From 0bc1eeaf37a50e11c344bc77a3ac803a64272f5b Mon Sep 17 00:00:00 2001 From: ryanml Date: Wed, 28 Sep 2022 20:26:01 -0700 Subject: [PATCH] Deprecating the Rinkeby, Ropsten, and Kovan test networks (#15989) * Deprecating Rinkeby, setting default debug network to Goerli * Deprecating Ropsten and Kovan * Conflict fix * Remove unused localization, test fixes * Add migration for moving used deprecated testnets to custom networks * Fix migrator test * Add more unit tests * Migration updates provider type to rpc if deprecated network is selected * Migration fully and correctly updates the provider if selected network is a deprecated testnet * Continue to show deprecation warning on each of rinkeby, ropsten and kovan * Add rpcUrl deprecation message to loading screen * Removing mayBeFauceting prop Co-authored-by: Dan Miller --- .storybook/initial-states/transactions.js | 66 +-- .storybook/test-data.js | 68 +-- app/_locales/am/messages.json | 18 - app/_locales/ar/messages.json | 18 - app/_locales/bg/messages.json | 18 - app/_locales/bn/messages.json | 18 - app/_locales/ca/messages.json | 18 - app/_locales/cs/messages.json | 9 - app/_locales/da/messages.json | 18 - app/_locales/de/messages.json | 18 - app/_locales/el/messages.json | 18 - app/_locales/en/messages.json | 21 +- app/_locales/es/messages.json | 18 - app/_locales/es_419/messages.json | 18 - app/_locales/et/messages.json | 18 - app/_locales/fa/messages.json | 18 - app/_locales/fi/messages.json | 18 - app/_locales/fil/messages.json | 9 - app/_locales/fr/messages.json | 18 - app/_locales/he/messages.json | 15 - app/_locales/hi/messages.json | 18 - app/_locales/hn/messages.json | 9 - app/_locales/hr/messages.json | 18 - app/_locales/ht/messages.json | 18 - app/_locales/hu/messages.json | 18 - app/_locales/id/messages.json | 18 - app/_locales/it/messages.json | 18 - app/_locales/ja/messages.json | 18 - app/_locales/kn/messages.json | 18 - app/_locales/ko/messages.json | 18 - app/_locales/lt/messages.json | 18 - app/_locales/lv/messages.json | 18 - app/_locales/ms/messages.json | 18 - app/_locales/nl/messages.json | 9 - app/_locales/no/messages.json | 15 - app/_locales/ph/messages.json | 18 - app/_locales/pl/messages.json | 18 - app/_locales/pt/messages.json | 18 - app/_locales/pt_BR/messages.json | 18 - app/_locales/ro/messages.json | 18 - app/_locales/ru/messages.json | 18 - app/_locales/sk/messages.json | 9 - app/_locales/sl/messages.json | 18 - app/_locales/sr/messages.json | 18 - app/_locales/sv/messages.json | 18 - app/_locales/sw/messages.json | 18 - app/_locales/ta/messages.json | 18 - app/_locales/th/messages.json | 12 - app/_locales/tl/messages.json | 18 - app/_locales/tr/messages.json | 18 - app/_locales/uk/messages.json | 18 - app/_locales/vi/messages.json | 18 - app/_locales/zh/messages.json | 18 - app/_locales/zh_CN/messages.json | 18 - app/_locales/zh_TW/messages.json | 18 - app/scripts/constants/contracts.js | 6 - app/scripts/controllers/app-state.js | 3 - .../controllers/cached-balances.test.js | 16 +- app/scripts/controllers/detect-tokens.test.js | 8 +- app/scripts/controllers/ens/index.test.js | 2 +- .../controllers/incoming-transactions.js | 6 - .../controllers/incoming-transactions.test.js | 141 +++-- app/scripts/controllers/metametrics.test.js | 22 +- .../network/createInfuraClient.test.js | 8 +- .../network/network-controller.test.js | 36 -- app/scripts/controllers/network/network.js | 6 +- .../network/pending-middleware.test.js | 2 +- app/scripts/controllers/network/util.test.js | 8 +- app/scripts/controllers/swaps.test.js | 4 +- .../controllers/transactions/index.test.js | 36 +- .../transactions/tx-gas-utils.test.js | 6 +- .../transactions/tx-state-manager.test.js | 4 +- app/scripts/lib/account-tracker.js | 24 - app/scripts/lib/buy-url.js | 10 - app/scripts/lib/buy-url.test.js | 24 - app/scripts/lib/ens-ipfs/resolver.js | 2 +- app/scripts/metamask-controller.js | 1 - app/scripts/metamask-controller.test.js | 2 +- app/scripts/migrations/052.js | 33 +- app/scripts/migrations/052.test.js | 54 +- app/scripts/migrations/054.test.js | 16 +- app/scripts/migrations/055.js | 16 + app/scripts/migrations/055.test.js | 12 +- app/scripts/migrations/059.test.js | 14 +- app/scripts/migrations/074.js | 132 +++++ app/scripts/migrations/074.test.js | 561 ++++++++++++++++++ app/scripts/migrations/index.js | 2 + app/scripts/migrations/migrations.test.js | 5 - development/states/navigate-txs.json | 7 +- shared/constants/network.ts | 81 --- test/data/mock-pending-transaction-data.json | 24 +- test/data/mock-state.json | 8 +- test/data/mock-tx-history.json | 342 +++++------ test/data/transaction-data.json | 18 +- test/e2e/fixtures/address-entry/state.json | 8 +- test/e2e/fixtures/connected-state/state.json | 6 +- test/e2e/fixtures/custom-rpc/state.json | 8 +- test/e2e/fixtures/custom-token/state.json | 11 +- test/e2e/fixtures/eip-1559-v2-dapp/state.json | 8 +- test/e2e/fixtures/eip-1559-v2/state.json | 8 +- test/e2e/fixtures/imported-account/state.json | 8 +- test/e2e/fixtures/localization/state.json | 8 +- test/e2e/fixtures/metrics-enabled/state.json | 6 +- .../fixtures/navigate-transactions/state.json | 8 +- test/e2e/fixtures/send-edit-v2/state.json | 8 +- test/e2e/fixtures/send-edit/state.json | 8 +- test/e2e/fixtures/special-settings/state.json | 8 +- test/e2e/fixtures/threebox-enabled/state.json | 9 +- test/e2e/mock-e2e.js | 3 - test/stub/tx-meta-stub.js | 8 +- .../collectible-details.js | 3 - .../collectibles-tab/collectibles-tab.test.js | 2 +- .../confirm-detail-row.component.test.js | 2 +- .../confirm-page-container-container.test.js | 6 +- ...m-page-container-content.component.test.js | 6 +- ...rm-page-container-header.component.test.js | 2 +- .../app/currency-input/currency-input.test.js | 2 +- .../app/dropdowns/network-dropdown.js | 9 - .../app/dropdowns/network-dropdown.test.js | 22 +- .../import-token-link.test.js.snap | 52 +- .../import-token-link.test.js | 8 +- .../loading-network-screen.component.js | 49 +- .../loading-network-screen.container.js | 9 + ui/components/app/menu-bar/menu-bar.test.js | 2 +- .../network-display.stories.js | 2 +- .../transaction-activity-log.util.test.js | 53 +- .../avatar-network/avatar-network.stories.js | 21 - .../avatar-token/avatar-token.stories.js | 21 - .../base-avatar/base-avatar.stories.js | 23 - ui/css/design-system/colors.scss | 3 - ui/css/itcss/components/network.scss | 12 - ui/css/utilities/colors.scss | 3 - .../confirm-transaction.duck.test.js | 9 +- ui/ducks/metamask/metamask.test.js | 18 +- ui/ducks/send/send.test.js | 38 +- ui/helpers/constants/design-system.js | 9 - ui/helpers/constants/settings.js | 21 - ui/helpers/utils/settings-search.test.js | 8 +- ui/helpers/utils/util.js | 3 - ui/hooks/useAddressDetails.test.js | 6 +- ui/hooks/useAssetDetails.test.js | 2 +- ui/hooks/useCurrencyDisplay.js | 2 +- .../transaction-alerts.test.js | 6 +- ui/pages/routes/routes.component.js | 6 - ui/pages/send/send.test.js | 6 +- .../custom-content-search.test.js | 4 +- .../networks-list-item.test.js | 8 +- .../networks-list/networks-list.test.js | 9 +- .../networks-tab-content.test.js | 3 - .../networks-tab/networks-tab.constants.js | 36 -- .../networks-tab/networks-tab.test.js | 3 - ui/pages/swaps/swaps.util.js | 2 +- ui/pages/swaps/swaps.util.test.js | 6 +- ui/selectors/confirm-transaction.test.js | 8 +- ui/selectors/permissions.test.js | 2 +- ui/selectors/selectors.test.js | 2 +- ui/selectors/transactions.test.js | 6 +- ui/store/actions.test.js | 2 +- 158 files changed, 1381 insertions(+), 2015 deletions(-) create mode 100644 app/scripts/migrations/074.js create mode 100644 app/scripts/migrations/074.test.js diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js index 34b848712..fefafefc4 100644 --- a/.storybook/initial-states/transactions.js +++ b/.storybook/initial-states/transactions.js @@ -24,10 +24,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 643368596521636, time: 1653527035634, status: 'submitted', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '5208', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: null, sendFlowHistory: [], @@ -50,10 +50,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 643368596521636, time: 1653527035634, status: 'approved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '5208', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: null, sendFlowHistory: [], @@ -204,7 +204,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { submittedTime: 1653527035924, }, [MOCK_TX_TYPE.CONTRACT_INTERACTION]: { - chainId: '0x4', + chainId: '0x5', dappSuggestedGasFees: { gas: '0x118f4', maxFeePerGas: '0x9502f91a', @@ -212,7 +212,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { }, id: 7694052085150913, loadingDefaults: true, - metamaskNetworkId: '4', + metamaskNetworkId: '5', origin: 'https://remix.ethereum.org', originalGasEstimate: '0x118f4', sendFlowHistory: [], @@ -235,7 +235,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { [MOCK_TX_TYPE.DEPLOY_CONTRACT]: { blockNumber: '6195527', id: 4243712234858468, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: 'confirmed', time: 1585088013000, txParams: { @@ -292,7 +292,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { [MOCK_TX_TYPE.INCOMING]: { blockNumber: '6477257', id: 4243712234858505, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: 'confirmed', time: 1589314295000, txParams: { @@ -346,10 +346,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 3938342322880462, time: 1653459456297, status: 'failed', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '14609', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: null, sendFlowHistory: [], @@ -376,10 +376,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 3938342322880462, time: 1653459456297, status: 'approved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '14609', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: null, sendFlowHistory: [], @@ -589,7 +589,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 4243712234858512, time: 1589314601567, status: 'confirmed', - metamaskNetworkId: '4', + metamaskNetworkId: '5', loadingDefaults: false, txParams: { from: '0xabca64466f257793eaa52fcfff5066894b76a149', @@ -605,7 +605,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { [MOCK_TX_TYPE.SMART]: { blockNumber: '6195527', id: 4243712234858468, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: 'confirmed', time: 1585088013000, txParams: { @@ -625,7 +625,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { [MOCK_TX_TYPE.SWAP]: { blockNumber: '6195527', id: 4243712234858467, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: 'confirmed', time: 1585088013000, txParams: { @@ -644,7 +644,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { [MOCK_TX_TYPE.SWAP_APPROVAL]: { blockNumber: '6195527', id: 4243712234858467, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: 'confirmed', time: 1585088013000, txParams: { @@ -664,10 +664,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058729, time: 1653457101080, status: 'submitted', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0xb427', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: { gasPrice: '0x4a817c800', @@ -692,10 +692,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058729, time: 1653457101080, status: 'unapproved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0xb427', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: true, dappSuggestedGasFees: { gasPrice: '0x4a817c800', @@ -918,10 +918,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 1441203963845330, time: 1652206763566, status: 'confirmed', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0x118e0', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: { maxPriorityFeePerGas: '0x3B9ACA00', @@ -939,7 +939,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { maxFeePerGas: '0x7be830aec', maxPriorityFeePerGas: '0x3B9ACA00', }, - origin: 'https://rinkeby.etherscan.io', + origin: 'https://goerli.etherscan.io', type: 'safetransferfrom', userFeeLevel: 'dappSuggested', defaultGasEstimates: { @@ -1042,10 +1042,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058725, time: 1653457077370, status: 'confirmed', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0xea60', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: { gasPrice: '0x4a817c800', @@ -1055,7 +1055,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { txParams: { from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725', to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976', - nonce: '0x4', + nonce: '0x5', value: '0x0', data: '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98', @@ -1070,10 +1070,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058725, time: 1653457077370, status: 'unapproved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0xea60', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: true, dappSuggestedGasFees: { gasPrice: '0x4a817c800', @@ -1152,7 +1152,7 @@ export const MOCK_TRANSACTION_BY_TYPE = { { op: 'add', path: '/txParams/nonce', - value: '0x4', + value: '0x5', note: 'transactions#approveTransaction', timestamp: 1653457091939, }, @@ -1446,10 +1446,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058754, time: 1653457323504, status: 'confirmed', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0x10896', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: false, dappSuggestedGasFees: null, sendFlowHistory: [ @@ -1496,10 +1496,10 @@ export const MOCK_TRANSACTION_BY_TYPE = { id: 5177046356058754, time: 1653457323504, status: 'unapproved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0x10896', userEditedGasLimit: false, - chainId: '0x4', + chainId: '0x5', loadingDefaults: true, dappSuggestedGasFees: null, sendFlowHistory: [ diff --git a/.storybook/test-data.js b/.storybook/test-data.js index e087b6990..1a2b4b9a6 100644 --- a/.storybook/test-data.js +++ b/.storybook/test-data.js @@ -26,28 +26,6 @@ const state = { ticker: 'ETH', viewOnly: true, }, - { - blockExplorerUrl: 'https://ropsten.etherscan.io', - chainId: '0x3', - iconColor: 'var(--ropsten)', - isATestNetwork: true, - labelKey: 'ropsten', - providerType: 'ropsten', - rpcUrl: 'https://ropsten.infura.io/v3/', - ticker: 'ETH', - viewOnly: true, - }, - { - blockExplorerUrl: 'https://rinkeby.etherscan.io', - chainId: '0x4', - iconColor: 'var(--rinkeby)', - isATestNetwork: true, - labelKey: 'rinkeby', - providerType: 'rinkeby', - rpcUrl: 'https://rinkeby.infura.io/v3/', - ticker: 'ETH', - viewOnly: true, - }, { blockExplorerUrl: 'https://goerli.etherscan.io', chainId: '0x5', @@ -59,17 +37,6 @@ const state = { ticker: 'ETH', viewOnly: true, }, - { - blockExplorerUrl: 'https://kovan.etherscan.io', - chainId: '0x2a', - iconColor: 'var(--kovan)', - isATestNetwork: true, - labelKey: 'kovan', - providerType: 'kovan', - rpcUrl: 'https://kovan.infura.io/v3/', - ticker: 'ETH', - viewOnly: true, - }, { blockExplorerUrl: 'https://sepolia.etherscan.io', chainId: '0xaa36a7', @@ -406,9 +373,9 @@ const state = { id: 3111025347726181, time: 1620710815484, status: 'unapproved', - metamaskNetworkId: '3', + metamaskNetworkId: '5', msgParams: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', - chainId: '0x3', + chainId: '0x5', loadingDefaults: false, txParams: { from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', @@ -427,8 +394,8 @@ const state = { id: 7786962153682822, time: 1620710815484, status: 'unapproved', - metamaskNetworkId: '3', - chainId: '0x3', + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: true, txParams: { from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', @@ -581,20 +548,20 @@ const state = { swapsWelcomeMessageHasBeenShown: true, defaultHomeActiveTabName: 'Assets', provider: { - type: 'rinkeby', + type: 'goerli', ticker: 'ETH', nickname: '', rpcUrl: '', - chainId: '0x4', + chainId: '0x5', }, previousProviderStore: { - type: 'rinkeby', + type: 'goerli', ticker: 'ETH', nickname: '', rpcUrl: '', - chainId: '0x4', + chainId: '0x5', }, - network: '3', + network: '5', accounts: { '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': { address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', @@ -1132,7 +1099,7 @@ const state = { '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e': '0x2d3142f5000', '0x9d0ba4ddac06032527b140912ec808ab9451b788': '0x15f6f0b9d4f8d000', }, - '0x3': { + 5: { '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': '0x176e5b6f173ebe66', '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e': '0x2d3142f5000', '0x9d0ba4ddac06032527b140912ec808ab9451b788': '0x15f6f0b9d4f8d000', @@ -1196,7 +1163,7 @@ const state = { decimals: 18, }, ], - '0x3': [ + '0x5': [ { address: '0xaD6D458402F60fD3Bd25163575031ACDce07538D', symbol: 'DAI', @@ -1209,7 +1176,7 @@ const state = { }, accountHiddenTokens: { '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': { - '0x3': [], + '0x5': [], }, }, assetImages: { @@ -1317,9 +1284,6 @@ const state = { }, }, incomingTxLastFetchedBlocksByNetwork: { - ropsten: 8872820, - rinkeby: null, - kovan: null, goerli: null, sepolia: null, mainnet: 10902989, @@ -1549,8 +1513,8 @@ const state = { id: 3111025347726181, time: 1620723786838, status: 'unapproved', - metamaskNetworkId: '3', - chainId: '0x3', + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: false, txParams: { from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', @@ -1569,8 +1533,8 @@ const state = { id: 3111025347726181, time: 1620723786838, status: 'unapproved', - metamaskNetworkId: '3', - chainId: '0x3', + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: true, txParams: { from: '0x983211ce699ea5ab57cc528086154b6db1ad8e55', diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index e7225b663..569051949 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -184,18 +184,9 @@ "connectingToGoerli": { "message": "ከ Goerli የሙከራ አውታረ መረብ ጋር መገናኘት" }, - "connectingToKovan": { - "message": "ከ Kovan የሙከራ አውታረ መረብ መገናኘት" - }, "connectingToMainnet": { "message": "ከዋናው የ Ethereum አውታረ መረብ ጋር መገናኘት" }, - "connectingToRinkeby": { - "message": "ከ Rinkeby የሙከራ አውታረ መረብ ጋር በመገናኘት ላይ" - }, - "connectingToRopsten": { - "message": "ከ Ropsten የሙከራ አውታረ መረብ ጋር በመገናኘት ላይ" - }, "continueToWyre": { "message": "ወደ Wyre ይቀጥሉ" }, @@ -482,9 +473,6 @@ "knownAddressRecipient": { "message": "የሚታወቅ የግንኙነት አድራሻ።" }, - "kovan": { - "message": "Kovan የሙከራ አውታረ መረብ" - }, "learnMore": { "message": "የበለጠ ይወቁ" }, @@ -735,12 +723,6 @@ "revealSeedWordsWarningTitle": { "message": "ይህን ሐረግ ለየትኛውም ሰው አያጋሩ!" }, - "rinkeby": { - "message": "Rinkeby የሙከራ አውታረ መረብ" - }, - "ropsten": { - "message": "Ropsten የሙከራ አውታረ መረብ " - }, "rpcUrl": { "message": "አዲስ የ RPC URL" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index cfc4f5e86..f06f120ba 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -198,18 +198,9 @@ "connectingToGoerli": { "message": "الاتصال بشبكة اختبار Goerli" }, - "connectingToKovan": { - "message": "الاتصال بشبكة اختبار Kovan" - }, "connectingToMainnet": { "message": "جارِ الاتصال بشبكة إيثيريوم الرئيسية" }, - "connectingToRinkeby": { - "message": "جارِ الاتصال بشبكة اختبار Rinkeby " - }, - "connectingToRopsten": { - "message": "جارِ الاتصال بشبكة اختبار Ropsten " - }, "continueToWyre": { "message": "الاستمرار إلى Wyre" }, @@ -495,9 +486,6 @@ "knownAddressRecipient": { "message": "عنوان العقد المعروف." }, - "kovan": { - "message": "شبكة اختبار Kovan " - }, "learnMore": { "message": "اكتشف المزيد" }, @@ -751,12 +739,6 @@ "revealSeedWordsWarningTitle": { "message": "لا تشارك هذه الجملة مع أي شخص آخر!" }, - "rinkeby": { - "message": "شبكة اختبارات Rinkeby" - }, - "ropsten": { - "message": "شبكة اختبار Ropsten" - }, "rpcUrl": { "message": "عنوان جديد لاستدعاء الإجراء عن بعد" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index 505032c11..3de720189 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Свързване с тестова мрежа на Goerli" }, - "connectingToKovan": { - "message": "Свързване с тестовата мрежа на Kovan" - }, "connectingToMainnet": { "message": "Свързване с главната мрежа Ethereum" }, - "connectingToRinkeby": { - "message": "Свързване с тестова мрежа на Rinkeby" - }, - "connectingToRopsten": { - "message": "Свързване с тестова мрежа Ropsten" - }, "continueToWyre": { "message": "Продължете към Wyre" }, @@ -487,9 +478,6 @@ "knownAddressRecipient": { "message": "Известен адрес на договора." }, - "kovan": { - "message": "Тестова мрежа на Кован" - }, "learnMore": { "message": "Научете повече" }, @@ -746,12 +734,6 @@ "revealSeedWordsWarningTitle": { "message": "НЕ споделяйте тази фраза с никого!" }, - "rinkeby": { - "message": "Тестова мрежа на Rinkeby" - }, - "ropsten": { - "message": "Тестова мрежа Ropsten" - }, "rpcUrl": { "message": "Нов URL адрес за RPC" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index d09fb8605..5df4a9ba7 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "গোয়েরলি টেস্ট নেটওয়ার্কের সাথে সংযোগ করা হচ্ছে" }, - "connectingToKovan": { - "message": "কোভান টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, "connectingToMainnet": { "message": "মুখ্য Ethereum নেটওয়ার্কের সাথে সংযোগ করছে" }, - "connectingToRinkeby": { - "message": "রিঙ্কেবি টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, - "connectingToRopsten": { - "message": "রপস্টেন টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, "continueToWyre": { "message": "Wyre এ অবিরত রাখুন" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "জানা পরিচিতির ঠিকানা৷" }, - "kovan": { - "message": "কোভান টেস্ট নেটওয়ার্ক" - }, "learnMore": { "message": "আরও জানুন" }, @@ -750,12 +738,6 @@ "revealSeedWordsWarningTitle": { "message": "এই ফ্রেজটি কারোর সাথে শেয়ার করবেন না!" }, - "rinkeby": { - "message": "রিঙ্কেবি টেস্ট নেটওয়ার্ক" - }, - "ropsten": { - "message": "রোপস্টেন টেস্ট নেটওয়ার্ক" - }, "rpcUrl": { "message": "নতুন RPC URL" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 496651dcb..1c3c0f055 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -187,18 +187,9 @@ "connectingToGoerli": { "message": "Connectant a Xarxa de Prova Goerli" }, - "connectingToKovan": { - "message": "Conectant a la xarxa de Kovan Test" - }, "connectingToMainnet": { "message": "Connectant a Xarxa Principal Ethereum" }, - "connectingToRinkeby": { - "message": "Connectant a la Xarxa de Prova Rinkeby" - }, - "connectingToRopsten": { - "message": "Connectant a la xarxa de test Ropsten" - }, "continueToWyre": { "message": "Continua a Wyre" }, @@ -478,9 +469,6 @@ "knownAddressRecipient": { "message": "Adreça de contracte coneguda" }, - "kovan": { - "message": "Xarxa de Prova Kovan" - }, "learnMore": { "message": "Saber més" }, @@ -728,12 +716,6 @@ "revealSeedWordsWarningTitle": { "message": "NO comparteixis aquesta frase amb ningú!" }, - "rinkeby": { - "message": "Xarxa del test Rinkeby" - }, - "ropsten": { - "message": "Xarxa de Prova Ropsten" - }, "rpcUrl": { "message": "Nova URL de RPC" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 4afb09fd7..35146b89f 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -63,18 +63,9 @@ "confirmed": { "message": "Potvrzeno" }, - "connectingToKovan": { - "message": "Připojuji se k Kovan Test Network" - }, "connectingToMainnet": { "message": "Připojuji se k Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Připojuji se k Rinkeby Test Network" - }, - "connectingToRopsten": { - "message": "Připojuji se k Ropsten Test Network" - }, "contractDeployment": { "message": "Nasazení kontraktu" }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index e57313608..762aab73d 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Opretter forbindelse til Goerli Testnetværk" }, - "connectingToKovan": { - "message": "Forbinder til Kovan Testnetværk" - }, "connectingToMainnet": { "message": "Forbinder til dit Primære Ethereum Netværk" }, - "connectingToRinkeby": { - "message": "Forbinder til Rinkeby-testnetværk" - }, - "connectingToRopsten": { - "message": "Forbinder til Ropsten-testnetværk" - }, "continueToWyre": { "message": "Fortsæt til Wyre" }, @@ -484,9 +475,6 @@ "knownAddressRecipient": { "message": "Kendte kontaktadresser." }, - "kovan": { - "message": "Kovan Test-Netværk" - }, "learnMore": { "message": "Lær mere" }, @@ -731,12 +719,6 @@ "revealSeedWordsWarningTitle": { "message": "DEL IKKE denne sætning med nogen!" }, - "rinkeby": { - "message": "Rinkeby-testnetværk" - }, - "ropsten": { - "message": "Ropsten Test-netværk" - }, "rpcUrl": { "message": "Ny RPC-URL" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 46d4f6b8d..76c3c75ad 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Verbindungsaufbau zum Goerli-Testnetzwerk" }, - "connectingToKovan": { - "message": " Verbindungsaufbau zum Kovan-Testnetzwerk" - }, "connectingToMainnet": { "message": "Verbinde zum Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": " Verbindungsaufbau zum Rinkeby-Testnetzwerk" - }, - "connectingToRopsten": { - "message": " Verbindungsaufbau zum Ropsten-Testnetzwerk" - }, "connectingToSepolia": { "message": "Verbindungsaufbau zum Sepolia-Testnetzwerk" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Mit dieser Aktion werden Token bearbeitet, die bereits in Ihrer Wallet aufgelistet sind und die dazu verwendet werden können, Sie zu betrügen. Genehmigen Sie diese Aktion nur, wenn Sie sicher sind, dass Sie den Wert dieser Token ändern wollen. Erfahren Sie mehr über $1" }, - "kovan": { - "message": "Kovan-Testnetzwerk" - }, "lastConnected": { "message": "Zuletzt verbunden" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Mit diesem Contract können Sie keine weiteren Ihrer aktuellen oder zukünftigen Token ausgeben." }, - "rinkeby": { - "message": "Rinkeby-Testnetzwerk" - }, - "ropsten": { - "message": "Ropsten-Testnetzwerk" - }, "rpcUrl": { "message": "Neue RPC-URL" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index de6d350d7..8080b314f 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Σύνδεση στο Δίκτυο Δοκιμής Goerli" }, - "connectingToKovan": { - "message": "Σύνδεση στο Δοκιμαστικό Δίκτυο Kovan" - }, "connectingToMainnet": { "message": "Σύνδεση στο Κύριο Δίκτυο Ethereum" }, - "connectingToRinkeby": { - "message": "Σύνδεση στο Δίκτυο Δοκιμών Rinkeby" - }, - "connectingToRopsten": { - "message": "Σύνδεση με το Δίκτυο Δοκιμών Ropsten" - }, "connectingToSepolia": { "message": "Σύνδεση στο δίκτυο δοκιμών Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Αυτή η ενέργεια θα επεξεργαστεί tokens που είναι ήδη εισηγμένα στο πορτοφόλι σας, τα οποίαο μπορεί να χρησιμοποιηθούν για να σας κλέψουν στοιχεία. Αποδεχθείτε μόνο αν είστε σίγουροι ότι θέλετε να αλλάξετε αυτό που αντιπροσωπεύουν αυτά τα νομίσματα. Μάθετε περισσότερά γι'αυτό $1" }, - "kovan": { - "message": "Δίκτυο Δοκιμής Kovan" - }, "lastConnected": { "message": "Τελευταία Σύνδεση" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Αυτός ο συμβαλλόμενος δεν θα μπορεί να ξοδέψει άλλα από τα τρέχοντα ή μελλοντικά σας tokens." }, - "rinkeby": { - "message": "Δοκιμαστικό Δίκτυο Rinkeby" - }, - "ropsten": { - "message": "Δίκτυο Δοκιμών Ropsten" - }, "rpcUrl": { "message": "Νέο RPC URL" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ef92a1d40..8d643deed 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Connecting to Goerli test network" }, - "connectingToKovan": { - "message": "Connecting to Kovan test network" - }, "connectingToMainnet": { "message": "Connecting to Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Connecting to Rinkeby test network" - }, - "connectingToRopsten": { - "message": "Connecting to Ropsten test network" - }, "connectingToSepolia": { "message": "Connecting to Sepolia test network" }, @@ -828,6 +819,9 @@ "currentLanguage": { "message": "Current language" }, + "currentRpcUrlDeprecated": { + "message": "The current rpc url for this network has been deprecated." + }, "currentTitle": { "message": "Current:" }, @@ -1813,9 +1807,6 @@ "knownTokenWarning": { "message": "This action will edit tokens that are already listed in your wallet, which can be used to phish you. Only approve if you are certain that you mean to change what these tokens represent. Learn more about $1" }, - "kovan": { - "message": "Kovan test network" - }, "lastConnected": { "message": "Last connected" }, @@ -2936,12 +2927,6 @@ "revokeSpendingCapTooltipText": { "message": "This contract will be unable to spend any more of your current or future tokens." }, - "rinkeby": { - "message": "Rinkeby test network" - }, - "ropsten": { - "message": "Ropsten test network" - }, "rpcUrl": { "message": "New RPC URL" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 0bd83157f..b0250932b 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Estableciendo conexión a la red de prueba Goerli" }, - "connectingToKovan": { - "message": "Estableciendo conexión a la red de prueba Kovan" - }, "connectingToMainnet": { "message": "Estableciendo conexión a la red principal de Ethereum" }, - "connectingToRinkeby": { - "message": "Estableciendo conexión a la red de prueba Rinkeby" - }, - "connectingToRopsten": { - "message": "Estableciendo conexión a la red de prueba Ropsten" - }, "connectingToSepolia": { "message": "Conectando a la red de prueba Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Esta acción editará tokens que ya estén enumerados en la cartera y que se pueden usar para engañarlo. Apruebe solo si está seguro de que quiere cambiar lo que representan estos tokens." }, - "kovan": { - "message": "Red de prueba Kovan" - }, "lastConnected": { "message": "Última conexión" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Este contrato no podrá gastar más de sus tokens actuales o futuros." }, - "rinkeby": { - "message": "Red de prueba Rinkeby" - }, - "ropsten": { - "message": "Red de prueba Ropsten" - }, "rpcUrl": { "message": "Nueva dirección URL de RPC" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 7717d5af5..738d51536 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -511,18 +511,9 @@ "connectingToGoerli": { "message": "Estableciendo conexión a la red de prueba Goerli" }, - "connectingToKovan": { - "message": "Estableciendo conexión a la red de prueba Kovan" - }, "connectingToMainnet": { "message": "Estableciendo conexión a la red principal de Ethereum" }, - "connectingToRinkeby": { - "message": "Estableciendo conexión a la red de prueba Rinkeby" - }, - "connectingToRopsten": { - "message": "Estableciendo conexión a la red de prueba Ropsten" - }, "contactUs": { "message": "Contáctenos" }, @@ -1410,9 +1401,6 @@ "knownTokenWarning": { "message": "Esta acción editará tokens que ya estén enumerados en la cartera y que se pueden usar para engañarlo. Apruebe solo si está seguro de que quiere cambiar lo que representan estos tokens." }, - "kovan": { - "message": "Red de prueba Kovan" - }, "lastConnected": { "message": "Última conexión" }, @@ -2225,12 +2213,6 @@ "revealSeedWordsWarningTitle": { "message": "¡NO comparta esta frase con nadie!" }, - "rinkeby": { - "message": "Red de prueba Rinkeby" - }, - "ropsten": { - "message": "Red de prueba Ropsten" - }, "rpcUrl": { "message": "Nueva dirección URL de RPC" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 8fdbaac43..3badd5681 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Ühendamine Goerli testvõrguga" }, - "connectingToKovan": { - "message": "Ühendamine Kovani testvõrguga" - }, "connectingToMainnet": { "message": "Ühenduse loomine peamise Etherumi võrguga" }, - "connectingToRinkeby": { - "message": "Ühendamine Rinkeby testvõrguga" - }, - "connectingToRopsten": { - "message": "Ühendamine Ropsteni testvõrguga" - }, "continueToWyre": { "message": "Ava Wyre" }, @@ -487,9 +478,6 @@ "knownAddressRecipient": { "message": "Teadaolev lepinguaadress." }, - "kovan": { - "message": "Kovani testvõrk" - }, "learnMore": { "message": "Lisateave" }, @@ -740,12 +728,6 @@ "revealSeedWordsWarningTitle": { "message": "ÄRGE jagage seda fraasi mitte kellegagi!" }, - "rinkeby": { - "message": "Rinkeby katsevõrk" - }, - "ropsten": { - "message": "Ropsteni testvõrk" - }, "rpcUrl": { "message": "Uus RPC URL" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index f61cdb4f4..c154b4cff 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "در حال اتصال به شبکه آزمایشی Goerli " }, - "connectingToKovan": { - "message": "در حال اتصال به شبکه آزمایشی Kovan" - }, "connectingToMainnet": { "message": "در حال اتصال به شبکه اصلی ایتریم" }, - "connectingToRinkeby": { - "message": "در حال اتصال به شبکه آزمایشی Rinkeby" - }, - "connectingToRopsten": { - "message": "در حال اتصال به شبکه آزمایشی Ropsten" - }, "continueToWyre": { "message": "ادامه به Wyre" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "آدرس شناخته شده قرارداد" }, - "kovan": { - "message": "شبکه آزمایشی Kovan" - }, "learnMore": { "message": "بیشتر بدانید" }, @@ -750,12 +738,6 @@ "revealSeedWordsWarningTitle": { "message": "این عبارت را با هیچکس شریک نسازید!" }, - "rinkeby": { - "message": "شبکه آزمایشی Rinkeby" - }, - "ropsten": { - "message": "شبکه آزمایشی Ropsten" - }, "rpcUrl": { "message": "RPC URL جدید" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index a409afa44..3d623bfaa 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Yhdistetään Goerlin testiverkostoon" }, - "connectingToKovan": { - "message": "Yhdistetään Kovanin koeverkkoon" - }, "connectingToMainnet": { "message": "Yhdistetään Ethereumin pääverkkoon" }, - "connectingToRinkeby": { - "message": "Yhdistetään Rinkebyn koeverkkoon" - }, - "connectingToRopsten": { - "message": "Yhdistetään Ropstenin koeverkkoon" - }, "continueToWyre": { "message": "Jatka Wyreen" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "Tunnettu sopimusosoite." }, - "kovan": { - "message": "Kovanin koeverkko" - }, "learnMore": { "message": "Lisätietoa" }, @@ -747,12 +735,6 @@ "revealSeedWordsWarningTitle": { "message": "ÄLÄ jaa tätä tekstiä kenellekään!" }, - "rinkeby": { - "message": "Rinkebyn koeverkko" - }, - "ropsten": { - "message": "Ropstenin koeverkko" - }, "rpcUrl": { "message": "Uusi RPC:n URL" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index af01bc063..b357f4547 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -169,18 +169,9 @@ "connectingToGoerli": { "message": "Kumokonekta sa Goerli Test Network" }, - "connectingToKovan": { - "message": "Kumokonekta sa Kovan Test Network" - }, "connectingToMainnet": { "message": "Kumokonekta sa Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Kumokonekta sa Rinkeby Test Network" - }, - "connectingToRopsten": { - "message": "Kumokonekta sa Ropsten Test Network" - }, "continueToWyre": { "message": "Magpatuloy sa Wyre" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 7459e8134..101698d35 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Connexion au testnet Goerli" }, - "connectingToKovan": { - "message": "Connexion au testnet Kovan" - }, "connectingToMainnet": { "message": "Connexion au réseau principal Ethereum" }, - "connectingToRinkeby": { - "message": "Connexion au testnet Rinkeby" - }, - "connectingToRopsten": { - "message": "Connexion au testnet Ropsten" - }, "connectingToSepolia": { "message": "Connexion au réseau de test Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Cette action modifiera les jetons déjà présents dans votre portefeuille, et risque de favoriser les tentatives d’hameçonnage. N’approuvez que si vous êtes certain·e de vouloir modifier ce que ces jetons représentent. En savoir plus sur $1" }, - "kovan": { - "message": "Testnet Kovan" - }, "lastConnected": { "message": "Dernière connexion" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "L’autre partie à ce contrat ne pourra plus dépenser vos jetons actuels ou futurs." }, - "rinkeby": { - "message": "Testnet Rinkeby" - }, - "ropsten": { - "message": "Testnet Ropsten" - }, "rpcUrl": { "message": "Nouvelle URL de RPC" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index a299ca631..4ea03d383 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "מתחבר ל-Goerli Test Network" }, - "connectingToKovan": { - "message": "מתחבר ל-Kovan Test Network" - }, "connectingToMainnet": { "message": "מתחבר לרשת אתריום הראשית" }, - "connectingToRinkeby": { - "message": "מתחבר ל- Rinkeby Test Network " - }, - "connectingToRopsten": { - "message": "מתחבר אל רשת בדיקה Ropsten " - }, "continueToWyre": { "message": "המשך ל-Wyre" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "כתובת חוזה ידועה." }, - "kovan": { - "message": "רשת בדיקה Kovan " - }, "learnMore": { "message": "למדו עוד" }, @@ -747,9 +735,6 @@ "revealSeedWordsWarningTitle": { "message": "אין לשתף צירוף מילים זה עם אף אחד!" }, - "rinkeby": { - "message": "רשת בדיקה Rinkeby " - }, "rpcUrl": { "message": "כתובת URL חדשה של RPC" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index bced23618..cb2c66d3c 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Goerli टेस्ट नेटवर्क से कनेक्ट हो रहा है" }, - "connectingToKovan": { - "message": "Kovan टेस्ट नेटवर्क से कनेक्ट हो रहा है" - }, "connectingToMainnet": { "message": "Ethereum Mainnet से कनेक्ट हो रहा है" }, - "connectingToRinkeby": { - "message": "Rinkeby टेस्ट नेटवर्क से कनेक्ट हो रहा है" - }, - "connectingToRopsten": { - "message": "Ropsten टेस्ट नेटवर्क से कनेक्ट हो रहा है" - }, "connectingToSepolia": { "message": "सेपोलिया टेस्ट नेटवर्क से कनेक्ट कर रहा है" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "यह कार्रवाई उन टोकन को संपादित करेगी, जो पहले से ही आपके वॉलेट में सूचीबद्ध हैं, जिसका उपयोग आपको फ़िश करने के लिए किया जा सकता है। केवल तभी अनुमोदित करें, जब आप इस बात को लेकर सुनिश्चित हों कि आप इन टोकन का प्रतिनिधित्व बदलना चाहते हैं। $1 के बारे में और अधिक जानें" }, - "kovan": { - "message": "Kovan टेस्ट नेटवर्क" - }, "lastConnected": { "message": "अंतिम बार जुड़ा" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "यह अनुबंध आपके वर्तमान या भविष्य के और टोकन पर खर्च करने में असमर्थ है।" }, - "rinkeby": { - "message": "Rinkeby टेस्ट नेटवर्क" - }, - "ropsten": { - "message": "Ropsten टेस्ट नेटवर्क" - }, "rpcUrl": { "message": "नया RPC URL" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index e75010b28..8e42dd052 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -175,9 +175,6 @@ "message": "JSON फ़ाइल", "description": "format for importing an account" }, - "kovan": { - "message": "कोवान टेस्ट नेटवर्क" - }, "likeToImportTokens": { "message": "क्या आप इन टोकनों को जोड़ना चाहते हैं?" }, @@ -281,12 +278,6 @@ "revealSeedWordsWarning": { "message": "किसी सार्वजनिक स्थान पर अपने बीज के शब्द ठीक नहीं करें! ये शब्द आपके सभी खातों को चोरी करने के लिए उपयोग किए जा सकते हैं।" }, - "rinkeby": { - "message": "रिचीव टेस्ट नेटवर्क" - }, - "ropsten": { - "message": "रॉप्स्टेन टेस्ट नेटवर्क" - }, "save": { "message": "सहेजें" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 8b2836a2e..253993929 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Povezivanje na testnu mrežu Goerli" }, - "connectingToKovan": { - "message": "Povezivanje na testnu mrežu Kovan" - }, "connectingToMainnet": { "message": "Povezivanje na glavnu mrežu Ethereum" }, - "connectingToRinkeby": { - "message": "Povezivanje na testnu mrežu Rinkeby" - }, - "connectingToRopsten": { - "message": "Povezivanje na testnu mrežu Ropsten" - }, "continueToWyre": { "message": "Nastavi na uslugu Wyre" }, @@ -487,9 +478,6 @@ "knownAddressRecipient": { "message": "Poznata ugovorna adresa." }, - "kovan": { - "message": "Testna mreža Kovan" - }, "learnMore": { "message": "Saznajte više" }, @@ -743,12 +731,6 @@ "revealSeedWordsWarningTitle": { "message": "NE DIJELITE ovu rečenicu ni s kim!" }, - "rinkeby": { - "message": "Testna mreža Rinkeby" - }, - "ropsten": { - "message": "Testna mreža Ropsten" - }, "rpcUrl": { "message": "Novi URL RPC-a" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index 35f3bbdb2..815e89d26 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -108,18 +108,9 @@ "connectHardwareWallet": { "message": "Konekte Materyèl Wallet" }, - "connectingToKovan": { - "message": "Konekte nan Kovan Tès Rezo a" - }, "connectingToMainnet": { "message": "Konekte ak Prensipal Ethereum Rezo a" }, - "connectingToRinkeby": { - "message": "Konekte nan Rinkeby Tès Rezo a" - }, - "connectingToRopsten": { - "message": "Konekte ak Ropsten Tès Rezo a" - }, "contractDeployment": { "message": "Kontra Deplwaman" }, @@ -292,9 +283,6 @@ "message": "JSON Dosye", "description": "format for importing an account" }, - "kovan": { - "message": "Kovan Tès Rezo" - }, "learnMore": { "message": "Aprann plis" }, @@ -488,12 +476,6 @@ "revealSeedWordsWarningTitle": { "message": "PA pataje fraz sa a avèk nenpòt moun!" }, - "rinkeby": { - "message": "Rinkeby Tès Rezo" - }, - "ropsten": { - "message": "Ropsten Tès Rezo" - }, "save": { "message": "Sove" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 11d585332..dfcec73f3 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Csatlakozás a Goerli teszthálózathoz" }, - "connectingToKovan": { - "message": "Csatlakozás a Kovan teszthálózathoz" - }, "connectingToMainnet": { "message": "Csatlakozás a fő Ethereum hálózathoz" }, - "connectingToRinkeby": { - "message": "Kapcsolódás a Rinkeby Teszthálózathoz" - }, - "connectingToRopsten": { - "message": "Csatlakozás a Ropsten teszthálózathoz" - }, "continueToWyre": { "message": "Tovább a Wyre-re" }, @@ -487,9 +478,6 @@ "knownAddressRecipient": { "message": "Ismert szerződéses cím." }, - "kovan": { - "message": "Kovan teszthálózat" - }, "learnMore": { "message": "Tudjon meg többet" }, @@ -743,12 +731,6 @@ "revealSeedWordsWarningTitle": { "message": "NE ossza meg ezt a mondatot senkivel!" }, - "rinkeby": { - "message": "Rinkeby teszthálózat" - }, - "ropsten": { - "message": "Ropsten teszthálózat" - }, "rpcUrl": { "message": "Új RPC URL" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 420d06027..4d577cb2a 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Menghubungkan ke jaringan uji Goerli" }, - "connectingToKovan": { - "message": "Menghubungkan ke jaringan uji Kovan" - }, "connectingToMainnet": { "message": "Menghubungkan ke Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Menghubungkan ke jaringan uji Rinkeby" - }, - "connectingToRopsten": { - "message": "Menghubungkan ke jaringan uji Ropsten" - }, "connectingToSepolia": { "message": "Menghubungkan ke jaringan uji Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Tindakan ini akan mengedit token yang telah terdaftar dalam dompet Anda, yang dapat digunakan untuk menipu Anda. Setujui hanya jika Anda yakin bahwa Anda ingin mengubah apa yang diwakili token ini. Pelajari selengkapnya seputar $1" }, - "kovan": { - "message": "Jaringan uji Kovan" - }, "lastConnected": { "message": "Terakhir terhubung" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Kontrak ini tidak akan dapat mempergunakan token Anda saat ini atau di masa mendatang." }, - "rinkeby": { - "message": "Jaringan uji Rinkeby" - }, - "ropsten": { - "message": "Jaringan uji Ropsten" - }, "rpcUrl": { "message": "URL RPC Baru" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 355c46690..4e4421202 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -292,18 +292,9 @@ "connectingToGoerli": { "message": "Connessione alla Rete di Test Goerli" }, - "connectingToKovan": { - "message": "Connessione alla Rete di test Kovan" - }, "connectingToMainnet": { "message": "Connessione alla Rete Ethereum Principale" }, - "connectingToRinkeby": { - "message": "Connessione alla Rete di test Rinkeby" - }, - "connectingToRopsten": { - "message": "Connessione alla Rete di test Ropsten" - }, "contactUs": { "message": "Contattaci!" }, @@ -774,9 +765,6 @@ "knownTokenWarning": { "message": "Questa azione modificherà i token che sono già nel tuo portafoglio, che possono essere utilizzati per truffarti. Approva solo se sei sicuro di voler cambiare ciò che rappresentano questi token." }, - "kovan": { - "message": "Rete di test Kovan" - }, "lastConnected": { "message": "Ultima Connessione" }, @@ -1131,12 +1119,6 @@ "revealSeedWordsWarningTitle": { "message": "NON CONDIVIDERE questa frase con nessuno!" }, - "rinkeby": { - "message": "Rete di test Rinkeby" - }, - "ropsten": { - "message": "Rete di test Ropsten" - }, "rpcUrl": { "message": "Nuovo URL RPC" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 822bb06f6..781b55da8 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Goerliテストネットワークに接続中" }, - "connectingToKovan": { - "message": "Kovanテストネットワークに接続中" - }, "connectingToMainnet": { "message": "イーサリアムメインネットに接続中" }, - "connectingToRinkeby": { - "message": "Rinkebyテストネットワークに接続中" - }, - "connectingToRopsten": { - "message": "Ropstenテストネットワークに接続中" - }, "connectingToSepolia": { "message": "Sepolia テストネットワークに接続中" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "このアクションは、ウォレットに既に一覧表示されているトークンを編集します。これは、フィッシングに使用される可能性があります。これらのトークンの表す内容を変更する意図が確実な場合にのみ承認します。$1に関する詳細をご覧ください" }, - "kovan": { - "message": "Kovanテストネットワーク" - }, "lastConnected": { "message": "前回の接続" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "このコントラクトは、現在または今後のトークンをこれ以上使用できなくなります。" }, - "rinkeby": { - "message": "Rinkebyテストネットワーク" - }, - "ropsten": { - "message": "Ropstenテストネットワーク" - }, "rpcUrl": { "message": "新しいRPC URL" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 1c77584ea..4ffb4e464 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Goerli ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" }, - "connectingToKovan": { - "message": "Kovan ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ " - }, "connectingToMainnet": { "message": "ಮುಖ್ಯ ಎಥೆರಿಯಮ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" }, - "connectingToRinkeby": { - "message": "Rinkeby ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" - }, - "connectingToRopsten": { - "message": "Ropsten ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" - }, "continueToWyre": { "message": "Wyre ಗೆ ಮುಂದುವರಿಸಿ" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "ತಿಳಿದಿರುವ ಒಪ್ಪಂದದ ವಿಳಾಸ." }, - "kovan": { - "message": "Kovan ಪರೀಕ್ಷೆ ನೆಟ್‌ವರ್ಕ್" - }, "learnMore": { "message": "ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ" }, @@ -750,12 +738,6 @@ "revealSeedWordsWarningTitle": { "message": "ಈ ಫ್ರೇಸ್ ಅನ್ನು ಯಾರೊಂದಿಗೂ ಹಂಚಿಕೊಳ್ಳಬೇಡಿ!" }, - "rinkeby": { - "message": "Rinkeby ಪರೀಕ್ಷೆ ನೆಟ್‌ವರ್ಕ್" - }, - "ropsten": { - "message": "Ropsten ಪರೀಕ್ಷೆ ನೆಟ್‌ವರ್ಕ್" - }, "rpcUrl": { "message": "ಹೊಸ RPC URL" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index b0005b7bb..00d49f447 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Goerli 테스트 네트워크에 연결 중" }, - "connectingToKovan": { - "message": "Kovan 테스트 네트워크에 연결 중" - }, "connectingToMainnet": { "message": "이더리움 메인넷에 연결 중" }, - "connectingToRinkeby": { - "message": "Rinkeby 테스트 네트워크에 연결 중" - }, - "connectingToRopsten": { - "message": "Ropsten 테스트 네트워크에 연결 중" - }, "connectingToSepolia": { "message": "Sepolia 테스트 네트워크에 연결 중" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "이 작업은 지갑에 이미 나열되어 있고 피싱에 사용될 수 있는 토큰을 편집합니다. 해당 토큰이 나타내는 내용을 변경하려는 경우에만 작업을 승인하세요. $1에 대해 자세히 알아보기" }, - "kovan": { - "message": "Kovan 테스트 네트워크" - }, "lastConnected": { "message": "마지막으로 연결됨" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "이 계약은 현재나 미래의 토큰을 더 이상 사용할 수 없습니다." }, - "rinkeby": { - "message": "Rinkeby 테스트 네트워크" - }, - "ropsten": { - "message": "Ropsten 테스트 네트워크" - }, "rpcUrl": { "message": "새 RPC URL" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 6118151b2..18227752e 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Jungiamasi prie „Goerli“ bandomojo tinklo" }, - "connectingToKovan": { - "message": "Jungiamasi prie „Kovan“ bandomojo tinklo" - }, "connectingToMainnet": { "message": "Jungiamasi prie pagrindinio „Ethereum“ tinklo" }, - "connectingToRinkeby": { - "message": "Jungiamasi prie „Rinkeby“ bandomojo tinklo" - }, - "connectingToRopsten": { - "message": "Jungiamasi prie „Ropsten“ bandomojo tinklo" - }, "continueToWyre": { "message": "Tęsti su „Wyre“" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "Žinomas sutarties adresas." }, - "kovan": { - "message": "„Kovan“ bandomasis tinklas" - }, "learnMore": { "message": "Sužinokite daugiau" }, @@ -750,12 +738,6 @@ "revealSeedWordsWarningTitle": { "message": "Šia fraze su niekuo NESIDALINKITE!" }, - "rinkeby": { - "message": "„Rinkeby“ bandomasis tinklas" - }, - "ropsten": { - "message": "„Ropsten“ bandomasis tinklas" - }, "rpcUrl": { "message": "Naujas RPC URL" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index 6adf3a5fb..745aef836 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Pieslēdzas Goerli testa tīklam" }, - "connectingToKovan": { - "message": "Savienojas ar Kovan testa tīklu" - }, "connectingToMainnet": { "message": "Savienojas ar galveno Ethereum tīklu" }, - "connectingToRinkeby": { - "message": "Pieslēdzas Rinkeby testa tīklam" - }, - "connectingToRopsten": { - "message": "Pieslēdzas Ropsten testa tīklam" - }, "continueToWyre": { "message": "Pāriet uz Wyre" }, @@ -487,9 +478,6 @@ "knownAddressRecipient": { "message": "Zināmā līguma adrese." }, - "kovan": { - "message": "Kovan testa tīkls" - }, "learnMore": { "message": "Uzzināt vairāk" }, @@ -746,12 +734,6 @@ "revealSeedWordsWarningTitle": { "message": "NEDALIETIES ar šo frāzi!" }, - "rinkeby": { - "message": "Rinkeby testa tīkls" - }, - "ropsten": { - "message": "Ropsten testa tīkls" - }, "rpcUrl": { "message": "Jauns RPC URL" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index ee8f3c150..81b001a71 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Menyambung kepada Rangkaian Ujian Goerli" }, - "connectingToKovan": { - "message": "Menyambungkan kepada Rangkaian Ujian Kovan" - }, "connectingToMainnet": { "message": "Menyambung kepada Rangkaian Ethereum Utama" }, - "connectingToRinkeby": { - "message": "Menyambung kepada Rangkaian Ujian Rinkeby" - }, - "connectingToRopsten": { - "message": "Menyambungkan kepada Rangkaian Ujian Ropsten" - }, "continueToWyre": { "message": "Teruskan ke Wyre" }, @@ -480,9 +471,6 @@ "knownAddressRecipient": { "message": "Alamat kontrak diketahui." }, - "kovan": { - "message": "Rangkaian Ujian Kovan" - }, "learnMore": { "message": "Maklumat lanjut" }, @@ -730,12 +718,6 @@ "revealSeedWordsWarningTitle": { "message": "JANGAN berkongsi ungkapan ini dengan orang lain!" }, - "rinkeby": { - "message": "Rangkaian Ujian Rinkeby" - }, - "ropsten": { - "message": "Rangkaian Ujian Ropsten" - }, "rpcUrl": { "message": "URL RPC baru" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 169efd73a..085ef891d 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -172,9 +172,6 @@ "message": "JSON-bestand", "description": "format for importing an account" }, - "kovan": { - "message": "Kovan-testnetwerk" - }, "likeToImportTokens": { "message": "Wil je deze tokens toevoegen?" }, @@ -271,12 +268,6 @@ "revealSeedWordsWarning": { "message": "Zorg dat je back-up woorden niet op een openbare plaats bekijkt! Deze woorden kunnen worden gebruikt om al uw accounts opnieuw te genereren (en dus uw account te stelen)." }, - "rinkeby": { - "message": "Rinkeby testnetwerk" - }, - "ropsten": { - "message": "Ropsten testnetwerk" - }, "save": { "message": "Opslaan" }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 3149f4965..06b98d531 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -187,18 +187,9 @@ "connectingToGoerli": { "message": "Oppretter forbindelse med Goerli Test Network" }, - "connectingToKovan": { - "message": "Kobler til Kovan testnettverk" - }, "connectingToMainnet": { "message": "Forbinder med hoved-Ethereumnettverk " }, - "connectingToRinkeby": { - "message": "Kobler til Rinkeby Test Network " - }, - "connectingToRopsten": { - "message": "Kobler til Ropsten testnettverk" - }, "continueToWyre": { "message": "Fortsett til Wyre " }, @@ -478,9 +469,6 @@ "knownAddressRecipient": { "message": "Kjent kontaktadresse" }, - "kovan": { - "message": "Kovan testnettverk" - }, "learnMore": { "message": "Lær mer" }, @@ -737,9 +725,6 @@ "revealSeedWordsWarningTitle": { "message": "IKKE del denne frasen med noen! " }, - "rinkeby": { - "message": "Rinkeby testnettverk" - }, "rpcUrl": { "message": "NY RPC-URL " }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 0a6017a7a..15d729216 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -352,18 +352,9 @@ "connectingToGoerli": { "message": "Kumokonekta sa Goerli Test Network" }, - "connectingToKovan": { - "message": "Kumokonekta sa Kovan Test Network" - }, "connectingToMainnet": { "message": "Kumokonekta sa Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Kumokonekta sa Rinkeby Test Network" - }, - "connectingToRopsten": { - "message": "Kumokonekta sa Ropsten Test Network" - }, "contactUs": { "message": "Makipag-ugnayan sa amin" }, @@ -909,9 +900,6 @@ "knownTokenWarning": { "message": "Mae-edit ng aksyong ito ang mga token na nakalista na sa iyong wallet, na puwedeng gamitin para i-phish ka. Aprubahan lang kung sigurado kang gusto mong baguhin kung ano ang kinakatawan ng mga token na ito." }, - "kovan": { - "message": "Kovan Test Network" - }, "lastConnected": { "message": "Huling Kumonekta" }, @@ -1414,12 +1402,6 @@ "revealSeedWordsWarningTitle": { "message": "Huwag ibahagi ang phrase na ito sa kahit sino!" }, - "rinkeby": { - "message": "Rinkeby Test Network" - }, - "ropsten": { - "message": "Ropsten Test Network" - }, "rpcUrl": { "message": "Bagong RPC URL" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 0b7f30213..03929a328 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Łączenie z siecią testową Goerli" }, - "connectingToKovan": { - "message": "Łączenie z siecią testową Kovan" - }, "connectingToMainnet": { "message": "Łączenie z główną siecią Ethereum" }, - "connectingToRinkeby": { - "message": "Łączenie z siecią testową Rinkeby" - }, - "connectingToRopsten": { - "message": "Łączenie z siecią testową Ropsten" - }, "continueToWyre": { "message": "Przejdź do Wyre" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "Znany adres kontraktu." }, - "kovan": { - "message": "Sieć testowa Kovan" - }, "learnMore": { "message": "Dowiedz się więcej" }, @@ -744,12 +732,6 @@ "revealSeedWordsWarningTitle": { "message": "NIE pokazuj tej frazy nikomu!" }, - "rinkeby": { - "message": "Sieć testowa Rinkeby" - }, - "ropsten": { - "message": "Sieć testowa Ropsten" - }, "rpcUrl": { "message": "Nowy adres URL RPC" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 0f1a1d1ab..21f8d79a7 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Conectando à rede de testes Goerli" }, - "connectingToKovan": { - "message": "Conectando à rede de testes Kovan" - }, "connectingToMainnet": { "message": "Conectando à mainnet do Ethereum" }, - "connectingToRinkeby": { - "message": "Conectando à rede de testes Rinkeby" - }, - "connectingToRopsten": { - "message": "Conectando à rede de testes Ropsten" - }, "connectingToSepolia": { "message": "Conectando à rede de teste Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Essa ação editará os tokens já listados na sua carteira, que podem ser usado para praticar phishing contra você. Só aprove se você tiver certeza de que quer alterar o que esses tokens representam." }, - "kovan": { - "message": "Rede de testes Kovan" - }, "lastConnected": { "message": "Última conexão" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Este contrato não poderá gastar mais nenhum de seus tokens atuais ou futuros." }, - "rinkeby": { - "message": "Rede de teste Rinkeby" - }, - "ropsten": { - "message": "Rede de teste Ropsten" - }, "rpcUrl": { "message": "Novo URL da RPC" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 3eea7bce1..245a0ad7b 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -511,18 +511,9 @@ "connectingToGoerli": { "message": "Conectando à rede de testes Goerli" }, - "connectingToKovan": { - "message": "Conectando à rede de testes Kovan" - }, "connectingToMainnet": { "message": "Conectando à mainnet do Ethereum" }, - "connectingToRinkeby": { - "message": "Conectando à rede de testes Rinkeby" - }, - "connectingToRopsten": { - "message": "Conectando à rede de testes Ropsten" - }, "contactUs": { "message": "Fale conosco" }, @@ -1394,9 +1385,6 @@ "knownTokenWarning": { "message": "Essa ação editará os tokens já listados na sua carteira, que podem ser usado para praticar phishing contra você. Só aprove se você tiver certeza de que quer alterar o que esses tokens representam." }, - "kovan": { - "message": "Rede de testes Kovan" - }, "lastConnected": { "message": "Conectado pela última vez em" }, @@ -2209,12 +2197,6 @@ "revealSeedWordsWarningTitle": { "message": "NÃO compartilhe essa frase com ninguém!" }, - "rinkeby": { - "message": "Rede de testes Rinkeby" - }, - "ropsten": { - "message": "Rede de testes Ropsten" - }, "rpcUrl": { "message": "Novo URL da RPC" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index 76afc2979..cfe91a352 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Se conectează la rețeaua de test Goerli" }, - "connectingToKovan": { - "message": "Se conectează la rețeaua de test Kovan" - }, "connectingToMainnet": { "message": "Se conectează la rețeaua Ethereum principală" }, - "connectingToRinkeby": { - "message": "Se conectează la Rețeaua de test Rinkeby" - }, - "connectingToRopsten": { - "message": "Se conectează la rețeaua de test Ropsten" - }, "continueToWyre": { "message": "Continuați la Wyre" }, @@ -481,9 +472,6 @@ "knownAddressRecipient": { "message": "Adresa cunoscută din contract." }, - "kovan": { - "message": "Rețea de test Kovan" - }, "learnMore": { "message": "Aflați mai multe" }, @@ -737,12 +725,6 @@ "revealSeedWordsWarningTitle": { "message": "NU împărtășiți această expresie nimănui!" }, - "rinkeby": { - "message": "Rețea test Rinkeby" - }, - "ropsten": { - "message": "Rețea de testare Ropsten" - }, "rpcUrl": { "message": "URL RPC nou" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 745c42b67..82410531b 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Подключение к тестовой сети Goerli..." }, - "connectingToKovan": { - "message": "Подключение к тестовой сети Kovan..." - }, "connectingToMainnet": { "message": "Подключение к сети Ethereum Mainnet..." }, - "connectingToRinkeby": { - "message": "Подключение к тестовой сети Rinkeby..." - }, - "connectingToRopsten": { - "message": "Подключение к тестовой сети Ropsten..." - }, "connectingToSepolia": { "message": "Подключение к тестовой сети Sepolia..." }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Это действие изменит токены, уже указанные в вашем кошельке, которые можно использовать для фишинга. Утверждайте, только если вы уверены, что хотите изменить то, что представляют эти токены. Узнайте подробнее о $1" }, - "kovan": { - "message": "Тестовая сеть Kovan" - }, "lastConnected": { "message": "Последнее подключение" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Этот контракт не позволит вам больше тратить ваши текущие или будущие токены." }, - "rinkeby": { - "message": "Тестовая сеть Rinkeby" - }, - "ropsten": { - "message": "Тестовая сеть Ropsten" - }, "rpcUrl": { "message": "Новый URL-адрес RPC" }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 22e1f7821..2f4fb2e9a 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -184,18 +184,9 @@ "connectingToGoerli": { "message": "Pripája sa k testovacej sieti Goerli" }, - "connectingToKovan": { - "message": "Připojuji se k Kovan Test Network" - }, "connectingToMainnet": { "message": "Připojuji se k Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "Připojuji se k Rinkeby Test Network" - }, - "connectingToRopsten": { - "message": "Připojuji se k Ropsten Test Network" - }, "continueToWyre": { "message": "Pokračovať na Wyre" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 0d729be4b..f3fd82b89 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Povezovanje na testno omrežje Goerli" }, - "connectingToKovan": { - "message": "Povezovanje na testno omrežje Kovan" - }, "connectingToMainnet": { "message": "Povezovanje na glavno omrežje" }, - "connectingToRinkeby": { - "message": "Povezovanje na testno omrežje Rinkeby" - }, - "connectingToRopsten": { - "message": "Povezovanje na testno omrežje Ropsten" - }, "continueToWyre": { "message": "Nadaljuj na Wyre" }, @@ -485,9 +476,6 @@ "knownAddressRecipient": { "message": "Znan naslov pogodbe." }, - "kovan": { - "message": "Testno omrežje Kovan" - }, "learnMore": { "message": "Preberite več" }, @@ -738,12 +726,6 @@ "revealSeedWordsWarningTitle": { "message": "Tega ne delite z nikomer!" }, - "rinkeby": { - "message": "Testno omrežje Rinkeby" - }, - "ropsten": { - "message": "Testno omrežje Ropsten" - }, "rpcUrl": { "message": "Nov URL RPC" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index fcf33544e..c51f8d3a9 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -187,18 +187,9 @@ "connectingToGoerli": { "message": "Povezuje se sa test mrežom Goerli " }, - "connectingToKovan": { - "message": "Povezuje se na test mrežu Kovan" - }, "connectingToMainnet": { "message": "Povezuje se na glavnu Ethereum mrežu" }, - "connectingToRinkeby": { - "message": "Poezivanje na Rinkeby Test mrežu" - }, - "connectingToRopsten": { - "message": "Povezuje se na Ropsten Test mrežu" - }, "continueToWyre": { "message": "Nastavite ka Wyre" }, @@ -488,9 +479,6 @@ "knownAddressRecipient": { "message": "Poznata adresa ugovora." }, - "kovan": { - "message": "Kovan test mreža" - }, "learnMore": { "message": "Nauči više" }, @@ -741,12 +729,6 @@ "revealSeedWordsWarningTitle": { "message": "NE delite ovu frazu ni sa kim!" }, - "rinkeby": { - "message": "Rinkeby test mreža" - }, - "ropsten": { - "message": "Test mreža Ropsten" - }, "rpcUrl": { "message": "Novi RPC URL" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index f88911fd2..161261870 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -184,18 +184,9 @@ "connectingToGoerli": { "message": "Ansluter till Goerli Test Network" }, - "connectingToKovan": { - "message": "Ansluter till Kovans testnätverk" - }, "connectingToMainnet": { "message": "Koppla till Ethereums huvudnätverk" }, - "connectingToRinkeby": { - "message": "Ansluter till Rinkeby Test Network" - }, - "connectingToRopsten": { - "message": "Ansluter till Ropsten Test Network" - }, "continueToWyre": { "message": "Fortsätt till Wyre" }, @@ -481,9 +472,6 @@ "knownAddressRecipient": { "message": "Känd kontraktadress." }, - "kovan": { - "message": "Kovan testnätverk" - }, "learnMore": { "message": "Läs mer" }, @@ -734,12 +722,6 @@ "revealSeedWordsWarningTitle": { "message": "DELA INTE frasen med någon!" }, - "rinkeby": { - "message": "Rinkeby testnätverk" - }, - "ropsten": { - "message": "Ropsten testnätverk" - }, "rpcUrl": { "message": "Ny RPC-URL" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index a01c9c096..ac48f06de 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -184,18 +184,9 @@ "connectingToGoerli": { "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Goerli" }, - "connectingToKovan": { - "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Kovan" - }, "connectingToMainnet": { "message": "Inaunganisha kwenye Mtandao Mkuu wa Ethereum" }, - "connectingToRinkeby": { - "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Rinkeby" - }, - "connectingToRopsten": { - "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Ropsten" - }, "continueToWyre": { "message": "Endelea kwenye Wyre" }, @@ -478,9 +469,6 @@ "knownAddressRecipient": { "message": "Anwani za mkataba zinazofahamika." }, - "kovan": { - "message": "Mtandao wa Majaribio wa Kovan" - }, "learnMore": { "message": "Jifunze zaidi" }, @@ -728,12 +716,6 @@ "revealSeedWordsWarningTitle": { "message": "USISHIRIKI kirai hiki na mtu yeyote!" }, - "rinkeby": { - "message": "Mtandao wa Majaribio wa Rinkeby" - }, - "ropsten": { - "message": "Mtandao wa Majaribio wa Ropsten" - }, "rpcUrl": { "message": "RPC URL mpya" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index 775c63d2a..5c4f63430 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -78,18 +78,9 @@ "connect": { "message": "இணை" }, - "connectingToKovan": { - "message": "கோவன் டெஸ்ட் நெட்வொர்க்குடன் இணைத்தல்" - }, "connectingToMainnet": { "message": "முக்கிய எதெரியும் நெட்வொர்க் இணைக்கும்" }, - "connectingToRinkeby": { - "message": "ரிங்கெப்ய டெஸ்ட் நெட்வொர்க்குடன் இணைக்கிறது" - }, - "connectingToRopsten": { - "message": "ரொப்ஸ்டென் டெஸ்ட் நெட்வொர்க்குடன் இணைக்கிறது" - }, "contractDeployment": { "message": "ஒப்பந்த வரிசைப்படுத்தல்" }, @@ -235,9 +226,6 @@ "message": "JSON கோப்பு", "description": "format for importing an account" }, - "kovan": { - "message": "கோவன் டெஸ்ட் நெட்வொர்க்" - }, "learnMore": { "message": "மேலும் அறிக" }, @@ -389,12 +377,6 @@ "revealSeedWordsWarning": { "message": "உங்கள் விதை வார்த்தைகள் ஒரு பொது இடத்தில் மீட்க வேண்டாம்! உங்கள் எல்லா கணக்குகளையும் திருட இந்த வார்த்தைகள் பயன்படுத்தப்படலாம்." }, - "rinkeby": { - "message": "ரிங்கெப்ய டெஸ்ட் நெட்வொர்க்" - }, - "ropsten": { - "message": "ரொப்ஸ்டென் டெஸ்ட் நெட்வொர்க்" - }, "save": { "message": "சேமி" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 89707ce76..347176fea 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -81,9 +81,6 @@ "connectingToMainnet": { "message": "เชื่อมต่อกับเครือข่าย Ethereum หลัก" }, - "connectingToRopsten": { - "message": "เชื่อมต่อกับเครือข่ายทดสอบ Ropsten" - }, "continueToWyre": { "message": "ไปที่ Wyre" }, @@ -247,9 +244,6 @@ "message": "ไฟล์ JSON", "description": "format for importing an account" }, - "kovan": { - "message": "เครือข่ายทดสอบ Kovan" - }, "learnMore": { "message": "เรียนรู้เพิ่มเติม" }, @@ -371,12 +365,6 @@ "revealSeedWordsWarning": { "message": "อย่าเปิดเผยคำกลุ่มคำชีดของคุณในที่สาธารณะ! คำเหล่านี้สามารถใช้เพื่อขโมยบัญชีทั้งหมดของคุณ" }, - "rinkeby": { - "message": "เครือข่ายทดสอบ Rinkeby" - }, - "ropsten": { - "message": "เครือข่ายทดสอบ Ropsten" - }, "save": { "message": "บันทึก" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 1eaeace76..5ef6c7fbc 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Kumokonekta sa Goerli Test Network" }, - "connectingToKovan": { - "message": "Kumokonekta sa Kovan Test Network" - }, "connectingToMainnet": { "message": "Kumokonekta sa Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": "AwwKumokonekta sa Rinkeby test network" - }, - "connectingToRopsten": { - "message": "Kumokonekta sa Ropsten test network" - }, "connectingToSepolia": { "message": "Kumokonekta sa Sepolia test network" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Mae-edit ng aksyong ito ang mga token na nakalista na sa iyong wallet, na puwedeng gamitin para i-phish ka. Aprubahan lang kung sigurado kang gusto mong baguhin kung ano ang kinakatawan ng mga token na ito. Alamin pa ang tungkol sa $1" }, - "kovan": { - "message": "Kovan Test Network" - }, "lastConnected": { "message": "Huling Kumonekta" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Hindi na magagawang gastusin pa ng kontratang ito ang iyong mga pangkasalukuyan o panghinaharap na mga token." }, - "rinkeby": { - "message": "Rinkeby Test Network" - }, - "ropsten": { - "message": "Ropsten Test Network" - }, "rpcUrl": { "message": "Bagong RPC URL" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index a2769460a..fd9e1ebe2 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Goerli Test Ağına Bağlanıyor" }, - "connectingToKovan": { - "message": "Kovan Test Ağına bağlanıyor" - }, "connectingToMainnet": { "message": "Ethereum Mainnet ağına bağlanıyor" }, - "connectingToRinkeby": { - "message": "Rinkeby Test Ağına bağlanıyor" - }, - "connectingToRopsten": { - "message": "Ropsten Test Ağına bağlanıyor" - }, "connectingToSepolia": { "message": "Sepolia test ağına bağlanılıyor" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Bu eylem kimlik avı için kullanılabilecek şekilde cüzdanınızda zaten listelenmiş olan tokenleri düzenleyecektir. Sadece bu tokenlerin neyi temsil ettiğini değiştirmek istediğinizden eminseniz onaylayın. $1 hakkında daha fazla bilgi edinin" }, - "kovan": { - "message": "Kovan Test Ağı" - }, "lastConnected": { "message": "Son Bağlanma" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Bu sözleşme şimdiki ya da gelecekteki tokenlerinizin hiçbirini kullanamayacak." }, - "rinkeby": { - "message": "Rinkeby Test Ağı" - }, - "ropsten": { - "message": "Ropsten Test Ağı" - }, "rpcUrl": { "message": "Yeni RPC URL adresi" }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 4f0c073d0..14a340c55 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -190,18 +190,9 @@ "connectingToGoerli": { "message": "Підключення до тестової мережі Goerli" }, - "connectingToKovan": { - "message": "Підключення до тестової мережі Kovan" - }, "connectingToMainnet": { "message": "З'єднуємось з Головною мережею Ethereum" }, - "connectingToRinkeby": { - "message": "Під'єднуємось до тестової мережі Rinkeby" - }, - "connectingToRopsten": { - "message": "Під'єднуємось до Тестової мережі Ropsten" - }, "continueToWyre": { "message": "Продовжити у Wyre" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "Відома контрактна адреса." }, - "kovan": { - "message": "Тестова мережа Kovan" - }, "learnMore": { "message": "Дізнатись більше" }, @@ -750,12 +738,6 @@ "revealSeedWordsWarningTitle": { "message": "НЕ передавайте цю фразу нікому!" }, - "rinkeby": { - "message": "Тестова мережа Rinkeby" - }, - "ropsten": { - "message": "Тестова мережа Ropsten" - }, "rpcUrl": { "message": "Новий RPC URL" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index d85e93a87..ad00eb4b4 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "Đang kết nối với mạng thử nghiệm Goerli" }, - "connectingToKovan": { - "message": "Đang kết nối với mạng thử nghiệm Kovan" - }, "connectingToMainnet": { "message": "Đang kết nối với mạng chính thức của Ethereum" }, - "connectingToRinkeby": { - "message": "Đang kết nối với mạng thử nghiệm Rinkeby" - }, - "connectingToRopsten": { - "message": "Đang kết nối với mạng thử nghiệm Ropsten" - }, "connectingToSepolia": { "message": "Đang kết nối với mạng thử nghiệm Sepolia" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "Hành động này sẽ chỉnh sửa các token đã niêm yết trong ví của bạn, kẻ xấu có thể lợi dụng việc này để lừa đảo bạn. Chỉ phê duyệt nếu bạn chắc chắn rằng bạn muốn thay đổi giá trị mà những token này đại diện cho. Tìm hiểu thêm về $1" }, - "kovan": { - "message": "Mạng thử nghiệm Kovan" - }, "lastConnected": { "message": "Đã kết nối lần cuối" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "Hợp đồng này sẽ không thể chi tiêu thêm bất kỳ token hiện tại hoặc tương lai nào của bạn." }, - "rinkeby": { - "message": "Mạng thử nghiệm Rinkeby" - }, - "ropsten": { - "message": "Mạng thử nghiệm Ropsten" - }, "rpcUrl": { "message": "URL RPC mới" }, diff --git a/app/_locales/zh/messages.json b/app/_locales/zh/messages.json index 670e3026f..ce6a95c56 100644 --- a/app/_locales/zh/messages.json +++ b/app/_locales/zh/messages.json @@ -619,18 +619,9 @@ "connectingToGoerli": { "message": "正在连接 Goerli 测试网络" }, - "connectingToKovan": { - "message": "正在连接到 Kovan 测试网络" - }, "connectingToMainnet": { "message": "正在连接到以太坊主网" }, - "connectingToRinkeby": { - "message": "正在连接到 Rinkeby 测试网络" - }, - "connectingToRopsten": { - "message": "正在连接到 Ropsten 测试网络" - }, "contactUs": { "message": "联系我们" }, @@ -1669,9 +1660,6 @@ "knownTokenWarning": { "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1" }, - "kovan": { - "message": "Kovan 测试网络" - }, "lastConnected": { "message": "最后连接" }, @@ -2732,12 +2720,6 @@ "message": "通过撤销权限，以下$1将无法再访问您的$2", "description": "$1 is either key 'account' or 'contract', and $2 is either a string or link of a given token symbol or name" }, - "rinkeby": { - "message": "Rinkeby 测试网络" - }, - "ropsten": { - "message": "Ropsten 测试网络" - }, "rpcUrl": { "message": "新的 RPC URL" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index b10ce65f1..eb1e1be9c 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -708,18 +708,9 @@ "connectingToGoerli": { "message": "正在连接 Goerli 测试网络" }, - "connectingToKovan": { - "message": "正在连接 Kovan 测试网络" - }, "connectingToMainnet": { "message": "正在连接到以太坊主网" }, - "connectingToRinkeby": { - "message": "正在连接 Rinkeby 测试网络" - }, - "connectingToRopsten": { - "message": "正在连接 Ropsten 测试网络" - }, "connectingToSepolia": { "message": "正在连接Sepolia测试网络" }, @@ -1800,9 +1791,6 @@ "knownTokenWarning": { "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1" }, - "kovan": { - "message": "Kovan 测试网络" - }, "lastConnected": { "message": "最后连接" }, @@ -2923,12 +2911,6 @@ "revokeSpendingCapTooltipText": { "message": "本合约将无法再使用您当前或未来的任何代币。" }, - "rinkeby": { - "message": "Rinkeby 测试网络" - }, - "ropsten": { - "message": "Ropsten 测试网络" - }, "rpcUrl": { "message": "新的 RPC URL" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 69d81d306..a4ac39f5c 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "連接至 Goerli 測試網路" }, - "connectingToKovan": { - "message": "連線到 Kovan 測試網路" - }, "connectingToMainnet": { "message": "連線到主 Ethereum 網路" }, - "connectingToRinkeby": { - "message": "連線到 Rinkeby 測試網路" - }, - "connectingToRopsten": { - "message": "連線到 Ropsten 測試網路" - }, "continueToWyre": { "message": "繼續至 Wyre" }, @@ -491,9 +482,6 @@ "knownAddressRecipient": { "message": "已知合約位址" }, - "kovan": { - "message": "Kovan 測試網路" - }, "learnMore": { "message": "了解更多" }, @@ -732,12 +720,6 @@ "revealSeedWordsWarningTitle": { "message": "請勿將助憶詞洩漏予他人" }, - "rinkeby": { - "message": "Rinkeby 測試網路" - }, - "ropsten": { - "message": "Ropsten 測試網路" - }, "rpcUrl": { "message": "新的 RPC URL" }, diff --git a/app/scripts/constants/contracts.js b/app/scripts/constants/contracts.js index 7afbba1f0..19ed411ec 100644 --- a/app/scripts/constants/contracts.js +++ b/app/scripts/constants/contracts.js @@ -1,11 +1,5 @@ export const SINGLE_CALL_BALANCES_ADDRESS = '0xb1f8e55c7f64d203c1400b9d8555d050f94adf39'; -export const SINGLE_CALL_BALANCES_ADDRESS_RINKEBY = - '0x9f510b19f1ad66f0dcf6e45559fab0d6752c1db7'; -export const SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN = - '0xb8e671734ce5c8d7dfbbea5574fa4cf39f7a54a4'; -export const SINGLE_CALL_BALANCES_ADDRESS_KOVAN = - '0xb1d3fbb2f83aecd196f474c16ca5d9cffa0d0ffc'; export const SINGLE_CALL_BALANCES_ADDRESS_GOERLI = '0x9788C4E93f9002a7ad8e72633b11E8d1ecd51f9b'; // TODO(SEPOLIA) There is currently no balance call address for Sepolia diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js index 76eab8367..0cf5fc24b 100644 --- a/app/scripts/controllers/app-state.js +++ b/app/scripts/controllers/app-state.js @@ -42,9 +42,6 @@ export default class AppStateController extends EventEmitter { collectiblesDropdownState: {}, usedNetworks: { '0x1': true, - '0x2a': true, - '0x3': true, - '0x4': true, '0x5': true, '0x539': true, }, diff --git a/app/scripts/controllers/cached-balances.test.js b/app/scripts/controllers/cached-balances.test.js index 5f507f076..b5618cf3b 100644 --- a/app/scripts/controllers/cached-balances.test.js +++ b/app/scripts/controllers/cached-balances.test.js @@ -7,7 +7,7 @@ describe('CachedBalancesController', function () { describe('updateCachedBalances', function () { it('should update the cached balances', async function () { const controller = new CachedBalancesController({ - getCurrentChainId: () => CHAIN_IDS.KOVAN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, accountTracker: { store: { subscribe: () => undefined, @@ -27,7 +27,7 @@ describe('CachedBalancesController', function () { assert.equal(controller._generateBalancesToCache.callCount, 1); assert.deepEqual(controller._generateBalancesToCache.args[0], [ 'mockAccounts', - CHAIN_IDS.KOVAN, + CHAIN_IDS.GOERLI, ]); assert.equal( controller.store.getState().cachedBalances, @@ -46,7 +46,7 @@ describe('CachedBalancesController', function () { }, initState: { cachedBalances: { - [CHAIN_IDS.KOVAN]: { + [CHAIN_IDS.GOERLI]: { a: '0x1', b: '0x2', c: '0x3', @@ -66,11 +66,11 @@ describe('CachedBalancesController', function () { b: { balance: null }, c: { balance: '0x5' }, }, - CHAIN_IDS.KOVAN, + CHAIN_IDS.GOERLI, ); assert.deepEqual(result, { - [CHAIN_IDS.KOVAN]: { + [CHAIN_IDS.GOERLI]: { a: '0x4', b: '0x2', c: '0x5', @@ -92,7 +92,7 @@ describe('CachedBalancesController', function () { }, initState: { cachedBalances: { - [CHAIN_IDS.KOVAN]: { + [CHAIN_IDS.GOERLI]: { a: '0x1', b: '0x2', c: '0x3', @@ -111,7 +111,7 @@ describe('CachedBalancesController', function () { ); assert.deepEqual(result, { - [CHAIN_IDS.KOVAN]: { + [CHAIN_IDS.GOERLI]: { a: '0x1', b: '0x2', c: '0x3', @@ -128,7 +128,7 @@ describe('CachedBalancesController', function () { it('should subscribe to the account tracker with the updateCachedBalances method', async function () { const subscribeSpy = sinon.spy(); const controller = new CachedBalancesController({ - getCurrentChainId: () => CHAIN_IDS.KOVAN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, accountTracker: { store: { subscribe: subscribeSpy, diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js index 2f06b4088..f0f189ae7 100644 --- a/app/scripts/controllers/detect-tokens.test.js +++ b/app/scripts/controllers/detect-tokens.test.js @@ -195,15 +195,15 @@ describe('DetectTokensController', function () { it('should not check and add tokens while on unsupported networks', async function () { sandbox.useFakeTimers(); - network.setProviderType(NETWORK_TYPES.ROPSTEN); - const tokenListMessengerRopsten = new ControllerMessenger().getRestricted({ + network.setProviderType(NETWORK_TYPES.SEPOLIA); + const tokenListMessengerSepolia = new ControllerMessenger().getRestricted({ name: 'TokenListController', }); tokenListController = new TokenListController({ - chainId: '3', + chainId: '11155111', onNetworkStateChange: sinon.spy(), onPreferencesStateChange: sinon.spy(), - messenger: tokenListMessengerRopsten, + messenger: tokenListMessengerSepolia, }); await tokenListController.start(); const controller = new DetectTokensController({ diff --git a/app/scripts/controllers/ens/index.test.js b/app/scripts/controllers/ens/index.test.js index d325e2885..aa7ed8c04 100644 --- a/app/scripts/controllers/ens/index.test.js +++ b/app/scripts/controllers/ens/index.test.js @@ -10,7 +10,7 @@ describe('EnsController', function () { let getCurrentChainId; let onNetworkDidChange; beforeEach(function () { - currentChainId = '0x3'; + currentChainId = '0x5'; getCurrentChainId = () => currentChainId; onNetworkDidChange = sinon.spy(); }); diff --git a/app/scripts/controllers/incoming-transactions.js b/app/scripts/controllers/incoming-transactions.js index a110c3c07..bb47cdac3 100644 --- a/app/scripts/controllers/incoming-transactions.js +++ b/app/scripts/controllers/incoming-transactions.js @@ -50,10 +50,7 @@ const fetchWithTimeout = getFetchWithTimeout(); */ const etherscanSupportedNetworks = [ CHAIN_IDS.GOERLI, - CHAIN_IDS.KOVAN, CHAIN_IDS.MAINNET, - CHAIN_IDS.RINKEBY, - CHAIN_IDS.ROPSTEN, CHAIN_IDS.SEPOLIA, ]; @@ -79,10 +76,7 @@ export default class IncomingTransactionsController { incomingTransactions: {}, incomingTxLastFetchedBlockByChainId: { [CHAIN_IDS.GOERLI]: null, - [CHAIN_IDS.KOVAN]: null, [CHAIN_IDS.MAINNET]: null, - [CHAIN_IDS.RINKEBY]: null, - [CHAIN_IDS.ROPSTEN]: null, [CHAIN_IDS.SEPOLIA]: null, }, ...opts.initState, diff --git a/app/scripts/controllers/incoming-transactions.test.js b/app/scripts/controllers/incoming-transactions.test.js index 100696ae6..fd11163ff 100644 --- a/app/scripts/controllers/incoming-transactions.test.js +++ b/app/scripts/controllers/incoming-transactions.test.js @@ -31,18 +31,12 @@ const PREPOPULATED_INCOMING_TXS_BY_HASH = { }; const PREPOPULATED_BLOCKS_BY_NETWORK = { [CHAIN_IDS.GOERLI]: 1, - [CHAIN_IDS.KOVAN]: 2, [CHAIN_IDS.MAINNET]: 3, - [CHAIN_IDS.RINKEBY]: 5, - [CHAIN_IDS.ROPSTEN]: 4, [CHAIN_IDS.SEPOLIA]: 6, }; const EMPTY_BLOCKS_BY_NETWORK = { [CHAIN_IDS.GOERLI]: null, - [CHAIN_IDS.KOVAN]: null, [CHAIN_IDS.MAINNET]: null, - [CHAIN_IDS.RINKEBY]: null, - [CHAIN_IDS.ROPSTEN]: null, [CHAIN_IDS.SEPOLIA]: null, }; @@ -147,10 +141,7 @@ const getFakeEtherscanTransaction = ({ function nockEtherscanApiForAllChains(mockResponse) { for (const chainId of [ CHAIN_IDS.GOERLI, - CHAIN_IDS.KOVAN, CHAIN_IDS.MAINNET, - CHAIN_IDS.RINKEBY, - CHAIN_IDS.ROPSTEN, CHAIN_IDS.SEPOLIA, 'undefined', ]) { @@ -246,16 +237,16 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, ); const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - CHAIN_IDS.ROPSTEN + CHAIN_IDS.GOERLI ]; - nock('https://api-ropsten.etherscan.io') + nock('https://api-goerli.etherscan.io') .get( `/api?module=account&action=txlist&address=${MOCK_SELECTED_ADDRESS}&tag=latest&page=1&startBlock=${startBlock}`, ) @@ -305,8 +296,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -322,8 +313,8 @@ describe('IncomingTransactionsController', function () { '0xfakeeip1559': { blockNumber: '10', hash: '0xfakeeip1559', - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -340,7 +331,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [CHAIN_IDS.ROPSTEN]: 11, + [CHAIN_IDS.GOERLI]: 11, }, }, 'State should have been updated after first block was received', @@ -448,7 +439,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -493,7 +484,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -540,7 +531,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -548,9 +539,9 @@ describe('IncomingTransactionsController', function () { const NEW_MOCK_SELECTED_ADDRESS = `${MOCK_SELECTED_ADDRESS}9`; const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - CHAIN_IDS.ROPSTEN + CHAIN_IDS.GOERLI ]; - nock('https://api-ropsten.etherscan.io') + nock('https://api-goerli.etherscan.io') .get( `/api?module=account&action=txlist&address=${NEW_MOCK_SELECTED_ADDRESS}&tag=latest&page=1&startBlock=${startBlock}`, ) @@ -603,8 +594,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -620,7 +611,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [CHAIN_IDS.ROPSTEN]: 11, + [CHAIN_IDS.GOERLI]: 11, }, }, 'State should have been updated after first block was received', @@ -687,7 +678,7 @@ describe('IncomingTransactionsController', function () { it('should update when switching to a supported network', async function () { const mockedNetworkMethods = getMockNetworkControllerMethods( - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); const incomingTransactionsController = new IncomingTransactionsController( { @@ -699,9 +690,9 @@ describe('IncomingTransactionsController', function () { ); const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - CHAIN_IDS.ROPSTEN + CHAIN_IDS.GOERLI ]; - nock('https://api-ropsten.etherscan.io') + nock('https://api-goerli.etherscan.io') .get( `/api?module=account&action=txlist&address=${MOCK_SELECTED_ADDRESS}&tag=latest&page=1&startBlock=${startBlock}`, ) @@ -723,7 +714,7 @@ describe('IncomingTransactionsController', function () { const subscription = mockedNetworkMethods.onNetworkDidChange.getCall(0).args[0]; - await subscription(CHAIN_IDS.ROPSTEN); + await subscription(CHAIN_IDS.GOERLI); await updateStateCalled(); const actualState = incomingTransactionsController.store.getState(); @@ -744,8 +735,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -761,7 +752,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [CHAIN_IDS.ROPSTEN]: 11, + [CHAIN_IDS.GOERLI]: 11, }, }, 'State should have been updated after first block was received', @@ -770,7 +761,7 @@ describe('IncomingTransactionsController', function () { it('should not update when switching to an unsupported network', async function () { const mockedNetworkMethods = getMockNetworkControllerMethods( - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); const incomingTransactionsController = new IncomingTransactionsController( { @@ -829,10 +820,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getEmptyInitState(), - getCurrentChainId: () => CHAIN_IDS.ROPSTEN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, }); sinon.spy(incomingTransactionsController.store, 'updateState'); @@ -847,14 +838,14 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 999, CHAIN_IDS.ROPSTEN], + ['fakeAddress', 999, CHAIN_IDS.GOERLI], ); assert.deepStrictEqual( incomingTransactionsController.store.updateState.getCall(0).args[0], { incomingTxLastFetchedBlockByChainId: { ...EMPTY_BLOCKS_BY_NETWORK, - [CHAIN_IDS.ROPSTEN]: 1000, + [CHAIN_IDS.GOERLI]: 1000, }, incomingTransactions: {}, }, @@ -865,10 +856,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getEmptyInitState(), - getCurrentChainId: () => CHAIN_IDS.ROPSTEN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, }); const NEW_TRANSACTION_ONE = { @@ -894,7 +885,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 10, CHAIN_IDS.ROPSTEN], + ['fakeAddress', 10, CHAIN_IDS.GOERLI], ); assert.deepStrictEqual( @@ -902,7 +893,7 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...EMPTY_BLOCKS_BY_NETWORK, - [CHAIN_IDS.ROPSTEN]: 445, + [CHAIN_IDS.GOERLI]: 445, }, incomingTransactions: { [NEW_TRANSACTION_ONE.hash]: NEW_TRANSACTION_ONE, @@ -918,10 +909,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), - getCurrentChainId: () => CHAIN_IDS.ROPSTEN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, }); sinon.spy(incomingTransactionsController.store, 'updateState'); incomingTransactionsController._getNewIncomingTransactions = sinon @@ -937,7 +928,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 4, CHAIN_IDS.ROPSTEN], + ['fakeAddress', 1, CHAIN_IDS.GOERLI], ); assert.deepStrictEqual( @@ -945,8 +936,8 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...PREPOPULATED_BLOCKS_BY_NETWORK, - [CHAIN_IDS.ROPSTEN]: - PREPOPULATED_BLOCKS_BY_NETWORK[CHAIN_IDS.ROPSTEN] + 1, + [CHAIN_IDS.GOERLI]: + PREPOPULATED_BLOCKS_BY_NETWORK[CHAIN_IDS.GOERLI] + 1, }, incomingTransactions: PREPOPULATED_INCOMING_TXS_BY_HASH, }, @@ -958,10 +949,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), - getCurrentChainId: () => CHAIN_IDS.ROPSTEN, + getCurrentChainId: () => CHAIN_IDS.GOERLI, }, ); @@ -988,7 +979,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 4, CHAIN_IDS.ROPSTEN], + ['fakeAddress', 1, CHAIN_IDS.GOERLI], ); assert.deepStrictEqual( @@ -996,7 +987,7 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...PREPOPULATED_BLOCKS_BY_NETWORK, - [CHAIN_IDS.ROPSTEN]: 445, + [CHAIN_IDS.GOERLI]: 445, }, incomingTransactions: { ...PREPOPULATED_INCOMING_TXS_BY_HASH, @@ -1033,7 +1024,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1042,13 +1033,13 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert(mockFetch.calledOnce); assert.strictEqual( mockFetch.getCall(0).args[0], - `https://api-${NETWORK_TYPES.ROPSTEN}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1&startBlock=789`, + `https://api-${NETWORK_TYPES.GOERLI}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1&startBlock=789`, ); }); @@ -1079,7 +1070,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1088,13 +1079,13 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, null, - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert(mockFetch.calledOnce); assert.strictEqual( mockFetch.getCall(0).args[0], - `https://api-${NETWORK_TYPES.ROPSTEN}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1`, + `https://api-${NETWORK_TYPES.GOERLI}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1`, ); }); @@ -1102,7 +1093,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1112,14 +1103,14 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert(mockFetch.calledOnce); assert.deepStrictEqual(result, [ incomingTransactionsController._normalizeTxFromEtherscan( FETCHED_TX, - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ), ]); }); @@ -1135,7 +1126,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1145,7 +1136,7 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert.deepStrictEqual(result, []); window.fetch = tempFetchStatusZero; @@ -1163,7 +1154,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1173,7 +1164,7 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert.deepStrictEqual(result, []); window.fetch = tempFetchEmptyResult; @@ -1186,7 +1177,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1205,14 +1196,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.FAILED, time: 4444000, txParams: { @@ -1232,7 +1223,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1251,14 +1242,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 4444000, txParams: { @@ -1278,7 +1269,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(CHAIN_IDS.ROPSTEN), + ...getMockNetworkControllerMethods(CHAIN_IDS.GOERLI), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1298,14 +1289,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - CHAIN_IDS.ROPSTEN, + CHAIN_IDS.GOERLI, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, status: TRANSACTION_STATUSES.CONFIRMED, time: 4444000, txParams: { diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js index 1ad4e18d6..77fa34e54 100644 --- a/app/scripts/controllers/metametrics.test.js +++ b/app/scripts/controllers/metametrics.test.js @@ -638,7 +638,7 @@ describe('MetaMetricsController', function () { const traits = metaMetricsController._buildUserTraitsObject({ addressBook: { [CHAIN_IDS.MAINNET]: [{ address: '0x' }], - [CHAIN_IDS.ROPSTEN]: [{ address: '0x' }, { address: '0x0' }], + [CHAIN_IDS.GOERLI]: [{ address: '0x' }, { address: '0x0' }], }, allCollectibles: { '0xac706cE8A9BF27Afecf080fB298d0ee13cfb978A': { @@ -669,7 +669,7 @@ describe('MetaMetricsController', function () { allTokens: MOCK_ALL_TOKENS, frequentRpcListDetail: [ { chainId: CHAIN_IDS.MAINNET, ticker: CURRENCY_SYMBOLS.ETH }, - { chainId: CHAIN_IDS.ROPSTEN, ticker: CURRENCY_SYMBOLS.TEST_ETH }, + { chainId: CHAIN_IDS.GOERLI, ticker: CURRENCY_SYMBOLS.TEST_ETH }, { chainId: '0xaf' }, ], identities: [{}, {}], @@ -685,7 +685,7 @@ describe('MetaMetricsController', function () { [TRAITS.ADDRESS_BOOK_ENTRIES]: 3, [TRAITS.INSTALL_DATE_EXT]: '', [TRAITS.LEDGER_CONNECTION_TYPE]: 'web-hid', - [TRAITS.NETWORKS_ADDED]: [CHAIN_IDS.MAINNET, CHAIN_IDS.ROPSTEN, '0xaf'], + [TRAITS.NETWORKS_ADDED]: [CHAIN_IDS.MAINNET, CHAIN_IDS.GOERLI, '0xaf'], [TRAITS.NETWORKS_WITHOUT_TICKER]: ['0xaf'], [TRAITS.NFT_AUTODETECTION_ENABLED]: false, [TRAITS.NUMBER_OF_ACCOUNTS]: 2, @@ -704,12 +704,12 @@ describe('MetaMetricsController', function () { metaMetricsController._buildUserTraitsObject({ addressBook: { [CHAIN_IDS.MAINNET]: [{ address: '0x' }], - [CHAIN_IDS.ROPSTEN]: [{ address: '0x' }, { address: '0x0' }], + [CHAIN_IDS.GOERLI]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: CHAIN_IDS.MAINNET }, - { chainId: CHAIN_IDS.ROPSTEN }, + { chainId: CHAIN_IDS.GOERLI }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, @@ -723,14 +723,14 @@ describe('MetaMetricsController', function () { const updatedTraits = metaMetricsController._buildUserTraitsObject({ addressBook: { [CHAIN_IDS.MAINNET]: [{ address: '0x' }, { address: '0x1' }], - [CHAIN_IDS.ROPSTEN]: [{ address: '0x' }, { address: '0x0' }], + [CHAIN_IDS.GOERLI]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: { '0x1': { '0xabcde': [{ '0x12345': { address: '0xtestAddress' } }] }, }, frequentRpcListDetail: [ { chainId: CHAIN_IDS.MAINNET }, - { chainId: CHAIN_IDS.ROPSTEN }, + { chainId: CHAIN_IDS.GOERLI }, ], ledgerTransportType: 'web-hid', openSeaEnabled: false, @@ -754,12 +754,12 @@ describe('MetaMetricsController', function () { metaMetricsController._buildUserTraitsObject({ addressBook: { [CHAIN_IDS.MAINNET]: [{ address: '0x' }], - [CHAIN_IDS.ROPSTEN]: [{ address: '0x' }, { address: '0x0' }], + [CHAIN_IDS.GOERLI]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: CHAIN_IDS.MAINNET }, - { chainId: CHAIN_IDS.ROPSTEN }, + { chainId: CHAIN_IDS.GOERLI }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, @@ -773,12 +773,12 @@ describe('MetaMetricsController', function () { const updatedTraits = metaMetricsController._buildUserTraitsObject({ addressBook: { [CHAIN_IDS.MAINNET]: [{ address: '0x' }], - [CHAIN_IDS.ROPSTEN]: [{ address: '0x' }, { address: '0x0' }], + [CHAIN_IDS.GOERLI]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: CHAIN_IDS.MAINNET }, - { chainId: CHAIN_IDS.ROPSTEN }, + { chainId: CHAIN_IDS.GOERLI }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, diff --git a/app/scripts/controllers/network/createInfuraClient.test.js b/app/scripts/controllers/network/createInfuraClient.test.js index 0d7ac9557..4e5fb32b6 100644 --- a/app/scripts/controllers/network/createInfuraClient.test.js +++ b/app/scripts/controllers/network/createInfuraClient.test.js @@ -34,7 +34,7 @@ describe('createInfuraClient', () => { describe('eth_chainId', () => { it('does not hit Infura, instead returning the chain id that maps to the Infura network, as a hex string', async () => { const chainId = await withInfuraClient( - { network: 'ropsten' }, + { network: 'goerli' }, ({ makeRpcCall }) => { return makeRpcCall({ method: 'eth_chainId', @@ -42,7 +42,7 @@ describe('createInfuraClient', () => { }, ); - expect(chainId).toStrictEqual('0x3'); + expect(chainId).toStrictEqual('0x5'); }); }); @@ -286,7 +286,7 @@ describe('createInfuraClient', () => { describe('net_version', () => { it('does not hit Infura, instead returning the chain id that maps to the Infura network, as a decimal string', async () => { const chainId = await withInfuraClient( - { network: 'ropsten' }, + { network: 'goerli' }, ({ makeRpcCall }) => { return makeRpcCall({ method: 'net_version', @@ -294,7 +294,7 @@ describe('createInfuraClient', () => { }, ); - expect(chainId).toStrictEqual('3'); + expect(chainId).toStrictEqual('5'); }); }); diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js index ec47eefdc..64afce45a 100644 --- a/app/scripts/controllers/network/network-controller.test.js +++ b/app/scripts/controllers/network/network-controller.test.js @@ -133,42 +133,6 @@ describe('NetworkController', () => { describe('utils', () => { it('getNetworkDisplayName should return the correct network name', () => { const tests = [ - { - input: '3', - expected: 'Ropsten', - }, - { - input: '4', - expected: 'Rinkeby', - }, - { - input: '42', - expected: 'Kovan', - }, - { - input: '0x3', - expected: 'Ropsten', - }, - { - input: '0x4', - expected: 'Rinkeby', - }, - { - input: '0x2a', - expected: 'Kovan', - }, - { - input: 'ropsten', - expected: 'Ropsten', - }, - { - input: 'rinkeby', - expected: 'Rinkeby', - }, - { - input: 'kovan', - expected: 'Kovan', - }, { input: 'mainnet', expected: 'Ethereum Mainnet', diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 8214da894..d0f6bdd65 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -39,9 +39,9 @@ if (process.env.IN_TEST) { }; } else if (process.env.METAMASK_DEBUG || env === 'test') { defaultProviderConfigOpts = { - type: NETWORK_TYPES.RINKEBY, - chainId: CHAIN_IDS.RINKEBY, - ticker: TEST_NETWORK_TICKER_MAP.rinkeby, + type: NETWORK_TYPES.GOERLI, + chainId: CHAIN_IDS.GOERLI, + ticker: TEST_NETWORK_TICKER_MAP.GOERLI, }; } else { defaultProviderConfigOpts = { diff --git a/app/scripts/controllers/network/pending-middleware.test.js b/app/scripts/controllers/network/pending-middleware.test.js index 9544dc792..5b34a48c3 100644 --- a/app/scripts/controllers/network/pending-middleware.test.js +++ b/app/scripts/controllers/network/pending-middleware.test.js @@ -70,7 +70,7 @@ describe('PendingNonceMiddleware', () => { gasPrice: '0x1e8480', hash: '0x2cc5a25744486f7383edebbf32003e5a66e18135799593d6b5cdd2bb43674f09', input: '0x', - nonce: '0x4', + nonce: '0x5', type: TRANSACTION_ENVELOPE_TYPES.LEGACY, to: '0xf231d46dd78806e1dd93442cf33c7671f8538748', transactionIndex: null, diff --git a/app/scripts/controllers/network/util.test.js b/app/scripts/controllers/network/util.test.js index 4ca1768cb..49fda6ef8 100644 --- a/app/scripts/controllers/network/util.test.js +++ b/app/scripts/controllers/network/util.test.js @@ -22,9 +22,9 @@ describe('network utils', () => { }, type: TRANSACTION_TYPES.SIMPLE_SEND, origin: 'other', - chainId: '0x3', + chainId: '0x5', time: 1624408066355, - metamaskNetworkId: '3', + metamaskNetworkId: '5', hash: '0x4bcb6cd6b182209585f8ad140260ddb35c81a575dd40f508d9767e652a9f60e7', r: '0x4c3111e42ed5eec3dcecba1e234700f387e8693c373c61c3e54a762a26f1570e', s: '0x18bfc4eeb7ebcfacc3bd59ea100a6834ea3265e65945dbec69aa2a06564fafff', @@ -67,9 +67,9 @@ describe('network utils', () => { }, type: TRANSACTION_TYPES.SIMPLE_SEND, origin: 'other', - chainId: '0x3', + chainId: '0x5', time: 1624408066355, - metamaskNetworkId: '3', + metamaskNetworkId: '5', hash: '0x4bcb6cd6b182209585f8ad140260ddb35c81a575dd40f508d9767e652a9f60e7', r: '0x4c3111e42ed5eec3dcecba1e234700f387e8693c373c61c3e54a762a26f1570e', s: '0x18bfc4eeb7ebcfacc3bd59ea100a6834ea3265e65945dbec69aa2a06564fafff', diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js index 685a13e4d..0768b9791 100644 --- a/app/scripts/controllers/swaps.test.js +++ b/app/scripts/controllers/swaps.test.js @@ -100,7 +100,7 @@ function getMockNetworkController() { store: { getState: () => { return { - network: NETWORK_IDS.ROPSTEN, + network: NETWORK_IDS.GOERLI, }; }, }, @@ -269,7 +269,7 @@ describe('SwapsController', function () { const currentEthersInstance = swapsController.ethersProvider; const onNetworkDidChange = networkController.on.getCall(0).args[1]; - onNetworkDidChange(NETWORK_IDS.ROPSTEN); + onNetworkDidChange(NETWORK_IDS.GOERLI); const newEthersInstance = swapsController.ethersProvider; assert.strictEqual( diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js index 4bd5da250..660b8e191 100644 --- a/app/scripts/controllers/transactions/index.test.js +++ b/app/scripts/controllers/transactions/index.test.js @@ -31,10 +31,10 @@ import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../shared/lib/transact import TransactionController from '.'; const noop = () => true; -const currentNetworkId = '42'; -const currentChainId = '0x2a'; +const currentNetworkId = '5'; +const currentChainId = '0x5'; const providerConfig = { - type: 'kovan', + type: 'goerli', }; const actionId = 'DUMMY_ACTION_ID'; const VALID_ADDRESS = '0x0000000000000000000000000000000000000000'; @@ -1039,7 +1039,7 @@ describe('Transaction Controller', function () { ); const rawTx = await txController.signTransaction('1'); const ethTx = TransactionFactory.fromSerializedData(toBuffer(rawTx)); - assert.equal(ethTx.common.chainIdBN().toNumber(), 42); + assert.equal(ethTx.common.chainIdBN().toNumber(), 5); }); }); @@ -1699,11 +1699,11 @@ describe('Transaction Controller', function () { category: EVENT.CATEGORIES.TRANSACTIONS, persist: true, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: ORIGIN_METAMASK, source: EVENT.SOURCE.TRANSACTION.USER, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -1785,11 +1785,11 @@ describe('Transaction Controller', function () { category: EVENT.CATEGORIES.TRANSACTIONS, persist: true, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: ORIGIN_METAMASK, source: EVENT.SOURCE.TRANSACTION.USER, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -1880,11 +1880,11 @@ describe('Transaction Controller', function () { category: EVENT.CATEGORIES.TRANSACTIONS, persist: true, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: 'other', source: EVENT.SOURCE.TRANSACTION.DAPP, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -1968,11 +1968,11 @@ describe('Transaction Controller', function () { category: EVENT.CATEGORIES.TRANSACTIONS, persist: true, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: 'other', source: EVENT.SOURCE.TRANSACTION.DAPP, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -2055,11 +2055,11 @@ describe('Transaction Controller', function () { category: EVENT.CATEGORIES.TRANSACTIONS, persist: true, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: 'other', source: EVENT.SOURCE.TRANSACTION.DAPP, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -2123,11 +2123,11 @@ describe('Transaction Controller', function () { persist: true, category: EVENT.CATEGORIES.TRANSACTIONS, properties: { - network: '42', + network: '5', referrer: 'other', source: EVENT.SOURCE.TRANSACTION.DAPP, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '0', gas_edit_attempted: 'none', gas_edit_type: 'none', @@ -2201,11 +2201,11 @@ describe('Transaction Controller', function () { persist: true, category: EVENT.CATEGORIES.TRANSACTIONS, properties: { - chain_id: '0x2a', + chain_id: '0x5', eip_1559_version: '1', gas_edit_attempted: 'none', gas_edit_type: 'none', - network: '42', + network: '5', referrer: 'other', source: EVENT.SOURCE.TRANSACTION.DAPP, transaction_type: TRANSACTION_TYPES.SIMPLE_SEND, diff --git a/app/scripts/controllers/transactions/tx-gas-utils.test.js b/app/scripts/controllers/transactions/tx-gas-utils.test.js index 15386e319..ed512f596 100644 --- a/app/scripts/controllers/transactions/tx-gas-utils.test.js +++ b/app/scripts/controllers/transactions/tx-gas-utils.test.js @@ -30,14 +30,14 @@ describe('txUtils', function () { gasPrice: '0x199c82cc00', data: '0x', nonce: '0x3', - chainId: 42, + chainId: 5, }; const ethTx = TransactionFactory.fromTxData(txParams, { - common: new Common({ chain: 'kovan' }), + common: new Common({ chain: 'goerli' }), }); assert.equal( ethTx.common.chainIdBN().toNumber(), - 42, + 5, 'chainId is set from tx params', ); }); diff --git a/app/scripts/controllers/transactions/tx-state-manager.test.js b/app/scripts/controllers/transactions/tx-state-manager.test.js index 2e5646a14..3638eefa0 100644 --- a/app/scripts/controllers/transactions/tx-state-manager.test.js +++ b/app/scripts/controllers/transactions/tx-state-manager.test.js @@ -44,7 +44,7 @@ function generateTransactions( } describe('TransactionStateManager', function () { let txStateManager; - const currentNetworkId = NETWORK_IDS.KOVAN; + const currentNetworkId = NETWORK_IDS.GOERLI; const currentChainId = CHAIN_IDS.MAINNET; const otherNetworkId = '2'; @@ -678,7 +678,7 @@ describe('TransactionStateManager', function () { if (i === 0 || i === 1) { return CHAIN_IDS.MAINNET; } else if (i === 4 || i === 5) { - return CHAIN_IDS.RINKEBY; + return CHAIN_IDS.GOERLI; } return currentChainId; }, diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js index 38efc9dd5..024ed6c24 100644 --- a/app/scripts/lib/account-tracker.js +++ b/app/scripts/lib/account-tracker.js @@ -18,9 +18,6 @@ import { CHAIN_IDS } from '../../../shared/constants/network'; import { SINGLE_CALL_BALANCES_ADDRESS, - SINGLE_CALL_BALANCES_ADDRESS_RINKEBY, - SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN, - SINGLE_CALL_BALANCES_ADDRESS_KOVAN, SINGLE_CALL_BALANCES_ADDRESS_GOERLI, SINGLE_CALL_BALANCES_ADDRESS_SEPOLIA, SINGLE_CALL_BALANCES_ADDRESS_BSC, @@ -211,27 +208,6 @@ export default class AccountTracker { ); break; - case CHAIN_IDS.RINKEBY: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_RINKEBY, - ); - break; - - case CHAIN_IDS.ROPSTEN: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN, - ); - break; - - case CHAIN_IDS.KOVAN: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_KOVAN, - ); - break; - case CHAIN_IDS.GOERLI: await this._updateAccountsViaBalanceChecker( addresses, diff --git a/app/scripts/lib/buy-url.js b/app/scripts/lib/buy-url.js index 8584c534a..68a6c506c 100644 --- a/app/scripts/lib/buy-url.js +++ b/app/scripts/lib/buy-url.js @@ -172,10 +172,6 @@ export default async function getBuyUrl({ chainId, address, service, symbol }) { return createCoinbasePayUrl(address, chainId, symbol); case 'metamask-faucet': return 'https://faucet.metamask.io/'; - case 'rinkeby-faucet': - return 'https://www.rinkeby.io/'; - case 'kovan-faucet': - return 'https://github.com/kovan-testnet/faucet'; case 'goerli-faucet': return 'https://goerli-faucet.slock.it/'; case 'sepolia-faucet': @@ -191,12 +187,6 @@ function getDefaultServiceForChain(chainId) { switch (chainId) { case CHAIN_IDS.MAINNET: return 'wyre'; - case CHAIN_IDS.ROPSTEN: - return 'metamask-faucet'; - case CHAIN_IDS.RINKEBY: - return 'rinkeby-faucet'; - case CHAIN_IDS.KOVAN: - return 'kovan-faucet'; case CHAIN_IDS.GOERLI: return 'goerli-faucet'; case CHAIN_IDS.SEPOLIA: diff --git a/app/scripts/lib/buy-url.test.js b/app/scripts/lib/buy-url.test.js index 36ab5ae96..80b8d4116 100644 --- a/app/scripts/lib/buy-url.test.js +++ b/app/scripts/lib/buy-url.test.js @@ -15,15 +15,6 @@ const MAINNET = { amount: 5, address: ETH_ADDRESS, }; -const ROPSTEN = { - chainId: CHAIN_IDS.ROPSTEN, -}; -const RINKEBY = { - chainId: CHAIN_IDS.RINKEBY, -}; -const KOVAN = { - chainId: CHAIN_IDS.KOVAN, -}; const BSC = { chainId: CHAIN_IDS.BSC, amount: 5, @@ -86,21 +77,6 @@ describe('buy-url', () => { ); }); - it('returns metamask ropsten faucet for network 3', async () => { - const ropstenUrl = await getBuyUrl(ROPSTEN); - expect(ropstenUrl).toStrictEqual('https://faucet.metamask.io/'); - }); - - it('returns rinkeby dapp for network 4', async () => { - const rinkebyUrl = await getBuyUrl(RINKEBY); - expect(rinkebyUrl).toStrictEqual('https://www.rinkeby.io/'); - }); - - it('returns kovan github test faucet for network 42', async () => { - const kovanUrl = await getBuyUrl(KOVAN); - expect(kovanUrl).toStrictEqual('https://github.com/kovan-testnet/faucet'); - }); - it('returns a MoonPay url with a prefilled wallet address for the Ethereum network', async () => { const { moonPay: { defaultCurrencyCode, showOnlyCurrencies } = {} } = BUYABLE_CHAINS_MAP[MAINNET.chainId]; diff --git a/app/scripts/lib/ens-ipfs/resolver.js b/app/scripts/lib/ens-ipfs/resolver.js index 94136c5e5..602134498 100644 --- a/app/scripts/lib/ens-ipfs/resolver.js +++ b/app/scripts/lib/ens-ipfs/resolver.js @@ -80,7 +80,7 @@ function getRegistryForChainId(chainId) { case 4: case 5: case 6: - // Mainnet, Ropsten, Rinkeby, and Goerli, respectively, use the same address + // Mainnet and Goerli, respectively, use the same address return '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e'; default: return null; diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index bb2001cdb..9d24755f7 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -2384,7 +2384,6 @@ export default class MetamaskController extends EventEmitter { * @type Identity * @property {string} name - The account nickname. * @property {string} address - The account's ethereum address, in lower case. - * @property {boolean} mayBeFauceting - Whether this account is currently * receiving funds from our automatic Ropsten faucet. */ diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js index 51bfdc77c..1baa0a39b 100644 --- a/app/scripts/metamask-controller.test.js +++ b/app/scripts/metamask-controller.test.js @@ -120,7 +120,7 @@ const MetaMaskController = proxyquire('./metamask-controller', { './lib/createLoggerMiddleware': { default: createLoggerMiddlewareMock }, }).default; -const currentNetworkId = '42'; +const currentNetworkId = '5'; const DEFAULT_LABEL = 'Account 1'; const TEST_SEED = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'; diff --git a/app/scripts/migrations/052.js b/app/scripts/migrations/052.js index e18040e47..4d8433e19 100644 --- a/app/scripts/migrations/052.js +++ b/app/scripts/migrations/052.js @@ -43,21 +43,18 @@ function transformState(state = {}) { newAccountTokens[address][CHAIN_IDS.MAINNET] = accountTokens[address][NETWORK_TYPES.MAINNET]; break; - case NETWORK_TYPES.ROPSTEN: - newAccountTokens[address][CHAIN_IDS.ROPSTEN] = - accountTokens[address][NETWORK_TYPES.ROPSTEN]; + case 'ropsten': + newAccountTokens[address]['0x3'] = accountTokens[address].ropsten; break; - case NETWORK_TYPES.RINKEBY: - newAccountTokens[address][CHAIN_IDS.RINKEBY] = - accountTokens[address][NETWORK_TYPES.RINKEBY]; + case 'rinkeby': + newAccountTokens[address]['0x4'] = accountTokens[address].rinkeby; break; case NETWORK_TYPES.GOERLI: newAccountTokens[address][CHAIN_IDS.GOERLI] = accountTokens[address][NETWORK_TYPES.GOERLI]; break; - case NETWORK_TYPES.KOVAN: - newAccountTokens[address][CHAIN_IDS.KOVAN] = - accountTokens[address][NETWORK_TYPES.KOVAN]; + case 'kovan': + newAccountTokens[address]['0x2a'] = accountTokens[address].kovan; break; default: break; @@ -82,21 +79,21 @@ function transformState(state = {}) { newAccountHiddenTokens[address][CHAIN_IDS.MAINNET] = accountHiddenTokens[address][NETWORK_TYPES.MAINNET]; break; - case NETWORK_TYPES.ROPSTEN: - newAccountHiddenTokens[address][CHAIN_IDS.ROPSTEN] = - accountHiddenTokens[address][NETWORK_TYPES.ROPSTEN]; + case 'ropsten': + newAccountHiddenTokens[address]['0x3'] = + accountHiddenTokens[address].ropsten; break; - case NETWORK_TYPES.RINKEBY: - newAccountHiddenTokens[address][CHAIN_IDS.RINKEBY] = - accountHiddenTokens[address][NETWORK_TYPES.RINKEBY]; + case 'rinkeby': + newAccountHiddenTokens[address]['0x4'] = + accountHiddenTokens[address].rinkeby; break; case NETWORK_TYPES.GOERLI: newAccountHiddenTokens[address][CHAIN_IDS.GOERLI] = accountHiddenTokens[address][NETWORK_TYPES.GOERLI]; break; - case NETWORK_TYPES.KOVAN: - newAccountHiddenTokens[address][CHAIN_IDS.KOVAN] = - accountHiddenTokens[address][NETWORK_TYPES.KOVAN]; + case 'kovan': + newAccountHiddenTokens[address]['0x2a'] = + accountHiddenTokens[address].kovan; break; default: break; diff --git a/app/scripts/migrations/052.test.js b/app/scripts/migrations/052.test.js index 37c325066..9a7ab8422 100644 --- a/app/scripts/migrations/052.test.js +++ b/app/scripts/migrations/052.test.js @@ -73,25 +73,25 @@ describe('migration #52', () => { }); }); - it(`should move ${NETWORK_TYPES.RINKEBY} tokens and hidden tokens to be keyed by ${CHAIN_IDS.RINKEBY} for each address`, async () => { + it(`should move rinkeby tokens and hidden tokens to be keyed by '0x4' for each address`, async () => { const oldStorage = { meta: {}, data: { PreferencesController: { accountHiddenTokens: { '0x1111': { - [NETWORK_TYPES.RINKEBY]: [TOKEN1], + rinkeby: [TOKEN1], }, '0x1112': { - [NETWORK_TYPES.RINKEBY]: [TOKEN3], + rinkeby: [TOKEN3], }, }, accountTokens: { '0x1111': { - [NETWORK_TYPES.RINKEBY]: [TOKEN1, TOKEN2], + rinkeby: [TOKEN1, TOKEN2], }, '0x1112': { - [NETWORK_TYPES.RINKEBY]: [TOKEN1, TOKEN3], + rinkeby: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -105,18 +105,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [CHAIN_IDS.RINKEBY]: [TOKEN1], + '0x4': [TOKEN1], }, '0x1112': { - [CHAIN_IDS.RINKEBY]: [TOKEN3], + '0x4': [TOKEN3], }, }, accountTokens: { '0x1111': { - [CHAIN_IDS.RINKEBY]: [TOKEN1, TOKEN2], + '0x4': [TOKEN1, TOKEN2], }, '0x1112': { - [CHAIN_IDS.RINKEBY]: [TOKEN1, TOKEN3], + '0x4': [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -125,25 +125,25 @@ describe('migration #52', () => { }); }); - it(`should move ${NETWORK_TYPES.KOVAN} tokens and hidden tokens to be keyed by ${CHAIN_IDS.KOVAN} for each address`, async () => { + it(`should move kovan tokens and hidden tokens to be keyed by 0x2a for each address`, async () => { const oldStorage = { meta: {}, data: { PreferencesController: { accountHiddenTokens: { '0x1111': { - [NETWORK_TYPES.KOVAN]: [TOKEN1], + kovan: [TOKEN1], }, '0x1112': { - [NETWORK_TYPES.KOVAN]: [TOKEN3], + kovan: [TOKEN3], }, }, accountTokens: { '0x1111': { - [NETWORK_TYPES.KOVAN]: [TOKEN1, TOKEN2], + kovan: [TOKEN1, TOKEN2], }, '0x1112': { - [NETWORK_TYPES.KOVAN]: [TOKEN1, TOKEN3], + kovan: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -157,18 +157,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [CHAIN_IDS.KOVAN]: [TOKEN1], + '0x2a': [TOKEN1], }, '0x1112': { - [CHAIN_IDS.KOVAN]: [TOKEN3], + '0x2a': [TOKEN3], }, }, accountTokens: { '0x1111': { - [CHAIN_IDS.KOVAN]: [TOKEN1, TOKEN2], + '0x2a': [TOKEN1, TOKEN2], }, '0x1112': { - [CHAIN_IDS.KOVAN]: [TOKEN1, TOKEN3], + '0x2a': [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -229,25 +229,25 @@ describe('migration #52', () => { }); }); - it(`should move ${NETWORK_TYPES.ROPSTEN} tokens and hidden tokens to be keyed by ${CHAIN_IDS.ROPSTEN} for each address`, async () => { + it(`should move ropsten tokens and hidden tokens to be keyed by 0x3 for each address`, async () => { const oldStorage = { meta: {}, data: { PreferencesController: { accountHiddenTokens: { '0x1111': { - [NETWORK_TYPES.ROPSTEN]: [TOKEN1], + ropsten: [TOKEN1], }, '0x1112': { - [NETWORK_TYPES.ROPSTEN]: [TOKEN3], + ropsten: [TOKEN3], }, }, accountTokens: { '0x1111': { - [NETWORK_TYPES.ROPSTEN]: [TOKEN1, TOKEN2], + ropsten: [TOKEN1, TOKEN2], }, '0x1112': { - [NETWORK_TYPES.ROPSTEN]: [TOKEN1, TOKEN3], + ropsten: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -261,18 +261,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [CHAIN_IDS.ROPSTEN]: [TOKEN1], + '0x3': [TOKEN1], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [TOKEN3], + '0x3': [TOKEN3], }, }, accountTokens: { '0x1111': { - [CHAIN_IDS.ROPSTEN]: [TOKEN1, TOKEN2], + '0x3': [TOKEN1, TOKEN2], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [TOKEN1, TOKEN3], + '0x3': [TOKEN1, TOKEN3], }, }, bar: 'baz', diff --git a/app/scripts/migrations/054.test.js b/app/scripts/migrations/054.test.js index 8ac809b3f..98ca1b9be 100644 --- a/app/scripts/migrations/054.test.js +++ b/app/scripts/migrations/054.test.js @@ -171,7 +171,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -229,7 +229,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -289,7 +289,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -347,7 +347,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -407,7 +407,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -486,7 +486,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -567,7 +567,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -641,7 +641,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [CHAIN_IDS.ROPSTEN]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, diff --git a/app/scripts/migrations/055.js b/app/scripts/migrations/055.js index ca79f447e..108c864bb 100644 --- a/app/scripts/migrations/055.js +++ b/app/scripts/migrations/055.js @@ -19,6 +19,22 @@ export default { const UNKNOWN_CHAIN_ID_KEY = 'UNKNOWN'; +BUILT_IN_NETWORKS.rinkeby = { + networkId: '4', + chainId: '0x4', + ticker: 'ETH', +}; +BUILT_IN_NETWORKS.ropsten = { + networkId: '3', + chainId: '0x3', + ticker: 'ETH', +}; +BUILT_IN_NETWORKS.kovan = { + networkId: '42', + chainId: '0x2a', + ticker: 'ETH', +}; + function transformState(state) { if ( state?.IncomingTransactionsController?.incomingTxLastFetchedBlocksByNetwork diff --git a/app/scripts/migrations/055.test.js b/app/scripts/migrations/055.test.js index faff99bdd..3b4c6e998 100644 --- a/app/scripts/migrations/055.test.js +++ b/app/scripts/migrations/055.test.js @@ -31,10 +31,10 @@ describe('migration #55', () => { }, incomingTxLastFetchedBlocksByNetwork: { [NETWORK_TYPES.MAINNET]: 1, - [NETWORK_TYPES.ROPSTEN]: 2, - [NETWORK_TYPES.RINKEBY]: 3, + ropsten: 2, + rinkeby: 3, [NETWORK_TYPES.GOERLI]: 4, - [NETWORK_TYPES.KOVAN]: 5, + kovan: 5, }, }, foo: 'bar', @@ -48,10 +48,10 @@ describe('migration #55', () => { oldStorage.data.IncomingTransactionsController.incomingTransactions, incomingTxLastFetchedBlockByChainId: { [CHAIN_IDS.MAINNET]: 1, - [CHAIN_IDS.ROPSTEN]: 2, - [CHAIN_IDS.RINKEBY]: 3, + '0x3': 2, + '0x4': 3, [CHAIN_IDS.GOERLI]: 4, - [CHAIN_IDS.KOVAN]: 5, + '0x2a': 5, }, }, foo: 'bar', diff --git a/app/scripts/migrations/059.test.js b/app/scripts/migrations/059.test.js index 271a37b9e..34065213c 100644 --- a/app/scripts/migrations/059.test.js +++ b/app/scripts/migrations/059.test.js @@ -28,7 +28,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 2: { type: SENT_ETHER, id: 2, - chainId: CHAIN_IDS.KOVAN, + chainId: '0x2a', txParams: { nonce: '0x2', }, @@ -36,7 +36,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 3: { type: SENT_ETHER, id: 3, - chainId: CHAIN_IDS.RINKEBY, + chainId: '0x4', txParams: { nonce: '0x3', }, @@ -44,7 +44,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 4: { type: SENT_ETHER, id: 4, - chainId: CHAIN_IDS.RINKEBY, + chainId: '0x4', txParams: { nonce: '0x4', }, @@ -60,7 +60,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 6: { type: SENT_ETHER, id: 6, - chainId: CHAIN_IDS.KOVAN, + chainId: '0x2a', txParams: { nonce: '0x6', }, @@ -68,7 +68,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 7: { type: SENT_ETHER, id: 7, - chainId: CHAIN_IDS.RINKEBY, + chainId: '0x4', txParams: { nonce: '0x7', }, @@ -76,7 +76,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 8: { type: SENT_ETHER, id: 8, - chainId: CHAIN_IDS.RINKEBY, + chainId: '0x4', txParams: { nonce: '0x8', }, @@ -84,7 +84,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 9: { type: SENT_ETHER, id: 9, - chainId: CHAIN_IDS.RINKEBY, + chainId: '0x4', status: TRANSACTION_STATUSES.UNAPPROVED, }, }; diff --git a/app/scripts/migrations/074.js b/app/scripts/migrations/074.js new file mode 100644 index 000000000..0f687d7a0 --- /dev/null +++ b/app/scripts/migrations/074.js @@ -0,0 +1,132 @@ +import { cloneDeep, uniq } from 'lodash'; +import BigNumber from 'bignumber.js'; +import { getRpcUrl } from '../../../shared/constants/network'; + +const version = 74; + +const hexNumberIsGreaterThanZero = (hexNumber) => + new BigNumber(hexNumber || '0x0', 16).gt(0); + +const DEPRECATED_TEST_NET_CHAINIDS = ['0x3', '0x2a', '0x4']; +const DEPRECATED_TEST_NET_DETAILS = { + '0x3': { + rpcUrl: getRpcUrl({ network: 'ropsten' }), + nickname: 'Ropsten', + ticker: 'RopstenETH', + }, + '0x2a': { + rpcUrl: getRpcUrl({ network: 'kovan' }), + nickname: 'Kovan', + ticker: 'KovanETH', + }, + '0x4': { + rpcUrl: getRpcUrl({ network: 'rinkeby' }), + nickname: 'Rinkeby', + ticker: 'RinkebyETH', + }, +}; + +/** + * Migrates the user default but deprecated testnet networks to custom networks, and + * if the current network is one such network, updates the network provider details so that it + * will work as a custom rpc + */ +export default { + version, + async migrate(originalVersionedData) { + const versionedData = cloneDeep(originalVersionedData); + versionedData.meta.version = version; + const state = versionedData.data; + const newState = transformState(state); + versionedData.data = newState; + return versionedData; + }, +}; + +function transformState(state) { + const PreferencesController = state?.PreferencesController || {}; + const preferences = PreferencesController.preferences || {}; + const NetworkController = state?.NetworkController || {}; + const provider = NetworkController?.provider || {}; + + const currentlyOnDeprecatedNetwork = DEPRECATED_TEST_NET_CHAINIDS.filter( + (chainId) => chainId === provider?.chainId, + ); + + // If the user does not want to see test networks, and if the the user is not on a deprecated test network, then + // no need to migrate the test network data to a custom network + if ( + !preferences.showTestNetworks && + currentlyOnDeprecatedNetwork.length === 0 + ) { + return state; + } + + const transactions = state?.TransactionController?.transactions || {}; + const cachedBalances = state.CachedBalancesController?.cachedBalances || {}; + + const deprecatedTestnetsOnWhichTheUserHasMadeATransaction = Object.values( + transactions, + ) + .filter(({ chainId }) => DEPRECATED_TEST_NET_CHAINIDS.includes(chainId)) + .map(({ chainId }) => chainId); + const deprecatedTestnetsOnWhichTheUserHasCachedBalance = + DEPRECATED_TEST_NET_CHAINIDS.filter((chainId) => { + const cachedBalancesForChain = Object.values( + cachedBalances[chainId] || {}, + ); + const userHasABalanceGreaterThanZeroOnThisChain = + cachedBalancesForChain.some(hexNumberIsGreaterThanZero); + return userHasABalanceGreaterThanZeroOnThisChain; + }); + const deprecatedTestnetsThatHaveBeenUsed = uniq([ + ...deprecatedTestnetsOnWhichTheUserHasCachedBalance, + ...deprecatedTestnetsOnWhichTheUserHasMadeATransaction, + ...currentlyOnDeprecatedNetwork, + ]); + + const newFrequentRpcListDetail = + PreferencesController.frequentRpcListDetail ?? []; + + deprecatedTestnetsThatHaveBeenUsed.forEach((chainId) => { + if ( + !newFrequentRpcListDetail.find( + (rpcDetails) => rpcDetails.chainId === chainId, + ) + ) { + newFrequentRpcListDetail.unshift({ + rpcUrl: DEPRECATED_TEST_NET_DETAILS[chainId].rpcUrl, + chainId, + ticker: DEPRECATED_TEST_NET_DETAILS[chainId].ticker, + nickname: DEPRECATED_TEST_NET_DETAILS[chainId].nickname, + rpcPrefs: {}, + }); + } + }); + + if (newFrequentRpcListDetail.length) { + PreferencesController.frequentRpcListDetail = newFrequentRpcListDetail; + } + + if (currentlyOnDeprecatedNetwork.length) { + const selectedNetworkChainId = currentlyOnDeprecatedNetwork[0]; + NetworkController.provider = { + ...NetworkController.provider, + type: 'rpc', + rpcUrl: DEPRECATED_TEST_NET_DETAILS[selectedNetworkChainId].rpcUrl, + chainId: selectedNetworkChainId, + nickname: DEPRECATED_TEST_NET_DETAILS[selectedNetworkChainId].nickname, + ticker: DEPRECATED_TEST_NET_DETAILS[selectedNetworkChainId].ticker, + }; + } + + return { + ...state, + PreferencesController: { + ...PreferencesController, + }, + NetworkController: { + ...NetworkController, + }, + }; +} diff --git a/app/scripts/migrations/074.test.js b/app/scripts/migrations/074.test.js new file mode 100644 index 000000000..bdb03d386 --- /dev/null +++ b/app/scripts/migrations/074.test.js @@ -0,0 +1,561 @@ +import migration74 from './074'; + +describe('migration #74', () => { + it('should update the version metadata', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: {}, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage.meta).toStrictEqual({ + version: 74, + }); + }); + + it('should add a deprecated testnet to custom networks if that network is currently selected and modify the provider', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0x4', + type: 'rinkeby', + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0x4', + type: 'rpc', + rpcUrl: `https://rinkeby.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + nickname: 'Rinkeby', + ticker: 'RinkebyETH', + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://rinkeby.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x4', + nickname: 'Rinkeby', + ticker: 'RinkebyETH', + rpcPrefs: {}, + }, + ], + }, + }, + }); + }); + + it('should not add a deprecated testnet to custom networks if no deprecated testnet is selected', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + }, + }, + }); + }); + + it('should add a deprecated testnet to custom networks if a transaction has been sent from that network', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + 2: { + chainId: '0x4', + }, + 3: { + chainId: '0xabc', + }, + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://rinkeby.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x4', + nickname: 'Rinkeby', + ticker: 'RinkebyETH', + rpcPrefs: {}, + }, + { + rpcUrl: `https://ropsten.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x3', + nickname: 'Ropsten', + ticker: 'RopstenETH', + rpcPrefs: {}, + }, + ], + preferences: { + showTestNetworks: true, + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + 2: { + chainId: '0x4', + }, + 3: { + chainId: '0xabc', + }, + }, + }, + }, + }); + }); + + it('should add a deprecated testnet to custom networks if there is balance on that network', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x2a': { + '0x123456789': '0x1', + }, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://kovan.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x2a', + nickname: 'Kovan', + ticker: 'KovanETH', + rpcPrefs: {}, + }, + ], + preferences: { + showTestNetworks: true, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x2a': { + '0x123456789': '0x1', + }, + }, + }, + }, + }); + }); + + it('should add all three deprecated testnets to custom networks if each has a different reason for being added', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0x2a', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + rpcUrl: `https://kovan.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x2a', + nickname: 'Kovan', + ticker: 'KovanETH', + type: 'rpc', + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://kovan.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x2a', + nickname: 'Kovan', + ticker: 'KovanETH', + rpcPrefs: {}, + }, + { + rpcUrl: `https://ropsten.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x3', + nickname: 'Ropsten', + ticker: 'RopstenETH', + rpcPrefs: {}, + }, + { + rpcUrl: `https://rinkeby.infura.io/v3/${process.env.INFURA_PROJECT_ID}`, + chainId: '0x4', + nickname: 'Rinkeby', + ticker: 'RinkebyETH', + rpcPrefs: {}, + }, + ], + preferences: { + showTestNetworks: true, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + }, + }); + }); + + it('should not add deprecated testnets to custom networks if none is selected and showTestNetworks is false', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: false, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: false, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + }, + }); + }); + + it('should not alter or remove existing custom networks when no deprecated testnets are being added', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://example.com`, + chainId: '0xdef', + ticker: 'ETH', + nickname: 'Kovan', + rpcPrefs: {}, + }, + ], + preferences: { + showTestNetworks: false, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0xabc', + }, + }, + PreferencesController: { + frequentRpcListDetail: [ + { + rpcUrl: `https://example.com`, + chainId: '0xdef', + ticker: 'ETH', + nickname: 'Kovan', + rpcPrefs: {}, + }, + ], + preferences: { + showTestNetworks: false, + }, + }, + CachedBalancesController: { + cachedBalances: { + '0x4': { + '0x123456789': '0x1', + }, + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + }, + }); + }); + + it('should not modify an existing custom network with the same chainId as a deprecated testnet', async () => { + const oldStorage = { + meta: { + version: 73, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + frequentRpcListDetail: [ + { + rpcUrl: `https://example.com`, + chainId: '0x3', + ticker: 'ETH', + nickname: 'Ropsten', + rpcPrefs: {}, + }, + ], + }, + }, + }; + + const newStorage = await migration74.migrate(oldStorage); + expect(newStorage).toStrictEqual({ + meta: { + version: 74, + }, + data: { + NetworkController: { + provider: { + chainId: '0x1', + }, + }, + TransactionController: { + transactions: { + 1: { + chainId: '0x3', + }, + }, + }, + PreferencesController: { + preferences: { + showTestNetworks: true, + }, + frequentRpcListDetail: [ + { + rpcUrl: `https://example.com`, + chainId: '0x3', + ticker: 'ETH', + nickname: 'Ropsten', + rpcPrefs: {}, + }, + ], + }, + }, + }); + }); +}); diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js index f8a6db814..1fafb65bd 100644 --- a/app/scripts/migrations/index.js +++ b/app/scripts/migrations/index.js @@ -77,6 +77,7 @@ import m070 from './070'; import m071 from './071'; import m072 from './072'; import m073 from './073'; +import m074 from './074'; const migrations = [ m002, @@ -151,6 +152,7 @@ const migrations = [ m071, m072, m073, + m074, ]; export default migrations; diff --git a/app/scripts/migrations/migrations.test.js b/app/scripts/migrations/migrations.test.js index f1f860d90..4832adac5 100644 --- a/app/scripts/migrations/migrations.test.js +++ b/app/scripts/migrations/migrations.test.js @@ -149,11 +149,6 @@ describe('wallet1 is migrated successfully', () => { 'testnet', ); return migration13.migrate(twelfthResult); - }) - .then((thirteenthResult) => { - expect(thirteenthResult.data.config.provider.type).toStrictEqual( - 'ropsten', - ); }); }); }); diff --git a/development/states/navigate-txs.json b/development/states/navigate-txs.json index bf39420c1..24850ddcc 100644 --- a/development/states/navigate-txs.json +++ b/development/states/navigate-txs.json @@ -229,7 +229,7 @@ "useETHAsPrimaryCurrency": true }, "provider": { - "type": "rinkeby" + "type": "goerli" }, "network": "4", "accounts": { @@ -276,7 +276,7 @@ "0x8cf82b5aa41ff2282427be151dd328568684007a": {}, "0xbe1a00e10ec68b154adb84e8119167146a71c9a2": {}, "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2": { - "rinkeby": [ + "goerli": [ { "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a", "decimals": 9, @@ -305,10 +305,7 @@ "conversionDate": 1538859376, "shapeShiftTxList": [], "infuraNetworkStatus": { - "kovan": "ok", "mainnet": "ok", - "rinkeby": "ok", - "ropsten": "ok", "goerli": "ok", "sepolia": "ok" } diff --git a/shared/constants/network.ts b/shared/constants/network.ts index 6b024ec3d..759ad694e 100644 --- a/shared/constants/network.ts +++ b/shared/constants/network.ts @@ -160,11 +160,8 @@ type BuyableChainSettings = { */ export const NETWORK_TYPES = { GOERLI: 'goerli', - KOVAN: 'kovan', LOCALHOST: 'localhost', MAINNET: 'mainnet', - RINKEBY: 'rinkeby', - ROPSTEN: 'ropsten', RPC: 'rpc', SEPOLIA: 'sepolia', } as const; @@ -189,10 +186,7 @@ export const NETWORK_NAMES = { */ export const NETWORK_IDS = { MAINNET: '1', - ROPSTEN: '3', - RINKEBY: '4', GOERLI: '5', - KOVAN: '42', LOCALHOST: '1337', SEPOLIA: '11155111', } as const; @@ -203,10 +197,7 @@ export const NETWORK_IDS = { */ export const CHAIN_IDS = { MAINNET: '0x1', - ROPSTEN: '0x3', - RINKEBY: '0x4', GOERLI: '0x5', - KOVAN: '0x2a', LOCALHOST: '0x539', BSC: '0x38', OPTIMISM: '0xa', @@ -227,9 +218,6 @@ export const CHAIN_IDS = { */ export const MAX_SAFE_CHAIN_ID = 4503599627370476; -export const ROPSTEN_DISPLAY_NAME = 'Ropsten'; -export const RINKEBY_DISPLAY_NAME = 'Rinkeby'; -export const KOVAN_DISPLAY_NAME = 'Kovan'; export const MAINNET_DISPLAY_NAME = 'Ethereum Mainnet'; export const GOERLI_DISPLAY_NAME = 'Goerli'; export const SEPOLIA_DISPLAY_NAME = 'Sepolia'; @@ -255,13 +243,6 @@ export const getRpcUrl = ({ }) => `https://${network}.infura.io/v3/${excludeProjectId ? '' : infuraProjectId}`; -export const ROPSTEN_RPC_URL = getRpcUrl({ - network: NETWORK_TYPES.ROPSTEN, -}); -export const RINKEBY_RPC_URL = getRpcUrl({ - network: NETWORK_TYPES.RINKEBY, -}); -export const KOVAN_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.KOVAN }); export const MAINNET_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.MAINNET, }); @@ -430,19 +411,13 @@ export const OPTIMISM_TOKEN_IMAGE_URL = './images/optimism.svg'; export const PALM_TOKEN_IMAGE_URL = './images/palm.svg'; export const INFURA_PROVIDER_TYPES = [ - NETWORK_TYPES.ROPSTEN, - NETWORK_TYPES.RINKEBY, - NETWORK_TYPES.KOVAN, NETWORK_TYPES.MAINNET, NETWORK_TYPES.GOERLI, NETWORK_TYPES.SEPOLIA, ]; export const TEST_CHAINS = [ - CHAIN_IDS.ROPSTEN, - CHAIN_IDS.RINKEBY, CHAIN_IDS.GOERLI, - CHAIN_IDS.KOVAN, CHAIN_IDS.SEPOLIA, CHAIN_IDS.LOCALHOST, ]; @@ -456,15 +431,6 @@ export const TEST_NETWORK_TICKER_MAP: { 'localhost' | 'mainnet' | 'rpc' >]: `${Capitalize}${typeof CURRENCY_SYMBOLS.ETH}`; } = { - [NETWORK_TYPES.ROPSTEN]: `${typedCapitalize(NETWORK_TYPES.ROPSTEN)}${ - CURRENCY_SYMBOLS.ETH - }`, - [NETWORK_TYPES.RINKEBY]: `${typedCapitalize(NETWORK_TYPES.RINKEBY)}${ - CURRENCY_SYMBOLS.ETH - }`, - [NETWORK_TYPES.KOVAN]: `${typedCapitalize(NETWORK_TYPES.KOVAN)}${ - CURRENCY_SYMBOLS.ETH - }`, [NETWORK_TYPES.GOERLI]: `${typedCapitalize(NETWORK_TYPES.GOERLI)}${ CURRENCY_SYMBOLS.ETH }`, @@ -477,21 +443,6 @@ export const TEST_NETWORK_TICKER_MAP: { * Map of all build-in Infura networks to their network, ticker and chain IDs. */ export const BUILT_IN_NETWORKS = { - [NETWORK_TYPES.ROPSTEN]: { - networkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.ROPSTEN], - }, - [NETWORK_TYPES.RINKEBY]: { - networkId: NETWORK_IDS.RINKEBY, - chainId: CHAIN_IDS.RINKEBY, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.RINKEBY], - }, - [NETWORK_TYPES.KOVAN]: { - networkId: NETWORK_IDS.KOVAN, - chainId: CHAIN_IDS.KOVAN, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.KOVAN], - }, [NETWORK_TYPES.GOERLI]: { networkId: NETWORK_IDS.GOERLI, chainId: CHAIN_IDS.GOERLI, @@ -513,25 +464,16 @@ export const BUILT_IN_NETWORKS = { } as const; export const NETWORK_TO_NAME_MAP = { - [NETWORK_TYPES.ROPSTEN]: ROPSTEN_DISPLAY_NAME, - [NETWORK_TYPES.RINKEBY]: RINKEBY_DISPLAY_NAME, - [NETWORK_TYPES.KOVAN]: KOVAN_DISPLAY_NAME, [NETWORK_TYPES.MAINNET]: MAINNET_DISPLAY_NAME, [NETWORK_TYPES.GOERLI]: GOERLI_DISPLAY_NAME, [NETWORK_TYPES.SEPOLIA]: SEPOLIA_DISPLAY_NAME, [NETWORK_TYPES.LOCALHOST]: LOCALHOST_DISPLAY_NAME, - [NETWORK_IDS.ROPSTEN]: ROPSTEN_DISPLAY_NAME, - [NETWORK_IDS.RINKEBY]: RINKEBY_DISPLAY_NAME, - [NETWORK_IDS.KOVAN]: KOVAN_DISPLAY_NAME, [NETWORK_IDS.GOERLI]: GOERLI_DISPLAY_NAME, [NETWORK_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME, [NETWORK_IDS.MAINNET]: MAINNET_DISPLAY_NAME, [NETWORK_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME, - [CHAIN_IDS.ROPSTEN]: ROPSTEN_DISPLAY_NAME, - [CHAIN_IDS.RINKEBY]: RINKEBY_DISPLAY_NAME, - [CHAIN_IDS.KOVAN]: KOVAN_DISPLAY_NAME, [CHAIN_IDS.GOERLI]: GOERLI_DISPLAY_NAME, [CHAIN_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME, [CHAIN_IDS.MAINNET]: MAINNET_DISPLAY_NAME, @@ -542,16 +484,10 @@ export const CHAIN_ID_TO_TYPE_MAP = { [CHAIN_IDS.MAINNET]: NETWORK_TYPES.MAINNET, [CHAIN_IDS.GOERLI]: NETWORK_TYPES.GOERLI, [CHAIN_IDS.SEPOLIA]: NETWORK_TYPES.SEPOLIA, - [CHAIN_IDS.KOVAN]: NETWORK_TYPES.KOVAN, [CHAIN_IDS.LOCALHOST]: NETWORK_TYPES.LOCALHOST, - [CHAIN_IDS.RINKEBY]: NETWORK_TYPES.RINKEBY, - [CHAIN_IDS.ROPSTEN]: NETWORK_TYPES.ROPSTEN, } as const; export const CHAIN_ID_TO_RPC_URL_MAP = { - [CHAIN_IDS.ROPSTEN]: ROPSTEN_RPC_URL, - [CHAIN_IDS.RINKEBY]: RINKEBY_RPC_URL, - [CHAIN_IDS.KOVAN]: KOVAN_RPC_URL, [CHAIN_IDS.GOERLI]: GOERLI_RPC_URL, [CHAIN_IDS.SEPOLIA]: SEPOLIA_RPC_URL, [CHAIN_IDS.MAINNET]: MAINNET_RPC_URL, @@ -571,8 +507,6 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = { } as const; export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP = { - [NETWORK_IDS.ROPSTEN]: NETWORK_TYPES.ROPSTEN, - [NETWORK_IDS.RINKEBY]: NETWORK_TYPES.RINKEBY, [NETWORK_IDS.GOERLI]: NETWORK_TYPES.GOERLI, [NETWORK_IDS.SEPOLIA]: NETWORK_TYPES.SEPOLIA, [NETWORK_IDS.MAINNET]: NETWORK_NAMES.HOMESTEAD, @@ -582,10 +516,7 @@ export const CHAIN_ID_TO_NETWORK_ID_MAP = { [CHAIN_IDS.MAINNET]: NETWORK_IDS.MAINNET, [CHAIN_IDS.GOERLI]: NETWORK_IDS.GOERLI, [CHAIN_IDS.SEPOLIA]: NETWORK_IDS.SEPOLIA, - [CHAIN_IDS.KOVAN]: NETWORK_IDS.KOVAN, [CHAIN_IDS.LOCALHOST]: NETWORK_IDS.LOCALHOST, - [CHAIN_IDS.RINKEBY]: NETWORK_IDS.RINKEBY, - [CHAIN_IDS.ROPSTEN]: NETWORK_IDS.ROPSTEN, } as const; export const NATIVE_CURRENCY_TOKEN_IMAGE_MAP = { @@ -832,14 +763,6 @@ export const BUYABLE_CHAINS_MAP: { SUPPORTED_CURRENCY_SYMBOLS.ZRX, ], }, - [CHAIN_IDS.ROPSTEN]: { - nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.ROPSTEN], - network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, - }, - [CHAIN_IDS.RINKEBY]: { - nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.RINKEBY], - network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, - }, [CHAIN_IDS.GOERLI]: { nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.GOERLI], network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, @@ -848,10 +771,6 @@ export const BUYABLE_CHAINS_MAP: { nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA], network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, }, - [CHAIN_IDS.KOVAN]: { - nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.KOVAN], - network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, - }, [CHAIN_IDS.BSC]: { nativeCurrency: CURRENCY_SYMBOLS.BNB, network: 'bsc', diff --git a/test/data/mock-pending-transaction-data.json b/test/data/mock-pending-transaction-data.json index 62f072c10..26ce780eb 100644 --- a/test/data/mock-pending-transaction-data.json +++ b/test/data/mock-pending-transaction-data.json @@ -5,8 +5,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "approved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": null, "txParams": { @@ -25,8 +25,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "unapproved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": true, "dappSuggestedGasFees": null, "txParams": { @@ -81,8 +81,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "approved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": null, "txParams": { @@ -101,8 +101,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "unapproved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": true, "dappSuggestedGasFees": null, "txParams": { @@ -158,8 +158,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "approved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": null, "txParams": { @@ -178,8 +178,8 @@ "id": 6854191329910881, "time": 1631558469046, "status": "unapproved", - "metamaskNetworkId": "42", - "chainId": "0x2a", + "metamaskNetworkId": "5", + "chainId": "0x5", "loadingDefaults": true, "dappSuggestedGasFees": null, "txParams": { diff --git a/test/data/mock-state.json b/test/data/mock-state.json index cc1b350a4..a376803df 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -61,10 +61,10 @@ "featureFlags": { "showIncomingTransactions": true }, - "network": "4", + "network": "5", "provider": { "type": "rpc", - "chainId": "0x4" + "chainId": "0x5" }, "keyrings": [ { @@ -221,10 +221,10 @@ "nativeCurrency": "ETH", "conversionRate": 556.12, "addressBook": { - "0x4": { + "0x5": { "0xc42edfcc21ed14dda456aa0756c153f7985d8813": { "address": "0xc42edfcc21ed14dda456aa0756c153f7985d8813", - "chainId": "0x4", + "chainId": "0x5", "isEns": false, "memo": "", "name": "Address Book Account 1" diff --git a/test/data/mock-tx-history.json b/test/data/mock-tx-history.json index 5a78af315..790dd44fa 100644 --- a/test/data/mock-tx-history.json +++ b/test/data/mock-tx-history.json @@ -5,21 +5,21 @@ "id": 6616756286038869, "time": 1502438908445, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038869, "time": 1502438908445, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -32,7 +32,7 @@ "id": 6616756286038869, "time": 1502438908445, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -45,7 +45,7 @@ "id": 6616756286038869, "time": 1502438908445, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -58,7 +58,7 @@ "id": 6616756286038869, "time": 1502438908445, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -71,7 +71,7 @@ "id": 6616756286038869, "time": 1502438908445, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -91,7 +91,7 @@ "id": 6616756286038869, "time": 1502438908445, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -111,14 +111,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -131,14 +131,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -151,14 +151,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -172,14 +172,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -193,14 +193,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -215,14 +215,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -237,14 +237,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -259,14 +259,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -281,14 +281,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -304,14 +304,14 @@ "id": 6616756286038869, "time": 1502438908445, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16643c", @@ -338,7 +338,7 @@ "id": 6616756286038870, "time": 1502573153664, "status": "rejected", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -351,7 +351,7 @@ "id": 6616756286038870, "time": 1502573153664, "status": "rejected", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -364,7 +364,7 @@ "id": 6616756286038870, "time": 1502573153664, "status": "rejected", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -379,7 +379,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -387,14 +387,14 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038871, "time": 1502573157128, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -407,7 +407,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -420,7 +420,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -433,7 +433,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -446,7 +446,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -466,7 +466,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -486,7 +486,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -494,7 +494,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -507,7 +507,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -515,7 +515,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -528,7 +528,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -536,7 +536,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -550,7 +550,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -558,7 +558,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -572,7 +572,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -580,7 +580,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -595,7 +595,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -603,7 +603,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -618,7 +618,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -626,7 +626,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -641,7 +641,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -649,7 +649,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -664,7 +664,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -672,7 +672,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -688,7 +688,7 @@ "id": 6616756286038871, "time": 1502573157128, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -696,7 +696,7 @@ "gasPrice": "0x28fa6ae00", "gas": "0x7b0d", "nonce": "0x01", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x168739", @@ -723,7 +723,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -731,14 +731,14 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038872, "time": 1502734903652, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -751,7 +751,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -764,7 +764,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -777,7 +777,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -790,7 +790,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -810,7 +810,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -830,7 +830,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -838,7 +838,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -851,7 +851,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -859,7 +859,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -872,7 +872,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -880,7 +880,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -894,7 +894,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -902,7 +902,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -916,7 +916,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -924,7 +924,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -939,7 +939,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -947,7 +947,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -962,7 +962,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -970,7 +970,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -985,7 +985,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -993,7 +993,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -1008,7 +1008,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1016,7 +1016,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -1032,7 +1032,7 @@ "id": 6616756286038872, "time": 1502734903652, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1040,7 +1040,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x02", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b066", @@ -1067,7 +1067,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1075,14 +1075,14 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038873, "time": 1502734910224, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1095,7 +1095,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1108,7 +1108,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1121,7 +1121,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1134,7 +1134,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1154,7 +1154,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1174,7 +1174,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1182,7 +1182,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1195,7 +1195,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1203,7 +1203,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1216,7 +1216,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1224,7 +1224,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1238,7 +1238,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1246,7 +1246,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1260,7 +1260,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1268,7 +1268,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1283,7 +1283,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1291,7 +1291,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1306,7 +1306,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1314,7 +1314,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1329,7 +1329,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1337,7 +1337,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1352,7 +1352,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1360,7 +1360,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1376,7 +1376,7 @@ "id": 6616756286038873, "time": 1502734910224, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1384,7 +1384,7 @@ "gasPrice": "0x3b9aca00", "gas": "0x7b0d", "nonce": "0x03", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1411,7 +1411,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1419,14 +1419,14 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038874, "time": 1502734917414, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1439,7 +1439,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1452,7 +1452,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1465,7 +1465,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1478,7 +1478,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1498,7 +1498,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1518,7 +1518,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1526,7 +1526,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1539,7 +1539,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1547,7 +1547,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1560,7 +1560,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1568,7 +1568,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1582,7 +1582,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1590,7 +1590,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1604,7 +1604,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1612,7 +1612,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1627,7 +1627,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1635,7 +1635,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1650,7 +1650,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1658,7 +1658,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1673,7 +1673,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1681,7 +1681,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1696,7 +1696,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1704,7 +1704,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1720,7 +1720,7 @@ "id": 6616756286038874, "time": 1502734917414, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1728,7 +1728,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x04", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b067", @@ -1755,7 +1755,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1763,14 +1763,14 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "history": [ { "id": 6616756286038875, "time": 1502734922745, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1783,7 +1783,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "unapproved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1796,7 +1796,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1809,7 +1809,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1822,7 +1822,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1842,7 +1842,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "approved", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1862,7 +1862,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1870,7 +1870,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1883,7 +1883,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1891,7 +1891,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1904,7 +1904,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1912,7 +1912,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1926,7 +1926,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1934,7 +1934,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1948,7 +1948,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1956,7 +1956,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1971,7 +1971,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "signed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -1979,7 +1979,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -1994,7 +1994,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -2002,7 +2002,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -2017,7 +2017,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "submitted", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -2025,7 +2025,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -2040,7 +2040,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -2048,7 +2048,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", @@ -2064,7 +2064,7 @@ "id": 6616756286038875, "time": 1502734922745, "status": "confirmed", - "metamaskNetworkId": "3", + "metamaskNetworkId": "5", "txParams": { "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c", @@ -2072,7 +2072,7 @@ "gasPrice": "0x4a817c800", "gas": "0x7b0d", "nonce": "0x05", - "chainId": 3 + "chainId": 5 }, "nonceDetails": { "blockNumber": "0x16b068", diff --git a/test/data/transaction-data.json b/test/data/transaction-data.json index b3f2b05c5..24d1deaf7 100644 --- a/test/data/transaction-data.json +++ b/test/data/transaction-data.json @@ -864,10 +864,10 @@ "id": 1441203963845330, "time": 1652206763566, "status": "confirmed", - "metamaskNetworkId": "4", + "metamaskNetworkId": "5", "originalGasEstimate": "0x118e0", "userEditedGasLimit": false, - "chainId": "0x4", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": { "maxPriorityFeePerGas": "0x3B9ACA00", @@ -884,7 +884,7 @@ "maxFeePerGas": "0x7be830aec", "maxPriorityFeePerGas": "0x3B9ACA00" }, - "origin": "https://rinkeby.etherscan.io", + "origin": "https://goerli.etherscan.io", "type": "safetransferfrom", "userFeeLevel": "dappSuggested", "defaultGasEstimates": { @@ -980,10 +980,10 @@ "id": 1441203963845330, "time": 1652206763566, "status": "confirmed", - "metamaskNetworkId": "4", + "metamaskNetworkId": "5", "originalGasEstimate": "0x118e0", "userEditedGasLimit": false, - "chainId": "0x4", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": { "maxPriorityFeePerGas": "0x3B9ACA00", @@ -1000,7 +1000,7 @@ "maxFeePerGas": "0x7be830aec", "maxPriorityFeePerGas": "0x3B9ACA00" }, - "origin": "https://rinkeby.etherscan.io", + "origin": "https://goerli.etherscan.io", "type": "safetransferfrom", "userFeeLevel": "dappSuggested", "defaultGasEstimates": { @@ -1095,10 +1095,10 @@ "id": 1441203963845330, "time": 1652206763566, "status": "confirmed", - "metamaskNetworkId": "4", + "metamaskNetworkId": "5", "originalGasEstimate": "0x118e0", "userEditedGasLimit": false, - "chainId": "0x4", + "chainId": "0x5", "loadingDefaults": false, "dappSuggestedGasFees": { "maxPriorityFeePerGas": "0x3B9ACA00", @@ -1115,7 +1115,7 @@ "maxFeePerGas": "0x7be830aec", "maxPriorityFeePerGas": "0x3B9ACA00" }, - "origin": "https://rinkeby.etherscan.io", + "origin": "https://goerli.etherscan.io", "type": "safetransferfrom", "userFeeLevel": "dappSuggested", "defaultGasEstimates": { diff --git a/test/e2e/fixtures/address-entry/state.json b/test/e2e/fixtures/address-entry/state.json index 5fbf10276..ac1a8ebe5 100644 --- a/test/e2e/fixtures/address-entry/state.json +++ b/test/e2e/fixtures/address-entry/state.json @@ -33,10 +33,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -128,8 +126,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/connected-state/state.json b/test/e2e/fixtures/connected-state/state.json index 28a206071..d2d00fb4a 100644 --- a/test/e2e/fixtures/connected-state/state.json +++ b/test/e2e/fixtures/connected-state/state.json @@ -22,10 +22,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, "sepolia": null, - "rinkeby": 5570536, "localhost": 98 } }, @@ -130,8 +128,8 @@ "frequentRpcListDetail": [], "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/custom-rpc/state.json b/test/e2e/fixtures/custom-rpc/state.json index 8088a1799..0019533a1 100644 --- a/test/e2e/fixtures/custom-rpc/state.json +++ b/test/e2e/fixtures/custom-rpc/state.json @@ -19,10 +19,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -130,8 +128,8 @@ ], "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/custom-token/state.json b/test/e2e/fixtures/custom-token/state.json index 5f447420b..50dc7d9b0 100644 --- a/test/e2e/fixtures/custom-token/state.json +++ b/test/e2e/fixtures/custom-token/state.json @@ -17,7 +17,7 @@ }, "CachedBalancesController": { "cachedBalances": { - "0x4": { + "0x5": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": "0x0" } } @@ -35,10 +35,7 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlockByChainId": { "0x1": null, - "0x2a": null, - "0x3": null, - "0x4": 8977934, - "0x5": null + "0x5": 8977934 } }, "KeyringController": { @@ -54,9 +51,9 @@ "EIPS": {} }, "previousProviderStore": { - "chainId": "0x4", + "chainId": "0x5", "ticker": "ETH", - "type": "rinkeby" + "type": "goerli" }, "provider": { "chainId": "0x539", diff --git a/test/e2e/fixtures/eip-1559-v2-dapp/state.json b/test/e2e/fixtures/eip-1559-v2-dapp/state.json index 1b01bc077..5c6d28bed 100644 --- a/test/e2e/fixtures/eip-1559-v2-dapp/state.json +++ b/test/e2e/fixtures/eip-1559-v2-dapp/state.json @@ -20,10 +20,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -115,8 +113,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/eip-1559-v2/state.json b/test/e2e/fixtures/eip-1559-v2/state.json index 0341d4ecb..c39d6bfdc 100644 --- a/test/e2e/fixtures/eip-1559-v2/state.json +++ b/test/e2e/fixtures/eip-1559-v2/state.json @@ -20,10 +20,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -115,8 +113,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json index d89d6e2cf..260316da3 100644 --- a/test/e2e/fixtures/imported-account/state.json +++ b/test/e2e/fixtures/imported-account/state.json @@ -19,10 +19,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -114,8 +112,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/localization/state.json b/test/e2e/fixtures/localization/state.json index d5ba38d28..632f3d6f1 100644 --- a/test/e2e/fixtures/localization/state.json +++ b/test/e2e/fixtures/localization/state.json @@ -19,10 +19,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -114,8 +112,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/metrics-enabled/state.json b/test/e2e/fixtures/metrics-enabled/state.json index 683f6cda6..22f160220 100644 --- a/test/e2e/fixtures/metrics-enabled/state.json +++ b/test/e2e/fixtures/metrics-enabled/state.json @@ -22,10 +22,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, "sepolia": null, - "rinkeby": 5570536, "localhost": 98 } }, @@ -130,8 +128,8 @@ "frequentRpcListDetail": [], "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json index 8d4734d54..6549e2de8 100644 --- a/test/e2e/fixtures/navigate-transactions/state.json +++ b/test/e2e/fixtures/navigate-transactions/state.json @@ -19,10 +19,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -114,8 +112,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/send-edit-v2/state.json b/test/e2e/fixtures/send-edit-v2/state.json index b414cf8d3..c5ec33d51 100644 --- a/test/e2e/fixtures/send-edit-v2/state.json +++ b/test/e2e/fixtures/send-edit-v2/state.json @@ -20,10 +20,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -115,8 +113,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/send-edit/state.json b/test/e2e/fixtures/send-edit/state.json index 30eee4e90..14795e55e 100644 --- a/test/e2e/fixtures/send-edit/state.json +++ b/test/e2e/fixtures/send-edit/state.json @@ -20,10 +20,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -115,8 +113,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/special-settings/state.json b/test/e2e/fixtures/special-settings/state.json index 57a4cd2c9..b1bdad525 100644 --- a/test/e2e/fixtures/special-settings/state.json +++ b/test/e2e/fixtures/special-settings/state.json @@ -19,10 +19,8 @@ "incomingTransactions": {}, "incomingTxLastFetchedBlocksByNetwork": { "goerli": null, - "kovan": null, "mainnet": null, - "sepolia": null, - "rinkeby": 5570536 + "sepolia": null } }, "KeyringController": { @@ -108,8 +106,8 @@ "PreferencesController": { "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "rinkeby": [], - "ropsten": [] + "goerli": [], + "sepolia": [] } }, "assetImages": {}, diff --git a/test/e2e/fixtures/threebox-enabled/state.json b/test/e2e/fixtures/threebox-enabled/state.json index e7b7d10a4..ea1ab3b37 100644 --- a/test/e2e/fixtures/threebox-enabled/state.json +++ b/test/e2e/fixtures/threebox-enabled/state.json @@ -22,10 +22,9 @@ "IncomingTransactionsController": { "incomingTransactions": {}, "incomingTxLastFetchedBlockByChainId": { - "0x5": null, - "0x2a": null, + "0xaa36a7": null, "0x1": null, - "0x4": 5570536 + "0x5": 5570536 } }, "KeyringController": { @@ -101,8 +100,8 @@ ], "accountTokens": { "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": { - "0x4": [], - "0x3": [] + "0x5": [], + "0xaa36a7": [] } }, "accountHiddenTokens": {}, diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js index 785ec4c00..a2391b1ca 100644 --- a/test/e2e/mock-e2e.js +++ b/test/e2e/mock-e2e.js @@ -1,9 +1,6 @@ const blacklistedHosts = [ 'goerli.infura.io', - 'kovan.infura.io', 'mainnet.infura.io', - 'rinkeby.infura.io', - 'ropsten.infura.io', 'sepolia.infura.io', ]; diff --git a/test/stub/tx-meta-stub.js b/test/stub/tx-meta-stub.js index c33ab758c..8640998f4 100644 --- a/test/stub/tx-meta-stub.js +++ b/test/stub/tx-meta-stub.js @@ -11,7 +11,7 @@ export const txMetaStub = { { id: 405984854664302, loadingDefaults: true, - metamaskNetworkId: '4', + metamaskNetworkId: '5', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1572395156620, type: TRANSACTION_TYPES.SIMPLE_SEND, @@ -56,7 +56,7 @@ export const txMetaStub = { op: 'add', path: '/txParams/nonce', timestamp: 1572395158261, - value: '0x4', + value: '0x5', }, { op: 'add', @@ -163,7 +163,7 @@ export const txMetaStub = { ], id: 405984854664302, loadingDefaults: false, - metamaskNetworkId: '4', + metamaskNetworkId: '5', nonceDetails: { local: { details: { @@ -200,7 +200,7 @@ export const txMetaStub = { from: '0xf231d46dd78806e1dd93442cf33c7671f8538748', gas: GAS_LIMITS.SIMPLE, gasPrice: '0x1e8480', - nonce: '0x4', + nonce: '0x5', to: '0xf231d46dd78806e1dd93442cf33c7671f8538748', value: '0x0', }, diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/collectible-details/collectible-details.js index f824a3814..d2e6a9100 100644 --- a/ui/components/app/collectible-details/collectible-details.js +++ b/ui/components/app/collectible-details/collectible-details.js @@ -97,9 +97,6 @@ export default function CollectibleDetails({ collectible }) { case CHAIN_IDS.POLYGON: return `https://opensea.io/assets/matic/${address}/${tokenId}`; case CHAIN_IDS.GOERLI: - case CHAIN_IDS.KOVAN: - case CHAIN_IDS.ROPSTEN: - case CHAIN_IDS.RINKEBY: case CHAIN_IDS.SEPOLIA: return `https://testnets.opensea.io/assets/${address}/${tokenId}`; default: diff --git a/ui/components/app/collectibles-tab/collectibles-tab.test.js b/ui/components/app/collectibles-tab/collectibles-tab.test.js index 4d9494b88..2e1b6b692 100644 --- a/ui/components/app/collectibles-tab/collectibles-tab.test.js +++ b/ui/components/app/collectibles-tab/collectibles-tab.test.js @@ -299,7 +299,7 @@ describe('Collectible Items', () => { it('should render a link "Refresh list" when some collectibles are present on a non-mainnet chain, which, when clicked calls a method checkAndUpdateCollectiblesOwnershipStatus', () => { render({ - chainId: '0x4', + chainId: '0x5', selectedAddress: ACCOUNT_1, collectibles: COLLECTIBLES, useCollectibleDetection: true, diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js index be68c56d9..52c795265 100644 --- a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js @@ -9,7 +9,7 @@ describe('Confirm Detail Row Component', () => { metamask: { provider: { type: 'rpc', - chainId: '0x4', + chainId: '0x5', }, preferences: { useNativeCurrencyAsPrimaryCurrency: true, diff --git a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js index 32a8a46ca..2256f6e9c 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js @@ -32,7 +32,7 @@ describe('Confirm Page Container Container Test', () => { id: 8783053010106567, time: 1656448479005, status: 'unapproved', - metamaskNetworkId: '4', + metamaskNetworkId: '5', originalGasEstimate: '0x5208', userEditedGasLimit: false, loadingDefaults: false, @@ -121,10 +121,10 @@ describe('Confirm Page Container Container Test', () => { const addressBookName = 'test save name'; const addressBook = { - '0x4': { + '0x5': { '0x7a1A4Ad9cc746a70ee58568466f7996dD0aCE4E8': { address: '0x7a1A4Ad9cc746a70ee58568466f7996dD0aCE4E8', - chainId: '0x4', + chainId: '054', isEns: false, memo: '', name: addressBookName, diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js index 65ef0e606..20db18839 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js @@ -11,15 +11,15 @@ describe('Confirm Page Container Content', () => { metamask: { provider: { type: 'test', - chainId: '0x3', + chainId: '0x5', }, eip1559V2Enabled: false, addressBook: { - '0x3': { + '0x5': { '0x06195827297c7A80a443b6894d3BDB8824b43896': { address: '0x06195827297c7A80a443b6894d3BDB8824b43896', name: 'Address Book Account 1', - chainId: '0x3', + chainId: '0x5', }, }, }, diff --git a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js index 8096c8581..6f06f540c 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js @@ -17,7 +17,7 @@ describe('Confirm Detail Row Component', () => { metamask: { provider: { type: 'rpc', - chainId: '0x4', + chainId: '0x5', }, }, }; diff --git a/ui/components/app/currency-input/currency-input.test.js b/ui/components/app/currency-input/currency-input.test.js index 48670f3f7..3fd1c9cf2 100644 --- a/ui/components/app/currency-input/currency-input.test.js +++ b/ui/components/app/currency-input/currency-input.test.js @@ -11,7 +11,7 @@ describe('CurrencyInput Component', () => { currentCurrency: 'usd', conversionRate: 231.06, provider: { - chainId: '0x4', + chainId: '0x5', }, preferences: { showFiatInTestnets: true, diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js index ee103f25e..490449161 100644 --- a/ui/components/app/dropdowns/network-dropdown.js +++ b/ui/components/app/dropdowns/network-dropdown.js @@ -217,12 +217,6 @@ class NetworkDropdown extends Component { switch (providerName) { case NETWORK_TYPES.MAINNET: return t('mainnet'); - case NETWORK_TYPES.ROPSTEN: - return t('ropsten'); - case NETWORK_TYPES.KOVAN: - return t('kovan'); - case NETWORK_TYPES.RINKEBY: - return t('rinkeby'); case NETWORK_TYPES.GOERLI: return t('goerli'); case NETWORK_TYPES.SEPOLIA: @@ -354,9 +348,6 @@ class NetworkDropdown extends Component { {shouldShowTestNetworks && ( <> - {this.renderNetworkEntry(NETWORK_TYPES.ROPSTEN)} - {this.renderNetworkEntry(NETWORK_TYPES.KOVAN)} - {this.renderNetworkEntry(NETWORK_TYPES.RINKEBY)} {this.renderNetworkEntry(NETWORK_TYPES.GOERLI)} {this.renderNetworkEntry(NETWORK_TYPES.SEPOLIA)} {this.renderCustomRpcList( diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js index 61a19bd96..727b8fadc 100644 --- a/ui/components/app/dropdowns/network-dropdown.test.js +++ b/ui/components/app/dropdowns/network-dropdown.test.js @@ -80,33 +80,17 @@ describe('Network Dropdown', () => { expect(mainnetColorIndicator).toBeInTheDocument(); }); - it('checks background color for second ColorIndicator', () => { - // find where test networks start in case there are custom RPCs - const ropstenColorIndicator = screen.queryByTestId('color-icon-ropsten'); - expect(ropstenColorIndicator).toBeInTheDocument(); - }); - - it('checks background color for third ColorIndicator', () => { - const kovanColorIndicator = screen.queryByTestId('color-icon-kovan'); - expect(kovanColorIndicator).toBeInTheDocument(); - }); - it('checks background color for fourth ColorIndicator', () => { - const rinkebyColorIndicator = screen.queryByTestId('color-icon-rinkeby'); - expect(rinkebyColorIndicator).toBeInTheDocument(); - }); - - it('checks background color for fifth ColorIndicator', () => { const goerliColorIndicator = screen.queryByTestId('color-icon-goerli'); expect(goerliColorIndicator).toBeInTheDocument(); }); - it('checks background color for sixth ColorIndicator', () => { + it('checks background color for fifth ColorIndicator', () => { const sepoliaColorIndicator = screen.queryByTestId('color-icon-sepolia'); expect(sepoliaColorIndicator).toBeInTheDocument(); }); - it('checks background color for seventh ColorIndicator', () => { + it('checks background color for sixth ColorIndicator', () => { const localhostColorIndicator = screen.queryByTestId( 'color-icon-localhost', ); @@ -121,7 +105,7 @@ describe('Network Dropdown', () => { it('shows test networks in the dropdown', () => { const networkItems = screen.queryAllByTestId(/network-item/u); - expect(networkItems).toHaveLength(9); + expect(networkItems).toHaveLength(6); }); }); diff --git a/ui/components/app/import-token-link/__snapshots__/import-token-link.test.js.snap b/ui/components/app/import-token-link/__snapshots__/import-token-link.test.js.snap index a3d8b9e7d..37dab0c3d 100644 --- a/ui/components/app/import-token-link/__snapshots__/import-token-link.test.js.snap +++ b/ui/components/app/import-token-link/__snapshots__/import-token-link.test.js.snap @@ -1,5 +1,31 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`Import Token Link should match snapshot for goerli chainId 1`] = ` +
+
+ + Refresh list + + or + + import tokens + +
+
+`; + exports[`Import Token Link should match snapshot for mainnet chainId 1`] = `
`; - -exports[`Import Token Link should match snapshot for rinkeby chainId 1`] = ` -
-
- - Refresh list - - or - - import tokens - -
-
-`; diff --git a/ui/components/app/import-token-link/import-token-link.test.js b/ui/components/app/import-token-link/import-token-link.test.js index 55e4b69b7..7d2947bce 100644 --- a/ui/components/app/import-token-link/import-token-link.test.js +++ b/ui/components/app/import-token-link/import-token-link.test.js @@ -23,11 +23,11 @@ jest.mock('../../../store/actions.js', () => ({ })); describe('Import Token Link', () => { - it('should match snapshot for rinkeby chainId', () => { + it('should match snapshot for goerli chainId', () => { const mockState = { metamask: { provider: { - chainId: '0x4', + chainId: '0x5', }, }, }; @@ -59,7 +59,7 @@ describe('Import Token Link', () => { const mockState = { metamask: { provider: { - chainId: '0x4', + chainId: '0x5', }, }, }; @@ -78,7 +78,7 @@ describe('Import Token Link', () => { const mockState = { metamask: { provider: { - chainId: '0x4', + chainId: '0x5', }, }, }; diff --git a/ui/components/app/loading-network-screen/loading-network-screen.component.js b/ui/components/app/loading-network-screen/loading-network-screen.component.js index 00f6649f1..bf241cfce 100644 --- a/ui/components/app/loading-network-screen/loading-network-screen.component.js +++ b/ui/components/app/loading-network-screen/loading-network-screen.component.js @@ -24,6 +24,7 @@ export default class LoadingNetworkScreen extends PureComponent { setProviderType: PropTypes.func, rollbackToPreviousProvider: PropTypes.func, isNetworkLoading: PropTypes.bool, + showDeprecatedRpcUrlWarning: PropTypes.bool, }; componentDidMount = () => { @@ -44,12 +45,6 @@ export default class LoadingNetworkScreen extends PureComponent { switch (providerName) { case NETWORK_TYPES.MAINNET: return t('connectingToMainnet'); - case NETWORK_TYPES.ROPSTEN: - return t('connectingToRopsten'); - case NETWORK_TYPES.KOVAN: - return t('connectingToKovan'); - case NETWORK_TYPES.RINKEBY: - return t('connectingToRinkeby'); case NETWORK_TYPES.GOERLI: return t('connectingToGoerli'); case NETWORK_TYPES.SEPOLIA: @@ -59,6 +54,28 @@ export default class LoadingNetworkScreen extends PureComponent { } }; + renderDeprecatedRpcUrlWarning = () => { + const { showNetworkDropdown } = this.props; + + return ( +
+ 😞 + {this.context.t('currentRpcUrlDeprecated')} +
+ +
+
+ ); + }; + renderErrorScreenContent = () => { const { showNetworkDropdown, setProviderArgs, setProviderType } = this.props; @@ -123,7 +140,19 @@ export default class LoadingNetworkScreen extends PureComponent { }; render() { - const { rollbackToPreviousProvider } = this.props; + const { rollbackToPreviousProvider, showDeprecatedRpcUrlWarning } = + this.props; + + let loadingMessageToRender; + if (this.state.showErrorScreen) { + loadingMessageToRender = this.renderErrorScreenContent(); + } else if (showDeprecatedRpcUrlWarning) { + loadingMessageToRender = this.renderDeprecatedRpcUrlWarning(); + } else { + loadingMessageToRender = this.getConnectingLabel( + this.props.loadingMessage, + ); + } return ( } showLoadingSpinner={!this.state.showErrorScreen} - loadingMessage={ - this.state.showErrorScreen - ? this.renderErrorScreenContent() - : this.getConnectingLabel(this.props.loadingMessage) - } + loadingMessage={loadingMessageToRender} /> ); } diff --git a/ui/components/app/loading-network-screen/loading-network-screen.container.js b/ui/components/app/loading-network-screen/loading-network-screen.container.js index e243c011e..657ff3265 100644 --- a/ui/components/app/loading-network-screen/loading-network-screen.container.js +++ b/ui/components/app/loading-network-screen/loading-network-screen.container.js @@ -4,6 +4,8 @@ import * as actions from '../../../store/actions'; import { getNetworkIdentifier, isNetworkLoading } from '../../../selectors'; import LoadingNetworkScreen from './loading-network-screen.component'; +const DEPRECATED_TEST_NET_CHAINIDS = ['0x3', '0x2a', '0x4']; + const mapStateToProps = (state) => { const { loadingMessage } = state.appState; const { provider } = state.metamask; @@ -14,12 +16,19 @@ const mapStateToProps = (state) => { ? [rpcUrl, chainId, ticker, nickname] : [provider.type]; + const providerChainId = provider?.chainId; + const isDeprecatedNetwork = + DEPRECATED_TEST_NET_CHAINIDS.includes(providerChainId); + const isInfuraRpcUrl = provider?.rpcUrl?.match('infura'); + const showDeprecatedRpcUrlWarning = isDeprecatedNetwork && isInfuraRpcUrl; + return { isNetworkLoading: isNetworkLoading(state), loadingMessage, setProviderArgs, provider, providerId: getNetworkIdentifier(state), + showDeprecatedRpcUrlWarning, }; }; diff --git a/ui/components/app/menu-bar/menu-bar.test.js b/ui/components/app/menu-bar/menu-bar.test.js index d3a5a39a1..55be5ca13 100644 --- a/ui/components/app/menu-bar/menu-bar.test.js +++ b/ui/components/app/menu-bar/menu-bar.test.js @@ -9,7 +9,7 @@ const initState = { activeTab: {}, metamask: { provider: { - chainId: CHAIN_IDS.ROPSTEN, + chainId: CHAIN_IDS.GOERLI, }, selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', identities: { diff --git a/ui/components/app/network-display/network-display.stories.js b/ui/components/app/network-display/network-display.stories.js index f8148168f..b596d3eb4 100644 --- a/ui/components/app/network-display/network-display.stories.js +++ b/ui/components/app/network-display/network-display.stories.js @@ -33,7 +33,7 @@ export default { }, }, args: { - targetNetwork: 'ropsten', + targetNetwork: 'goerli', }, }; diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log.util.test.js b/ui/components/app/transaction-activity-log/transaction-activity-log.util.test.js index a6fd624b2..f076b4038 100644 --- a/ui/components/app/transaction-activity-log/transaction-activity-log.util.test.js +++ b/ui/components/app/transaction-activity-log/transaction-activity-log.util.test.js @@ -1,5 +1,4 @@ import { GAS_LIMITS } from '../../../../shared/constants/gas'; -import { CHAIN_IDS, NETWORK_IDS } from '../../../../shared/constants/network'; import { TRANSACTION_STATUSES, TRANSACTION_TYPES, @@ -24,8 +23,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331058, time: 1543958845581, status: TRANSACTION_STATUSES.UNAPPROVED, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: true, txParams: { from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706', @@ -72,8 +71,8 @@ describe('TransactionActivityLog utils', () => { ], id: 6400627574331058, loadingDefaults: false, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.DROPPED, submittedTime: 1543958848135, time: 1543958845581, @@ -94,8 +93,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331060, time: 1543958857697, status: TRANSACTION_STATUSES.UNAPPROVED, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: false, txParams: { from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706', @@ -165,8 +164,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331060, lastGasPrice: '0x4190ab00', loadingDefaults: false, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.CONFIRMED, submittedTime: 1543958860054, time: 1543958857697, @@ -188,8 +187,8 @@ describe('TransactionActivityLog utils', () => { const expected = [ { id: 6400627574331058, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3', eventKey: 'transactionCreated', timestamp: 1543958845581, @@ -197,8 +196,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331058, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3', eventKey: 'transactionSubmitted', timestamp: 1543958848147, @@ -206,8 +205,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331060, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33', eventKey: 'transactionResubmitted', timestamp: 1543958860061, @@ -215,8 +214,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331060, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33', eventKey: 'transactionConfirmed', timestamp: 1543958897165, @@ -253,8 +252,8 @@ describe('TransactionActivityLog utils', () => { { id: 5559712943815343, loadingDefaults: true, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, - chainId: CHAIN_IDS.ROPSTEN, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1535507561452, txParams: { @@ -394,8 +393,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2386f26fc10000', }, hash: '0xabc', - chainId: CHAIN_IDS.ROPSTEN, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + chainId: '0x5', + metamaskNetworkId: '5', }; const expectedResult = [ @@ -405,8 +404,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2386f26fc10000', id: 1, hash: '0xabc', - chainId: CHAIN_IDS.ROPSTEN, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + chainId: '0x5', + metamaskNetworkId: '5', }, { eventKey: 'transactionSubmitted', @@ -414,8 +413,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2632e314a000', id: 1, hash: '0xabc', - chainId: CHAIN_IDS.ROPSTEN, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + chainId: '0x5', + metamaskNetworkId: '5', }, { eventKey: 'transactionConfirmed', @@ -423,8 +422,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2632e314a000', id: 1, hash: '0xabc', - chainId: CHAIN_IDS.ROPSTEN, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + chainId: '0x5', + metamaskNetworkId: '5', }, ]; diff --git a/ui/components/component-library/avatar-network/avatar-network.stories.js b/ui/components/component-library/avatar-network/avatar-network.stories.js index 4546ec597..cbb96e63f 100644 --- a/ui/components/component-library/avatar-network/avatar-network.stories.js +++ b/ui/components/component-library/avatar-network/avatar-network.stories.js @@ -89,20 +89,6 @@ ShowHalo.args = { export const ColorBackgroundColorAndBorderColor = (args) => ( - - ( networkName="G" color={COLORS.PRIMARY_INVERSE} // This will have to be added to the BaseAvatar component as a prop so we can change the color of the text and to the base avatar /> - ); ColorBackgroundColorAndBorderColor.args = { diff --git a/ui/components/component-library/avatar-token/avatar-token.stories.js b/ui/components/component-library/avatar-token/avatar-token.stories.js index 494d42ecc..5c097599c 100644 --- a/ui/components/component-library/avatar-token/avatar-token.stories.js +++ b/ui/components/component-library/avatar-token/avatar-token.stories.js @@ -89,20 +89,6 @@ ShowHalo.args = { export const ColorBackgroundColorAndBorderColor = (args) => ( - - ( tokenName="G" color={COLORS.PRIMARY_INVERSE} // TODO: This will have to be added to the BaseAvatar component as a prop so we can change the color of the text and to the base avatar /> - ); ColorBackgroundColorAndBorderColor.args = { diff --git a/ui/components/component-library/base-avatar/base-avatar.stories.js b/ui/components/component-library/base-avatar/base-avatar.stories.js index 166a3083b..defdb9fa9 100644 --- a/ui/components/component-library/base-avatar/base-avatar.stories.js +++ b/ui/components/component-library/base-avatar/base-avatar.stories.js @@ -134,21 +134,6 @@ export const Children = (args) => ( export const ColorBackgroundColorAndBorderColor = (args) => ( B - - K - - - R - ( > S - - R - ); diff --git a/ui/css/design-system/colors.scss b/ui/css/design-system/colors.scss index cf98a16e0..25a219b84 100644 --- a/ui/css/design-system/colors.scss +++ b/ui/css/design-system/colors.scss @@ -37,9 +37,6 @@ $color-map: ( 'info-inverse': --color-info-inverse, 'info-disabled': --color-info-disabled, 'mainnet': --mainnet, - 'ropsten': --ropsten, - 'kovan': --kovan, - 'rinkeby': --rinkeby, 'goerli': --goerli, 'sepolia': --sepolia, 'localhost': --localhost, diff --git a/ui/css/itcss/components/network.scss b/ui/css/itcss/components/network.scss index 4f65d50aa..c89f93d55 100644 --- a/ui/css/itcss/components/network.scss +++ b/ui/css/itcss/components/network.scss @@ -17,18 +17,6 @@ background-color: rgba(3, 135, 137, 0.7) !important; } - &.ropsten-test-network .menu-icon-circle div { - background-color: rgba(233, 21, 80, 0.7) !important; - } - - &.kovan-test-network .menu-icon-circle div { - background-color: rgba(105, 4, 150, 0.7) !important; - } - - &.rinkeby-test-network .menu-icon-circle div { - background-color: rgba(235, 179, 63, 0.7) !important; - } - &.goerli-test-network .menu-icon-circle div { background-color: rgba(48, 153, 242, 0.7) !important; } diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss index 3800fbf4a..30804fef7 100644 --- a/ui/css/utilities/colors.scss +++ b/ui/css/utilities/colors.scss @@ -2,9 +2,6 @@ // Accents // Everything below this line is part of the new color system --mainnet: #29b6af; - --ropsten: #ff4a8d; - --kovan: #9064ff; - --rinkeby: #f6c343; --goerli: #3099f2; --sepolia: #cfb5f0; --localhost: #bbc0c5; diff --git a/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js b/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js index f25c9f3ab..816c544eb 100644 --- a/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js +++ b/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js @@ -1,7 +1,6 @@ import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import sinon from 'sinon'; -import { CHAIN_IDS, NETWORK_IDS } from '../../../shared/constants/network'; import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction'; import ConfirmTransactionReducer, * as actions from './confirm-transaction.duck'; @@ -275,7 +274,7 @@ describe('Confirm Transaction Duck', () => { history: [], id: 2603411941761054, loadingDefaults: false, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + metamaskNetworkId: '5', origin: 'faucet.metamask.io', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1530838113716, @@ -341,16 +340,16 @@ describe('Confirm Transaction Duck', () => { metamask: { conversionRate: 468.58, currentCurrency: 'usd', - network: NETWORK_IDS.ROPSTEN, + network: '5', provider: { - chainId: CHAIN_IDS.ROPSTEN, + chainId: '0x5', }, unapprovedTxs: { 2603411941761054: { history: [], id: 2603411941761054, loadingDefaults: false, - metamaskNetworkId: NETWORK_IDS.ROPSTEN, + metamaskNetworkId: '5', origin: 'faucet.metamask.io', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1530838113716, diff --git a/ui/ducks/metamask/metamask.test.js b/ui/ducks/metamask/metamask.test.js index b14c4ed5c..cdd22052b 100644 --- a/ui/ducks/metamask/metamask.test.js +++ b/ui/ducks/metamask/metamask.test.js @@ -40,10 +40,10 @@ describe('MetaMask Reducers', () => { currentBlockGasLimit: '0x4c1878', conversionRate: 1200.88200327, nativeCurrency: 'ETH', - network: '3', + network: '5', provider: { type: 'testnet', - chainId: '0x3', + chainId: '0x5', }, accounts: { '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': { @@ -72,11 +72,11 @@ describe('MetaMask Reducers', () => { }, }, addressBook: { - '0x3': { + '0x5': { '0x06195827297c7a80a443b6894d3bdb8824b43896': { address: '0x06195827297c7a80a443b6894d3bdb8824b43896', name: 'Address Book Account 1', - chainId: '0x3', + chainId: '0x5', }, }, }, @@ -86,13 +86,13 @@ describe('MetaMask Reducers', () => { time: 1487363153561, status: TRANSACTION_STATUSES.UNAPPROVED, gasMultiplier: 1, - metamaskNetworkId: '3', + metamaskNetworkId: '5', txParams: { from: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb', to: '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761', value: '0xde0b6b3a7640000', metamaskId: 4768706228115573, - metamaskNetworkId: '3', + metamaskNetworkId: '5', gas: '0x5209', }, txFee: '17e0186e60800', @@ -353,7 +353,7 @@ describe('MetaMask Reducers', () => { { address: '0x06195827297c7a80a443b6894d3bdb8824b43896', name: 'Address Book Account 1', - chainId: '0x3', + chainId: '0x5', }, ]); }); @@ -366,13 +366,13 @@ describe('MetaMask Reducers', () => { time: 1487363153561, status: TRANSACTION_STATUSES.UNAPPROVED, gasMultiplier: 1, - metamaskNetworkId: '3', + metamaskNetworkId: '5', txParams: { from: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb', to: '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761', value: '0xde0b6b3a7640000', metamaskId: 4768706228115573, - metamaskNetworkId: '3', + metamaskNetworkId: '5', gas: '0x5209', }, txFee: '17e0186e60800', diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js index 20e11f509..1610c022d 100644 --- a/ui/ducks/send/send.test.js +++ b/ui/ducks/send/send.test.js @@ -723,7 +723,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [], useTokenDetection: true, tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'], @@ -747,7 +747,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [], useTokenDetection: true, tokenAddressList: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'], @@ -772,7 +772,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [{ address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc' }], useTokenDetection: true, tokenAddressList: [], @@ -797,7 +797,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [{ address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }], useTokenDetection: true, tokenAddressList: ['0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'], @@ -1287,12 +1287,12 @@ describe('Send Slice', () => { }, }, cachedBalances: { - 0x4: { + 0x5: { '0xAddress': '0x0', }, }, provider: { - chainId: '0x4', + chainId: '0x5', }, useTokenDetection: true, tokenList: { @@ -1574,10 +1574,10 @@ describe('Send Slice', () => { blockGasLimit: '', selectedAddress: '', provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, cachedBalances: { - [CHAIN_IDS.RINKEBY]: { + [CHAIN_IDS.GOERLI]: { '0xAddress': '0x0', }, }, @@ -2166,7 +2166,7 @@ describe('Send Slice', () => { }, metamask: { provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, }, }; @@ -2215,7 +2215,7 @@ describe('Send Slice', () => { }, metamask: { provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, }, }; @@ -2373,11 +2373,11 @@ describe('Send Slice', () => { gasEstimateType: GAS_ESTIMATE_TYPES.NONE, gasFeeEstimates: {}, provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, tokens: [], addressBook: { - [CHAIN_IDS.RINKEBY]: {}, + [CHAIN_IDS.GOERLI]: {}, }, identities: {}, accounts: { @@ -2387,7 +2387,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [CHAIN_IDS.RINKEBY]: { + [CHAIN_IDS.GOERLI]: { '0xAddress': '0x0', }, }, @@ -2508,11 +2508,11 @@ describe('Send Slice', () => { blockGasLimit: '0x3a98', selectedAddress: '', provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, tokens: [], addressBook: { - [CHAIN_IDS.RINKEBY]: {}, + [CHAIN_IDS.GOERLI]: {}, }, identities: {}, accounts: { @@ -2522,7 +2522,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [CHAIN_IDS.RINKEBY]: { + [CHAIN_IDS.GOERLI]: { '0xAddress': '0x0', }, }, @@ -2682,7 +2682,7 @@ describe('Send Slice', () => { blockGasLimit: '0x3a98', selectedAddress: '', provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, tokens: [ { @@ -2697,7 +2697,7 @@ describe('Send Slice', () => { }, }, addressBook: { - [CHAIN_IDS.RINKEBY]: {}, + [CHAIN_IDS.GOERLI]: {}, }, identities: {}, accounts: { @@ -2707,7 +2707,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [CHAIN_IDS.RINKEBY]: { + [CHAIN_IDS.GOERLI]: { '0xAddress': '0x0', }, }, diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js index 3a664bf54..1ea44d678 100644 --- a/ui/helpers/constants/design-system.js +++ b/ui/helpers/constants/design-system.js @@ -46,9 +46,6 @@ export const COLORS = { INFO_INVERSE: 'info-inverse', INFO_DISABLED: 'info-disabled', MAINNET: 'mainnet', - ROPSTEN: 'ropsten', - KOVAN: 'kovan', - RINKEBY: 'rinkeby', GOERLI: 'goerli', SEPOLIA: 'sepolia', LOCALHOST: 'localhost', @@ -75,9 +72,6 @@ export const BACKGROUND_COLORS = pick(COLORS, [ 'INFO_ALTERNATIVE', 'INFO_MUTED', 'MAINNET', - 'ROPSTEN', - 'KOVAN', - 'RINKEBY', 'GOERLI', 'SEPOLIA', 'TRANSPARENT', @@ -103,9 +97,6 @@ export const BORDER_COLORS = pick(COLORS, [ 'INFO_ALTERNATIVE', 'INFO_MUTED', 'MAINNET', - 'ROPSTEN', - 'KOVAN', - 'RINKEBY', 'GOERLI', 'SEPOLIA', 'TRANSPARENT', diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js index a2bb8cf7d..38f63b85e 100644 --- a/ui/helpers/constants/settings.js +++ b/ui/helpers/constants/settings.js @@ -211,20 +211,6 @@ export const SETTINGS_CONSTANTS = [ route: `${NETWORKS_ROUTE}#networks-mainnet`, icon: 'fa fa-plug', }, - { - tabMessage: (t) => t('networks'), - sectionMessage: (t) => t('ropsten'), - descriptionMessage: (t) => t('ropsten'), - route: `${NETWORKS_ROUTE}#networks-ropsten`, - icon: 'fa fa-plug', - }, - { - tabMessage: (t) => t('networks'), - sectionMessage: (t) => t('rinkeby'), - descriptionMessage: (t) => t('rinkeby'), - route: `${NETWORKS_ROUTE}#networks-rinkeby`, - icon: 'fa fa-plug', - }, { tabMessage: (t) => t('networks'), sectionMessage: (t) => t('goerli'), @@ -239,13 +225,6 @@ export const SETTINGS_CONSTANTS = [ route: `${NETWORKS_ROUTE}#networks-sepolia`, icon: 'fa fa-plug', }, - { - tabMessage: (t) => t('networks'), - sectionMessage: (t) => t('kovan'), - descriptionMessage: (t) => t('kovan'), - route: `${NETWORKS_ROUTE}#networks-kovan`, - icon: 'fa fa-plug', - }, { tabMessage: (t) => t('networks'), sectionMessage: (t) => t('localhost'), diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js index 43dea6c7d..39453afd8 100644 --- a/ui/helpers/utils/settings-search.test.js +++ b/ui/helpers/utils/settings-search.test.js @@ -99,16 +99,10 @@ const t = (key) => { return 'Networks'; case 'mainnet': return 'Ethereum Mainnet'; - case 'ropsten': - return 'Ropsten Test Network'; - case 'rinkeby': - return 'Rinkeby test network'; case 'goerli': return 'Goerli test network'; case 'sepolia': return 'Sepolia test network'; - case 'kovan': - return 'Kovan test network'; case 'localhost': return 'Localhost 8545'; case 'experimental': @@ -187,7 +181,7 @@ describe('Settings Search Utils', () => { }); it('should get good network section number', () => { - expect(getNumberOfSettingsInSection(t, t('networks'))).toStrictEqual(7); + expect(getNumberOfSettingsInSection(t, t('networks'))).toStrictEqual(4); }); it('should get good experimental section number', () => { diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js index 01bf3c965..924bc80d6 100644 --- a/ui/helpers/utils/util.js +++ b/ui/helpers/utils/util.js @@ -48,9 +48,6 @@ export function isDefaultMetaMaskChain(chainId) { if ( !chainId || chainId === CHAIN_IDS.MAINNET || - chainId === CHAIN_IDS.ROPSTEN || - chainId === CHAIN_IDS.RINKEBY || - chainId === CHAIN_IDS.KOVAN || chainId === CHAIN_IDS.GOERLI || chainId === CHAIN_IDS.SEPOLIA || chainId === CHAIN_IDS.LOCALHOST diff --git a/ui/hooks/useAddressDetails.test.js b/ui/hooks/useAddressDetails.test.js index 9f1343a14..b255c6c71 100644 --- a/ui/hooks/useAddressDetails.test.js +++ b/ui/hooks/useAddressDetails.test.js @@ -10,7 +10,7 @@ const renderUseAddressDetails = (toAddress, stateVariables = {}) => { metamask: { provider: { type: 'test', - chainId: '0x3', + chainId: '0x5', }, tokenList: {}, ...stateVariables, @@ -39,11 +39,11 @@ describe('useAddressDetails', () => { '0x06195827297c7A80a443b6894d3BDB8824b43896', { addressBook: { - '0x3': { + '0x5': { '0x06195827297c7A80a443b6894d3BDB8824b43896': { address: '0x06195827297c7A80a443b6894d3BDB8824b43896', name: 'Address Book Account 1', - chainId: '0x3', + chainId: '0x5', }, }, }, diff --git a/ui/hooks/useAssetDetails.test.js b/ui/hooks/useAssetDetails.test.js index d86ba2af7..31f6f6044 100644 --- a/ui/hooks/useAssetDetails.test.js +++ b/ui/hooks/useAssetDetails.test.js @@ -16,7 +16,7 @@ const renderUseAssetDetails = ({ metamask: { provider: { type: 'test', - chainId: '0x3', + chainId: '0x5', }, tokenList: {}, }, diff --git a/ui/hooks/useCurrencyDisplay.js b/ui/hooks/useCurrencyDisplay.js index f12cfdd08..da413de83 100644 --- a/ui/hooks/useCurrencyDisplay.js +++ b/ui/hooks/useCurrencyDisplay.js @@ -96,7 +96,7 @@ export function useCurrencyDisplay( let suffix; if (!opts.hideLabel) { - // if the currency we are displaying is the native currency of one of our preloaded test-nets (rinkeby, ropsten etc.) + // if the currency we are displaying is the native currency of one of our preloaded test-nets (goerli, sepolia etc.) // then we allow lowercase characters, otherwise we force to uppercase any suffix passed as a currency const currencyTickerSymbol = Object.values( TEST_NETWORK_TICKER_MAP, diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js index fdf68dcf9..f0170b641 100644 --- a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js +++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js @@ -151,15 +151,15 @@ describe('TransactionAlerts', () => { }, componentProps: { nativeCurrency: 'ETH', - networkName: 'Ropsten', + networkName: 'Goerli', showBuyModal: jest.fn(), - chainId: '0x1', + chainId: '0x5', type: TRANSACTION_TYPES.DEPLOY_CONTRACT, }, }); expect( getByText( - /You do not have enough ETH in your account to pay for transaction fees on Ropsten network./u, + /You do not have enough ETH in your account to pay for transaction fees on Goerli network./u, ), ).toBeInTheDocument(); }); diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index b412b0f8e..bae8d9055 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -465,12 +465,6 @@ export default class Routes extends Component { switch (providerType) { case NETWORK_TYPES.MAINNET: return t('connectingToMainnet'); - case NETWORK_TYPES.ROPSTEN: - return t('connectingToRopsten'); - case NETWORK_TYPES.KOVAN: - return t('connectingToKovan'); - case NETWORK_TYPES.RINKEBY: - return t('connectingToRinkeby'); case NETWORK_TYPES.GOERLI: return t('connectingToGoerli'); case NETWORK_TYPES.SEPOLIA: diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js index 2567604a8..96ac7aebe 100644 --- a/ui/pages/send/send.test.js +++ b/ui/pages/send/send.test.js @@ -81,17 +81,17 @@ const baseStore = { }, currentCurrency: 'USD', provider: { - chainId: CHAIN_IDS.RINKEBY, + chainId: CHAIN_IDS.GOERLI, }, nativeCurrency: 'ETH', featureFlags: { sendHexData: false, }, addressBook: { - [CHAIN_IDS.RINKEBY]: [], + [CHAIN_IDS.GOERLI]: [], }, cachedBalances: { - [CHAIN_IDS.RINKEBY]: {}, + [CHAIN_IDS.GOERLI]: {}, }, accounts: { '0x0': { balance: '0x0', address: '0x0' }, diff --git a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.test.js b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.test.js index ab569b183..ee5996dd9 100644 --- a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.test.js +++ b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.test.js @@ -93,7 +93,7 @@ describe('CustomContentSearch', () => { const networksSearchFuse = new Fuse(testData.networkList, { keys: ['label', 'labelKey'], }); - const fuseSearchResult = networksSearchFuse.search('ropsten'); + const fuseSearchResult = networksSearchFuse.search('goerli'); const wrapper = renderComponent({ componentProps: { onSearch, @@ -103,7 +103,7 @@ describe('CustomContentSearch', () => { }, }); const input = wrapper.getByTestId('search-networks'); - expect(fuseSearchResult).toHaveLength(1); + expect(fuseSearchResult).toHaveLength(2); fireEvent.change(input, { target: { error: '' } }); expect(input.error).toBe(''); }); diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js index 617222668..f4d4f3832 100644 --- a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js +++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js @@ -7,12 +7,12 @@ import NetworksListItem from '.'; const mockState = { metamask: { provider: { - chainId: '0x4', + chainId: '0x5', nickname: '', rpcPrefs: {}, - rpcUrl: 'https://rinkeby.infura.io/v3/undefined', + rpcUrl: 'https://goerli.infura.io/v3/undefined', ticker: 'ETH', - type: 'rinkeby', + type: 'goerli', }, }, }; @@ -46,6 +46,6 @@ describe('NetworksListItem Component', () => { it('should render a test network item correctly', () => { const { queryByText } = renderComponent(testNetProps); - expect(queryByText('Ropsten test network')).toBeInTheDocument(); + expect(queryByText('Goerli test network')).toBeInTheDocument(); }); }); diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.test.js b/ui/pages/settings/networks-tab/networks-list/networks-list.test.js index 332fe5826..c9633ba06 100644 --- a/ui/pages/settings/networks-tab/networks-list/networks-list.test.js +++ b/ui/pages/settings/networks-tab/networks-list/networks-list.test.js @@ -7,12 +7,12 @@ import NetworksList from '.'; const mockState = { metamask: { provider: { - chainId: '0x4', + chainId: '0x5', nickname: '', rpcPrefs: {}, - rpcUrl: 'https://rinkeby.infura.io/v3/undefined', + rpcUrl: 'https://goerli.infura.io/v3/undefined', ticker: 'ETH', - type: 'rinkeby', + type: 'goerli', }, }, }; @@ -41,10 +41,7 @@ describe('NetworksList Component', () => { const { queryByText } = renderComponent(props); expect(queryByText('Ethereum Mainnet')).toBeInTheDocument(); - expect(queryByText('Ropsten test network')).toBeInTheDocument(); - expect(queryByText('Rinkeby test network')).toBeInTheDocument(); expect(queryByText('Goerli test network')).toBeInTheDocument(); expect(queryByText('Sepolia test network')).toBeInTheDocument(); - expect(queryByText('Kovan test network')).toBeInTheDocument(); }); }); diff --git a/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js index cf65aff73..1277975a6 100644 --- a/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js +++ b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js @@ -52,11 +52,8 @@ describe('NetworksTabContent Component', () => { renderComponent(props); expect(queryByText('Ethereum Mainnet')).toBeInTheDocument(); - expect(queryByText('Ropsten test network')).toBeInTheDocument(); - expect(queryByText('Rinkeby test network')).toBeInTheDocument(); expect(queryByText('Goerli test network')).toBeInTheDocument(); expect(queryByText('Sepolia test network')).toBeInTheDocument(); - expect(queryByText('Kovan test network')).toBeInTheDocument(); expect(queryByText('Network name')).toBeInTheDocument(); expect(queryByText('New RPC URL')).toBeInTheDocument(); diff --git a/ui/pages/settings/networks-tab/networks-tab.constants.js b/ui/pages/settings/networks-tab/networks-tab.constants.js index b2faee18f..088d8a991 100644 --- a/ui/pages/settings/networks-tab/networks-tab.constants.js +++ b/ui/pages/settings/networks-tab/networks-tab.constants.js @@ -19,30 +19,6 @@ const defaultNetworksData = [ ticker: CURRENCY_SYMBOLS.ETH, blockExplorerUrl: 'https://etherscan.io', }, - { - labelKey: NETWORK_TYPES.ROPSTEN, - iconColor: '#FF4A8D', - providerType: NETWORK_TYPES.ROPSTEN, - rpcUrl: getRpcUrl({ - network: NETWORK_TYPES.ROPSTEN, - excludeProjectId: true, - }), - chainId: CHAIN_IDS.ROPSTEN, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.ROPSTEN], - blockExplorerUrl: 'https://ropsten.etherscan.io', - }, - { - labelKey: NETWORK_TYPES.RINKEBY, - iconColor: '#F6C343', - providerType: NETWORK_TYPES.RINKEBY, - rpcUrl: getRpcUrl({ - network: NETWORK_TYPES.RINKEBY, - excludeProjectId: true, - }), - chainId: CHAIN_IDS.RINKEBY, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.RINKEBY], - blockExplorerUrl: 'https://rinkeby.etherscan.io', - }, { labelKey: NETWORK_TYPES.GOERLI, iconColor: '#3099f2', @@ -67,18 +43,6 @@ const defaultNetworksData = [ ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA], blockExplorerUrl: 'https://sepolia.etherscan.io', }, - { - labelKey: NETWORK_TYPES.KOVAN, - iconColor: '#9064FF', - providerType: NETWORK_TYPES.KOVAN, - rpcUrl: getRpcUrl({ - network: NETWORK_TYPES.KOVAN, - excludeProjectId: true, - }), - chainId: CHAIN_IDS.KOVAN, - ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.KOVAN], - blockExplorerUrl: 'https://kovan.etherscan.io', - }, ]; export { defaultNetworksData }; diff --git a/ui/pages/settings/networks-tab/networks-tab.test.js b/ui/pages/settings/networks-tab/networks-tab.test.js index 2a97fe416..038e6ded2 100644 --- a/ui/pages/settings/networks-tab/networks-tab.test.js +++ b/ui/pages/settings/networks-tab/networks-tab.test.js @@ -32,11 +32,8 @@ describe('NetworksTab Component', () => { }); expect(queryByText('Ethereum Mainnet')).toBeInTheDocument(); - expect(queryByText('Ropsten test network')).toBeInTheDocument(); - expect(queryByText('Rinkeby test network')).toBeInTheDocument(); expect(queryByText('Goerli test network')).toBeInTheDocument(); expect(queryByText('Sepolia test network')).toBeInTheDocument(); - expect(queryByText('Kovan test network')).toBeInTheDocument(); expect(queryByText('Add network')).toBeInTheDocument(); }); it('should render add network form correctly', () => { diff --git a/ui/pages/swaps/swaps.util.js b/ui/pages/swaps/swaps.util.js index 49abc6ee4..4ed47e989 100644 --- a/ui/pages/swaps/swaps.util.js +++ b/ui/pages/swaps/swaps.util.js @@ -625,7 +625,7 @@ export const getNetworkNameByChainId = (chainId) => { */ export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => { const networkName = getNetworkNameByChainId(chainId); - // Use old APIs for testnet and Rinkeby. + // Use old APIs for testnet and Goerli. if ([CHAIN_IDS.LOCALHOST, CHAIN_IDS.GOERLI].includes(chainId)) { return { swapsFeatureIsLive: true, diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js index 597aebe40..1b6b94aa5 100644 --- a/ui/pages/swaps/swaps.util.test.js +++ b/ui/pages/swaps/swaps.util.test.js @@ -317,10 +317,6 @@ describe('Swaps Util', () => { it('returns "avalanche" for Avalanche chain ID', () => { expect(getNetworkNameByChainId(CHAIN_IDS.AVALANCHE)).toBe(AVALANCHE); }); - - it('returns an empty string for an unsupported network', () => { - expect(getNetworkNameByChainId(CHAIN_IDS.KOVAN)).toBe(''); - }); }); describe('getSwapsLivenessForNetwork', () => { @@ -355,7 +351,7 @@ describe('Swaps Util', () => { expect( getSwapsLivenessForNetwork( MOCKS.createFeatureFlagsResponse(), - CHAIN_IDS.KOVAN, + CHAIN_IDS.SEPOLIA, ), ).toMatchObject(expectedSwapsLiveness); }); diff --git a/ui/selectors/confirm-transaction.test.js b/ui/selectors/confirm-transaction.test.js index 5e8da334a..3799428b7 100644 --- a/ui/selectors/confirm-transaction.test.js +++ b/ui/selectors/confirm-transaction.test.js @@ -1,4 +1,4 @@ -import { CHAIN_IDS, NETWORK_IDS } from '../../shared/constants/network'; +import { CHAIN_IDS } from '../../shared/constants/network'; import { TRANSACTION_TYPES } from '../../shared/constants/transaction'; import { unconfirmedTransactionsCountSelector, @@ -22,7 +22,7 @@ describe('Confirm Transaction Selector', () => { metamask: { unapprovedTxs: { 1: { - metamaskNetworkId: NETWORK_IDS.KOVAN, + metamaskNetworkId: '5', }, 2: { chainId: CHAIN_IDS.MAINNET, @@ -31,9 +31,9 @@ describe('Confirm Transaction Selector', () => { unapprovedMsgCount: 1, unapprovedPersonalMsgCount: 1, unapprovedTypedMessagesCount: 1, - network: NETWORK_IDS.KOVAN, + network: '5', provider: { - chainId: CHAIN_IDS.KOVAN, + chainId: '0x5', }, }, }; diff --git a/ui/selectors/permissions.test.js b/ui/selectors/permissions.test.js index d8ecaf9ce..13fa9bd55 100644 --- a/ui/selectors/permissions.test.js +++ b/ui/selectors/permissions.test.js @@ -150,7 +150,7 @@ describe('selectors', () => { }, metamask: { provider: { - chainId: CHAIN_IDS.KOVAN, + chainId: CHAIN_IDS.GOERLI, }, accounts: { '0x7250739de134d33ec7ab1ee592711e15098c9d2d': { diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js index c785b4122..f6f3ebcc0 100644 --- a/ui/selectors/selectors.test.js +++ b/ui/selectors/selectors.test.js @@ -125,7 +125,7 @@ describe('Selectors', () => { expect(selectors.getAddressBook(mockState)).toStrictEqual([ { address: '0xc42edfcc21ed14dda456aa0756c153f7985d8813', - chainId: '0x4', + chainId: '0x5', isEns: false, memo: '', name: 'Address Book Account 1', diff --git a/ui/selectors/transactions.test.js b/ui/selectors/transactions.test.js index f77dd17b4..2977fde09 100644 --- a/ui/selectors/transactions.test.js +++ b/ui/selectors/transactions.test.js @@ -30,7 +30,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: CHAIN_IDS.KOVAN, + chainId: '0x5', }, }, }; @@ -60,7 +60,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: CHAIN_IDS.KOVAN, + chainId: '0x5', }, }, }; @@ -91,7 +91,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: CHAIN_IDS.KOVAN, + chainId: '0x5', }, }, }; diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js index 93403fa32..62c761588 100644 --- a/ui/store/actions.test.js +++ b/ui/store/actions.test.js @@ -37,7 +37,7 @@ const baseMockState = defaultState.metamask; describe('Actions', () => { let background; - const currentNetworkId = '42'; + const currentNetworkId = '5'; beforeEach(async () => { background = sinon.createStubInstance(MetaMaskController, {