FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

chore: switch optimism testnet from kovan to goerli (#4719) · Osub/interface@d8c84a9 · GitHub

  1. Osub
  2. interface

Repository navigation

Commit d8c84a9

Browse files
annieke
and
vm
authored
chore: switch optimism testnet from kovan to goerli (Uniswap#4719)
* chore: switch optimism testnet from kovan to goerli * update supported chain id check Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
1 parent 68282af commit d8c84a9

20 files changed

Lines changed: 50 additions & 50 deletions

File tree

‎src/components/DowntimeWarning/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default function DowntimeWarning() {
4949

5050
switch (chainId) {
5151
case SupportedChainId.OPTIMISM:
52-
case SupportedChainId.OPTIMISTIC_KOVAN:
52+
case SupportedChainId.OPTIMISM_GOERLI:
5353
return (
5454
<Wrapper>
5555
<Trans>

‎src/components/Header/NetworkSelector.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ const BridgeLabel = ({ chainId }: { chainId: SupportedChainId }) => {
178178
case SupportedChainId.ARBITRUM_RINKEBY:
179179
return <Trans>Arbitrum Bridge</Trans>
180180
case SupportedChainId.OPTIMISM:
181-
case SupportedChainId.OPTIMISTIC_KOVAN:
181+
case SupportedChainId.OPTIMISM_GOERLI:
182182
return <Trans>Optimism Bridge</Trans>
183183
case SupportedChainId.POLYGON:
184184
case SupportedChainId.POLYGON_MUMBAI:
@@ -196,7 +196,7 @@ const ExplorerLabel = ({ chainId }: { chainId: SupportedChainId }) => {
196196
case SupportedChainId.ARBITRUM_RINKEBY:
197197
return <Trans>Arbiscan</Trans>
198198
case SupportedChainId.OPTIMISM:
199-
case SupportedChainId.OPTIMISTIC_KOVAN:
199+
case SupportedChainId.OPTIMISM_GOERLI:
200200
return <Trans>Optimistic Etherscan</Trans>
201201
case SupportedChainId.POLYGON:
202202
case SupportedChainId.POLYGON_MUMBAI:

‎src/components/NetworkAlert/NetworkAlert.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const RootWrapper = styled.div`
3737

3838
const SHOULD_SHOW_ALERT = {
3939
[SupportedChainId.OPTIMISM]: true,
40-
[SupportedChainId.OPTIMISTIC_KOVAN]: true,
40+
[SupportedChainId.OPTIMISM_GOERLI]: true,
4141
[SupportedChainId.ARBITRUM_ONE]: true,
4242
[SupportedChainId.ARBITRUM_RINKEBY]: true,
4343
[SupportedChainId.POLYGON]: true,
@@ -62,7 +62,7 @@ const BG_COLORS_BY_DARK_MODE_AND_CHAIN_ID: {
6262
'radial-gradient(182.71% 150.59% at 2.81% 7.69%, rgba(90, 190, 170, 0.15) 0%, rgba(80, 160, 40, 0.15) 100%)',
6363
[SupportedChainId.OPTIMISM]:
6464
'radial-gradient(948% 292% at 42% 0%, rgba(255, 58, 212, 0.01) 0%, rgba(255, 255, 255, 0.04) 100%),radial-gradient(98% 96% at 2% 0%, rgba(255, 39, 39, 0.01) 0%, rgba(235, 0, 255, 0.01) 96%)',
65-
[SupportedChainId.OPTIMISTIC_KOVAN]:
65+
[SupportedChainId.OPTIMISM_GOERLI]:
6666
'radial-gradient(948% 292% at 42% 0%, rgba(255, 58, 212, 0.04) 0%, rgba(255, 255, 255, 0.04) 100%),radial-gradient(98% 96% at 2% 0%, rgba(255, 39, 39, 0.04) 0%, rgba(235, 0, 255, 0.01 96%)',
6767
[SupportedChainId.ARBITRUM_ONE]:
6868
'radial-gradient(285% 8200% at 30% 50%, rgba(40, 160, 240, 0.01) 0%, rgba(219, 255, 0, 0) 100%),radial-gradient(75% 75% at 0% 0%, rgba(150, 190, 220, 0.05) 0%, rgba(33, 114, 229, 0.05) 100%), hsla(0, 0%, 100%, 0.05)',
@@ -80,7 +80,7 @@ const BG_COLORS_BY_DARK_MODE_AND_CHAIN_ID: {
8080
'radial-gradient(182.71% 150.59% at 2.81% 7.69%, rgba(63, 208, 137, 0.15) 0%, rgba(49, 205, 50, 0.15) 100%)',
8181
[SupportedChainId.OPTIMISM]:
8282
'radial-gradient(92% 105% at 50% 7%, rgba(255, 58, 212, 0.04) 0%, rgba(255, 255, 255, 0.03) 100%),radial-gradient(100% 97% at 0% 12%, rgba(235, 0, 255, 0.1) 0%, rgba(243, 19, 19, 0.1) 100%), hsla(0, 0%, 100%, 0.1)',
83-
[SupportedChainId.OPTIMISTIC_KOVAN]:
83+
[SupportedChainId.OPTIMISM_GOERLI]:
8484
'radial-gradient(92% 105% at 50% 7%, rgba(255, 58, 212, 0.04) 0%, rgba(255, 255, 255, 0.03) 100%),radial-gradient(100% 97% at 0% 12%, rgba(235, 0, 255, 0.1) 0%, rgba(243, 19, 19, 0.1) 100%), hsla(0, 0%, 100%, 0.1)',
8585
[SupportedChainId.ARBITRUM_ONE]:
8686
'radial-gradient(285% 8200% at 30% 50%, rgba(40, 160, 240, 0.1) 0%, rgba(219, 255, 0, 0) 100%),radial-gradient(circle at top left, hsla(206, 50%, 75%, 0.01), hsla(215, 79%, 51%, 0.12)), hsla(0, 0%, 100%, 0.1)',
@@ -142,7 +142,7 @@ const TEXT_COLORS: { [chainId in NetworkAlertChains]: string } = {
142142
[SupportedChainId.CELO]: 'rgba(53, 178, 97)',
143143
[SupportedChainId.CELO_ALFAJORES]: 'rgba(53, 178, 97)',
144144
[SupportedChainId.OPTIMISM]: '#ff3856',
145-
[SupportedChainId.OPTIMISTIC_KOVAN]: '#ff3856',
145+
[SupportedChainId.OPTIMISM_GOERLI]: '#ff3856',
146146
[SupportedChainId.ARBITRUM_ONE]: '#0490ed',
147147
[SupportedChainId.ARBITRUM_RINKEBY]: '#0490ed',
148148
}

‎src/components/Web3Provider/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { SupportedChainId } from '@uniswap/widgets'
21
import { useWeb3React, Web3ReactHooks, Web3ReactProvider } from '@web3-react/core'
32
import { Connector } from '@web3-react/types'
43
import { Connection } from 'connection'
54
import { getConnectionName } from 'connection/utils'
5+
import { isSupportedChain } from 'constants/chains'
66
import { RPC_PROVIDERS } from 'constants/providers'
77
import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/traceJsonRpc'
88
import useEagerlyConnect from 'hooks/useEagerlyConnect'
@@ -26,7 +26,7 @@ export default function Web3Provider({ children }: { children: ReactNode }) {
2626

2727
function Tracer() {
2828
const { chainId, provider } = useWeb3React()
29-
const networkProvider = RPC_PROVIDERS[(chainId || SupportedChainId.MAINNET) as SupportedChainId]
29+
const networkProvider = isSupportedChain(chainId) ? RPC_PROVIDERS[chainId] : undefined
3030
const shouldTrace = useTraceJsonRpcFlag() === TraceJsonRpcVariant.Enabled
3131

3232
useEffect(() => {

‎src/constants/addresses.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const CELO_TICK_LENS_ADDRESSES = '0x5f115D9113F88e0a0Db1b5033D90D4a9690AcD3D'
2424
export const V3_CORE_FACTORY_ADDRESSES: AddressMap = {
2525
...constructSameAddressMap(V3_FACTORY_ADDRESS, [
2626
SupportedChainId.OPTIMISM,
27-
SupportedChainId.OPTIMISTIC_KOVAN,
27+
SupportedChainId.OPTIMISM_GOERLI,
2828
SupportedChainId.ARBITRUM_ONE,
2929
SupportedChainId.ARBITRUM_RINKEBY,
3030
SupportedChainId.POLYGON_MUMBAI,
@@ -47,7 +47,7 @@ export const V3_MIGRATOR_ADDRESSES: AddressMap = {
4747

4848
export const MULTICALL_ADDRESS: AddressMap = {
4949
...constructSameAddressMap('0x1F98415757620B543A52E61c46B32eB19261F984', [
50-
SupportedChainId.OPTIMISTIC_KOVAN,
50+
SupportedChainId.OPTIMISM_GOERLI,
5151
SupportedChainId.OPTIMISM,
5252
SupportedChainId.POLYGON_MUMBAI,
5353
SupportedChainId.POLYGON,
@@ -61,7 +61,7 @@ export const MULTICALL_ADDRESS: AddressMap = {
6161
export const SWAP_ROUTER_ADDRESSES: AddressMap = {
6262
...constructSameAddressMap('0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45', [
6363
SupportedChainId.OPTIMISM,
64-
SupportedChainId.OPTIMISTIC_KOVAN,
64+
SupportedChainId.OPTIMISM_GOERLI,
6565
SupportedChainId.ARBITRUM_ONE,
6666
SupportedChainId.ARBITRUM_RINKEBY,
6767
SupportedChainId.POLYGON,
@@ -103,7 +103,7 @@ export const ARGENT_WALLET_DETECTOR_ADDRESS: AddressMap = {
103103
export const QUOTER_ADDRESSES: AddressMap = {
104104
...constructSameAddressMap('0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6', [
105105
SupportedChainId.OPTIMISM,
106-
SupportedChainId.OPTIMISTIC_KOVAN,
106+
SupportedChainId.OPTIMISM_GOERLI,
107107
SupportedChainId.ARBITRUM_ONE,
108108
SupportedChainId.ARBITRUM_RINKEBY,
109109
SupportedChainId.POLYGON_MUMBAI,
@@ -116,7 +116,7 @@ export const QUOTER_ADDRESSES: AddressMap = {
116116
export const NONFUNGIBLE_POSITION_MANAGER_ADDRESSES: AddressMap = {
117117
...constructSameAddressMap('0xC36442b4a4522E871399CD717aBDD847Ab11FE88', [
118118
SupportedChainId.OPTIMISM,
119-
SupportedChainId.OPTIMISTIC_KOVAN,
119+
SupportedChainId.OPTIMISM_GOERLI,
120120
SupportedChainId.ARBITRUM_ONE,
121121
SupportedChainId.ARBITRUM_RINKEBY,
122122
SupportedChainId.POLYGON_MUMBAI,

‎src/constants/chainInfo.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const CHAIN_INFO: ChainInfoMap = {
9292
label: 'Kovan',
9393
logoUrl: ethereumLogoUrl,
9494
nativeCurrency: { name: 'Kovan Ether', symbol: 'kovETH', decimals: 18 },
95-
color: colorsDark.chain_69,
95+
color: colorsDark.chain_420,
9696
},
9797
[SupportedChainId.GOERLI]: {
9898
networkType: NetworkType.L1,
@@ -121,20 +121,20 @@ const CHAIN_INFO: ChainInfoMap = {
121121
color: colorsDark.chain_10,
122122
backgroundColor: colorsDark.chain_10_background,
123123
},
124-
[SupportedChainId.OPTIMISTIC_KOVAN]: {
124+
[SupportedChainId.OPTIMISM_GOERLI]: {
125125
networkType: NetworkType.L2,
126126
blockWaitMsBeforeWarning: ms`25m`,
127127
bridge: 'https://app.optimism.io/bridge',
128128
defaultListUrl: OPTIMISM_LIST,
129129
docs: 'https://optimism.io/',
130-
explorer: 'https://optimistic.etherscan.io/',
130+
explorer: 'https://goerli-optimism.etherscan.io/',
131131
infoLink: 'https://info.uniswap.org/#/optimism/',
132-
label: 'Optimistic Kovan',
132+
label: 'Optimism Görli',
133133
logoUrl: optimismLogoUrl,
134134
statusPage: 'https://optimism.io/status',
135135
helpCenterUrl: 'https://help.uniswap.org/en/collections/3137778-uniswap-on-optimistic-ethereum-oξ',
136-
nativeCurrency: { name: 'Optimistic Kovan Ether', symbol: 'kovOpETH', decimals: 18 },
137-
color: colorsDark.chain_69,
136+
nativeCurrency: { name: 'Optimism Goerli Ether', symbol: 'görOpETH', decimals: 18 },
137+
color: colorsDark.chain_420,
138138
},
139139
[SupportedChainId.ARBITRUM_ONE]: {
140140
networkType: NetworkType.L2,

‎src/constants/chains.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export enum SupportedChainId {
1212
ARBITRUM_RINKEBY = 421611,
1313

1414
OPTIMISM = 10,
15-
OPTIMISTIC_KOVAN = 69,
15+
OPTIMISM_GOERLI = 420,
1616

1717
POLYGON = 137,
1818
POLYGON_MUMBAI = 80001,
@@ -34,7 +34,7 @@ export const CHAIN_IDS_TO_NAMES = {
3434
[SupportedChainId.ARBITRUM_ONE]: 'arbitrum',
3535
[SupportedChainId.ARBITRUM_RINKEBY]: 'arbitrum_rinkeby',
3636
[SupportedChainId.OPTIMISM]: 'optimism',
37-
[SupportedChainId.OPTIMISTIC_KOVAN]: 'optimistic_kovan',
37+
[SupportedChainId.OPTIMISM_GOERLI]: 'optimism_goerli',
3838
}
3939

4040
/**
@@ -72,7 +72,7 @@ export const TESTNET_CHAIN_IDS = [
7272
SupportedChainId.KOVAN,
7373
SupportedChainId.POLYGON_MUMBAI,
7474
SupportedChainId.ARBITRUM_RINKEBY,
75-
SupportedChainId.OPTIMISTIC_KOVAN,
75+
SupportedChainId.OPTIMISM_GOERLI,
7676
] as const
7777

7878
export type SupportedTestnetChainId = typeof TESTNET_CHAIN_IDS[number]
@@ -102,7 +102,7 @@ export const L2_CHAIN_IDS = [
102102
SupportedChainId.ARBITRUM_ONE,
103103
SupportedChainId.ARBITRUM_RINKEBY,
104104
SupportedChainId.OPTIMISM,
105-
SupportedChainId.OPTIMISTIC_KOVAN,
105+
SupportedChainId.OPTIMISM_GOERLI,
106106
] as const
107107

108108
export type SupportedL2ChainId = typeof L2_CHAIN_IDS[number]

‎src/constants/networks.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ export const FALLBACK_URLS: { [key in SupportedChainId]: string[] } = {
7575
// "Fallback" URLs
7676
'https://rpc.ankr.com/optimism',
7777
],
78-
[SupportedChainId.OPTIMISTIC_KOVAN]: [
78+
[SupportedChainId.OPTIMISM_GOERLI]: [
7979
// "Safe" URLs
80-
'https://kovan.optimism.io',
80+
'https://goerli.optimism.io',
8181
],
8282
[SupportedChainId.CELO]: [
8383
// "Safe" URLs
@@ -112,9 +112,9 @@ export const RPC_URLS: { [key in SupportedChainId]: string[] } = {
112112
`https://optimism-mainnet.infura.io/v3/${INFURA_KEY}`,
113113
...FALLBACK_URLS[SupportedChainId.OPTIMISM],
114114
],
115-
[SupportedChainId.OPTIMISTIC_KOVAN]: [
116-
`https://optimism-kovan.infura.io/v3/${INFURA_KEY}`,
117-
...FALLBACK_URLS[SupportedChainId.OPTIMISTIC_KOVAN],
115+
[SupportedChainId.OPTIMISM_GOERLI]: [
116+
`https://optimism-goerli.infura.io/v3/${INFURA_KEY}`,
117+
...FALLBACK_URLS[SupportedChainId.OPTIMISM_GOERLI],
118118
],
119119
[SupportedChainId.ARBITRUM_ONE]: [
120120
`https://arbitrum-mainnet.infura.io/v3/${INFURA_KEY}`,

‎src/constants/providers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const RPC_PROVIDERS: { [key in SupportedChainId]: StaticJsonRpcProvider }
5656
[SupportedChainId.GOERLI]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.GOERLI]),
5757
[SupportedChainId.KOVAN]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.KOVAN]),
5858
[SupportedChainId.OPTIMISM]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.OPTIMISM]),
59-
[SupportedChainId.OPTIMISTIC_KOVAN]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.OPTIMISTIC_KOVAN]),
59+
[SupportedChainId.OPTIMISM_GOERLI]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.OPTIMISM_GOERLI]),
6060
[SupportedChainId.ARBITRUM_ONE]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.ARBITRUM_ONE]),
6161
[SupportedChainId.ARBITRUM_RINKEBY]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.ARBITRUM_RINKEBY]),
6262
[SupportedChainId.POLYGON]: new AppJsonRpcProvider(RPC_URLS[SupportedChainId.POLYGON]),

‎src/constants/routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export const COMMON_BASES: ChainCurrencyList = {
157157
USDT_OPTIMISM,
158158
WBTC_OPTIMISM,
159159
],
160-
[SupportedChainId.OPTIMISTIC_KOVAN]: [nativeOnChain(SupportedChainId.OPTIMISTIC_KOVAN)],
160+
[SupportedChainId.OPTIMISM_GOERLI]: [nativeOnChain(SupportedChainId.OPTIMISM_GOERLI)],
161161
[SupportedChainId.POLYGON]: [
162162
nativeOnChain(SupportedChainId.POLYGON),
163163
WETH_POLYGON,

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL