[SMR-1975] TODO cleanup (#49)

* address TODOs on bridge flowrate integration tests * clean up last TODO * checkout file
immutable · Nov 21, 2023 · 1652728 · 1652728
1 parent 45acda3
commit 1652728
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 66 deletions.
diff --git a/script/InitializeChildContracts.s.sol b/script/InitializeChildContracts.s.sol
@@ -62,7 +62,6 @@ contract InitializeChildContracts is Script {
         vm.createSelectFork(params.childRpcUrl);
         vm.startBroadcast(params.deployerPrivateKey);
 
-        // TODO update
         IChildERC20Bridge.InitializationRoles memory roles = IChildERC20Bridge.InitializationRoles({
             defaultAdmin: params.childAdminAddress,
             pauser: params.childPauserAddress,

diff --git a/script/InitializeRootContracts.s.sol b/script/InitializeRootContracts.s.sol
@@ -66,8 +66,6 @@ contract InitializeRootContracts is Script {
         vm.createSelectFork(params.rootRpcUrl);
         vm.startBroadcast(params.rootPrivateKey);
 
-        // TODO add pauser, unpauser roles. variable manager and Adaptor manager will be privileged transaction multisg
-
         IRootERC20Bridge.InitializationRoles memory roles = IRootERC20Bridge.InitializationRoles({
             defaultAdmin: params.rootAdminAddress,
             pauser: params.rootPauserAddress,

diff --git a/src/root/RootAxelarBridgeAdaptor.sol b/src/root/RootAxelarBridgeAdaptor.sol
@@ -130,7 +130,6 @@ contract RootAxelarBridgeAdaptor is
         string memory _childBridgeAdaptor = IRootERC20Bridge(rootBridge).childBridgeAdaptor();
         string memory _childChain = childChain;
 
-        // TODO For `sender` (first param), should likely be refundRecipient (and in which case refundRecipient should be renamed to sender and used as refund recipient)
         gasService.payNativeGasForContractCall{value: msg.value}(
             address(this), _childChain, _childBridgeAdaptor, payload, refundRecipient
         );

diff --git a/src/root/RootERC20Bridge.sol b/src/root/RootERC20Bridge.sol
@@ -398,7 +398,6 @@ contract RootERC20Bridge is BridgeRoles, IRootERC20Bridge, IRootERC20BridgeEvent
 
         bytes memory payload =
             abi.encode(MAP_TOKEN_SIG, rootToken, rootToken.name(), rootToken.symbol(), rootToken.decimals());
-        // TODO investigate using delegatecall to keep the axelar message sender as the bridge contract, since adaptor can change.
         rootBridgeAdaptor.sendMessage{value: msg.value}(payload, msg.sender);
 
         emit L1TokenMapped(address(rootToken), childToken);
@@ -451,7 +450,6 @@ contract RootERC20Bridge is BridgeRoles, IRootERC20Bridge, IRootERC20BridgeEvent
         // Deposit sig, root token address, depositor, receiver, amount
         bytes memory payload = abi.encode(DEPOSIT_SIG, payloadToken, msg.sender, receiver, amount);
 
-        // TODO investigate using delegatecall to keep the axelar message sender as the bridge contract, since adaptor can change.
         rootBridgeAdaptor.sendMessage{value: feeAmount}(payload, msg.sender);
 
         if (address(rootToken) == NATIVE_ETH) {

diff --git a/test/integration/child/ChildAxelarBridge.t.sol b/test/integration/child/ChildAxelarBridge.t.sol
@@ -270,8 +270,6 @@ contract ChildERC20BridgeIntegrationTest is Test, IChildERC20BridgeEvents, IChil
         );
     }
 
-    // TODO add mapToken calls to these to isolate the specific error we are testing for vvvv
-
     function test_RevertIf_depositWithRootTokenZeroAddress() public {
         address rootTokenAddress = address(0);
         address sender = address(0xff);
@@ -280,6 +278,15 @@ contract ChildERC20BridgeIntegrationTest is Test, IChildERC20BridgeEvents, IChil
         bytes32 commandId = bytes32("testCommandId");
         bytes32 depositSig = childERC20Bridge.DEPOSIT_SIG();
 
+        {
+            // Found by running `forge inspect src/child/ChildERC20Bridge.sol:ChildERC20Bridge storageLayout | grep -B3 -A5 -i "rootTokenToChildToken"`
+            uint256 rootTokenToChildTokenMappingSlot = 201;
+            address childAddress = address(444444);
+            bytes32 slot = getMappingStorageSlotFor(rootTokenAddress, rootTokenToChildTokenMappingSlot);
+            bytes32 data = bytes32(uint256(uint160(childAddress)));
+            vm.store(address(childERC20Bridge), slot, data);
+        }
+
         vm.expectRevert(ZeroAddress.selector);
         childAxelarBridgeAdaptor.execute(
             commandId,
@@ -297,6 +304,15 @@ contract ChildERC20BridgeIntegrationTest is Test, IChildERC20BridgeEvents, IChil
         bytes32 commandId = bytes32("testCommandId");
         bytes32 depositSig = childERC20Bridge.DEPOSIT_SIG();
 
+        {
+            // Found by running `forge inspect src/child/ChildERC20Bridge.sol:ChildERC20Bridge storageLayout | grep -B3 -A5 -i "rootTokenToChildToken"`
+            uint256 rootTokenToChildTokenMappingSlot = 201;
+            address childAddress = address(444444);
+            bytes32 slot = getMappingStorageSlotFor(rootTokenAddress, rootTokenToChildTokenMappingSlot);
+            bytes32 data = bytes32(uint256(uint160(childAddress)));
+            vm.store(address(childERC20Bridge), slot, data);
+        }
+
         vm.expectRevert(ZeroAddress.selector);
         childAxelarBridgeAdaptor.execute(
             commandId,