merge main

data/addresses.json

@@ -1,10 +1,17 @@
 {
   "ccm": {
     "bsc_mainnet": {
+<<<<<<< HEAD
       "connector": "0x000063A6e758D9e2f438d430108377564cf4077D",
       "erc20Custody": "0x00000fF8fA992424957F97688015814e707A0115",
       "immutableCreate2Factory": "",
       "tss": "0x70e967acFcC17c3941E87562161406d41676FD83",
+=======
+      "connector": "",
+      "erc20Custody": "",
+      "immutableCreate2Factory": "",
+      "tss": "",
+>>>>>>> main
       "tssUpdater": "",
       "zetaToken": "0x0000028a2eB8346cd5c0267856aB7594B7a55308"
     },
@@ -37,12 +44,12 @@
       "zetaTokenConsumerUniV3": ""
     },
     "eth_mainnet": {
-      "connector": "0x000007Cf399229b2f5A4D043F20E90C9C98B7C6a",
-      "erc20Custody": "0x0000030Ec64DF25301d8414eE5a29588C4B0dE10",
+      "connector": "",
+      "erc20Custody": "",
       "immutableCreate2Factory": "",
-      "tss": "0x70e967acFcC17c3941E87562161406d41676FD83",
+      "tss": "",
       "tssUpdater": "",
-      "zetaToken": "0xf091867EC603A6628eD83D274E835539D82e9cc8"
+      "zetaToken": ""
     },
     "goerli_testnet": {
       "connector": "0x00005e3125aba53c5652f9f0ce1a4cf91d8b15ea",
@@ -153,4 +160,4 @@
       "uniswapv2Router02": "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe"
     }
   }
-}
+}

hardhat.config.ts

@@ -1,5 +1,5 @@
 import "@nomiclabs/hardhat-waffle";
-import "@nomiclabs/hardhat-etherscan";
+import "@nomicfoundation/hardhat-verify";
 import "@typechain/hardhat";
 import "tsconfig-paths/register";
 import "hardhat-abi-exporter";
@@ -16,6 +16,7 @@ const config: HardhatUserConfig = {
   etherscan: {
     apiKey: {
       // BSC
+      bsc: process.env.BSCSCAN_API_KEY || "",
       bscTestnet: process.env.BSCSCAN_API_KEY || "",
       // ETH
       goerli: process.env.ETHERSCAN_API_KEY || "",

lib/contracts.constants.ts

@@ -5,16 +5,66 @@ export const ZETA_INITIAL_SUPPLY = 2_100_000_000;
 export const MAX_ETH_ADDRESS = "0xffffffffffffffffffffffffffffffffffffffff";
 
 // dev: this values should be calculated using get-salt script
-export const ZETA_TOKEN_SALT_NUMBER_ETH = "84108";
-export const ZETA_TOKEN_SALT_NUMBER_NON_ETH = "29265";
+const SALT_NUMBERS = {
+  baobab_testnet: {
+    zetaConnector: "71733",
+    zetaConsumer: "0",
+    zetaERC20Custody: "195084",
+    zetaToken: "29265",
+  },
+  bsc_mainnet: {
+    zetaConnector: "71733",
+    zetaConsumer: "0",
+    zetaERC20Custody: "195084",
+    zetaToken: "29265",
+  },
+  bsc_testnet: {
+    zetaConnector: "71733",
+    zetaConsumer: "0",
+    zetaERC20Custody: "195084",
+    zetaToken: "29265",
+  },
+  btc_testnet: {
+    zetaConnector: "",
+    zetaConsumer: "",
+    zetaERC20Custody: "",
+    zetaToken: "",
+  },
+  eth_mainnet: {
+    zetaConnector: "84286",
+    zetaConsumer: "0",
+    zetaERC20Custody: "926526",
+    zetaToken: "0",
+  },
+  goerli_testnet: {
+    zetaConnector: "1414",
+    zetaConsumer: "0",
+    zetaERC20Custody: "87967",
+    zetaToken: "84108",
+  },
+  mumbai_testnet: {
+    zetaConnector: "71733",
+    zetaConsumer: "0",
+    zetaERC20Custody: "195084",
+    zetaToken: "29265",
+  },
+  zeta_testnet: {
+    zetaConnector: "71733",
+    zetaConsumer: "0",
+    zetaERC20Custody: "195084",
+    zetaToken: "29265",
+  },
+};
 
-// dev: this values should be calculated using get-salt script
-export const ZETA_CONNECTOR_SALT_NUMBER_ETH = "1414";
-export const ZETA_CONNECTOR_SALT_NUMBER_NON_ETH = "71733";
+export const getSaltNumber = (contractName: string, networkName: string) => {
+  const saltNumber = SALT_NUMBERS[networkName][contractName];
+
+  if (!saltNumber) {
+    throw new Error(`Salt number for ${contractName} on ${networkName} is not defined.`);
+  }
+
+  return saltNumber;
+};
 
-export const ERC20_CUSTODY_SALT_NUMBER_ETH = "87967";
-export const ERC20_CUSTODY_SALT_NUMBER_NON_ETH = "195084";
 export const ERC20_CUSTODY_ZETA_FEE = "0";
 export const ERC20_CUSTODY_ZETA_MAX_FEE = parseEther("1000");
-
-export const ZETA_CONSUMER_SALT_NUMBER = "0";

lib/contracts.helpers.ts

@@ -24,10 +24,7 @@ import { BaseContract, ContractFactory } from "ethers";
 import { ethers } from "hardhat";
 
 export const isEthNetworkName = (networkName: string) =>
-  networkName === "eth-localnet" ||
-  networkName === "goerli_testnet" ||
-  networkName === "eth_mainnet" ||
-  networkName === "bsc_mainnet";
+  networkName === "eth-localnet" || networkName === "goerli_testnet" || networkName === "eth_mainnet";
 
 export const deployZetaConnectorBase = async ({ args }: { args: Parameters<ZetaConnectorBaseFactory["deploy"]> }) => {
   const Factory = (await ethers.getContractFactory("ZetaConnectorBase")) as ZetaConnectorBaseFactory;

lib/deterministic-deploy.helpers.ts

@@ -1,21 +1,23 @@
 import { BigNumber } from "ethers";
+import { getAddress } from "lib";
 
-import { getAddress } from "../lib/address.helpers";
 import { MAX_ETH_ADDRESS } from "../lib/contracts.constants";
 import {
   buildBytecode,
   buildCreate2Address,
   saltToHex,
 } from "../lib/ImmutableCreate2Factory/ImmutableCreate2Factory.helpers";
+import { ZetaProtocolNetwork } from "./address.tools";
 
 export const calculateBestSalt = async (
   maxIterations: BigNumber,
   deployerAddress: string,
   constructorTypes: string[],
   constructorArgs: string[],
-  contractBytecode: string
+  contractBytecode: string,
+  network: ZetaProtocolNetwork
 ) => {
-  const immutableCreate2Factory = getAddress("immutableCreate2Factory");
+  const immutableCreate2Factory = getAddress("immutableCreate2Factory", network);
 
   let minAddress = MAX_ETH_ADDRESS;
   let minAddressSalt = "";

package.json

@@ -8,7 +8,7 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "^2.0.0",
     "@nomiclabs/hardhat-ethers": "^2.0.5",
-    "@nomiclabs/hardhat-etherscan": "3.0.3",
+    "@nomicfoundation/hardhat-verify": "2.0.3",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@openzeppelin/contracts": "^4.8.3",
     "@typechain/ethers-v5": "^10.1.0",

scripts/deployments/core/deploy.ts

@@ -1,29 +1,18 @@
 import { network } from "hardhat";
 
 import { isProtocolNetworkName } from "../../../lib/address.tools";
-import { isEthNetworkName } from "../../../lib/contracts.helpers";
-import { setZetaAddresses } from "../../tools/set-zeta-token-addresses";
-import { deployZetaConnector } from "./deploy-zeta-connector";
-import { deployZetaToken } from "./deploy-zeta-token";
+import { deterministicDeployERC20Custody } from "./deterministic-deploy-erc20-custody";
+import { deterministicDeployZetaConnector } from "./deterministic-deploy-zeta-connector";
+import { deterministicDeployZetaToken } from "./deterministic-deploy-zeta-token";
 
 const networkName = network.name;
 
 async function main() {
   if (!isProtocolNetworkName(networkName)) throw new Error("Invalid network name");
 
-  const zetaTokenAddress = await deployZetaToken();
-  const connectorAddress = await deployZetaConnector();
-
-  /**
-   * @description The Eth implementation of Zeta token doesn't need any address
-   */
-  if (isEthNetworkName(network.name)) return;
-
-  /**
-   * @description Avoid setting Zeta addresses for local network,
-   * since it must be done after starting the local Zeta node
-   */
-  await setZetaAddresses(connectorAddress, zetaTokenAddress);
+  await deterministicDeployZetaToken();
+  await deterministicDeployZetaConnector();
+  await deterministicDeployERC20Custody();
 }
 
 main()

scripts/deployments/core/deterministic-deploy-erc20-custody.ts

@@ -2,13 +2,7 @@ import { BigNumber } from "ethers";
 import { ethers, network } from "hardhat";
 import { getAddress, isProtocolNetworkName } from "lib";
 
-import {
-  ERC20_CUSTODY_SALT_NUMBER_ETH,
-  ERC20_CUSTODY_SALT_NUMBER_NON_ETH,
-  ERC20_CUSTODY_ZETA_FEE,
-  ERC20_CUSTODY_ZETA_MAX_FEE,
-} from "../../../lib/contracts.constants";
-import { isEthNetworkName } from "../../../lib/contracts.helpers";
+import { ERC20_CUSTODY_ZETA_FEE, ERC20_CUSTODY_ZETA_MAX_FEE, getSaltNumber } from "../../../lib/contracts.constants";
 import {
   deployContractToAddress,
   saltToHex,
@@ -22,6 +16,7 @@ export const deterministicDeployERC20Custody = async () => {
 
   const accounts = await ethers.getSigners();
   const [signer] = accounts;
+  const initialBalance = await signer.getBalance();
 
   const DEPLOYER_ADDRESS = process.env.DEPLOYER_ADDRESS || signer.address;
 
@@ -30,7 +25,7 @@ export const deterministicDeployERC20Custody = async () => {
   const tssUpdaterAddress = getAddress("tssUpdater", network.name);
   const immutableCreate2FactoryAddress = getAddress("immutableCreate2Factory", network.name);
 
-  const saltNumber = isEthNetworkName(network.name) ? ERC20_CUSTODY_SALT_NUMBER_ETH : ERC20_CUSTODY_SALT_NUMBER_NON_ETH;
+  const saltNumber = getSaltNumber("zetaERC20Custody", network.name);
   const saltStr = BigNumber.from(saltNumber).toHexString();
 
   const zetaFee = ERC20_CUSTODY_ZETA_FEE;
@@ -52,8 +47,12 @@ export const deterministicDeployERC20Custody = async () => {
     signer,
   });
 
+  const finalBalance = await signer.getBalance();
   console.log("Deployed ERC20 Custody. Address:", address);
   console.log("Constructor Args", constructorArgs);
+  console.log("ETH spent:", initialBalance.sub(finalBalance).toString());
+
+  return address;
 };
 
 if (!process.env.EXECUTE_PROGRAMMATICALLY) {

scripts/deployments/core/deterministic-deploy-zeta-connector.ts

@@ -2,21 +2,22 @@ import { BigNumber } from "ethers";
 import { ethers, network } from "hardhat";
 import { getAddress, isProtocolNetworkName } from "lib";
 
-import { ZETA_CONNECTOR_SALT_NUMBER_ETH, ZETA_CONNECTOR_SALT_NUMBER_NON_ETH } from "../../../lib/contracts.constants";
+import { getSaltNumber } from "../../../lib/contracts.constants";
 import { isEthNetworkName } from "../../../lib/contracts.helpers";
 import {
   deployContractToAddress,
   saltToHex,
 } from "../../../lib/ImmutableCreate2Factory/ImmutableCreate2Factory.helpers";
 import { ZetaConnectorEth__factory, ZetaConnectorNonEth__factory } from "../../../typechain-types";
 
-export async function deterministicDeployZetaConnector() {
+export const deterministicDeployZetaConnector = async () => {
   if (!isProtocolNetworkName(network.name)) {
     throw new Error(`network.name: ${network.name} isn't supported.`);
   }
 
   const accounts = await ethers.getSigners();
   const [signer] = accounts;
+  const initialBalance = await signer.getBalance();
 
   const DEPLOYER_ADDRESS = process.env.DEPLOYER_ADDRESS || signer.address;
 
@@ -25,9 +26,7 @@ export async function deterministicDeployZetaConnector() {
   const tssUpdaterAddress = getAddress("tssUpdater", network.name);
   const immutableCreate2FactoryAddress = getAddress("immutableCreate2Factory", network.name);
 
-  const saltNumber = isEthNetworkName(network.name)
-    ? ZETA_CONNECTOR_SALT_NUMBER_ETH
-    : ZETA_CONNECTOR_SALT_NUMBER_NON_ETH;
+  const saltNumber = getSaltNumber("zetaConnector", network.name);
   const saltStr = BigNumber.from(saltNumber).toHexString();
 
   const salthex = saltToHex(saltStr, DEPLOYER_ADDRESS);
@@ -50,9 +49,13 @@ export async function deterministicDeployZetaConnector() {
     signer,
   });
 
+  const finalBalance = await signer.getBalance();
   console.log("Deployed ZetaConnector. Address:", address);
   console.log("Constructor Args", constructorArgs);
-}
+  console.log("ETH spent:", initialBalance.sub(finalBalance).toString());
+
+  return address;
+};
 
 if (!process.env.EXECUTE_PROGRAMMATICALLY) {
   deterministicDeployZetaConnector()

scripts/deployments/core/deterministic-deploy-zeta-token.ts

@@ -2,33 +2,30 @@ import { BigNumber } from "ethers";
 import { ethers, network } from "hardhat";
 import { getAddress, isProtocolNetworkName } from "lib";
 
-import {
-  ZETA_INITIAL_SUPPLY,
-  ZETA_TOKEN_SALT_NUMBER_ETH,
-  ZETA_TOKEN_SALT_NUMBER_NON_ETH,
-} from "../../../lib/contracts.constants";
+import { getSaltNumber, ZETA_INITIAL_SUPPLY } from "../../../lib/contracts.constants";
 import { isEthNetworkName } from "../../../lib/contracts.helpers";
 import {
   deployContractToAddress,
   saltToHex,
 } from "../../../lib/ImmutableCreate2Factory/ImmutableCreate2Factory.helpers";
 import { ZetaEth__factory, ZetaNonEth__factory } from "../../../typechain-types";
 
-export async function deterministicDeployZetaToken() {
+export const deterministicDeployZetaToken = async () => {
   if (!isProtocolNetworkName(network.name)) {
     throw new Error(`network.name: ${network.name} isn't supported.`);
   }
 
   const accounts = await ethers.getSigners();
   const [signer] = accounts;
+  const initialBalance = await signer.getBalance();
 
   const DEPLOYER_ADDRESS = process.env.DEPLOYER_ADDRESS || signer.address;
 
   const tssAddress = getAddress("tss", network.name);
   const tssUpdaterAddress = getAddress("tssUpdater", network.name);
   const immutableCreate2FactoryAddress = getAddress("immutableCreate2Factory", network.name);
 
-  const saltNumber = isEthNetworkName(network.name) ? ZETA_TOKEN_SALT_NUMBER_ETH : ZETA_TOKEN_SALT_NUMBER_NON_ETH;
+  const saltNumber = getSaltNumber("zetaToken", network.name);
   const saltStr = BigNumber.from(saltNumber).toHexString();
 
   const salthex = saltToHex(saltStr, DEPLOYER_ADDRESS);
@@ -57,9 +54,13 @@ export async function deterministicDeployZetaToken() {
     signer,
   });
 
+  const finalBalance = await signer.getBalance();
   console.log("Deployed zetaToken. Address:", address);
   console.log("Constructor Args", constructorArgs);
-}
+  console.log("ETH spent:", initialBalance.sub(finalBalance).toString());
+
+  return address;
+};
 
 if (!process.env.EXECUTE_PROGRAMMATICALLY) {
   deterministicDeployZetaToken()

scripts/deployments/tools/deterministic-get-salt-erc20-custody.ts

@@ -29,14 +29,19 @@ export const deterministicDeployGetSaltERC20Custody = async () => {
   const constructorArgs = [tssAddress, tssUpdaterAddress, zetaFee.toString(), zetaMaxFee.toString(), zetaTokenAddress];
   const contractBytecode = ERC20Custody__factory.bytecode;
 
-  calculateBestSalt(MAX_ITERATIONS, DEPLOYER_ADDRESS, constructorTypes, constructorArgs, contractBytecode);
+  await calculateBestSalt(
+    MAX_ITERATIONS,
+    DEPLOYER_ADDRESS,
+    constructorTypes,
+    constructorArgs,
+    contractBytecode,
+    network.name
+  );
 };
 
-if (!process.env.EXECUTE_PROGRAMMATICALLY) {
-  deterministicDeployGetSaltERC20Custody()
-    .then(() => process.exit(0))
-    .catch((error) => {
-      console.error(error);
-      process.exit(1);
-    });
-}
+deterministicDeployGetSaltERC20Custody()
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });