From 45283e0222b0ddd7e2114565eb17e848590771a8 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Wed, 2 Oct 2024 23:00:22 -0500 Subject: [PATCH 01/11] set base TSS updater/pauser --- v1/data/addresses.mainnet.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/v1/data/addresses.mainnet.json b/v1/data/addresses.mainnet.json index 68f3c7f37..8c1fb3290 100644 --- a/v1/data/addresses.mainnet.json +++ b/v1/data/addresses.mainnet.json @@ -160,6 +160,13 @@ "chain_name": "polygon_mainnet", "type": "zetaToken" }, + { + "address": "base:0x4Ed087B3aB502475c97cF9d3f1637eFd2470B8FE", + "category": "omnichain", + "chain_id": 8453, + "chain_name": "base_mainnet", + "type": "tssUpdater" + }, { "address": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67", "category": "messaging", From 62213fb0394ffd60b4577ce0e2a09400547459fd Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Wed, 2 Oct 2024 23:02:20 -0500 Subject: [PATCH 02/11] add base addresses tools and contract constants --- v1/lib/address.tools.ts | 2 ++ v1/lib/contracts.constants.ts | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/v1/lib/address.tools.ts b/v1/lib/address.tools.ts index 2de148e3a..e896a4a61 100644 --- a/v1/lib/address.tools.ts +++ b/v1/lib/address.tools.ts @@ -67,6 +67,7 @@ export declare type ZetaProtocolMainNetwork = | "btc_mainnet" | "eth_mainnet" | "polygon_mainnet" + | "base_mainnet" | "zeta_mainnet"; export const zetaProtocolMainNetworks: ZetaProtocolMainNetwork[] = [ @@ -74,6 +75,7 @@ export const zetaProtocolMainNetworks: ZetaProtocolMainNetwork[] = [ "btc_mainnet", "eth_mainnet", "polygon_mainnet", + "base_mainnet" "zeta_mainnet", ]; diff --git a/v1/lib/contracts.constants.ts b/v1/lib/contracts.constants.ts index bdfa6066d..7af3e40c2 100644 --- a/v1/lib/contracts.constants.ts +++ b/v1/lib/contracts.constants.ts @@ -12,6 +12,12 @@ const SALT_NUMBERS = { zetaERC20Custody: "0", zetaToken: "0", }, + base_mainnet: { + zetaConnector: "0", + zetaConsumer: "0", + zetaERC20Custody: "0", + zetaToken: "0", + } baobab_testnet: { zetaConnector: "71733", zetaConsumer: "0", From fa8b47e659f3c24168dd95b9d64dad35be1a8cd2 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Wed, 2 Oct 2024 23:06:12 -0500 Subject: [PATCH 03/11] fix: accidentally a comma --- v1/lib/contracts.constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1/lib/contracts.constants.ts b/v1/lib/contracts.constants.ts index 7af3e40c2..ee736cad3 100644 --- a/v1/lib/contracts.constants.ts +++ b/v1/lib/contracts.constants.ts @@ -17,7 +17,7 @@ const SALT_NUMBERS = { zetaConsumer: "0", zetaERC20Custody: "0", zetaToken: "0", - } + }, baobab_testnet: { zetaConnector: "71733", zetaConsumer: "0", From b263035e117faa15d670a7899ed7b360f615bb80 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Wed, 2 Oct 2024 23:13:18 -0500 Subject: [PATCH 04/11] fix: accidentally a comma --- v1/lib/address.tools.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1/lib/address.tools.ts b/v1/lib/address.tools.ts index e896a4a61..147680715 100644 --- a/v1/lib/address.tools.ts +++ b/v1/lib/address.tools.ts @@ -75,7 +75,7 @@ export const zetaProtocolMainNetworks: ZetaProtocolMainNetwork[] = [ "btc_mainnet", "eth_mainnet", "polygon_mainnet", - "base_mainnet" + "base_mainnet", "zeta_mainnet", ]; From 4c2b56945da283958f689d79c9e3c741b86b23c0 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 09:48:47 -0500 Subject: [PATCH 05/11] add known base addresses --- v1/data/addresses.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/v1/data/addresses.json b/v1/data/addresses.json index 1075d08c4..1a4f7fea7 100644 --- a/v1/data/addresses.json +++ b/v1/data/addresses.json @@ -10,6 +10,14 @@ "zetaTokenConsumerUniV2": "", "zetaTokenConsumerUniV3": "" }, + "base_mainnet": { + "connector": "", + "erc20Custody": "", + "immutableCreate2Factory": "", + "tss": "0x70e967acFcC17c3941E87562161406d41676FD83", + "tssUpdater": "0x4Ed087B3aB502475c97cF9d3f1637eFd2470B8FE", + "zetaToken": "" + }, "bsc_mainnet": { "connector": "0x000063A6e758D9e2f438d430108377564cf4077D", "erc20Custody": "0x00000fF8fA992424957F97688015814e707A0115", From 7738fd77214e36826a6e2dd5a3a4842da222da9c Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 09:55:46 -0500 Subject: [PATCH 06/11] checking in hardhat.config.ts change --- v1/hardhat.config.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/v1/hardhat.config.ts b/v1/hardhat.config.ts index d98a278d1..e45740822 100644 --- a/v1/hardhat.config.ts +++ b/v1/hardhat.config.ts @@ -47,6 +47,14 @@ const config: HardhatUserConfig = { browserURL: "https://sepolia.basescan.org/", }, }, + { + chainId: 8453, + network: "base_mainnet", + urls: { + apiURL: "https://api.basescan.org/api", + browserURL: "https://basescan.org/", + }, + }, ], }, networks: { From 6c643a833eee77b286e30036694f83e8374112cd Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 10:04:08 -0500 Subject: [PATCH 07/11] murder incorrectly included base: prefix --- v1/data/addresses.mainnet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1/data/addresses.mainnet.json b/v1/data/addresses.mainnet.json index 8c1fb3290..3e9b39e6a 100644 --- a/v1/data/addresses.mainnet.json +++ b/v1/data/addresses.mainnet.json @@ -161,7 +161,7 @@ "type": "zetaToken" }, { - "address": "base:0x4Ed087B3aB502475c97cF9d3f1637eFd2470B8FE", + "address": "0x4Ed087B3aB502475c97cF9d3f1637eFd2470B8FE", "category": "omnichain", "chain_id": 8453, "chain_name": "base_mainnet", From b44ec82a856c7765c9d2c1541097b2f2c78bdc0c Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 10:12:30 -0500 Subject: [PATCH 08/11] update lib/types.ts with base mainnet --- v1/lib/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1/lib/types.ts b/v1/lib/types.ts index 96d32d45a..716657d15 100644 --- a/v1/lib/types.ts +++ b/v1/lib/types.ts @@ -1,4 +1,4 @@ -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 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.BASE" | "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" | "base_mainnet"; export type ParamType = "connector" | "erc20Custody" | "pauser" | "tss" | "tssUpdater" | "uniswapV2Factory" | "uniswapV2Router02" | "uniswapV3Factory" | "uniswapV3Router" | "weth9" | "zetaToken" | "fungibleModule" | "systemContract" | "zrc20" | "zetaTokenConsumerUniV3"; From 06074c262a751bc06d07398fdfd90415bfdaeaa8 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 10:16:03 -0500 Subject: [PATCH 09/11] remove modifications to lib/types.ts --- v1/lib/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1/lib/types.ts b/v1/lib/types.ts index 716657d15..96d32d45a 100644 --- a/v1/lib/types.ts +++ b/v1/lib/types.ts @@ -1,4 +1,4 @@ -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.BASE" | "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" | "base_mainnet"; +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"; From bbcdffa4dd6bc9ba48790935bdcf7a3c993bd7ff Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 10:22:16 -0500 Subject: [PATCH 10/11] ran deploy-immutable-create2-factory.ts and added the deployed contract address --- v1/data/addresses.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1/data/addresses.json b/v1/data/addresses.json index 1a4f7fea7..352e04507 100644 --- a/v1/data/addresses.json +++ b/v1/data/addresses.json @@ -13,7 +13,7 @@ "base_mainnet": { "connector": "", "erc20Custody": "", - "immutableCreate2Factory": "", + "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d", "tss": "0x70e967acFcC17c3941E87562161406d41676FD83", "tssUpdater": "0x4Ed087B3aB502475c97cF9d3f1637eFd2470B8FE", "zetaToken": "" From 1a3256a2e696ea3577ae30c195ee8fbcabceda04 Mon Sep 17 00:00:00 2001 From: Christopher Fuka Date: Thu, 3 Oct 2024 10:50:14 -0500 Subject: [PATCH 11/11] changes needed to deploy base mainnet --- v1/data/addresses.mainnet.json | 7 +++++++ v1/package.json | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/v1/data/addresses.mainnet.json b/v1/data/addresses.mainnet.json index 3e9b39e6a..2d0565784 100644 --- a/v1/data/addresses.mainnet.json +++ b/v1/data/addresses.mainnet.json @@ -167,6 +167,13 @@ "chain_name": "base_mainnet", "type": "tssUpdater" }, + { + "address": "0x70e967acFcC17c3941E87562161406d41676FD83", + "category": "omnichain", + "chain_id": 8453, + "chain_name": "base_mainnet", + "type": "tss" + }, { "address": "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67", "category": "messaging", diff --git a/v1/package.json b/v1/package.json index f028cded7..159cb77bd 100644 --- a/v1/package.json +++ b/v1/package.json @@ -47,7 +47,7 @@ "ethereum-waffle": "^4.0.9", "ethereumjs-utils": "^5.2.5", "ethers": "5.6.8", - "hardhat": "^2.17.2", + "hardhat": "^2.22.12", "hardhat-abi-exporter": "^2.10.1", "hardhat-gas-reporter": "^1.0.9", "inquirer": "^8.2.4", @@ -89,5 +89,8 @@ "tsc:watch": "npx tsc --watch" }, "types": "./dist/lib/index.d.ts", - "version": "0.0.8" + "version": "0.0.8", + "dependencies": { + "chokidar": "^4.0.1" + } }