feat: Athens 3 support

messaging/counter/contracts/CrossChainCounter.sol

@@ -38,7 +38,7 @@ contract CrossChainCounter is
         if (!_isValidChainId(destinationChainId))
             revert InvalidDestinationChainId();
 
-        uint256 crossChainGas = 18 * (10 ** 18);
+        uint256 crossChainGas = 2 * (10 ** 18);
         uint256 zetaValueAndGas = _zetaConsumer.getZetaFromEth{
             value: msg.value
         }(address(this), crossChainGas);

messaging/counter/hardhat.config.ts

@@ -1,23 +1,15 @@
 import "@nomicfoundation/hardhat-toolbox";
-import "./tasks/account";
-import "./tasks/faucet";
-import "./tasks/balances";
-import "./tasks/verify";
 import "./tasks/deploy";
 import "./tasks/counter_increment";
 import "./tasks/counter_show";
 
-import { getHardhatConfigNetworks } from "@zetachain/addresses-tools/dist/networks";
-import * as dotenv from "dotenv";
+import { getHardhatConfigNetworks } from "@zetachain/networks";
 import { HardhatUserConfig } from "hardhat/config";
-
-dotenv.config();
-const PRIVATE_KEYS =
-  process.env.PRIVATE_KEY !== undefined ? [`0x${process.env.PRIVATE_KEY}`] : [];
+import "@zetachain/toolkit/tasks";
 
 const config: HardhatUserConfig = {
   networks: {
-    ...getHardhatConfigNetworks(PRIVATE_KEYS),
+    ...getHardhatConfigNetworks(),
   },
   solidity: "0.8.7",
 };

messaging/counter/package.json

@@ -30,9 +30,11 @@
     "@typescript-eslint/parser": "^5.59.9",
     "@zetachain/addresses": "^0.0.9",
     "@zetachain/addresses-tools": "^0.0.7",
-    "@zetachain/faucet-cli": "1.3.5",
+    "@zetachain/faucet-cli": "^2.0.1",
     "@zetachain/interfaces": "^0.0.1",
-    "@zetachain/protocol-contracts": "^0.0.7",
+    "@zetachain/networks": "^2.3.0-athens3",
+    "@zetachain/protocol-contracts": "^1.0.0-athens3",
+    "@zetachain/toolkit": "^1.0.2-athens3",
     "axios": "^1.3.6",
     "chai": "^4.2.0",
     "dotenv": "^16.0.3",
@@ -54,4 +56,4 @@
     "typechain": "^8.1.0",
     "typescript": ">=4.5.0"
   }
-}
+}

messaging/counter/tasks/counter_increment.ts

@@ -21,16 +21,11 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
 
 Please, refer to ZetaChain's explorer for updates on the progress of the cross-chain transaction.
 
-🌍 Explorer: https://explorer.zetachain.com/cc/tx/${receipt.transactionHash}
+🌍 Explorer: https://athens3.explorer.zetachain.com/cc/tx/${receipt.transactionHash}
 `);
 };
 
-const descTask = `Sends a message from one chain to another.`;
-const descContractFlag = `Contract address`;
-const descDestinationFlag = `Destination chain ID (integer)`;
-const descAmountFlag = `Token amount to send`;
-
-task("counter:increment", descTask, main)
-  .addParam("contract", descContractFlag)
-  .addParam("amount", descAmountFlag)
-  .addParam("destination", descDestinationFlag);
+task("counter:increment", "Sends a message from one chain to another.", main)
+  .addParam("contract", "Contract address")
+  .addParam("amount", "Token amount to send")
+  .addParam("destination", "Destination chain ID (integer)");

messaging/counter/tasks/counter_show.ts

@@ -12,12 +12,12 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
 
   const counter = await contract.counter(signer.address);
 
-  console.log(`
-🔢 The counter for ${signer.address} is: ${counter.toString()}
+  console.log(`🔢 The counter for ${signer.address} is: ${counter.toString()}
 `);
 };
 
