diff --git a/src/constants/addresses.ts b/src/constants/addresses.ts index 678c482ce..2aab487a6 100644 --- a/src/constants/addresses.ts +++ b/src/constants/addresses.ts @@ -7,7 +7,7 @@ export const UNI_ADDRESS: AddressMap = constructSameAddressMap('0x1f9840a85d5aF5 export const MULTICALL_ADDRESS: AddressMap = { ...constructSameAddressMap('0x1F98415757620B543A52E61c46B32eB19261F984', [ - SupportedChainId.OPTIMISTIC_KOVAN, + SupportedChainId.OPTIMISM_GOERLI, SupportedChainId.OPTIMISM, SupportedChainId.POLYGON_MUMBAI, SupportedChainId.POLYGON, @@ -18,7 +18,7 @@ export const MULTICALL_ADDRESS: AddressMap = { export const SWAP_ROUTER_ADDRESSES: AddressMap = constructSameAddressMap('0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45', [ SupportedChainId.OPTIMISM, - SupportedChainId.OPTIMISTIC_KOVAN, + SupportedChainId.OPTIMISM_GOERLI, SupportedChainId.ARBITRUM_ONE, SupportedChainId.ARBITRUM_RINKEBY, SupportedChainId.POLYGON, diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index b482d9e61..1c1651ec4 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -106,19 +106,19 @@ const CHAIN_INFO: ChainInfoMap = { helpCenterUrl: 'https://help.uniswap.org/en/collections/3137778-uniswap-on-optimistic-ethereum-oξ', nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, }, - [SupportedChainId.OPTIMISTIC_KOVAN]: { + [SupportedChainId.OPTIMISM_GOERLI]: { networkType: NetworkType.L2, blockWaitMsBeforeWarning: ms`25m`, bridge: 'https://app.optimism.io/bridge', defaultListUrl: OPTIMISM_LIST, docs: 'https://optimism.io/', - explorer: 'https://optimistic.etherscan.io/', + explorer: 'https://goerli-optimism.etherscan.io/', infoLink: 'https://info.uniswap.org/#/optimism/', - label: 'Optimistic Kovan', + label: 'Optimism Goerli', logoUrl: optimismLogoUrl, statusPage: 'https://optimism.io/status', helpCenterUrl: 'https://help.uniswap.org/en/collections/3137778-uniswap-on-optimistic-ethereum-oξ', - nativeCurrency: { name: 'Optimistic Kovan Ether', symbol: 'kovOpETH', decimals: 18 }, + nativeCurrency: { name: 'Optimism Görli Ether', symbol: 'görOpETH', decimals: 18 }, }, [SupportedChainId.ARBITRUM_ONE]: { networkType: NetworkType.L2, diff --git a/src/constants/chains.ts b/src/constants/chains.ts index b9283da93..92819db58 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -12,7 +12,7 @@ export enum SupportedChainId { ARBITRUM_RINKEBY = 421611, OPTIMISM = 10, - OPTIMISTIC_KOVAN = 69, + OPTIMISM_GOERLI = 420, POLYGON = 137, POLYGON_MUMBAI = 80001, @@ -25,7 +25,7 @@ export enum ChainName { GOERLI = 'goerli', KOVAN = 'kovan', OPTIMISM = 'optimism-mainnet', - OPTIMISTIC_KOVAN = 'optimism-kovan', + OPTIMISM_GOERLI = 'optimism-goerli', ARBITRUM_ONE = 'arbitrum-mainnet', ARBITRUM_RINKEBY = 'arbitrum-rinkeby', POLYGON = 'polygon-mainnet', @@ -43,7 +43,7 @@ export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { [ChainName.ARBITRUM_ONE]: SupportedChainId.ARBITRUM_ONE, [ChainName.ARBITRUM_RINKEBY]: SupportedChainId.ARBITRUM_RINKEBY, [ChainName.OPTIMISM]: SupportedChainId.OPTIMISM, - [ChainName.OPTIMISTIC_KOVAN]: SupportedChainId.OPTIMISTIC_KOVAN, + [ChainName.OPTIMISM_GOERLI]: SupportedChainId.OPTIMISM_GOERLI, } /** @@ -83,7 +83,7 @@ export const L2_CHAIN_IDS = [ SupportedChainId.ARBITRUM_ONE, SupportedChainId.ARBITRUM_RINKEBY, SupportedChainId.OPTIMISM, - SupportedChainId.OPTIMISTIC_KOVAN, + SupportedChainId.OPTIMISM_GOERLI, ] as const export type SupportedL2ChainId = typeof L2_CHAIN_IDS[number] diff --git a/src/constants/jsonRpcEndpoints.ts b/src/constants/jsonRpcEndpoints.ts index 56ff9ef5b..128579420 100644 --- a/src/constants/jsonRpcEndpoints.ts +++ b/src/constants/jsonRpcEndpoints.ts @@ -67,8 +67,8 @@ export const JSON_RPC_FALLBACK_ENDPOINTS: Record = { // "Fallback" URLs 'https://rpc.ankr.com/optimism', ], - [SupportedChainId.OPTIMISTIC_KOVAN]: [ + [SupportedChainId.OPTIMISM_GOERLI]: [ // "Safe" URLs - 'https://kovan.optimism.io', + 'https://goerli.optimism.io', ], } diff --git a/src/constants/routing.ts b/src/constants/routing.ts index 66e418f70..fae84f6cf 100644 --- a/src/constants/routing.ts +++ b/src/constants/routing.ts @@ -149,7 +149,7 @@ export const COMMON_BASES: ChainCurrencyList = { USDT_OPTIMISM, WBTC_OPTIMISM, ], - [SupportedChainId.OPTIMISTIC_KOVAN]: [nativeOnChain(SupportedChainId.OPTIMISTIC_KOVAN)], + [SupportedChainId.OPTIMISM_GOERLI]: [nativeOnChain(SupportedChainId.OPTIMISM_GOERLI)], [SupportedChainId.POLYGON]: [ nativeOnChain(SupportedChainId.POLYGON), WETH_POLYGON, diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index 04278e462..d3094db8f 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -46,9 +46,9 @@ export const USDC_OPTIMISM = new Token( 'USDC', 'USD//C' ) -export const USDC_OPTIMISTIC_KOVAN = new Token( - SupportedChainId.OPTIMISTIC_KOVAN, - '0x3b8e53b3ab8e01fb57d0c9e893bc4d655aa67d84', +export const USDC_OPTIMISM_GOERLI = new Token( + SupportedChainId.OPTIMISM_GOERLI, + '0x7E07E15D2a87A24492740D16f5bdF58c16db0c4E', 6, 'USDC', 'USD//C' @@ -115,7 +115,7 @@ export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.ARBITRUM_ONE]: USDC_ARBITRUM, [SupportedChainId.OPTIMISM]: USDC_OPTIMISM, [SupportedChainId.ARBITRUM_RINKEBY]: USDC_ARBITRUM_RINKEBY, - [SupportedChainId.OPTIMISTIC_KOVAN]: USDC_OPTIMISTIC_KOVAN, + [SupportedChainId.OPTIMISM_GOERLI]: USDC_OPTIMISM_GOERLI, [SupportedChainId.POLYGON]: USDC_POLYGON, [SupportedChainId.POLYGON_MUMBAI]: USDC_POLYGON_MUMBAI, [SupportedChainId.GOERLI]: USDC_GOERLI, @@ -281,8 +281,8 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } = 'WETH', 'Wrapped Ether' ), - [SupportedChainId.OPTIMISTIC_KOVAN]: new Token( - SupportedChainId.OPTIMISTIC_KOVAN, + [SupportedChainId.OPTIMISM_GOERLI]: new Token( + SupportedChainId.OPTIMISM_GOERLI, '0x4200000000000000000000000000000000000006', 18, 'WETH', @@ -370,7 +370,7 @@ export const TOKEN_SHORTHANDS: { [shorthand: string]: { [chainId in SupportedCha [SupportedChainId.ARBITRUM_ONE]: USDC_ARBITRUM.address, [SupportedChainId.OPTIMISM]: USDC_OPTIMISM.address, [SupportedChainId.ARBITRUM_RINKEBY]: USDC_ARBITRUM_RINKEBY.address, - [SupportedChainId.OPTIMISTIC_KOVAN]: USDC_OPTIMISTIC_KOVAN.address, + [SupportedChainId.OPTIMISM_GOERLI]: USDC_OPTIMISM_GOERLI.address, [SupportedChainId.POLYGON]: USDC_POLYGON.address, [SupportedChainId.POLYGON_MUMBAI]: USDC_POLYGON_MUMBAI.address, [SupportedChainId.GOERLI]: USDC_GOERLI.address, diff --git a/src/cosmos/useProvider.ts b/src/cosmos/useProvider.ts index 2e7b09a01..7a27d45e7 100644 --- a/src/cosmos/useProvider.ts +++ b/src/cosmos/useProvider.ts @@ -20,7 +20,7 @@ export const INFURA_NETWORK_URLS: { [chainId: number]: string[] } = INFURA_KEY [SupportedChainId.GOERLI]: [`https://goerli.infura.io/v3/${INFURA_KEY}`], [SupportedChainId.KOVAN]: [`https://kovan.infura.io/v3/${INFURA_KEY}`], [SupportedChainId.OPTIMISM]: [`https://optimism-mainnet.infura.io/v3/${INFURA_KEY}`], - [SupportedChainId.OPTIMISTIC_KOVAN]: [`https://optimism-kovan.infura.io/v3/${INFURA_KEY}`], + [SupportedChainId.OPTIMISM_GOERLI]: [`https://optimism-goerli.infura.io/v3/${INFURA_KEY}`], [SupportedChainId.ARBITRUM_ONE]: [`https://arbitrum-mainnet.infura.io/v3/${INFURA_KEY}`], [SupportedChainId.ARBITRUM_RINKEBY]: [`https://arbitrum-rinkeby.infura.io/v3/${INFURA_KEY}`], [SupportedChainId.POLYGON]: [`https://polygon-mainnet.infura.io/v3/${INFURA_KEY}`], diff --git a/src/hooks/transactions/updater.tsx b/src/hooks/transactions/updater.tsx index b6865649e..d49ecf610 100644 --- a/src/hooks/transactions/updater.tsx +++ b/src/hooks/transactions/updater.tsx @@ -33,7 +33,7 @@ export function shouldCheck(lastBlockNumber: number, tx: Transaction): boolean { const RETRY_OPTIONS_BY_CHAIN_ID: { [chainId: number]: RetryOptions } = { [SupportedChainId.ARBITRUM_ONE]: { n: 10, minWait: 250, maxWait: 1000 }, [SupportedChainId.ARBITRUM_RINKEBY]: { n: 10, minWait: 250, maxWait: 1000 }, - [SupportedChainId.OPTIMISTIC_KOVAN]: { n: 10, minWait: 250, maxWait: 1000 }, + [SupportedChainId.OPTIMISM_GOERLI]: { n: 10, minWait: 250, maxWait: 1000 }, [SupportedChainId.OPTIMISM]: { n: 10, minWait: 250, maxWait: 1000 }, } const DEFAULT_RETRY_OPTIONS: RetryOptions = { n: 1, minWait: 0, maxWait: 0 } diff --git a/src/hooks/web3/useJsonRpcUrlsMap.tsx b/src/hooks/web3/useJsonRpcUrlsMap.tsx index fc0b286ba..fa537b9c5 100644 --- a/src/hooks/web3/useJsonRpcUrlsMap.tsx +++ b/src/hooks/web3/useJsonRpcUrlsMap.tsx @@ -28,7 +28,7 @@ function toJsonRpcMap(getChainConnections: (chainId: SupportedChainId) => T): [SupportedChainId.ARBITRUM_ONE]: getChainConnections(SupportedChainId.ARBITRUM_ONE), [SupportedChainId.ARBITRUM_RINKEBY]: getChainConnections(SupportedChainId.ARBITRUM_RINKEBY), [SupportedChainId.OPTIMISM]: getChainConnections(SupportedChainId.OPTIMISM), - [SupportedChainId.OPTIMISTIC_KOVAN]: getChainConnections(SupportedChainId.OPTIMISTIC_KOVAN), + [SupportedChainId.OPTIMISM_GOERLI]: getChainConnections(SupportedChainId.OPTIMISM_GOERLI), } } diff --git a/src/utils/getExplorerLink.ts b/src/utils/getExplorerLink.ts index 633c898ab..77d15d9dc 100644 --- a/src/utils/getExplorerLink.ts +++ b/src/utils/getExplorerLink.ts @@ -7,7 +7,7 @@ const ETHERSCAN_PREFIXES: { [chainId: number]: string } = { [SupportedChainId.GOERLI]: 'https://goerli.etherscan.io', [SupportedChainId.KOVAN]: 'https://kovan.etherscan.io', [SupportedChainId.OPTIMISM]: 'https://optimistic.etherscan.io', - [SupportedChainId.OPTIMISTIC_KOVAN]: 'https://kovan-optimistic.etherscan.io', + [SupportedChainId.OPTIMISM_GOERLI]: 'https://goerli-optimism.etherscan.io/', [SupportedChainId.POLYGON_MUMBAI]: 'https://mumbai.polygonscan.com', [SupportedChainId.POLYGON]: 'https://polygonscan.com', } @@ -64,7 +64,7 @@ export function getExplorerLink(chainId: number, data: string, type: ExplorerDat return `${prefix}/token/${data}` case ExplorerDataType.BLOCK: - if (chainId === SupportedChainId.OPTIMISM || chainId === SupportedChainId.OPTIMISTIC_KOVAN) { + if (chainId === SupportedChainId.OPTIMISM || chainId === SupportedChainId.OPTIMISM_GOERLI) { return `${prefix}/tx/${data}` } return `${prefix}/block/${data}`