feat: skip onZetaMessage and onZetaRevert if no args (#125)

zeta-chain · May 7, 2024 · d657a69 · d657a69
1 parent 03064a5
commit d657a69
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/packages/tasks/src/processTemplates.ts b/packages/tasks/src/processTemplates.ts
@@ -89,9 +89,12 @@ const prepareData = (args: any) => {
 
   const feesNative = args.fees === "native";
 
+  const argsListNotEmpty = argsList.length > 0;
+
   return {
     args,
     arguments: {
+      argsListNotEmpty,
       casts,
       feesNative,
       names,

diff --git a/packages/tasks/templates/messaging/contracts/{{contractName}}.sol.hbs b/packages/tasks/templates/messaging/contracts/{{contractName}}.sol.hbs
@@ -9,17 +9,16 @@ import "@zetachain/protocol-contracts/contracts/evm/interfaces/ZetaInterfaces.so
 import "@zetachain/protocol-contracts/contracts/evm/Zeta.eth.sol";
 {{/unless}}
 
-contract {{contractName}} is ZetaInteractor, ZetaReceiver {
-    error InvalidMessageType();
+contract {{contractName}} is ZetaInteractor{{#if arguments.argsListNotEmpty}}, ZetaReceiver{{/if}} {
     {{#unless arguments.feesNative}}
     error ErrorTransferringZeta();
     {{/unless}}
 
+    {{#if arguments.argsListNotEmpty}}
     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}}
+
     {{#if arguments.feesNative}}
     ZetaTokenConsumer private immutable _zetaConsumer;
     {{/if}}
@@ -53,37 +52,35 @@ contract {{contractName}} is ZetaInteractor, ZetaReceiver {
                 destinationChainId: destinationChainId,
                 destinationAddress: interactorsByChainId[destinationChainId],
                 destinationGasLimit: 300000,
-                message: abi.encode({{contractNameUnderscore}}_MESSAGE_TYPE{{#if arguments.pairs}}, {{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[0]}}{{/each}}{{/if}}),
+                message: abi.encode({{#if arguments.pairs}}{{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[0]}}{{/each}}{{/if}}),
                 zetaValueAndGas: zetaValueAndGas,
                 zetaParams: abi.encode("")
             })
         );
     }
 
+    {{#if arguments.argsListNotEmpty}}
+
     function onZetaMessage(
         ZetaInterfaces.ZetaMessage calldata zetaMessage
     ) external override isValidMessageCall(zetaMessage) {
-        (bytes32 messageType{{#if arguments.pairsWithDataLocation}}, {{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}}{{/each}}{{/if}}) = abi.decode(
-            zetaMessage.message, (bytes32{{#if arguments.pairs}}, {{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}}{{/if}})
+        ({{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}} {{/each}}) = abi.decode(
+            zetaMessage.message, ({{#if arguments.pairs}}{{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}}{{/if}})
         );
 
-        if (messageType != {{contractNameUnderscore}}_MESSAGE_TYPE)
-            revert InvalidMessageType();
-
         emit {{contractName}}Event({{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[0]}}{{/each}});
     }
 
     function onZetaRevert(
         ZetaInterfaces.ZetaRevert calldata zetaRevert
     ) external override isValidRevertCall(zetaRevert) {
-        (bytes32 messageType{{#if arguments.pairsWithDataLocation}}, {{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}}{{/each}}{{/if}}) = abi.decode(
+        ({{#if arguments.pairsWithDataLocation}}{{#each arguments.pairsWithDataLocation}}{{#if @index}}, {{/if}}{{this.[1]}} {{this.[0]}}{{/each}}{{/if}}) = abi.decode(
             zetaRevert.message,
-            (bytes32{{#if arguments.pairs}}, {{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}}{{/if}})
+            ({{#if arguments.pairs}}{{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[1]}}{{/each}}{{/if}})
         );
 
-        if (messageType != {{contractNameUnderscore}}_MESSAGE_TYPE)
-            revert InvalidMessageType();
-
         emit {{contractName}}RevertedEvent({{#each arguments.pairs}}{{#if @index}}, {{/if}}{{this.[0]}}{{/each}});
     }
+
+    {{/if}}
 }
diff --git a/packages/tasks/templates/messaging/tasks/deploy.ts.hbs b/packages/tasks/templates/messaging/tasks/deploy.ts.hbs
@@ -13,7 +13,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     networks.map(async (networkName: ParamChainName) => {
       contracts[networkName] = await deployContract(
         hre,
-        networkName,
+        networkName as ParamChainName,
         args.json,
         args.gasLimit
       );