test(fork): simulate executing txs from the TimelockController queue

Author: nadir-akhtar

script/configs/mainnet/mainnet-addresses.config.json

@@ -55,6 +55,7 @@
             "0xAe60d8180437b5C34bB956822ac2710972584473",
             "0x298aFB19A105D59E74658C4C334Ff360BadE6dd2"
         ],
+        "strategyBaseTVLLimitsImplementation": "0x62F7226Fb9d615590EadB539713b250fB2fdf4E0",
         "token": {
             "tokenProxyAdmin": "0x3f5Ab2D4418d38568705bFd6672630fCC3435CC9",
             "EIGEN": "0xec53bf9167f50cdeb3ae105f56099aaab9061f83",
@@ -74,6 +75,7 @@
         "communityMultisig": "0xFEA47018D632A77bA579846c840d5706705Dc598",
         "executorMultisig": "0x369e6F597e22EaB55fFb173C6d9cD234BD699111",
         "operationsMultisig": "0xBE1685C81aA44FF9FB319dD389addd9374383e90",
+        "protocolCouncil": "0x461854d84ee845f905e0ecf6c288ddeeb4a9533f",
         "pauserMultisig": "0x5050389572f2d220ad927CcbeA0D406831012390",
         "timelockController": "0xC06Fd4F821eaC1fF1ae8067b36342899b57BAa2d",
         "semver": "v1.4.1"

script/utils/ExistingDeploymentParser.sol

@@ -167,6 +167,7 @@ contract ExistingDeploymentParser is Script, Logger {
     address executorMultisig;
     address operationsMultisig;
     address communityMultisig;
+    address protocolCouncil;
     address pauserMultisig;
     address timelockController;
 
@@ -213,6 +214,7 @@ contract ExistingDeploymentParser is Script, Logger {
         executorMultisig = json.readAddress(".parameters.executorMultisig");
         operationsMultisig = json.readAddress(".parameters.operationsMultisig");
         communityMultisig = json.readAddress(".parameters.communityMultisig");
+        protocolCouncil = json.readAddress(".parameters.protocolCouncil");
         pauserMultisig = json.readAddress(".parameters.pauserMultisig");
         timelockController = json.readAddress(".parameters.timelockController");
 

src/test/integration/IntegrationDeployer.t.sol

@@ -19,6 +19,7 @@ import "src/contracts/pods/EigenPodManager.sol";
 import "src/contracts/pods/EigenPod.sol";
 import "src/contracts/permissions/PauserRegistry.sol";
 import "src/contracts/permissions/PermissionController.sol";
+import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
 
 import "src/test/mocks/EmptyContract.sol";
 import "src/test/mocks/ETHDepositMock.sol";
@@ -37,7 +38,7 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
 
     // Fork ids for specific fork tests
     bool isUpgraded;
-    uint mainnetForkBlock = 22_514_370; // Post Pectra Compatibility Upgrade
+    uint mainnetForkBlock = 22_949_454; // Post Pectra Compatibility Upgrade
 
     string version = "9.9.9";
 
@@ -54,6 +55,12 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
 
     uint32 INITIAL_GLOBAL_DELAY_BLOCKS = 4 days / 12 seconds; // 4 days in blocks
 
+    // derived from
+    bytes calldataToExecutor_DISTRO =
+        hex"6A76120200000000000000000000000040A2ACCBD92BCA938B02010E17A5B8929B49130D000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C800000000000000000000000000000000000000000000000000000000000000B048D80FF0A00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000AA2008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000039053D51B77DC0D36036FC1FCC8CB819DF8EF37A0000000000000000000000006EED6C2802DF347E05884857CDDB2D3E96D12F89008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000948A420B8CC1D6BFD0B6087C2E7C344A2CD0BC39000000000000000000000000C97602648FA52F92B4EE2B0E5A54BD15B6CB0345008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000858646372CC42E1A627FCE94AA7A7033E7CF075A00000000000000000000000046AEFD30415BE99E20169EE7046F65784B46D123008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000091E677B07F7AF907EC9A428AAFA9FC14A0D3A338000000000000000000000000E48D7CAEC1790B293667E4BB2DE1E00536F2BABD008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000ACB55C530ACDB2849E6D4F36992CD8C9D50ED8F7000000000000000000000000530FDB7ADF7D489DF49C27E3D3512C0DD64886BE000ED6703C298D28AE0878D1B28E88CA87F9662FE9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000243659CFE6000000000000000000000000D4D1746142642DB4C1AB17B03B9C58BAAC913E5B008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000093C4B944D05DFE6DF7645A86CD2206016C51564D00000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC40000000000000000000000001BEE69B7DFFFA4E2D53C2A2DF135C388AD25DCD200000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000054945180DB7943C0ED0FEE7EDAB2BD24620256BC00000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC40000000000000000000000009D7ED45EE2E8FC5482FA2428F15C971E6369011D00000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000013760F50A9D7377E4F20CB8CF9E4C26586C658FF00000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000A4C637E0F704745D182E4D38CAB7E7485321D05900000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC400000000000000000000000057BA429517C3473B6D34CA9ACD56C0E735B94C0200000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC40000000000000000000000000FE4F44BEE93503346A3AC9EE5A26B130A5796D600000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC40000000000000000000000007CA911E83DABF90C90DD3DE5411A10F1A611218400000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC40000000000000000000000008CA7A5D6F3ACD3A7A8BC468A8CD0FB14B6BD28B600000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000AE60D8180437B5C34BB956822AC271097258447300000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000298AFB19A105D59E74658C4C334FF360BADE6DD200000000000000000000000062F7226FB9D615590EADB539713B250FB2FDF4E0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041000000000000000000000000C06FD4F821EAC1FF1AE8067B36342899B57BAA2D00000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000";
+    bytes calldataToExecutor_MOOCOW =
+        hex"6A76120200000000000000000000000040A2ACCBD92BCA938B02010E17A5B8929B49130D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E000000000000000000000000000000000000000000000000000000000000001648D80FF0A00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000112005A2A4F2F3C18F09179B6703E63D9EDD165909073000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000243659CFE6000000000000000000000000CB27A4819A64FBA93ABD4D480E4466AEC0503745008B9566ADA63B64D1E1DCF1418B43FD1433B724440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004499A88EC4000000000000000000000000EC53BF9167F50CDEB3AE105F56099AAAB9061F830000000000000000000000002C4A81E257381F87F5A5C4BD525116466D972E500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041000000000000000000000000C06FD4F821EAC1FF1AE8067B36342899B57BAA2D00000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000";
+
     // Lists of strategies used in the system
     //
     // When we select random user assets, we use the `assetType` to determine
@@ -265,25 +272,40 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
         // Since we haven't done the slashing upgrade on mainnet yet, upgrade mainnet contracts
         // prior to test. `isUpgraded` is true by default, but is set to false in `UpgradeTest.t.sol`
         if (isUpgraded) {
-            _upgradeMainnetContracts();
+            cheats.startPrank(executorMultisig);
+
+            _deployProxies();
+            _deployImplementations();
+            _upgradeProxies();
 
             // Set the `pectraForkTimestamp` on the EigenPodManager. Use pectra state
-            cheats.startPrank(executorMultisig);
             eigenPodManager.setProofTimestampSetter(executorMultisig);
             eigenPodManager.setPectraForkTimestamp(BEACON_GENESIS_TIME);
             cheats.stopPrank();
         }
     }
 
     function _upgradeMainnetContracts() public virtual {
-        cheats.startPrank(address(executorMultisig));
+        cheats.startPrank(address(protocolCouncil));
+
+        TimelockController tc = TimelockController(payable(timelockController));
+
+        uint executeTimestamp = tc.getTimestamp(tc.hashOperation(executorMultisig, 0, calldataToExecutor_MOOCOW, bytes32(0), bytes32(0))); // using MOOCOW as it's the last tx in the queue
+
+        console.log("executeTimestamp:", executeTimestamp);
+        cheats.warp(executeTimestamp);
+
+        console.log(
+            "is it ready?", tc.isOperationReady(tc.hashOperation(executorMultisig, 0, calldataToExecutor_MOOCOW, bytes32(0), bytes32(0)))
+        );
+
+        console.log("trying first queued tx");
+        // execute queued txs
+        tc.execute({target: executorMultisig, value: 0, payload: calldataToExecutor_DISTRO, predecessor: bytes32(0), salt: bytes32(0)});
+
+        console.log("trying second queued tx");
+        tc.execute({target: executorMultisig, value: 0, payload: calldataToExecutor_MOOCOW, predecessor: bytes32(0), salt: bytes32(0)});
 
-        // First, deploy the new contracts as empty contracts
-        emptyContract = new EmptyContract();
-        // Deploy new implementation contracts and upgrade all proxies to point to them
-        _deployProxies(); // deploy proxies (if undeployed)
-        _deployImplementations();
-        _upgradeProxies();
         cheats.stopPrank();
     }
 
@@ -375,6 +397,7 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
 
         // Pre-longtail StrategyBaseTVLLimits implementation
         // TODO - need to update ExistingDeploymentParser
+        deployedStrategyArray;
 
         // multichain
         keyRegistrarImplementation = new KeyRegistrar(permissionController, allocationManager, "9.9.9");