Merge branch 'main' into add-simple-integration-mock

symbioticfi · Jan 8, 2025 · a1facaf · a1facaf
2 parents 3bd79c5 + c8eb4df
commit a1facaf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@symbioticfi/periphery",
   "version": "1.0.0-devnet.1",
-  "description": "Symbiotic is a shared security protocol enabling decentralized networks to control and customize their own multi-asset restaking implementation.",
+  "description": "Symbiotic Periphery repository contains a helper contract allowing users to migrate their funds from Default Collaterals to Vaults in a convenient way.",
   "homepage": "https://symbiotic.fi/",
   "bugs": "https://github.com/symbioticfi/periphery/issues",
   "license": "MIT",
@@ -25,6 +25,6 @@
   "dependencies": {
     "@openzeppelin/contracts": "5.0.2",
     "@openzeppelin/contracts-upgradeable": "5.0.2",
-    "@symbioticfi/core": "1.0.0-devnet.5"
+    "@symbioticfi/core": "1.0.0-devnet.9"
   }
 }
diff --git a/test/DefaultCollateralMigrator.t.sol b/test/DefaultCollateralMigrator.t.sol
@@ -22,15 +22,18 @@ import {Vault} from "@symbioticfi/core/src/contracts/vault/Vault.sol";
 import {NetworkRestakeDelegator} from "@symbioticfi/core/src/contracts/delegator/NetworkRestakeDelegator.sol";
 import {FullRestakeDelegator} from "@symbioticfi/core/src/contracts/delegator/FullRestakeDelegator.sol";
 import {OperatorSpecificDelegator} from "@symbioticfi/core/src/contracts/delegator/OperatorSpecificDelegator.sol";
+import {OperatorNetworkSpecificDelegator} from
+    "@symbioticfi/core/src/contracts/delegator/OperatorNetworkSpecificDelegator.sol";
 import {Slasher} from "@symbioticfi/core/src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "@symbioticfi/core/src/contracts/slasher/VetoSlasher.sol";
 
 import {Token} from "@symbioticfi/core/test/mocks/Token.sol";
 import {FeeOnTransferToken} from "@symbioticfi/core/test/mocks/FeeOnTransferToken.sol";
-import {VaultConfigurator, IVaultConfigurator} from "@symbioticfi/core/src/contracts/VaultConfigurator.sol";
-import {IVault} from "@symbioticfi/core/src/interfaces/vault/IVault.sol";
+import {VaultConfigurator} from "@symbioticfi/core/src/contracts/VaultConfigurator.sol";
+import {IVaultConfigurator} from "@symbioticfi/core/src/interfaces/IVaultConfigurator.sol";
 import {INetworkRestakeDelegator} from "@symbioticfi/core/src/interfaces/delegator/INetworkRestakeDelegator.sol";
 import {IBaseDelegator} from "@symbioticfi/core/src/interfaces/delegator/IBaseDelegator.sol";
+import {IVault} from "@symbioticfi/core/src/interfaces/vault/IVault.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
@@ -133,6 +136,19 @@ contract DefaultCollateralMigratorTest is Test {
         );
         delegatorFactory.whitelist(operatorSpecificDelegatorImpl);
 
+        address operatorNetworkSpecificDelegatorImpl = address(
+            new OperatorNetworkSpecificDelegator(
+                address(operatorRegistry),
+                address(networkRegistry),
+                address(vaultFactory),
+                address(operatorVaultOptInService),
+                address(operatorNetworkOptInService),
+                address(delegatorFactory),
+                delegatorFactory.totalTypes()
+            )
+        );
+        delegatorFactory.whitelist(operatorNetworkSpecificDelegatorImpl);
+
         address slasherImpl = address(
             new Slasher(
                 address(vaultFactory),