Authenticated call support

examples/hello/contracts/Echo.sol

@@ -9,6 +9,7 @@ contract Echo {
 
     event RevertEvent(string, RevertContext);
     event HelloEvent(string, string);
+    event ReceivedOnCall(address sender, bytes message);
 
     constructor(address payable gatewayAddress) {
         gateway = GatewayEVM(gatewayAddress);
@@ -30,6 +31,14 @@ contract Echo {
         gateway.call(receiver, message, revertOptions);
     }
 
+    function onCall(
+        MessageContext calldata messageContext,
+        bytes calldata message
+    ) external payable returns (bytes memory) {
+        emit ReceivedOnCall(messageContext.sender, message);
+        return "";
+    }
+
     receive() external payable {}
 
     fallback() external payable {}

examples/hello/contracts/Hello.sol

@@ -17,8 +17,8 @@ contract Hello is UniversalContract {
         gateway = GatewayZEVM(gatewayAddress);
     }
 
-    function onCrossChainCall(
-        zContext calldata context,
+    function onCall(
+        MessageContext calldata context,
         address zrc20,
         uint256 amount,
         bytes calldata message
@@ -27,34 +27,36 @@ contract Hello is UniversalContract {
         emit HelloEvent("Hello on ZetaChain", name);
     }
 
-    function onRevert(RevertContext calldata revertContext) external override {
+    function onRevert(RevertContext calldata revertContext) external {
         emit RevertEvent("Revert on ZetaChain", revertContext);
     }
 
     function call(
         bytes memory receiver,
         address zrc20,
         bytes calldata message,
-        uint256 gasLimit,
+        CallOptions memory callOptions,
         RevertOptions memory revertOptions
     ) external {
-        (, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(gasLimit);
+        (, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(
+            callOptions.gasLimit
+        );
         if (!IZRC20(zrc20).transferFrom(msg.sender, address(this), gasFee))
             revert TransferFailed();
         IZRC20(zrc20).approve(address(gateway), gasFee);
-        gateway.call(receiver, zrc20, message, gasLimit, revertOptions);
+        gateway.call(receiver, zrc20, message, callOptions, revertOptions);
     }
 
     function withdrawAndCall(
         bytes memory receiver,
         uint256 amount,
         address zrc20,
         bytes calldata message,
-        uint256 gasLimit,
+        CallOptions memory callOptions,
         RevertOptions memory revertOptions
     ) external {
         (address gasZRC20, uint256 gasFee) = IZRC20(zrc20)
-            .withdrawGasFeeWithGasLimit(gasLimit);
+            .withdrawGasFeeWithGasLimit(callOptions.gasLimit);
         uint256 target = zrc20 == gasZRC20 ? amount + gasFee : amount;
         if (!IZRC20(zrc20).transferFrom(msg.sender, address(this), target))
             revert TransferFailed();
@@ -74,7 +76,7 @@ contract Hello is UniversalContract {
             amount,
             zrc20,
             message,
-            gasLimit,
+            callOptions,
             revertOptions
         );
     }

examples/hello/package.json

@@ -57,6 +57,6 @@
     "@solana-developers/helpers": "^2.4.0",
     "@solana/spl-memo": "^0.2.5",
     "@solana/web3.js": "^1.95.2",
-    "@zetachain/protocol-contracts": "10.0.0-rc10"
+    "@zetachain/protocol-contracts": "11.0.0-rc3"
   }
-}
+}

examples/hello/tasks/deploy.ts

@@ -32,5 +32,5 @@ task("deploy", "Deploy the contract", main)
   .addOptionalParam(
     "gateway",
     "Gateway address (default: ZetaChain Gateway)",
-    "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0"
+    "0x9A676e781A523b5d0C0e43731313A708CB607508"
   );

examples/hello/tasks/echoCall.ts

@@ -60,7 +60,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
 
   console.log(`Transaction hash: ${tx.hash}`);
   await tx.wait();
-  console.log("gatewayCall executed successfully");
 };
 
 task("echo-call", "Calls the gateway on a contract on EVM", main)

examples/hello/tasks/helloCall.ts

@@ -21,7 +21,10 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     ),
   };
 
-  const functionSignature = ethers.utils.id(args.function).slice(0, 10);
+  const callOptions = {
+    gasLimit: args.txOptionsGasLimit,
+    isArbitraryCall: args.isArbitraryCall,
+  };
 
   const types = JSON.parse(args.types);
 
@@ -46,14 +49,23 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
       return value;
     }
   });
