V1.1

.gitignore

@@ -1,6 +1,13 @@
 # Compiler files
 cache/
 out/**/
+!out/VaultImplementation.sol/
+!out/VaultTokenizedImplementation.sol/
+!out/VaultVotesImplementation.sol/
+!out/v1.1/
+!out/v1.1/Vault.sol/
+!out/v1.1/VaultTokenized.sol/
+!out/VaultVotes.sol/
 !out/Vault.sol/
 !out/VaultTokenized.sol/
 !out/NetworkRestakeDelegator.sol/

script/deploy/Vault.s.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {Script, console2} from "forge-std/Script.sol";
+import {console2} from "forge-std/Script.sol";
+
+import {SymbioticCoreInit} from "../integration/SymbioticCoreInit.sol";
 
 import {Vault} from "../../src/contracts/vault/Vault.sol";
 
-import {IMigratablesFactory} from "../../src/interfaces/common/IMigratablesFactory.sol";
 import {IVault} from "../../src/interfaces/vault/IVault.sol";
 import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
 import {IBaseDelegator} from "../../src/interfaces/delegator/IBaseDelegator.sol";
@@ -17,14 +18,13 @@ import {IBaseSlasher} from "../../src/interfaces/slasher/IBaseSlasher.sol";
 import {ISlasher} from "../../src/interfaces/slasher/ISlasher.sol";
 import {IVetoSlasher} from "../../src/interfaces/slasher/IVetoSlasher.sol";
 
