replace goerli to sepolia

lidofinance · Feb 12, 2024 · 90a8ecc · 90a8ecc
1 parent 384be20
commit 90a8ecc
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 95 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -40,47 +40,47 @@ const config: HardhatUserConfig = {
     eth_mainnet: {
       url: env.string("RPC_ETH_MAINNET", ""),
     },
-    eth_goerli: {
-      url: env.string("RPC_ETH_GOERLI", ""),
+    eth_sepolia: {
+      url: env.string("RPC_ETH_SEPOLIA", ""),
     },
 
     // Ethereum Fork Chains
     eth_mainnet_fork: {
       url: "http://localhost:8545",
     },
-    eth_goerli_fork: {
+    eth_sepolia_fork: {
       url: "http://localhost:8545",
     },
 
     // Arbitrum Public Chains
     arb_mainnet: {
       url: env.string("RPC_ARB_MAINNET", ""),
     },
-    arb_goerli: {
-      url: env.string("RPC_ARB_GOERLI", ""),
+    arb_sepolia: {
+      url: env.string("RPC_ARB_SEPOLIA", ""),
     },
 
     // Arbitrum Fork Chains
     arb_mainnet_fork: {
       url: "http://localhost:8546",
     },
-    arb_goerli_fork: {
+    arb_sepolia_fork: {
       url: "http://localhost:8546",
     },
 
     // Optimism Public Chains
     opt_mainnet: {
       url: env.string("RPC_OPT_MAINNET", ""),
     },
-    opt_goerli: {
-      url: env.string("RPC_OPT_GOERLI", ""),
+    opt_sepolia: {
+      url: env.string("RPC_OPT_SEPOLIA", ""),
     },
 
     // Optimism Fork Chains
     opt_mainnet_fork: {
       url: "http://localhost:9545",
     },
-    opt_goerli_fork: {
+    opt_sepolia_fork: {
       url: "http://localhost:9545",
     },
   },
@@ -91,12 +91,31 @@ const config: HardhatUserConfig = {
   etherscan: {
     apiKey: {
       mainnet: env.string("ETHERSCAN_API_KEY_ETH", ""),
-      goerli: env.string("ETHERSCAN_API_KEY_ETH", ""),
-      arbitrumGoerli: env.string("ETHERSCAN_API_KEY_ARB", ""),
+      sepolia: env.string("ETHERSCAN_API_KEY_ETH", ""),
+      // arbitrumSepolia: env.string("ETHERSCAN_API_KEY_ARB", ""),
       arbitrumOne: env.string("ETHERSCAN_API_KEY_ARB", ""),
       optimisticEthereum: env.string("ETHERSCAN_API_KEY_OPT", ""),
-      optimisticGoerli: env.string("ETHERSCAN_API_KEY_OPT", ""),
+      "opt_sepolia": env.string("ETHERSCAN_API_KEY_OPT", ""),
     },
+
+    customChains: [
+        {
+          network: 'sepolia',
+          chainId: 11155111,
+          urls: {
+            apiURL: 'https://api-sepolia.etherscan.io/api',
+            browserURL: 'https://sepolia.etherscan.io',
+          },
+        },
+        {
+            network: 'opt_sepolia',
+            chainId: 11155420,
+            urls: {
+              apiURL: 'https://api-sepolia-optimism.etherscan.io/api',
+              browserURL: 'https://sepolia-optimism.etherscan.io',
+            },
+          },
+      ],
   },
   typechain: {
     externalArtifacts: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,10 +11,10 @@
     "test:unit": "hardhat test ./test/**/*.unit.test.ts",
     "test:integration": "hardhat test ./test/**/*.integration.test.ts",
     "fork:eth:mainnet": "hardhat node:fork eth_mainnet 8545",
-    "fork:eth:goerli": "hardhat node:fork eth_goerli 8545",
-    "fork:arb:goerli": "hardhat node:fork arb_goerli 8546",
+    "fork:eth:sepolia": "hardhat node:fork eth_sepolia 8545",
+    "fork:arb:sepolia": "hardhat node:fork arb_sepolia 8546",
     "fork:arb:mainnet": "hardhat node:fork arb_mainnet 8546",
-    "fork:opt:goerli": "hardhat node:fork opt_goerli 9545",
+    "fork:opt:sepolia": "hardhat node:fork opt_sepolia 9545",
     "fork:opt:mainnet": "hardhat node:fork opt_mainnet 9545",
     "arbitrum:deploy": "ts-node --files ./scripts/arbitrum/deploy-gateway.ts",
     "arbitrum:finalize-message": "ts-node --files ./scripts/arbitrum/finalize-message.ts",
@@ -38,7 +38,7 @@
   "license": "ISC",
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.6",
-    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@nomiclabs/hardhat-etherscan": "^3.1.8",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@typechain/ethers-v5": "^7.2.0",
     "@typechain/hardhat": "^2.3.1",

diff --git a/test/arbitrum/bridging-native.e2e.test.ts b/test/arbitrum/bridging-native.e2e.test.ts
@@ -12,7 +12,7 @@ import arbitrum from "../../utils/arbitrum";
 import { ethers } from "hardhat";
 
 async function ctxFactory() {
-  const networkName = env.network("TESTING_ARB_NETWORK", "goerli");
+  const networkName = env.network("TESTING_ARB_NETWORK", "sepolia");
   const testingSetup = await arbitrum.testing(networkName).getE2ETestSetup();
 
   const l2Network = await getL2Network(testingSetup.l2Provider);

diff --git a/test/arbitrum/bridging-router.e2e.test.ts b/test/arbitrum/bridging-router.e2e.test.ts
@@ -7,7 +7,7 @@ import { scenario } from "../../utils/testing";
 import arbitrum from "../../utils/arbitrum";
 
 async function ctxFactory() {
-  const networkName = env.network("TESTING_ARB_NETWORK", "goerli");
+  const networkName = env.network("TESTING_ARB_NETWORK", "sepolia");
   const testingSetup = await arbitrum.testing(networkName).getE2ETestSetup();
 
   const l2Network = await getL2Network(testingSetup.l2Provider);

diff --git a/test/arbitrum/managing-deposits.e2e.test.ts b/test/arbitrum/managing-deposits.e2e.test.ts
@@ -77,7 +77,7 @@ const scenarioTest = scenario(
         [false, false],
       ]);
 
-    const arbAddresses = arbitrum.addresses("goerli");
+    const arbAddresses = arbitrum.addresses("sepolia");
 
     const { calldata, callvalue } =
       await ctx.messaging.prepareRetryableTicketTx({
@@ -160,7 +160,7 @@ scenarioTest.run();
 scenarioTest.run();
 
 async function ctxFactory() {
-  const ethArbNetwork = network.multichain(["eth", "arb"], "goerli");
+  const ethArbNetwork = network.multichain(["eth", "arb"], "sepolia");
 
   const [l1Provider] = ethArbNetwork.getProviders({
     forking: false,
@@ -176,8 +176,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: arbitrum.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: arbitrum.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l2Tester,
     l1Provider,

diff --git a/test/arbitrum/managing-executor.e2e.test.ts b/test/arbitrum/managing-executor.e2e.test.ts
@@ -59,7 +59,7 @@ scenario("Arbitrum :: Update guardian", ctxFactory)
         [false],
       ]);
 
-    const arbAddresses = arbitrum.addresses("goerli");
+    const arbAddresses = arbitrum.addresses("sepolia");
 
     const { calldata, callvalue } =
       await ctx.messaging.prepareRetryableTicketTx({
@@ -134,7 +134,7 @@ scenario("Arbitrum :: Update guardian", ctxFactory)
   .run();
 
 async function ctxFactory() {
-  const ethArbNetwork = network.multichain(["eth", "arb"], "goerli");
+  const ethArbNetwork = network.multichain(["eth", "arb"], "sepolia");
 
   const [l1Provider] = ethArbNetwork.getProviders({
     forking: false,
@@ -150,8 +150,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: arbitrum.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: arbitrum.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l2Tester,
     l1Provider,

diff --git a/test/arbitrum/managing-proxy.e2e.test.ts b/test/arbitrum/managing-proxy.e2e.test.ts
@@ -66,7 +66,7 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
         [false],
       ]);
 
-    const arbAddresses = arbitrum.addresses("goerli");
+    const arbAddresses = arbitrum.addresses("sepolia");
 
     const { calldata, callvalue } =
       await ctx.messaging.prepareRetryableTicketTx({
@@ -173,7 +173,7 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
         [false],
       ]);
 
-    const arbAddresses = arbitrum.addresses("goerli");
+    const arbAddresses = arbitrum.addresses("sepolia");
 
     const { calldata, callvalue } =
       await ctx.messaging.prepareRetryableTicketTx({
@@ -240,7 +240,7 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
   .run();
 
 async function ctxFactory() {
-  const ethArbNetwork = network.multichain(["eth", "arb"], "goerli");
+  const ethArbNetwork = network.multichain(["eth", "arb"], "sepolia");
 
   const [l1Provider] = ethArbNetwork.getProviders({
     forking: false,
@@ -256,8 +256,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: arbitrum.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: arbitrum.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l2Tester,
     l1LDOHolder,

diff --git a/test/optimism/bridging-to.e2e.test.ts b/test/optimism/bridging-to.e2e.test.ts
@@ -132,7 +132,7 @@ scenario("Optimism :: Bridging via depositTo/withdrawTo E2E test", ctxFactory)
   .run();
 
 async function ctxFactory() {
-  const networkName = env.network("TESTING_OPT_NETWORK", "goerli");
+  const networkName = env.network("TESTING_OPT_NETWORK", "sepolia");
   const testingSetup = await optimism.testing(networkName).getE2ETestSetup();
 
   return {

diff --git a/test/optimism/bridging.e2e.test.ts b/test/optimism/bridging.e2e.test.ts
@@ -122,7 +122,7 @@ scenario("Optimism :: Bridging via deposit/withdraw E2E test", ctxFactory)
   .run();
 
 async function ctxFactory() {
-  const networkName = env.network("TESTING_OPT_NETWORK", "goerli");
+  const networkName = env.network("TESTING_OPT_NETWORK", "sepolia");
   const testingSetup = await optimism.testing(networkName).getE2ETestSetup();
 
   return {

diff --git a/test/optimism/managing-deposits.e2e.test.ts b/test/optimism/managing-deposits.e2e.test.ts
@@ -63,7 +63,7 @@ const scenarioTest = scenario(
         [false, false],
       ]);
 
-    const optAddresses = optimism.addresses("goerli");
+    const optAddresses = optimism.addresses("sepolia");
 
     const { calldata, callvalue } = await ctx.messaging.prepareL2Message({
       sender: ctx.lidoAragonDAO.agent.address,
@@ -138,7 +138,7 @@ scenarioTest.run();
 scenarioTest.run();
 
 async function ctxFactory() {
-  const ethOptNetwork = network.multichain(["eth", "opt"], "goerli");
+  const ethOptNetwork = network.multichain(["eth", "opt"], "sepolia");
 
   const [l1Provider] = ethOptNetwork.getProviders({ forking: false });
   const [l1Tester, l2Tester] = ethOptNetwork.getSigners(
@@ -152,8 +152,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: optimism.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: optimism.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l1Tester,
     l2Tester,

diff --git a/test/optimism/managing-executor.e2e.test.ts b/test/optimism/managing-executor.e2e.test.ts
@@ -47,7 +47,7 @@ scenario("Optimism :: AAVE governance crosschain bridge management", ctxFactory)
         [false],
       ]);
 
-    const optAddresses = optimism.addresses("goerli");
+    const optAddresses = optimism.addresses("sepolia");
 
     const { calldata, callvalue } = await ctx.messaging.prepareL2Message({
       sender: ctx.lidoAragonDAO.agent.address,
@@ -115,7 +115,7 @@ scenario("Optimism :: AAVE governance crosschain bridge management", ctxFactory)
   .run();
 
 async function ctxFactory() {
-  const ethOptNetwork = network.multichain(["eth", "opt"], "goerli");
+  const ethOptNetwork = network.multichain(["eth", "opt"], "sepolia");
 
   const [l1Provider] = ethOptNetwork.getProviders({ forking: false });
   const [, l2Tester] = ethOptNetwork.getSigners(
@@ -129,8 +129,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: optimism.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: optimism.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l2Tester,
     l1LDOHolder,

diff --git a/test/optimism/managing-proxy.e2e.test.ts b/test/optimism/managing-proxy.e2e.test.ts
@@ -47,7 +47,7 @@ scenario(
         [false],
       ]);
 
-    const optAddresses = optimism.addresses("goerli");
+    const optAddresses = optimism.addresses("sepolia");
 
     const { calldata, callvalue } = await ctx.messaging.prepareL2Message({
       sender: ctx.lidoAragonDAO.agent.address,
@@ -118,7 +118,7 @@ scenario(
         [false],
       ]);
 
-    const optAddresses = optimism.addresses("goerli");
+    const optAddresses = optimism.addresses("sepolia");
 
     const { calldata, callvalue } = await ctx.messaging.prepareL2Message({
       sender: ctx.lidoAragonDAO.agent.address,
@@ -180,7 +180,7 @@ scenario(
   .run();
 
 async function ctxFactory() {
-  const ethOptNetwork = network.multichain(["eth", "opt"], "goerli");
+  const ethOptNetwork = network.multichain(["eth", "opt"], "sepolia");
 
   const [l1Provider] = ethOptNetwork.getProviders({ forking: false });
   const [l1Tester, l2Tester] = ethOptNetwork.getSigners(
@@ -194,8 +194,8 @@ async function ctxFactory() {
   );
 
   return {
-    lidoAragonDAO: lido("goerli", l1Provider),
-    messaging: optimism.messaging("goerli", { forking: false }),
+    lidoAragonDAO: lido("sepolia", l1Provider),
+    messaging: optimism.messaging("sepolia", { forking: false }),
     gasAmount: wei`0.1 ether`,
     l1Tester,
     l2Tester,

diff --git a/utils/arbitrum/addresses.ts b/utils/arbitrum/addresses.ts
@@ -26,7 +26,7 @@ export default function addresses(
   switch (networkName) {
     case "mainnet":
       return { ...ArbitrumMainnetAddresses, ...options.customAddresses };
-    case "goerli":
+    case "sepolia":
       return { ...ArbitrumGoerliAddresses, ...options.customAddresses };
     default:
       throw new Error(`Network "${networkName}" is not supported`);