Split Optimism and Arbitrum testnets

Author: Krishang Nadgauda

hardhat.config.ts

@@ -26,9 +26,11 @@ const chainIds = {
   polygon: 137,
   mumbai: 80001,
   optimism: 10,
-  optimism_testnet: 69,
+  optimism_kovan: 69,
+  optimism_goerli: 420,
   arbitrum: 42161,
-  arbitrum_testnet: 421611,
+  arbitrum_rinkeby: 421611,
+  arbitrum_goerli: 421613,
   binance: 56,
   binance_testnet: 97
 };
@@ -54,15 +56,21 @@ function createTestnetConfig(network: keyof typeof chainIds): NetworkUserConfig
     case "optimism":
       nodeUrl = `https://opt-mainnet.g.alchemy.com/v2/${alchemyKey}`;
       break;
-    case "optimism_testnet":
+    case "optimism_kovan":
       nodeUrl = `https://opt-kovan.g.alchemy.com/v2/${alchemyKey}`;
       break;
+    case "optimism_goerli":
+      nodeUrl = `https://opt-goerli.g.alchemy.com/v2/${alchemyKey}`;
+      break;
     case "arbitrum":
       nodeUrl = `https://arb-mainnet.g.alchemy.com/v2/${alchemyKey}`;
       break;
-    case "arbitrum_testnet":
+    case "arbitrum_rinkeby":
       nodeUrl = `https://arb-rinkeby.g.alchemy.com/v2/${alchemyKey}`;
       break;
+    case "arbitrum_goerli":
+      nodeUrl = `https://arb-goerli.g.alchemy.com/v2/${alchemyKey}`;
+      break;
     case "avax":
       nodeUrl = "https://api.avax.network/ext/bc/C/rpc";
       break;
@@ -163,9 +171,11 @@ if (testPrivateKey) {
     avax: createTestnetConfig("avax"),
     avax_testnet: createTestnetConfig("avax_testnet"),
     arbitrum: createTestnetConfig("arbitrum"),
-    arbitrum_testnet: createTestnetConfig("arbitrum_testnet"),
+    arbitrum_rinkeby: createTestnetConfig("arbitrum_rinkeby"),
+    arbitrum_goerli: createTestnetConfig("arbitrum_goerli"),
     optimism: createTestnetConfig("optimism"),
-    optimism_testnet: createTestnetConfig("optimism_testnet"),
+    optimism_kovan: createTestnetConfig("optimism_kovan"),
+    optimism_goerli: createTestnetConfig("optimism_goerli"),
     binance: createTestnetConfig("binance"),
     binance_testnet: createTestnetConfig("binance_testnet"),
   };

package.json

@@ -15,7 +15,7 @@
     "@openzeppelin/contracts": "4.5.0",
     "@openzeppelin/contracts-upgradeable": "4.5.1",
     "@primitivefi/hardhat-dodoc": "^0.2.0",
-    "@thirdweb-dev/sdk": "^2.4.0-0",
+    "@thirdweb-dev/sdk": "^3.0.4",
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^4.0.0",
     "@types/fs-extra": "^9.0.13",

scripts/release/constants.ts

@@ -11,9 +11,11 @@ export const nativeTokenWrapper: Record<number, string> = {
   250: "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83", // fantom
   4002: "0xf1277d1Ed8AD466beddF92ef448A132661956621", // fantom testnet
   10: "0x4200000000000000000000000000000000000006", // optimism
-  69: "0xbC6F6b680bc61e30dB47721c6D1c5cde19C1300d", // optimism testnet
+  69: "0xbC6F6b680bc61e30dB47721c6D1c5cde19C1300d", // optimism kovan
+  420: "0x4200000000000000000000000000000000000006", // optimism goerli
   42161: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1", // arbitrum
-  421611: "0xEBbc3452Cc911591e4F18f3b36727Df45d6bd1f9", // arbitrum testnet
+  421611: "0xEBbc3452Cc911591e4F18f3b36727Df45d6bd1f9", // arbitrum rinkeby
+  421613: "0xe39Ab88f8A4777030A534146A9Ca3B52bd5D43A3", // arbitrum goerli
 };
 
 export const chainIdToName: Record<number, string> = {
@@ -23,9 +25,11 @@ export const chainIdToName: Record<number, string> = {
   [ChainId.Polygon]: "polygon",
   [ChainId.Mainnet]: "mainnet",
   [ChainId.Optimism]: "optimism",
-  [ChainId.OptimismTestnet]: "optimism-testnet",
+  [ChainId.OptimismKovan]: "optimism-kovan",
+  [ChainId.OptimismGoerli]: "optimism-goerli",
   [ChainId.Arbitrum]: "arbitrum",
-  [ChainId.ArbitrumTestnet]: "arbitrum-testnet",
+  [ChainId.ArbitrumRinkeby]: "arbitrum-rinkeby",
+  [ChainId.ArbitrumGoerli]: "arbitrum-goerli",
   [ChainId.Fantom]: "fantom",
   [ChainId.FantomTestnet]: "fantom-testnet",
   [ChainId.Avalanche]: "avalanche",
@@ -43,9 +47,9 @@ export const defaultFactories: Record<number, string> = {
   [ChainId.Fantom]: CONTRACT_ADDRESSES[ChainId.Fantom].twFactory,
   [ChainId.FantomTestnet]: CONTRACT_ADDRESSES[ChainId.FantomTestnet].twFactory,
   [ChainId.Optimism]: CONTRACT_ADDRESSES[ChainId.Optimism].twFactory,
-  [ChainId.OptimismTestnet]: CONTRACT_ADDRESSES[ChainId.OptimismTestnet].twFactory,
+  [ChainId.OptimismGoerli]: CONTRACT_ADDRESSES[ChainId.OptimismGoerli].twFactory,
   [ChainId.Arbitrum]: CONTRACT_ADDRESSES[ChainId.Arbitrum].twFactory,
-  [ChainId.ArbitrumTestnet]: CONTRACT_ADDRESSES[ChainId.ArbitrumTestnet].twFactory,
+  [ChainId.ArbitrumGoerli]: CONTRACT_ADDRESSES[ChainId.ArbitrumGoerli].twFactory,
   [ChainId.Avalanche]: CONTRACT_ADDRESSES[ChainId.Avalanche].twFactory,
   [ChainId.AvalancheFujiTestnet]: CONTRACT_ADDRESSES[ChainId.AvalancheFujiTestnet].twFactory,
 };

utils/nativeTokenWrapper.ts

@@ -9,9 +9,11 @@ export const nativeTokenWrapper: Record<number, string> = {
   250: "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83",
   4002: "0xf1277d1Ed8AD466beddF92ef448A132661956621",
   10: "0x4200000000000000000000000000000000000006", // optimism
-  69: "0xbC6F6b680bc61e30dB47721c6D1c5cde19C1300d", // optimism testnet
+  69: "0xbC6F6b680bc61e30dB47721c6D1c5cde19C1300d", // optimism kovan
+  420: "0x4200000000000000000000000000000000000006", // optimism goerli
   42161: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1", // arbitrum
-  421611: "0xEBbc3452Cc911591e4F18f3b36727Df45d6bd1f9", // arbitrum testnet
+  421611: "0xEBbc3452Cc911591e4F18f3b36727Df45d6bd1f9", // arbitrum rinkeby
+  421613: "0xe39Ab88f8A4777030A534146A9Ca3B52bd5D43A3", // arbitrum goerli
   56: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c", // binance mainnet
   97: "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd", // binance testnet
 };