Update contract

lib/index.ts

@@ -85,9 +85,18 @@ const prepareData = (args: any) => {
     return [n, `args.${p[0]}`];
   });
 
+  const feesNative = args.fees === "native";
+
   return {
     args,
-    arguments: { casts, names, pairs, pairsWithDataLocation, types },
+    arguments: {
+      casts,
+      names,
+      pairs,
+      pairsWithDataLocation,
+      types,
+      feesNative,
+    },
     contractName,
     contractNameUnderscore: camelToUnderscoreUpper(contractName),
   };

tasks/messaging.ts

@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import { task } from "hardhat/config";
+import { task, types } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import * as path from "path";
 
@@ -28,6 +28,12 @@ export const messagingTask = task(
   main
 )
   .addPositionalParam("name", "Name of the contract")
+  .addOptionalParam(
+    "fees",
+    "Use ZETA or native gas tokens for cross-chain fees",
+    "native",
+    types.string
+  )
   .addOptionalVariadicPositionalParam(
     "arguments",
     "Arguments for a crosschain call (e.g. dest:address to:bytes32 output:uint256)"

templates/messaging/contracts/{{contractName}}.sol.hbs

@@ -5,43 +5,48 @@ import "@openzeppelin/contracts/interfaces/IERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@zetachain/protocol-contracts/contracts/evm/tools/ZetaInteractor.sol";
 import "@zetachain/protocol-contracts/contracts/evm/interfaces/ZetaInterfaces.sol";
+{{#unless arguments.feesNative}}
+import "@zetachain/protocol-contracts/contracts/evm/Zeta.eth.sol";
+{{/unless}}
 
-interface {{contractName}}Errors {
+contract {{contractName}} is ZetaInteractor, ZetaReceiver {
     error InvalidMessageType();
-}
-
-contract {{contractName}} is
-    ZetaInteractor,
-    ZetaReceiver,
-    {{contractName}}Errors
-{
-    bytes32 public constant {{contractNameUnderscore}}_MESSAGE_TYPE =
-        keccak256("CROSS_CHAIN_{{contractNameUnderscore}}");
+    {{#unless arguments.feesNative}}
+    error ErrorTransferringZeta();
+    {{/unless}}
 
     event {{contractName}}Event({{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}});
     event {{contractName}}RevertedEvent({{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}});
 
+    bytes32 public constant {{contractNameUnderscore}}_MESSAGE_TYPE =
+        keccak256("CROSS_CHAIN_{{contractNameUnderscore}}");
+    {{#if arguments.feesNative}}
     ZetaTokenConsumer private immutable _zetaConsumer;
+    {{/if}}
     IERC20 internal immutable _zetaToken;
 
-    constructor(
-        address connectorAddress,
-        address zetaTokenAddress,
-        address zetaConsumerAddress
-    ) ZetaInteractor(connectorAddress) {
+    constructor(address connectorAddress, address zetaTokenAddress{{#if arguments.feesNative}}, address zetaConsumerAddress{{/if}}) ZetaInteractor(connectorAddress) {
         _zetaToken = IERC20(zetaTokenAddress);
+        {{#if arguments.feesNative}}
         _zetaConsumer = ZetaTokenConsumer(zetaConsumerAddress);
+        {{/if}}
     }
 
-    function sendMessage(uint256 destinationChainId{{#if arguments.pairsWithDataLocation}}, {{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}}{{/each}}{{/if}}) external payable {
+    function sendMessage(uint256 destinationChainId{{#unless arguments.feesNative}}, uint256 zetaValueAndGas{{/unless}}{{#if arguments.pairsWithDataLocation}}, {{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}}{{/each}}{{/if}}) external payable {
         if (!_isValidChainId(destinationChainId))
             revert InvalidDestinationChainId();
 
+        {{#if arguments.feesNative}}
         uint256 crossChainGas = 2 * (10 ** 18);
         uint256 zetaValueAndGas = _zetaConsumer.getZetaFromEth{
             value: msg.value
         }(address(this), crossChainGas);
         _zetaToken.approve(address(connector), zetaValueAndGas);
+        {{else}}
+        bool success1 = _zetaToken.approve(address(connector), zetaValueAndGas);
+        bool success2 = _zetaToken.transferFrom(msg.sender, address(this), zetaValueAndGas);
+        if (!(success1 && success2)) revert ErrorTransferringZeta();
+        {{/if}}
 
         connector.send(
             ZetaInterfaces.SendInput({