diff --git a/src/components/Logo/util.ts b/src/components/Logo/util.ts index 54917a9bd..20c8f2e71 100644 --- a/src/components/Logo/util.ts +++ b/src/components/Logo/util.ts @@ -55,7 +55,6 @@ export function getNativeLogoURI(chainId: SupportedChainId = SupportedChainId.MA case SupportedChainId.BNB: return BnbLogo case SupportedChainId.BASE: - case SupportedChainId.BASE_GOERLI: return BaseLogo default: return EthereumLogo diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index fe3103be7..657c0c331 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -250,20 +250,7 @@ const CHAIN_INFO: ChainInfoMap = { nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, color: '#0152ff', backgroundColor: '#0152ff', - }, - [SupportedChainId.BASE_GOERLI]: { - networkType: NetworkType.L2, - blockWaitMsBeforeWarning: ms`10m`, - bridge: 'https://goerli-bridge.base.org/', - docs: 'https://docs.base.org/', - explorer: 'https://goerli.basescan.org/', - infoLink: 'https://info.uniswap.org/#/base/', - label: 'Base Goerli', - logoUrl: baseLogo, - nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, - color: '#0152ff', - backgroundColor: '#0152ff', - }, + } } export function getChainInfo(chainId: SupportedL1ChainId): L1ChainInfo diff --git a/src/constants/chains.ts b/src/constants/chains.ts index 1dfb8fa68..87d90235d 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -23,7 +23,6 @@ export enum SupportedChainId { BNB = 56, BASE = 8453, - BASE_GOERLI = 84531, } export enum ChainName { @@ -42,7 +41,6 @@ export enum ChainName { CELO_ALFAJORES = 'celo-alfajores', BNB = 'bnb', BASE = 'base', - BASE_GOERLI = 'base-goerli', } export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { @@ -61,7 +59,6 @@ export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { [ChainName.CELO_ALFAJORES]: SupportedChainId.CELO_ALFAJORES, [ChainName.BNB]: SupportedChainId.BNB, [ChainName.BASE]: SupportedChainId.BASE, - [ChainName.BASE_GOERLI]: SupportedChainId.BASE_GOERLI, } /** @@ -95,7 +92,6 @@ export const L1_CHAIN_IDS = [ SupportedChainId.CELO, SupportedChainId.CELO_ALFAJORES, SupportedChainId.BASE, - SupportedChainId.BASE_GOERLI, ] as const export type SupportedL1ChainId = typeof L1_CHAIN_IDS[number] @@ -110,7 +106,6 @@ export const L2_CHAIN_IDS = [ SupportedChainId.OPTIMISM, SupportedChainId.OPTIMISM_GOERLI, SupportedChainId.BASE, - SupportedChainId.BASE_GOERLI, ] as const export type SupportedL2ChainId = typeof L2_CHAIN_IDS[number] diff --git a/src/constants/jsonRpcEndpoints.ts b/src/constants/jsonRpcEndpoints.ts index 8069dea12..d95cd2587 100644 --- a/src/constants/jsonRpcEndpoints.ts +++ b/src/constants/jsonRpcEndpoints.ts @@ -89,9 +89,11 @@ export const JSON_RPC_FALLBACK_ENDPOINTS: Record = { [SupportedChainId.BASE]: [ // "Safe" URLs 'https://mainnet.base.org', - ], - [SupportedChainId.BASE_GOERLI]: [ - // "Safe" URLs - 'https://goerli.base.org', + 'https://developer-access-mainnet.base.org/', + 'https://base.gateway.tenderly.co', + 'https://base.publicnode.com', + // "Fallback" URLs + 'https://1rpc.io/base', + 'https://base.meowrpc.com', ], } diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index a123bb283..846aebfb4 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -137,13 +137,6 @@ export const USDC_BASE = new Token( 'USDC', 'USD Coin' ) -export const USDBC_BASE_GOERLI = new Token( - SupportedChainId.BASE_GOERLI, - '0x853154e2A5604E5C74a2546E2871Ad44932eB92C', - 6, - 'USDbC', - 'USD Base Coin' -) export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.MAINNET]: USDC_MAINNET, [SupportedChainId.ARBITRUM_ONE]: USDC_ARBITRUM, @@ -160,7 +153,6 @@ export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.ROPSTEN]: USDC_ROPSTEN, [SupportedChainId.BNB]: USDC_BNB_CHAIN, [SupportedChainId.BASE]: USDC_BASE, - [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI, } export const DAI_POLYGON = new Token( SupportedChainId.POLYGON, @@ -521,13 +513,6 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } = 'WETH', 'Wrapped Ether' ), - [SupportedChainId.BASE_GOERLI]: new Token( - SupportedChainId.BASE_GOERLI, - '0x4200000000000000000000000000000000000006', - 18, - 'WETH', - 'Wrapped Ether' - ), } export function isCelo(chainId: number): chainId is SupportedChainId.CELO | SupportedChainId.CELO_ALFAJORES { @@ -613,6 +598,5 @@ export const TOKEN_SHORTHANDS: { [shorthand: string]: { [chainId in SupportedCha [SupportedChainId.CELO]: PORTAL_USDC_CELO.address, [SupportedChainId.CELO_ALFAJORES]: USDC_CELO_ALFAJORES.address, [SupportedChainId.BASE]: USDC_BASE.address, - [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI.address, }, } diff --git a/src/hooks/web3/useJsonRpcUrlsMap.tsx b/src/hooks/web3/useJsonRpcUrlsMap.tsx index c8e36aacb..c116f668b 100644 --- a/src/hooks/web3/useJsonRpcUrlsMap.tsx +++ b/src/hooks/web3/useJsonRpcUrlsMap.tsx @@ -33,7 +33,6 @@ function toJsonRpcMap(getChainConnections: (chainId: SupportedChainId) => T): [SupportedChainId.CELO_ALFAJORES]: getChainConnections(SupportedChainId.CELO_ALFAJORES), [SupportedChainId.BNB]: getChainConnections(SupportedChainId.BNB), [SupportedChainId.BASE]: getChainConnections(SupportedChainId.BASE), - [SupportedChainId.BASE_GOERLI]: getChainConnections(SupportedChainId.BASE_GOERLI), } } diff --git a/src/utils/getExplorerLink.test.ts b/src/utils/getExplorerLink.test.ts index 626dc168b..6847a1852 100644 --- a/src/utils/getExplorerLink.test.ts +++ b/src/utils/getExplorerLink.test.ts @@ -42,7 +42,4 @@ describe('#getExplorerLink', () => { it('base', () => { expect(getExplorerLink(8453, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://basescan.org/address/abc') }) - it('base goerli', () => { - expect(getExplorerLink(84531, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://goerli.basescan.org/address/abc') - }) }) diff --git a/src/utils/getExplorerLink.ts b/src/utils/getExplorerLink.ts index 148a928ff..0d48a1f68 100644 --- a/src/utils/getExplorerLink.ts +++ b/src/utils/getExplorerLink.ts @@ -14,7 +14,6 @@ const ETHERSCAN_PREFIXES: { [chainId: number]: string } = { [SupportedChainId.CELO_ALFAJORES]: 'https://alfajores.celoscan.io', [SupportedChainId.BNB]: 'https://bscscan.com', [SupportedChainId.BASE]: 'https://basescan.org/', - [SupportedChainId.BASE_GOERLI]: 'https://goerli.basescan.org/', } export enum ExplorerDataType {