Rename to maxDispatchGas

Snowfork · May 2, 2024 · 27c14e9 · 27c14e9
1 parent 7880d46
commit 27c14e9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/contracts/src/AgentExecutor.sol b/contracts/src/AgentExecutor.sol
@@ -40,7 +40,8 @@ contract AgentExecutor {
     }
 
     /// @dev Call a contract at the given address, with provided bytes as payload.
-    function executeCall(address target, bytes memory payload, uint64 dynamicGas) external returns (bool) {
-        return target.safeCall(dynamicGas, 0, payload);
+    /// The safeCall here performs a low level call without copying any returndata for the return bomb attack
+    function executeCall(address target, bytes memory payload, uint64 maxDispatchGas) external returns (bool) {
+        return target.safeCall(maxDispatchGas, 0, payload);
     }
 }
diff --git a/contracts/src/Gateway.sol b/contracts/src/Gateway.sol
@@ -412,7 +412,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         TransactCallParams memory params = abi.decode(data, (TransactCallParams));
         address agent = _ensureAgent(params.agentID);
         bytes memory call =
-            abi.encodeCall(AgentExecutor.executeCall, (params.target, params.payload, params.dynamicGas));
+            abi.encodeCall(AgentExecutor.executeCall, (params.target, params.payload, params.maxDispatchGas));
         (, bytes memory result) = Agent(payable(agent)).invoke(AGENT_EXECUTOR, call);
         (bool success) = abi.decode(result, (bool));
         if (!success) {

diff --git a/contracts/src/Params.sol b/contracts/src/Params.sol
@@ -92,5 +92,5 @@ struct TransactCallParams {
     /// @dev Payload of the call
     bytes payload;
     /// @dev Max gas cost of the call
-    uint64 dynamicGas;
+    uint64 maxDispatchGas;
 }
diff --git a/contracts/test/Gateway.t.sol b/contracts/test/Gateway.t.sol
@@ -873,7 +873,7 @@ contract GatewayTest is Test {
             agentID: assetHubAgentID,
             target: address(helloWorld),
             payload: payload,
-            dynamicGas: 100000
+            maxDispatchGas: 100000
         });
 
         // Expect the HelloWorld contract to emit `SaidHello`
@@ -890,7 +890,7 @@ contract GatewayTest is Test {
             agentID: assetHubAgentID,
             target: address(helloWorld),
             payload: payload,
-            dynamicGas: 100000
+            maxDispatchGas: 100000
         });
 
         vm.expectRevert(abi.encodeWithSelector(Gateway.AgentTransactCallFailed.selector));
@@ -905,7 +905,7 @@ contract GatewayTest is Test {
             agentID: assetHubAgentID,
             target: address(helloWorld),
             payload: payload,
-            dynamicGas: 100000
+            maxDispatchGas: 100000
         });
 
         vm.expectRevert(abi.encodeWithSelector(Gateway.AgentTransactCallFailed.selector));
@@ -923,8 +923,12 @@ contract GatewayTest is Test {
         uint256 amount = 50;
         bytes memory payload = abi.encodeCall(IERC20.transfer, (account1, amount));
 
-        TransactCallParams memory params =
-            TransactCallParams({agentID: assetHubAgentID, target: address(token), payload: payload, dynamicGas: 100000});
+        TransactCallParams memory params = TransactCallParams({
+            agentID: assetHubAgentID,
+            target: address(token),
+            payload: payload,
+            maxDispatchGas: 100000
+        });
 
         MockGateway(address(gateway)).transactPublic(abi.encode(params));