-contract VaultScript is Script {
+contract VaultScript is SymbioticCoreInit {
     function run(
-        address vaultConfigurator,
         address owner,
         address collateral,
         address burner,
         uint48 epochDuration,
-        address[] calldata whitelistedDepositors,
+        address[] calldata depositorsWhitelisted,
         uint256 depositLimit,
         uint64 delegatorIndex,
         address hook,
@@ -33,10 +33,12 @@ contract VaultScript is Script {
         uint64 slasherIndex,
         uint48 vetoDuration
     ) public {
+        SymbioticCoreInit.run(0);
+
         vm.startBroadcast();
         (,, address deployer) = vm.readCallers();
 
-        bool depositWhitelist = whitelistedDepositors.length != 0;
+        bool depositWhitelist = depositorsWhitelisted.length != 0;
 
         bytes memory vaultParams = abi.encode(
             IVault.InitParams({
@@ -136,7 +138,7 @@ contract VaultScript is Script {
             );
         }
 
-        (address vault_, address delegator_, address slasher_) = IVaultConfigurator(vaultConfigurator).create(
+        (address vault_, address delegator_, address slasher_) = symbioticCore.vaultConfigurator.create(
             IVaultConfigurator.InitParams({
                 version: 1,
                 owner: owner,
@@ -153,8 +155,8 @@ contract VaultScript is Script {
             Vault(vault_).grantRole(Vault(vault_).DEFAULT_ADMIN_ROLE(), owner);
             Vault(vault_).grantRole(Vault(vault_).DEPOSITOR_WHITELIST_ROLE(), deployer);
 
-            for (uint256 i; i < whitelistedDepositors.length; ++i) {
-                Vault(vault_).setDepositorWhitelistStatus(whitelistedDepositors[i], true);
+            for (uint256 i; i < depositorsWhitelisted.length; ++i) {
+                Vault(vault_).setDepositorWhitelistStatus(depositorsWhitelisted[i], true);
             }
 
             Vault(vault_).renounceRole(Vault(vault_).DEPOSITOR_WHITELIST_ROLE(), deployer);

script/deploy/VaultTokenized.s.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {Script, console2} from "forge-std/Script.sol";
+import {console2} from "forge-std/Script.sol";
+
+import {SymbioticCoreInit} from "../integration/SymbioticCoreInit.sol";
 
 import {Vault} from "../../src/contracts/vault/Vault.sol";
 
-import {IMigratablesFactory} from "../../src/interfaces/common/IMigratablesFactory.sol";
 import {IVault} from "../../src/interfaces/vault/IVault.sol";
 import {IVaultTokenized} from "../../src/interfaces/vault/IVaultTokenized.sol";
 import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
@@ -18,14 +19,13 @@ import {IBaseSlasher} from "../../src/interfaces/slasher/IBaseSlasher.sol";
 import {ISlasher} from "../../src/interfaces/slasher/ISlasher.sol";
 import {IVetoSlasher} from "../../src/interfaces/slasher/IVetoSlasher.sol";
 
-contract VaultTokenizedScript is Script {
+contract VaultTokenizedScript is SymbioticCoreInit {
     function run(
-        address vaultConfigurator,
         address owner,
         address collateral,
         address burner,
         uint48 epochDuration,
-        address[] calldata whitelistedDepositors,
+        address[] calldata depositorsWhitelisted,
         uint256 depositLimit,
         string calldata name,
         string calldata symbol,
@@ -36,10 +36,12 @@ contract VaultTokenizedScript is Script {
         uint64 slasherIndex,
         uint48 vetoDuration
     ) public {
+        SymbioticCoreInit.run(0);
+
         vm.startBroadcast();
         (,, address deployer) = vm.readCallers();
 
-        bool depositWhitelist = whitelistedDepositors.length != 0;
+        bool depositWhitelist = depositorsWhitelisted.length != 0;
 
         bytes memory vaultParams = abi.encode(
             IVaultTokenized.InitParamsTokenized({
@@ -143,7 +145,7 @@ contract VaultTokenizedScript is Script {
             );
         }
 
-        (address vault_, address delegator_, address slasher_) = IVaultConfigurator(vaultConfigurator).create(
+        (address vault_, address delegator_, address slasher_) = symbioticCore.vaultConfigurator.create(
             IVaultConfigurator.InitParams({
                 version: 2,
                 owner: owner,
@@ -160,8 +162,8 @@ contract VaultTokenizedScript is Script {
             Vault(vault_).grantRole(Vault(vault_).DEFAULT_ADMIN_ROLE(), owner);
             Vault(vault_).grantRole(Vault(vault_).DEPOSITOR_WHITELIST_ROLE(), deployer);
 
-            for (uint256 i; i < whitelistedDepositors.length; ++i) {
-                Vault(vault_).setDepositorWhitelistStatus(whitelistedDepositors[i], true);
+            for (uint256 i; i < depositorsWhitelisted.length; ++i) {
+                Vault(vault_).setDepositorWhitelistStatus(depositorsWhitelisted[i], true);
             }
 
             Vault(vault_).renounceRole(Vault(vault_).DEPOSITOR_WHITELIST_ROLE(), deployer);

script/deploy/Core.s.sol → script/deploy/genesis/Core.s.sol

@@ -3,25 +3,25 @@ pragma solidity 0.8.25;
 
 import {Script, console2} from "forge-std/Script.sol";
 
-import {VaultFactory} from "../../src/contracts/VaultFactory.sol";
-import {DelegatorFactory} from "../../src/contracts/DelegatorFactory.sol";
-import {SlasherFactory} from "../../src/contracts/SlasherFactory.sol";
-import {NetworkRegistry} from "../../src/contracts/NetworkRegistry.sol";
-import {OperatorRegistry} from "../../src/contracts/OperatorRegistry.sol";
-import {MetadataService} from "../../src/contracts/service/MetadataService.sol";
-import {NetworkMiddlewareService} from "../../src/contracts/service/NetworkMiddlewareService.sol";
-import {OptInService} from "../../src/contracts/service/OptInService.sol";
-
-import {Vault} from "../../src/contracts/vault/Vault.sol";
-import {VaultTokenized} from "../../src/contracts/vault/VaultTokenized.sol";
-import {NetworkRestakeDelegator} from "../../src/contracts/delegator/NetworkRestakeDelegator.sol";
-import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDelegator.sol";
-import {OperatorSpecificDelegator} from "../../src/contracts/delegator/OperatorSpecificDelegator.sol";
-import {OperatorNetworkSpecificDelegator} from "../../src/contracts/delegator/OperatorNetworkSpecificDelegator.sol";
-import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
-import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
-
-import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
+import {VaultFactory} from "../../../src/contracts/VaultFactory.sol";
+import {DelegatorFactory} from "../../../src/contracts/DelegatorFactory.sol";
+import {SlasherFactory} from "../../../src/contracts/SlasherFactory.sol";
+import {NetworkRegistry} from "../../../src/contracts/NetworkRegistry.sol";
+import {OperatorRegistry} from "../../../src/contracts/OperatorRegistry.sol";
+import {MetadataService} from "../../../src/contracts/service/MetadataService.sol";
+import {NetworkMiddlewareService} from "../../../src/contracts/service/NetworkMiddlewareService.sol";
+import {OptInService} from "../../../src/contracts/service/OptInService.sol";
+
+import {Vault} from "../../../src/contracts/vault/Vault.sol";
+import {VaultTokenized} from "../../../src/contracts/vault/VaultTokenized.sol";
+import {NetworkRestakeDelegator} from "../../../src/contracts/delegator/NetworkRestakeDelegator.sol";
+import {FullRestakeDelegator} from "../../../src/contracts/delegator/FullRestakeDelegator.sol";
+import {OperatorSpecificDelegator} from "../../../src/contracts/delegator/OperatorSpecificDelegator.sol";
+import {OperatorNetworkSpecificDelegator} from "../../../src/contracts/delegator/OperatorNetworkSpecificDelegator.sol";
+import {Slasher} from "../../../src/contracts/slasher/Slasher.sol";
+import {VetoSlasher} from "../../../src/contracts/slasher/VetoSlasher.sol";
+
+import {VaultConfigurator} from "../../../src/contracts/VaultConfigurator.sol";
 
 contract CoreScript is Script {
     function run(

script/deploy/MetadataService.s.sol → script/deploy/genesis/MetadataService.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {MetadataService} from "../../src/contracts/service/MetadataService.sol";
+import {MetadataService} from "../../../src/contracts/service/MetadataService.sol";
 
 contract MetadataServiceScript is Script {
     function run(

script/deploy/NetworkMiddlewareService.s.sol → script/deploy/genesis/NetworkMiddlewareService.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {NetworkMiddlewareService} from "../../src/contracts/service/NetworkMiddlewareService.sol";
+import {NetworkMiddlewareService} from "../../../src/contracts/service/NetworkMiddlewareService.sol";
 
 contract NetworkMiddlewareServiceScript is Script {
     function run(

script/deploy/NetworkRegistry.s.sol → script/deploy/genesis/NetworkRegistry.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {NetworkRegistry} from "../../src/contracts/NetworkRegistry.sol";
+import {NetworkRegistry} from "../../../src/contracts/NetworkRegistry.sol";
 
 contract NetworkRegistryScript is Script {
     function run() public {

script/deploy/OperatorRegistry.s.sol → script/deploy/genesis/OperatorRegistry.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {OperatorRegistry} from "../../src/contracts/OperatorRegistry.sol";
+import {OperatorRegistry} from "../../../src/contracts/OperatorRegistry.sol";
 
 contract OperatorRegistryScript is Script {
     function run() public {

script/deploy/OptInService.s.sol → script/deploy/genesis/OptInService.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {OptInService} from "../../src/contracts/service/OptInService.sol";
+import {OptInService} from "../../../src/contracts/service/OptInService.sol";
 
 contract OptInServiceScript is Script {
     function run(address whoRegistry, address whereRegistry, string calldata name) public {

script/deploy/VaultFactory.s.sol → script/deploy/genesis/VaultFactory.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {VaultFactory} from "../../src/contracts/VaultFactory.sol";
+import {VaultFactory} from "../../../src/contracts/VaultFactory.sol";
 
 contract VaultFactoryScript is Script {
     function run(

script/deploy/genesis/v1.1/Vaults.s.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.25;
+
+import {Script, console2} from "forge-std/Script.sol";
+
+import {SymbioticCoreInit} from "../../../integration/SymbioticCoreInit.sol";
+
+import {Vault} from "../../../../src/contracts/vault/v1.1/Vault.sol";
+import {VaultTokenized} from "../../../../src/contracts/vault/v1.1/VaultTokenized.sol";
+import {VaultVotes} from "../../../../src/contracts/vault/v1.1/VaultVotes.sol";
+import {VaultImplementation} from "../../../../src/contracts/vault/v1.1/VaultImplementation.sol";
+import {VaultTokenizedImplementation} from "../../../../src/contracts/vault/v1.1/VaultTokenizedImplementation.sol";
+import {VaultVotesImplementation} from "../../../../src/contracts/vault/v1.1/VaultVotesImplementation.sol";
+
+contract VaultsScript is SymbioticCoreInit {
+    function run() public {
+        SymbioticCoreInit.run(0);
+
+        vm.startBroadcast();
+
+        address vaultImplementation = address(
+            new VaultImplementation(address(symbioticCore.delegatorFactory), address(symbioticCore.slasherFactory))
+        );
+        address vaultImpl = address(new Vault(address(symbioticCore.vaultFactory), vaultImplementation));
+
+        address vaultTokenizedImplementation = address(new VaultTokenizedImplementation(vaultImplementation));
+        address vaultTokenizedImpl =
+            address(new VaultTokenized(address(symbioticCore.vaultFactory), vaultTokenizedImplementation));
+
+        address vaultVotesImplementation = address(new VaultVotesImplementation(vaultImplementation));
+        address vaultVotesImpl = address(new VaultVotes(address(symbioticCore.vaultFactory), vaultVotesImplementation));
+
+        console2.log("Vault: ", address(vaultImpl));
+        console2.log("VaultTokenized: ", address(vaultTokenizedImpl));
+        console2.log("VaultVotes: ", address(vaultVotesImpl));
+        console2.log();
+        console2.log("VaultImplementation: ", address(vaultImplementation));
+        console2.log("VaultTokenizedImplementation: ", address(vaultTokenizedImplementation));
+        console2.log("VaultVotesImplementation: ", address(vaultVotesImplementation));
+
+        vm.stopBroadcast();
+    }
+}