Merge pull request #102 from blocto/feat/deprecate-goerli

feat: deprecate goerli
blocto · Apr 12, 2024 · 1994883 · 1994883
2 parents 874946a + 83aae34
commit 1994883
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 65 deletions.
diff --git a/src/contracts/index.ts b/src/contracts/index.ts
@@ -13,10 +13,6 @@ export const ContractInfos: ContractInfosType = {
     abi: valueDappAbi,
     address: "0x009c403BdFaE357d82AAef2262a163287c30B739",
   },
-  [EvmChainId.EthereumGoerli]: {
-    abi: valueDappAbi,
-    address: "0x009c403BdFaE357d82AAef2262a163287c30B739",
-  },
   [EvmChainId.Bsc]: {
     abi: valueDappAbi,
     address: "0x009c403BdFaE357d82AAef2262a163287c30B739",
@@ -45,18 +41,10 @@ export const ContractInfos: ContractInfosType = {
     abi: valueDappAbi,
     address: "0x806243c7368a90D957592B55875eF4C3353C5bEa",
   },
-  [EvmChainId.ArbitrumTestnet]: {
-    abi: valueDappAbi,
-    address: "0x009c403BdFaE357d82AAef2262a163287c30B739",
-  },
   [EvmChainId.Optimism]: {
     abi: valueDappAbi,
     address: "0x806243c7368a90D957592B55875eF4C3353C5bEa",
   },
-  [EvmChainId.OptimismTestnet]: {
-    abi: valueDappAbi,
-    address: "0x009c403BdFaE357d82AAef2262a163287c30B739",
-  },
   [OtherChain.Aptos]: {
     address:
       "0x4282ed29feb89781cd4da44a5bb1d23ff7e31a9dd64536233792efe78b4a494d",

diff --git a/src/services/evm.ts b/src/services/evm.ts
@@ -22,13 +22,6 @@ export const supportedChains = [
     ],
     environment: "mainnet",
   },
-  {
-    name: "Ethereum Goerli",
-    chainId: "0x5",
-    rpcUrls: ["https://rpc.ankr.com/eth_goerli"],
-    faucet: "https://goerlifaucet.com/",
-    environment: "testnet",
-  },
   {
     name: "Ethereum Sepolia",
     chainId: "0xaa36a7",
@@ -42,13 +35,6 @@ export const supportedChains = [
     rpcUrls: ["https://arb1.arbitrum.io/rpc"],
     environment: "mainnet",
   },
-  {
-    name: "Arbitrum Goerli Testnet",
-    chainId: "0x66eed",
-    rpcUrls: ["https://goerli-rollup.arbitrum.io/rpc"],
-    faucet: "https://faucet.triangleplatform.com/arbitrum/goerli",
-    environment: "testnet",
-  },
   {
     name: "Arbitrum Sepolia Testnet",
     chainId: "0x66eee",
@@ -101,13 +87,6 @@ export const supportedChains = [
     rpcUrls: ["https://mainnet.optimism.io"],
     environment: "mainnet",
   },
-  {
-    name: "Optimism Testnet",
-    chainId: "0x1a4",
-    rpcUrls: ["https://goerli.optimism.io"],
-    faucet: "https://faucet.paradigm.xyz/",
-    environment: "testnet",
-  },
   {
     name: "Optimism Sepolia Testnet",
     chainId: "0xaa37dc",
@@ -121,13 +100,6 @@ export const supportedChains = [
     rpcUrls: ["https://mainnet.base.org"],
     environment: "mainnet",
   },
-  {
-    name: "Base Goerli Testnet",
-    chainId: "0x14a33",
-    rpcUrls: ["https://goerli.base.org"],
-    faucet: "https://faucet.quicknode.com/base/goerli",
-    environment: "testnet",
-  },
   {
     name: "Base Sepolia Testnet",
     chainId: "0x14a34",
@@ -141,13 +113,6 @@ export const supportedChains = [
     rpcUrls: ["https://rpc.zora.energy"],
     environment: "mainnet",
   },
-  {
-    name: "Zora Goerli Testnet",
-    chainId: "0x3E7",
-    rpcUrls: ["https://testnet.rpc.zora.energy"],
-    faucet: "https://testnet.zora.co",
-    environment: "testnet",
-  },
   {
     name: "Zora Sepolia Testnet",
     chainId: "0x3b9ac9ff",
@@ -161,12 +126,6 @@ export const supportedChains = [
     rpcUrls: ["https://rpc.scroll.io"],
     environment: "mainnet",
   },
-  {
-    name: "Scroll Goerli Testnet",
-    chainId: "0x82751",
-    rpcUrls: ["https://alpha-rpc.scroll.io/l2"],
-    environment: "testnet",
-  },
   {
     name: "Scroll Sepolia Testnet",
     chainId: "0x8274f",
@@ -180,13 +139,6 @@ export const supportedChains = [
     rpcUrls: ["https://rpc.linea.build"],
     environment: "mainnet",
   },
-  {
-    name: "Linea Goerli Testnet",
-    chainId: "0xe704",
-    rpcUrls: ["https://rpc.goerli.linea.build"],
-    faucet: "https://faucet.goerli.linea.build/",
-    environment: "testnet",
-  },
   {
     name: "zKatana Sepolia Testnet",
     chainId: "0x133e40",
@@ -211,11 +163,11 @@ export const supportedChains = [
 const bloctoSDK = new BloctoSDK({
   ethereum: {
     // (required) chainId to be used
-    chainId: isMainnet ? "0x1" : "0x5",
+    chainId: isMainnet ? "0x1" : "0xaa36a7",
     // (required for Ethereum) JSON RPC endpoint
     rpc: isMainnet
       ? `https://mainnet.infura.io/v3/${process.env.REACT_APP_INFURA_KEY}`
-      : "https://rpc.ankr.com/eth_goerli",
+      : "https://ethereum-sepolia.blockpi.network/v1/rpc/public",
     walletServer: process.env.REACT_APP_WALLET_SERVER,
   },
   appId: process.env.REACT_APP_DAPP_ID,

diff --git a/src/types/ChainTypes.ts b/src/types/ChainTypes.ts
@@ -15,17 +15,14 @@ export enum EvmChain {
 
 export enum EvmChainId {
   Ethereum = "0x1",
-  EthereumGoerli = "0x5",
   Bsc = "0x38",
   BscTestnet = "0x61",
   Polygon = "0x89",
   PolygonTestnet = "0x13881",
   Avalanche = "0xa86a",
   AvalancheTestnet = "0xa869",
   Arbitrum = "0xa4b1",
-  ArbitrumTestnet = "0x66eed",
   Optimism = "0x000a",
-  OptimismTestnet = "0x01a4",
 }
 
 export type ChainsType = OtherChain;