-const descTask = `Sends a message from one chain to another.`;
-const descContractFlag = `Contract address`;
-
-task("counter:show", descTask, main).addParam("contract", descContractFlag);
+task(
+  "counter:show",
+  "Sends a message from one chain to another.",
+  main
+).addParam("contract", "Contract address");

messaging/counter/tasks/deploy.ts

@@ -1,7 +1,8 @@
-import { getAddress, getChainId } from "@zetachain/addresses";
+import { getAddress } from "@zetachain/protocol-contracts";
 import { ethers } from "ethers";
 import { task } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { getSupportedNetworks } from "@zetachain/networks";
 
 const contractName = "CrossChainCounter";
 
@@ -23,7 +24,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
 // Initialize a wallet using a network configuration and a private key from
 // environment variables.
 const initWallet = (hre: HardhatRuntimeEnvironment, networkName: string) => {
-  const { url } = hre.config.networks[networkName];
+  const { url } = hre.config.networks[networkName] as any;
   const provider = new ethers.providers.JsonRpcProvider(url);
   const wallet = new ethers.Wallet(process.env.PRIVATE_KEY as string, provider);
 
@@ -38,41 +39,30 @@ const deployContract = async (
   networkName: string
 ) => {
   const wallet = initWallet(hre, networkName);
-  const zetaNetwork = "athens";
-  const connectorAddress = getAddress({
-    address: "connector",
-    networkName,
-    zetaNetwork,
-  });
-  const zetaTokenAddress = getAddress({
-    address: "zetaToken",
-    networkName,
-    zetaNetwork,
-  });
-  const zetaTokenConsumerV2 = getAddress({
-    address: "zetaTokenConsumerUniV2",
-    networkName,
-    zetaNetwork,
-  });
-  const zetaTokenConsumerV3 = getAddress({
-    address: "zetaTokenConsumerUniV3",
-    networkName,
-    zetaNetwork,
-  });
+
+  const connector = getAddress("connector", networkName as any);
+  const zetaToken = getAddress("zetaToken", networkName as any);
+  const zetaTokenConsumerUniV2 = getAddress(
+    "zetaTokenConsumerUniV2",
+    networkName as any
+  );
+  const zetaTokenConsumerUniV3 = getAddress(
+    "zetaTokenConsumerUniV3",
+    networkName as any
+  );
 
   const { abi, bytecode } = await hre.artifacts.readArtifact(contractName);
   const factory = new ethers.ContractFactory(abi, bytecode, wallet);
   const contract = await factory.deploy(
-    connectorAddress,
-    zetaTokenAddress,
-    zetaTokenConsumerV2 || zetaTokenConsumerV3
+    connector,
+    zetaToken,
+    zetaTokenConsumerUniV2 || zetaTokenConsumerUniV3
   );
 
   await contract.deployed();
   console.log(`
 🚀 Successfully deployed contract on ${networkName}.
-📜 Contract address: ${contract.address}
-`);
+📜 Contract address: ${contract.address}`);
   return contract.address;
 };
 
@@ -102,7 +92,7 @@ const setInteractors = async (
       ["address"],
       [contracts[counterparty]]
     );
-    const chainId = getChainId(counterparty as any);
+    const chainId = hre.config.networks[counterparty].chainId;
     await (
       await contract.setInteractorByChainId(chainId, counterpartyContract)
     ).wait();
@@ -112,7 +102,9 @@ const setInteractors = async (
   }
 };
 
-const descTask = `Deploy the contract`;
-const descNetworksFlag = `Comma separated list of networks to deploy to`;
-
-task("deploy", descTask).addParam("networks", descNetworksFlag).setAction(main);
+task("deploy", "Deploy the contract", main).addParam(
+  "networks",
+  `Comma separated list of networks to deploy to (e.g. ${getSupportedNetworks(
+    "ccm"
+  )})`
+);