Call Contract with value

Author: yrong

contracts/src/AgentExecutor.sol

@@ -28,8 +28,8 @@ contract AgentExecutor {
         _transferToken(token, recipient, amount);
     }
 
-    function callContract(address target, bytes memory data) external {
-        bool success = Call.safeCall(target, data);
+    function callContract(address target, bytes memory data, uint256 value) external {
+        bool success = Call.safeCall(target, data, value);
         if (!success) {
             revert();
         }

contracts/src/utils/Call.sol

@@ -33,14 +33,14 @@ library Call {
      * @param target   Address to call
      * @param data Calldata to pass to the call
      */
-    function safeCall(address target, bytes memory data) internal returns (bool) {
+    function safeCall(address target, bytes memory data, uint256 value) internal returns (bool) {
         bool success;
         assembly {
             success :=
                 call(
                     gas(), // gas
                     target, // recipient
-                    0, // ether value
+                    value, // ether value
                     add(data, 0x20), // inloc
                     mload(data), // inlen
                     0, // outloc

contracts/src/v2/Handlers.sol

@@ -88,7 +88,7 @@ library HandlersV2 {
         CallContractParams memory params = abi.decode(data, (CallContractParams));
         address agent = Functions.ensureAgent(origin);
         bytes memory call =
-            abi.encodeCall(AgentExecutor.callContract, (params.target, params.data));
+            abi.encodeCall(AgentExecutor.callContract, (params.target, params.data, params.value));
         Functions.invokeOnAgent(agent, executor, call);
     }
 }

contracts/src/v2/Types.sol

@@ -94,4 +94,6 @@ struct CallContractParams {
     address target;
     // Call data
     bytes data;
+    // Ether value
+    uint256 value;
 }

contracts/test/GatewayV2.t.sol

@@ -62,6 +62,8 @@ import {
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
 
+import {HelloWorld} from "./mocks/HelloWorld.sol";
+
 contract GatewayV2Test is Test {
     // Emitted when token minted/burnt/transfered
     event Transfer(address indexed from, address indexed to, uint256 value);
@@ -86,6 +88,10 @@ contract GatewayV2Test is Test {
     // tokenID for DOT
     bytes32 public dotTokenID;
 
+    HelloWorld public helloWorld;
+
+    event SaidHello(string indexed message);
+
     function setUp() public {
         token = new WETH9();
         AgentExecutor executor = new AgentExecutor();
@@ -132,6 +138,8 @@ contract GatewayV2Test is Test {
         token.deposit{value: 500}();
 
         dotTokenID = bytes32(uint256(1));
+
+        helloWorld = new HelloWorld();
     }
 
     function recipientAddress32() internal pure returns (MultiAddress memory) {
@@ -172,6 +180,21 @@ contract GatewayV2Test is Test {
         return commands;
     }
 
+    function makeCallContractCommand(uint256 value) public view returns (CommandV2[] memory) {
+        bytes memory data = abi.encodeWithSignature("sayHello(string)", "World");
+        CallContractParams memory params = CallContractParams({
+            target: address(helloWorld),
+            data: data,
+            value: value
+        });
+        bytes memory payload = abi.encode(params);
+
+        CommandV2[] memory commands = new CommandV2[](1);
+        commands[0] =
+            CommandV2({kind: CommandKind.CallContract, gas: 500_000, payload: payload});
+        return commands;
+    }
+
     /**
      * Message Verification
      */
@@ -289,4 +312,22 @@ contract GatewayV2Test is Test {
             message, proof, makeMockProof(), relayerRewardAddress
         );
     }
+
+    function testAgentCallContractSuccess() public {
+        vm.expectEmit(true, false, false, true);
+        emit IGatewayV2.InboundMessageDispatched(1, true, relayerRewardAddress);
+
+        vm.deal(assetHubAgent, 1 ether);
+        hoax(relayer, 1 ether);
+        IGatewayV2(address(gateway)).v2_submit(
+            InboundMessageV2({
+                origin: Constants.ASSET_HUB_AGENT_ID,
+                nonce: 1,
+                commands: makeCallContractCommand(0.1 ether)
+            }),
+            proof,
+            makeMockProof(),
+            relayerRewardAddress
+        );
+    }
 }

contracts/test/mocks/HelloWorld.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.25;
+
+contract HelloWorld {
+    event SaidHello(string indexed message);
+
+    error Unauthorized();
+
+    function sayHello(string memory _text) payable public {
+        string memory fullMessage = string(abi.encodePacked("Hello there, ", _text));
+        emit SaidHello(fullMessage);
+    }
+
+    function revertUnauthorized() public pure {
+        revert Unauthorized();
+    }
+
+    function retBomb() public pure returns (bytes memory) {
+        assembly {
+            return(1, 3000000)
+        }
+    }
+}