chore(eth-multisig-v4): add bera config

Ticket: WIN-3295
BitGo · Aug 14, 2024 · b5a9563 · b5a9563
1 parent c9f3d0b
commit b5a9563
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -28,11 +28,8 @@ const {
   ARBISCAN_API_KEY,
   OPTIMISTIC_ETHERSCAN_API_KEY,
   ZKSYNC_EXPLORER_API_KEY,
-<<<<<<< HEAD
-  BASESCAN_API_KEY
-=======
+  BASESCAN_API_KEY,
   BARTIO_BERA_EXPLORER_API_KEY
->>>>>>> be622e1 (chore(eth-multisig-v4): add bera config)
 } = process.env;
 
 const config: HardhatUserConfig = {
@@ -127,19 +124,17 @@ const config: HardhatUserConfig = {
       url: `${QUICKNODE_ZKSYNC_SEPOLIA_API_KEY}`,
       accounts: [`${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`]
     },
-<<<<<<< HEAD
     tbaseeth: {
       url: 'https://sepolia.base.org',
       accounts: [`${TESTNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
     },
     baseeth: {
       url: 'https://mainnet.base.org/',
       accounts: [`${MAINNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
-=======
+    },
     tbera: {
       url: `https://bartio.rpc.berachain.com/`,
       accounts: [`${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`]
->>>>>>> be622e1 (chore(eth-multisig-v4): add bera config)
     }
   },
   gasReporter: {
@@ -166,14 +161,11 @@ const config: HardhatUserConfig = {
       // zksync
       zksync: `${ZKSYNC_EXPLORER_API_KEY}`,
       zksyncSepolia: `${ZKSYNC_EXPLORER_API_KEY}`,
-<<<<<<< HEAD
       // base chain
       baseSepolia: `${BASESCAN_API_KEY}`,
-      base: `${BASESCAN_API_KEY}`
-=======
+      base: `${BASESCAN_API_KEY}`,
       // bera
       bartioBera: `${BARTIO_BERA_EXPLORER_API_KEY}`
->>>>>>> be622e1 (chore(eth-multisig-v4): add bera config)
     },
     customChains: [
       {