From be2a6e091225bf565b248a29fbb640f4ae275c2f Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Thu, 15 Aug 2024 21:38:09 +0300 Subject: [PATCH 1/2] chore: udpate polygon and base contract addresses --- v1/data/addresses.json | 20 ++++---- v1/data/addresses.mainnet.json | 26 ++++++++++ v1/data/addresses.testnet.json | 90 +++++++++++++++++++++------------- v1/lib/types.ts | 43 ++-------------- v1/tasks/addresses.ts | 6 ++- 5 files changed, 98 insertions(+), 87 deletions(-) diff --git a/v1/data/addresses.json b/v1/data/addresses.json index 4eaac336..1075d08c 100644 --- a/v1/data/addresses.json +++ b/v1/data/addresses.json @@ -1,5 +1,15 @@ { "ccm": { + "base_testnet": { + "connector": "0xc0B74d761ef4EC9e9473f65687d36B9F13DB0dCc", + "erc20Custody": "0x3A1f7b35EF57543B4e86c384eF6a368Ed811a36E", + "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d", + "tss": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e", + "tssUpdater": "0xdE3fb63723f0EEed8967ff9124e1c3bA89871b03", + "zetaToken": "0xf4e63991E7475b659bd97Bba85f32a7259239D5d", + "zetaTokenConsumerUniV2": "", + "zetaTokenConsumerUniV3": "" + }, "bsc_mainnet": { "connector": "0x000063A6e758D9e2f438d430108377564cf4077D", "erc20Custody": "0x00000fF8fA992424957F97688015814e707A0115", @@ -81,16 +91,6 @@ "zetaToken": "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf", "zetaTokenConsumerUniV2": "", "zetaTokenConsumerUniV3": "" - }, - "base_testnet": { - "connector": "0xc0B74d761ef4EC9e9473f65687d36B9F13DB0dCc", - "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d", - "erc20Custody": "0x3A1f7b35EF57543B4e86c384eF6a368Ed811a36E", - "tss": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e", - "tssUpdater": "0xdE3fb63723f0EEed8967ff9124e1c3bA89871b03", - "zetaToken": "0xf4e63991E7475b659bd97Bba85f32a7259239D5d", - "zetaTokenConsumerUniV2": "", - "zetaTokenConsumerUniV3": "" } }, "non_zeta": { diff --git a/v1/data/addresses.mainnet.json b/v1/data/addresses.mainnet.json index 30604da4..6d5c8fd4 100644 --- a/v1/data/addresses.mainnet.json +++ b/v1/data/addresses.mainnet.json @@ -345,6 +345,32 @@ "symbol": "ETH.ETH", "type": "zrc20" }, + { + "address": "0xdbfF6471a79E5374d771922F2194eccc42210B9F", + "asset": "0xc2132d05d31c914a87c6611c10748aeb04b58e8f", + "category": "omnichain", + "chain_id": 7000, + "chain_name": "zeta_mainnet", + "coin_type": "erc20", + "decimals": 18, + "description": "ZetaChain ZRC20 USDT on POL", + "foreign_chain_id": "137", + "symbol": "USDT.POL", + "type": "zrc20" + }, + { + "address": "0xfC9201f4116aE6b054722E10b98D904829b469c3", + "asset": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359", + "category": "omnichain", + "chain_id": 7000, + "chain_name": "zeta_mainnet", + "coin_type": "erc20", + "decimals": 18, + "description": "ZetaChain ZRC20 USDC on POL", + "foreign_chain_id": "137", + "symbol": "USDC.POL", + "type": "zrc20" + }, { "address": "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y", "category": "omnichain", diff --git a/v1/data/addresses.testnet.json b/v1/data/addresses.testnet.json index 95ab606f..cdba831a 100644 --- a/v1/data/addresses.testnet.json +++ b/v1/data/addresses.testnet.json @@ -171,6 +171,19 @@ "symbol": "gETH", "type": "zrc20" }, + { + "address": "0x236b0DE675cC8F46AE186897fCCeFe3370C9eDeD", + "asset": "", + "category": "omnichain", + "chain_id": 7001, + "chain_name": "zeta_testnet", + "coin_type": "gas", + "decimals": 18, + "description": "ZetaChain ZRC20 Base Sepolia ETH-base_sepolia", + "foreign_chain_id": "84532", + "symbol": "ETH.BASESEPOLIA", + "type": "zrc20" + }, { "address": "0x48f80608B672DC30DC7e3dbBd0343c5F02C738Eb", "asset": "", @@ -311,6 +324,48 @@ "chain_name": "amoy_testnet", "type": "zetaToken" }, + { + "address": "0xc0B74d761ef4EC9e9473f65687d36B9F13DB0dCc", + "category": "messaging", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "connector" + }, + { + "address": "0x3A1f7b35EF57543B4e86c384eF6a368Ed811a36E", + "category": "omnichain", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "erc20Custody" + }, + { + "address": "0xdE3fb63723f0EEed8967ff9124e1c3bA89871b03", + "category": "messaging", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "pauser" + }, + { + "address": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e", + "category": "omnichain", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "tss" + }, + { + "address": "0xdE3fb63723f0EEed8967ff9124e1c3bA89871b03", + "category": "omnichain", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "tssUpdater" + }, + { + "address": "0xf4e63991E7475b659bd97Bba85f32a7259239D5d", + "category": "messaging", + "chain_id": 84532, + "chain_name": "base_sepolia", + "type": "zetaToken" + }, { "address": "0x3963341dad121c9CD33046089395D66eBF20Fb03", "category": "messaging", @@ -380,40 +435,5 @@ "chain_id": 11155111, "chain_name": "sepolia_testnet", "type": "zetaTokenConsumerUniV3" - }, - { - "address": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e", - "category": "omnichain", - "chain_id": 84532, - "chain_name": "base_testnet", - "type": "tss" - }, - { - "address": "0xdE3fb63723f0EEed8967ff9124e1c3bA89871b03", - "category": "omnichain", - "chain_id": 84532, - "chain_name": "base_testnet", - "type": "tssUpdater" - }, - { - "address": "0xf4e63991E7475b659bd97Bba85f32a7259239D5d", - "category": "messaging", - "chain_id": 84532, - "chain_name": "base_testnet", - "type": "zetaToken" - }, - { - "address": "0x3A1f7b35EF57543B4e86c384eF6a368Ed811a36E", - "category": "omnichain", - "chain_id": 84532, - "chain_name": "base_testnet", - "type": "erc20Custody" - }, - { - "address": "0xc0B74d761ef4EC9e9473f65687d36B9F13DB0dCc", - "category": "messaging", - "chain_id": 84532, - "chain_name": "base_testnet", - "type": "connector" } ] diff --git a/v1/lib/types.ts b/v1/lib/types.ts index 3c4e5c1a..96d32d45 100644 --- a/v1/lib/types.ts +++ b/v1/lib/types.ts @@ -1,41 +1,4 @@ -import { ZetaProtocolNetwork } from "./address.tools"; +export type ParamSymbol = "USDC.BSC" | "USDC.ETH" | "BTC.BTC" | "PEPE.ETH" | "BNB.BSC" | "SHIB.ETH" | "USDT.ETH" | "USDT.BSC" | "POL.POLYGON" | "DAI.ETH" | "ETH.ETH" | "USDT.POL" | "USDC.POL" | "sETH.SEPOLIA" | "USDC" | "gETH" | "ETH.BASESEPOLIA" | "tMATIC" | "tBTC" | "MATIC.AMOY" | "USDC.SEPOLIA" | "tBNB"; +export type ParamChainName = "eth_mainnet" | "bsc_mainnet" | "polygon_mainnet" | "zeta_mainnet" | "btc_mainnet" | "bsc_testnet" | "zeta_testnet" | "btc_testnet" | "amoy_testnet" | "base_sepolia" | "sepolia_testnet"; +export type ParamType = "connector" | "erc20Custody" | "pauser" | "tss" | "tssUpdater" | "uniswapV2Factory" | "uniswapV2Router02" | "uniswapV3Factory" | "uniswapV3Router" | "weth9" | "zetaToken" | "fungibleModule" | "systemContract" | "zrc20" | "zetaTokenConsumerUniV3"; -export type ParamSymbol = - | "BNB.BSC" - | "BTC.BTC" - | "DAI.ETH" - | "ETH.ETH" - | "gETH" - | "MATIC.AMOY" - | "PEPE.ETH" - | "POL.POLYGON" - | "sETH.SEPOLIA" - | "SHIB.ETH" - | "tBNB" - | "tBTC" - | "tMATIC" - | "USDC.BSC" - | "USDC.ETH" - | "USDC.SEPOLIA" - | "USDC" - | "USDT.BSC" - | "USDT.ETH"; - -export type ParamChainName = ZetaProtocolNetwork; - -export type ParamType = - | "connector" - | "erc20Custody" - | "fungibleModule" - | "pauser" - | "systemContract" - | "tss" - | "tssUpdater" - | "uniswapV2Factory" - | "uniswapV2Router02" - | "uniswapV3Factory" - | "uniswapV3Router" - | "weth9" - | "zetaToken" - | "zetaTokenConsumerUniV3" - | "zrc20"; diff --git a/v1/tasks/addresses.ts b/v1/tasks/addresses.ts index 1427915c..c83448b8 100644 --- a/v1/tasks/addresses.ts +++ b/v1/tasks/addresses.ts @@ -207,7 +207,8 @@ const fetchTSSUpdater = async (chains: any, addresses: any) => { })?.address; if (erc20Custody) { if (["18332", "8332"].includes(chain.chain_id)) return; - const rpc = getEndpoints("evm", chain.chain_name)[0]?.url; + const chainName = chain.chain_name === "base_sepolia" ? "base_testnet" : chain.chain_name; + const rpc = getEndpoints("evm", chainName)[0]?.url; const provider = new ethers.providers.JsonRpcProvider(rpc); const custody = ERC20Custody__factory.connect(erc20Custody, provider); return custody.TSSAddressUpdater().then((address: string) => { @@ -232,7 +233,8 @@ const fetchPauser = async (chains: any, addresses: any) => { })?.address; if (erc20Custody) { if (["18332", "8332", "7001", "7000"].includes(chain.chain_id)) return; - const rpc = getEndpoints("evm", chain.chain_name)[0]?.url; + const chainName = chain.chain_name === "base_sepolia" ? "base_testnet" : chain.chain_name; + const rpc = getEndpoints("evm", chainName)[0]?.url; const provider = new ethers.providers.JsonRpcProvider(rpc); const connector = ZetaConnectorBase__factory.connect(erc20Custody, provider); return connector.pauserAddress().then((address: string) => { From efa0751d59619af0e291ae3ebd95070cf267ba41 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Thu, 15 Aug 2024 21:59:41 +0300 Subject: [PATCH 2/2] fix decimals --- v1/data/addresses.mainnet.json | 10 +++++----- v1/data/addresses.testnet.json | 10 +++++----- v1/tasks/addresses.ts | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/v1/data/addresses.mainnet.json b/v1/data/addresses.mainnet.json index 6d5c8fd4..68f3c7f3 100644 --- a/v1/data/addresses.mainnet.json +++ b/v1/data/addresses.mainnet.json @@ -222,7 +222,7 @@ "chain_id": 7000, "chain_name": "zeta_mainnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "ZetaChain ZRC20 USDC on ETH", "foreign_chain_id": "1", "symbol": "USDC.ETH", @@ -235,7 +235,7 @@ "chain_id": 7000, "chain_name": "zeta_mainnet", "coin_type": "gas", - "decimals": 18, + "decimals": 8, "description": "ZetaChain ZRC20 BTC-btc_mainnet", "foreign_chain_id": "8332", "symbol": "BTC.BTC", @@ -287,7 +287,7 @@ "chain_id": 7000, "chain_name": "zeta_mainnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "ZetaChain ZRC20 USDT on ETH", "foreign_chain_id": "1", "symbol": "USDT.ETH", @@ -352,7 +352,7 @@ "chain_id": 7000, "chain_name": "zeta_mainnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "ZetaChain ZRC20 USDT on POL", "foreign_chain_id": "137", "symbol": "USDT.POL", @@ -365,7 +365,7 @@ "chain_id": 7000, "chain_name": "zeta_mainnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "ZetaChain ZRC20 USDC on POL", "foreign_chain_id": "137", "symbol": "USDC.POL", diff --git a/v1/data/addresses.testnet.json b/v1/data/addresses.testnet.json index cdba831a..065301a1 100644 --- a/v1/data/addresses.testnet.json +++ b/v1/data/addresses.testnet.json @@ -152,7 +152,7 @@ "chain_id": 7001, "chain_name": "zeta_testnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "USDC-goerli_testnet", "foreign_chain_id": "5", "symbol": "USDC", @@ -204,7 +204,7 @@ "chain_id": 7001, "chain_name": "zeta_testnet", "coin_type": "gas", - "decimals": 18, + "decimals": 8, "description": "BTC-btc_testnet-btc_testnet", "foreign_chain_id": "18332", "symbol": "tBTC", @@ -230,7 +230,7 @@ "chain_id": 7001, "chain_name": "zeta_testnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "USDC-bsc_testnet", "foreign_chain_id": "97", "symbol": "USDC", @@ -243,7 +243,7 @@ "chain_id": 7001, "chain_name": "zeta_testnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "USDC-mumbai_testnet", "foreign_chain_id": "80001", "symbol": "USDC", @@ -256,7 +256,7 @@ "chain_id": 7001, "chain_name": "zeta_testnet", "coin_type": "erc20", - "decimals": 18, + "decimals": 6, "description": "ZetaChain ZRC20 USDC on SEPOLIA", "foreign_chain_id": "11155111", "symbol": "USDC.SEPOLIA", diff --git a/v1/tasks/addresses.ts b/v1/tasks/addresses.ts index c83448b8..3a5a7c45 100644 --- a/v1/tasks/addresses.ts +++ b/v1/tasks/addresses.ts @@ -120,7 +120,7 @@ const fetchForeignCoinsData = async (chains: any, addresses: any, network: Netwo chain_id, chain_name: network, coin_type: token.coin_type.toLowerCase(), - decimals: 18, + decimals: token.decimals, description: token.name, foreign_chain_id: token.foreign_chain_id, symbol: token.symbol,