Merge pull request #2 from symbioticfi/sync-core

Sync with core
symbioticfi · Oct 31, 2024 · 30ba028 · 30ba028
2 parents ad39c4d + 4bfcb89
commit 30ba028
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -23,8 +23,5 @@ tab_width = 4
 runs = 4096
 max_test_rejects = 262144
 
-[etherscan]
-mainnet = { key = "${ETHERSCAN_API_KEY}" }
-holesky = { key = "${ETHERSCAN_API_KEY}" }
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
diff --git a/lib/core b/lib/core
diff --git a/package.json b/package.json
@@ -25,6 +25,6 @@
   "dependencies": {
     "@openzeppelin/contracts": "5.0.2",
     "@openzeppelin/contracts-upgradeable": "5.0.2",
-    "@symbioticfi/core": "1.0.0-devnet.3"
+    "@symbioticfi/core": "1.0.0-devnet.5"
   }
 }
diff --git a/test/DefaultCollateralMigrator.t.sol b/test/DefaultCollateralMigrator.t.sol
@@ -173,15 +173,19 @@ contract DefaultCollateralMigratorTest is Test {
                 version: vaultFactory.lastVersion(),
                 owner: alice,
                 vaultParams: IVault.InitParams({
-                    collateral: address(feeOnTransferToken),
+                    collateral: address(feeOnTransferCollateral.asset()),
                     delegator: address(0),
                     slasher: address(0),
                     burner: address(0xdEaD),
                     epochDuration: epochDuration,
                     depositWhitelist: false,
+                    isDepositLimit: false,
+                    depositLimit: 0,
                     defaultAdminRoleHolder: alice,
                     depositWhitelistSetRoleHolder: alice,
-                    depositorWhitelistRoleHolder: alice
+                    depositorWhitelistRoleHolder: alice,
+                    isDepositLimitSetRoleHolder: alice,
+                    depositLimitSetRoleHolder: alice
                 }),
                 delegatorIndex: 0,
                 delegatorParams: abi.encode(
@@ -301,9 +305,13 @@ contract DefaultCollateralMigratorTest is Test {
                     burner: address(0xdEaD),
                     epochDuration: epochDuration,
                     depositWhitelist: false,
+                    isDepositLimit: false,
+                    depositLimit: 0,
                     defaultAdminRoleHolder: alice,
                     depositWhitelistSetRoleHolder: alice,
-                    depositorWhitelistRoleHolder: alice
+                    depositorWhitelistRoleHolder: alice,
+                    isDepositLimitSetRoleHolder: alice,
+                    depositLimitSetRoleHolder: alice
                 }),
                 delegatorIndex: 0,
                 delegatorParams: abi.encode(