chore: new ccip stewards with timelock getter on base

src/20241223_Multi_GHOBaseLaunch/AaveV3Base_GHOBaseLaunch_20241223.sol

@@ -45,8 +45,8 @@ contract AaveV3Base_GHOBaseLaunch_20241223 is IProposalGenericExecutor {
   address public constant GHO_AAVE_STEWARD = 0x20fd5f3FCac8883a3A0A2bBcD658A2d2c6EFa6B6;
   // https://basescan.org/address/0xA5Ba213867E175A182a5dd6A9193C6158738105A
   address public constant GHO_BUCKET_STEWARD = 0xA5Ba213867E175A182a5dd6A9193C6158738105A;
-  // https://basescan.org/address/0x2Ce400703dAcc37b7edFA99D228b8E70a4d3831B
-  address public constant GHO_CCIP_STEWARD = 0x2Ce400703dAcc37b7edFA99D228b8E70a4d3831B;
+  // https://basescan.org/address/0x6e637e1E48025E51315d50ab96d5b3be1971A715
+  address public constant GHO_CCIP_STEWARD = 0x6e637e1E48025E51315d50ab96d5b3be1971A715;
 
   // https://etherscan.io/address/0x20fd5f3FCac8883a3A0A2bBcD658A2d2c6EFa6B6
   address public constant REMOTE_TOKEN_POOL_ETH = 0x20fd5f3FCac8883a3A0A2bBcD658A2d2c6EFa6B6;

src/20241223_Multi_GHOBaseLaunch/AaveV3Base_GHOBaseLaunch_20241223.t.sol

@@ -73,7 +73,7 @@ contract AaveV3Base_GHOBaseLaunch_20241223_Base is ProtocolV3TestBase {
   IGhoBucketSteward internal constant NEW_GHO_BUCKET_STEWARD =
     IGhoBucketSteward(0xA5Ba213867E175A182a5dd6A9193C6158738105A);
   IGhoCcipSteward internal constant NEW_GHO_CCIP_STEWARD =
-    IGhoCcipSteward(0x2Ce400703dAcc37b7edFA99D228b8E70a4d3831B);
+    IGhoCcipSteward(0x6e637e1E48025E51315d50ab96d5b3be1971A715);
   IUpgradeableBurnMintTokenPool_1_5_1 internal constant NEW_TOKEN_POOL =
     IUpgradeableBurnMintTokenPool_1_5_1(0xDe6539018B095353A40753Dc54C91C68c9487D4E);
   address internal constant NEW_REMOTE_POOL_ARB = 0x6Bb7a212910682DCFdbd5BCBb3e28FB4E8da10Ee;
@@ -93,7 +93,7 @@ contract AaveV3Base_GHOBaseLaunch_20241223_Base is ProtocolV3TestBase {
   error InvalidSourcePoolAddress(bytes);
 
   function setUp() public virtual {
-    vm.createSelectFork(vm.rpcUrl('base'), 24519153);
+    vm.createSelectFork(vm.rpcUrl('base'), 24685477);
     proposal = new AaveV3Base_GHOBaseLaunch_20241223();
 
     _performCcipPreReq();
@@ -328,13 +328,10 @@ contract AaveV3Base_GHOBaseLaunch_20241223_PreExecution is AaveV3Base_GHOBaseLau
     assertEq(NEW_GHO_CCIP_STEWARD.GHO_TOKEN_POOL(), address(NEW_TOKEN_POOL));
     assertEq(NEW_GHO_CCIP_STEWARD.RISK_COUNCIL(), RISK_COUNCIL);
     assertFalse(NEW_GHO_CCIP_STEWARD.BRIDGE_LIMIT_ENABLED());
-    uint256 ccipDebounceValue = uint256(vm.load(address(NEW_GHO_CCIP_STEWARD), bytes32(0)));
-    IGhoCcipSteward.CcipDebounce memory ccipDebounce = IGhoCcipSteward.CcipDebounce({
-      bridgeLimitLastUpdate: uint40(ccipDebounceValue >> 216),
-      rateLimitLastUpdate: uint40(ccipDebounceValue >> 176)
-    });
-    assertEq(ccipDebounce.bridgeLimitLastUpdate, 0);
-    assertEq(ccipDebounce.rateLimitLastUpdate, 0);
+    assertEq(
+      abi.encode(NEW_GHO_CCIP_STEWARD.getCcipTimelocks()),
+      abi.encode(IGhoCcipSteward.CcipDebounce(0, 0))
+    );
   }
 
   function test_newTokenPoolInitialization() public {

src/20241223_Multi_GHOBaseLaunch/AaveV3Base_GHOBaseListing_20241223.t.sol

@@ -46,12 +46,12 @@ contract AaveV3Base_GHOBaseListing_20241223_Base is ProtocolV3TestBase {
   IGhoBucketSteward internal constant NEW_GHO_BUCKET_STEWARD =
     IGhoBucketSteward(0xA5Ba213867E175A182a5dd6A9193C6158738105A);
   IGhoCcipSteward internal constant NEW_GHO_CCIP_STEWARD =
-    IGhoCcipSteward(0x2Ce400703dAcc37b7edFA99D228b8E70a4d3831B);
+    IGhoCcipSteward(0x6e637e1E48025E51315d50ab96d5b3be1971A715);
   IUpgradeableBurnMintTokenPool_1_5_1 internal constant NEW_TOKEN_POOL =
     IUpgradeableBurnMintTokenPool_1_5_1(0xDe6539018B095353A40753Dc54C91C68c9487D4E);
 
   function setUp() public virtual {
-    vm.createSelectFork(vm.rpcUrl('base'), 24519153);
+    vm.createSelectFork(vm.rpcUrl('base'), 24685477);
     proposal = new AaveV3Base_GHOBaseListing_20241223();
   }
 
@@ -225,6 +225,7 @@ contract AaveV3Base_GHOBaseListing_20241223_Stewards is AaveV3Base_GHOBaseListin
     NEW_GHO_AAVE_STEWARD.updateGhoBorrowCap(newBorrowCap);
 
     assertEq(AaveV3Base.POOL.getConfiguration(address(GHO_TOKEN)).getBorrowCap(), newBorrowCap);
+    assertEq(NEW_GHO_AAVE_STEWARD.getGhoTimelocks().ghoBorrowCapLastUpdate, vm.getBlockTimestamp());
   }
 
   function test_aaveStewardCanUpdateSupplyCap(uint256 newSupplyCap) public {
@@ -240,6 +241,7 @@ contract AaveV3Base_GHOBaseListing_20241223_Stewards is AaveV3Base_GHOBaseListin
     NEW_GHO_AAVE_STEWARD.updateGhoSupplyCap(newSupplyCap);
 
     assertEq(AaveV3Base.POOL.getConfiguration(address(GHO_TOKEN)).getSupplyCap(), newSupplyCap);
+    assertEq(NEW_GHO_AAVE_STEWARD.getGhoTimelocks().ghoSupplyCapLastUpdate, vm.getBlockTimestamp());
   }
 
   function test_bucketStewardCanUpdateBucketCapacity(uint256 newBucketCapacity) public {
@@ -295,6 +297,7 @@ contract AaveV3Base_GHOBaseListing_20241223_Stewards is AaveV3Base_GHOBaseListin
 
     assertEq(NEW_TOKEN_POOL.getCurrentOutboundRateLimiterState(remoteChain), outboundConfig);
     assertEq(NEW_TOKEN_POOL.getCurrentInboundRateLimiterState(remoteChain), inboundConfig);
+    assertEq(NEW_GHO_CCIP_STEWARD.getCcipTimelocks().rateLimitLastUpdate, vm.getBlockTimestamp());
 
     skip(NEW_GHO_CCIP_STEWARD.MINIMUM_DELAY() + 1);
 
@@ -305,5 +308,6 @@ contract AaveV3Base_GHOBaseListing_20241223_Stewards is AaveV3Base_GHOBaseListin
     IRateLimiter.Config memory disabledConfig = IRateLimiter.Config(false, 0, 0);
     assertEq(NEW_TOKEN_POOL.getCurrentOutboundRateLimiterState(remoteChain), disabledConfig);
     assertEq(NEW_TOKEN_POOL.getCurrentInboundRateLimiterState(remoteChain), disabledConfig);
+    assertEq(NEW_GHO_CCIP_STEWARD.getCcipTimelocks().rateLimitLastUpdate, vm.getBlockTimestamp());
   }
 }

src/20241223_Multi_GHOBaseLaunch/AaveV3E2E_GHOBaseLaunch_20241223.t.sol

@@ -110,7 +110,7 @@ contract AaveV3Base_GHOBaseLaunch_20241223_Base is ProtocolV3TestBase {
 
   function setUp() public virtual {
     arb.c.forkId = vm.createFork(vm.rpcUrl('arbitrum'), 292550754);
-    base.c.forkId = vm.createFork(vm.rpcUrl('base'), 24519153);
+    base.c.forkId = vm.createFork(vm.rpcUrl('base'), 24685477);
     eth.c.forkId = vm.createFork(vm.rpcUrl('mainnet'), 21564756);
 
     arb.c.tokenAdminRegistry = ITokenAdminRegistry(0x39AE1032cF4B334a1Ed41cdD0833bdD7c7E7751E);

src/20241223_Multi_GHOBaseLaunch/config.ts

@@ -45,7 +45,7 @@ export const config: ConfigFile = {
           },
         ],
       },
-      cache: {blockNumber: 24519153},
+      cache: {blockNumber: 24685477},
     },
   },
 };