remove hard coded arbitrum

marsfoundation · Mar 26, 2024 · 37f0979 · 37f0979
1 parent 978025b
commit 37f0979
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 53 deletions.
diff --git a/src/XChainForwarders.sol b/src/XChainForwarders.sol
@@ -104,24 +104,6 @@ library XChainForwarders {
         );
     }
 
-    function sendMessageArbitrum(
-        address l1CrossDomain,
-        address target,
-        bytes memory message,
-        uint256 gasLimit
-    ) internal {
-        sendMessageArbitrum(
-            l1CrossDomain,
-            target,
-            message,
-            gasLimit,
-            // These constants are reasonable estimates based on current market conditions
-            // They can be updated as needed
-            1 gwei,
-            block.basefee + 10 gwei
-        );
-    }
-
     function sendMessageArbitrumOne(
         address target,
         bytes memory message,
@@ -139,22 +121,6 @@ library XChainForwarders {
         );
     }
 
-    function sendMessageArbitrumOne(
-        address target,
-        bytes memory message,
-        uint256 gasLimit
-    ) internal {
-        sendMessageArbitrumOne(
-            target,
-            message,
-            gasLimit,
-            // These constants are reasonable estimates based on current market conditions
-            // They can be updated as needed
-            1 gwei,
-            block.basefee + 10 gwei
-        );
-    }
-
     function sendMessageArbitrumNova(
         address target,
         bytes memory message,
@@ -172,22 +138,6 @@ library XChainForwarders {
         );
     }
 
-    function sendMessageArbitrumNova(
-        address target,
-        bytes memory message,
-        uint256 gasLimit
-    ) internal {
-        sendMessageArbitrumNova(
-            target,
-            message,
-            gasLimit,
-            // These constants are reasonable estimates based on current market conditions
-            // They can be updated as needed
-            1 gwei,
-            block.basefee + 10 gwei
-        );
-    }
-
     /// ================================ Gnosis ================================
 
     function sendMessageGnosis(

diff --git a/test/ArbitrumIntegration.t.sol b/test/ArbitrumIntegration.t.sol
@@ -62,13 +62,17 @@ contract ArbitrumIntegrationTest is IntegrationBaseTest {
             address(arbitrum.INBOX()),
             address(moArbitrum),
             abi.encodeWithSelector(MessageOrdering.push.selector, 1),
-            100000
+            100000,
+            1 gwei,
+            block.basefee + 10 gwei
         );
         XChainForwarders.sendMessageArbitrum(
             address(arbitrum.INBOX()),
             address(moArbitrum),
             abi.encodeWithSelector(MessageOrdering.push.selector, 2),
-            100000
+            100000,
+            1 gwei,
+            block.basefee + 10 gwei
         );
         vm.stopPrank();
 
@@ -92,7 +96,9 @@ contract ArbitrumIntegrationTest is IntegrationBaseTest {
             address(arbitrum.INBOX()),
             address(moArbitrum),
             abi.encodeWithSelector(MessageOrdering.push.selector, 999),
-            100000
+            100000,
+            1 gwei,
+            block.basefee + 10 gwei
         );
         vm.stopPrank();