fix: use correct param oder in messaging example constructor (#303)

Author: fadeev

examples/messaging/commands/deploy.ts

@@ -11,8 +11,8 @@ const main = async (options: any) => {
   const contractFactory = new ethers.ContractFactory(abi, bytecode, signer);
 
   const contract = await contractFactory.deploy(
+    signer.address,
     options.gateway,
-    signer.address, // owner
     options.router
   );
 

examples/messaging/contracts/Messaging.sol

@@ -10,10 +10,10 @@ contract Example is Messaging {
     event OnRevertEventEVM();
 
     constructor(
-        address payable _gateway,
         address owner,
+        address payable _gateway,
         address _router
-    ) Messaging(_gateway, owner, _router) {}
+    ) Messaging(owner, _gateway, _router) {}
 
     function onMessageReceive(
         bytes memory data,

examples/messaging/foundry.toml

@@ -3,7 +3,6 @@ src = 'contracts'
 out = 'out'
 viaIR = true
 libs = ['node_modules', "dependencies"]
-evm_version = "paris"
 test = 'test'
 cache_path  = 'cache_forge'
 verbosity = 3

examples/messaging/hardhat.config.ts

@@ -15,6 +15,7 @@ const config: HardhatUserConfig = {
     compilers: [
       {
         settings: {
+          evmVersion: "cancun",
           optimizer: {
             enabled: true,
             runs: 1000,

examples/messaging/package.json

@@ -58,7 +58,7 @@
     "@solana-developers/helpers": "^2.4.0",
     "@solana/spl-memo": "^0.2.5",
     "@solana/web3.js": "^1.95.8",
-    "@zetachain/protocol-contracts": "13.0.0",
+    "@zetachain/protocol-contracts": "14.1.0",
     "@zetachain/standard-contracts": "^4.1.0",
     "@zetachain/toolkit": "^16.2.2",
     "commander": "^13.1.0",

examples/messaging/scripts/localnet.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -exo pipefail
+
+yarn zetachain localnet start --force-kill --no-analytics &
+
+REGISTRY_FILE="$HOME/.zetachain/localnet/registry.json"
+while [ ! -f "$REGISTRY_FILE" ]; do sleep 1; done
+
+forge soldeer update
+
+forge build
+
+ZRC20_ETHEREUM=$(jq -r '."11155112".zrc20Tokens[] | select(.symbol=="ETH.ETH") | .address' "$REGISTRY_FILE")
+USDC_ETHEREUM=$(jq -r '."11155112".zrc20Tokens[] | select(.symbol=="USDC.ETH") | .originAddress' "$REGISTRY_FILE")
+ZRC20_USDC_BNB=$(jq -r '."98".zrc20Tokens[] | select(.symbol=="USDC.BNB") | .address' "$REGISTRY_FILE")
+ZRC20_BNB=$(jq -r '."98".zrc20Tokens[] | select(.symbol=="BNB.BNB") | .address' "$REGISTRY_FILE")
+GATEWAY_ETHEREUM=$(jq -r '."11155112".contracts[] | select(.contractType=="gateway") | .address' "$REGISTRY_FILE")
+GATEWAY_ZETACHAIN=$(jq -r '."31337".contracts[] | select(.contractType=="gateway") | .address' "$REGISTRY_FILE")
+GATEWAY_BNB=$(jq -r '."98".contracts[] | select(.contractType=="gateway") | .address' "$REGISTRY_FILE")
+PRIVATE_KEY=$(jq -r '.private_keys[0]' ~/.zetachain/localnet/anvil.json) && echo $PRIVATE_KEY
+DEPLOYER_ADDRESS=$(cast wallet address $PRIVATE_KEY)
+
+CONTRACT_ZETACHAIN=$(forge create --broadcast --json test/UniversalRouter.sol:UniversalRouter --rpc-url http://localhost:8545 --private-key $PRIVATE_KEY --constructor-args $DEPLOYER_ADDRESS | jq -r '.deployedTo')
+
+CONTRACT_ETHEREUM=$(npx tsx commands deploy --rpc http://localhost:8545 --gateway "$GATEWAY_ETHEREUM" --router "$CONTRACT_ZETACHAIN" --private-key $PRIVATE_KEY | jq -r '.contractAddress')
+
+CONTRACT_BNB=$(npx tsx commands deploy --rpc http://localhost:8545 --gateway "$GATEWAY_BNB" --router "$CONTRACT_ZETACHAIN" --private-key $PRIVATE_KEY | jq -r '.contractAddress')
+
+npx tsx commands connect --rpc http://localhost:8545 --private-key $PRIVATE_KEY --contract "$CONTRACT_ETHEREUM" --target-chain-id 98 --target-contract "$CONTRACT_BNB"
+npx tsx commands connect --rpc http://localhost:8545 --private-key $PRIVATE_KEY --contract "$CONTRACT_BNB"  --target-chain-id 11155112 --target-contract "$CONTRACT_ETHEREUM"
+
+# Gas
+npx tsx commands message --rpc http://localhost:8545 --private-key $PRIVATE_KEY --contract "$CONTRACT_ETHEREUM" --target-contract "$CONTRACT_BNB" --amount 1 --call-on-revert --revert-address "$CONTRACT_ETHEREUM" --revert-message "hello" --types string --values alice --target-token "$ZRC20_BNB"
+
+npx zetachain localnet check
+
+# Source ERC-20
+npx tsx commands message --rpc http://localhost:8545 --private-key $PRIVATE_KEY --contract "$CONTRACT_ETHEREUM" --target-contract "$CONTRACT_BNB" --amount 1 --call-on-revert --revert-address "$CONTRACT_ETHEREUM" --revert-message "hello" --types string --values alice --erc20 "$USDC_ETHEREUM" --target-token "$ZRC20_BNB"
+
+npx zetachain localnet check
+
+yarn zetachain localnet stop

examples/messaging/test/UniversalRouter.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+import {UniversalRouter as UniversalRouterImport} from "@zetachain/standard-contracts/contracts/messaging/contracts/UniversalRouter.sol";
+
+contract UniversalRouter is UniversalRouterImport {
+    constructor(address owner) UniversalRouterImport(owner) {}
+}

scripts/build.sh

@@ -6,7 +6,8 @@ rm -rf typescript-types && mkdir typescript-types
 for dir in ./examples/*/; do
   subdir=$(echo $dir | cut -d'/' -f2)
 
-  cd $dir && yarn && npx hardhat compile --force && cp -r artifacts/contracts/* ../../abi/$subdir/ && cd ../../;           
+  echo "Building $subdir"
+  (cd $dir && yarn && npx hardhat compile --force && cp -r artifacts/contracts/* ../../abi/$subdir/)
 done
 
 find ./abi/ -name '*.dbg.json' -exec rm {} \;