fix: integration test initialization params (#978)

* fix: initialization params * fix: roll blocks usage
Layr-Labs · Jan 3, 2025 · 14ca22e · 14ca22e
1 parent e39f264
commit 14ca22e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/script/configs/mainnet.json b/script/configs/mainnet.json
@@ -2,7 +2,7 @@
     "config": {
         "environment": {
             "chainid": 1,
-            "lastUpdated": "v0.4.2-mainnet-pepe",
+            "lastUpdated": "slashing-integration-testing",
             "name": "mainnet"
         },
         "params": {
@@ -16,7 +16,8 @@
             "REWARDS_UPDATER_ADDRESS": "0x8f94F55fD8c9E090296283137C303fE97d32A9e2",
             "ACTIVATION_DELAY": 604800,
             "GLOBAL_OPERATOR_COMMISSION_BIPS": 1000,
-            "MIN_WITHDRAWAL_DELAY": 7200
+            "MIN_WITHDRAWAL_DELAY_BLOCKS": 100800,
+            "ALLOCATION_CONFIGURATION_DELAY": 126000
         }
     },
     "deployment": {

diff --git a/script/utils/ExistingDeploymentParser.sol b/script/utils/ExistingDeploymentParser.sol
@@ -683,5 +683,9 @@ contract ExistingDeploymentParser is Script, Logger {
         REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH = uint32(json.readUint(".config.params.MAX_RETROACTIVE_LENGTH"));
         REWARDS_COORDINATOR_MAX_FUTURE_LENGTH = uint32(json.readUint(".config.params.MAX_FUTURE_LENGTH"));
         REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP = uint32(json.readUint(".config.params.GENESIS_REWARDS_TIMESTAMP"));
+
+        DEALLOCATION_DELAY = uint32(json.readUint(".config.params.MIN_WITHDRAWAL_DELAY_BLOCKS"));
+        ALLOCATION_CONFIGURATION_DELAY = uint32(json.readUint(".config.params.ALLOCATION_CONFIGURATION_DELAY"));
+        DELEGATION_MANAGER_MIN_WITHDRAWAL_DELAY_BLOCKS = uint32(json.readUint(".config.params.MIN_WITHDRAWAL_DELAY_BLOCKS"));
     }
 }
diff --git a/src/test/integration/IntegrationBase.t.sol b/src/test/integration/IntegrationBase.t.sol
@@ -101,7 +101,10 @@ abstract contract IntegrationBase is IntegrationDeployer {
 
             operator.registerAsOperator();
             operator.depositIntoEigenlayer(strategies, tokenBalances);
-        }
+
+            // Roll passed the allocation configuration delay
+            rollForward({blocks: ALLOCATION_CONFIGURATION_DELAY});
+        }        
 
         assert_Snap_Added_Staker_DepositShares(operator, strategies, addedShares, "_newRandomOperator: failed to add delegatable shares");
         assert_Snap_Added_OperatorShares(operator, strategies, addedShares, "_newRandomOperator: failed to award shares to operator");

diff --git a/src/test/integration/IntegrationDeployer.t.sol b/src/test/integration/IntegrationDeployer.t.sol
@@ -166,6 +166,11 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
         EmptyContract emptyContract = new EmptyContract();
         ethPOSDeposit = new ETHPOSDepositMock();
 
+        // Matching parameters to testnet
+        DELEGATION_MANAGER_MIN_WITHDRAWAL_DELAY_BLOCKS = 50;
+        DEALLOCATION_DELAY = 50;
+        ALLOCATION_CONFIGURATION_DELAY = 75;
+
         /**
          * First, deploy upgradeable proxy contracts that **will point** to the implementations. Since the implementation contracts are
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.

diff --git a/src/test/integration/tests/Deposit_Delegate_Allocate.t.sol b/src/test/integration/tests/Deposit_Delegate_Allocate.t.sol
@@ -66,12 +66,15 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
         _upgradeEigenLayerContracts(); // Upgrade contracts if forkType is not local
         (AVS avs,) = _newRandomAVS();
 
-        // Create an operator set and register an operator.
+        // 3. Set allocation delay for operator
+        operator.setAllocationDelay(1);
+        rollForward({blocks: ALLOCATION_CONFIGURATION_DELAY});
+
+        // 4. Create an operator set and register an operator.
         OperatorSet memory operatorSet = avs.createOperatorSet(strategies);
         operator.registerForOperatorSet(operatorSet);
-        operator.setAllocationDelay(1);
 
-        // 3. Allocate to operator set.
+        // 5. Allocate to operator set.
         IAllocationManagerTypes.AllocateParams memory allocateParams =
             operator.modifyAllocations(operatorSet, _randMagnitudes({sum: 1 ether, len: strategies.length}));
         assert_Snap_Allocations_Modified(

diff --git a/src/test/integration/users/User.t.sol b/src/test/integration/users/User.t.sol
@@ -192,7 +192,6 @@ contract User is Logger, IDelegationManagerTypes, IAllocationManagerTypes {
         _tryPrankAppointee_AllocationManager(IAllocationManager.setAllocationDelay.selector);
         allocationManager().setAllocationDelay(address(this), delay);
         print.gasUsed();
-        rollForward({blocks: allocationManager().ALLOCATION_CONFIGURATION_DELAY()});
     }
 
     /// -----------------------------------------------------------------------