+
   const encodedParameters = ethers.utils.defaultAbiCoder.encode(
     types,
     valuesArray
   );
 
-  const message = ethers.utils.hexlify(
-    ethers.utils.concat([functionSignature, encodedParameters])
-  );
+  let message: string;
+
+  if (args.isArbitraryCall) {
+    const functionSignature = ethers.utils.id(args.function).slice(0, 10);
+
+    message = ethers.utils.hexlify(
+      ethers.utils.concat([functionSignature, encodedParameters])
+    );
+  } else {
+    message = encodedParameters;
+  }
 
   const gasLimit = hre.ethers.BigNumber.from(args.txOptionsGasLimit);
   const zrc20 = new ethers.Contract(args.zrc20, ZRC20ABI.abi, signer);
@@ -69,14 +81,13 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     ethers.utils.hexlify(args.receiver),
     args.zrc20,
     message,
-    gasLimit,
+    callOptions,
     revertOptions,
     txOptions
   );
 
   console.log(`Transaction hash: ${tx.hash}`);
   await tx.wait();
-  console.log("gatewayCall executed successfully");
 };
 
 task(
@@ -115,7 +126,8 @@ task(
     7000000,
     types.int
   )
-  .addParam("function", `Function to call (example: "hello(string)")`)
   .addParam("name", "The name of the contract", "Hello")
+  .addOptionalParam("function", `Function to call (example: "hello(string)")`)
+  .addFlag("isArbitraryCall", "Whether the call is arbitrary")
   .addParam("types", `The types of the parameters (example: '["string"]')`)
   .addVariadicPositionalParam("values", "The values of the parameters");

examples/hello/tasks/helloWithdrawAndCall.ts

@@ -21,7 +21,10 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     ),
   };
 
-  const functionSignature = ethers.utils.id(args.function).slice(0, 10);
+  const callOptions = {
+    gasLimit: args.txOptionsGasLimit,
+    isArbitraryCall: args.isArbitraryCall,
+  };
 
   const types = JSON.parse(args.types);
 
@@ -46,14 +49,23 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
       return value;
     }
   });
+
   const encodedParameters = ethers.utils.defaultAbiCoder.encode(
     types,
     valuesArray
   );
 
-  const message = ethers.utils.hexlify(
-    ethers.utils.concat([functionSignature, encodedParameters])
-  );
+  let message: string;
+
+  if (args.isArbitraryCall) {
+    const functionSignature = ethers.utils.id(args.function).slice(0, 10);
+
+    message = ethers.utils.hexlify(
+      ethers.utils.concat([functionSignature, encodedParameters])
+    );
+  } else {
+    message = encodedParameters;
+  }
 
   const gasLimit = hre.ethers.BigNumber.from(args.txOptionsGasLimit);
 
@@ -86,14 +98,13 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     amount,
     args.zrc20,
     message,
-    gasLimit,
+    callOptions,
     revertOptions,
     txOptions
   );
 
   console.log(`Transaction hash: ${tx.hash}`);
   await tx.wait();
-  console.log("gatewayCall executed successfully");
 };
 
 task(
@@ -132,8 +143,9 @@ task(
     7000000,
     types.int
   )
-  .addParam("function", `Function to call (example: "hello(string)")`)
+  .addOptionalParam("function", `Function to call (example: "hello(string)")`)
   .addParam("name", "The name of the contract", "Hello")
+  .addFlag("isArbitraryCall", "Whether the call is arbitrary")
   .addParam("amount", "Amount of ZRC-20 to withdraw")
   .addParam("types", `The types of the parameters (example: '["string"]')`)
   .addVariadicPositionalParam("values", "The values of the parameters");