From f81b7c6b8164054587efc2a71fb73eb4e4dccace Mon Sep 17 00:00:00 2001 From: Mohit Khandelwal Date: Wed, 29 Jan 2025 19:04:26 +0530 Subject: [PATCH] chore(eth-multisig-v4): add bera config to deploy contract in prod Ticket: WIN-4439 --- .github/workflows/deploy_and_release.yml | 5 +++- .github/workflows/deploy_batcher_contract.yml | 3 +++ .github/workflows/push.yml | 1 + hardhat.config.ts | 23 ++++++++++++++++++- scripts/deploy.ts | 4 +++- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_and_release.yml b/.github/workflows/deploy_and_release.yml index 910989e..a9f79b8 100644 --- a/.github/workflows/deploy_and_release.yml +++ b/.github/workflows/deploy_and_release.yml @@ -38,6 +38,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} @@ -59,7 +60,7 @@ jobs: result-encoding: string script: | const tag = process.env.GITHUB_REF_NAME; - const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|tflr|flr|tsgb|sgb|txdc|xdc|twemix|wemix)$/; + const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|bera|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|tflr|flr|tsgb|sgb|txdc|xdc|twemix|wemix)$/; const network = tag.match(regex); return network ? network[1] : "hteth"; deploy-to-test: @@ -99,6 +100,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} @@ -171,6 +173,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} diff --git a/.github/workflows/deploy_batcher_contract.yml b/.github/workflows/deploy_batcher_contract.yml index 6c7502b..3741173 100644 --- a/.github/workflows/deploy_batcher_contract.yml +++ b/.github/workflows/deploy_batcher_contract.yml @@ -38,6 +38,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} @@ -100,6 +101,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} @@ -149,6 +151,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b3a5dd2..3a657a8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -46,6 +46,7 @@ jobs: ZKSYNC_EXPLORER_API_KEY: ${{ secrets.ZKSYNC_EXPLORER_API_KEY }} BASESCAN_API_KEY: ${{ secrets.BASESCAN_API_KEY }} CARTIO_BERA_EXPLORER_API_KEY: ${{ secrets.CARTIO_BERA_EXPLORER_API_KEY }} + BERA_EXPLORER_API_KEY: ${{ secrets.BERA_EXPLORER_API_KEY }} OAS_EXPLORER_API_KEY: ${{ secrets.OAS_EXPLORER_API_KEY }} CORE_DAO_TESTNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_TESTNET_EXPLORER_API_KEY }} CORE_DAO_MAINNET_EXPLORER_API_KEY: ${{ secrets.CORE_DAO_MAINNET_EXPLORER_API_KEY }} diff --git a/hardhat.config.ts b/hardhat.config.ts index 26ee487..f861a47 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -31,6 +31,7 @@ const { ZKSYNC_EXPLORER_API_KEY, BASESCAN_API_KEY, CARTIO_BERA_EXPLORER_API_KEY, + BERA_EXPLORER_API_KEY, OAS_EXPLORER_API_KEY, CORE_DAO_TESTNET_EXPLORER_API_KEY, CORE_DAO_MAINNET_EXPLORER_API_KEY, @@ -139,7 +140,17 @@ const config: HardhatUserConfig = { }, tbera: { url: `https://rockbeard-eth-cartio.berachain.com/`, - accounts: [`${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`] + accounts: [ + `${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`, + `${PRIVATE_KEY_FOR_BATCHER_CONTRACT_DEPLOYMENT}` + ] + }, + bera: { + url: `http://bera-node-proxy.app-microservices-fullnodes.svc.cluster.local:4000`, + accounts: [ + `${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`, + `${PRIVATE_KEY_FOR_BATCHER_CONTRACT_DEPLOYMENT}` + ] }, toas: { url: `https://rpc.testnet.oasys.games`, @@ -275,6 +286,7 @@ const config: HardhatUserConfig = { base: `${BASESCAN_API_KEY}`, // bera cartioBera: `${CARTIO_BERA_EXPLORER_API_KEY}`, + bera: `${BERA_EXPLORER_API_KEY}`, //OAS oasTestnet: `${OAS_EXPLORER_API_KEY}`, oasMainnet: `${OAS_EXPLORER_API_KEY}`, @@ -347,6 +359,15 @@ const config: HardhatUserConfig = { browserURL: 'https://80000.testnet.routescan.io' } }, + { + network: 'bera', + chainId: 80094, + urls: { + apiURL: + 'https://api.routescan.io/v2/network/mainnet/evm/80094/etherscan/api', + browserURL: 'https://80094.routescan.io' + } + }, { network: 'oasTestnet', chainId: 9372, diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 6a2ab73..985b06d 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -124,8 +124,10 @@ async function main() { forwarderFactoryContractName = 'ForwarderFactory'; contractPath = `contracts/${walletImplementationContractName}.sol:${walletImplementationContractName}`; break; - // bera + // cartio bera case 80000: + // bera + case 80094: // coredao case 1115: case 1116: