From 0eded43d4a99273c43cb2be1c43211227b12992c Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 20 Sep 2022 14:46:25 +0200 Subject: [PATCH 01/17] [FLASK] Fix an issue with installing and updating snaps with 0 permissions (#15796) * Fix an issue with installing snaps with 0 permissions * Fix some issues * Fix lint * Fix code fencing * UI improvements for no permission use-case * Fix redirect * Delay BIP44 test slightly * Add more delay * Fix update UI --- app/_locales/en/messages.json | 3 + .../@metamask+snap-controllers+0.20.0.patch | 62 +++++++++++++++++++ test/e2e/snaps/test-snap-bip-44.spec.js | 1 + test/e2e/snaps/test-snap-confirm.spec.js | 1 + test/e2e/snaps/test-snap-error.spec.js | 1 + test/e2e/snaps/test-snap-managestate.spec.js | 1 + test/e2e/snaps/test-snap-notification.spec.js | 1 + ui/pages/home/home.container.js | 4 +- .../flask/snap-install/snap-install.js | 35 ++++++----- .../flask/snap-update/snap-update.js | 43 ++++++++----- .../permissions-connect.component.js | 35 ++++++++--- .../permissions-connect.container.js | 14 ++++- ui/selectors/permissions.js | 11 ++-- 13 files changed, 165 insertions(+), 47 deletions(-) create mode 100644 patches/@metamask+snap-controllers+0.20.0.patch diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index f69cebb57f1c..e8852f869cab 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1695,6 +1695,9 @@ "initialTransactionConfirmed": { "message": "Your initial transaction was confirmed by the network. Click OK to go back." }, + "install": { + "message": "Install" + }, "insufficientBalance": { "message": "Insufficient balance." }, diff --git a/patches/@metamask+snap-controllers+0.20.0.patch b/patches/@metamask+snap-controllers+0.20.0.patch new file mode 100644 index 000000000000..6e1df558ce0c --- /dev/null +++ b/patches/@metamask+snap-controllers+0.20.0.patch @@ -0,0 +1,62 @@ +diff --git a/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js b/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js +index ad84417..158e8e6 100644 +--- a/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js ++++ b/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js +@@ -30,6 +30,7 @@ const RequestQueue_1 = require("./RequestQueue"); + const utils_3 = require("./utils"); + const Timer_1 = require("./Timer"); + exports.controllerName = 'SnapController'; ++exports.SNAP_APPROVAL_INSTALL = 'wallet_installSnap'; + exports.SNAP_APPROVAL_UPDATE = 'wallet_updateSnap'; + const TRUNCATED_SNAP_PROPERTIES = new Set([ + 'initialPermissions', +@@ -738,7 +739,7 @@ class SnapController extends controllers_1.BaseControllerV2 { + id: snapId, + versionRange, + }); +- await this.authorize(snapId); ++ await this.authorize(origin, snapId); + await this._startSnap({ + snapId, + sourceCode, +@@ -1073,18 +1074,34 @@ class SnapController extends controllers_1.BaseControllerV2 { + * @param snapId - The id of the Snap. + * @returns The snap's approvedPermissions. + */ +- async authorize(snapId) { ++ async authorize(origin, snapId) { + console.info(`Authorizing snap: ${snapId}`); + const snapsState = this.state.snaps; + const snap = snapsState[snapId]; + const { initialPermissions } = snap; + try { +- if ((0, utils_1.isNonEmptyArray)(Object.keys(initialPermissions))) { +- const processedPermissions = this.processSnapPermissions(initialPermissions); +- const [approvedPermissions] = await this.messagingSystem.call('PermissionController:requestPermissions', { origin: snapId }, processedPermissions); +- return Object.values(approvedPermissions).map((perm) => perm.parentCapability); ++ const processedPermissions = this.processSnapPermissions(initialPermissions); ++ const id = (0, nanoid_1.nanoid)(); ++ const isApproved = await this.messagingSystem.call('ApprovalController:addRequest', { ++ origin, ++ id, ++ type: exports.SNAP_APPROVAL_INSTALL, ++ requestData: { ++ // Mirror previous installation metadata ++ metadata: { id, origin: snapId, dappOrigin: origin }, ++ permissions: processedPermissions, ++ snapId, ++ }, ++ }, true); ++ if (!isApproved) { ++ throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest(); ++ } ++ if ((0, utils_1.isNonEmptyArray)(Object.keys(processedPermissions))) { ++ await this.messagingSystem.call('PermissionController:grantPermissions', { ++ approvedPermissions: processedPermissions, ++ subject: { origin: snapId }, ++ }); + } +- return []; + } + finally { + const runtime = this.getRuntimeExpect(snapId); diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js index 5795fa777710..1db055b3a979 100644 --- a/test/e2e/snaps/test-snap-bip-44.spec.js +++ b/test/e2e/snaps/test-snap-bip-44.spec.js @@ -79,6 +79,7 @@ describe('Test Snap bip-44', function () { await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + await driver.delay(1000); await driver.clickElement('#sendBip44'); // check the results of the public key test diff --git a/test/e2e/snaps/test-snap-confirm.spec.js b/test/e2e/snaps/test-snap-confirm.spec.js index f4dcfa99d8e3..c6a35657a403 100644 --- a/test/e2e/snaps/test-snap-confirm.spec.js +++ b/test/e2e/snaps/test-snap-confirm.spec.js @@ -64,6 +64,7 @@ describe('Test Snap Confirm', function () { await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + await driver.delay(1000); await driver.clickElement('#sendConfirmButton'); // hit 'approve' on the custom confirm diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js index bb4fc251a8ec..177184727617 100644 --- a/test/e2e/snaps/test-snap-error.spec.js +++ b/test/e2e/snaps/test-snap-error.spec.js @@ -64,6 +64,7 @@ describe('Test Snap Error', function () { await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + await driver.delay(1000); await driver.clickElement('#sendError'); await driver.navigate(PAGES.HOME); diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js index 03e481e89999..06fddda59528 100644 --- a/test/e2e/snaps/test-snap-managestate.spec.js +++ b/test/e2e/snaps/test-snap-managestate.spec.js @@ -73,6 +73,7 @@ describe('Test Snap manageState', function () { windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.fill('#dataManageState', '23'); + await driver.delay(1000); await driver.clickElement('#sendManageState'); // check the results of the public key test diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js index 0a303bc9cdeb..25f7cbe3435d 100644 --- a/test/e2e/snaps/test-snap-notification.spec.js +++ b/test/e2e/snaps/test-snap-notification.spec.js @@ -72,6 +72,7 @@ describe('Test Snap Notification', function () { await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + await driver.delay(1000); await driver.clickElement('#sendInAppNotification'); // try to go to the MM pages diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js index cfca56bad4ef..1417ec97ac15 100644 --- a/ui/pages/home/home.container.js +++ b/ui/pages/home/home.container.js @@ -5,7 +5,7 @@ import { activeTabHasPermissions, getFirstPermissionRequest, ///: BEGIN:ONLY_INCLUDE_IN(flask) - getFirstSnapUpdateRequest, + getFirstSnapInstallOrUpdateRequest, ///: END:ONLY_INCLUDE_IN getIsMainnet, getOriginOfCurrentTab, @@ -98,7 +98,7 @@ const mapStateToProps = (state) => { ///: BEGIN:ONLY_INCLUDE_IN(flask) if (!firstPermissionsRequest) { - firstPermissionsRequest = getFirstSnapUpdateRequest(state); + firstPermissionsRequest = getFirstSnapInstallOrUpdateRequest(state); firstPermissionsRequestId = firstPermissionsRequest?.metadata.id || null; } ///: END:ONLY_INCLUDE_IN diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js index 231e45a3909d..2a12340d8ade 100644 --- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js +++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js @@ -35,10 +35,13 @@ export default function SnapInstall({ ); const onSubmit = useCallback( - () => approveSnapInstall(request), + () => approveSnapInstall(request.metadata.id), [request, approveSnapInstall], ); + const hasPermissions = + request?.permissions && Object.keys(request.permissions).length > 0; + const bip44LegacyEntropyPermissions = request.permissions && Object.keys(request.permissions).filter((v) => @@ -88,18 +91,22 @@ export default function SnapInstall({ snapVersion={targetSubjectMetadata.version} boxProps={{ alignItems: ALIGN_ITEMS.CENTER }} /> - - {t('snapRequestsPermission')} - - + {hasPermissions && ( + <> + + {t('snapRequestsPermission')} + + + + )} setIsShowingWarning(true) : onSubmit } - submitText={t('approveAndInstall')} + submitText={t(hasPermissions ? 'approveAndInstall' : 'install')} /> {isShowingWarning && ( diff --git a/ui/pages/permissions-connect/flask/snap-update/snap-update.js b/ui/pages/permissions-connect/flask/snap-update/snap-update.js index d3f7d52fb1ff..5127646d518c 100644 --- a/ui/pages/permissions-connect/flask/snap-update/snap-update.js +++ b/ui/pages/permissions-connect/flask/snap-update/snap-update.js @@ -33,7 +33,7 @@ export default function SnapUpdate({ ); const onSubmit = useCallback( - () => approveSnapUpdate(request), + () => approveSnapUpdate(request.metadata.id), [request, approveSnapUpdate], ); @@ -48,6 +48,15 @@ export default function SnapUpdate({ [request.permissions], ); + const approvedPermissions = request.approvedPermissions ?? {}; + const revokedPermissions = request.unusedPermissions ?? {}; + const newPermissions = request.newPermissions ?? {}; + const hasPermissions = + Object.keys(approvedPermissions).length + + Object.keys(revokedPermissions).length + + Object.keys(newPermissions).length > + 0; + return ( {t('snapUpdateExplanation', [`${request.metadata.dappOrigin}`])} - - {t('snapRequestsPermission')} - - + {hasPermissions && ( + <> + + {t('snapRequestsPermission')} + + + + )} ( { - approvePermissionsRequest(...args); + approveSnapInstall={(requestId) => { + approvePendingApproval(requestId, true); this.redirect(true); }} - rejectSnapInstall={(requestId) => - this.cancelPermissionsRequest(requestId) - } + rejectSnapInstall={(requestId) => { + rejectPendingApproval( + requestId, + serializeError(ethErrors.provider.userRejectedRequest()), + ); + this.redirect(false); + }} targetSubjectMetadata={targetSubjectMetadata} /> )} @@ -328,13 +339,17 @@ export default class PermissionConnect extends Component { render={() => ( { - approvePermissionsRequest(...args); + approveSnapUpdate={(requestId) => { + approvePendingApproval(requestId, true); this.redirect(true); }} - rejectSnapUpdate={(requestId) => - this.cancelPermissionsRequest(requestId) - } + rejectSnapUpdate={(requestId) => { + rejectPendingApproval( + requestId, + serializeError(ethErrors.provider.userRejectedRequest()), + ); + this.redirect(false); + }} targetSubjectMetadata={targetSubjectMetadata} /> )} diff --git a/ui/pages/permissions-connect/permissions-connect.container.js b/ui/pages/permissions-connect/permissions-connect.container.js index c30a440d9ef3..d99ed279c232 100644 --- a/ui/pages/permissions-connect/permissions-connect.container.js +++ b/ui/pages/permissions-connect/permissions-connect.container.js @@ -6,7 +6,7 @@ import { getPermissionsRequests, getSelectedAddress, ///: BEGIN:ONLY_INCLUDE_IN(flask) - getSnapUpdateRequests, + getSnapInstallOrUpdateRequests, ///: END:ONLY_INCLUDE_IN getTargetSubjectMetadata, } from '../../selectors'; @@ -19,6 +19,10 @@ import { showModal, getCurrentWindowTab, getRequestAccountTabIds, + ///: BEGIN:ONLY_INCLUDE_IN(flask) + resolvePendingApproval, + rejectPendingApproval, + ///: END:ONLY_INCLUDE_IN } from '../../store/actions'; import { CONNECT_ROUTE, @@ -42,7 +46,7 @@ const mapStateToProps = (state, ownProps) => { ///: BEGIN:ONLY_INCLUDE_IN(flask) permissionsRequests = [ ...permissionsRequests, - ...getSnapUpdateRequests(state), + ...getSnapInstallOrUpdateRequests(state), ]; ///: END:ONLY_INCLUDE_IN const currentAddress = getSelectedAddress(state); @@ -139,6 +143,12 @@ const mapDispatchToProps = (dispatch) => { dispatch(approvePermissionsRequest(request)), rejectPermissionsRequest: (requestId) => dispatch(rejectPermissionsRequest(requestId)), + ///: BEGIN:ONLY_INCLUDE_IN(flask) + approvePendingApproval: (id, value) => + dispatch(resolvePendingApproval(id, value)), + rejectPendingApproval: (id, error) => + dispatch(rejectPendingApproval(id, error)), + ///: END:ONLY_INCLUDE_IN showNewAccountModal: ({ onCreateNewAccount, newAccountNumber }) => { return dispatch( showModal({ diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js index ea1fc5d6d880..272b18681ed4 100644 --- a/ui/selectors/permissions.js +++ b/ui/selectors/permissions.js @@ -281,14 +281,17 @@ export function getLastConnectedInfo(state) { } ///: BEGIN:ONLY_INCLUDE_IN(flask) -export function getSnapUpdateRequests(state) { +export function getSnapInstallOrUpdateRequests(state) { return Object.values(state.metamask.pendingApprovals) - .filter(({ type }) => type === 'wallet_updateSnap') + .filter( + ({ type }) => + type === 'wallet_installSnap' || type === 'wallet_updateSnap', + ) .map(({ requestData }) => requestData); } -export function getFirstSnapUpdateRequest(state) { - const requests = getSnapUpdateRequests(state); +export function getFirstSnapInstallOrUpdateRequest(state) { + const requests = getSnapInstallOrUpdateRequests(state); return requests && requests[0] ? requests[0] : null; } ///: END:ONLY_INCLUDE_IN From b16606156ffc7d21673d46e0eadf3a109bd4ab53 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 12 Sep 2022 18:36:40 +0200 Subject: [PATCH 02/17] [FLASK] Fix crash with certain permissions on the snap settings page (#15797) --- ui/pages/settings/flask/view-snap/view-snap.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js index 0fa9964c16c4..cff1a34cdc4d 100644 --- a/ui/pages/settings/flask/view-snap/view-snap.js +++ b/ui/pages/settings/flask/view-snap/view-snap.js @@ -24,7 +24,11 @@ import { removeSnap, removePermissionsFor, } from '../../../../store/actions'; -import { getSnaps, getSubjectsWithPermission } from '../../../../selectors'; +import { + getSnaps, + getSubjectsWithPermission, + getPermissions, +} from '../../../../selectors'; import { formatDate } from '../../../../helpers/utils/util'; function ViewSnap() { @@ -50,6 +54,7 @@ function ViewSnap() { const connectedSubjects = useSelector((state) => getSubjectsWithPermission(state, snap?.permissionName), ); + const permissions = useSelector((state) => getPermissions(state, snap?.id)); const dispatch = useDispatch(); const onDisconnect = (connectedOrigin, snapPermissionName) => { dispatch( @@ -137,9 +142,7 @@ function ViewSnap() { {t('snapAccess', [snap.manifest.proposedName])} - +
From 82263222444978a18a1d23a92134eda813903845 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 13 Sep 2022 12:41:29 +0200 Subject: [PATCH 03/17] [FLASK] Fix crash when uninstalling snap (#15799) * Fix crash when uninstalling snap * Run lint --- ui/pages/settings/flask/view-snap/view-snap.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js index cff1a34cdc4d..e5c9e51f9249 100644 --- a/ui/pages/settings/flask/view-snap/view-snap.js +++ b/ui/pages/settings/flask/view-snap/view-snap.js @@ -54,7 +54,9 @@ function ViewSnap() { const connectedSubjects = useSelector((state) => getSubjectsWithPermission(state, snap?.permissionName), ); - const permissions = useSelector((state) => getPermissions(state, snap?.id)); + const permissions = useSelector( + (state) => snap && getPermissions(state, snap.id), + ); const dispatch = useDispatch(); const onDisconnect = (connectedOrigin, snapPermissionName) => { dispatch( @@ -142,7 +144,9 @@ function ViewSnap() { {t('snapAccess', [snap.manifest.proposedName])} - +
From eed06dae1fff5d38857e219a596cab4266a1d406 Mon Sep 17 00:00:00 2001 From: seaona Date: Wed, 28 Sep 2022 11:16:20 +0200 Subject: [PATCH 04/17] RC cut with Snaps fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65868d4cfe4a..d98a2ba9bdbb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.19.0", + "version": "10.20.0", "private": true, "repository": { "type": "git", From 5a42dfd76db2435903c13e339a512ed8f1985084 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Wed, 28 Sep 2022 09:08:22 -0230 Subject: [PATCH 05/17] Simplfy _buildEventFragmentProperties so that necessary objects and data are defined when it is called during onBootCleanup (#16001) --- app/scripts/controllers/transactions/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 8e7a2d62f9d6..a95c4d6d8772 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -2070,7 +2070,6 @@ export default class TransactionController extends EventEmitter { async _buildEventFragmentProperties(txMeta, extraParams) { const { - id, type, time, status, @@ -2088,8 +2087,14 @@ export default class TransactionController extends EventEmitter { originalType, replacedById, metamaskNetworkId: network, + customTokenAmount, + dappProposedTokenAmount, + currentTokenBalance, + originalApprovalAmount, + finalApprovalAmount, + contractMethodName, } = txMeta; - const { transactions } = this.store.getState(); + const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp'; const { assetType, tokenStandard } = await determineTransactionAssetType( @@ -2181,11 +2186,6 @@ export default class TransactionController extends EventEmitter { APPROVE: 'Approve', }; - const customTokenAmount = transactions[id]?.customTokenAmount; - const dappProposedTokenAmount = transactions[id]?.dappProposedTokenAmount; - const currentTokenBalance = transactions[id]?.currentTokenBalance; - const originalApprovalAmount = transactions[id]?.originalApprovalAmount; - const finalApprovalAmount = transactions[id]?.finalApprovalAmount; let transactionApprovalAmountType; let transactionContractMethod; let transactionApprovalAmountVsProposedRatio; @@ -2199,7 +2199,7 @@ export default class TransactionController extends EventEmitter { transactionType = TRANSACTION_TYPES.DEPLOY_CONTRACT; } else if (contractInteractionTypes) { transactionType = TRANSACTION_TYPES.CONTRACT_INTERACTION; - transactionContractMethod = transactions[id]?.contractMethodName; + transactionContractMethod = contractMethodName; if ( transactionContractMethod === contractMethodNames.APPROVE && tokenStandard === TOKEN_STANDARDS.ERC20 From d7a812f42fddc39d4673a9fe18307e46ac3d2899 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Thu, 29 Sep 2022 10:39:35 -0600 Subject: [PATCH 06/17] Add remaining tests for createInfuraClient (#15717) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add tests for the `block-tracker-inspector` middleware — which makes sure that the block tracker never has a reference to the latest block which is less than a block number that shows up in an RPC method's response — and the Infura middleware — which takes care of sending the request to Infura, and will retry the request up to 5 times if Infura sends back a certain type of error. Note that the `retry-on-empty` middleware is not tested because it currently has a [bug][1] which is making it ineffective. [1]: https://github.com/MetaMask/eth-json-rpc-middleware/issues/139 --- .../network/createInfuraClient.test.js | 71 +- .../network/provider-api-tests/helpers.js | 114 ++- .../provider-api-tests/shared-tests.js | 865 +++++++++++++++++- jest.config.js | 2 +- lavamoat/browserify/beta/policy.json | 138 +-- lavamoat/browserify/flask/policy.json | 142 +-- lavamoat/browserify/main/policy.json | 138 +-- lavamoat/build-system/policy-override.json | 3 +- lavamoat/build-system/policy.json | 97 +- package.json | 2 +- patches/eth-query+2.1.2.patch | 5 +- test/helpers/setup-helper.js | 6 + test/jest/setup.js | 7 + ui/pages/swaps/swaps.util.test.js | 8 +- yarn.lock | 61 +- 15 files changed, 1274 insertions(+), 385 deletions(-) diff --git a/app/scripts/controllers/network/createInfuraClient.test.js b/app/scripts/controllers/network/createInfuraClient.test.js index 4e5fb32b6cb8..404489ece544 100644 --- a/app/scripts/controllers/network/createInfuraClient.test.js +++ b/app/scripts/controllers/network/createInfuraClient.test.js @@ -2,7 +2,10 @@ * @jest-environment node */ -import { withInfuraClient } from './provider-api-tests/helpers'; +import { + withMockedInfuraCommunications, + withInfuraClient, +} from './provider-api-tests/helpers'; import { testsForRpcMethodNotHandledByMiddleware, testsForRpcMethodAssumingNoBlockParam, @@ -141,9 +144,36 @@ describe('createInfuraClient', () => { }); describe('eth_getTransactionByHash', () => { - testsForRpcMethodsThatCheckForBlockHashInResponse( - 'eth_getTransactionByHash', - ); + const method = 'eth_getTransactionByHash'; + + testsForRpcMethodsThatCheckForBlockHashInResponse(method); + + it("refreshes the block tracker's current block if it is less than the block number that comes back in the response", async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest + // block number is retrieved through the block tracker first. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // This is our request. + comms.mockInfuraRpcCall({ + request, + response: { + result: { + blockNumber: '0x200', + }, + }, + }); + // The block-tracker-inspector middleware will request the latest + // block through the block tracker again. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x300' }); + + await withInfuraClient(async ({ makeRpcCall, blockTracker }) => { + await makeRpcCall(request); + expect(blockTracker.getCurrentBlock()).toStrictEqual('0x300'); + }); + }); + }); }); describe('eth_getTransactionCount', () => { @@ -153,9 +183,36 @@ describe('createInfuraClient', () => { }); describe('eth_getTransactionReceipt', () => { - testsForRpcMethodsThatCheckForBlockHashInResponse( - 'eth_getTransactionReceipt', - ); + const method = 'eth_getTransactionReceipt'; + + testsForRpcMethodsThatCheckForBlockHashInResponse(method); + + it("refreshes the block tracker's current block if it is less than the block number that comes back in the response", async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest + // block number is retrieved through the block tracker first. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // This is our request. + comms.mockInfuraRpcCall({ + request, + response: { + result: { + blockNumber: '0x200', + }, + }, + }); + // The block-tracker-inspector middleware will request the latest + // block through the block tracker again. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x300' }); + + await withInfuraClient(async ({ makeRpcCall, blockTracker }) => { + await makeRpcCall(request); + expect(blockTracker.getCurrentBlock()).toStrictEqual('0x300'); + }); + }); + }); }); describe('eth_getUncleByBlockHashAndIndex', () => { diff --git a/app/scripts/controllers/network/provider-api-tests/helpers.js b/app/scripts/controllers/network/provider-api-tests/helpers.js index 9b4c22460777..d49cdb7c2072 100644 --- a/app/scripts/controllers/network/provider-api-tests/helpers.js +++ b/app/scripts/controllers/network/provider-api-tests/helpers.js @@ -38,37 +38,37 @@ import createInfuraClient from '../createInfuraClient'; */ /** - * @typedef {{ nockScope: NockScope, blockNumber: string }} MockNextBlockTrackerRequestOptions + * @typedef {{ nockScope: NockScope, blockNumber: string }} MockBlockTrackerRequestOptions * - * The options to `mockNextBlockTrackerRequest`. + * The options to `mockNextBlockTrackerRequest` and `mockAllBlockTrackerRequests`. */ /** - * @typedef {{ nockScope: NockScope, request: object, response: object, delay?: number }} MockSuccessfulInfuraRpcCallOptions + * @typedef {{ nockScope: NockScope, request: object, response: object, delay?: number }} MockInfuraRpcCallOptions * - * The options to `mockSuccessfulInfuraRpcCall`. + * The options to `mockInfuraRpcCall`. */ /** - * @typedef {{mockNextBlockTrackerRequest: (options: Omit) => void, mockSuccessfulInfuraRpcCall: (options: Omit) => NockScope}} InfuraCommunications + * @typedef {{mockNextBlockTrackerRequest: (options: Omit) => void, mockAllBlockTrackerRequests: (options: Omit) => void, mockInfuraRpcCall: (options: Omit) => NockScope}} InfuraCommunications * * Provides methods to mock different kinds of requests to Infura. */ /** - * @typedef {{network: string}} MockingInfuraCommunicationsOptions + * @typedef {{network: string}} WithMockedInfuraCommunicationsOptions * * The options bag that `mockingInfuraCommunications` takes. */ /** - * @typedef {(comms: InfuraCommunications) => Promise} MockingInfuraCommunicationsCallback + * @typedef {(comms: InfuraCommunications) => Promise} WithMockedInfuraCommunicationsCallback * * The callback that `mockingInfuraCommunications` takes. */ /** - * @typedef {[MockingInfuraCommunicationsOptions, MockingInfuraCommunicationsCallback] | [MockingInfuraCommunicationsCallback]} MockingInfuraCommunicationsArgs + * @typedef {[WithMockedInfuraCommunicationsOptions, WithMockedInfuraCommunicationsCallback] | [WithMockedInfuraCommunicationsCallback]} WithMockedInfuraCommunicationsArgs * * The arguments to `mockingInfuraCommunications`. */ @@ -111,7 +111,7 @@ function buildScopeForMockingInfuraRequests({ network = 'mainnet' } = {}) { /** * Mocks the next request for the latest block that the block tracker will make. * - * @param {MockNextBlockTrackerRequestOptions} args - The arguments. + * @param {MockBlockTrackerRequestOptions} args - The arguments. * @param {NockScope} args.nockScope - A nock scope (a set of mocked requests * scoped to a certain base URL). * @param {string} args.blockNumber - The block number that the block tracker @@ -121,35 +121,80 @@ async function mockNextBlockTrackerRequest({ nockScope, blockNumber = DEFAULT_LATEST_BLOCK_NUMBER, }) { - await mockSuccessfulInfuraRpcCall({ + await mockInfuraRpcCall({ nockScope, request: { method: 'eth_blockNumber', params: [] }, response: { result: blockNumber }, }); } +/** + * Mocks all requests for the latest block that the block tracker will make. + * + * @param {MockBlockTrackerRequestOptions} args - The arguments. + * @param {NockScope} args.nockScope - A nock scope (a set of mocked requests + * scoped to a certain base URL). + * @param {string} args.blockNumber - The block number that the block tracker + * should report, as a 0x-prefixed hex string. + */ +async function mockAllBlockTrackerRequests({ + nockScope, + blockNumber = DEFAULT_LATEST_BLOCK_NUMBER, +}) { + await mockInfuraRpcCall({ + nockScope, + request: { method: 'eth_blockNumber', params: [] }, + response: { result: blockNumber }, + }).persist(); +} + /** * Mocks a JSON-RPC request sent to Infura with the given response. * - * @param {MockSuccessfulInfuraRpcCallOptions} args - The arguments. + * @param {MockInfuraRpcCallOptions} args - The arguments. * @param {NockScope} args.nockScope - A nock scope (a set of mocked requests * scoped to a certain base URL). * @param {object} args.request - The request data. - * @param {object} args.response - The response that the request should have. - * @param {number} args.delay - The amount of time that should pass before the + * @param {{body: string} | {httpStatus?: number; id?: number; method?: string; params?: string[]}} [args.response] - Information + * concerning the response that the request should have. If a `body` property is + * present, this is taken as the complete response body. If an `httpStatus` + * property is present, then it is taken as the HTTP status code to respond + * with. Properties other than these two are used to build a complete response + * body (including `id` and `jsonrpc` properties). + * @param {Error | string} [args.error] - An error to throw while making the + * request. Takes precedence over `response`. + * @param {number} [args.delay] - The amount of time that should pass before the * request resolves with the response. + * @param {number} [args.times] - The number of times that the request is + * expected to be made. * @returns {NockScope} The nock scope. */ -function mockSuccessfulInfuraRpcCall({ nockScope, request, response, delay }) { - // eth-query always passes `params`, so even if we don't supply this property +function mockInfuraRpcCall({ + nockScope, + request, + response, + error, + delay, + times, +}) { + // eth-query always passes `params`, so even if we don't supply this property, // for consistency with makeRpcCall, assume that the `body` contains it const { method, params = [], ...rest } = request; - const completeResponse = { - id: 1, - jsonrpc: '2.0', - ...response, - }; - const nockRequest = nockScope.post(`/v3/${INFURA_PROJECT_ID}`, { + const httpStatus = response?.httpStatus ?? 200; + let completeResponse; + if (response !== undefined) { + if (response.body === undefined) { + completeResponse = { id: 1, jsonrpc: '2.0' }; + ['id', 'jsonrpc', 'result', 'error'].forEach((prop) => { + if (response[prop] !== undefined) { + completeResponse[prop] = response[prop]; + } + }); + } else { + completeResponse = response.body; + } + } + let nockRequest = nockScope.post(`/v3/${INFURA_PROJECT_ID}`, { jsonrpc: '2.0', method, params, @@ -157,10 +202,19 @@ function mockSuccessfulInfuraRpcCall({ nockScope, request, response, delay }) { }); if (delay !== undefined) { - nockRequest.delay(delay); + nockRequest = nockRequest.delay(delay); + } + + if (times !== undefined) { + nockRequest = nockRequest.times(times); } - return nockRequest.reply(200, completeResponse); + if (error !== undefined) { + return nockRequest.replyWithError(error); + } else if (completeResponse !== undefined) { + return nockRequest.reply(httpStatus, completeResponse); + } + return nockRequest; } /** @@ -189,7 +243,7 @@ function makeRpcCall(ethQuery, request) { /** * Sets up request mocks for requests to Infura. * - * @param {MockingInfuraCommunicationsArgs} args - Either an options bag + a + * @param {WithMockedInfuraCommunicationsArgs} args - Either an options bag + a * function, or just a function. The options bag, at the moment, may contain * `network` (that is, the Infura network; defaults to "mainnet"). The function * is called with an object that allows you to mock different kinds of requests. @@ -202,11 +256,14 @@ export async function withMockedInfuraCommunications(...args) { const nockScope = buildScopeForMockingInfuraRequests({ network }); const curriedMockNextBlockTrackerRequest = (localOptions) => mockNextBlockTrackerRequest({ nockScope, ...localOptions }); - const curriedMockSuccessfulInfuraRpcCall = (localOptions) => - mockSuccessfulInfuraRpcCall({ nockScope, ...localOptions }); + const curriedMockAllBlockTrackerRequests = (localOptions) => + mockAllBlockTrackerRequests({ nockScope, ...localOptions }); + const curriedMockInfuraRpcCall = (localOptions) => + mockInfuraRpcCall({ nockScope, ...localOptions }); const comms = { mockNextBlockTrackerRequest: curriedMockNextBlockTrackerRequest, - mockSuccessfulInfuraRpcCall: curriedMockSuccessfulInfuraRpcCall, + mockAllBlockTrackerRequests: curriedMockAllBlockTrackerRequests, + mockInfuraRpcCall: curriedMockInfuraRpcCall, }; try { @@ -258,9 +315,10 @@ export async function withInfuraClient(...args) { // depends on `setTimeout`) const clock = sinon.useFakeTimers(); const client = { + blockTracker, + clock, makeRpcCall: curriedMakeRpcCall, makeRpcCallsInSeries, - clock, }; try { diff --git a/app/scripts/controllers/network/provider-api-tests/shared-tests.js b/app/scripts/controllers/network/provider-api-tests/shared-tests.js index aafa2155a9b1..c28855435a55 100644 --- a/app/scripts/controllers/network/provider-api-tests/shared-tests.js +++ b/app/scripts/controllers/network/provider-api-tests/shared-tests.js @@ -9,6 +9,57 @@ import { buildRequestWithReplacedBlockParam, } from './helpers'; +const originalSetTimeout = setTimeout; + +/** + * Some middleware contain logic which retries the request if some condition + * applies. This retrying always happens out of band via `setTimeout`, and + * because we are stubbing time via Jest's fake timers, we have to manually + * advance the clock so that the `setTimeout` handlers get fired. We don't know + * when these timers will get created, however, so we have to keep advancing + * timers until the request has been made an appropriate number of times. + * Unfortunately we don't have a good way to know how many times a request has + * been retried, but the good news is that the middleware won't end, and thus + * the promise which the RPC call returns won't get fulfilled, until all retries + * have been made. + * + * @param promise - The promise which is returned by the RPC call. + * @param clock - A Sinon clock object which can be used to advance to the next + * `setTimeout` handler. + */ +async function waitForPromiseToBeFulfilledAfterRunningAllTimers( + promise, + clock, +) { + let hasPromiseBeenFulfilled = false; + let numTimesClockHasBeenAdvanced = 0; + + promise + .catch(() => { + // This is used to silence Node.js warnings about the rejection + // being handled asynchronously. The error is handled later when + // `promise` is awaited. + }) + .finally(() => { + hasPromiseBeenFulfilled = true; + }); + + // `isPromiseFulfilled` is modified asynchronously. + /* eslint-disable-next-line no-unmodified-loop-condition */ + while (!hasPromiseBeenFulfilled && numTimesClockHasBeenAdvanced < 15) { + clock.runAll(); + await new Promise((resolve) => originalSetTimeout(resolve, 10)); + numTimesClockHasBeenAdvanced += 1; + } + + return promise; +} + +/** + * Defines tests which exercise the behavior exhibited by an RPC method that + * does not support params (which affects how the method is cached). + */ +/* eslint-disable-next-line jest/no-export */ export function testsForRpcMethodNotHandledByMiddleware( method, { numberOfParameters }, @@ -25,7 +76,7 @@ export function testsForRpcMethodNotHandledByMiddleware( // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request, response: { result: expectedResult }, }); @@ -55,7 +106,7 @@ export function testsForRpcMethodAssumingNoBlockParam(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); @@ -78,12 +129,12 @@ export function testsForRpcMethodAssumingNoBlockParam(method) { // the second RPC request, but rather because we call `clock.runAll()` // below. comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -112,11 +163,11 @@ export function testsForRpcMethodAssumingNoBlockParam(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -129,6 +180,265 @@ export function testsForRpcMethodAssumingNoBlockParam(method) { }); }, ); + + it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => { + const requests = [{ method }, { method }, { method }]; + const mockResults = ['first result', 'second result', 'third result']; + + await withMockedInfuraCommunications(async (comms) => { + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request: requests[0], + response: { result: mockResults[0] }, + delay: 100, + }); + comms.mockInfuraRpcCall({ + request: requests[1], + response: { result: mockResults[1] }, + }); + comms.mockInfuraRpcCall({ + request: requests[2], + response: { result: mockResults[2] }, + }); + + const results = await withInfuraClient(async (client) => { + const resultPromises = [ + client.makeRpcCall(requests[0]), + client.makeRpcCall(requests[1]), + client.makeRpcCall(requests[2]), + ]; + const firstResult = await resultPromises[0]; + // The inflight cache middleware uses setTimeout to run the handlers, + // so run them now + client.clock.runAll(); + const remainingResults = await Promise.all(resultPromises.slice(1)); + return [firstResult, ...remainingResults]; + }); + + expect(results).toStrictEqual([ + mockResults[0], + mockResults[0], + mockResults[0], + ]); + }); + }); + + it('throws a custom error if the request to Infura returns a 405 response', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request, + response: { + httpStatus: 405, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + 'The method does not exist / is not available', + ); + }); + }); + + it('throws a custom error if the request to Infura returns a 429 response', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request, + response: { + httpStatus: 429, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + 'Request is being rate limited', + ); + }); + }); + + it('throws a custom error if the request to Infura returns a response that is not 405, 429, 503, or 504', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request, + response: { + id: 12345, + jsonrpc: '2.0', + error: 'some error', + httpStatus: 420, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + '{"id":12345,"jsonrpc":"2.0","error":"some error"}', + ); + }); + }); + + [503, 504].forEach((httpStatus) => { + it(`retries the request to Infura up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + // Here we have the request fail for the first 4 tries, then succeed + // on the 5th try. + comms.mockInfuraRpcCall({ + request, + response: { + error: 'Some error', + httpStatus, + }, + times: 4, + }); + comms.mockInfuraRpcCall({ + request, + response: { + result: 'the result', + httpStatus: 200, + }, + }); + const result = await withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + expect(result).toStrictEqual('the result'); + }); + }); + + it(`causes a request to fail with a custom error if the request to Infura returns a ${httpStatus} response 5 times in a row`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request, + response: { + error: 'Some error', + httpStatus, + }, + times: 5, + }); + const promiseForResult = withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + await expect(promiseForResult).rejects.toThrow( + /^InfuraProvider - cannot complete request\. All retries exhausted\..+Gateway timeout/su, + ); + }); + }); + }); + + ['ETIMEDOUT', 'ECONNRESET', 'SyntaxError'].forEach((errorMessagePrefix) => { + it(`retries the request to Infura up to 5 times if an "${errorMessagePrefix}" error is thrown while making the request, returning the successful result if there is one on the 5th try`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + // Here we have the request fail for the first 4 tries, then succeed + // on the 5th try. + comms.mockInfuraRpcCall({ + request, + error: `${errorMessagePrefix}: Some message`, + times: 4, + }); + comms.mockInfuraRpcCall({ + request, + response: { + result: 'the result', + httpStatus: 200, + }, + }); + const result = await withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + expect(result).toStrictEqual('the result'); + }); + }); + + it(`causes a request to fail with a custom error if an "${errorMessagePrefix}" error is thrown while making the request to Infura 5 times in a row`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the latest block + // number is retrieved through the block tracker first. It doesn't + // matter what this is — it's just used as a cache key. + comms.mockNextBlockTrackerRequest(); + comms.mockInfuraRpcCall({ + request, + error: `${errorMessagePrefix}: Some message`, + times: 5, + }); + const promiseForResult = withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + await expect(promiseForResult).rejects.toThrow( + new RegExp( + `^InfuraProvider - cannot complete request\\. All retries exhausted\\..+${errorMessagePrefix}: Some message`, + 'su', + ), + ); + }); + }); + }); } /** @@ -148,7 +458,7 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); @@ -172,12 +482,12 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // because of the second RPC request, but rather because we call // `clock.runAll()` below. comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -206,11 +516,11 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -219,6 +529,7 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { makeRpcCallsInSeries(requests), ); + // TODO: Does this work? expect(results).toStrictEqual(mockResults); }); }, @@ -236,11 +547,11 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -265,11 +576,11 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -298,11 +609,11 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(method) { // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -354,7 +665,7 @@ export function testsForRpcMethodSupportingBlockParam( // The block-ref middleware will make the request as specified // except that the block param is replaced with the latest block // number. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: buildRequestWithReplacedBlockParam( requests[0], blockParamIndex, @@ -364,7 +675,7 @@ export function testsForRpcMethodSupportingBlockParam( }); // Note that the block-ref middleware will still allow the original // request to go through. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); @@ -394,7 +705,7 @@ export function testsForRpcMethodSupportingBlockParam( // The block-ref middleware will make the request as specified // except that the block param is replaced with the latest block // number. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: buildRequestWithReplacedBlockParam( requests[0], blockParamIndex, @@ -404,18 +715,18 @@ export function testsForRpcMethodSupportingBlockParam( }); // Note that the block-ref middleware will still allow the original // request to go through. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); comms.mockNextBlockTrackerRequest({ blockNumber: '0x200' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); // The previous two requests will happen again, with a different block // number, in the same order. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: buildRequestWithReplacedBlockParam( requests[0], blockParamIndex, @@ -423,7 +734,7 @@ export function testsForRpcMethodSupportingBlockParam( ), response: { result: mockResults[1] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[1] }, }); @@ -461,7 +772,7 @@ export function testsForRpcMethodSupportingBlockParam( // The block-ref middleware will make the request as specified // except that the block param is replaced with the latest block // number. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: buildRequestWithReplacedBlockParam( requests[0], blockParamIndex, @@ -471,12 +782,12 @@ export function testsForRpcMethodSupportingBlockParam( }); // Note that the block-ref middleware will still allow the original // request to go through. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); // The previous two requests will happen again, in the same order. - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: buildRequestWithReplacedBlockParam( requests[0], blockParamIndex, @@ -484,7 +795,7 @@ export function testsForRpcMethodSupportingBlockParam( ), response: { result: mockResults[1] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[1] }, }); @@ -497,6 +808,420 @@ export function testsForRpcMethodSupportingBlockParam( }); }, ); + + it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => { + const requests = [{ method }, { method }, { method }]; + const mockResults = ['first result', 'second result', 'third result']; + + await withMockedInfuraCommunications(async (comms) => { + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + requests[0], + blockParamIndex, + '0x100', + ), + response: { result: mockResults[0] }, + }); + // This is the original request as below, which the block-ref + // middleware will allow through, except that we delay it. + comms.mockInfuraRpcCall({ + request: requests[0], + response: { result: mockResults[0] }, + delay: 100, + }); + // The previous two requests will happen again, in the same order. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + requests[1], + blockParamIndex, + '0x100', + ), + response: { result: mockResults[1] }, + }); + comms.mockInfuraRpcCall({ + request: requests[1], + response: { result: mockResults[1] }, + }); + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + requests[2], + blockParamIndex, + '0x100', + ), + response: { result: mockResults[2] }, + }); + comms.mockInfuraRpcCall({ + request: requests[2], + response: { result: mockResults[2] }, + }); + + const results = await withInfuraClient(async (client) => { + const resultPromises = [ + client.makeRpcCall(requests[0]), + client.makeRpcCall(requests[1]), + client.makeRpcCall(requests[2]), + ]; + const firstResult = await resultPromises[0]; + // The inflight cache middleware uses setTimeout to run the + // handlers, so run them now + client.clock.runAll(); + const remainingResults = await Promise.all(resultPromises.slice(1)); + return [firstResult, ...remainingResults]; + }); + + expect(results).toStrictEqual([ + mockResults[0], + mockResults[0], + mockResults[0], + ]); + }); + }); + + if (blockParamType === 'none') { + it('throws a custom error if the request to Infura returns a 405 response', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Note, however, that the block-ref middleware doesn't run the + // original request, as it fails before it gets to that point, so + // there is no need to mock the request again. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + httpStatus: 405, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + 'The method does not exist / is not available', + ); + }); + }); + + it('throws a custom error if the request to Infura returns a 429 response', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Note, however, that the block-ref middleware doesn't run the + // original request, as it fails before it gets to that point, so + // there is no need to mock the request again. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + httpStatus: 429, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + 'Request is being rate limited', + ); + }); + }); + + it('throws a custom error if the request to Infura returns a response that is not 405, 429, 503, or 504', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Note, however, that the block-ref middleware doesn't run the + // original request, as it fails before it gets to that point, so + // there is no need to mock the request again. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + id: 12345, + jsonrpc: '2.0', + error: 'some error', + httpStatus: 420, + }, + }); + const promiseForResult = withInfuraClient(async ({ makeRpcCall }) => + makeRpcCall(request), + ); + + await expect(promiseForResult).rejects.toThrow( + '{"id":12345,"jsonrpc":"2.0","error":"some error"}', + ); + }); + }); + + [503, 504].forEach((httpStatus) => { + it(`retries the request to Infura up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Here we have the request fail for the first 4 tries, then succeed + // on the 5th try. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + error: 'some error', + httpStatus, + }, + times: 4, + }); + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + result: 'the result', + httpStatus: 200, + }, + }); + // Note that the block-ref middleware will still allow the original + // request to go through. + comms.mockInfuraRpcCall({ + request, + response: { + result: 'the result', + httpStatus: 200, + }, + }); + const result = await withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + expect(result).toStrictEqual('the result'); + }); + }); + + it(`causes a request to fail with a custom error if the request to Infura returns a ${httpStatus} response 5 times in a row`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Note, however, that the block-ref middleware doesn't run the + // original request, as it fails before it gets to that point, so + // there is no need to mock the request again. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + error: 'Some error', + httpStatus, + }, + times: 5, + }); + const promiseForResult = withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + await expect(promiseForResult).rejects.toThrow( + /^InfuraProvider - cannot complete request\. All retries exhausted\..+Gateway timeout/su, + ); + }); + }); + }); + + ['ETIMEDOUT', 'ECONNRESET', 'SyntaxError'].forEach( + (errorMessagePrefix) => { + it(`retries the request to Infura up to 5 times if an "${errorMessagePrefix}" error is thrown while making the request, returning the successful result if there is one on the 5th try`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Here we have the request fail for the first 4 tries, then + // succeed on the 5th try. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + error: `${errorMessagePrefix}: Some message`, + times: 4, + }); + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + response: { + result: 'the result', + httpStatus: 200, + }, + }); + // Note that the block-ref middleware will still allow the + // original request to go through. + comms.mockInfuraRpcCall({ + request, + response: { + result: 'the result', + httpStatus: 200, + }, + }); + const result = await withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + expect(result).toStrictEqual('the result'); + }); + }); + + it(`causes a request to fail with a custom error if an "${errorMessagePrefix}" error is thrown while making the request to Infura 5 times in a row`, async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { method }; + + // The first time a block-cacheable request is made, the + // block-cache middleware will request the latest block number + // through the block tracker to determine the cache key. Later, + // the block-ref middleware will request the latest block number + // again to resolve the value of "latest", but the block number is + // cached once made, so we only need to mock the request once. + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The block-ref middleware will make the request as specified + // except that the block param is replaced with the latest block + // number. + // + // Note, however, that the block-ref middleware doesn't run the + // original request, as it fails before it gets to that point, so + // there is no need to mock the request again. + comms.mockInfuraRpcCall({ + request: buildRequestWithReplacedBlockParam( + request, + blockParamIndex, + '0x100', + ), + error: `${errorMessagePrefix}: Some message`, + times: 5, + }); + const promiseForResult = withInfuraClient( + async ({ makeRpcCall, clock }) => { + return await waitForPromiseToBeFulfilledAfterRunningAllTimers( + makeRpcCall(request), + clock, + ); + }, + ); + + await expect(promiseForResult).rejects.toThrow( + new RegExp( + `^InfuraProvider - cannot complete request\\. All retries exhausted\\..+${errorMessagePrefix}: Some message`, + 'su', + ), + ); + }); + }); + }, + ); + } }); describe.each([ @@ -518,7 +1243,7 @@ export function testsForRpcMethodSupportingBlockParam( // tracker to determine the cache key. This block number doesn't // matter. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); @@ -545,12 +1270,12 @@ export function testsForRpcMethodSupportingBlockParam( // occur because of the second RPC request, but rather because we // call `clock.runAll()` below. comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -582,11 +1307,11 @@ export function testsForRpcMethodSupportingBlockParam( // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); @@ -622,7 +1347,7 @@ export function testsForRpcMethodSupportingBlockParam( // block number is retrieved through the block tracker first. It // doesn't matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); @@ -654,11 +1379,11 @@ export function testsForRpcMethodSupportingBlockParam( // number is retrieved through the block tracker first. It doesn't // matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: 'first result' }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: 'second result' }, }); @@ -670,6 +1395,70 @@ export function testsForRpcMethodSupportingBlockParam( expect(results).toStrictEqual(['first result', 'second result']); }); }); + + it('makes an additional request to Infura if the given block number matches the latest block number', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { + method, + params: buildMockParamsWithBlockParamAt(blockParamIndex, '0x100'), + }; + + // The first time a block-cacheable request is made, the latest + // block number is retrieved through the block tracker first. This + // also happens within the retry-on-empty middleware (although the + // latest block is cached by now). + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The retry-on-empty middleware will make an explicit request. + comms.mockInfuraRpcCall({ + request, + response: { result: 'this result gets overwritten' }, + }); + // Note that the retry-on-empty middleware will still allow the + // original request to go through. + comms.mockInfuraRpcCall({ + request, + response: { result: 'the actual result' }, + }); + + const result = await withInfuraClient(({ makeRpcCall }) => + makeRpcCall(request), + ); + + expect(result).toStrictEqual('the actual result'); + }); + }); + + it('makes an additional request to Infura if the given block number is less than the latest block number', async () => { + await withMockedInfuraCommunications(async (comms) => { + const request = { + method, + params: buildMockParamsWithBlockParamAt(blockParamIndex, '0x50'), + }; + + // The first time a block-cacheable request is made, the latest + // block number is retrieved through the block tracker first. This + // also happens within the retry-on-empty middleware (although the + // latest block is cached by now). + comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' }); + // The retry-on-empty middleware will make an explicit request. + comms.mockInfuraRpcCall({ + request, + response: { result: 'this result gets overwritten' }, + }); + // Note that the retry-on-empty middleware will still allow the + // original request to go through. + comms.mockInfuraRpcCall({ + request, + response: { result: 'the actual result' }, + }); + + const result = await withInfuraClient(({ makeRpcCall }) => + makeRpcCall(request), + ); + + expect(result).toStrictEqual('the actual result'); + }); + }); } }); @@ -688,11 +1477,11 @@ export function testsForRpcMethodSupportingBlockParam( // block number is retrieved through the block tracker first. It // doesn't matter what this is — it's just used as a cache key. comms.mockNextBlockTrackerRequest(); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[0], response: { result: mockResults[0] }, }); - comms.mockSuccessfulInfuraRpcCall({ + comms.mockInfuraRpcCall({ request: requests[1], response: { result: mockResults[1] }, }); diff --git a/jest.config.js b/jest.config.js index 04b26dfe6519..1c8cfe7ff033 100644 --- a/jest.config.js +++ b/jest.config.js @@ -49,7 +49,7 @@ module.exports = { '/app/scripts/lib/**/*.test.js', '/app/scripts/migrations/*.test.js', '/app/scripts/platforms/*.test.js', - 'app/scripts/controllers/network/**/*.test.js', + '/app/scripts/controllers/network/**/*.test.js', '/app/scripts/controllers/permissions/**/*.test.js', '/app/scripts/flask/**/*.test.js', '/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js', diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index fc15ef26bab5..2e9433adf656 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -288,7 +288,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs-mini": { @@ -388,7 +388,7 @@ "3box>ipfs>multibase": true, "browserify>assert": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>dlv": { @@ -450,7 +450,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-bitswap>bignumber.js": { @@ -520,7 +520,7 @@ "browserify>assert": true, "browserify>browser-resolve": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-mfs>hamt-sharding": { @@ -567,7 +567,7 @@ "browserify>path-browserify": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-repo>bignumber.js": { @@ -811,7 +811,7 @@ "3box>ipfs>protons": true, "base32-encode": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>is-ipfs": { @@ -850,7 +850,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>process": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -866,7 +866,7 @@ "3box>ipfs>peer-info": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-crypto": { @@ -979,7 +979,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "promise-to-callback": true } }, @@ -1102,7 +1102,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1161,7 +1161,7 @@ "3box>ipfs>stream-to-pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1177,7 +1177,7 @@ "3box>ipfs>libp2p-webrtc-star>simple-peer>readable-stream": true, "browserify>buffer": true, "ethereumjs-wallet>randombytes": true, - "madge>debug": true, + "nock>debug": true, "pumpify>inherits": true } }, @@ -1377,7 +1377,7 @@ "3box>ipfs>multiaddr": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1399,7 +1399,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true, "uuid": true } @@ -1449,7 +1449,7 @@ "3box>ipfs>multiaddr-to-uri": true, "3box>ipfs>pull-mplex>interface-connection": true, "browserify>os-browserify": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-websockets>pull-ws": { @@ -1478,7 +1478,7 @@ "packages": { "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": { @@ -1518,7 +1518,7 @@ "3box>ipfs>pull-stream": true, "browserify>assert": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub": { @@ -1535,7 +1535,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub>time-cache": { @@ -1555,7 +1555,7 @@ "3box>ipfs>libp2p-secio>pull-handshake": true, "3box>ipfs>pull-stream": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-switch": { @@ -1578,7 +1578,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1601,7 +1601,7 @@ "3box>ipfs>pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1631,7 +1631,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1806,7 +1806,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>pull-mplex>interface-connection": { @@ -3102,7 +3102,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true, "eslint>fast-deep-equal": true, - "madge>debug": true + "nock>debug": true } }, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": { @@ -3231,15 +3231,36 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>deep-equal": true, "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/eth-token-tracker>ethjs": true, "@metamask/eth-token-tracker>human-standard-token-abi": true, "ethjs-contract": true, "ethjs-query": true, - "nock>deep-equal": true, "safe-event-emitter": true } }, + "@metamask/eth-token-tracker>deep-equal": { + "packages": { + "@metamask/eth-token-tracker>deep-equal>is-arguments": true, + "@metamask/eth-token-tracker>deep-equal>is-date-object": true, + "enzyme>is-regex": true, + "enzyme>object-is": true, + "mocha>object.assign>object-keys": true, + "string.prototype.matchall>regexp.prototype.flags": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-arguments": { + "packages": { + "koa>is-generator-function>has-tostringtag": true, + "string.prototype.matchall>call-bind": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-date-object": { + "packages": { + "koa>is-generator-function>has-tostringtag": true + } + }, "@metamask/eth-token-tracker>eth-block-tracker": { "globals": { "clearTimeout": true, @@ -3670,6 +3691,11 @@ "localStorage": true } }, + "@storybook/components>qs": { + "packages": { + "string.prototype.matchall>side-channel": true + } + }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -3690,7 +3716,7 @@ "browserify>buffer": true, "browserify>util": true, "gulp-dart-sass>lodash.clonedeep": true, - "madge>debug": true, + "nock>debug": true, "semver": true } }, @@ -3913,7 +3939,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/source-map-utils": true, "@truffle/decoder>bn.js": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils": { @@ -3923,7 +3949,7 @@ "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": true, "@truffle/decoder>@truffle/source-map-utils>json-pointer": true, "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": { @@ -4516,7 +4542,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-block-tracker>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-ens-namehash": { @@ -4586,7 +4612,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-json-rpc-middleware>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-json-rpc-middleware>eth-sig-util": { @@ -4918,10 +4944,10 @@ "setTimeout": true }, "packages": { + "@storybook/components>qs": true, "browserify>browser-resolve": true, "browserify>process": true, "eth-rpc-errors>fast-safe-stringify": true, - "nock>qs": true, "pubnub>superagent>component-emitter": true } }, @@ -4943,7 +4969,7 @@ "eth-query": { "packages": { "eth-query>json-rpc-random-id": true, - "madge>debug": true, + "nock>debug": true, "watchify>xtend": true } }, @@ -6683,7 +6709,7 @@ "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, - "nock>deep-equal>object-keys": true + "mocha>object.assign>object-keys": true } }, "globalthis>define-properties>has-property-descriptors": { @@ -6774,19 +6800,6 @@ "Intl": true } }, - "madge>debug": { - "globals": { - "console": true, - "document": true, - "localStorage": true, - "navigator": true, - "process": true - }, - "packages": { - "browserify>process": true, - "madge>debug>ms": true - } - }, "madge>rc>deep-extend": { "packages": { "browserify>buffer": true @@ -6822,30 +6835,17 @@ "navigator": true } }, - "nock>deep-equal": { - "packages": { - "enzyme>is-regex": true, - "enzyme>object-is": true, - "nock>deep-equal>is-arguments": true, - "nock>deep-equal>is-date-object": true, - "nock>deep-equal>object-keys": true, - "string.prototype.matchall>regexp.prototype.flags": true - } - }, - "nock>deep-equal>is-arguments": { - "packages": { - "koa>is-generator-function>has-tostringtag": true, - "string.prototype.matchall>call-bind": true - } - }, - "nock>deep-equal>is-date-object": { - "packages": { - "koa>is-generator-function>has-tostringtag": true - } - }, - "nock>qs": { + "nock>debug": { + "globals": { + "console": true, + "document": true, + "localStorage": true, + "navigator": true, + "process": true + }, "packages": { - "string.prototype.matchall>side-channel": true + "browserify>process": true, + "nock>debug>ms": true } }, "node-fetch": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 8a8c07847d6a..3613d9de2cc2 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -288,7 +288,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs-mini": { @@ -388,7 +388,7 @@ "3box>ipfs>multibase": true, "browserify>assert": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>dlv": { @@ -450,7 +450,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-bitswap>bignumber.js": { @@ -520,7 +520,7 @@ "browserify>assert": true, "browserify>browser-resolve": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-mfs>hamt-sharding": { @@ -567,7 +567,7 @@ "browserify>path-browserify": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-repo>bignumber.js": { @@ -811,7 +811,7 @@ "3box>ipfs>protons": true, "base32-encode": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>is-ipfs": { @@ -850,7 +850,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>process": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -866,7 +866,7 @@ "3box>ipfs>peer-info": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-crypto": { @@ -979,7 +979,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "promise-to-callback": true } }, @@ -1102,7 +1102,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1161,7 +1161,7 @@ "3box>ipfs>stream-to-pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1177,7 +1177,7 @@ "3box>ipfs>libp2p-webrtc-star>simple-peer>readable-stream": true, "browserify>buffer": true, "ethereumjs-wallet>randombytes": true, - "madge>debug": true, + "nock>debug": true, "pumpify>inherits": true } }, @@ -1377,7 +1377,7 @@ "3box>ipfs>multiaddr": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1399,7 +1399,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true, "uuid": true } @@ -1449,7 +1449,7 @@ "3box>ipfs>multiaddr-to-uri": true, "3box>ipfs>pull-mplex>interface-connection": true, "browserify>os-browserify": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-websockets>pull-ws": { @@ -1478,7 +1478,7 @@ "packages": { "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": { @@ -1518,7 +1518,7 @@ "3box>ipfs>pull-stream": true, "browserify>assert": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub": { @@ -1535,7 +1535,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub>time-cache": { @@ -1555,7 +1555,7 @@ "3box>ipfs>libp2p-secio>pull-handshake": true, "3box>ipfs>pull-stream": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-switch": { @@ -1578,7 +1578,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1601,7 +1601,7 @@ "3box>ipfs>pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1631,7 +1631,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1806,7 +1806,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>pull-mplex>interface-connection": { @@ -2218,7 +2218,7 @@ "browserify>path-browserify": true, "browserify>process": true, "depcheck>@babel/traverse": true, - "madge>debug": true, + "nock>debug": true, "nyc>convert-source-map": true } }, @@ -3263,7 +3263,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true, "eslint>fast-deep-equal": true, - "madge>debug": true + "nock>debug": true } }, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": { @@ -3392,15 +3392,36 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>deep-equal": true, "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/eth-token-tracker>ethjs": true, "@metamask/eth-token-tracker>human-standard-token-abi": true, "ethjs-contract": true, "ethjs-query": true, - "nock>deep-equal": true, "safe-event-emitter": true } }, + "@metamask/eth-token-tracker>deep-equal": { + "packages": { + "@metamask/eth-token-tracker>deep-equal>is-arguments": true, + "@metamask/eth-token-tracker>deep-equal>is-date-object": true, + "enzyme>is-regex": true, + "enzyme>object-is": true, + "mocha>object.assign>object-keys": true, + "string.prototype.matchall>regexp.prototype.flags": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-arguments": { + "packages": { + "koa>is-generator-function>has-tostringtag": true, + "string.prototype.matchall>call-bind": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-date-object": { + "packages": { + "koa>is-generator-function>has-tostringtag": true + } + }, "@metamask/eth-token-tracker>eth-block-tracker": { "globals": { "clearTimeout": true, @@ -4448,6 +4469,11 @@ "localStorage": true } }, + "@storybook/components>qs": { + "packages": { + "string.prototype.matchall>side-channel": true + } + }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -4468,7 +4494,7 @@ "browserify>buffer": true, "browserify>util": true, "gulp-dart-sass>lodash.clonedeep": true, - "madge>debug": true, + "nock>debug": true, "semver": true } }, @@ -4691,7 +4717,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/source-map-utils": true, "@truffle/decoder>bn.js": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils": { @@ -4701,7 +4727,7 @@ "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": true, "@truffle/decoder>@truffle/source-map-utils>json-pointer": true, "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": { @@ -5240,7 +5266,7 @@ "depcheck>@babel/traverse>@babel/helper-hoist-variables": true, "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true, "depcheck>@babel/traverse>globals": true, - "madge>debug": true + "nock>debug": true } }, "depcheck>@babel/traverse>@babel/helper-function-name": { @@ -5328,7 +5354,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-block-tracker>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-ens-namehash": { @@ -5398,7 +5424,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-json-rpc-middleware>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-json-rpc-middleware>eth-sig-util": { @@ -5730,10 +5756,10 @@ "setTimeout": true }, "packages": { + "@storybook/components>qs": true, "browserify>browser-resolve": true, "browserify>process": true, "eth-rpc-errors>fast-safe-stringify": true, - "nock>qs": true, "pubnub>superagent>component-emitter": true } }, @@ -5755,7 +5781,7 @@ "eth-query": { "packages": { "eth-query>json-rpc-random-id": true, - "madge>debug": true, + "nock>debug": true, "watchify>xtend": true } }, @@ -7495,7 +7521,7 @@ "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, - "nock>deep-equal>object-keys": true + "mocha>object.assign>object-keys": true } }, "globalthis>define-properties>has-property-descriptors": { @@ -7606,19 +7632,6 @@ "Intl": true } }, - "madge>debug": { - "globals": { - "console": true, - "document": true, - "localStorage": true, - "navigator": true, - "process": true - }, - "packages": { - "browserify>process": true, - "madge>debug>ms": true - } - }, "madge>rc>deep-extend": { "packages": { "browserify>buffer": true @@ -7654,30 +7667,17 @@ "navigator": true } }, - "nock>deep-equal": { - "packages": { - "enzyme>is-regex": true, - "enzyme>object-is": true, - "nock>deep-equal>is-arguments": true, - "nock>deep-equal>is-date-object": true, - "nock>deep-equal>object-keys": true, - "string.prototype.matchall>regexp.prototype.flags": true - } - }, - "nock>deep-equal>is-arguments": { - "packages": { - "koa>is-generator-function>has-tostringtag": true, - "string.prototype.matchall>call-bind": true - } - }, - "nock>deep-equal>is-date-object": { - "packages": { - "koa>is-generator-function>has-tostringtag": true - } - }, - "nock>qs": { + "nock>debug": { + "globals": { + "console": true, + "document": true, + "localStorage": true, + "navigator": true, + "process": true + }, "packages": { - "string.prototype.matchall>side-channel": true + "browserify>process": true, + "nock>debug>ms": true } }, "node-fetch": { diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index fc15ef26bab5..2e9433adf656 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -288,7 +288,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs-mini": { @@ -388,7 +388,7 @@ "3box>ipfs>multibase": true, "browserify>assert": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>dlv": { @@ -450,7 +450,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-bitswap>bignumber.js": { @@ -520,7 +520,7 @@ "browserify>assert": true, "browserify>browser-resolve": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-mfs>hamt-sharding": { @@ -567,7 +567,7 @@ "browserify>path-browserify": true, "browserify>timers-browserify": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>ipfs-repo>bignumber.js": { @@ -811,7 +811,7 @@ "3box>ipfs>protons": true, "base32-encode": true, "browserify>buffer": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>is-ipfs": { @@ -850,7 +850,7 @@ "browserify>insert-module-globals>is-buffer": true, "browserify>process": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -866,7 +866,7 @@ "3box>ipfs>peer-info": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-crypto": { @@ -979,7 +979,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "promise-to-callback": true } }, @@ -1102,7 +1102,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1161,7 +1161,7 @@ "3box>ipfs>stream-to-pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1177,7 +1177,7 @@ "3box>ipfs>libp2p-webrtc-star>simple-peer>readable-stream": true, "browserify>buffer": true, "ethereumjs-wallet>randombytes": true, - "madge>debug": true, + "nock>debug": true, "pumpify>inherits": true } }, @@ -1377,7 +1377,7 @@ "3box>ipfs>multiaddr": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1399,7 +1399,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true, "uuid": true } @@ -1449,7 +1449,7 @@ "3box>ipfs>multiaddr-to-uri": true, "3box>ipfs>pull-mplex>interface-connection": true, "browserify>os-browserify": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p-websockets>pull-ws": { @@ -1478,7 +1478,7 @@ "packages": { "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-connection-manager>latency-monitor": { @@ -1518,7 +1518,7 @@ "3box>ipfs>pull-stream": true, "browserify>assert": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub": { @@ -1535,7 +1535,7 @@ "browserify>events": true, "browserify>insert-module-globals>is-buffer": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-floodsub>libp2p-pubsub>time-cache": { @@ -1555,7 +1555,7 @@ "3box>ipfs>libp2p-secio>pull-handshake": true, "3box>ipfs>pull-stream": true, "browserify>events": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>libp2p>libp2p-switch": { @@ -1578,7 +1578,7 @@ "browserify>assert": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1601,7 +1601,7 @@ "3box>ipfs>pull-stream": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1631,7 +1631,7 @@ "browserify>assert": true, "browserify>buffer": true, "gh-pages>async": true, - "madge>debug": true, + "nock>debug": true, "pump>once": true } }, @@ -1806,7 +1806,7 @@ "browserify>buffer": true, "browserify>events": true, "gh-pages>async": true, - "madge>debug": true + "nock>debug": true } }, "3box>ipfs>pull-mplex>interface-connection": { @@ -3102,7 +3102,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true, "eslint>fast-deep-equal": true, - "madge>debug": true + "nock>debug": true } }, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": { @@ -3231,15 +3231,36 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>deep-equal": true, "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/eth-token-tracker>ethjs": true, "@metamask/eth-token-tracker>human-standard-token-abi": true, "ethjs-contract": true, "ethjs-query": true, - "nock>deep-equal": true, "safe-event-emitter": true } }, + "@metamask/eth-token-tracker>deep-equal": { + "packages": { + "@metamask/eth-token-tracker>deep-equal>is-arguments": true, + "@metamask/eth-token-tracker>deep-equal>is-date-object": true, + "enzyme>is-regex": true, + "enzyme>object-is": true, + "mocha>object.assign>object-keys": true, + "string.prototype.matchall>regexp.prototype.flags": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-arguments": { + "packages": { + "koa>is-generator-function>has-tostringtag": true, + "string.prototype.matchall>call-bind": true + } + }, + "@metamask/eth-token-tracker>deep-equal>is-date-object": { + "packages": { + "koa>is-generator-function>has-tostringtag": true + } + }, "@metamask/eth-token-tracker>eth-block-tracker": { "globals": { "clearTimeout": true, @@ -3670,6 +3691,11 @@ "localStorage": true } }, + "@storybook/components>qs": { + "packages": { + "string.prototype.matchall>side-channel": true + } + }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -3690,7 +3716,7 @@ "browserify>buffer": true, "browserify>util": true, "gulp-dart-sass>lodash.clonedeep": true, - "madge>debug": true, + "nock>debug": true, "semver": true } }, @@ -3913,7 +3939,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/source-map-utils": true, "@truffle/decoder>bn.js": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils": { @@ -3923,7 +3949,7 @@ "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": true, "@truffle/decoder>@truffle/source-map-utils>json-pointer": true, "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": true, - "madge>debug": true + "nock>debug": true } }, "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": { @@ -4516,7 +4542,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-block-tracker>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-ens-namehash": { @@ -4586,7 +4612,7 @@ "packages": { "eslint>fast-deep-equal": true, "eth-json-rpc-middleware>@metamask/utils>superstruct": true, - "madge>debug": true + "nock>debug": true } }, "eth-json-rpc-middleware>eth-sig-util": { @@ -4918,10 +4944,10 @@ "setTimeout": true }, "packages": { + "@storybook/components>qs": true, "browserify>browser-resolve": true, "browserify>process": true, "eth-rpc-errors>fast-safe-stringify": true, - "nock>qs": true, "pubnub>superagent>component-emitter": true } }, @@ -4943,7 +4969,7 @@ "eth-query": { "packages": { "eth-query>json-rpc-random-id": true, - "madge>debug": true, + "nock>debug": true, "watchify>xtend": true } }, @@ -6683,7 +6709,7 @@ "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, - "nock>deep-equal>object-keys": true + "mocha>object.assign>object-keys": true } }, "globalthis>define-properties>has-property-descriptors": { @@ -6774,19 +6800,6 @@ "Intl": true } }, - "madge>debug": { - "globals": { - "console": true, - "document": true, - "localStorage": true, - "navigator": true, - "process": true - }, - "packages": { - "browserify>process": true, - "madge>debug>ms": true - } - }, "madge>rc>deep-extend": { "packages": { "browserify>buffer": true @@ -6822,30 +6835,17 @@ "navigator": true } }, - "nock>deep-equal": { - "packages": { - "enzyme>is-regex": true, - "enzyme>object-is": true, - "nock>deep-equal>is-arguments": true, - "nock>deep-equal>is-date-object": true, - "nock>deep-equal>object-keys": true, - "string.prototype.matchall>regexp.prototype.flags": true - } - }, - "nock>deep-equal>is-arguments": { - "packages": { - "koa>is-generator-function>has-tostringtag": true, - "string.prototype.matchall>call-bind": true - } - }, - "nock>deep-equal>is-date-object": { - "packages": { - "koa>is-generator-function>has-tostringtag": true - } - }, - "nock>qs": { + "nock>debug": { + "globals": { + "console": true, + "document": true, + "localStorage": true, + "navigator": true, + "process": true + }, "packages": { - "string.prototype.matchall>side-channel": true + "browserify>process": true, + "nock>debug>ms": true } }, "node-fetch": { diff --git a/lavamoat/build-system/policy-override.json b/lavamoat/build-system/policy-override.json index 499e683e2df1..39640ea8d7aa 100644 --- a/lavamoat/build-system/policy-override.json +++ b/lavamoat/build-system/policy-override.json @@ -158,7 +158,8 @@ "eslint-plugin-jest>@typescript-eslint/utils": true, "eslint>debug": true, "madge>debug": true, - "typescript": true + "typescript": true, + "nock>debug": true } }, "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": { diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 2cad4ca0eebb..d83c594a851a 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -52,7 +52,7 @@ "@babel/preset-typescript": true, "depcheck>@babel/traverse": true, "depcheck>json5": true, - "madge>debug": true, + "nock>debug": true, "nyc>convert-source-map": true } }, @@ -1046,6 +1046,11 @@ "pumpify>inherits": true } }, + "@metamask/eth-token-tracker>deep-equal>is-date-object": { + "packages": { + "koa>is-generator-function>has-tostringtag": true + } + }, "@metamask/jazzicon>color>color-convert": { "packages": { "@metamask/jazzicon>color>color-convert>color-name": true @@ -1076,6 +1081,11 @@ "util.deprecate": true } }, + "@storybook/components>qs": { + "packages": { + "string.prototype.matchall>side-channel": true + } + }, "@storybook/react>acorn-walk": { "globals": { "define": true @@ -1109,6 +1119,7 @@ "eslint-plugin-jest>@typescript-eslint/utils": true, "eslint>debug": true, "madge>debug": true, + "nock>debug": true, "typescript": true } }, @@ -1144,7 +1155,7 @@ "packages": { "@typescript-eslint/parser>@typescript-eslint/scope-manager": true, "@typescript-eslint/parser>@typescript-eslint/typescript-estree": true, - "madge>debug": true, + "nock>debug": true, "typescript": true } }, @@ -1177,7 +1188,7 @@ "@typescript-eslint/parser>@typescript-eslint/types": true, "eslint>is-glob": true, "globby": true, - "madge>debug": true, + "nock>debug": true, "semver": true, "typescript": true } @@ -2004,7 +2015,7 @@ "depcheck>@babel/traverse>@babel/helper-hoist-variables": true, "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true, "depcheck>@babel/traverse>globals": true, - "madge>debug": true + "nock>debug": true } }, "depcheck>@babel/traverse>@babel/helper-function-name": { @@ -2176,7 +2187,7 @@ "enzyme>object.assign": { "packages": { "globalthis>define-properties": true, - "nock>deep-equal>object-keys": true, + "mocha>object.assign>object-keys": true, "string.prototype.matchall>call-bind": true, "string.prototype.matchall>has-symbols": true } @@ -2243,7 +2254,7 @@ "eslint>natural-compare": true, "eslint>regexpp": true, "globby>ignore": true, - "madge>debug": true + "nock>debug": true } }, "eslint-config-prettier": { @@ -2291,7 +2302,7 @@ "brfs>resolve": true, "eslint-plugin-import>tsconfig-paths": true, "eslint>is-glob": true, - "madge>debug": true, + "nock>debug": true, "nyc>glob": true } }, @@ -2537,7 +2548,7 @@ "eslint-plugin-jsdoc>escape-string-regexp": true, "eslint-plugin-jsdoc>spdx-expression-parse": true, "eslint>esquery": true, - "madge>debug": true, + "nock>debug": true, "semver": true } }, @@ -2764,7 +2775,7 @@ "eslint>minimatch": true, "eslint>strip-json-comments": true, "globby>ignore": true, - "madge>debug": true + "nock>debug": true } }, "eslint>@humanwhocodes/config-array": { @@ -2774,7 +2785,7 @@ "packages": { "eslint>@humanwhocodes/config-array>@humanwhocodes/object-schema": true, "eslint>minimatch": true, - "madge>debug": true + "nock>debug": true } }, "eslint>ajv": { @@ -3122,7 +3133,7 @@ "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, - "nock>deep-equal>object-keys": true + "mocha>object.assign>object-keys": true } }, "globalthis>define-properties>has-property-descriptors": { @@ -3510,10 +3521,10 @@ "console.error": true }, "packages": { + "@storybook/components>qs": true, "gulp-livereload>tiny-lr>body": true, "gulp-livereload>tiny-lr>debug": true, "gulp-livereload>tiny-lr>faye-websocket": true, - "nock>qs": true, "react>object-assign": true } }, @@ -6452,25 +6463,6 @@ "loose-envify>js-tokens": true } }, - "madge>debug": { - "builtin": { - "tty.isatty": true, - "util.deprecate": true, - "util.format": true, - "util.inspect": true - }, - "globals": { - "console": true, - "document": true, - "localStorage": true, - "navigator": true, - "process": true - }, - "packages": { - "madge>debug>ms": true, - "sinon>supports-color": true - } - }, "madge>detective-scss>gonzales-pe": { "globals": { "console.error": true, @@ -6498,6 +6490,13 @@ "stylelint>balanced-match": true } }, + "mocha>mkdirp": { + "builtin": { + "fs": true, + "path.dirname": true, + "path.resolve": true + } + }, "mocha>supports-color>has-flag": { "globals": { "process.argv": true @@ -6530,21 +6529,23 @@ "process.platform": true } }, - "nock>deep-equal>is-date-object": { - "packages": { - "koa>is-generator-function>has-tostringtag": true - } - }, - "nock>mkdirp": { + "nock>debug": { "builtin": { - "fs": true, - "path.dirname": true, - "path.resolve": true - } - }, - "nock>qs": { + "tty.isatty": true, + "util.deprecate": true, + "util.format": true, + "util.inspect": true + }, + "globals": { + "console": true, + "document": true, + "localStorage": true, + "navigator": true, + "process": true + }, "packages": { - "string.prototype.matchall>side-channel": true + "nock>debug>ms": true, + "sinon>supports-color": true } }, "node-sass": { @@ -6960,9 +6961,9 @@ }, "string.prototype.matchall>es-abstract>es-to-primitive": { "packages": { + "@metamask/eth-token-tracker>deep-equal>is-date-object": true, "@storybook/api>telejson>is-symbol": true, - "enzyme>is-callable": true, - "nock>deep-equal>is-date-object": true + "enzyme>is-callable": true } }, "string.prototype.matchall>get-intrinsic": { @@ -7029,7 +7030,7 @@ "globby>ignore": true, "globby>slash": true, "lodash": true, - "madge>debug": true, + "nock>debug": true, "nyc>resolve-from": true, "stylelint>@stylelint/postcss-css-in-js": true, "stylelint>@stylelint/postcss-markdown": true, @@ -7343,7 +7344,7 @@ "path.dirname": true }, "packages": { - "nock>mkdirp": true + "mocha>mkdirp": true } }, "stylelint>global-modules": { diff --git a/package.json b/package.json index 3d9fbb4c841e..ec8962ecffc2 100644 --- a/package.json +++ b/package.json @@ -363,7 +363,7 @@ "madge": "^5.0.1", "mocha": "^7.2.0", "mockttp": "^2.6.0", - "nock": "^9.0.14", + "nock": "^13.2.9", "node-fetch": "^2.6.1", "nyc": "^15.0.0", "patch-package": "^6.4.7", diff --git a/patches/eth-query+2.1.2.patch b/patches/eth-query+2.1.2.patch index ea405d5f8f03..5ab82b6d5202 100644 --- a/patches/eth-query+2.1.2.patch +++ b/patches/eth-query+2.1.2.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/eth-query/index.js b/node_modules/eth-query/index.js -index 13e9f3c..303d703 100644 +index 13e9f3c..d714bb7 100644 --- a/node_modules/eth-query/index.js +++ b/node_modules/eth-query/index.js @@ -1,5 +1,6 @@ @@ -9,7 +9,7 @@ index 13e9f3c..303d703 100644 module.exports = EthQuery -@@ -63,7 +64,9 @@ EthQuery.prototype.submitHashrate = generateFnFor('eth_subm +@@ -63,7 +64,10 @@ EthQuery.prototype.submitHashrate = generateFnFor('eth_subm EthQuery.prototype.sendAsync = function(opts, cb){ const self = this @@ -17,6 +17,7 @@ index 13e9f3c..303d703 100644 + const payload = createPayload(opts) + debug('making request %o', payload) + self.currentProvider.sendAsync(payload, function(err, response){ ++ debug('got err = %o, response = %o', err, response) if (!err && response.error) err = new Error('EthQuery - RPC Error - '+response.error.message) if (err) return cb(err) cb(null, response.result) diff --git a/test/helpers/setup-helper.js b/test/helpers/setup-helper.js index 2c7a8299fe50..cb627c805cdc 100644 --- a/test/helpers/setup-helper.js +++ b/test/helpers/setup-helper.js @@ -12,6 +12,12 @@ global.chrome = { nock.disableNetConnect(); nock.enableNetConnect('localhost'); +if (typeof beforeEach === 'function') { + /* eslint-disable-next-line jest/require-top-level-describe */ + beforeEach(() => { + nock.cleanAll(); + }); +} // catch rejections that are still unhandled when tests exit const unhandledRejections = new Map(); diff --git a/test/jest/setup.js b/test/jest/setup.js index ae49888e5e9a..c0852092041c 100644 --- a/test/jest/setup.js +++ b/test/jest/setup.js @@ -1,4 +1,6 @@ // This file is for Jest-specific setup only and runs before our Jest tests. + +import nock from 'nock'; import '@testing-library/jest-dom'; jest.mock('webextension-polyfill', () => { @@ -8,3 +10,8 @@ jest.mock('webextension-polyfill', () => { }, }; }); + +/* eslint-disable-next-line jest/require-top-level-describe */ +beforeEach(() => { + nock.cleanAll(); +}); diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js index d263f55c22b1..e1e1038748ff 100644 --- a/ui/pages/swaps/swaps.util.test.js +++ b/ui/pages/swaps/swaps.util.test.js @@ -42,7 +42,7 @@ jest.mock('../../../shared/lib/storage-helpers', () => ({ })); describe('Swaps Util', () => { - afterAll(() => { + afterEach(() => { nock.cleanAll(); }); @@ -112,7 +112,7 @@ describe('Swaps Util', () => { }); describe('fetchTokens', () => { - beforeAll(() => { + beforeEach(() => { nock('https://swap.metaswap.codefi.network') .persist() .get('/networks/1/tokens') @@ -131,7 +131,7 @@ describe('Swaps Util', () => { }); describe('fetchAggregatorMetadata', () => { - beforeAll(() => { + beforeEach(() => { nock('https://swap.metaswap.codefi.network') .persist() .get('/networks/1/aggregatorMetadata') @@ -150,7 +150,7 @@ describe('Swaps Util', () => { }); describe('fetchTopAssets', () => { - beforeAll(() => { + beforeEach(() => { nock('https://swap.metaswap.codefi.network') .persist() .get('/networks/1/topAssets') diff --git a/yarn.lock b/yarn.lock index 32b18cf97b55..701ee0bffb97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7114,7 +7114,7 @@ assert@^2.0.0: object-is "^1.0.1" util "^0.12.0" -assertion-error@^1.0.1, assertion-error@^1.1.0: +assertion-error@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== @@ -8778,15 +8778,6 @@ chai-checkmark@^1.0.1: resolved "https://registry.yarnpkg.com/chai-checkmark/-/chai-checkmark-1.0.1.tgz#9fbb3c9ad9101f097ef288328d30f4227d74fffb" integrity sha1-n7s8mtkQHwl+8ogyjTD0In10//s= -"chai@>=1.9.2 <4.0.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247" - integrity sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc= - dependencies: - assertion-error "^1.0.1" - deep-eql "^0.1.3" - type-detect "^1.0.0" - chai@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" @@ -10341,13 +10332,6 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-eql@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2" - integrity sha1-71WKyrjeJSBs1xOQbXTlaTDrafI= - dependencies: - type-detect "0.1.1" - deep-eql@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" @@ -10355,7 +10339,7 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -deep-equal@^1.0.0, deep-equal@^1.1.0: +deep-equal@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== @@ -19241,7 +19225,7 @@ lodash.uniqby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= -lodash@=3.10.1, lodash@^4.13.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.2: +lodash@=3.10.1, lodash@^4.13.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20100,7 +20084,7 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@0.5.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -20678,20 +20662,15 @@ no-case@^3.0.3, no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -nock@^9.0.14: - version "9.1.5" - resolved "https://registry.yarnpkg.com/nock/-/nock-9.1.5.tgz#9e4878e0e1c050bdd93ae1e326e89461ea15618b" - integrity sha512-ukkBUhGU73CmSKTpTl6N/Qjvb7Hev4rCEjgOuEBKvHmsOqz7jGh2vUXL3dPnX3ndfcmVjsFBPfKpNuJbK94SKg== +nock@^13.2.9: + version "13.2.9" + resolved "https://registry.yarnpkg.com/nock/-/nock-13.2.9.tgz#4faf6c28175d36044da4cfa68e33e5a15086ad4c" + integrity sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA== dependencies: - chai ">=1.9.2 <4.0.0" - debug "^2.2.0" - deep-equal "^1.0.0" + debug "^4.1.0" json-stringify-safe "^5.0.1" - lodash "~4.17.2" - mkdirp "^0.5.0" - propagate "0.4.0" - qs "^6.5.1" - semver "^5.3.0" + lodash "^4.17.21" + propagate "^2.0.0" node-abi@^2.18.0, node-abi@^2.21.0, node-abi@^2.7.0: version "2.30.1" @@ -23126,10 +23105,10 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, object-assign "^4.1.1" react-is "^16.13.1" -propagate@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/propagate/-/propagate-0.4.0.tgz#f3fcca0a6fe06736a7ba572966069617c130b481" - integrity sha1-8/zKCm/gZzanulcpZgaWF8EwtIE= +propagate@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45" + integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag== proper-lockfile@^4.0.0: version "4.1.1" @@ -27592,21 +27571,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822" - integrity sha1-C6XsKohWQORw6k6FBZcZANrFiCI= - type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-detect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" - integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI= - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" From b11f6c1bf9f021098ae7fed1ae34392c0d565b9c Mon Sep 17 00:00:00 2001 From: seaona <54408225+seaona@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:58:37 +0200 Subject: [PATCH 07/17] Changelog for 10.20.0 (#16011) * Run update changelog script * Rinkeby, Ropsten and Kovan deprecation * Fix Changelog lint --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e7dbb987f6..f4697e9b8193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.20.0] +### Changed +- Deprecate Rinkeby, Ropsten and Kovan test networks and define Goerli as the default network in test mode ([#15989](https://github.com/MetaMask/metamask-extension/pull/15989)) + +### Fixed +- [FLASK] Fix crash when uninstalling snap ([#15799](https://github.com/MetaMask/metamask-extension/pull/15799)) +- [FLASK] Fix crash with certain permissions on the snap settings page ([#15797](https://github.com/MetaMask/metamask-extension/pull/15797)) +- [FLASK] Fix an issue with installing and updating snaps with 0 permissions ([#15796](https://github.com/MetaMask/metamask-extension/pull/15796)) + ## [10.19.0] ### Added - Add ENS wildcard and secure offchain resolution (ENSIP-10 & EIP3668) ([#14675](https://github.com/MetaMask/metamask-extension/pull/14675)) @@ -3189,7 +3198,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.19.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.20.0...HEAD +[10.20.0]: https://github.com/MetaMask/metamask-extension/compare/v10.19.0...v10.20.0 [10.19.0]: https://github.com/MetaMask/metamask-extension/compare/v10.18.4...v10.19.0 [10.18.4]: https://github.com/MetaMask/metamask-extension/compare/v10.18.3...v10.18.4 [10.18.3]: https://github.com/MetaMask/metamask-extension/compare/v10.18.2...v10.18.3 From 6a0dcf41b6be67383d7b1a437985fca1378c0ed5 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Fri, 30 Sep 2022 16:10:01 +0200 Subject: [PATCH 08/17] Fix `@hapi/hoek` audit failure (#16034) --- package.json | 1 + yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index ec8962ecffc2..47ed82802ddf 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,7 @@ "3box/**/libp2p-crypto/node-forge": "^1.3.0", "3box/**/libp2p-keychain/node-forge": "^1.3.0", "3box/ipfs/libp2p-webrtc-star/socket.io/engine.io": "^4.0.0", + "3box/**/@hapi/hoek": "^8.5.1", "analytics-node/axios": "^0.21.2", "ganache-core/lodash": "^4.17.21", "netmask": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 701ee0bffb97..032905d61a02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2265,15 +2265,10 @@ "@hapi/hoek" "6.x.x" "@hapi/joi" "15.x.x" -"@hapi/hoek@6.x.x", "@hapi/hoek@^6.2.0": - version "6.2.4" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595" - integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A== - -"@hapi/hoek@8.x.x": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.1.0.tgz#8f7627b23ed9bf67088fc7f9669e48c63ad421bd" - integrity sha512-b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA== +"@hapi/hoek@6.x.x", "@hapi/hoek@8.x.x", "@hapi/hoek@^6.2.0", "@hapi/hoek@^8.5.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" + integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== "@hapi/inert@^5.2.0": version "5.2.1" From 300cb6e7c5effbce3f5fb401d1b035552d75c85c Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 30 Sep 2022 20:00:59 +0530 Subject: [PATCH 09/17] Revert "Fix permissions in MV3 manifest (#15980)" (#16021) This reverts commit 67eb2f9f27ad1c6fb9a02407c7e8b1ab41597f7b. --- app/manifest/v3/_base.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json index 59cb72718377..1b9456fd8d93 100644 --- a/app/manifest/v3/_base.json +++ b/app/manifest/v3/_base.json @@ -49,10 +49,9 @@ "description": "__MSG_appDescription__", "host_permissions": [ "http://localhost:8545/", - "https://*.infura.io/", - "https://chainid.network/chains.json", - "https://lattice.gridplus.io/*", - "*://*.eth/" + "file://*/*", + "http://*/*", + "https://*/*" ], "icons": { "16": "images/icon-16.png", From 67aeb645813938a049888cf0d8a078455aaf81cc Mon Sep 17 00:00:00 2001 From: ryanml Date: Wed, 28 Sep 2022 20:26:01 -0700 Subject: [PATCH 10/17] 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 | 26 +- app/_locales/el/messages.json | 20 +- app/_locales/en/messages.json | 21 +- app/_locales/es/messages.json | 20 +- 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 | 20 +- app/_locales/he/messages.json | 15 - app/_locales/hi/messages.json | 20 +- 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 | 20 +- app/_locales/it/messages.json | 18 - app/_locales/ja/messages.json | 20 +- app/_locales/kn/messages.json | 18 - app/_locales/ko/messages.json | 20 +- 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 | 20 +- app/_locales/pt_BR/messages.json | 18 - app/_locales/ro/messages.json | 18 - app/_locales/ru/messages.json | 20 +- 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 | 20 +- app/_locales/tr/messages.json | 20 +- app/_locales/uk/messages.json | 18 - app/_locales/vi/messages.json | 20 +- app/_locales/zh/messages.json | 18 - app/_locales/zh_CN/messages.json | 19 +- 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 | 18 +- app/scripts/controllers/detect-tokens.test.js | 10 +- app/scripts/controllers/ens/index.test.js | 2 +- .../controllers/incoming-transactions.js | 9 - .../controllers/incoming-transactions.test.js | 148 ++- app/scripts/controllers/metametrics.test.js | 24 +- .../network/network-controller.test.js | 36 - app/scripts/controllers/network/network.js | 10 +- .../network/pending-middleware.test.js | 2 +- app/scripts/controllers/network/util.test.js | 8 +- app/scripts/controllers/swaps.test.js | 6 +- .../controllers/transactions/index.test.js | 36 +- .../transactions/tx-gas-utils.test.js | 6 +- .../transactions/tx-state-manager.test.js | 11 +- app/scripts/lib/account-tracker.js | 27 - app/scripts/lib/buy-url.js | 13 - app/scripts/lib/buy-url.test.js | 27 - 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 | 39 +- app/scripts/migrations/052.test.js | 60 +- app/scripts/migrations/054.test.js | 21 +- app/scripts/migrations/055.js | 18 + app/scripts/migrations/055.test.js | 18 +- app/scripts/migrations/059.test.js | 16 +- 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 | 930 ++++++++++++++++++ test/data/mock-pending-transaction-data.json | 24 +- test/data/mock-state.json | 9 +- 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 +- test/test-results/junit.xml | 23 + .../unconnected-account-alert.test.js | 5 +- .../collectible-details.js | 6 - .../collectibles-tab/collectibles-tab.test.js | 2 +- ...m-page-container-content.component.test.js | 6 +- .../app/dropdowns/network-dropdown.js | 9 - .../app/dropdowns/network-dropdown.test.js | 22 +- .../import-token-link.test.js.snap | 4 +- .../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 | 4 +- .../network-display.stories.js | 2 +- .../transaction-activity-log.util.test.js | 56 +- .../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 | 12 +- ui/ducks/metamask/metamask.test.js | 18 +- ui/ducks/send/send.test.js | 40 +- ui/ducks/swaps/swaps.test.js | 3 +- 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 | 6 - 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 | 8 +- .../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 | 33 - .../networks-tab/networks-tab.test.js | 3 - ui/pages/swaps/fee-card/fee-card.js | 3 +- ui/pages/swaps/swaps.util.js | 11 +- ui/pages/swaps/swaps.util.test.js | 31 +- ui/selectors/confirm-transaction.test.js | 13 +- ui/selectors/permissions.test.js | 4 +- ui/selectors/selectors.test.js | 2 +- ui/selectors/transactions.test.js | 11 +- ui/store/actions.test.js | 2 +- 157 files changed, 2393 insertions(+), 1978 deletions(-) create mode 100644 app/scripts/migrations/074.js create mode 100644 app/scripts/migrations/074.test.js create mode 100644 shared/constants/network.ts create mode 100644 test/test-results/junit.xml diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js index 34b848712231..fefafefc4bf5 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 e087b6990241..1a2b4b9a67c2 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 6a3d69bc2d0f..7c32af9f3adf 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -187,18 +187,9 @@ "connectingToGoerli": { "message": "ከ Goerli የሙከራ አውታረ መረብ ጋር መገናኘት" }, - "connectingToKovan": { - "message": "ከ Kovan የሙከራ አውታረ መረብ መገናኘት" - }, "connectingToMainnet": { "message": "ከዋናው የ Ethereum አውታረ መረብ ጋር መገናኘት" }, - "connectingToRinkeby": { - "message": "ከ Rinkeby የሙከራ አውታረ መረብ ጋር በመገናኘት ላይ" - }, - "connectingToRopsten": { - "message": "ከ Ropsten የሙከራ አውታረ መረብ ጋር በመገናኘት ላይ" - }, "continueToWyre": { "message": "ወደ Wyre ይቀጥሉ" }, @@ -494,9 +485,6 @@ "knownAddressRecipient": { "message": "የሚታወቅ የግንኙነት አድራሻ።" }, - "kovan": { - "message": "Kovan የሙከራ አውታረ መረብ" - }, "learnMore": { "message": "የበለጠ ይወቁ" }, @@ -753,12 +741,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 6d99fc54b78a..6e3448582ae4 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -201,18 +201,9 @@ "connectingToGoerli": { "message": "الاتصال بشبكة اختبار Goerli" }, - "connectingToKovan": { - "message": "الاتصال بشبكة اختبار Kovan" - }, "connectingToMainnet": { "message": "جارِ الاتصال بشبكة إيثيريوم الرئيسية" }, - "connectingToRinkeby": { - "message": "جارِ الاتصال بشبكة اختبار Rinkeby " - }, - "connectingToRopsten": { - "message": "جارِ الاتصال بشبكة اختبار Ropsten " - }, "continueToWyre": { "message": "الاستمرار إلى Wyre" }, @@ -507,9 +498,6 @@ "knownAddressRecipient": { "message": "عنوان العقد المعروف." }, - "kovan": { - "message": "شبكة اختبار Kovan " - }, "learnMore": { "message": "اكتشف المزيد" }, @@ -769,12 +757,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 49b76836583e..8bb45fa464d5 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "Свързване с тестова мрежа на Goerli" }, - "connectingToKovan": { - "message": "Свързване с тестовата мрежа на Kovan" - }, "connectingToMainnet": { "message": "Свързване с главната мрежа Ethereum" }, - "connectingToRinkeby": { - "message": "Свързване с тестова мрежа на Rinkeby" - }, - "connectingToRopsten": { - "message": "Свързване с тестова мрежа Ropsten" - }, "continueToWyre": { "message": "Продължете към Wyre" }, @@ -499,9 +490,6 @@ "knownAddressRecipient": { "message": "Известен адрес на договора." }, - "kovan": { - "message": "Тестова мрежа на Кован" - }, "learnMore": { "message": "Научете повече" }, @@ -764,12 +752,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 88fedac63b1f..93f39489f766 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "গোয়েরলি টেস্ট নেটওয়ার্কের সাথে সংযোগ করা হচ্ছে" }, - "connectingToKovan": { - "message": "কোভান টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, "connectingToMainnet": { "message": "মুখ্য Ethereum নেটওয়ার্কের সাথে সংযোগ করছে" }, - "connectingToRinkeby": { - "message": "রিঙ্কেবি টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, - "connectingToRopsten": { - "message": "রপস্টেন টেস্ট নেটওয়ার্কের সাথে সংযোগ করছে" - }, "continueToWyre": { "message": "Wyre এ অবিরত রাখুন" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "জানা পরিচিতির ঠিকানা৷" }, - "kovan": { - "message": "কোভান টেস্ট নেটওয়ার্ক" - }, "learnMore": { "message": "আরও জানুন" }, @@ -768,12 +756,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 3bdaf93ba630..1fd13163dc44 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -190,18 +190,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" }, @@ -490,9 +481,6 @@ "knownAddressRecipient": { "message": "Adreça de contracte coneguda" }, - "kovan": { - "message": "Xarxa de Prova Kovan" - }, "learnMore": { "message": "Saber més" }, @@ -746,12 +734,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 51ec1eac69d1..9bd3572581c6 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 4b642ef37499..36fcda696fe3 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -193,18 +193,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" }, @@ -496,9 +487,6 @@ "knownAddressRecipient": { "message": "Kendte kontaktadresser." }, - "kovan": { - "message": "Kovan Test-Netværk" - }, "learnMore": { "message": "Lær mere" }, @@ -749,12 +737,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 d78a3f854400..aedf873245bd 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -608,17 +608,11 @@ "connectingToGoerli": { "message": "Verbindung mit Goerli Test Network wird hergestellt" }, - "connectingToKovan": { - "message": " Verbinde zum Kovan Testnetzwerk" - }, "connectingToMainnet": { "message": "Verbinde zum Ethereum Mainnet" }, - "connectingToRinkeby": { - "message": " Verbinde zum Rinkeby Testnetzwerk" - }, - "connectingToRopsten": { - "message": " Verbinde zum Ropsten Testnetzwerk" + "connectingToSepolia": { + "message": "Verbindungsaufbau zum Sepolia-Testnetzwerk" }, "contactUs": { "message": "Kontaktaufnahme" @@ -1652,9 +1646,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" }, @@ -2679,11 +2670,16 @@ "revealTheSeedPhrase": { "message": "Seed-Phrase anzeigen" }, - "rinkeby": { - "message": "Rinkeby Testnetzwerk" + "revokeAllTokensTitle": { + "message": "Erlaubnis zum Zugriff auf alle Ihre $1 entziehen?", + "description": "$1 is the symbol of the token for which the user is revoking approval" + }, + "revokeApproveForAllDescription": { + "message": "Wenn Sie diese Erlaubnis entziehen, wird folgende/s/r $1 nicht mehr dazu in der Lage sein, auf Ihr/e/n $2 zuzugreifen.", + "description": "$1 is either key 'account' or 'contract', and $2 is either a string or link of a given token symbol or name" }, - "ropsten": { - "message": "Ropsten Testnetzwerk" + "revokeSpendingCapTooltipText": { + "message": "Mit diesem Contract können Sie keine weiteren Ihrer aktuellen oder zukünftigen Token ausgeben." }, "rpcUrl": { "message": "Neue RPC-URL" diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index e844d02b32b2..1338302e8214 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Σύνδεση στο Δίκτυο Δοκιμής Goerli" }, - "connectingToKovan": { - "message": "Σύνδεση στο Δοκιμαστικό Δίκτυο Kovan" - }, "connectingToMainnet": { "message": "Σύνδεση στο Κύριο Δίκτυο Ethereum" }, - "connectingToRinkeby": { - "message": "Σύνδεση στο Δίκτυο Δοκιμών Rinkeby" - }, - "connectingToRopsten": { - "message": "Σύνδεση με το Δίκτυο Δοκιμών Ropsten" + "connectingToSepolia": { + "message": "Σύνδεση στο δίκτυο δοκιμών Sepolia" }, "contactUs": { "message": "Επικοινωνήστε μαζί μας" @@ -1666,9 +1660,6 @@ "knownTokenWarning": { "message": "Αυτή η ενέργεια θα επεξεργαστεί tokens που είναι ήδη εισηγμένα στο πορτοφόλι σας, τα οποίαο μπορεί να χρησιμοποιηθούν για να σας κλέψουν στοιχεία. Αποδεχθείτε μόνο αν είστε σίγουροι ότι θέλετε να αλλάξετε αυτό που αντιπροσωπεύουν αυτά τα νομίσματα. Μάθετε περισσότερά γι'αυτό $1" }, - "kovan": { - "message": "Δίκτυο Δοκιμής Kovan" - }, "lastConnected": { "message": "Τελευταία Σύνδεση" }, @@ -2724,11 +2715,8 @@ "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" + "revokeSpendingCapTooltipText": { + "message": "Αυτός ο συμβαλλόμενος δεν θα μπορεί να ξοδέψει άλλα από τα τρέχοντα ή μελλοντικά σας tokens." }, "rpcUrl": { "message": "Νέο RPC URL" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index e8852f869cab..440596606bb4 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -704,18 +704,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" }, @@ -824,6 +815,9 @@ "currentLanguage": { "message": "Current language" }, + "currentRpcUrlDeprecated": { + "message": "The current rpc url for this network has been deprecated." + }, "currentTitle": { "message": "Current:" }, @@ -1808,9 +1802,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" }, @@ -2928,12 +2919,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 541bbf579e1d..b76062521ecf 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -616,17 +616,11 @@ "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" }, "contactUs": { "message": "Contáctenos" @@ -1666,9 +1660,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" }, @@ -2724,11 +2715,8 @@ "message": "Al revocar permisos, el/la siguiente $1 no tendrá más acceso a su $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": "Red de prueba Rinkeby" - }, - "ropsten": { - "message": "Red de prueba Ropsten" + "revokeSpendingCapTooltipText": { + "message": "Este contrato no podrá gastar más de sus tokens actuales o futuros." }, "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 e3a617fbebd3..88dcc4c3c4e9 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -514,18 +514,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" }, @@ -1425,9 +1416,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" }, @@ -2248,12 +2236,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 1b1a3872061c..9fda9b49fe68 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -193,18 +193,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" }, @@ -499,9 +490,6 @@ "knownAddressRecipient": { "message": "Teadaolev lepinguaadress." }, - "kovan": { - "message": "Kovani testvõrk" - }, "learnMore": { "message": "Lisateave" }, @@ -758,12 +746,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 ab74d3482c0d..cf7d86087a3b 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "در حال اتصال به شبکه آزمایشی Goerli " }, - "connectingToKovan": { - "message": "در حال اتصال به شبکه آزمایشی Kovan" - }, "connectingToMainnet": { "message": "در حال اتصال به شبکه اصلی ایتریم" }, - "connectingToRinkeby": { - "message": "در حال اتصال به شبکه آزمایشی Rinkeby" - }, - "connectingToRopsten": { - "message": "در حال اتصال به شبکه آزمایشی Ropsten" - }, "continueToWyre": { "message": "ادامه به Wyre" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "آدرس شناخته شده قرارداد" }, - "kovan": { - "message": "شبکه آزمایشی Kovan" - }, "learnMore": { "message": "بیشتر بدانید" }, @@ -768,12 +756,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 496475976a3b..737090e1b8cd 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -193,18 +193,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" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "Tunnettu sopimusosoite." }, - "kovan": { - "message": "Kovanin koeverkko" - }, "learnMore": { "message": "Lisätietoa" }, @@ -765,12 +753,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 6ed19fecdfa0..189d431e9a38 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -172,18 +172,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 43c53f4d7c3d..9410d6ef7110 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Connexion au réseau de test Goerli" }, - "connectingToKovan": { - "message": "Connexion au réseau de test Kovan" - }, "connectingToMainnet": { "message": "Connexion au réseau principal Ethereum" }, - "connectingToRinkeby": { - "message": "Connexion au réseau de test Rinkeby" - }, - "connectingToRopsten": { - "message": "Connexion au réseau de test Ropsten" + "connectingToSepolia": { + "message": "Connexion au réseau de test Sepolia" }, "contactUs": { "message": "Nous contacter" @@ -1666,9 +1660,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": "Réseau de test Kovan" - }, "lastConnected": { "message": "Dernière connexion" }, @@ -2724,11 +2715,8 @@ "message": "En révoquant cette autorisation, les $1 suivants ne pourront plus accéder à vos $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": "Réseau de test Rinkeby" - }, - "ropsten": { - "message": "Réseau de test Ropsten" + "revokeSpendingCapTooltipText": { + "message": "L’autre partie à ce contrat ne pourra plus dépenser vos jetons actuels ou futurs." }, "rpcUrl": { "message": "Nouvelle URL de RPC" diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 9bfd09d99abe..94c229408456 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "מתחבר ל-Goerli Test Network" }, - "connectingToKovan": { - "message": "מתחבר ל-Kovan Test Network" - }, "connectingToMainnet": { "message": "מתחבר לרשת אתריום הראשית" }, - "connectingToRinkeby": { - "message": "מתחבר ל- Rinkeby Test Network " - }, - "connectingToRopsten": { - "message": "מתחבר אל רשת בדיקה Ropsten " - }, "continueToWyre": { "message": "המשך ל-Wyre" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "כתובת חוזה ידועה." }, - "kovan": { - "message": "רשת בדיקה Kovan " - }, "learnMore": { "message": "למדו עוד" }, @@ -765,9 +753,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 dd68eaaf1b13..79620f31e6d7 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Goerli टेस्ट नेटवर्क से कनेक्ट हो रहा है" }, - "connectingToKovan": { - "message": "Kovan टेस्ट नेटवर्क से कनेक्ट हो रहा है" - }, "connectingToMainnet": { "message": "Ethereum Mainnet से कनेक्ट हो रहा है" }, - "connectingToRinkeby": { - "message": "Rinkeby टेस्ट नेटवर्क से कनेक्ट हो रहा है" - }, - "connectingToRopsten": { - "message": "Ropsten टेस्ट नेटवर्क से कनेक्ट हो रहा है" + "connectingToSepolia": { + "message": "सेपोलिया टेस्ट नेटवर्क से कनेक्ट कर रहा है" }, "contactUs": { "message": "हमसे संपर्क करें" @@ -1666,9 +1660,6 @@ "knownTokenWarning": { "message": "यह कार्रवाई उन टोकन को संपादित करेगी, जो पहले से ही आपके वॉलेट में सूचीबद्ध हैं, जिसका उपयोग आपको फ़िश करने के लिए किया जा सकता है। केवल तभी अनुमोदित करें, जब आप इस बात को लेकर सुनिश्चित हों कि आप इन टोकन का प्रतिनिधित्व बदलना चाहते हैं। $1 के बारे में और अधिक जानें" }, - "kovan": { - "message": "Kovan टेस्ट नेटवर्क" - }, "lastConnected": { "message": "अंतिम बार कनेक्ट किया गया" }, @@ -2724,11 +2715,8 @@ "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 टेस्ट नेटवर्क" + "revokeSpendingCapTooltipText": { + "message": "यह अनुबंध आपके वर्तमान या भविष्य के और टोकन पर खर्च करने में असमर्थ है।" }, "rpcUrl": { "message": "नया RPC URL" diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 0fc0a7c26155..8b509d267fc0 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -178,9 +178,6 @@ "message": "JSON फ़ाइल", "description": "format for importing an account" }, - "kovan": { - "message": "कोवान टेस्ट नेटवर्क" - }, "likeToImportTokens": { "message": "क्या आप इन टोकनों को जोड़ना चाहते हैं?" }, @@ -284,12 +281,6 @@ "revealSeedWordsWarning": { "message": "किसी सार्वजनिक स्थान पर अपने बीज के शब्द ठीक नहीं करें! ये शब्द आपके सभी खातों को चोरी करने के लिए उपयोग किए जा सकते हैं।" }, - "rinkeby": { - "message": "रिचीव टेस्ट नेटवर्क" - }, - "ropsten": { - "message": "रॉप्स्टेन टेस्ट नेटवर्क" - }, "save": { "message": "सहेजें" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 551b1f15aa21..c1555838c8b3 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -193,18 +193,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" }, @@ -499,9 +490,6 @@ "knownAddressRecipient": { "message": "Poznata ugovorna adresa." }, - "kovan": { - "message": "Testna mreža Kovan" - }, "learnMore": { "message": "Saznajte više" }, @@ -761,12 +749,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 44409dd4598e..dd1579bac07c 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" }, @@ -295,9 +286,6 @@ "message": "JSON Dosye", "description": "format for importing an account" }, - "kovan": { - "message": "Kovan Tès Rezo" - }, "learnMore": { "message": "Aprann plis" }, @@ -491,12 +479,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 590b77f86e22..d6a4baadb1ae 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -193,18 +193,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" }, @@ -499,9 +490,6 @@ "knownAddressRecipient": { "message": "Ismert szerződéses cím." }, - "kovan": { - "message": "Kovan teszthálózat" - }, "learnMore": { "message": "Tudjon meg többet" }, @@ -761,12 +749,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 8063b53d64ab..2d86d9ec08db 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -616,17 +616,11 @@ "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" }, "contactUs": { "message": "Hubungi kami" @@ -1666,9 +1660,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" }, @@ -2724,11 +2715,8 @@ "message": "Dengan mencabut izin, $1 berikut tidak lagi dapat mengakses $2 Anda", "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": "Jaringan Uji Rinkeby" - }, - "ropsten": { - "message": "Jaringan Uji Ropsten" + "revokeSpendingCapTooltipText": { + "message": "Kontrak ini tidak akan dapat mempergunakan token Anda saat ini atau di masa mendatang." }, "rpcUrl": { "message": "URL RPC Baru" diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index c352034da896..246960f014fc 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -295,18 +295,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!" }, @@ -789,9 +780,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" }, @@ -1152,12 +1140,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 0b9a735fbcdb..3bbe7a90d718 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Goerliテストネットワークに接続中" }, - "connectingToKovan": { - "message": "Kovanテストネットワークに接続中" - }, "connectingToMainnet": { "message": "イーサリアムメインネットに接続中" }, - "connectingToRinkeby": { - "message": "Rinkebyテストネットワークに接続中" - }, - "connectingToRopsten": { - "message": "Ropstenテストネットワークに接続中" + "connectingToSepolia": { + "message": "Sepolia テストネットワークに接続中" }, "contactUs": { "message": "お問い合わせ" @@ -1666,9 +1660,6 @@ "knownTokenWarning": { "message": "このアクションは、ウォレットに既に一覧表示されているトークンを編集します。これは、フィッシングに使用される可能性があります。これらのトークンの表す内容を変更する意図が確実な場合にのみ承認します。$1に関する詳細をご覧ください" }, - "kovan": { - "message": "Kovanテストネットワーク" - }, "lastConnected": { "message": "前回の接続" }, @@ -2724,11 +2715,8 @@ "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テストネットワーク" + "revokeSpendingCapTooltipText": { + "message": "このコントラクトは、現在または今後のトークンをこれ以上使用できなくなります。" }, "rpcUrl": { "message": "新しいRPC URL" diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 762b250c7ff6..831ce3344e28 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "Goerli ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" }, - "connectingToKovan": { - "message": "Kovan ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ " - }, "connectingToMainnet": { "message": "ಮುಖ್ಯ ಎಥೆರಿಯಮ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" }, - "connectingToRinkeby": { - "message": "Rinkeby ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" - }, - "connectingToRopsten": { - "message": "Ropsten ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" - }, "continueToWyre": { "message": "Wyre ಗೆ ಮುಂದುವರಿಸಿ" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "ತಿಳಿದಿರುವ ಒಪ್ಪಂದದ ವಿಳಾಸ." }, - "kovan": { - "message": "Kovan ಪರೀಕ್ಷೆ ನೆಟ್‌ವರ್ಕ್" - }, "learnMore": { "message": "ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ" }, @@ -768,12 +756,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 f4d108491dc0..1c647cf5e846 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Goerli 테스트 네트워크에 연결 중" }, - "connectingToKovan": { - "message": "Kovan 테스트 네트워크에 연결 중" - }, "connectingToMainnet": { "message": "이더리움 메인넷에 연결 중" }, - "connectingToRinkeby": { - "message": "Rinkeby 테스트 네트워크에 연결 중" - }, - "connectingToRopsten": { - "message": "Ropsten 테스트 네트워크에 연결 중" + "connectingToSepolia": { + "message": "Sepolia 테스트 네트워크에 연결 중" }, "contactUs": { "message": "문의하기" @@ -1666,9 +1660,6 @@ "knownTokenWarning": { "message": "이 작업은 지갑에 이미 나열되어 있고 피싱에 사용될 수 있는 토큰을 편집합니다. 해당 토큰이 나타내는 내용을 변경하려는 경우에만 작업을 승인하세요. $1에 대해 자세히 알아보기" }, - "kovan": { - "message": "Kovan 테스트 네트워크" - }, "lastConnected": { "message": "마지막 연결" }, @@ -2724,11 +2715,8 @@ "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 테스트 네트워크" + "revokeSpendingCapTooltipText": { + "message": "이 계약은 현재나 미래의 토큰을 더 이상 사용할 수 없습니다." }, "rpcUrl": { "message": "새 RPC URL" diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 68dd08edc238..7672fa096ced 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -193,18 +193,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“" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "Žinomas sutarties adresas." }, - "kovan": { - "message": "„Kovan“ bandomasis tinklas" - }, "learnMore": { "message": "Sužinokite daugiau" }, @@ -768,12 +756,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 30e65fd68b1e..ec46605efe63 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -193,18 +193,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" }, @@ -499,9 +490,6 @@ "knownAddressRecipient": { "message": "Zināmā līguma adrese." }, - "kovan": { - "message": "Kovan testa tīkls" - }, "learnMore": { "message": "Uzzināt vairāk" }, @@ -764,12 +752,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 8923fb8bfcb9..20fca94c08eb 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -193,18 +193,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" }, @@ -492,9 +483,6 @@ "knownAddressRecipient": { "message": "Alamat kontrak diketahui." }, - "kovan": { - "message": "Rangkaian Ujian Kovan" - }, "learnMore": { "message": "Maklumat lanjut" }, @@ -748,12 +736,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 03510df014fb..b77ced60a84a 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -175,9 +175,6 @@ "message": "JSON-bestand", "description": "format for importing an account" }, - "kovan": { - "message": "Kovan-testnetwerk" - }, "likeToImportTokens": { "message": "Wil je deze tokens toevoegen?" }, @@ -274,12 +271,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 8d1cc1eab29e..07f2ae027753 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -190,18 +190,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 " }, @@ -490,9 +481,6 @@ "knownAddressRecipient": { "message": "Kjent kontaktadresse" }, - "kovan": { - "message": "Kovan testnettverk" - }, "learnMore": { "message": "Lær mer" }, @@ -755,9 +743,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 af0a3c7a6fd9..a5c5901a75aa 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -355,18 +355,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" }, @@ -924,9 +915,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" }, @@ -1435,12 +1423,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 0025ba5fa3ed..5b2b6441daea 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -193,18 +193,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" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "Znany adres kontraktu." }, - "kovan": { - "message": "Sieć testowa Kovan" - }, "learnMore": { "message": "Dowiedz się więcej" }, @@ -762,12 +750,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 4e261ec78a2b..a3e223eed676 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -616,17 +616,11 @@ "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" }, "contactUs": { "message": "Fale conosco" @@ -1666,9 +1660,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 Teste Kovan" - }, "lastConnected": { "message": "Conectado pela última vez em" }, @@ -2724,11 +2715,8 @@ "message": "Ao revogar a permissão, o $1 a seguir não terá mais acesso ao seu $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": "Rede de Teste Rinkeby" - }, - "ropsten": { - "message": "Rede de Teste Ropsten" + "revokeSpendingCapTooltipText": { + "message": "Este contrato não poderá gastar mais nenhum de seus tokens atuais ou futuros." }, "rpcUrl": { "message": "Novo URL da RPC" diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 5b2c104595be..802b1b55c594 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -514,18 +514,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" }, @@ -1409,9 +1400,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" }, @@ -2232,12 +2220,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 002236935c12..6484ab9f2648 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -193,18 +193,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" }, @@ -493,9 +484,6 @@ "knownAddressRecipient": { "message": "Adresa cunoscută din contract." }, - "kovan": { - "message": "Rețea de test Kovan" - }, "learnMore": { "message": "Aflați mai multe" }, @@ -755,12 +743,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 a4d0891ab073..d194ac40dd99 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -616,17 +616,11 @@ "connectingToGoerli": { "message": "Подключение к тестовой сети Goerli..." }, - "connectingToKovan": { - "message": "Подключение к тестовой сети Kovan..." - }, "connectingToMainnet": { "message": "Подключение к сети Ethereum Mainnet..." }, - "connectingToRinkeby": { - "message": "Подключение к тестовой сети Rinkeby..." - }, - "connectingToRopsten": { - "message": "Подключение к тестовой сети Ropsten..." + "connectingToSepolia": { + "message": "Подключение к тестовой сети Sepolia..." }, "contactUs": { "message": "Свяжитесь с нами" @@ -1666,9 +1660,6 @@ "knownTokenWarning": { "message": "Это действие изменит токены, уже указанные в вашем кошельке, которые можно использовать для фишинга. Утверждайте, только если вы уверены, что хотите изменить то, что представляют эти токены. Узнайте подробнее о $1" }, - "kovan": { - "message": "Тестовая сеть Kovan" - }, "lastConnected": { "message": "Последнее подключение" }, @@ -2724,11 +2715,8 @@ "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" + "revokeSpendingCapTooltipText": { + "message": "Этот контракт не позволит вам больше тратить ваши текущие или будущие токены." }, "rpcUrl": { "message": "Новый URL-адрес RPC" diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 2bfd7e540dcc..da3f1889a316 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -187,18 +187,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 c49155135358..cb6812231ebb 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -193,18 +193,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" }, @@ -497,9 +488,6 @@ "knownAddressRecipient": { "message": "Znan naslov pogodbe." }, - "kovan": { - "message": "Testno omrežje Kovan" - }, "learnMore": { "message": "Preberite več" }, @@ -756,12 +744,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 5ebbd176e554..e70ff66c9458 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -190,18 +190,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" }, @@ -500,9 +491,6 @@ "knownAddressRecipient": { "message": "Poznata adresa ugovora." }, - "kovan": { - "message": "Kovan test mreža" - }, "learnMore": { "message": "Nauči više" }, @@ -759,12 +747,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 c8d77d1677ed..e5a64143062f 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -187,18 +187,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" }, @@ -493,9 +484,6 @@ "knownAddressRecipient": { "message": "Känd kontraktadress." }, - "kovan": { - "message": "Kovan testnätverk" - }, "learnMore": { "message": "Läs mer" }, @@ -752,12 +740,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 9a060e45ec42..a7307bb439b7 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -187,18 +187,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" }, @@ -490,9 +481,6 @@ "knownAddressRecipient": { "message": "Anwani za mkataba zinazofahamika." }, - "kovan": { - "message": "Mtandao wa Majaribio wa Kovan" - }, "learnMore": { "message": "Jifunze zaidi" }, @@ -746,12 +734,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 7d003b620d4a..270bd0b4db0b 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": "ஒப்பந்த வரிசைப்படுத்தல்" }, @@ -238,9 +229,6 @@ "message": "JSON கோப்பு", "description": "format for importing an account" }, - "kovan": { - "message": "கோவன் டெஸ்ட் நெட்வொர்க்" - }, "learnMore": { "message": "மேலும் அறிக" }, @@ -392,12 +380,6 @@ "revealSeedWordsWarning": { "message": "உங்கள் விதை வார்த்தைகள் ஒரு பொது இடத்தில் மீட்க வேண்டாம்! உங்கள் எல்லா கணக்குகளையும் திருட இந்த வார்த்தைகள் பயன்படுத்தப்படலாம்." }, - "rinkeby": { - "message": "ரிங்கெப்ய டெஸ்ட் நெட்வொர்க்" - }, - "ropsten": { - "message": "ரொப்ஸ்டென் டெஸ்ட் நெட்வொர்க்" - }, "save": { "message": "சேமி" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 6daf3c05b10b..7a7e2dbc3058 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" }, @@ -253,9 +250,6 @@ "message": "ไฟล์ JSON", "description": "format for importing an account" }, - "kovan": { - "message": "เครือข่ายทดสอบ Kovan" - }, "learnMore": { "message": "เรียนรู้เพิ่มเติม" }, @@ -380,12 +374,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 04c1f8983395..d04235ae449f 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -616,17 +616,11 @@ "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" + "connectingToSepolia": { + "message": "Kumokonekta sa Sepolia test network" }, "contactUs": { "message": "Makipag-ugnayan sa amin" @@ -1666,9 +1660,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" }, @@ -2724,11 +2715,8 @@ "message": "Sa pamamagitan ng pagbawi ng pahintulot, hindi na maa-access ng sumusunod na $1 ang iyong $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 Test Network" - }, - "ropsten": { - "message": "Ropsten Test Network" + "revokeSpendingCapTooltipText": { + "message": "Hindi na magagawang gastusin pa ng kontratang ito ang iyong mga pangkasalukuyan o panghinaharap na mga token." }, "rpcUrl": { "message": "Bagong RPC URL" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index fa30acbdd684..6ddc0eeb8c8e 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -616,17 +616,11 @@ "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" }, "contactUs": { "message": "Bize ulaşın" @@ -1666,9 +1660,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" }, @@ -2724,11 +2715,8 @@ "message": "İzni geri çektiğinizde aşağıdaki $1 artık $2 alanınıza erişim sağlayamayacak", "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 Test Ağı" - }, - "ropsten": { - "message": "Ropsten Test Ağı" + "revokeSpendingCapTooltipText": { + "message": "Bu sözleşme şimdiki ya da gelecekteki tokenlerinizin hiçbirini kullanamayacak." }, "rpcUrl": { "message": "Yeni RPC URL adresi" diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 2b47cd8d45ef..acc8275672b7 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -193,18 +193,9 @@ "connectingToGoerli": { "message": "Підключення до тестової мережі Goerli" }, - "connectingToKovan": { - "message": "Підключення до тестової мережі Kovan" - }, "connectingToMainnet": { "message": "З'єднуємось з Головною мережею Ethereum" }, - "connectingToRinkeby": { - "message": "Під'єднуємось до тестової мережі Rinkeby" - }, - "connectingToRopsten": { - "message": "Під'єднуємось до Тестової мережі Ropsten" - }, "continueToWyre": { "message": "Продовжити у Wyre" }, @@ -503,9 +494,6 @@ "knownAddressRecipient": { "message": "Відома контрактна адреса." }, - "kovan": { - "message": "Тестова мережа Kovan" - }, "learnMore": { "message": "Дізнатись більше" }, @@ -768,12 +756,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 9adab7642c74..c8133649a42f 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -616,17 +616,11 @@ "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" }, "contactUs": { "message": "Liên hệ với chúng tôi" @@ -1666,9 +1660,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" }, @@ -2724,11 +2715,8 @@ "message": "Bằng cách thu hồi quyền truy cập, $1 sau đây sẽ không thể truy cập vào $2 của bạn nữa", "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": "Mạng thử nghiệm Rinkeby" - }, - "ropsten": { - "message": "Mạng thử nghiệm Ropsten" + "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." }, "rpcUrl": { "message": "URL RPC mới" diff --git a/app/_locales/zh/messages.json b/app/_locales/zh/messages.json index 37d0db90632a..49f7140a6c14 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": "最后连接" }, @@ -2734,12 +2722,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 147485e81802..80f25739e389 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -506,17 +506,11 @@ "connectingToGoerli": { "message": "正在连接 Goerli 测试网络" }, - "connectingToKovan": { - "message": "正在连接到 Kovan 测试网络" - }, "connectingToMainnet": { "message": "正在连接到以太坊 Ethereum 主网" }, - "connectingToRinkeby": { - "message": "正在连接到 Rinkeby 测试网络" - }, - "connectingToRopsten": { - "message": "正在连接到 Ropsten 测试网络" + "connectingToSepolia": { + "message": "正在连接Sepolia测试网络" }, "contactUs": { "message": "联系我们" @@ -1376,9 +1370,6 @@ "knownTokenWarning": { "message": "此操作将编辑已经在您的钱包中列出的代币，有可能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1" }, - "kovan": { - "message": "Kovan 测试网络" - }, "lastConnected": { "message": "最后连接" }, @@ -2199,12 +2190,6 @@ "revealSeedWordsWarningTitle": { "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 4bed5f928ef6..cfa64615f258 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -196,18 +196,9 @@ "connectingToGoerli": { "message": "連接至 Goerli 測試網路" }, - "connectingToKovan": { - "message": "連線到 Kovan 測試網路" - }, "connectingToMainnet": { "message": "連線到主 Ethereum 網路" }, - "connectingToRinkeby": { - "message": "連線到 Rinkeby 測試網路" - }, - "connectingToRopsten": { - "message": "連線到 Ropsten 測試網路" - }, "continueToWyre": { "message": "繼續至 Wyre" }, @@ -503,9 +494,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/scripts/constants/contracts.js b/app/scripts/constants/contracts.js index 7afbba1f0ef3..19ed411ec57f 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 5dfdc2f70dcc..6e96504a66a5 100644 --- a/app/scripts/controllers/app-state.js +++ b/app/scripts/controllers/app-state.js @@ -40,9 +40,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 5ef473110559..fb581ef5ea0b 100644 --- a/app/scripts/controllers/cached-balances.test.js +++ b/app/scripts/controllers/cached-balances.test.js @@ -1,13 +1,13 @@ import { strict as assert } from 'assert'; import sinon from 'sinon'; -import { KOVAN_CHAIN_ID } from '../../../shared/constants/network'; +import { GOERLI_CHAIN_ID } from '../../../shared/constants/network'; import CachedBalancesController from './cached-balances'; describe('CachedBalancesController', function () { describe('updateCachedBalances', function () { it('should update the cached balances', async function () { const controller = new CachedBalancesController({ - getCurrentChainId: () => KOVAN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, accountTracker: { store: { subscribe: () => undefined, @@ -27,7 +27,7 @@ describe('CachedBalancesController', function () { assert.equal(controller._generateBalancesToCache.callCount, 1); assert.deepEqual(controller._generateBalancesToCache.args[0], [ 'mockAccounts', - KOVAN_CHAIN_ID, + GOERLI_CHAIN_ID, ]); assert.equal( controller.store.getState().cachedBalances, @@ -46,7 +46,7 @@ describe('CachedBalancesController', function () { }, initState: { cachedBalances: { - [KOVAN_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { a: '0x1', b: '0x2', c: '0x3', @@ -66,11 +66,11 @@ describe('CachedBalancesController', function () { b: { balance: null }, c: { balance: '0x5' }, }, - KOVAN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepEqual(result, { - [KOVAN_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { a: '0x4', b: '0x2', c: '0x5', @@ -92,7 +92,7 @@ describe('CachedBalancesController', function () { }, initState: { cachedBalances: { - [KOVAN_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { a: '0x1', b: '0x2', c: '0x3', @@ -111,7 +111,7 @@ describe('CachedBalancesController', function () { ); assert.deepEqual(result, { - [KOVAN_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { 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: () => KOVAN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, accountTracker: { store: { subscribe: subscribeSpy, diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js index f0ec07954816..7b55e9fa40cf 100644 --- a/app/scripts/controllers/detect-tokens.test.js +++ b/app/scripts/controllers/detect-tokens.test.js @@ -9,7 +9,7 @@ import { TokensController, AssetsContractController, } from '@metamask/controllers'; -import { MAINNET, ROPSTEN } from '../../../shared/constants/network'; +import { MAINNET, SEPOLIA } from '../../../shared/constants/network'; import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; import DetectTokensController from './detect-tokens'; import NetworkController from './network'; @@ -195,15 +195,15 @@ describe('DetectTokensController', function () { it('should not check and add tokens while on unsupported networks', async function () { sandbox.useFakeTimers(); - network.setProviderType(ROPSTEN); - const tokenListMessengerRopsten = new ControllerMessenger().getRestricted({ + network.setProviderType(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 d325e2885084..aa7ed8c04a98 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 f1f81352be6c..95473937b6da 100644 --- a/app/scripts/controllers/incoming-transactions.js +++ b/app/scripts/controllers/incoming-transactions.js @@ -13,10 +13,7 @@ import { CHAIN_ID_TO_NETWORK_ID_MAP, CHAIN_ID_TO_TYPE_MAP, GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, } from '../../../shared/constants/network'; @@ -55,10 +52,7 @@ const fetchWithTimeout = getFetchWithTimeout(); */ const etherscanSupportedNetworks = [ GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, ]; @@ -84,10 +78,7 @@ export default class IncomingTransactionsController { incomingTransactions: {}, incomingTxLastFetchedBlockByChainId: { [GOERLI_CHAIN_ID]: null, - [KOVAN_CHAIN_ID]: null, [MAINNET_CHAIN_ID]: null, - [RINKEBY_CHAIN_ID]: null, - [ROPSTEN_CHAIN_ID]: null, [SEPOLIA_CHAIN_ID]: null, }, ...opts.initState, diff --git a/app/scripts/controllers/incoming-transactions.test.js b/app/scripts/controllers/incoming-transactions.test.js index 5d1d8612942d..c341ab5579e2 100644 --- a/app/scripts/controllers/incoming-transactions.test.js +++ b/app/scripts/controllers/incoming-transactions.test.js @@ -8,13 +8,10 @@ import waitUntilCalled from '../../../test/lib/wait-until-called'; import { CHAIN_ID_TO_TYPE_MAP, GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, - ROPSTEN_NETWORK_ID, - ROPSTEN, + GOERLI_NETWORK_ID, + GOERLI, } from '../../../shared/constants/network'; import { TRANSACTION_TYPES, @@ -36,18 +33,12 @@ const PREPOPULATED_INCOMING_TXS_BY_HASH = { }; const PREPOPULATED_BLOCKS_BY_NETWORK = { [GOERLI_CHAIN_ID]: 1, - [KOVAN_CHAIN_ID]: 2, [MAINNET_CHAIN_ID]: 3, - [RINKEBY_CHAIN_ID]: 5, - [ROPSTEN_CHAIN_ID]: 4, [SEPOLIA_CHAIN_ID]: 6, }; const EMPTY_BLOCKS_BY_NETWORK = { [GOERLI_CHAIN_ID]: null, - [KOVAN_CHAIN_ID]: null, [MAINNET_CHAIN_ID]: null, - [RINKEBY_CHAIN_ID]: null, - [ROPSTEN_CHAIN_ID]: null, [SEPOLIA_CHAIN_ID]: null, }; @@ -152,10 +143,7 @@ const getFakeEtherscanTransaction = ({ function nockEtherscanApiForAllChains(mockResponse) { for (const chainId of [ GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, 'undefined', ]) { @@ -251,16 +239,16 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, ); const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - ROPSTEN_CHAIN_ID + GOERLI_CHAIN_ID ]; - 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}`, ) @@ -310,8 +298,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -327,8 +315,8 @@ describe('IncomingTransactionsController', function () { '0xfakeeip1559': { blockNumber: '10', hash: '0xfakeeip1559', - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -345,7 +333,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [ROPSTEN_CHAIN_ID]: 11, + [GOERLI_CHAIN_ID]: 11, }, }, 'State should have been updated after first block was received', @@ -453,7 +441,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -498,7 +486,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -545,7 +533,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -553,9 +541,9 @@ describe('IncomingTransactionsController', function () { const NEW_MOCK_SELECTED_ADDRESS = `${MOCK_SELECTED_ADDRESS}9`; const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - ROPSTEN_CHAIN_ID + GOERLI_CHAIN_ID ]; - 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}`, ) @@ -608,8 +596,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -625,7 +613,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [ROPSTEN_CHAIN_ID]: 11, + [GOERLI_CHAIN_ID]: 11, }, }, 'State should have been updated after first block was received', @@ -692,7 +680,7 @@ describe('IncomingTransactionsController', function () { it('should update when switching to a supported network', async function () { const mockedNetworkMethods = - getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID); + getMockNetworkControllerMethods(GOERLI_CHAIN_ID); const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), @@ -703,9 +691,9 @@ describe('IncomingTransactionsController', function () { ); const startBlock = getNonEmptyInitState().incomingTxLastFetchedBlockByChainId[ - ROPSTEN_CHAIN_ID + GOERLI_CHAIN_ID ]; - 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}`, ) @@ -727,7 +715,7 @@ describe('IncomingTransactionsController', function () { const subscription = mockedNetworkMethods.onNetworkDidChange.getCall(0).args[0]; - await subscription(ROPSTEN_CHAIN_ID); + await subscription(GOERLI_CHAIN_ID); await updateStateCalled(); const actualState = incomingTransactionsController.store.getState(); @@ -748,8 +736,8 @@ describe('IncomingTransactionsController', function () { '0xfake': { blockNumber: '10', hash: '0xfake', - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 16000000000000000, type: TRANSACTION_TYPES.INCOMING, @@ -765,7 +753,7 @@ describe('IncomingTransactionsController', function () { }, incomingTxLastFetchedBlockByChainId: { ...getNonEmptyInitState().incomingTxLastFetchedBlockByChainId, - [ROPSTEN_CHAIN_ID]: 11, + [GOERLI_CHAIN_ID]: 11, }, }, 'State should have been updated after first block was received', @@ -774,7 +762,7 @@ describe('IncomingTransactionsController', function () { it('should not update when switching to an unsupported network', async function () { const mockedNetworkMethods = - getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID); + getMockNetworkControllerMethods(GOERLI_CHAIN_ID); const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), @@ -832,10 +820,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getEmptyInitState(), - getCurrentChainId: () => ROPSTEN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, }); sinon.spy(incomingTransactionsController.store, 'updateState'); @@ -850,14 +838,14 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 999, ROPSTEN_CHAIN_ID], + ['fakeAddress', 999, GOERLI_CHAIN_ID], ); assert.deepStrictEqual( incomingTransactionsController.store.updateState.getCall(0).args[0], { incomingTxLastFetchedBlockByChainId: { ...EMPTY_BLOCKS_BY_NETWORK, - [ROPSTEN_CHAIN_ID]: 1000, + [GOERLI_CHAIN_ID]: 1000, }, incomingTransactions: {}, }, @@ -868,10 +856,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getEmptyInitState(), - getCurrentChainId: () => ROPSTEN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, }); const NEW_TRANSACTION_ONE = { @@ -897,7 +885,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 10, ROPSTEN_CHAIN_ID], + ['fakeAddress', 10, GOERLI_CHAIN_ID], ); assert.deepStrictEqual( @@ -905,7 +893,7 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...EMPTY_BLOCKS_BY_NETWORK, - [ROPSTEN_CHAIN_ID]: 445, + [GOERLI_CHAIN_ID]: 445, }, incomingTransactions: { [NEW_TRANSACTION_ONE.hash]: NEW_TRANSACTION_ONE, @@ -921,10 +909,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController({ blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), - getCurrentChainId: () => ROPSTEN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, }); sinon.spy(incomingTransactionsController.store, 'updateState'); incomingTransactionsController._getNewIncomingTransactions = sinon @@ -940,7 +928,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 4, ROPSTEN_CHAIN_ID], + ['fakeAddress', 1, GOERLI_CHAIN_ID], ); assert.deepStrictEqual( @@ -948,8 +936,8 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...PREPOPULATED_BLOCKS_BY_NETWORK, - [ROPSTEN_CHAIN_ID]: - PREPOPULATED_BLOCKS_BY_NETWORK[ROPSTEN_CHAIN_ID] + 1, + [GOERLI_CHAIN_ID]: + PREPOPULATED_BLOCKS_BY_NETWORK[GOERLI_CHAIN_ID] + 1, }, incomingTransactions: PREPOPULATED_INCOMING_TXS_BY_HASH, }, @@ -961,10 +949,10 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), - getCurrentChainId: () => ROPSTEN_CHAIN_ID, + getCurrentChainId: () => GOERLI_CHAIN_ID, }, ); @@ -991,7 +979,7 @@ describe('IncomingTransactionsController', function () { assert.deepStrictEqual( incomingTransactionsController._getNewIncomingTransactions.getCall(0) .args, - ['fakeAddress', 4, ROPSTEN_CHAIN_ID], + ['fakeAddress', 1, GOERLI_CHAIN_ID], ); assert.deepStrictEqual( @@ -999,7 +987,7 @@ describe('IncomingTransactionsController', function () { { incomingTxLastFetchedBlockByChainId: { ...PREPOPULATED_BLOCKS_BY_NETWORK, - [ROPSTEN_CHAIN_ID]: 445, + [GOERLI_CHAIN_ID]: 445, }, incomingTransactions: { ...PREPOPULATED_INCOMING_TXS_BY_HASH, @@ -1036,7 +1024,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1045,13 +1033,13 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert(mockFetch.calledOnce); assert.strictEqual( mockFetch.getCall(0).args[0], - `https://api-${ROPSTEN}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1&startBlock=789`, + `https://api-${GOERLI}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1&startBlock=789`, ); }); @@ -1082,7 +1070,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1091,13 +1079,13 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, null, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert(mockFetch.calledOnce); assert.strictEqual( mockFetch.getCall(0).args[0], - `https://api-${ROPSTEN}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1`, + `https://api-${GOERLI}.etherscan.io/api?module=account&action=txlist&address=0xfakeaddress&tag=latest&page=1`, ); }); @@ -1105,7 +1093,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1115,14 +1103,14 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert(mockFetch.calledOnce); assert.deepStrictEqual(result, [ incomingTransactionsController._normalizeTxFromEtherscan( FETCHED_TX, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ), ]); }); @@ -1138,7 +1126,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1148,7 +1136,7 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepStrictEqual(result, []); window.fetch = tempFetchStatusZero; @@ -1166,7 +1154,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1176,7 +1164,7 @@ describe('IncomingTransactionsController', function () { await incomingTransactionsController._getNewIncomingTransactions( ADDRESS_TO_FETCH_FOR, '789', - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepStrictEqual(result, []); window.fetch = tempFetchEmptyResult; @@ -1189,7 +1177,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1208,14 +1196,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.FAILED, time: 4444000, txParams: { @@ -1235,7 +1223,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1254,14 +1242,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 4444000, txParams: { @@ -1281,7 +1269,7 @@ describe('IncomingTransactionsController', function () { const incomingTransactionsController = new IncomingTransactionsController( { blockTracker: getMockBlockTracker(), - ...getMockNetworkControllerMethods(ROPSTEN_CHAIN_ID), + ...getMockNetworkControllerMethods(GOERLI_CHAIN_ID), preferencesController: getMockPreferencesController(), initState: getNonEmptyInitState(), }, @@ -1301,14 +1289,14 @@ describe('IncomingTransactionsController', function () { value: '15', hash: '0xg', }, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, ); assert.deepStrictEqual(result, { blockNumber: 333, id: 54321, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: GOERLI_NETWORK_ID, + chainId: GOERLI_CHAIN_ID, status: TRANSACTION_STATUSES.CONFIRMED, time: 4444000, txParams: { diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js index c5449b90edf6..ae137807ae0f 100644 --- a/app/scripts/controllers/metametrics.test.js +++ b/app/scripts/controllers/metametrics.test.js @@ -11,7 +11,7 @@ import waitUntilCalled from '../../../test/lib/wait-until-called'; import { ETH_SYMBOL, MAINNET_CHAIN_ID, - ROPSTEN_CHAIN_ID, + GOERLI_CHAIN_ID, TEST_ETH_SYMBOL, } from '../../../shared/constants/network'; import MetaMetricsController from './metametrics'; @@ -643,7 +643,7 @@ describe('MetaMetricsController', function () { const traits = metaMetricsController._buildUserTraitsObject({ addressBook: { [MAINNET_CHAIN_ID]: [{ address: '0x' }], - [ROPSTEN_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], + [GOERLI_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], }, allCollectibles: { '0xac706cE8A9BF27Afecf080fB298d0ee13cfb978A': { @@ -674,7 +674,7 @@ describe('MetaMetricsController', function () { allTokens: MOCK_ALL_TOKENS, frequentRpcListDetail: [ { chainId: MAINNET_CHAIN_ID, ticker: ETH_SYMBOL }, - { chainId: ROPSTEN_CHAIN_ID, ticker: TEST_ETH_SYMBOL }, + { chainId: GOERLI_CHAIN_ID, ticker: TEST_ETH_SYMBOL }, { chainId: '0xaf' }, ], identities: [{}, {}], @@ -690,7 +690,7 @@ describe('MetaMetricsController', function () { [TRAITS.ADDRESS_BOOK_ENTRIES]: 3, [TRAITS.INSTALL_DATE_EXT]: '', [TRAITS.LEDGER_CONNECTION_TYPE]: 'web-hid', - [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, ROPSTEN_CHAIN_ID, '0xaf'], + [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, GOERLI_CHAIN_ID, '0xaf'], [TRAITS.NETWORKS_WITHOUT_TICKER]: ['0xaf'], [TRAITS.NFT_AUTODETECTION_ENABLED]: false, [TRAITS.NUMBER_OF_ACCOUNTS]: 2, @@ -709,12 +709,12 @@ describe('MetaMetricsController', function () { metaMetricsController._buildUserTraitsObject({ addressBook: { [MAINNET_CHAIN_ID]: [{ address: '0x' }], - [ROPSTEN_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], + [GOERLI_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: MAINNET_CHAIN_ID }, - { chainId: ROPSTEN_CHAIN_ID }, + { chainId: GOERLI_CHAIN_ID }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, @@ -728,14 +728,14 @@ describe('MetaMetricsController', function () { const updatedTraits = metaMetricsController._buildUserTraitsObject({ addressBook: { [MAINNET_CHAIN_ID]: [{ address: '0x' }, { address: '0x1' }], - [ROPSTEN_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], + [GOERLI_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: { '0x1': { '0xabcde': [{ '0x12345': { address: '0xtestAddress' } }] }, }, frequentRpcListDetail: [ { chainId: MAINNET_CHAIN_ID }, - { chainId: ROPSTEN_CHAIN_ID }, + { chainId: GOERLI_CHAIN_ID }, ], ledgerTransportType: 'web-hid', openSeaEnabled: false, @@ -759,12 +759,12 @@ describe('MetaMetricsController', function () { metaMetricsController._buildUserTraitsObject({ addressBook: { [MAINNET_CHAIN_ID]: [{ address: '0x' }], - [ROPSTEN_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], + [GOERLI_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: MAINNET_CHAIN_ID }, - { chainId: ROPSTEN_CHAIN_ID }, + { chainId: GOERLI_CHAIN_ID }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, @@ -778,12 +778,12 @@ describe('MetaMetricsController', function () { const updatedTraits = metaMetricsController._buildUserTraitsObject({ addressBook: { [MAINNET_CHAIN_ID]: [{ address: '0x' }], - [ROPSTEN_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], + [GOERLI_CHAIN_ID]: [{ address: '0x' }, { address: '0x0' }], }, allTokens: {}, frequentRpcListDetail: [ { chainId: MAINNET_CHAIN_ID }, - { chainId: ROPSTEN_CHAIN_ID }, + { chainId: GOERLI_CHAIN_ID }, ], ledgerTransportType: 'web-hid', openSeaEnabled: true, diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js index ec47eefdca62..64afce45a8f8 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 a079307ab20c..8bc93803270b 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -10,13 +10,13 @@ import { } from 'swappable-obj-proxy'; import EthQuery from 'eth-query'; import { - RINKEBY, MAINNET, + GOERLI_CHAIN_ID, + GOERLI, INFURA_PROVIDER_TYPES, NETWORK_TYPE_RPC, NETWORK_TYPE_TO_ID_MAP, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, INFURA_BLOCKED_KEY, TEST_NETWORK_TICKER_MAP, } from '../../../../shared/constants/network'; @@ -42,9 +42,9 @@ if (process.env.IN_TEST) { }; } else if (process.env.METAMASK_DEBUG || env === 'test') { defaultProviderConfigOpts = { - type: RINKEBY, - chainId: RINKEBY_CHAIN_ID, - ticker: TEST_NETWORK_TICKER_MAP.rinkeby, + type: GOERLI, + chainId: GOERLI_CHAIN_ID, + ticker: TEST_NETWORK_TICKER_MAP.goerli, }; } else { defaultProviderConfigOpts = { type: MAINNET, chainId: MAINNET_CHAIN_ID }; diff --git a/app/scripts/controllers/network/pending-middleware.test.js b/app/scripts/controllers/network/pending-middleware.test.js index 9544dc7920f9..5b34a48c3cc2 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 4ca1768cb2a0..49fda6ef8215 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 e34dff016c0b..26e084d56183 100644 --- a/app/scripts/controllers/swaps.test.js +++ b/app/scripts/controllers/swaps.test.js @@ -5,7 +5,7 @@ import { ethers } from 'ethers'; import { mapValues } from 'lodash'; import BigNumber from 'bignumber.js'; import { - ROPSTEN_NETWORK_ID, + GOERLI_NETWORK_ID, MAINNET_NETWORK_ID, MAINNET_CHAIN_ID, } from '../../../shared/constants/network'; @@ -104,7 +104,7 @@ function getMockNetworkController() { store: { getState: () => { return { - network: ROPSTEN_NETWORK_ID, + network: GOERLI_NETWORK_ID, }; }, }, @@ -273,7 +273,7 @@ describe('SwapsController', function () { const currentEthersInstance = swapsController.ethersProvider; const onNetworkDidChange = networkController.on.getCall(0).args[1]; - onNetworkDidChange(ROPSTEN_NETWORK_ID); + onNetworkDidChange(GOERLI_NETWORK_ID); 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 4bbb3046d2c6..e4be03e62979 100644 --- a/app/scripts/controllers/transactions/index.test.js +++ b/app/scripts/controllers/transactions/index.test.js @@ -31,10 +31,10 @@ import { ORIGIN_METAMASK } from '../../../../shared/constants/app'; 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 VALID_ADDRESS = '0x0000000000000000000000000000000000000000'; @@ -940,7 +940,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); }); }); @@ -1524,11 +1524,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, @@ -1606,11 +1606,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, @@ -1698,11 +1698,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, @@ -1782,11 +1782,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, @@ -1866,11 +1866,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, @@ -1932,11 +1932,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', @@ -2008,11 +2008,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 15386e3191ae..ed512f596899 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 7fbe6ec1eae4..570bfa1ee1a7 100644 --- a/app/scripts/controllers/transactions/tx-state-manager.test.js +++ b/app/scripts/controllers/transactions/tx-state-manager.test.js @@ -5,10 +5,9 @@ import { TRANSACTION_TYPES, } from '../../../../shared/constants/transaction'; import { - KOVAN_CHAIN_ID, + GOERLI_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - KOVAN_NETWORK_ID, + GOERLI_NETWORK_ID, } from '../../../../shared/constants/network'; import { GAS_LIMITS } from '../../../../shared/constants/gas'; import { ORIGIN_METAMASK } from '../../../../shared/constants/app'; @@ -49,8 +48,8 @@ function generateTransactions( } describe('TransactionStateManager', function () { let txStateManager; - const currentNetworkId = KOVAN_NETWORK_ID; - const currentChainId = KOVAN_CHAIN_ID; + const currentNetworkId = GOERLI_NETWORK_ID; + const currentChainId = GOERLI_CHAIN_ID; const otherNetworkId = '2'; beforeEach(function () { @@ -683,7 +682,7 @@ describe('TransactionStateManager', function () { if (i === 0 || i === 1) { return MAINNET_CHAIN_ID; } else if (i === 4 || i === 5) { - return RINKEBY_CHAIN_ID; + return GOERLI_CHAIN_ID; } return currentChainId; }, diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js index e7a420a14527..4420f96206fd 100644 --- a/app/scripts/lib/account-tracker.js +++ b/app/scripts/lib/account-tracker.js @@ -16,10 +16,7 @@ import Web3 from 'web3'; import SINGLE_CALL_BALANCES_ABI from 'single-call-balance-checker-abi'; import { MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, - KOVAN_CHAIN_ID, GOERLI_CHAIN_ID, BSC_CHAIN_ID, OPTIMISM_CHAIN_ID, @@ -31,9 +28,6 @@ import { 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, @@ -225,27 +219,6 @@ export default class AccountTracker { ); break; - case RINKEBY_CHAIN_ID: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_RINKEBY, - ); - break; - - case ROPSTEN_CHAIN_ID: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN, - ); - break; - - case KOVAN_CHAIN_ID: - await this._updateAccountsViaBalanceChecker( - addresses, - SINGLE_CALL_BALANCES_ADDRESS_KOVAN, - ); - break; - case GOERLI_CHAIN_ID: await this._updateAccountsViaBalanceChecker( addresses, diff --git a/app/scripts/lib/buy-url.js b/app/scripts/lib/buy-url.js index 47b7163ba866..f4bc06591e69 100644 --- a/app/scripts/lib/buy-url.js +++ b/app/scripts/lib/buy-url.js @@ -3,10 +3,7 @@ import log from 'loglevel'; import { SWAPS_API_V2_BASE_URL } from '../../../shared/constants/swaps'; import { GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, BUYABLE_CHAINS_MAP, } from '../../../shared/constants/network'; @@ -165,10 +162,6 @@ export default async function getBuyUrl({ chainId, address, service }) { return createCoinbasePayUrl(address, chainId); 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': @@ -184,12 +177,6 @@ function getDefaultServiceForChain(chainId) { switch (chainId) { case MAINNET_CHAIN_ID: return 'wyre'; - case ROPSTEN_CHAIN_ID: - return 'metamask-faucet'; - case RINKEBY_CHAIN_ID: - return 'rinkeby-faucet'; - case KOVAN_CHAIN_ID: - return 'kovan-faucet'; case GOERLI_CHAIN_ID: return 'goerli-faucet'; case SEPOLIA_CHAIN_ID: diff --git a/app/scripts/lib/buy-url.test.js b/app/scripts/lib/buy-url.test.js index 21c3a3498883..e85dad8d8a59 100644 --- a/app/scripts/lib/buy-url.test.js +++ b/app/scripts/lib/buy-url.test.js @@ -1,9 +1,6 @@ import nock from 'nock'; import { - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, BSC_CHAIN_ID, POLYGON_CHAIN_ID, ETH_SYMBOL, @@ -20,15 +17,6 @@ const MAINNET = { amount: 5, address: ETH_ADDRESS, }; -const ROPSTEN = { - chainId: ROPSTEN_CHAIN_ID, -}; -const RINKEBY = { - chainId: RINKEBY_CHAIN_ID, -}; -const KOVAN = { - chainId: KOVAN_CHAIN_ID, -}; const BSC = { chainId: BSC_CHAIN_ID, amount: 5, @@ -100,21 +88,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 94136c5e59e2..602134498ab9 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 453f6cd1ea82..f2252d90fda0 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -2403,7 +2403,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 21b697fd2a05..5deecd4864e9 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 f2469106e948..d2a474186878 100644 --- a/app/scripts/migrations/052.js +++ b/app/scripts/migrations/052.js @@ -2,15 +2,9 @@ import { cloneDeep } from 'lodash'; import { GOERLI, GOERLI_CHAIN_ID, - KOVAN, - KOVAN_CHAIN_ID, MAINNET, MAINNET_CHAIN_ID, NETWORK_TYPE_RPC, - RINKEBY, - RINKEBY_CHAIN_ID, - ROPSTEN, - ROPSTEN_CHAIN_ID, } from '../../../shared/constants/network'; const version = 52; @@ -55,21 +49,18 @@ function transformState(state = {}) { newAccountTokens[address][MAINNET_CHAIN_ID] = accountTokens[address][MAINNET]; break; - case ROPSTEN: - newAccountTokens[address][ROPSTEN_CHAIN_ID] = - accountTokens[address][ROPSTEN]; + case 'ropsten': + newAccountTokens[address]['0x3'] = accountTokens[address].ropsten; break; - case RINKEBY: - newAccountTokens[address][RINKEBY_CHAIN_ID] = - accountTokens[address][RINKEBY]; + case 'rinkeby': + newAccountTokens[address]['0x4'] = accountTokens[address].rinkeby; break; case GOERLI: newAccountTokens[address][GOERLI_CHAIN_ID] = accountTokens[address][GOERLI]; break; - case KOVAN: - newAccountTokens[address][KOVAN_CHAIN_ID] = - accountTokens[address][KOVAN]; + case 'kovan': + newAccountTokens[address]['0x2a'] = accountTokens[address].kovan; break; default: break; @@ -94,21 +85,21 @@ function transformState(state = {}) { newAccountHiddenTokens[address][MAINNET_CHAIN_ID] = accountHiddenTokens[address][MAINNET]; break; - case ROPSTEN: - newAccountHiddenTokens[address][ROPSTEN_CHAIN_ID] = - accountHiddenTokens[address][ROPSTEN]; + case 'ropsten': + newAccountHiddenTokens[address]['0x3'] = + accountHiddenTokens[address].ropsten; break; - case RINKEBY: - newAccountHiddenTokens[address][RINKEBY_CHAIN_ID] = - accountHiddenTokens[address][RINKEBY]; + case 'rinkeby': + newAccountHiddenTokens[address]['0x4'] = + accountHiddenTokens[address].rinkeby; break; case GOERLI: newAccountHiddenTokens[address][GOERLI_CHAIN_ID] = accountHiddenTokens[address][GOERLI]; break; - case KOVAN: - newAccountHiddenTokens[address][KOVAN_CHAIN_ID] = - accountHiddenTokens[address][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 1a78374cb6e8..4bf2f5414b64 100644 --- a/app/scripts/migrations/052.test.js +++ b/app/scripts/migrations/052.test.js @@ -1,15 +1,9 @@ import { GOERLI, GOERLI_CHAIN_ID, - KOVAN, - KOVAN_CHAIN_ID, MAINNET, MAINNET_CHAIN_ID, NETWORK_TYPE_RPC, - RINKEBY, - RINKEBY_CHAIN_ID, - ROPSTEN, - ROPSTEN_CHAIN_ID, } from '../../../shared/constants/network'; import migration52 from './052'; @@ -85,25 +79,25 @@ describe('migration #52', () => { }); }); - it(`should move ${RINKEBY} tokens and hidden tokens to be keyed by ${RINKEBY_CHAIN_ID} 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': { - [RINKEBY]: [TOKEN1], + rinkeby: [TOKEN1], }, '0x1112': { - [RINKEBY]: [TOKEN3], + rinkeby: [TOKEN3], }, }, accountTokens: { '0x1111': { - [RINKEBY]: [TOKEN1, TOKEN2], + rinkeby: [TOKEN1, TOKEN2], }, '0x1112': { - [RINKEBY]: [TOKEN1, TOKEN3], + rinkeby: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -117,18 +111,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [RINKEBY_CHAIN_ID]: [TOKEN1], + '0x4': [TOKEN1], }, '0x1112': { - [RINKEBY_CHAIN_ID]: [TOKEN3], + '0x4': [TOKEN3], }, }, accountTokens: { '0x1111': { - [RINKEBY_CHAIN_ID]: [TOKEN1, TOKEN2], + '0x4': [TOKEN1, TOKEN2], }, '0x1112': { - [RINKEBY_CHAIN_ID]: [TOKEN1, TOKEN3], + '0x4': [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -137,25 +131,25 @@ describe('migration #52', () => { }); }); - it(`should move ${KOVAN} tokens and hidden tokens to be keyed by ${KOVAN_CHAIN_ID} 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': { - [KOVAN]: [TOKEN1], + kovan: [TOKEN1], }, '0x1112': { - [KOVAN]: [TOKEN3], + kovan: [TOKEN3], }, }, accountTokens: { '0x1111': { - [KOVAN]: [TOKEN1, TOKEN2], + kovan: [TOKEN1, TOKEN2], }, '0x1112': { - [KOVAN]: [TOKEN1, TOKEN3], + kovan: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -169,18 +163,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [KOVAN_CHAIN_ID]: [TOKEN1], + '0x2a': [TOKEN1], }, '0x1112': { - [KOVAN_CHAIN_ID]: [TOKEN3], + '0x2a': [TOKEN3], }, }, accountTokens: { '0x1111': { - [KOVAN_CHAIN_ID]: [TOKEN1, TOKEN2], + '0x2a': [TOKEN1, TOKEN2], }, '0x1112': { - [KOVAN_CHAIN_ID]: [TOKEN1, TOKEN3], + '0x2a': [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -241,25 +235,25 @@ describe('migration #52', () => { }); }); - it(`should move ${ROPSTEN} tokens and hidden tokens to be keyed by ${ROPSTEN_CHAIN_ID} 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': { - [ROPSTEN]: [TOKEN1], + ropsten: [TOKEN1], }, '0x1112': { - [ROPSTEN]: [TOKEN3], + ropsten: [TOKEN3], }, }, accountTokens: { '0x1111': { - [ROPSTEN]: [TOKEN1, TOKEN2], + ropsten: [TOKEN1, TOKEN2], }, '0x1112': { - [ROPSTEN]: [TOKEN1, TOKEN3], + ropsten: [TOKEN1, TOKEN3], }, }, bar: 'baz', @@ -273,18 +267,18 @@ describe('migration #52', () => { PreferencesController: { accountHiddenTokens: { '0x1111': { - [ROPSTEN_CHAIN_ID]: [TOKEN1], + '0x3': [TOKEN1], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [TOKEN3], + '0x3': [TOKEN3], }, }, accountTokens: { '0x1111': { - [ROPSTEN_CHAIN_ID]: [TOKEN1, TOKEN2], + '0x3': [TOKEN1, TOKEN2], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [TOKEN1, TOKEN3], + '0x3': [TOKEN1, TOKEN3], }, }, bar: 'baz', diff --git a/app/scripts/migrations/054.test.js b/app/scripts/migrations/054.test.js index 0e7cde9aeb51..70acabd0e38d 100644 --- a/app/scripts/migrations/054.test.js +++ b/app/scripts/migrations/054.test.js @@ -1,7 +1,4 @@ -import { - MAINNET_CHAIN_ID, - ROPSTEN_CHAIN_ID, -} from '../../../shared/constants/network'; +import { MAINNET_CHAIN_ID } from '../../../shared/constants/network'; import migration54 from './054'; describe('migration #54', () => { @@ -174,7 +171,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -232,7 +229,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -292,7 +289,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -350,7 +347,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -410,7 +407,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -489,7 +486,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, @@ -570,7 +567,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: '0', @@ -644,7 +641,7 @@ describe('migration #54', () => { ], }, '0x1112': { - [ROPSTEN_CHAIN_ID]: [ + '0x3': [ { address: '0x06012c8cf97bead5deae237070f9587f8e7a266d', decimals: 0, diff --git a/app/scripts/migrations/055.js b/app/scripts/migrations/055.js index b0ab2a8442b7..f35b0a44f308 100644 --- a/app/scripts/migrations/055.js +++ b/app/scripts/migrations/055.js @@ -19,6 +19,24 @@ export default { const UNKNOWN_CHAIN_ID_KEY = 'UNKNOWN'; +const BUILT_IN_NETWORKS = {}; + +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 a481579b444e..c2d320acc3b1 100644 --- a/app/scripts/migrations/055.test.js +++ b/app/scripts/migrations/055.test.js @@ -1,14 +1,8 @@ import { GOERLI, GOERLI_CHAIN_ID, - KOVAN, - KOVAN_CHAIN_ID, MAINNET, MAINNET_CHAIN_ID, - RINKEBY, - RINKEBY_CHAIN_ID, - ROPSTEN, - ROPSTEN_CHAIN_ID, } from '../../../shared/constants/network'; import migration55 from './055'; @@ -42,10 +36,10 @@ describe('migration #55', () => { }, incomingTxLastFetchedBlocksByNetwork: { [MAINNET]: 1, - [ROPSTEN]: 2, - [RINKEBY]: 3, + ropsten: 2, + rinkeby: 3, [GOERLI]: 4, - [KOVAN]: 5, + kovan: 5, }, }, foo: 'bar', @@ -59,10 +53,10 @@ describe('migration #55', () => { oldStorage.data.IncomingTransactionsController.incomingTransactions, incomingTxLastFetchedBlockByChainId: { [MAINNET_CHAIN_ID]: 1, - [ROPSTEN_CHAIN_ID]: 2, - [RINKEBY_CHAIN_ID]: 3, + '0x3': 2, + '0x4': 3, [GOERLI_CHAIN_ID]: 4, - [KOVAN_CHAIN_ID]: 5, + '0x2a': 5, }, }, foo: 'bar', diff --git a/app/scripts/migrations/059.test.js b/app/scripts/migrations/059.test.js index dff53fcd1d77..4bb51f03cb2e 100644 --- a/app/scripts/migrations/059.test.js +++ b/app/scripts/migrations/059.test.js @@ -1,8 +1,6 @@ import { cloneDeep } from 'lodash'; import { - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, GOERLI_CHAIN_ID, } from '../../../shared/constants/network'; import { @@ -33,7 +31,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 2: { type: SENT_ETHER, id: 2, - chainId: KOVAN_CHAIN_ID, + chainId: '0x2a', txParams: { nonce: '0x2', }, @@ -41,7 +39,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 3: { type: SENT_ETHER, id: 3, - chainId: RINKEBY_CHAIN_ID, + chainId: '0x4', txParams: { nonce: '0x3', }, @@ -49,7 +47,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 4: { type: SENT_ETHER, id: 4, - chainId: RINKEBY_CHAIN_ID, + chainId: '0x4', txParams: { nonce: '0x4', }, @@ -65,7 +63,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 6: { type: SENT_ETHER, id: 6, - chainId: KOVAN_CHAIN_ID, + chainId: '0x2a', txParams: { nonce: '0x6', }, @@ -73,7 +71,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 7: { type: SENT_ETHER, id: 7, - chainId: RINKEBY_CHAIN_ID, + chainId: '0x4', txParams: { nonce: '0x7', }, @@ -81,7 +79,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 8: { type: SENT_ETHER, id: 8, - chainId: RINKEBY_CHAIN_ID, + chainId: '0x4', txParams: { nonce: '0x8', }, @@ -89,7 +87,7 @@ const ERRONEOUS_TRANSACTION_STATE = { 9: { type: SENT_ETHER, id: 9, - chainId: RINKEBY_CHAIN_ID, + 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 000000000000..0f687d7a0c60 --- /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 000000000000..bdb03d3867f7 --- /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 f8a6db8141b3..1fafb65bdd83 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 f1f860d903cf..4832adac5b57 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 bf39420c1f24..24850ddccc70 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 new file mode 100644 index 000000000000..759ad694e3cc --- /dev/null +++ b/shared/constants/network.ts @@ -0,0 +1,930 @@ +import { capitalize } from 'lodash'; +/** + * A type representing any valid value for 'type' for setProviderType and other + * methods that add or manipulate networks in MetaMask state. + */ +export type NetworkType = typeof NETWORK_TYPES[keyof typeof NETWORK_TYPES]; + +/** + * A union type of all possible hard-coded chain ids. This type is not + * exhaustive and cannot be used for typing chainId in areas where the user or + * dapp may specify any chainId. + */ +export type ChainId = typeof CHAIN_IDS[keyof typeof CHAIN_IDS]; + +/** + * A type that is a union type of all possible hardcoded currency symbols. + * This type is non-exhaustive, and cannot be used for areas where the user + * or dapp may supply their own symbol. + */ +type CurrencySymbol = typeof CURRENCY_SYMBOLS[keyof typeof CURRENCY_SYMBOLS]; +/** + * A type that is a union type for the supported symbols on different onramp providers. + */ +type SupportedCurrencySymbol = + typeof SUPPORTED_CURRENCY_SYMBOLS[keyof typeof SUPPORTED_CURRENCY_SYMBOLS]; +/** + * Test networks have special symbols that combine the network name and 'ETH' + * so that they are distinct from mainnet and other networks that use 'ETH'. + */ +export type TestNetworkCurrencySymbol = + typeof TEST_NETWORK_TICKER_MAP[keyof typeof TEST_NETWORK_TICKER_MAP]; + +/** + * MoonPay is a fiat onramp provider, and there are some special strings that + * inform the MoonPay API which network the user is attempting to onramp into. + * This type reflects those possible values. + */ +type MoonPayNetworkAbbreviation = 'BSC' | 'CCHAIN' | 'POLYGON'; + +/** + * MoonPay requires some settings that are configured per network that it is + * enabled on. This type describes those settings. + */ +type MoonPayChainSettings = { + /** + * What should the default onramp currency be, for example 'eth' on 'mainnet' + * This type matches a single SupportedCurrencySymbol or a + * SupportedCurrencySymbol and a MoonPayNetworkAbbreviation joined by a '_'. + */ + defaultCurrencyCode: + | SupportedCurrencySymbol + | `${SupportedCurrencySymbol}_${MoonPayNetworkAbbreviation}`; + /** + * We must also configure all possible onramp currencies we wish to support. + * This type matches either an array of SupportedCurrencySymbol or + * an array of SupportedCurrencySymbol and a MoonPayNetworkAbbreviation joined by a '_'. + */ + showOnlyCurrencies: + | SupportedCurrencySymbol[] + | `${SupportedCurrencySymbol}_${MoonPayNetworkAbbreviation}`[]; +}; + +/** + * An object containing preferences for an RPC definition + */ +type RPCPreferences = { + /** + * A URL for the block explorer for the RPC's network + */ + blockExplorerUrl: `https://${string}`; + /** + * A image reflecting the asset symbol for the network + */ + imageUrl: string; +}; + +/** + * An object that describes a network to be used inside of MetaMask + */ +type RPCDefinition = { + /** + * The hex encoded ChainId for the network + */ + chainId: ChainId; + /** + * The nickname for the network + */ + nickname: string; + /** + * The URL for the client to send network requests to + */ + rpcUrl: `https://${string}`; + /** + * The Currency Symbol for the network + */ + ticker: string; + /** + * Additional preferences for the network, such as blockExplorerUrl + */ + rpcPrefs: RPCPreferences; +}; + +/** + * Wyre is a fiat onramp provider. We must provide some settings for networks + * that support Wyre. + */ +type WyreChainSettings = { + /** + * The network name + */ + srn: string; + /** + * The native currency for the network + */ + currencyCode: CurrencySymbol; + /** + * The list of supported currencies for the Wyre onramp provider + */ + currencies: SupportedCurrencySymbol[]; +}; + +/** + * For each chain that we support fiat onramps for, we provide a set of + * configuration options that help for initializing the connectiong to the + * onramp providers. + */ +type BuyableChainSettings = { + /** + * The native currency for the given chain + */ + nativeCurrency: CurrencySymbol | TestNetworkCurrencySymbol; + /** + * The network name or identifier + */ + network: string; + /** + * The list of supported currencies for the Transak onramp provider + */ + transakCurrencies?: SupportedCurrencySymbol[]; + /** + * A configuration object for the MoonPay onramp provider + */ + moonPay?: MoonPayChainSettings; + /** + * A configuration object for the Wyre onramp provider + */ + wyre?: WyreChainSettings; + /** + * The list of supported currencies for the CoinbasePay onramp provider + */ + coinbasePayCurrencies?: SupportedCurrencySymbol[]; +}; + +/** + * Throughout the extension we set the current provider by referencing its + * "type", which can be any of the values in the below object. These values + * represent the built-in networks of MetaMask, including test nets, as well + * as "rpc" which is the "type" of a custom network added by the user or via + * wallet_addEthereumChain. + */ +export const NETWORK_TYPES = { + GOERLI: 'goerli', + LOCALHOST: 'localhost', + MAINNET: 'mainnet', + RPC: 'rpc', + SEPOLIA: 'sepolia', +} as const; + +/** + * An object containing shortcut names for any non-builtin network. We need + * this to be able to differentiate between networks that require custom + * sections of code for our various features, such as swaps or token lists. + */ +export const NETWORK_NAMES = { + HOMESTEAD: 'homestead', +}; + +/** + * The Network ID for our builtin networks. This is the decimal equivalent of + * the chain id for the network, but is expresssed as a string. Many moons ago + * the decision was made on the extension team to expressly use chainId with + * hex encoding over network id. Consider that when accessing this object. Note + * for cross product purposes: alignment with mobile on this matter has not + * been fully achieved, thus it is possible for some dependencies to still + * ask for or require network id. + */ +export const NETWORK_IDS = { + MAINNET: '1', + GOERLI: '5', + LOCALHOST: '1337', + SEPOLIA: '11155111', +} as const; + +/** + * An object containing all of the chain ids for networks both built in and + * those that we have added custom code to support our feature set. + */ +export const CHAIN_IDS = { + MAINNET: '0x1', + GOERLI: '0x5', + LOCALHOST: '0x539', + BSC: '0x38', + OPTIMISM: '0xa', + OPTIMISM_TESTNET: '0x1a4', + POLYGON: '0x89', + AVALANCHE: '0xa86a', + FANTOM: '0xfa', + CELO: '0xa4ec', + ARBITRUM: '0xa4b1', + HARMONY: '0x63564c40', + PALM: '0x2a15c308d', + SEPOLIA: '0xaa36a7', +} as const; + +/** + * The largest possible chain ID we can handle. + * Explanation: https://gist.github.com/rekmarks/a47bd5f2525936c4b8eee31a16345553 + */ +export const MAX_SAFE_CHAIN_ID = 4503599627370476; + +export const MAINNET_DISPLAY_NAME = 'Ethereum Mainnet'; +export const GOERLI_DISPLAY_NAME = 'Goerli'; +export const SEPOLIA_DISPLAY_NAME = 'Sepolia'; +export const LOCALHOST_DISPLAY_NAME = 'Localhost 8545'; +export const BSC_DISPLAY_NAME = 'Binance Smart Chain'; +export const POLYGON_DISPLAY_NAME = 'Polygon'; +export const AVALANCHE_DISPLAY_NAME = 'Avalanche Network C-Chain'; +export const ARBITRUM_DISPLAY_NAME = 'Arbitrum One'; +export const BNB_DISPLAY_NAME = + 'BNB Smart Chain (previously Binance Smart Chain Mainnet)'; +export const OPTIMISM_DISPLAY_NAME = 'Optimism'; +export const FANTOM_DISPLAY_NAME = 'Fantom Opera'; +export const HARMONY_DISPLAY_NAME = 'Harmony Mainnet Shard 0'; +export const PALM_DISPLAY_NAME = 'Palm'; + +export const infuraProjectId = process.env.INFURA_PROJECT_ID; +export const getRpcUrl = ({ + network, + excludeProjectId = false, +}: { + network: NetworkType; + excludeProjectId?: boolean; +}) => + `https://${network}.infura.io/v3/${excludeProjectId ? '' : infuraProjectId}`; + +export const MAINNET_RPC_URL = getRpcUrl({ + network: NETWORK_TYPES.MAINNET, +}); +export const GOERLI_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.GOERLI }); +export const SEPOLIA_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.SEPOLIA }); +export const LOCALHOST_RPC_URL = 'http://localhost:8545'; + +/** + * An object containing the token symbols for various tokens that are either + * native currencies or those that have been special cased by the extension + * for supporting our feature set. + */ +export const CURRENCY_SYMBOLS = { + ARBITRUM: 'ETH', + AVALANCHE: 'AVAX', + BNB: 'BNB', + BUSD: 'BUSD', + CELO: 'CELO', + DAI: 'DAI', + ETH: 'ETH', + FANTOM: 'FTM', + HARMONY: 'ONE', + PALM: 'PALM', + MATIC: 'MATIC', + TEST_ETH: 'TESTETH', + USDC: 'USDC', + USDT: 'USDT', + WETH: 'WETH', +} as const; + +/** + * An object containing the token symbols for various tokens that are supported + * on different on ramp providers. This object is meant for internal consumption, + * hence why it is not exported. + */ +const SUPPORTED_CURRENCY_SYMBOLS = { + ...CURRENCY_SYMBOLS, + '1INCH': '1INCH', + AAVE: 'AAVE', + ABT: 'ABT', + ACH: 'ACH', + AGEUR: 'AGEUR', + AGLD: 'AGLD', + AMP: 'AMP', + ANKR: 'ANKR', + APE: 'APE', + ARPA: 'ARPA', + ASM: 'ASM', + AUCTION: 'AUCTION', + AXS: 'AXS', + AVAX: 'AVAX', + AVAXC: 'AVAXC', + AVAXCUSDC: 'AVAXCUSDC', + BADGER: 'BADGER', + BAL: 'BAL', + BAND: 'BAND', + BAT: 'BAT', + BNT: 'BNT', + BOBA: 'BOBA', + BOND: 'BOND', + BTRST: 'BTRST', + CHAIN: 'CHAIN', + CHZ: 'CHZ', + CLV: 'CLV', + COMP: 'COMP', + COTI: 'COTI', + CRO: 'CRO', + CRV: 'CRV', + CTSI: 'CTSI', + CVC: 'CVC', + DAO: 'DAO', + DDX: 'DDX', + DNT: 'DNT', + ENJ: 'ENJ', + ENS: 'ENS', + EURT: 'EURT', + FARM: 'FARM', + FET: 'FET', + FORTH: 'FORTH', + FX: 'FX', + GNO: 'GNO', + GRT: 'GRT', + GTC: 'GTC', + GTH: 'GTH', + GUSD: 'GUSD', + GYEN: 'GYEN', + HEX: 'HEX', + IOTX: 'IOTX', + IMX: 'IMX', + JASMY: 'JASMY', + KEEP: 'KEEP', + KNC: 'KNC', + KRL: 'KRL', + LCX: 'LCX', + LINK: 'LINK', + LPT: 'LPT', + LRC: 'LRC', + MANA: 'MANA', + MASK: 'MASK', + MINDS: 'MINDS', + MIR: 'MIR', + MKR: 'MKR', + MLN: 'MLN', + MTL: 'MTL', + MUSDC: 'mUSDC', + NKN: 'NKN', + NMR: 'NMR', + NU: 'NU', + OGN: 'OGN', + OMG: 'OMG', + ORN: 'ORN', + OXT: 'OXT', + PAX: 'PAX', + PERP: 'PERP', + PLA: 'PLA', + POLS: 'POLS', + POLY: 'POLY', + QNT: 'QNT', + QUICK: 'QUICK', + RAD: 'RAD', + RAI: 'RAI', + RARI: 'RARI', + REN: 'REN', + REP: 'REP', + REQ: 'REQ', + RLC: 'RLC', + RLY: 'RLY', + SAND: 'SAND', + SHIB: 'SHIB', + SKL: 'SKL', + SNX: 'SNX', + STETH: 'STETH', + STORJ: 'STORJ', + SUKU: 'SUKU', + SUSHI: 'SUSHI', + SWAP: 'SWAP', + SWFTC: 'SWFTC', + TRAC: 'TRAC', + TRB: 'TRB', + TRIBE: 'TRIBE', + TRU: 'TRU', + TXL: 'TXL', + UMA: 'UMA', + UNI: 'UNI', + USDS: 'USDS', + VRA: 'VRA', + WBTC: 'WBTC', + WCFG: 'WCFG', + XYO: 'XYO', + YFII: 'YFII', + YFI: 'YFI', + YLD: 'YLD', + ZRX: 'ZRX', + ZUSD: 'ZUSD', +} as const; + +export const ETH_TOKEN_IMAGE_URL = './images/eth_logo.svg'; +export const TEST_ETH_TOKEN_IMAGE_URL = './images/black-eth-logo.svg'; +export const BNB_TOKEN_IMAGE_URL = './images/bnb.png'; +export const MATIC_TOKEN_IMAGE_URL = './images/matic-token.png'; +export const AVAX_TOKEN_IMAGE_URL = './images/avax-token.png'; +export const AETH_TOKEN_IMAGE_URL = './images/arbitrum.svg'; +export const FTM_TOKEN_IMAGE_URL = './images/fantom-opera.svg'; +export const HARMONY_ONE_TOKEN_IMAGE_URL = './images/harmony-one.svg'; +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.MAINNET, + NETWORK_TYPES.GOERLI, + NETWORK_TYPES.SEPOLIA, +]; + +export const TEST_CHAINS = [ + CHAIN_IDS.GOERLI, + CHAIN_IDS.SEPOLIA, + CHAIN_IDS.LOCALHOST, +]; + +const typedCapitalize = (k: K): Capitalize => + capitalize(k) as Capitalize; + +export const TEST_NETWORK_TICKER_MAP: { + [K in Exclude< + NetworkType, + 'localhost' | 'mainnet' | 'rpc' + >]: `${Capitalize}${typeof CURRENCY_SYMBOLS.ETH}`; +} = { + [NETWORK_TYPES.GOERLI]: `${typedCapitalize(NETWORK_TYPES.GOERLI)}${ + CURRENCY_SYMBOLS.ETH + }`, + [NETWORK_TYPES.SEPOLIA]: `${typedCapitalize(NETWORK_TYPES.SEPOLIA)}${ + CURRENCY_SYMBOLS.ETH + }`, +}; + +/** + * Map of all build-in Infura networks to their network, ticker and chain IDs. + */ +export const BUILT_IN_NETWORKS = { + [NETWORK_TYPES.GOERLI]: { + networkId: NETWORK_IDS.GOERLI, + chainId: CHAIN_IDS.GOERLI, + ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.GOERLI], + }, + [NETWORK_TYPES.SEPOLIA]: { + networkId: NETWORK_IDS.SEPOLIA, + chainId: CHAIN_IDS.SEPOLIA, + ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA], + }, + [NETWORK_TYPES.MAINNET]: { + networkId: NETWORK_IDS.MAINNET, + chainId: CHAIN_IDS.MAINNET, + }, + [NETWORK_TYPES.LOCALHOST]: { + networkId: NETWORK_IDS.LOCALHOST, + chainId: CHAIN_IDS.LOCALHOST, + }, +} as const; + +export const NETWORK_TO_NAME_MAP = { + [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.GOERLI]: GOERLI_DISPLAY_NAME, + [NETWORK_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME, + [NETWORK_IDS.MAINNET]: MAINNET_DISPLAY_NAME, + [NETWORK_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME, + + [CHAIN_IDS.GOERLI]: GOERLI_DISPLAY_NAME, + [CHAIN_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME, + [CHAIN_IDS.MAINNET]: MAINNET_DISPLAY_NAME, + [CHAIN_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME, +} as const; + +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.LOCALHOST]: NETWORK_TYPES.LOCALHOST, +} as const; + +export const CHAIN_ID_TO_RPC_URL_MAP = { + [CHAIN_IDS.GOERLI]: GOERLI_RPC_URL, + [CHAIN_IDS.SEPOLIA]: SEPOLIA_RPC_URL, + [CHAIN_IDS.MAINNET]: MAINNET_RPC_URL, + [CHAIN_IDS.LOCALHOST]: LOCALHOST_RPC_URL, +} as const; + +export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = { + [CHAIN_IDS.MAINNET]: ETH_TOKEN_IMAGE_URL, + [CHAIN_IDS.AVALANCHE]: AVAX_TOKEN_IMAGE_URL, + [CHAIN_IDS.BSC]: BNB_TOKEN_IMAGE_URL, + [CHAIN_IDS.POLYGON]: MATIC_TOKEN_IMAGE_URL, + [CHAIN_IDS.ARBITRUM]: AETH_TOKEN_IMAGE_URL, + [CHAIN_IDS.FANTOM]: FTM_TOKEN_IMAGE_URL, + [CHAIN_IDS.HARMONY]: HARMONY_ONE_TOKEN_IMAGE_URL, + [CHAIN_IDS.OPTIMISM]: OPTIMISM_TOKEN_IMAGE_URL, + [CHAIN_IDS.PALM]: PALM_TOKEN_IMAGE_URL, +} as const; + +export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP = { + [NETWORK_IDS.GOERLI]: NETWORK_TYPES.GOERLI, + [NETWORK_IDS.SEPOLIA]: NETWORK_TYPES.SEPOLIA, + [NETWORK_IDS.MAINNET]: NETWORK_NAMES.HOMESTEAD, +} as const; + +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.LOCALHOST]: NETWORK_IDS.LOCALHOST, +} as const; + +export const NATIVE_CURRENCY_TOKEN_IMAGE_MAP = { + [CURRENCY_SYMBOLS.ETH]: ETH_TOKEN_IMAGE_URL, + [CURRENCY_SYMBOLS.TEST_ETH]: TEST_ETH_TOKEN_IMAGE_URL, + [CURRENCY_SYMBOLS.BNB]: BNB_TOKEN_IMAGE_URL, + [CURRENCY_SYMBOLS.MATIC]: MATIC_TOKEN_IMAGE_URL, + [CURRENCY_SYMBOLS.AVALANCHE]: AVAX_TOKEN_IMAGE_URL, +} as const; + +export const INFURA_BLOCKED_KEY = 'countryBlocked'; + +/** + * Hardforks are points in the chain where logic is changed significantly + * enough where there is a fork and the new fork becomes the active chain. + * These constants are presented in chronological order starting with BERLIN + * because when we first needed to track the hardfork we had launched support + * for EIP-2718 (where transactions can have types and different shapes) and + * EIP-2930 (optional access lists), which were included in BERLIN. + * + * BERLIN - forked at block number 12,244,000, included typed transactions and + * optional access lists + * LONDON - future, upcoming fork that introduces the baseFeePerGas, an amount + * of the ETH transaction fees that will be burned instead of given to the + * miner. This change necessitated the third type of transaction envelope to + * specify maxFeePerGas and maxPriorityFeePerGas moving the fee bidding system + * to a second price auction model. + */ +export const HARDFORKS = { + BERLIN: 'berlin', + LONDON: 'london', +} as const; + +export const CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP = { + [CHAIN_IDS.OPTIMISM]: 1, + [CHAIN_IDS.OPTIMISM_TESTNET]: 1, +}; + +/** + * Ethereum JSON-RPC methods that are known to exist but that we intentionally + * do not support. + */ +export const UNSUPPORTED_RPC_METHODS = new Set([ + // This is implemented later in our middleware stack – specifically, in + // eth-json-rpc-middleware – but our UI does not support it. + 'eth_signTransaction' as const, +]); + +export const IPFS_DEFAULT_GATEWAY_URL = 'dweb.link'; + +// The first item in transakCurrencies must be the +// default crypto currency for the network +const BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME = 'ethereum'; + +export const BUYABLE_CHAINS_MAP: { + [K in Exclude< + ChainId, + | typeof CHAIN_IDS.LOCALHOST + | typeof CHAIN_IDS.PALM + | typeof CHAIN_IDS.HARMONY + | typeof CHAIN_IDS.OPTIMISM + | typeof CHAIN_IDS.OPTIMISM_TESTNET + | typeof CHAIN_IDS.ARBITRUM + >]: BuyableChainSettings; +} = { + [CHAIN_IDS.MAINNET]: { + nativeCurrency: CURRENCY_SYMBOLS.ETH, + network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, + transakCurrencies: [ + SUPPORTED_CURRENCY_SYMBOLS.ETH, + SUPPORTED_CURRENCY_SYMBOLS['1INCH'], + SUPPORTED_CURRENCY_SYMBOLS.AAVE, + SUPPORTED_CURRENCY_SYMBOLS.AGEUR, + SUPPORTED_CURRENCY_SYMBOLS.BUSD, + SUPPORTED_CURRENCY_SYMBOLS.CHAIN, + SUPPORTED_CURRENCY_SYMBOLS.CLV, + SUPPORTED_CURRENCY_SYMBOLS.COMP, + SUPPORTED_CURRENCY_SYMBOLS.CTSI, + SUPPORTED_CURRENCY_SYMBOLS.DAI, + SUPPORTED_CURRENCY_SYMBOLS.DAO, + SUPPORTED_CURRENCY_SYMBOLS.ENJ, + SUPPORTED_CURRENCY_SYMBOLS.EURT, + SUPPORTED_CURRENCY_SYMBOLS.GTH, + SUPPORTED_CURRENCY_SYMBOLS.HEX, + SUPPORTED_CURRENCY_SYMBOLS.LINK, + SUPPORTED_CURRENCY_SYMBOLS.MANA, + SUPPORTED_CURRENCY_SYMBOLS.MASK, + SUPPORTED_CURRENCY_SYMBOLS.MINDS, + SUPPORTED_CURRENCY_SYMBOLS.MKR, + SUPPORTED_CURRENCY_SYMBOLS.PLA, + SUPPORTED_CURRENCY_SYMBOLS.POLS, + SUPPORTED_CURRENCY_SYMBOLS.SAND, + SUPPORTED_CURRENCY_SYMBOLS.STETH, + SUPPORTED_CURRENCY_SYMBOLS.SUSHI, + SUPPORTED_CURRENCY_SYMBOLS.SWAP, + SUPPORTED_CURRENCY_SYMBOLS.TXL, + SUPPORTED_CURRENCY_SYMBOLS.UNI, + SUPPORTED_CURRENCY_SYMBOLS.USDC, + SUPPORTED_CURRENCY_SYMBOLS.USDT, + SUPPORTED_CURRENCY_SYMBOLS.VRA, + SUPPORTED_CURRENCY_SYMBOLS.WBTC, + SUPPORTED_CURRENCY_SYMBOLS.YLD, + ], + moonPay: { + defaultCurrencyCode: SUPPORTED_CURRENCY_SYMBOLS.ETH, + showOnlyCurrencies: [ + SUPPORTED_CURRENCY_SYMBOLS.ETH, + SUPPORTED_CURRENCY_SYMBOLS.USDT, + SUPPORTED_CURRENCY_SYMBOLS.USDC, + SUPPORTED_CURRENCY_SYMBOLS.DAI, + SUPPORTED_CURRENCY_SYMBOLS.MATIC, + SUPPORTED_CURRENCY_SYMBOLS.ORN, + SUPPORTED_CURRENCY_SYMBOLS.WETH, + SUPPORTED_CURRENCY_SYMBOLS.IMX, + ], + }, + wyre: { + srn: 'ethereum', + currencyCode: CURRENCY_SYMBOLS.ETH, + currencies: [ + SUPPORTED_CURRENCY_SYMBOLS.ETH, + SUPPORTED_CURRENCY_SYMBOLS.AAVE, + SUPPORTED_CURRENCY_SYMBOLS.BAT, + SUPPORTED_CURRENCY_SYMBOLS.BUSD, + SUPPORTED_CURRENCY_SYMBOLS.COMP, + SUPPORTED_CURRENCY_SYMBOLS.CRV, + SUPPORTED_CURRENCY_SYMBOLS.DAI, + SUPPORTED_CURRENCY_SYMBOLS.GUSD, + SUPPORTED_CURRENCY_SYMBOLS.GYEN, + SUPPORTED_CURRENCY_SYMBOLS.LINK, + SUPPORTED_CURRENCY_SYMBOLS.MKR, + SUPPORTED_CURRENCY_SYMBOLS.PAX, + SUPPORTED_CURRENCY_SYMBOLS.RAI, + SUPPORTED_CURRENCY_SYMBOLS.SNX, + SUPPORTED_CURRENCY_SYMBOLS.UMA, + SUPPORTED_CURRENCY_SYMBOLS.UNI, + SUPPORTED_CURRENCY_SYMBOLS.USDC, + SUPPORTED_CURRENCY_SYMBOLS.USDS, + SUPPORTED_CURRENCY_SYMBOLS.USDT, + SUPPORTED_CURRENCY_SYMBOLS.WBTC, + SUPPORTED_CURRENCY_SYMBOLS.WETH, + SUPPORTED_CURRENCY_SYMBOLS.YFI, + SUPPORTED_CURRENCY_SYMBOLS.ZUSD, + ], + }, + coinbasePayCurrencies: [ + SUPPORTED_CURRENCY_SYMBOLS.ETH, + SUPPORTED_CURRENCY_SYMBOLS['1INCH'], + SUPPORTED_CURRENCY_SYMBOLS.AAVE, + SUPPORTED_CURRENCY_SYMBOLS.ABT, + SUPPORTED_CURRENCY_SYMBOLS.ACH, + SUPPORTED_CURRENCY_SYMBOLS.AGLD, + SUPPORTED_CURRENCY_SYMBOLS.AMP, + SUPPORTED_CURRENCY_SYMBOLS.ANKR, + SUPPORTED_CURRENCY_SYMBOLS.APE, + SUPPORTED_CURRENCY_SYMBOLS.ARPA, + SUPPORTED_CURRENCY_SYMBOLS.ASM, + SUPPORTED_CURRENCY_SYMBOLS.AUCTION, + SUPPORTED_CURRENCY_SYMBOLS.AXS, + SUPPORTED_CURRENCY_SYMBOLS.BADGER, + SUPPORTED_CURRENCY_SYMBOLS.BAL, + SUPPORTED_CURRENCY_SYMBOLS.BAND, + SUPPORTED_CURRENCY_SYMBOLS.BAT, + SUPPORTED_CURRENCY_SYMBOLS.BNT, + SUPPORTED_CURRENCY_SYMBOLS.BOBA, + SUPPORTED_CURRENCY_SYMBOLS.BOND, + SUPPORTED_CURRENCY_SYMBOLS.BTRST, + SUPPORTED_CURRENCY_SYMBOLS.CHZ, + SUPPORTED_CURRENCY_SYMBOLS.CLV, + SUPPORTED_CURRENCY_SYMBOLS.COMP, + SUPPORTED_CURRENCY_SYMBOLS.COTI, + SUPPORTED_CURRENCY_SYMBOLS.CRO, + SUPPORTED_CURRENCY_SYMBOLS.CRV, + SUPPORTED_CURRENCY_SYMBOLS.CTSI, + SUPPORTED_CURRENCY_SYMBOLS.CVC, + SUPPORTED_CURRENCY_SYMBOLS.DAI, + SUPPORTED_CURRENCY_SYMBOLS.DDX, + SUPPORTED_CURRENCY_SYMBOLS.DNT, + SUPPORTED_CURRENCY_SYMBOLS.ENJ, + SUPPORTED_CURRENCY_SYMBOLS.ENS, + SUPPORTED_CURRENCY_SYMBOLS.FARM, + SUPPORTED_CURRENCY_SYMBOLS.FET, + SUPPORTED_CURRENCY_SYMBOLS.FORTH, + SUPPORTED_CURRENCY_SYMBOLS.FX, + SUPPORTED_CURRENCY_SYMBOLS.GNO, + SUPPORTED_CURRENCY_SYMBOLS.GRT, + SUPPORTED_CURRENCY_SYMBOLS.GTC, + SUPPORTED_CURRENCY_SYMBOLS.IOTX, + SUPPORTED_CURRENCY_SYMBOLS.JASMY, + SUPPORTED_CURRENCY_SYMBOLS.KEEP, + SUPPORTED_CURRENCY_SYMBOLS.KNC, + SUPPORTED_CURRENCY_SYMBOLS.KRL, + SUPPORTED_CURRENCY_SYMBOLS.LCX, + SUPPORTED_CURRENCY_SYMBOLS.LINK, + SUPPORTED_CURRENCY_SYMBOLS.LPT, + SUPPORTED_CURRENCY_SYMBOLS.LRC, + SUPPORTED_CURRENCY_SYMBOLS.MANA, + SUPPORTED_CURRENCY_SYMBOLS.MASK, + SUPPORTED_CURRENCY_SYMBOLS.MATIC, + SUPPORTED_CURRENCY_SYMBOLS.MIR, + SUPPORTED_CURRENCY_SYMBOLS.MKR, + SUPPORTED_CURRENCY_SYMBOLS.MLN, + SUPPORTED_CURRENCY_SYMBOLS.MTL, + SUPPORTED_CURRENCY_SYMBOLS.NKN, + SUPPORTED_CURRENCY_SYMBOLS.NMR, + SUPPORTED_CURRENCY_SYMBOLS.NU, + SUPPORTED_CURRENCY_SYMBOLS.OGN, + SUPPORTED_CURRENCY_SYMBOLS.OMG, + SUPPORTED_CURRENCY_SYMBOLS.OXT, + SUPPORTED_CURRENCY_SYMBOLS.PAX, + SUPPORTED_CURRENCY_SYMBOLS.PERP, + SUPPORTED_CURRENCY_SYMBOLS.PLA, + SUPPORTED_CURRENCY_SYMBOLS.POLY, + SUPPORTED_CURRENCY_SYMBOLS.QNT, + SUPPORTED_CURRENCY_SYMBOLS.QUICK, + SUPPORTED_CURRENCY_SYMBOLS.RAD, + SUPPORTED_CURRENCY_SYMBOLS.RAI, + SUPPORTED_CURRENCY_SYMBOLS.RARI, + SUPPORTED_CURRENCY_SYMBOLS.REN, + SUPPORTED_CURRENCY_SYMBOLS.REP, + SUPPORTED_CURRENCY_SYMBOLS.REQ, + SUPPORTED_CURRENCY_SYMBOLS.RLC, + SUPPORTED_CURRENCY_SYMBOLS.RLY, + SUPPORTED_CURRENCY_SYMBOLS.SAND, + SUPPORTED_CURRENCY_SYMBOLS.SHIB, + SUPPORTED_CURRENCY_SYMBOLS.SKL, + SUPPORTED_CURRENCY_SYMBOLS.SNX, + SUPPORTED_CURRENCY_SYMBOLS.STORJ, + SUPPORTED_CURRENCY_SYMBOLS.SUKU, + SUPPORTED_CURRENCY_SYMBOLS.SUSHI, + SUPPORTED_CURRENCY_SYMBOLS.SWFTC, + SUPPORTED_CURRENCY_SYMBOLS.TRAC, + SUPPORTED_CURRENCY_SYMBOLS.TRB, + SUPPORTED_CURRENCY_SYMBOLS.TRIBE, + SUPPORTED_CURRENCY_SYMBOLS.TRU, + SUPPORTED_CURRENCY_SYMBOLS.UMA, + SUPPORTED_CURRENCY_SYMBOLS.UNI, + SUPPORTED_CURRENCY_SYMBOLS.USDC, + SUPPORTED_CURRENCY_SYMBOLS.USDT, + SUPPORTED_CURRENCY_SYMBOLS.WBTC, + SUPPORTED_CURRENCY_SYMBOLS.WCFG, + SUPPORTED_CURRENCY_SYMBOLS.XYO, + SUPPORTED_CURRENCY_SYMBOLS.YFII, + SUPPORTED_CURRENCY_SYMBOLS.ZRX, + ], + }, + [CHAIN_IDS.GOERLI]: { + nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.GOERLI], + network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, + }, + [CHAIN_IDS.SEPOLIA]: { + nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA], + network: BUYABLE_CHAIN_ETHEREUM_NETWORK_NAME, + }, + [CHAIN_IDS.BSC]: { + nativeCurrency: CURRENCY_SYMBOLS.BNB, + network: 'bsc', + transakCurrencies: [ + SUPPORTED_CURRENCY_SYMBOLS.BNB, + SUPPORTED_CURRENCY_SYMBOLS.BUSD, + ], + moonPay: { + defaultCurrencyCode: `${SUPPORTED_CURRENCY_SYMBOLS.BNB}_BSC`, + showOnlyCurrencies: [ + `${SUPPORTED_CURRENCY_SYMBOLS.BNB}_BSC`, + `${SUPPORTED_CURRENCY_SYMBOLS.BUSD}_BSC`, + ], + }, + }, + [CHAIN_IDS.POLYGON]: { + nativeCurrency: CURRENCY_SYMBOLS.MATIC, + network: 'polygon', + transakCurrencies: [ + SUPPORTED_CURRENCY_SYMBOLS.MATIC, + SUPPORTED_CURRENCY_SYMBOLS.USDT, + SUPPORTED_CURRENCY_SYMBOLS.USDC, + SUPPORTED_CURRENCY_SYMBOLS.DAI, + ], + moonPay: { + defaultCurrencyCode: `${SUPPORTED_CURRENCY_SYMBOLS.BNB}_POLYGON`, + showOnlyCurrencies: [ + `${SUPPORTED_CURRENCY_SYMBOLS.MATIC}_POLYGON`, + `${SUPPORTED_CURRENCY_SYMBOLS.USDC}_POLYGON`, + ], + }, + wyre: { + srn: 'matic', + currencyCode: CURRENCY_SYMBOLS.MATIC, + currencies: [ + SUPPORTED_CURRENCY_SYMBOLS.MATIC, + SUPPORTED_CURRENCY_SYMBOLS.MUSDC, + ], + }, + }, + [CHAIN_IDS.AVALANCHE]: { + nativeCurrency: CURRENCY_SYMBOLS.AVALANCHE, + network: 'avaxcchain', + transakCurrencies: [SUPPORTED_CURRENCY_SYMBOLS.AVALANCHE], + moonPay: { + defaultCurrencyCode: `${SUPPORTED_CURRENCY_SYMBOLS.AVAX}_CCHAIN`, + showOnlyCurrencies: [`${SUPPORTED_CURRENCY_SYMBOLS.AVAX}_CCHAIN`], + }, + wyre: { + srn: 'avalanche', + currencyCode: CURRENCY_SYMBOLS.AVALANCHE, + currencies: [ + SUPPORTED_CURRENCY_SYMBOLS.AVALANCHE, + SUPPORTED_CURRENCY_SYMBOLS.AVAXC, + SUPPORTED_CURRENCY_SYMBOLS.AVAXCUSDC, + ], + }, + coinbasePayCurrencies: [SUPPORTED_CURRENCY_SYMBOLS.AVALANCHE], + }, + [CHAIN_IDS.FANTOM]: { + nativeCurrency: CURRENCY_SYMBOLS.FANTOM, + network: 'fantom', + transakCurrencies: [SUPPORTED_CURRENCY_SYMBOLS.FANTOM], + }, + [CHAIN_IDS.CELO]: { + nativeCurrency: CURRENCY_SYMBOLS.CELO, + network: 'celo', + transakCurrencies: [SUPPORTED_CURRENCY_SYMBOLS.CELO], + moonPay: { + defaultCurrencyCode: SUPPORTED_CURRENCY_SYMBOLS.CELO, + showOnlyCurrencies: [SUPPORTED_CURRENCY_SYMBOLS.CELO], + }, + }, +}; + +export const FEATURED_RPCS: RPCDefinition[] = [ + { + chainId: CHAIN_IDS.ARBITRUM, + nickname: ARBITRUM_DISPLAY_NAME, + rpcUrl: `https://arbitrum-mainnet.infura.io/v3/${infuraProjectId}`, + ticker: CURRENCY_SYMBOLS.ARBITRUM, + rpcPrefs: { + blockExplorerUrl: 'https://explorer.arbitrum.io', + imageUrl: AETH_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.AVALANCHE, + nickname: AVALANCHE_DISPLAY_NAME, + rpcUrl: `https://avalanche-mainnet.infura.io/v3/${infuraProjectId}`, + ticker: CURRENCY_SYMBOLS.AVALANCHE, + rpcPrefs: { + blockExplorerUrl: 'https://snowtrace.io/', + imageUrl: AVAX_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.BSC, + nickname: BNB_DISPLAY_NAME, + rpcUrl: 'https://bsc-dataseed.binance.org/', + ticker: CURRENCY_SYMBOLS.BNB, + rpcPrefs: { + blockExplorerUrl: 'https://bscscan.com/', + imageUrl: BNB_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.FANTOM, + nickname: FANTOM_DISPLAY_NAME, + rpcUrl: 'https://rpc.ftm.tools/', + ticker: CURRENCY_SYMBOLS.FANTOM, + rpcPrefs: { + blockExplorerUrl: 'https://ftmscan.com/', + imageUrl: FTM_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.HARMONY, + nickname: HARMONY_DISPLAY_NAME, + rpcUrl: 'https://api.harmony.one/', + ticker: CURRENCY_SYMBOLS.HARMONY, + rpcPrefs: { + blockExplorerUrl: 'https://explorer.harmony.one/', + imageUrl: HARMONY_ONE_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.OPTIMISM, + nickname: OPTIMISM_DISPLAY_NAME, + rpcUrl: `https://optimism-mainnet.infura.io/v3/${infuraProjectId}`, + ticker: CURRENCY_SYMBOLS.ETH, + rpcPrefs: { + blockExplorerUrl: 'https://optimistic.etherscan.io/', + imageUrl: OPTIMISM_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.PALM, + nickname: PALM_DISPLAY_NAME, + rpcUrl: `https://palm-mainnet.infura.io/v3/${infuraProjectId}`, + ticker: CURRENCY_SYMBOLS.PALM, + rpcPrefs: { + blockExplorerUrl: 'https://explorer.palm.io/', + imageUrl: PALM_TOKEN_IMAGE_URL, + }, + }, + { + chainId: CHAIN_IDS.POLYGON, + nickname: `${POLYGON_DISPLAY_NAME} ${capitalize(NETWORK_TYPES.MAINNET)}`, + rpcUrl: `https://polygon-mainnet.infura.io/v3/${infuraProjectId}`, + ticker: CURRENCY_SYMBOLS.MATIC, + rpcPrefs: { + blockExplorerUrl: 'https://polygonscan.com/', + imageUrl: MATIC_TOKEN_IMAGE_URL, + }, + }, +]; diff --git a/test/data/mock-pending-transaction-data.json b/test/data/mock-pending-transaction-data.json index 62f072c10965..26ce780eb027 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 b378b37c4559..96a16826c422 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -49,9 +49,10 @@ "featureFlags": { "showIncomingTransactions": true }, - "network": "4", + "network": "5", "provider": { - "chainId": "0x4" + "type": "rpc", + "chainId": "0x5" }, "keyrings": [ { @@ -181,10 +182,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 5a78af315065..790dd44fae5d 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 b3f2b05c5fe8..24d1deaf7ac7 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 5fbf10276bc8..ac1a8ebe549d 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 28a20607193f..d2d00fb4a777 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 8088a1799dc1..0019533a1f9b 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 5f447420b251..50dc7d9b0e02 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 1b01bc0778c9..5c6d28bed7d7 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 0341d4ecbaa0..c39d6bfdc9d4 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 d89d6e2cf7b2..260316da3a88 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 d5ba38d28493..632f3d6f16c0 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 683f6cda6d4f..22f1602203a8 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 8d4734d54e08..6549e2de8919 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 b414cf8d3a0b..c5ec33d5105e 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 30eee4e908a8..14795e55e2e8 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 57a4cd2c9dc8..b1bdad525619 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 e7b7d10a42b9..ea1ab3b37e89 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 785ec4c00b98..a2391b1cab7d 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 c33ab758c152..8640998f4275 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/test/test-results/junit.xml b/test/test-results/junit.xml new file mode 100644 index 000000000000..400f40ec76ef --- /dev/null +++ b/test/test-results/junit.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js b/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js index cc5f64a9f0df..651e2feadacf 100644 --- a/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js +++ b/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js @@ -10,7 +10,6 @@ import { tick } from '../../../../../test/lib/tick'; import { renderWithProvider } from '../../../../../test/lib/render-helpers'; import * as actions from '../../../../store/actions'; -import { KOVAN_CHAIN_ID } from '../../../../../shared/constants/network'; import UnconnectedAccountAlert from '.'; describe('Unconnected Account Alert', () => { @@ -39,7 +38,7 @@ describe('Unconnected Account Alert', () => { }; const cachedBalances = { - [KOVAN_CHAIN_ID]: { + '0x2a': { '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': '0x0', '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': '0x0', }, @@ -63,7 +62,7 @@ describe('Unconnected Account Alert', () => { cachedBalances, keyrings, provider: { - chainId: KOVAN_CHAIN_ID, + chainId: '0x2a', }, permissionHistory: { 'https://test.dapp': { diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/collectible-details/collectible-details.js index 7ad4b26220f6..c81770259d38 100644 --- a/ui/components/app/collectible-details/collectible-details.js +++ b/ui/components/app/collectible-details/collectible-details.js @@ -35,11 +35,8 @@ import { } from '../../../store/actions'; import { GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, MAINNET_CHAIN_ID, POLYGON_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, } from '../../../../shared/constants/network'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; @@ -105,9 +102,6 @@ export default function CollectibleDetails({ collectible }) { case POLYGON_CHAIN_ID: return `https://opensea.io/assets/matic/${address}/${tokenId}`; case GOERLI_CHAIN_ID: - case KOVAN_CHAIN_ID: - case ROPSTEN_CHAIN_ID: - case RINKEBY_CHAIN_ID: case SEPOLIA_CHAIN_ID: 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 4d9494b88ed9..2e1b6b692846 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-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 65ef0e606b6e..20db18839d31 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/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js index db35c3009c2b..0d3f6087b36c 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 { if (providerName === 'mainnet') { name = this.context.t('mainnet'); - } else if (providerName === 'ropsten') { - name = this.context.t('ropsten'); - } else if (providerName === 'kovan') { - name = this.context.t('kovan'); - } else if (providerName === 'rinkeby') { - name = this.context.t('rinkeby'); } else if (providerName === 'goerli') { name = this.context.t('goerli'); } else if (providerName === 'sepolia') { @@ -356,9 +350,6 @@ class NetworkDropdown extends Component { {shouldShowTestNetworks && ( <> - {this.renderNetworkEntry('ropsten')} - {this.renderNetworkEntry('kovan')} - {this.renderNetworkEntry('rinkeby')} {this.renderNetworkEntry('goerli')} {this.renderNetworkEntry('sepolia')} {this.renderCustomRpcList( diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js index 61a19bd96ba8..727b8fadcdc8 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 a3d8b9e7d17f..37dab0c3ded5 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,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Import Token Link should match snapshot for mainnet chainId 1`] = ` +exports[`Import Token Link should match snapshot for goerli chainId 1`] = `
`; -exports[`Import Token Link should match snapshot for rinkeby chainId 1`] = ` +exports[`Import Token Link should match snapshot for mainnet chainId 1`] = `
({ })); 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 598d80245d67..0adc864ae2b8 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 @@ -23,6 +23,7 @@ export default class LoadingNetworkScreen extends PureComponent { setProviderType: PropTypes.func, rollbackToPreviousProvider: PropTypes.func, isNetworkLoading: PropTypes.bool, + showDeprecatedRpcUrlWarning: PropTypes.bool, }; componentDidMount = () => { @@ -43,12 +44,6 @@ export default class LoadingNetworkScreen extends PureComponent { if (providerName === 'mainnet') { name = this.context.t('connectingToMainnet'); - } else if (providerName === 'ropsten') { - name = this.context.t('connectingToRopsten'); - } else if (providerName === 'kovan') { - name = this.context.t('connectingToKovan'); - } else if (providerName === 'rinkeby') { - name = this.context.t('connectingToRinkeby'); } else if (providerName === 'goerli') { name = this.context.t('connectingToGoerli'); } else if (providerName === 'sepolia') { @@ -60,6 +55,28 @@ export default class LoadingNetworkScreen extends PureComponent { return name; }; + renderDeprecatedRpcUrlWarning = () => { + const { showNetworkDropdown } = this.props; + + return ( +
+ 😞 + {this.context.t('currentRpcUrlDeprecated')} +
+ +
+
+ ); + }; + renderErrorScreenContent = () => { const { showNetworkDropdown, setProviderArgs, setProviderType } = this.props; @@ -124,7 +141,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 2f1e711ce27d..889134c59676 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 4a958407acda..75f43b6b1da3 100644 --- a/ui/components/app/menu-bar/menu-bar.test.js +++ b/ui/components/app/menu-bar/menu-bar.test.js @@ -2,14 +2,14 @@ import React from 'react'; import configureStore from 'redux-mock-store'; import { fireEvent, screen, waitFor } from '@testing-library/react'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { ROPSTEN_CHAIN_ID } from '../../../../shared/constants/network'; +import { GOERLI_CHAIN_ID } from '../../../../shared/constants/network'; import MenuBar from './menu-bar'; const initState = { activeTab: {}, metamask: { provider: { - chainId: ROPSTEN_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, 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 8fc695a55d73..2b2895c29c6a 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 2cf586a0ec65..f076b40389d2 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,8 +1,4 @@ import { GAS_LIMITS } from '../../../../shared/constants/gas'; -import { - ROPSTEN_CHAIN_ID, - ROPSTEN_NETWORK_ID, -} from '../../../../shared/constants/network'; import { TRANSACTION_STATUSES, TRANSACTION_TYPES, @@ -27,8 +23,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331058, time: 1543958845581, status: TRANSACTION_STATUSES.UNAPPROVED, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: true, txParams: { from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706', @@ -75,8 +71,8 @@ describe('TransactionActivityLog utils', () => { ], id: 6400627574331058, loadingDefaults: false, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.DROPPED, submittedTime: 1543958848135, time: 1543958845581, @@ -97,8 +93,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331060, time: 1543958857697, status: TRANSACTION_STATUSES.UNAPPROVED, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', loadingDefaults: false, txParams: { from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706', @@ -168,8 +164,8 @@ describe('TransactionActivityLog utils', () => { id: 6400627574331060, lastGasPrice: '0x4190ab00', loadingDefaults: false, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.CONFIRMED, submittedTime: 1543958860054, time: 1543958857697, @@ -191,8 +187,8 @@ describe('TransactionActivityLog utils', () => { const expected = [ { id: 6400627574331058, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3', eventKey: 'transactionCreated', timestamp: 1543958845581, @@ -200,8 +196,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331058, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3', eventKey: 'transactionSubmitted', timestamp: 1543958848147, @@ -209,8 +205,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331060, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33', eventKey: 'transactionResubmitted', timestamp: 1543958860061, @@ -218,8 +214,8 @@ describe('TransactionActivityLog utils', () => { }, { id: 6400627574331060, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33', eventKey: 'transactionConfirmed', timestamp: 1543958897165, @@ -256,8 +252,8 @@ describe('TransactionActivityLog utils', () => { { id: 5559712943815343, loadingDefaults: true, - metamaskNetworkId: ROPSTEN_NETWORK_ID, - chainId: ROPSTEN_CHAIN_ID, + metamaskNetworkId: '5', + chainId: '0x5', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1535507561452, txParams: { @@ -397,8 +393,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2386f26fc10000', }, hash: '0xabc', - chainId: ROPSTEN_CHAIN_ID, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + chainId: '0x5', + metamaskNetworkId: '5', }; const expectedResult = [ @@ -408,8 +404,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2386f26fc10000', id: 1, hash: '0xabc', - chainId: ROPSTEN_CHAIN_ID, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + chainId: '0x5', + metamaskNetworkId: '5', }, { eventKey: 'transactionSubmitted', @@ -417,8 +413,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2632e314a000', id: 1, hash: '0xabc', - chainId: ROPSTEN_CHAIN_ID, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + chainId: '0x5', + metamaskNetworkId: '5', }, { eventKey: 'transactionConfirmed', @@ -426,8 +422,8 @@ describe('TransactionActivityLog utils', () => { value: '0x2632e314a000', id: 1, hash: '0xabc', - chainId: ROPSTEN_CHAIN_ID, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + 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 81ca71c4994d..0ab59646bb02 100644 --- a/ui/components/component-library/avatar-network/avatar-network.stories.js +++ b/ui/components/component-library/avatar-network/avatar-network.stories.js @@ -88,20 +88,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 7b74e10ae5f6..b46efeef3f58 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 166a3083b990..defdb9fa9f07 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 cf98a16e08ff..25a219b844c1 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 4f65d50aa8a8..c89f93d55f89 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 3800fbf4afc1..30804fef7f61 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 f4ef163039c9..816c544ebe87 100644 --- a/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js +++ b/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js @@ -1,10 +1,6 @@ import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import sinon from 'sinon'; -import { - ROPSTEN_CHAIN_ID, - ROPSTEN_NETWORK_ID, -} from '../../../shared/constants/network'; import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction'; import ConfirmTransactionReducer, * as actions from './confirm-transaction.duck'; @@ -278,7 +274,7 @@ describe('Confirm Transaction Duck', () => { history: [], id: 2603411941761054, loadingDefaults: false, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + metamaskNetworkId: '5', origin: 'faucet.metamask.io', status: TRANSACTION_STATUSES.UNAPPROVED, time: 1530838113716, @@ -344,16 +340,16 @@ describe('Confirm Transaction Duck', () => { metamask: { conversionRate: 468.58, currentCurrency: 'usd', - network: ROPSTEN_NETWORK_ID, + network: '5', provider: { - chainId: ROPSTEN_CHAIN_ID, + chainId: '0x5', }, unapprovedTxs: { 2603411941761054: { history: [], id: 2603411941761054, loadingDefaults: false, - metamaskNetworkId: ROPSTEN_NETWORK_ID, + 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 b14c4ed5c199..cdd22052b32b 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 d6c1b428a9a5..2e57144c9d4f 100644 --- a/ui/ducks/send/send.test.js +++ b/ui/ducks/send/send.test.js @@ -12,7 +12,7 @@ import { } from '../../pages/send/send.constants'; import { MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, + GOERLI_CHAIN_ID, } from '../../../shared/constants/network'; import { GAS_ESTIMATE_TYPES, GAS_LIMITS } from '../../../shared/constants/gas'; import { @@ -726,7 +726,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [], useTokenDetection: true, tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'], @@ -750,7 +750,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [], useTokenDetection: true, tokenAddressList: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'], @@ -775,7 +775,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [{ address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc' }], useTokenDetection: true, tokenAddressList: [], @@ -800,7 +800,7 @@ describe('Send Slice', () => { const action = { type: 'send/validateRecipientUserInput', payload: { - chainId: '0x4', + chainId: '0x5', tokens: [{ address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }], useTokenDetection: true, tokenAddressList: ['0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'], @@ -1290,12 +1290,12 @@ describe('Send Slice', () => { }, }, cachedBalances: { - 0x4: { + 0x5: { '0xAddress': '0x0', }, }, provider: { - chainId: '0x4', + chainId: '0x5', }, useTokenDetection: true, tokenList: { @@ -1577,10 +1577,10 @@ describe('Send Slice', () => { blockGasLimit: '', selectedAddress: '', provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, cachedBalances: { - [RINKEBY_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { '0xAddress': '0x0', }, }, @@ -2169,7 +2169,7 @@ describe('Send Slice', () => { }, metamask: { provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, }, }; @@ -2218,7 +2218,7 @@ describe('Send Slice', () => { }, metamask: { provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, }, }; @@ -2376,11 +2376,11 @@ describe('Send Slice', () => { gasEstimateType: GAS_ESTIMATE_TYPES.NONE, gasFeeEstimates: {}, provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, tokens: [], addressBook: { - [RINKEBY_CHAIN_ID]: {}, + [GOERLI_CHAIN_ID]: {}, }, identities: {}, accounts: { @@ -2390,7 +2390,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [RINKEBY_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { '0xAddress': '0x0', }, }, @@ -2511,11 +2511,11 @@ describe('Send Slice', () => { blockGasLimit: '0x3a98', selectedAddress: '', provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, tokens: [], addressBook: { - [RINKEBY_CHAIN_ID]: {}, + [GOERLI_CHAIN_ID]: {}, }, identities: {}, accounts: { @@ -2525,7 +2525,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [RINKEBY_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { '0xAddress': '0x0', }, }, @@ -2685,7 +2685,7 @@ describe('Send Slice', () => { blockGasLimit: '0x3a98', selectedAddress: '', provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, tokens: [ { @@ -2700,7 +2700,7 @@ describe('Send Slice', () => { }, }, addressBook: { - [RINKEBY_CHAIN_ID]: {}, + [GOERLI_CHAIN_ID]: {}, }, identities: {}, accounts: { @@ -2710,7 +2710,7 @@ describe('Send Slice', () => { }, }, cachedBalances: { - [RINKEBY_CHAIN_ID]: { + [GOERLI_CHAIN_ID]: { '0xAddress': '0x0', }, }, diff --git a/ui/ducks/swaps/swaps.test.js b/ui/ducks/swaps/swaps.test.js index 027e4d479664..476c455e10a7 100644 --- a/ui/ducks/swaps/swaps.test.js +++ b/ui/ducks/swaps/swaps.test.js @@ -5,7 +5,6 @@ import { setSwapsLiveness, setSwapsFeatureFlags } from '../../store/actions'; import { setStorageItem } from '../../helpers/utils/storage-helpers'; import { MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, BSC_CHAIN_ID, POLYGON_CHAIN_ID, } from '../../../shared/constants/network'; @@ -282,7 +281,7 @@ describe('Ducks - Swaps', () => { it('returns true if feature flag is enabled, not a HW and is Rinkeby network', () => { const state = createSwapsMockStore(); - state.metamask.provider.chainId = RINKEBY_CHAIN_ID; + state.metamask.provider.chainId = '0x4'; expect(swaps.getSmartTransactionsEnabled(state)).toBe(true); }); diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js index 3a664bf54a41..1ea44d67845b 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 41d99881481a..bdc276ecd72d 100644 --- a/ui/helpers/constants/settings.js +++ b/ui/helpers/constants/settings.js @@ -204,20 +204,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'), @@ -232,13 +218,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 fc8a22b13c8b..f372f91dfef0 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 68b9649fa5fa..abfbdd442b01 100644 --- a/ui/helpers/utils/util.js +++ b/ui/helpers/utils/util.js @@ -8,11 +8,8 @@ import slip44 from '@metamask/slip44'; import { addHexPrefix } from '../../../app/scripts/lib/util'; import { GOERLI_CHAIN_ID, - KOVAN_CHAIN_ID, LOCALHOST_CHAIN_ID, MAINNET_CHAIN_ID, - RINKEBY_CHAIN_ID, - ROPSTEN_CHAIN_ID, SEPOLIA_CHAIN_ID, } from '../../../shared/constants/network'; import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; @@ -54,9 +51,6 @@ export function isDefaultMetaMaskChain(chainId) { if ( !chainId || chainId === MAINNET_CHAIN_ID || - chainId === ROPSTEN_CHAIN_ID || - chainId === RINKEBY_CHAIN_ID || - chainId === KOVAN_CHAIN_ID || chainId === GOERLI_CHAIN_ID || chainId === SEPOLIA_CHAIN_ID || chainId === LOCALHOST_CHAIN_ID diff --git a/ui/hooks/useAddressDetails.test.js b/ui/hooks/useAddressDetails.test.js index 9f1343a14599..b255c6c7130c 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 d86ba2af7b98..31f6f6044dcb 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 f12cfdd08433..da413de83c6a 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 fdf68dcf952c..f0170b64146e 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 211f0035e591..93e048e86c58 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -463,12 +463,6 @@ export default class Routes extends Component { switch (providerType) { case 'mainnet': return this.context.t('connectingToMainnet'); - case 'ropsten': - return this.context.t('connectingToRopsten'); - case 'kovan': - return this.context.t('connectingToKovan'); - case 'rinkeby': - return this.context.t('connectingToRinkeby'); case 'goerli': return this.context.t('connectingToGoerli'); case 'sepolia': diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js index dc8a76628f66..d6f3508ec247 100644 --- a/ui/pages/send/send.test.js +++ b/ui/pages/send/send.test.js @@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom'; import { SEND_STAGES, startNewDraftTransaction } from '../../ducks/send'; import { ensInitialState } from '../../ducks/ens'; import { renderWithProvider } from '../../../test/jest'; -import { RINKEBY_CHAIN_ID } from '../../../shared/constants/network'; +import { GOERLI_CHAIN_ID } from '../../../shared/constants/network'; import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas'; import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks'; import Send from './send'; @@ -81,17 +81,17 @@ const baseStore = { }, currentCurrency: 'USD', provider: { - chainId: RINKEBY_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, nativeCurrency: 'ETH', featureFlags: { sendHexData: false, }, addressBook: { - [RINKEBY_CHAIN_ID]: [], + [GOERLI_CHAIN_ID]: [], }, cachedBalances: { - [RINKEBY_CHAIN_ID]: {}, + [GOERLI_CHAIN_ID]: {}, }, 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 ab569b1838a5..ee5996dd9902 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 617222668590..f4d4f3832ee7 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 332fe58269c3..c9633ba06b96 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 cf65aff73e50..1277975a66b0 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 8b05769863f1..4d65d232ddb1 100644 --- a/ui/pages/settings/networks-tab/networks-tab.constants.js +++ b/ui/pages/settings/networks-tab/networks-tab.constants.js @@ -1,14 +1,8 @@ import { GOERLI, GOERLI_CHAIN_ID, - KOVAN, - KOVAN_CHAIN_ID, MAINNET, MAINNET_CHAIN_ID, - RINKEBY, - RINKEBY_CHAIN_ID, - ROPSTEN, - ROPSTEN_CHAIN_ID, SEPOLIA, SEPOLIA_CHAIN_ID, getRpcUrl, @@ -26,24 +20,6 @@ const defaultNetworksData = [ ticker: ETH_SYMBOL, blockExplorerUrl: 'https://etherscan.io', }, - { - labelKey: ROPSTEN, - iconColor: '#FF4A8D', - providerType: ROPSTEN, - rpcUrl: getRpcUrl({ network: ROPSTEN, excludeProjectId: true }), - chainId: ROPSTEN_CHAIN_ID, - ticker: TEST_NETWORK_TICKER_MAP[ROPSTEN], - blockExplorerUrl: 'https://ropsten.etherscan.io', - }, - { - labelKey: RINKEBY, - iconColor: '#F6C343', - providerType: RINKEBY, - rpcUrl: getRpcUrl({ network: RINKEBY, excludeProjectId: true }), - chainId: RINKEBY_CHAIN_ID, - ticker: TEST_NETWORK_TICKER_MAP[RINKEBY], - blockExplorerUrl: 'https://rinkeby.etherscan.io', - }, { labelKey: GOERLI, iconColor: '#3099f2', @@ -65,15 +41,6 @@ const defaultNetworksData = [ ticker: TEST_NETWORK_TICKER_MAP[SEPOLIA], blockExplorerUrl: 'https://sepolia.etherscan.io', }, - { - labelKey: KOVAN, - iconColor: '#9064FF', - providerType: KOVAN, - rpcUrl: getRpcUrl({ network: KOVAN, excludeProjectId: true }), - chainId: KOVAN_CHAIN_ID, - ticker: TEST_NETWORK_TICKER_MAP[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 2a97fe4161f3..038e6ded21db 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/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js index e04bc5ad05aa..9c4156968fca 100644 --- a/ui/pages/swaps/fee-card/fee-card.js +++ b/ui/pages/swaps/fee-card/fee-card.js @@ -7,7 +7,6 @@ import { BSC_CHAIN_ID, LOCALHOST_CHAIN_ID, POLYGON_CHAIN_ID, - RINKEBY_CHAIN_ID, AVALANCHE_CHAIN_ID, } from '../../../../shared/constants/network'; import TransactionDetail from '../../../components/app/transaction-detail/transaction-detail.component'; @@ -48,7 +47,7 @@ export default function FeeCard({ return t('networkNamePolygon'); case LOCALHOST_CHAIN_ID: return t('networkNameTestnet'); - case RINKEBY_CHAIN_ID: + case '0x4': return t('networkNameRinkeby'); case AVALANCHE_CHAIN_ID: return t('networkNameAvalanche'); diff --git a/ui/pages/swaps/swaps.util.js b/ui/pages/swaps/swaps.util.js index 71bb2669f324..2e58d2b86749 100644 --- a/ui/pages/swaps/swaps.util.js +++ b/ui/pages/swaps/swaps.util.js @@ -8,7 +8,6 @@ import { ETHEREUM, POLYGON, BSC, - RINKEBY, AVALANCHE, SWAPS_API_V2_BASE_URL, SWAPS_DEV_API_V2_BASE_URL, @@ -26,7 +25,7 @@ import { BSC_CHAIN_ID, POLYGON_CHAIN_ID, LOCALHOST_CHAIN_ID, - RINKEBY_CHAIN_ID, + GOERLI_CHAIN_ID, ETH_SYMBOL, AVALANCHE_CHAIN_ID, } from '../../../shared/constants/network'; @@ -82,7 +81,7 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => { return `${v2ApiBaseUrl}/networks/${chainIdDecimal}`; }; -const TEST_CHAIN_IDS = [RINKEBY_CHAIN_ID, LOCALHOST_CHAIN_ID]; +const TEST_CHAIN_IDS = ['0x4', LOCALHOST_CHAIN_ID]; export const getBaseApi = function (type, chainId = MAINNET_CHAIN_ID) { // eslint-disable-next-line no-param-reassign @@ -874,8 +873,8 @@ export const getNetworkNameByChainId = (chainId) => { return BSC; case POLYGON_CHAIN_ID: return POLYGON; - case RINKEBY_CHAIN_ID: - return RINKEBY; + case '0x4': + return 'rinkeby'; case AVALANCHE_CHAIN_ID: return AVALANCHE; default: @@ -893,7 +892,7 @@ export const getNetworkNameByChainId = (chainId) => { export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => { const networkName = getNetworkNameByChainId(chainId); // Use old APIs for testnet and Rinkeby. - if ([LOCALHOST_CHAIN_ID, RINKEBY_CHAIN_ID].includes(chainId)) { + if ([LOCALHOST_CHAIN_ID, GOERLI_CHAIN_ID].includes(chainId)) { return { swapsFeatureIsLive: true, }; diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js index 755998f53f69..8d73ebd6531a 100644 --- a/ui/pages/swaps/swaps.util.test.js +++ b/ui/pages/swaps/swaps.util.test.js @@ -5,8 +5,7 @@ import { BSC_CHAIN_ID, POLYGON_CHAIN_ID, LOCALHOST_CHAIN_ID, - RINKEBY_CHAIN_ID, - KOVAN_CHAIN_ID, + SEPOLIA_CHAIN_ID, AVALANCHE_CHAIN_ID, ETH_SYMBOL, } from '../../../shared/constants/network'; @@ -19,7 +18,6 @@ import { ETHEREUM, POLYGON, BSC, - RINKEBY, AVALANCHE, } from '../../../shared/constants/swaps'; import { @@ -274,11 +272,8 @@ describe('Swaps Util', () => { }); it('returns true if "to" is Rinkeby contract address on Rinkeby network', () => { - usedTradeTxParams.to = - SWAPS_CHAINID_CONTRACT_ADDRESS_MAP[RINKEBY_CHAIN_ID]; - expect( - isContractAddressValid(usedTradeTxParams.to, RINKEBY_CHAIN_ID), - ).toBe(true); + usedTradeTxParams.to = SWAPS_CHAINID_CONTRACT_ADDRESS_MAP['0x4']; + expect(isContractAddressValid(usedTradeTxParams.to, '0x4')).toBe(true); }); it('returns true if "to" is testnet contract address', () => { @@ -318,16 +313,12 @@ describe('Swaps Util', () => { }); it('returns "rinkeby" for Rinkeby chain ID', () => { - expect(getNetworkNameByChainId(RINKEBY_CHAIN_ID)).toBe(RINKEBY); + expect(getNetworkNameByChainId('0x4')).toBe('rinkeby'); }); it('returns "avalanche" for Avalanche chain ID', () => { expect(getNetworkNameByChainId(AVALANCHE_CHAIN_ID)).toBe(AVALANCHE); }); - - it('returns an empty string for an unsupported network', () => { - expect(getNetworkNameByChainId(KOVAN_CHAIN_ID)).toBe(''); - }); }); describe('getSwapsLivenessForNetwork', () => { @@ -343,18 +334,6 @@ describe('Swaps Util', () => { ).toMatchObject(expectedSwapsLiveness); }); - it('returns info that Swaps are enabled and cannot use API v2 for Rinkeby chain ID', () => { - const expectedSwapsLiveness = { - swapsFeatureIsLive: true, - }; - expect( - getSwapsLivenessForNetwork( - MOCKS.createFeatureFlagsResponse(), - RINKEBY_CHAIN_ID, - ), - ).toMatchObject(expectedSwapsLiveness); - }); - it('returns info that Swaps are disabled and cannot use API v2 if network name is not found', () => { const expectedSwapsLiveness = { swapsFeatureIsLive: false, @@ -362,7 +341,7 @@ describe('Swaps Util', () => { expect( getSwapsLivenessForNetwork( MOCKS.createFeatureFlagsResponse(), - KOVAN_CHAIN_ID, + SEPOLIA_CHAIN_ID, ), ).toMatchObject(expectedSwapsLiveness); }); diff --git a/ui/selectors/confirm-transaction.test.js b/ui/selectors/confirm-transaction.test.js index 8ea9b28dd4e7..e751eea5bb0d 100644 --- a/ui/selectors/confirm-transaction.test.js +++ b/ui/selectors/confirm-transaction.test.js @@ -1,8 +1,3 @@ -import { - KOVAN_CHAIN_ID, - KOVAN_NETWORK_ID, - MAINNET_CHAIN_ID, -} from '../../shared/constants/network'; import { TRANSACTION_TYPES } from '../../shared/constants/transaction'; import { unconfirmedTransactionsCountSelector, @@ -26,18 +21,18 @@ describe('Confirm Transaction Selector', () => { metamask: { unapprovedTxs: { 1: { - metamaskNetworkId: KOVAN_NETWORK_ID, + metamaskNetworkId: '5', }, 2: { - chainId: MAINNET_CHAIN_ID, + chainId: '0x1', }, }, unapprovedMsgCount: 1, unapprovedPersonalMsgCount: 1, unapprovedTypedMessagesCount: 1, - network: KOVAN_NETWORK_ID, + network: '5', provider: { - chainId: KOVAN_CHAIN_ID, + chainId: '0x5', }, }, }; diff --git a/ui/selectors/permissions.test.js b/ui/selectors/permissions.test.js index 108c73fdd86f..253ded566773 100644 --- a/ui/selectors/permissions.test.js +++ b/ui/selectors/permissions.test.js @@ -1,4 +1,4 @@ -import { KOVAN_CHAIN_ID } from '../../shared/constants/network'; +import { GOERLI_CHAIN_ID } from '../../shared/constants/network'; import { getConnectedSubjectsForSelectedAddress, getLastConnectedInfo, @@ -150,7 +150,7 @@ describe('selectors', () => { }, metamask: { provider: { - chainId: KOVAN_CHAIN_ID, + chainId: GOERLI_CHAIN_ID, }, accounts: { '0x7250739de134d33ec7ab1ee592711e15098c9d2d': { diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js index 1aaa65420a90..6f265af7c013 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 4f538e232ac8..6d8efabda924 100644 --- a/ui/selectors/transactions.test.js +++ b/ui/selectors/transactions.test.js @@ -1,7 +1,4 @@ -import { - KOVAN_CHAIN_ID, - MAINNET_CHAIN_ID, -} from '../../shared/constants/network'; +import { MAINNET_CHAIN_ID } from '../../shared/constants/network'; import { TRANSACTION_STATUSES } from '../../shared/constants/transaction'; import { unapprovedMessagesSelector, @@ -33,7 +30,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: KOVAN_CHAIN_ID, + chainId: '0x5', }, }, }; @@ -63,7 +60,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: KOVAN_CHAIN_ID, + chainId: '0x5', }, }, }; @@ -94,7 +91,7 @@ describe('Transaction Selectors', () => { 1: msg, }, provider: { - chainId: KOVAN_CHAIN_ID, + chainId: '0x5', }, }, }; diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js index 49a426396d49..41114c29f341 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, { From 7a79206fd6b71c15c3823e319cd802525f44c087 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Fri, 30 Sep 2022 16:10:01 +0200 Subject: [PATCH 11/17] Fix `@hapi/hoek` audit failure (#16034) --- package.json | 1 + yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index d98a2ba9bdbb..7e942f6d2a85 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,7 @@ "3box/**/libp2p-crypto/node-forge": "^1.3.0", "3box/**/libp2p-keychain/node-forge": "^1.3.0", "3box/ipfs/libp2p-webrtc-star/socket.io/engine.io": "^4.0.0", + "3box/**/@hapi/hoek": "^8.5.1", "analytics-node/axios": "^0.21.2", "ganache-core/lodash": "^4.17.21", "netmask": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index dc69ab270d57..adb320d200e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2026,15 +2026,10 @@ "@hapi/hoek" "6.x.x" "@hapi/joi" "15.x.x" -"@hapi/hoek@6.x.x", "@hapi/hoek@^6.2.0": - version "6.2.4" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595" - integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A== - -"@hapi/hoek@8.x.x": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.1.0.tgz#8f7627b23ed9bf67088fc7f9669e48c63ad421bd" - integrity sha512-b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA== +"@hapi/hoek@6.x.x", "@hapi/hoek@8.x.x", "@hapi/hoek@^6.2.0", "@hapi/hoek@^8.5.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" + integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== "@hapi/inert@^5.2.0": version "5.2.1" From 9b6f72c3ca95c86d3e783ee602c6989a1295bcd1 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 28 Sep 2022 20:22:04 +0200 Subject: [PATCH 12/17] Fix `vm2` audit failure (#16025) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index adb320d200e8..c06b2c91e299 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27912,9 +27912,9 @@ vm-browserify@^1.0.0, vm-browserify@^1.0.1: integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== vm2@^3.9.3: - version "3.9.7" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.7.tgz#bb87aa677c97c61e23a6cb6547e44e990517a6f6" - integrity sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow== + version "3.9.11" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" From 6d86914c9494242e837aeac9cd37516b2b704911 Mon Sep 17 00:00:00 2001 From: ryanml Date: Sun, 2 Oct 2022 21:02:43 -0700 Subject: [PATCH 13/17] Merge fixes --- .../@metamask+snap-controllers+0.20.0.patch | 62 ------------------- test/test-results/junit.xml | 23 ------- .../loading-network-screen.component.js | 22 ------- 3 files changed, 107 deletions(-) delete mode 100644 patches/@metamask+snap-controllers+0.20.0.patch delete mode 100644 test/test-results/junit.xml diff --git a/patches/@metamask+snap-controllers+0.20.0.patch b/patches/@metamask+snap-controllers+0.20.0.patch deleted file mode 100644 index 6e1df558ce0c..000000000000 --- a/patches/@metamask+snap-controllers+0.20.0.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js b/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js -index ad84417..158e8e6 100644 ---- a/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js -+++ b/node_modules/@metamask/snap-controllers/dist/snaps/SnapController.js -@@ -30,6 +30,7 @@ const RequestQueue_1 = require("./RequestQueue"); - const utils_3 = require("./utils"); - const Timer_1 = require("./Timer"); - exports.controllerName = 'SnapController'; -+exports.SNAP_APPROVAL_INSTALL = 'wallet_installSnap'; - exports.SNAP_APPROVAL_UPDATE = 'wallet_updateSnap'; - const TRUNCATED_SNAP_PROPERTIES = new Set([ - 'initialPermissions', -@@ -738,7 +739,7 @@ class SnapController extends controllers_1.BaseControllerV2 { - id: snapId, - versionRange, - }); -- await this.authorize(snapId); -+ await this.authorize(origin, snapId); - await this._startSnap({ - snapId, - sourceCode, -@@ -1073,18 +1074,34 @@ class SnapController extends controllers_1.BaseControllerV2 { - * @param snapId - The id of the Snap. - * @returns The snap's approvedPermissions. - */ -- async authorize(snapId) { -+ async authorize(origin, snapId) { - console.info(`Authorizing snap: ${snapId}`); - const snapsState = this.state.snaps; - const snap = snapsState[snapId]; - const { initialPermissions } = snap; - try { -- if ((0, utils_1.isNonEmptyArray)(Object.keys(initialPermissions))) { -- const processedPermissions = this.processSnapPermissions(initialPermissions); -- const [approvedPermissions] = await this.messagingSystem.call('PermissionController:requestPermissions', { origin: snapId }, processedPermissions); -- return Object.values(approvedPermissions).map((perm) => perm.parentCapability); -+ const processedPermissions = this.processSnapPermissions(initialPermissions); -+ const id = (0, nanoid_1.nanoid)(); -+ const isApproved = await this.messagingSystem.call('ApprovalController:addRequest', { -+ origin, -+ id, -+ type: exports.SNAP_APPROVAL_INSTALL, -+ requestData: { -+ // Mirror previous installation metadata -+ metadata: { id, origin: snapId, dappOrigin: origin }, -+ permissions: processedPermissions, -+ snapId, -+ }, -+ }, true); -+ if (!isApproved) { -+ throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest(); -+ } -+ if ((0, utils_1.isNonEmptyArray)(Object.keys(processedPermissions))) { -+ await this.messagingSystem.call('PermissionController:grantPermissions', { -+ approvedPermissions: processedPermissions, -+ subject: { origin: snapId }, -+ }); - } -- return []; - } - finally { - const runtime = this.getRuntimeExpect(snapId); diff --git a/test/test-results/junit.xml b/test/test-results/junit.xml deleted file mode 100644 index 400f40ec76ef..000000000000 --- a/test/test-results/junit.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 fc43cb41cff8..bf241cfcea4f 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 @@ -76,28 +76,6 @@ export default class LoadingNetworkScreen extends PureComponent { ); }; - renderDeprecatedRpcUrlWarning = () => { - const { showNetworkDropdown } = this.props; - - return ( -
- 😞 - {this.context.t('currentRpcUrlDeprecated')} -
- -
-
- ); - }; - renderErrorScreenContent = () => { const { showNetworkDropdown, setProviderArgs, setProviderType } = this.props; From 90b6dbd3799364c648742ee782e852d17eefc87f Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 3 Oct 2022 11:00:19 -0700 Subject: [PATCH 14/17] Some icon fixes (#16044) --- app/images/icons/icon-search-filled.svg | 2 +- ui/components/component-library/icon/icon.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/images/icons/icon-search-filled.svg b/app/images/icons/icon-search-filled.svg index 88b36fc089da..267caca92714 100644 --- a/app/images/icons/icon-search-filled.svg +++ b/app/images/icons/icon-search-filled.svg @@ -1,3 +1,3 @@ - + diff --git a/ui/components/component-library/icon/icon.js b/ui/components/component-library/icon/icon.js index 9318c4706bf6..8b18b183a1eb 100644 --- a/ui/components/component-library/icon/icon.js +++ b/ui/components/component-library/icon/icon.js @@ -61,7 +61,7 @@ Icon.propTypes = { * Addition style properties to apply to the icon. * The Icon component uses inline styles to apply the icon's mask-image so be wary of overriding */ - style: PropTypes.style, + style: PropTypes.object, /** * Icon accepts all the props from Box */ From 5cc411967c29116612c1c4297549529603f4aa5b Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 3 Oct 2022 11:01:38 -0700 Subject: [PATCH 15/17] Fixes display of avatr in flex display with elements of different heights (#16047) --- ui/components/component-library/base-avatar/base-avatar.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/components/component-library/base-avatar/base-avatar.scss b/ui/components/component-library/base-avatar/base-avatar.scss index 7ead0dafbc63..cf558da6f67c 100644 --- a/ui/components/component-library/base-avatar/base-avatar.scss +++ b/ui/components/component-library/base-avatar/base-avatar.scss @@ -23,6 +23,8 @@ height: var(--avatar-size); width: var(--avatar-size); + max-width: var(--avatar-size); + flex: 0 0 var(--avatar-size); border-radius: 100%; overflow: hidden; display: flex; From 02d7eb34c90736cdc9b4ae1bc8d44115eb88e79d Mon Sep 17 00:00:00 2001 From: Filip Sekulic Date: Mon, 3 Oct 2022 21:55:54 +0200 Subject: [PATCH 16/17] Add Aurora to the popular custom network list (#16039) Co-authored-by: Brad Decker --- app/images/aurora.png | Bin 0 -> 48350 bytes shared/constants/network.ts | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 app/images/aurora.png diff --git a/app/images/aurora.png b/app/images/aurora.png new file mode 100644 index 0000000000000000000000000000000000000000..5c59ca5eb91bcc267f758fea78d0c451892efd13 GIT binary patch literal 48350 zcmeFac{r78^gsNdGBlxy5Gu2z6hiDqMMX*|v{h(OM5dDVDb0m4M`%zgX*UR^+9ws6 zPXj7RWvG-y15M|**1C7!@9+KZz23jxKaT4<=j`)5>sj|_eb&0yz3%lq``LRP7uXJz z8!5+e+`zeWW;$`4Y!LjjMW!DdIdk{UbNG*Jz#KO?sA-1(NSL^0Z00x(Ztl!!i^J01 zKb;`KX$%k@ioSn7%kx_$|9qA)4wCruxleN8 zpO2hmh5P?}mhdt9^I5=|jQI1JCrIi4=d*_BKlR*yPk^+$MUsAyN@L#0>B>a~YfQ0{&0+8@uQUDVEOA1KBe@OvI_%A5{ z3I8PpoDct13P8gDtE7-|<9gwT*QMR&?w%D#Ek1iR$lN)|+tlY&^}s9H0}2!dsQvX; zX5QqQwye=g6Srqg%?3~NTKwx>I5+K{YQMm|3hU3(FBJc`IXIN} zza2hDZo>a|0VVGIZ>O-Y{C^kxPn-2Wmi`Nk|DVr?CiPKtCqPTNHFA8`=XWaGPW~G4 zbHatL3l}`1pKtmw9+NMp)$_7EY5b@@_<7xgieDS-)|maf?Zv^19lyJuZC~*3BD=Sy z9oJL@zj~`znjQ837$XgWyj3gcu0i^T1v$ajPX&MbcC<-ni%O(N<1df*I7dW5d+ByV zL7nlp{EfBiv-2{xZF}8(vt7HyBY(fAeN*t{kcauXn{imdwjq>QI!}9b_@6lcTy=e( zP?)!7#PV65Nh{4flD^oY6kmmfXENBd?dVIZCzr(`+7Y|Nw#}x=g zp8((Rc8!03KMh)cyF@k2tphKXVfoSVj916Ud&?5@T@$ZYb=>iAsmzdpvpjDGEukPN z_|kDV;rWux5#^nR5(ggKIQ$rtMEnn%i3dK#(6e{~KV>2@f?J?WDnc~Rnkpj)X<7K#B2W3}E}1P>bn z(xQ+(M7!zgbovZ-dS-FM zEjvB6lkw4u>@FNt|5>@a<DJ$O@+hl z9|a$&yOygq0nUrmnO9Tx^f&GBk-aw40}gWA*rcx?quJ>+)s5rq-9K7w)jdqZuRcsht-fdc?LwFHhS5gZ#frgd zFfTj8@t)l{HqOhIJ?*;xKK*p(n8k?lZMR@LY~BQC#q&?&idVmp=_A1~TX+AdUNSA(%ab-w40)Jmi8`t^|I6)h8@{>$jM^Um(g%m{x3qE?RnGb)1<7=Paj74{Cf3n7M#fpq1eb= z3Vtk8sB=gk-Sq!BZdcqezD{q{bti?MT`^PM1(G_)VMLB&0&+L9ZkfZNf|5$b2w>q= zEa((0rC=4T1u%vie?1%`mEJV^!X^)kNjTspHeeXURmVAcxi1VNv6#&&C_O&RsOp?JWk^K1SBQl?VIR3-%X12yPJq{{kmA@(P?} zbp?%^^+o*}AT~=jSZu6^t9Y^$96W_xg*K&{b5R>5#wZc%VKLLFQdy2CMkxsAB&y(?1=NP*4Vw((HT6{uQ23O0Hl<`7y$J{>kQF0 zm7unzvouFIUTb-J_h04K-*@8hsOjB_$c0d$xIz6?d}QcT-cF;gy!~~fM&Z!~#47)M zSKhwzOO=*70~dqpjoaRzvLCDf=UqoI)$2@fsd(#N+P9C;{d&)>aBq1y%O6Lyh?W9v z8BR-w`!$+-X~e$RU1;-#hr|R2RALkf1H%hjLv{N1`Kq`4de{d|wCNl(*!4`2>zHQA zge?lZPz9Q*nJpe)D>Ns7w5X+;*+kmTu-}MvgcgOwI|(P9m}U6flX%&X~l3bt@s6AI2tF_lbag< z;CKD}q-b0g!VD?cI#-9UX`NZxw^MgJrpczc?w9ebmEEAis-5m!%+r05}{mpGg0?Gqyi}OdlHI1)CH$vW1+fT@78klk!22ndS)55*f;eHf$+|10k|> zfGzL5*Pwou{3c|bLTq(PZ2wHg$?7!HGE%EqQulBsrl^tH$b_ID*kS+&Yr&9koG&$_ zh|@_vu)gVKnP`sS{S&Fy`nzTfN?#>-nVM6Ymkuv%4C~wBrjnF0zX@k;wT zp3i`J+}#8Jt6^P^8=RWxA)qQ@!ET7SH*}Z{1B>Lt_y?BNBQxzR%P$=#Xs@VR;RV3# z>0ij5&5s*#%`-e6E|RYsy!>Xwr!cTkBO4O)BD-5#ZgO4`c6uLTpxinH5P4RKxIW|Q zZ{YivMRWCzhUMV3am0Wmr0nron_8bpMtw#{#0-aXuQt-8=>szkvWd6d+dSX?@=t$U zOr;e`eh+zXPa90dny44u3CKB5o+y?XyZri>dnSEX-*daU6hl^A$4na#v@PCgb6dFN zByXLpO-C+JVWF=>oO4~1m)+W&$jx6mT-jmjX1FRlgTU#VRs8A*tW0c^skxE?d2hon zobs6=HW9sDcW1yf5!kh?%d6_v@6Y|T3W*cpfck9ey$c!LEZG$O5X@G^;D0oiVk==} z>u=qx&sE)0P0>eHH{A%-g>#PT#QkF33%NhvJ(1`f=-(AM29GPVxzJY;FxDRLbz|C_L$#)K>B>673&N=c+ zLDP8a)A6}CzrSd-7~S)*z35F?(;T=uGlI-oiE(wi#W}&g&Oq_e`q<#3|E8b*`6Kvu zTl>XSqvhW(SX0IPt?J(^8QYfs{&DTbz6CO~7k`BK`huaJ=|_&p78!r@&2>2$m=Ty3 zoL+psrLLuZex26ub&&5>Hh*a2{LG}6TQ2*3;_sm6hTAe+6lTM?T>BVu$ZZfxcKZH2 z==kUn;co2{rI&fVI%L`I`D04Q)62=Wv#bw3ztZ*>48|*@4B#kKjdouub)28k{j@gx zN!deztT)C91RqgokRVSe`p;Df33VQ_WGyV-un42qpDuCtQ-05 zuE)@KB^OhxrmBLlZVW|$94u%X?cQdj5ANHO{QA7fr`m3aq}bwIsk(_y05#6s019n7P&qs%ERwT_4fHV{C+n4>&>%FOC?>V!I{6iO!#%d`{AVHAc~8jcfRcN zE4_P3lrY9f!S=7N>g~lp*PZ^-%|Gv+kKxdls#D%H_Y0*XpEnEISG_-FAng%@TaMiP z^BH~Dy}pKJjBXSg>gDEHwatqL6)aE-c-}SnKuNFu>~$VFhuepvQ`zj&6|@g?+cCIY zv95l8+aR+Qxs8if6r zJFe<3Pr7QT`yp(Q)s8*;Zz*9N8@%^gSnl$B8!SR_<_gs){OXT;byPdq*@XAADjq-D z=%z2${@)8D54H6;xa2{oiT4eB`>yR(x6*7JK6|-&DlY9*>ivFq<-!pTnyjz2PM_*hh!}im;ouj;vOizXV`=G22{ZdJlaPlO zcdSUjz0<7_Tg$H4{z zgdarHLO2c9%hU0{TPk{^tEarO2;%uohpKlmzig_}y$w%8c_1oO{`X}Xc$j};fvVYy zPs{AqIF#PiKKOjo)R2eM?B15B4!K>|*eb6KqV=pz=2vR`ZMR;QSyk!vuVlCIwFg%8?JTc+1`9jg<%YFKu4;C2`#doAA|!6JUpa zeGu@^)!LG~*2UXwz7=$@@<*D}_X`(O7c8}rc?Vwb9(2t*ETVGR?dI34bgE@JyuIaw z8I(*nRPXQ-po-j`>#<5U{yY{&qVJRh`18Se`DKrbAS$1Ro*%ui0ZP@&yPr-vHW3ER z*-P`SwxpyZWL)_yo0#X#AGw#!357R`ENoK~gL9`=V}e-Xz_7)-6gFBs(;l~fR{6*} zw|41i?!8a%wzM@!#}vBhoL2`)E{E-yYl}xOO0@>T@Isl}ke7_JJ~zf~c<@Zs2unf( zs`>@PE|)#d861A7{o0ound6|p0rhZ2-Tnu|UlO)@T+lb30(s%|;)aa-+ zajEs%{FbdZR}AVI^XA&pT$N#)Cbz5~lmeUyhSBy*w9mC=ZP~%t{x>0utefT%6jg!x zN7HO}Ra3wGOc>?(GGhCuLoGaGn#+(J@|YZXtO*U6R@!&G#+$Xfgcxm}bBO-&ZLfp< zrW?6R{LcmbY0ftFWfz{ z^JG1h>QxB_MOw`k>wn4fANTQ?FK>a@nlQb+5joNAw|2SC9}0w%41i$|w6v!`1nb^1^}OaU+*Bi=P1u z%n$}v7Qp1$ggkU^-_1RXzhHi&Q~tIB53L!(m{=1LAKeCJeA0P!$)T?_vOYg4mbq(z zWs()!R*$-`?=nZd>&ph7M3?hv>E3sXUdc~K1!LF zAGM@#x?AnmLCb9VWLLsg1+$gAlH?k=zF;@0?`S&_q*?+Tf+rl$Xx;hw{^d?Sg+hlW zx#}YrPq`Ow^D0~q%aEMMGQkzjB@v*yIlqcP{+mNwI}r+L>Un? zb6-Hg0O`BW>iL7r$8|lfCSO`GeuYbKp@_mb(#+z1AZ_wsFTlNV&P0q9AzUF5Y#Ov-&xqPmgmN%6Fy ztRy~h8D_^uV1nBwtQxjU7oJ@gumyj0O3d9aKaAPD`MERW!vms^B7rtdlGV}9xyE-!ip<>FN|0SFhiSe@dc;Y1-ozr zWzh*&9APVtK=GTYW!;ZPSRDDaPE0ms^O`f8_*9jBoL9WaLKC+OB~<*<&mifdhPl zDBz9}7kjE~Uwn6Kkz8`u@>nDVtqk*$>ypCT^2<2`ucHP7K4L1oO{B`F#N7CDxvX!_ zk@@riYTuHg8>`+3KeP#Z+A9=yv6_;_fSvrGMjVmqEq3akC+F%7@>b- z6v^>VAfdm2Af613d%RO2KXOT-VEv~-XEK7Zt1_KD<~S7z)f1e@Sp9};`(p}z`M+ZF zks!a+(7B8t$Eh^1^JOq#k7T_*8ju0HPLMiYpk z#U&U*vYB&`p>(h~(}FBs+x*%OLnx~|S8VZFHa+w)B<6CnE~CW*VE|{E1&%7}-ss}& zouLcF7PGYY7&6E%bII)O=;Bb2&)!8YJJO?sF5s;%+9Gz@T5>`5cARDkJZEwNBpco^ z0{ZB-Z9T^5+7`9NET$K;$?*weZWniU6~?G046u)4J+q(nO^hK&%a6xd%w@94vCju$ zLZOf2WORW#SnN27T#(iMPae8Jw<@`RNv)0G&qYhAex8Tu#8 zOq??B(&TU)i!K`_a3lkulfXMf2E>=y)}jH&yQ0ss7-B8uOmk$^lGDUQv<3Eff>%U@ z?xC1-=;E1e9?s0*p=@$2M1upl>EwZ7VDK#FfsyLY=z-NcLzjp>Fq90tiykPDSWOBPeCnoMvEtK^T`4%pqA0rm;Wqc5(cTjChWABQt^p( zXtE~7ui8_qFGuhLB<(GtunSGa)P7<4b-f_gck;@PV)YtUyA zsiE$SBjGS|rfC&UgT4ZPn#kD7P@yQ|t3;^M5I@4}#E`@%P9P*Fs9A7`k2r)b4UyV< zVl@t76&>m+9%3OI;vNj~s*k{yhQQ5=3bP_EVgL+FM(_Zy}H ze+)UoZ(mF%MnaikXpi=VTaCG%n7HFGhkZtwU~MP zVv^ArLbb+YVrSTqGr}gIGi14|B6P+H7@{bdGM{tjr%ULJtL4|PFlU5KAhhG5v>c!y zAsUXE;KxvK#t53(ole$E(HT7DqD5l6#V7pG?!nwp8sZ!bVUML08!+0lhGIcKzW!VS?ADlVio%0(chN&Vzb$a7);0;IbL6M_YEi` zL?_7IVRGtY(A}9vjZkf1t@r1|P-Iq;(_eupAIpGI)D{%2?3JO23ho+|%bX`Zu>&#n zbZD?2+;I9=BVX_=vDXs(l!5Xf5WGt zS9R3ZP&H+VP%Sw(0Tgmgqn&d{CjRDTJt|z=V-4B@4z0whBlqH}iqmC%Ywnv_WKgX= zVhZkvnns}bFK#D_FTla~lep1EcM`A67mMFACvg=N|H<7&aZeOKNaB%~7NfZF4*w8q zDspaa#PU<5gW^9psqCP~ozG#@(iBJHH!sa2@%{dxOx&7**`e<;(0;368fuS3?SGU1 z|GhYq#N+(K#Nq^omvC;kx3!4(&V6!32@oAXLrRwyN1S!%F83z3Ey8FNp$gHav+k1( zKS}gk)OPme7P!S_oJK$l2X>zcl;|umyRjWf5d}mS0$2SOwVd?|A1ttN8T=v`=F;D) zIR7hr+>#v<`U@^ZJnKG#2L`mFWBIyh<5w=i2~__;)$yoWP-rNNx&!w5M-XViG14;N zWSMjErBQ zDB}h6G^w=0H`uHGpP)+rN@d$mH@sMV6kZv0)&rAm2mxpqVr>dNb zQHf&(Lgbm1-$Y*g?)$|OFPX_?s1qW8E>V8~kavSGczOiohGB0PkS>%qna)UeB8SSI z0T%tF`9TmW71%J}Np^0!)KCslD@w1B>wScdm!mM$JpsTEs|lV%)EZ+U98bYqQ{qIx zZH-ODz+V&aJqSFQ3powI8xS~g%NtQ%guqqrzZV1FL%;vYeVFv!i6lL@Vic3!&ZLilw3Dhp36ZFSG>h?OVH6_ajW(IX zaLY5?NcaG0jcBkk2zF&W7UIf=FVM=^3d6&U69GB%E?U_~S|brT0cp`IvNEUo!8jy* zV8vL5WH=Gd_d*J9N$erQAvFn&iNbZ4{RqmC%X1l&okWUjJZ3|GZY_E<1ArTr(WJd* z_yn=klpbJM_zMa7a7rvH0t>WL55)Ti;&c;gm*=57Cz+gM&UcMv(9zK5ewhSaj(fNE zFSv`(o(14UE0`H2PGrWAWH*)u4DS(u>6m0TNI5z{8YqMz_?iTuc121e=Eu1eMq;a9 zQPxmEtMeq3W`KAviYqX2ue~I`x58K~&XSA-ieHvcvc)6=O9o$piSxrr{C>qmv3L_| zZ(4=o7bTSJK|CB+m{lZR<+}#Oxr#{xX=X2=T-`Jir7uV*5p-$?G>vaC4S|Ub}9`d@X28`HT5gm8}L6=-1g& zqBw-J1K}`=l@gZ|oM4}0EWbHVC9bGuqhxT3iTA7%^Rmf(N&ev*K$y1LS|jNl8$(6q2b_-_YrDhmO=HB6WK zy~Nrt*Fb{*A>|N*|DM4ggz!zJME4MW9Ka7D_A_?`U-{&**V zzh(fp-x1*71o&ZWO4PYI5&SR77a9DbQc4Q_5&m!~(F%lr8Q^=e;F+Abh}ie=InUsa zXYj`&{5zab7vYZs_&N-Jde&lu@0yWfz~ILbd@F))%o#2~_Hp9N68!X)$^<_!`38ey zMJ1zX2f~q);>nH^SG1d<}IZCouo(}#W7)SBiegP6q)$SU1ISh z6o-0JJFyUIS6pmWp@?l%r$I9eV-UK?-KUUZMijP;MJbW-HFCpcJvK&eID3j$(xhg5wMdiK{f>c!g1C%dh$X)x9@=@Mj#mH$XQksFt z4Y^Kv40IdFN&`sC*hC%%uD~}%f^Ak-lHX=iocHIfW&xHd(6mvakTc%d;y_rOeg0;Q z%V5X}HX{}<2|*H;AcG+Zd?74DT)#IXi;dpe6*P+;QJuLMw@tlrToEcS1m)R8?rPsB zahTuh_dPMDN#t0G_B#^i2Aoh9k)_cGvtf&oahwN zGDHHN1S5n?5-rKj8_C0%oe6|6crnD`B}wi&W-m`@xx6FuN4mWu;9q@w#K5U?T#Tu@ zP>y?VhrprC&L(bGuS_A}=KG#ZV8HJZaH3qF3!vNrU8&4n1bna70^)GBPbmXFkbw6^ z;Ac1yMeP^>E=RzJCz=uP%gI^{_%H(g34tG%p zj8Bo{3~?)2I0S$b<8xLj6Yx1+UzzkwlD>mct0%|JL{ff(?iHl_uR95Q@1Lkf@UMEAR#8;GC-_3@5Jtl-3W|BCM?wgGeVmpp!C#+ph{3;3@ZS^sF`Q@@ z!jA*^9t8jEib8_VSNCaQ@Qr9nr6TAuS--W_|aY=489+OuZ-;P<2Y%A9|`bH8T`XqvkCsnlw%BjD#7<7 z_@g<|UkLvMz@Ja>udWDZ?5p~`W$?8LzCXg>E5ij4`)eSE*Ax74u1g8Nc~S~%xOSQn z{ACD#lq8o%@Zknl81-kHJQ9Zy{96812ET~brp}27e-~{25&lhp?@22{*lw*^1V1nN zB7;Ak@>$VL3?5BRG#%kz2KY$?-_v^vV}HKS2L|7s;5#7vxxl^#vJdrO(;9;B;%Z0m zT~kvmiT%z=1b-32he!VmY1aYYHVC7n)8v+@K=3Cf-(YYYh)t_`04Ga><8i1S>c=K8 zQt#_Joz$1E=*QZfR@AEMlt*j-;<#yuz8KK&CiJ7cdt)*5HR9Z?7#ev(gnNE&c;PZtMKZ_Vx zjzo4za6@r<^@P2DBoXGm;tWC0Oih`}EM?(AlW+@1efs2Q0NtP5XXB<#(3AgupHBI* zhdMf)a}oL|PQ<-~vi&1exH<&gB~gZ;`%EZiZDZD^x5j)~A;l>XbhsVaLtBWRn3ib- zJ*A?HCGWuq9g6%>iDA$bM$)T+bh2k~Vn3$ZY0jSFSWCcuBAm`;u(W z%BvSLvDr=eR`54c@>GJ$ta@A=0cABcNd!*}WpVGobtWj=5F@NhzYFPhlLpJsI}uR$ z(sZxzo?^(#W*wLbn}}5AYX|>y4>lphOu4 zc1MHp-US2-NBLba<>$|8+zyHiiu%&lS4165KJYymfN5Hpllp!8jn_d^!?MnmUp>EhfbS{7$1@+@IlQMn~kM%q9S)X2)>LO~> zuabh44slonSTm_t`KI}FBnB4uwYie@(y31`n26BpAfq2d=#cAlDOG>(Nny~(gjq7^ z6A3!@>Fp=OdW7xQAF%V?M+6u}z9Q&Na~kCtbfR4s>z|1Ly%?dxdL~dLExR+m5p?q% z`K(i~OGSYk&Ix!Jk~;PHJW?igh~G4w-b&D`n&-1_x*QD}fY7U<6d>r(jbSbMu3k3= zeOTBs2AxU>>eSntK>LxPgOj!s>wb|B80%V%N(7y?>Sc)a0i3`ap;rNPM})4Cl+jJl zT@U56UcC&lPObW}z&iHoi@>)U#CmD-=?H?pq_vVkr(V6l7@?Oyfrp*rkAna@vEJ3A z%%JyaWbJnix+5iny?Q6Wg3bEQ-+)Dfu3zb)`!#B_9Iz1~vTpqiz(S-0mf^IN*0$io#FWNK!LnLSmJtY7bX z0Kr3_Y%PM{fZ&OlFFh#?yljyN%L3H97g3LXtprC+`fsr3Fr+SH&RvJk*yiEpy&4!t zE5LBtcnzm$2Q(94tqTM1ibhjHw)knqlFZCT)^=yjdp58D1#Pj0d5dNAz`ah`Jq}}-AVcbGV;apbgPW|^!6w}1NEak z;a4qpVDg>j{+X2FS))FH7KDXxyBn*j#%a*Pqk1Jk)#eu7Lgqx>MLU^urx9(`sGknU zu~Q#57(PhQ@d-aaSK*StUFgbF%Jy#&mjX?yS|g2 z`j`c{u_@K)2C+064d}G6In4~%T$INQ*iS&IU9SkZSD*o~M;1|gShVhEJTsuZtCbnR z`t=TIz!WfGKZekAFu;KfsO~ml2IN#fV-0&NGJyK^S+xSRwWK^$bi^l z71mN0AIG~Z_yzAM*ton@gT;I>>5u8|o}3Iu7vhfr{M4Bjt^B!( z;V&$@&+KK#)o@{fT3#a_v-3olo5k2eX=w8eqGVp$wx0F9JE*Bn9sAFaWwB*n1PgT& z-4zK)&8VPcp1IqMb=6tR-W}8DC8)~nsLqk%1O~)%aHJ6>bAff^T3T9~n0rVg@zIb|?{4~3e7z?(wiA})Wn`UVpCH*Fsn_()Pi zJ^M!h9-H>~3}aJ&iiM*Yr39Wo$iINa4)r;Dur25fS#SU?y71vQQU7mGI78F=DUngn zn)%Mqv^U2mPLRnd9Cz;r6#&+~YsBJRr$}7fwHN5SD3rs_PYHXJp-{iR#^sW;*{_lf zsf}w4A!3xO(H+#azXHf#qE}x?aK_YLJJlU$PC?MA?q5X6sckQ~xEN+(Efk^ZDBcF* z)X>!K4ibyU<+Hy1Jv4~5?bkpFf_?k2k05>+yGWn? zo_RNpMse*f6R~(qJ`=x(TQL#!?Y%)98~0)Vf;eq;PkkC92BYgQV%TxT6--zR*zW=M z!I%-$WH^x$uK&q*s$bCj5M3_nOPdB`>bp_nUKVyw)Vcqr!Es}7{pZWsY^C|lUFc%H zcoB6wv$4O{1+z44FM4S@G{BK{zNF0-mJa@{zn=8kJlC&(W{ZTeD6Nz0Dcf+^Q5Lpz$C zI(GHqGm3ad{S=jsy&QKX3mE13-hLhdPuOvSGld4N_!J*+SsBcpE2|RD4IB?C zPB7Q4ZEf*Z1x}C{4`OfZvQyzvM~KW3q4y$c;mGQ_@Ky#vNKRnh%ND4yjr+H|uP-o@ zgzw@bOf}h{Zg}dH<62uglIcO!54vard|AV^XfcGQkN44Y1Hah<%!LS3MRS8SJiiAG z@dnLqe9$p-7+UpISoU~Vk{*^!IYD_ZN6B(L6@ zP7p@wHFCu2Q?GlI`a4Lb#t}q63Dhhh^!D(&6+N&jcEKD*j^j>C9}=HQ;_!sJX^|m_ z+X<^4@7kixaTjsaIofGVd-gpK6LQrG)FKaGl~M78-XxcWV73l{n*s>tq+%KK?BbTH z6r%DFVPA>Zfk44wq^1$5QANrWWmhuh&jx*CrkbOcnHQ1C(Qvb84aUvCeK?JM=%_VO zLdJ|P< zN6g1l#LH5|L+(-{^uB1ve;LSQ{t!KlI?43^ysKtL=Cb2!DR5v03W9SNG=Mu?4`P_D zQ;cT5>U8M1M(IpA63t!Wg}#Le&fQ#rcs$?`+9g^Vb)4x}ZLLZr=bpnz<8MTJ10k_A z!6Uuv3%*HmLUUA9t1*D_(-hoslMO(}hkN4yS}=g87Y?u-wwh$XgQ!gL03~YXWB@z9 zf((G-N2EXw7yxA)F>$!lghF5Nu%Le%W=!$%C}b!K1~C5%<7YRR9EB#^D{N*a2aF1R zMe)XtUxqI&?@EG=3+GGmIf3IYW4hqW-mW4Sa7M2;q>;(&_!2bv0Yp%fB*lL}j=uy$ zqGEn&3gu+cq=rKjLgM4_5WR{gR5IK=cmQ3c<35Pa#z>zcYsThRa^m$siXnE~4Zf{h zY!79jK$eoeGW5$ZTN{r!=0h>cbqDxX(fnn{r(jG&G;zjKl=Y=J<0PC$Qrq$O$m%IRkP6w5~>w6Xb4} zF(=fvY&c3zpyN%W$q69OpM_4i)ejb6bb`Cx9OeYxz>az{IY0rasG_6=D-CQsj#=OsXBkRPOPhtxjKe|z z8t0r~JLMsu=sr?pzS~$#(bI+-6ctUY5NO&Rj0#w(xuGnX@j5>>=(pN_5#E>l+ri%>0wvf{x14_UET472Q zEtmnZ_m5hUkE3baP%vOd56lDkQjF3Tcx6!%8eAf8DweN&&g5@Wo_0a`Hz;3$@@=qf zvqL-|6(%zInjMy#i6C}-1j^Tgd<~=`(}sr<@RSwmzo1|wmfwF}EI$YJz?Tv7G@BtL zR^LJW?O^Xo5#?j`BT;@)KA{Pbes6A#H>FcbWnJGTq?detb+^(B=Pq z3h~rM?Phom-1V>~KH2dM#D53yD-r)~5?oIl4XiauJSpdOd}e@jFhX+zzi1YrIL(-L zSU52}9d6%d;d!rhLk4*lgXaWJmm1hq@%a?}(wtHn>YgqZt}l3HYskvJRq3wcl&Rqy64FCNOF`E298oZ68RaVe^w&#KzWz*!2-(=?i^ef*O;!?g0R>;oLn5_NcHl zOD3*~;yx(87{yIdTph$upm>bDSUgc<1`}6C@!2Ro55+@Jd<=+VqNv&5X~axT9Ba?S zF~bV9QG6zfPe5@U5XZ`)W_OKPyjEio6PHEtekg8*;u}%i0K_vBeP=0WhhKPHZe zvah>niwt`V-s)l#T&uq&#-U8?p4>Rf;4Xg`qBk8SkYT zNN+^xB#=hNW2e=NrSGpA!gQmwE_~HfWx78|uRsc|As=Ci;ccCMm67s>H~SEgvJtbu zPRj1k-QiiGf1rYt!(@^@zd)?~XsLb|ZX|Wl5t+J}Oba2It}cdIhu!ky$l*K1vtoDJ zPTWtd?8DTfTZ%bgJz#ly5q543upOlob0lgFo6|KZ??+S0*p6EEA&HJK8w6L;&|A=Z z!VHr+N^>bIpAPVLG3XNrI(jG>p>IJCt%MaBId|OOX~^Py_ULjJiIiYQW8mI_>Wr_1 z;=Uk`q&x1e`6E8|ArqIuAd*D!A`~}A@pT}MtUK-y{t?%H#>6SVBp{Eg0gOn9*k3>e zm4fN(d(@^79M}yNM$KG5_`_Gu1F~kfzj>(i> ziV=q8eK_1BwnN5h#|&lB$fd`H)5H)eBKToQjX9vqI3g4nu=>qwkIBg7V--zYY7HBj1>1fw*3VFDh2zOObKeSK! zlKhPNKk^QyOkNV@eXvSAM)IT|F^N8Z7Q$ZXT^p(1TDW`5DP#`3l<* zCO-h>wFy7USCD>?--~$WIqdl(@34!>-ywOzPx7Q68U?Z>ZyzR>H?&P;@=+vD_)*@F z^n?6f#52!!^&feMQ%rs)$rFCqQE`T(e;DW|`5CTa`5fD;Oui4w8zG)!D4#?6LB2oY zabGa!kG#V@Ccl&9QNI_-lm6i#kNVwbn~UWiX|AJqYm&q`^u>6KRRaC{Fg}a=a!vE_ zc-s&=aeRI$b*D6CjD60gi4JhNluI7=rNAX7|Li@NbU2 zOVcZWrq>uu4l-~DlG8*ua3{e0Fv9s1wLlDKRLVSBdTcRmnqwO%3eq1Ze-G8eK5`7I zSGBGGqyBIuQ{M+?FT5}as!CW|x#^VhrMONtWaov>sxn%uxUT!FiJhK7DDQ&Vp&s{C zFA)xG^1^l^oc1VtF&yv|y={nt`Z37}e{cdRV${(y(drdMuB>ao80{ zxx@@(2i{Nwu|w*8LH(3LoX7=_|DGErX6L|+L?%zi)6v>JXzdP+9VlIz_M)}_${ZBK z`Bb`z*a^es1Hcb?IS!-;5cg^vKTHKlyCu6{EWYu62#N2?$F&@|-%~Rja%*!dJ?M@?gX z<;EZSMR79#J9A3#iXhXdOCTq-WBd1rcKJ)*0J}^(i4|y`e)pUviSA%Y-Ir{bsE0F|ebR}DU zBmuFRCgA(b^YEnm^7H^JO#`^bm?pt~C{hr0Rg{Go-J&?rGRa&&InAxOdDvw>*8iS|C-QT$ZdTEui` zxQsu%ws2{|(+~MJq}K*dS~_Tg@8InSa9&W@8*7;1E5lvEJ;5e;ja-HXRIOZcLU8Wz z#`j;J<)2W8y9w9>sVQ3&7SwiTHWl8S;azF(-iUfx?h1zertZr+BOUf2{f2OdqrXkZ z*JscE87#rQnSo@#*1OW1q%*P-Z(VT0N$QE@2)bFY30~`v(FxCz(9MG3&D+_%1)k3I zR58N59+Ba*#~W@X43y-?VTKq7urf?jD^(m!j?~bVI{_@xN&hm6n*4dr|vn-BjJl?5Y;&O&5$mcN1R2%WSLmL)KZjynfeUAiwTK{q0J($kOl zO?QF|GT{}0pK?K=1F{l}jhH42?0@e|_Ejc?QP?;zIDY;#Auuyj#RAZjrj;XU+BH=pMvH7$M2AwQR@%t)Y0< z4qh+efMemVaO~x>gmNO%@#x@x0-t{nGhK>H&P?!hU20{kt;6_4W28nGHuFUgGSCmg zr7gBh-^GZ*lv6+1au}?@+ZckyH*?Ch`rugbE~R~6eez#4QoM|UFw>~oaO=i%Khw~3 zcX)XZi10?LpKAFYjx(kU{jqo6$u>p&`X2`~bygg_MS3IZoOv_5d==gu;^wqS<;{!C zli}`Qf;irDcg3V*I&fSbs;x=tyWo2aC_l-6>cu%MC^uOzE^l_(&+)JsuW_(bD^55B zUA8-?ZHK6X8ni!Z$N9= z!+k5rqBmvIe&G?i_x+V-tNSK(zR<*%+1Lu;FH)zIbouO;_n zxOnUw#KX83%u*|l>I|EeEDIOHeF=lZXj=LF9+aw6NV?LX+K<3 z8^nzv5;u0F|AsLg6A?Kt#b7ty65{xito_PgjRzCf;1z3trO3-qiay1!__+mL26wX| z5~By(N(dex?eC%trbKR&8xJceH+$t#gWW|6oGwOo_JV@LGgc$E0dL<*`pBS1;@sj=zWYtcGi+%il-iZD=Dsgy$y3MBuS~rVBMBq#_--fZZf*Z z*{$^~TZBYj)`I@RXa3%?>;@Fi`R0LhI9Fj|5rFa-P;TbCDE$`bZo#l@dH;2prrlQc zQ5#0Rz$pfQ7lc*L8LIG77+Yk0&K@ULw+QOC>IMCJdB84i21Es3J4|-ryKZmTWWy7& zaJ@~rW7&0;Ux05jQnoL?aP5z-{dZ$9H-U&keBr)lAMzo(rMS%D$lGY|+^0WRD8R`k znZaf;k$J8!K49{Dgeg4!(lh^CQ93T^c580xVkR(8H_S3sPn6`caO}rDin*q@T#*j* zgA-lWV{GZ+zb5-nJ@i1Vb<)Q)7m7M|Cb4ks5cpaJEXhqTTR(OCT<)z*NeIsS<4de2 zGe>&oUbBYaxT#JrLg%WQqza$njdpJu^=H%GcrAM4xOw%qv}L3m@5J$xum7smcUeE( z7Ssz&tQxE$e_q<$@xJV^y(GIdL1zBi%U~Bgi(>u6&La^Rnus*nHEtg1y)~>L{HN7- zO*qSKzc?P+nCw{qchS3W59^72xiXyB`h{O7m36h~f{@6&*&z6aGLmgUS}IcNwEU2b z0@1^Fz0$s}4>#QUQin?fTBTU-9*ltkJH!R|BstMJx~9YG;9+a4t?;EVRM=>F>yjbJ zXrZB6u%<0@IBvN70P;0&MwL?%+}vR2oOOd9x9ndC#|5%zXoH{WHuLhs9k!6wGyCCi zazG-C0Dq@e;%)U26r{RA!@dM`XA=j;YHs%PZ4SVk;SEIkhSjCdoO>&V&7mR4lW0F; z)bE(O_izM!5e-tz`IxH9r=CX|oan>uPKwsCF|?*0pS5a=A3t|ry^k2cFqye)zgyuH zg>CT5m#qt71i=m*U#=pl?(+tg`;z~W-o31fqCSUBQxH$|9d;w#3;_tOflhAF=7R7m zjJAw#Rj|ACM+=7~kB7Me`4vKm3&Yk@HZSE|`d~3|=nTlg>ig|Ph6E=xA~g!yNJmAv z|L}F!Mq%iPV*(C}`#~bjk7*PQIo1}QusOj6esRD@oZ|54&hAuO)RT^@rhY*euIJEM ziU^bAa_FARj0k1Acu(%sV2(c@{K~1~REBGBy*LW{_bNO9{hhwJw=6N_A5oL=YX zkbEo(8OKA!DgV!nqUQ69FlLey$T}1j|53wEq*=#CTk~ z@qNTRmzv_r6QDwz#z5 z+m00JhqdX&V-W$TtV64=rmi5bO^QX_kE5dvB!j3cvm#=L=yj<;yCU&ZMxtln^ItL1lPQYM<{ zGXEnc8U9wdgf~pPVqI4PCBx6K)UdfmfSV?7ry*pa79Fo%?J?!y;fMeT(gmdTsLn!c zSAgADn#auoOc*}r(9ovIHs)%GZLVI>HjA9zP5xw5z~rY zWB5pVqy>_E)0*C&Rm!!H7*~VM^z29WojU(NYe1_`n@jEKe+I+Xu5mv^r=CyUI+bQ` zc!Z%#UCIBP{GD;b()``)vf<_tRaowY$Zzfw6@pq?zmnHp?=9@I zShp3HfKl-FHI0K8QxkoM`yZXN)Y=?_)#^69!(QQ2+4~3A*8Go<%Co|*O8^;4hK=rr z%PY<1avB5SImXz^gdua+oog74ls9?7DSRjHNqmLxrB5%%=I^M*TnXRVFK+O+y_0?{ zD|l*1obPZ6!6bO29?x_|ZiAI92^e1uY-!Dc^%q}=8hbF=Apa=*1Vp|yIYL@Ks3oNK zJGjIhFVpwV>djj;w^DizTq@Y2>tJ|u!nsF&Fs2i}3Q)OMaQNA@cB*j;bdp|mb;F)5 z7T8469lOQ#=-b8lrSg zMZya&rmjaW>19{9nj$v`-!gg<-sJB*v%wOxjz3N|W<|B%|8+KE&i(2|c#_NTHE@Z{Uuo9cPnJ80Z&|!_DaGK{d9RMG z$w)!Zm>2W9hQR$vJ$UP%ASYtpnH_`U@H+f4Hb0YX-r8>q=gDy=@lC=`Bd@>J9&L1V z!R9US^I;pdqPbjX!Otc5+j+70YgeTe(g_x-dDeJB(Bo}T7x?zWL9fMsmqSe0VN95) zFMihxU8QgLy)qiYo=W_*a4*o{P zNq7ym^GtWkWBLWb7}!@j))#)B9f_BXLjXqy8w7_fo}3%)W}@CXBEU5e(Rpf=5e6yik@9d`6X(zJj)@Y0~SWFhc zFCfjlV^FeeSkf#Bfj&akk6#v4x8R(u*+w3+Xx+|=*Y1{AXpiZ=k; z)AQtv^V`S9-_n<1*q@zP@$2e&cjurfL%D36!P$of8-KA-ZT%hG4%<%!l4saEtFI=_G#zXN>RjQV4r(w)>3%bZNnae@)?s# zYUHlq*Y14GK))AuNz`suHP-0uTljPK-NC20#2)%^m2OXUI;6`K2md=g$1&h8>okf0 zI_NKOR&DtKsRUZ^pFqm+y72g?cgEoKB(an0jE5R^UpAQh`J^`nb4sR;W)yVSwG}o+ zlLHaz*_P*d6{q(B^~RAMi@>s+jsP8s)B0$8)-Qtjf8A_~rK(SX`t?1hHRf8@@pcm# z(KjT6zMdBK#ihq1Z%kS(KMW_Q)Yt6f*tX~OLiu3N;LK%Nw~We?{x@Wu#TOKIO%(gdw3ys~5;SKP<3vi4W0sZ@ zyk|=?4;2_;jz@Pvr7lmWel+5fc&-fNK-!g2!4kZClVisg;N?tuGl|E#@;twn4NHny zsm;+Nn#X|V*+BFPozy_w)nt|R#9XVSBaQgoNvK=|`O$W{E$_73rMAU~O;=GUwNnd7 zD*Q5wd(H+fpg9W~>g#P$zh@FGE?ZfU*$lp2AzC^S6j%<4uvTY4QumI%9~S4kVA}-m zY-5$Run@OJW{`7mGWD&iUq1;*cOW)hzM#!y5h6*lNS|5cC;1MBOybuqvda3dundjp zPIafu>xluJy9&1k-+r|FR={3zg%3@198Cl6BMeO-fyf*1xT0YDFqmL*I}f2;G+VwX zLEvf_H0AxkWWPDBhc*V>b$ABo5y+M3=m$j!UMiMM4oPO}G#k63IR|OWvMn+;eYsXe z+j=aT97np3h2yT3)7<1T>Fyq;4)+Old2|~cc6|`EU4?O?d*vT~sI{jdSJrJpc{g|} z9{p6OUT{jE6QUWo(GO?i6G%1^+$|h$#HDslY8i{XsG;Nt>J(+jPvQ*RER#zy8-q-* zEy|;CXcI;%@Sa~EXX}Mk^1z%T@`j^XIONz(z&q%rWfFn&GqWmhobXvgRyA>>;Rb`m_D_;cO{uMde8whB{A%-h!;z*>P z=2$cq9(IkWmeYZ-m?t6%**6j^^t@!b#hpI!U?L6)zWVd&klJmD87Bmu&13TL$$ zd)Jy1VSKP=v@UmNXqHoed3UMoUF%wHQZXY0AUg&1fbs6AJcd6sn zmOxkmW*o4iK5g(V{J8i@VOMXyiu}a!*F8Xc>VK{U>uQ6)D@W(0vi6JnzuX7Bm`snU%)8|@>lMO)Q$D$Vo#u-H z{*2TW(_4GAXuk``(4|ngqd=*z;i!NS8PUF=>2&+-uNe*dI1&Fc%o-KQFLGnsXRm#UetarxY>+<`<^Ry-k}@UhR$col z_5FbJstUsQfwb3=9H=<{tJk`|i=Go$Hipxr9U&eg|>6m_T z*()3GYTKsZ;6?rYUm>TYeJVGob1+HhJJRD=9a-`2$$b+vAWCt+E>a3_oBgT&&hSOO zqYnZJWDtpy9H@6s{KRi1`wd&vL!uK^hk@zytD-U^c}^T_NsSPW70k&MqgW z-h{8~80Vpm`}r{3Fl1%_}pg$Nx5G^M&yU=`)rMAP2|zrH*} zP61eVWMcf9R~4NCi}CHoUx5E&+*v>$4M0z=|JGo?Z$6b|)E)ywk)|QQ|H6=1l0?zg z@Q=~>5%P#RCZvYun_!8^>>-_=7-e~mJOrbk>vy3gG!@^u66#a$VZbj%N2WZWb21{; z;lOh2=VI>3GD3BdxGM$R0^#;*YPYEy2v{?YeZchYCOX+?G;QL3vP_N0n7W39rS&C} zmUW?8miv}^BF_ank|t$Pg{xJVtD>elBYwXuaIqF zcvkyWv3cfN)*uQjJzt;{w0#_pnFRwxOo=zi!RB&wUHQ`eX^tyF)DR>G@XuS9#oeHC$+QUQf>p$dFAp5; zuaaGF{z&nHs2$M9%okRmbSz)KIASTeCdqPnOhB2GWC4K1xAP-p6BEf zvoFdqHh~0dFP~hihBl^jRfH$0Qzq-&K7dxK%AQ#IIu?kS5z4}g@vMo_s!9|<0m#e> z#T5}leJ^Z$rZXGPd33j|DN_#dUv5EDSxHb_a?__W8`Nm0OnjN8mJ!#%ctbI7vH4RfG$E7K-MripWuhmOBsA3g?C)YY z6@JU+npqXAdNU@>ZaIvhnrK}+`GyHj$*!`VpK z#i#oI%BQBu5B#GF?V>SzkcheS{Fya1@_F$s{@q84E!Gl-(CZt?f5tvivPu3%mXR1z z)fB+uhVVb_9BVl{3&rAJn&SLjudG3eyN4YG=&Lj1UDEPd8H~6wpe%5k1Jj&BIWr0F zJ!>&=DGvFP_$2vid%&!uD1`-;xiOu0;m(KEY1o-x=kHEh zQ>K5K3Ww9QfH`c!L7Pq^gfXJT+f9a?5vp~ra@F!szm^g9;$`N_z+ z8_B2-8#NX}by>Wm761abO>GN5O$F-telN^Fad{wvnGu)#5DJxe+tw#Xk%3kyiix~% zJ@MpRb2yQ8L?AF~e_@0;I?~|uG*octF7nqm*fhjM`ltzL# z>uLup*p%*nB0gy>4A6wbu3@Kh0zxTYtT^AZaxL02Mz6UXMFf;M^^1UtSYQN@?k?rs zw?gSeFu-;=S)fPtzqGL1ptPoT49V9OwU*_ipprSR@sXWnImplPuvngX8YT|676saW zLF4h9*(dJz_?X#6%8+QU_zI%{$Ag}*IW*p9Eb6y-Dz#$sOQJs`i&00ET^JqdrG)Bv zWRy1`4_h$5HRoOa`2{Fl+EeP+iVQkt&SG!#1`!!A*8Z~nC;=O0oM|t54Aqx$Z zk+6tff4G0P@{ED2&qPNk{CBZ^uMt*5R`x(EX1H`NFu^%GscxGvODBJZVqsQmC(A0k%Kcr`xQ(`smM z0@c`Xy3(Sr?i@5*bcL*h$j2dhYg1kkZBQ<*^lvs-2}F|tw&4u@#FFmmo7EjV`tTBU z(^~$jP2trvM<0RP-OLlpfnjFQmd)%Ul#6fN>U?Z3fpUrqoRe)!M?VTM*pK~?*H6%m zW6)7XudhU5b7kPj+mi!elO#02HYd1madW>bObeTTWq#0iDb24`iD?YA%67y%W_X_J z`K_<)ZU%cd;;&j3Vo*P1(VNjX?VbIN`A^WRcAkA>UK%&*h>JFrqK Date: Mon, 3 Oct 2022 19:02:38 -0500 Subject: [PATCH 17/17] Update eth-lattice-keyring to v0.12.3 (#15997) --- lavamoat/browserify/beta/policy.json | 131 +-- lavamoat/browserify/flask/policy.json | 123 +-- lavamoat/browserify/main/policy.json | 131 +-- lavamoat/build-system/policy.json | 1421 ++++++------------------- package.json | 2 +- yarn.lock | 84 +- 6 files changed, 460 insertions(+), 1432 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 2e9433adf656..2e1e455bc59c 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -2405,36 +2405,13 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": { - "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, - "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true - } - }, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { "globals": { "define": true @@ -2481,10 +2458,10 @@ "packages": { "@ethereumjs/tx": true, "@keystonehq/bc-ur-registry-eth": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -3425,14 +3402,6 @@ "crypto": true } }, - "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/smart-transactions-controller": { "globals": { "URLSearchParams": true, @@ -3691,11 +3660,6 @@ "localStorage": true } }, - "@storybook/components>qs": { - "packages": { - "string.prototype.matchall>side-channel": true - } - }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -4500,15 +4464,6 @@ "string.prototype.matchall>call-bind": true } }, - "enzyme>object-inspect": { - "globals": { - "HTMLElement": true, - "WeakRef": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "enzyme>object-is": { "packages": { "globalthis>define-properties": true, @@ -4766,44 +4721,56 @@ "clearInterval": true, "fetch": true, "open": true, - "setInterval": true, - "txData.type": true + "setInterval": true }, "packages": { "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/common": true, "eth-lattice-keyring>@ethereumjs/tx": true, + "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, - "eth-lattice-keyring>rlp": true, - "eth-lattice-keyring>secp256k1": true, - "ethereumjs-util": true + "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/tx": { "packages": { - "@ethereumjs/common>crc-32": true, + "@ethereumjs/common": true, "browserify>buffer": true, - "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true, "ethereumjs-util": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { + "eth-lattice-keyring>@ethereumjs/util": { "packages": { "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true } }, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "eth-lattice-keyring>bn.js": { @@ -4816,9 +4783,15 @@ }, "eth-lattice-keyring>gridplus-sdk": { "globals": { + "AbortController": true, + "Request": true, "__values": true, + "caches": true, + "clearTimeout": true, + "console.error": true, "console.log": true, "console.warn": true, + "fetch": true, "setTimeout": true }, "packages": { @@ -4837,7 +4810,6 @@ "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true, "eth-lattice-keyring>gridplus-sdk>rlp": true, "eth-lattice-keyring>gridplus-sdk>secp256k1": true, - "eth-lattice-keyring>gridplus-sdk>superagent": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, "ethers>@ethersproject/keccak256>js-sha3": true, @@ -4934,33 +4906,11 @@ "3box>ethers>elliptic": true } }, - "eth-lattice-keyring>gridplus-sdk>superagent": { - "globals": { - "XMLHttpRequest": true, - "btoa": true, - "clearTimeout": true, - "console.error": true, - "console.warn": true, - "setTimeout": true - }, - "packages": { - "@storybook/components>qs": true, - "browserify>browser-resolve": true, - "browserify>process": true, - "eth-rpc-errors>fast-safe-stringify": true, - "pubnub>superagent>component-emitter": true - } - }, "eth-lattice-keyring>rlp": { "globals": { "TextEncoder": true } }, - "eth-lattice-keyring>secp256k1": { - "packages": { - "3box>ethers>elliptic": true - } - }, "eth-method-registry": { "packages": { "ethjs": true @@ -7449,13 +7399,6 @@ "string.prototype.matchall>call-bind": true } }, - "string.prototype.matchall>side-channel": { - "packages": { - "enzyme>object-inspect": true, - "string.prototype.matchall>call-bind": true, - "string.prototype.matchall>get-intrinsic": true - } - }, "stylelint>write-file-atomic>typedarray-to-buffer": { "packages": { "browserify>buffer": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 3613d9de2cc2..6ba23b6c3f72 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2566,36 +2566,13 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": { - "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, - "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true - } - }, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { "globals": { "define": true @@ -2642,10 +2619,10 @@ "packages": { "@ethereumjs/tx": true, "@keystonehq/bc-ur-registry-eth": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -4469,11 +4446,6 @@ "localStorage": true } }, - "@storybook/components>qs": { - "packages": { - "string.prototype.matchall>side-channel": true - } - }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -5312,15 +5284,6 @@ "string.prototype.matchall>call-bind": true } }, - "enzyme>object-inspect": { - "globals": { - "HTMLElement": true, - "WeakRef": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "enzyme>object-is": { "packages": { "globalthis>define-properties": true, @@ -5578,44 +5541,56 @@ "clearInterval": true, "fetch": true, "open": true, - "setInterval": true, - "txData.type": true + "setInterval": true }, "packages": { "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/common": true, "eth-lattice-keyring>@ethereumjs/tx": true, + "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, - "eth-lattice-keyring>rlp": true, - "eth-lattice-keyring>secp256k1": true, - "ethereumjs-util": true + "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/tx": { "packages": { - "@ethereumjs/common>crc-32": true, + "@ethereumjs/common": true, "browserify>buffer": true, - "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true, "ethereumjs-util": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { + "eth-lattice-keyring>@ethereumjs/util": { "packages": { "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true } }, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "eth-lattice-keyring>bn.js": { @@ -5628,9 +5603,15 @@ }, "eth-lattice-keyring>gridplus-sdk": { "globals": { + "AbortController": true, + "Request": true, "__values": true, + "caches": true, + "clearTimeout": true, + "console.error": true, "console.log": true, "console.warn": true, + "fetch": true, "setTimeout": true }, "packages": { @@ -5649,7 +5630,6 @@ "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true, "eth-lattice-keyring>gridplus-sdk>rlp": true, "eth-lattice-keyring>gridplus-sdk>secp256k1": true, - "eth-lattice-keyring>gridplus-sdk>superagent": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, "ethers>@ethersproject/keccak256>js-sha3": true, @@ -5746,33 +5726,11 @@ "3box>ethers>elliptic": true } }, - "eth-lattice-keyring>gridplus-sdk>superagent": { - "globals": { - "XMLHttpRequest": true, - "btoa": true, - "clearTimeout": true, - "console.error": true, - "console.warn": true, - "setTimeout": true - }, - "packages": { - "@storybook/components>qs": true, - "browserify>browser-resolve": true, - "browserify>process": true, - "eth-rpc-errors>fast-safe-stringify": true, - "pubnub>superagent>component-emitter": true - } - }, "eth-lattice-keyring>rlp": { "globals": { "TextEncoder": true } }, - "eth-lattice-keyring>secp256k1": { - "packages": { - "3box>ethers>elliptic": true - } - }, "eth-method-registry": { "packages": { "ethjs": true @@ -8293,13 +8251,6 @@ "string.prototype.matchall>call-bind": true } }, - "string.prototype.matchall>side-channel": { - "packages": { - "enzyme>object-inspect": true, - "string.prototype.matchall>call-bind": true, - "string.prototype.matchall>get-intrinsic": true - } - }, "stylelint>autoprefixer>browserslist": { "packages": { "browserify>browser-resolve": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 2e9433adf656..2e1e455bc59c 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -2405,36 +2405,13 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": { - "packages": { - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, - "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true - } - }, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { "globals": { "define": true @@ -2481,10 +2458,10 @@ "packages": { "@ethereumjs/tx": true, "@keystonehq/bc-ur-registry-eth": true, - "@keystonehq/bc-ur-registry-eth>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, + "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -3425,14 +3402,6 @@ "crypto": true } }, - "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/smart-transactions-controller": { "globals": { "URLSearchParams": true, @@ -3691,11 +3660,6 @@ "localStorage": true } }, - "@storybook/components>qs": { - "packages": { - "string.prototype.matchall>side-channel": true - } - }, "@storybook/react>@storybook/store>stable": { "globals": { "define": true @@ -4500,15 +4464,6 @@ "string.prototype.matchall>call-bind": true } }, - "enzyme>object-inspect": { - "globals": { - "HTMLElement": true, - "WeakRef": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "enzyme>object-is": { "packages": { "globalthis>define-properties": true, @@ -4766,44 +4721,56 @@ "clearInterval": true, "fetch": true, "open": true, - "setInterval": true, - "txData.type": true + "setInterval": true }, "packages": { "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/common": true, "eth-lattice-keyring>@ethereumjs/tx": true, + "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, - "eth-lattice-keyring>rlp": true, - "eth-lattice-keyring>secp256k1": true, - "ethereumjs-util": true + "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/tx": { "packages": { - "@ethereumjs/common>crc-32": true, + "@ethereumjs/common": true, "browserify>buffer": true, - "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true, "ethereumjs-util": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { + "eth-lattice-keyring>@ethereumjs/util": { "packages": { "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true } }, - "eth-lattice-keyring>@ethereumjs/tx>@ethereumjs/common": { + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true + } + }, + "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "eth-lattice-keyring>bn.js": { @@ -4816,9 +4783,15 @@ }, "eth-lattice-keyring>gridplus-sdk": { "globals": { + "AbortController": true, + "Request": true, "__values": true, + "caches": true, + "clearTimeout": true, + "console.error": true, "console.log": true, "console.warn": true, + "fetch": true, "setTimeout": true }, "packages": { @@ -4837,7 +4810,6 @@ "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true, "eth-lattice-keyring>gridplus-sdk>rlp": true, "eth-lattice-keyring>gridplus-sdk>secp256k1": true, - "eth-lattice-keyring>gridplus-sdk>superagent": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, "ethers>@ethersproject/keccak256>js-sha3": true, @@ -4934,33 +4906,11 @@ "3box>ethers>elliptic": true } }, - "eth-lattice-keyring>gridplus-sdk>superagent": { - "globals": { - "XMLHttpRequest": true, - "btoa": true, - "clearTimeout": true, - "console.error": true, - "console.warn": true, - "setTimeout": true - }, - "packages": { - "@storybook/components>qs": true, - "browserify>browser-resolve": true, - "browserify>process": true, - "eth-rpc-errors>fast-safe-stringify": true, - "pubnub>superagent>component-emitter": true - } - }, "eth-lattice-keyring>rlp": { "globals": { "TextEncoder": true } }, - "eth-lattice-keyring>secp256k1": { - "packages": { - "3box>ethers>elliptic": true - } - }, "eth-method-registry": { "packages": { "ethjs": true @@ -7449,13 +7399,6 @@ "string.prototype.matchall>call-bind": true } }, - "string.prototype.matchall>side-channel": { - "packages": { - "enzyme>object-inspect": true, - "string.prototype.matchall>call-bind": true, - "string.prototype.matchall>get-intrinsic": true - } - }, "stylelint>write-file-atomic>typedarray-to-buffer": { "packages": { "browserify>buffer": true, diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index d83c594a851a..d05fa519b195 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1809,7 +1809,6 @@ }, "packages": { "chokidar>braces": true, - "chokidar>fsevents": true, "chokidar>glob-parent": true, "chokidar>is-binary-path": true, "chokidar>normalize-path": true, @@ -1836,12 +1835,6 @@ "chokidar>braces>fill-range>to-regex-range>is-number": true } }, - "chokidar>fsevents": { - "globals": { - "process.platform": true - }, - "native": true - }, "chokidar>glob-parent": { "builtin": { "os.platform": true, @@ -4235,7 +4228,6 @@ "gulp-watch>chokidar>anymatch": true, "gulp-watch>chokidar>async-each": true, "gulp-watch>chokidar>braces": true, - "gulp-watch>chokidar>fsevents": true, "gulp-watch>chokidar>is-binary-path": true, "gulp-watch>chokidar>normalize-path": true, "gulp-watch>chokidar>readdirp": true, @@ -4384,1319 +4376,552 @@ "webpack>micromatch>braces>fill-range>repeat-string": true } }, - "gulp-watch>chokidar>fsevents": { + "gulp-watch>chokidar>is-binary-path": { "builtin": { - "events.EventEmitter": true, - "fs.stat": true, - "path.join": true, - "util.inherits": true - }, - "globals": { - "__dirname": true, - "process.nextTick": true, - "process.platform": true, - "setImmediate": true + "path.extname": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp": true + "gulp-watch>chokidar>is-binary-path>binary-extensions": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp": { + "gulp-watch>chokidar>readdirp": { "builtin": { - "events.EventEmitter": true, - "fs.existsSync": true, - "fs.readFileSync": true, - "fs.renameSync": true, - "path.dirname": true, - "path.existsSync": true, "path.join": true, - "path.resolve": true, - "url.parse": true, - "url.resolve": true, + "path.relative": true, "util.inherits": true }, "globals": { - "__dirname": true, - "console.log": true, - "process.arch": true, - "process.cwd": true, - "process.env": true, - "process.platform": true, - "process.version.substr": true, - "process.versions": true + "setImmediate": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": { - "builtin": { - "child_process.spawnSync": true, - "fs.readdirSync": true, - "os.platform": true - }, - "globals": { - "process.env": true + "fs-extra>graceful-fs": true, + "gulp-watch>chokidar>readdirp>micromatch": true, + "readable-stream": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": { + "gulp-watch>chokidar>readdirp>micromatch": { "builtin": { - "path": true, - "stream.Stream": true, - "url": true + "path.basename": true, + "path.sep": true, + "util.inspect": true }, "globals": { - "console": true, - "process.argv": true, - "process.env.DEBUG_NOPT": true, - "process.env.NOPT_DEBUG": true, "process.platform": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true + "gulp-watch>chokidar>braces": true, + "gulp-watch>chokidar>readdirp>micromatch>arr-diff": true, + "gulp-watch>chokidar>readdirp>micromatch>array-unique": true, + "gulp-watch>chokidar>readdirp>micromatch>define-property": true, + "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob": true, + "gulp-watch>chokidar>readdirp>micromatch>kind-of": true, + "webpack>micromatch>fragment-cache": true, + "webpack>micromatch>nanomatch": true, + "webpack>micromatch>object.pick": true, + "webpack>micromatch>regex-not": true, + "webpack>micromatch>snapdragon": true, + "webpack>micromatch>to-regex": true + } + }, + "gulp-watch>chokidar>readdirp>micromatch>define-property": { + "packages": { + "gulp>gulp-cli>isobject": true, + "webpack>micromatch>define-property>is-descriptor": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": { - "builtin": { - "child_process.exec": true, - "path": true - }, - "globals": { - "process.env.COMPUTERNAME": true, - "process.env.ComSpec": true, - "process.env.EDITOR": true, - "process.env.HOSTNAME": true, - "process.env.PATH": true, - "process.env.PROMPT": true, - "process.env.PS1": true, - "process.env.Path": true, - "process.env.SHELL": true, - "process.env.USER": true, - "process.env.USERDOMAIN": true, - "process.env.USERNAME": true, - "process.env.VISUAL": true, - "process.env.path": true, - "process.nextTick": true, - "process.platform": true - }, + "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": { "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true + "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": true, + "webpack>micromatch>extend-shallow>assign-symbols": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": { - "builtin": { - "os.homedir": true - }, - "globals": { - "process.env": true, - "process.getuid": true, - "process.platform": true + "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": { + "packages": { + "@babel/register>clone-deep>is-plain-object": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": { - "globals": { - "process.env.SystemRoot": true, - "process.env.TEMP": true, - "process.env.TMP": true, - "process.env.TMPDIR": true, - "process.env.windir": true, - "process.platform": true + "gulp-watch>chokidar>readdirp>micromatch>extglob": { + "packages": { + "gulp-watch>chokidar>readdirp>micromatch>array-unique": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": true, + "webpack>micromatch>fragment-cache": true, + "webpack>micromatch>regex-not": true, + "webpack>micromatch>snapdragon": true, + "webpack>micromatch>to-regex": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": { - "builtin": { - "events.EventEmitter": true, - "util": true - }, - "globals": { - "process.nextTick": true, - "process.stderr": true - }, + "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": { "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": true + "webpack>micromatch>define-property>is-descriptor": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": { - "builtin": { - "events.EventEmitter": true, - "util.inherits": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": { + "globals": { + "__filename": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>delegates": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": true, + "webpack>micromatch>extglob>expand-brackets>posix-character-classes": true, + "webpack>micromatch>regex-not": true, + "webpack>micromatch>snapdragon": true, + "webpack>micromatch>to-regex": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": { + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": { "builtin": { - "events.EventEmitter": true, - "stream": true, + "fs.SyncWriteStream": true, + "net.Socket": true, + "tty.WriteStream": true, + "tty.isatty": true, "util": true }, "globals": { - "process.browser": true, - "process.env.READABLE_STREAM": true, - "process.stderr": true, - "process.stdout": true, - "process.version.slice": true, - "setImmediate": true + "chrome": true, + "console": true, + "document": true, + "localStorage": true, + "navigator": true, + "process": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>isarray": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug>ms": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": { - "globals": { - "Buffer.isBuffer": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": { + "packages": { + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": { - "globals": { - "process": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": { + "packages": { + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": { + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": { "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true + "gulp-watch>anymatch>micromatch>kind-of": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": { - "builtin": { - "util.deprecate": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": { + "packages": { + "gulp-watch>anymatch>micromatch>kind-of": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": { - "builtin": { - "util.format": true - }, - "globals": { - "clearInterval": true, - "process": true, - "setImmediate": true, - "setInterval": true - }, + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": { "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>aproba": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>object-assign": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": { - "builtin": { - "os.type": true - }, - "globals": { - "process.env.LANG": true, - "process.env.LC_ALL": true, - "process.env.LC_CTYPE": true + "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": { + "packages": { + "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": { + "gulp-watch>chokidar>upath": { "builtin": { - "assert.equal": true, - "events": true - }, - "globals": { - "process": true + "path": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": { + "gulp-watch>fancy-log": { + "globals": { + "console": true, + "process.argv.indexOf": true, + "process.stderr.write": true, + "process.stdout.write": true + }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>code-point-at": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true + "fancy-log>ansi-gray": true, + "fancy-log>color-support": true, + "fancy-log>time-stamp": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": { + "gulp-watch>glob-parent": { + "builtin": { + "os.platform": true, + "path": true + }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true + "gulp-watch>glob-parent>is-glob": true, + "gulp-watch>glob-parent>path-dirname": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": { + "gulp-watch>glob-parent>is-glob": { "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true + "gulp-watch>glob-parent>is-glob>is-extglob": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": { - "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true + "gulp-watch>glob-parent>path-dirname": { + "builtin": { + "path": true, + "util.inspect": true + }, + "globals": { + "process.platform": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": { + "gulp-watch>path-is-absolute": { "globals": { - "process.stderr": true, - "process.stdout": true + "process.platform": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": { + "gulp-watch>vinyl-file": { "builtin": { - "assert": true, - "fs": true, - "path.join": true + "path.resolve": true }, "globals": { - "process.platform": true, - "setTimeout": true + "process.cwd": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": true + "del>globby>pinkie-promise": true, + "fs-extra>graceful-fs": true, + "gulp-watch>vinyl-file>pify": true, + "gulp-watch>vinyl-file>strip-bom": true, + "gulp-watch>vinyl-file>strip-bom-stream": true, + "gulp-watch>vinyl-file>vinyl": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": { - "builtin": { - "assert": true, - "events.EventEmitter": true, - "fs.lstat": true, - "fs.lstatSync": true, - "fs.readdir": true, - "fs.readdirSync": true, - "fs.stat": true, - "fs.statSync": true, - "path.join": true, - "path.resolve": true, - "util": true - }, + "gulp-watch>vinyl-file>strip-bom": { "globals": { - "console.error": true, - "process.cwd": true, - "process.nextTick": true, - "process.platform": true + "Buffer.isBuffer": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": true + "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": { - "builtin": { - "fs.lstat": true, - "fs.lstatSync": true, - "fs.readlink": true, - "fs.readlinkSync": true, - "fs.realpath": true, - "fs.realpathSync": true, - "fs.stat": true, - "fs.statSync": true, - "path.normalize": true, - "path.resolve": true - }, - "globals": { - "console.error": true, - "console.trace": true, - "process.env.NODE_DEBUG": true, - "process.nextTick": true, - "process.noDeprecation": true, - "process.platform": true, - "process.throwDeprecation": true, - "process.traceDeprecation": true, - "process.version": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": { - "globals": { - "process.nextTick": true - }, - "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": { - "builtin": { - "util.inherits": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": { - "builtin": { - "path": true - }, - "globals": { - "console.error": true - }, - "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": { - "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>balanced-match": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>concat-map": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": { - "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": { - "globals": { - "process.platform": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": { - "globals": { - "console": true, - "process": true - } - }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": { - "builtin": { - "buffer": true - } - }, - "gulp-watch>chokidar>is-binary-path": { - "builtin": { - "path.extname": true - }, - "packages": { - "gulp-watch>chokidar>is-binary-path>binary-extensions": true - } - }, - "gulp-watch>chokidar>readdirp": { - "builtin": { - "path.join": true, - "path.relative": true, - "util.inherits": true - }, - "globals": { - "setImmediate": true - }, - "packages": { - "fs-extra>graceful-fs": true, - "gulp-watch>chokidar>readdirp>micromatch": true, - "readable-stream": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch": { - "builtin": { - "path.basename": true, - "path.sep": true, - "util.inspect": true - }, - "globals": { - "process.platform": true - }, - "packages": { - "gulp-watch>chokidar>braces": true, - "gulp-watch>chokidar>readdirp>micromatch>arr-diff": true, - "gulp-watch>chokidar>readdirp>micromatch>array-unique": true, - "gulp-watch>chokidar>readdirp>micromatch>define-property": true, - "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob": true, - "gulp-watch>chokidar>readdirp>micromatch>kind-of": true, - "webpack>micromatch>fragment-cache": true, - "webpack>micromatch>nanomatch": true, - "webpack>micromatch>object.pick": true, - "webpack>micromatch>regex-not": true, - "webpack>micromatch>snapdragon": true, - "webpack>micromatch>to-regex": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>define-property": { - "packages": { - "gulp>gulp-cli>isobject": true, - "webpack>micromatch>define-property>is-descriptor": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": true, - "webpack>micromatch>extend-shallow>assign-symbols": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": { - "packages": { - "@babel/register>clone-deep>is-plain-object": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>array-unique": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": true, - "webpack>micromatch>fragment-cache": true, - "webpack>micromatch>regex-not": true, - "webpack>micromatch>snapdragon": true, - "webpack>micromatch>to-regex": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": { - "packages": { - "webpack>micromatch>define-property>is-descriptor": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": { - "globals": { - "__filename": true - }, - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": true, - "webpack>micromatch>extglob>expand-brackets>posix-character-classes": true, - "webpack>micromatch>regex-not": true, - "webpack>micromatch>snapdragon": true, - "webpack>micromatch>to-regex": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": { - "builtin": { - "fs.SyncWriteStream": true, - "net.Socket": true, - "tty.WriteStream": true, - "tty.isatty": true, - "util": true - }, - "globals": { - "chrome": true, - "console": true, - "document": true, - "localStorage": true, - "navigator": true, - "process": true - }, - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug>ms": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": { - "packages": { - "gulp-watch>anymatch>micromatch>kind-of": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": { - "packages": { - "gulp-watch>anymatch>micromatch>kind-of": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": true - } - }, - "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": { - "packages": { - "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true - } - }, - "gulp-watch>chokidar>upath": { - "builtin": { - "path": true - } - }, - "gulp-watch>fancy-log": { - "globals": { - "console": true, - "process.argv.indexOf": true, - "process.stderr.write": true, - "process.stdout.write": true - }, - "packages": { - "fancy-log>ansi-gray": true, - "fancy-log>color-support": true, - "fancy-log>time-stamp": true - } - }, - "gulp-watch>glob-parent": { - "builtin": { - "os.platform": true, - "path": true - }, - "packages": { - "gulp-watch>glob-parent>is-glob": true, - "gulp-watch>glob-parent>path-dirname": true - } - }, - "gulp-watch>glob-parent>is-glob": { - "packages": { - "gulp-watch>glob-parent>is-glob>is-extglob": true - } - }, - "gulp-watch>glob-parent>path-dirname": { - "builtin": { - "path": true, - "util.inspect": true - }, - "globals": { - "process.platform": true - } - }, - "gulp-watch>path-is-absolute": { - "globals": { - "process.platform": true - } - }, - "gulp-watch>vinyl-file": { - "builtin": { - "path.resolve": true - }, - "globals": { - "process.cwd": true - }, - "packages": { - "del>globby>pinkie-promise": true, - "fs-extra>graceful-fs": true, - "gulp-watch>vinyl-file>pify": true, - "gulp-watch>vinyl-file>strip-bom": true, - "gulp-watch>vinyl-file>strip-bom-stream": true, - "gulp-watch>vinyl-file>vinyl": true - } - }, - "gulp-watch>vinyl-file>strip-bom": { - "globals": { - "Buffer.isBuffer": true - }, - "packages": { - "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true - } - }, - "gulp-watch>vinyl-file>strip-bom-stream": { - "packages": { - "gulp-watch>vinyl-file>strip-bom": true, - "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true - } - }, - "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": { - "builtin": { - "util.inherits": true - }, - "globals": { - "Buffer.concat": true, - "setImmediate": true - }, - "packages": { - "readable-stream": true - } - }, - "gulp-watch>vinyl-file>vinyl": { - "builtin": { - "buffer.Buffer": true, - "path.basename": true, - "path.dirname": true, - "path.extname": true, - "path.join": true, - "path.relative": true, - "stream.PassThrough": true, - "stream.Stream": true - }, - "globals": { - "process.cwd": true - }, - "packages": { - "gulp-watch>vinyl-file>vinyl>clone": true, - "gulp-watch>vinyl-file>vinyl>clone-stats": true, - "gulp-watch>vinyl-file>vinyl>replace-ext": true - } - }, - "gulp-watch>vinyl-file>vinyl>clone": { - "globals": { - "Buffer": true - } - }, - "gulp-watch>vinyl-file>vinyl>clone-stats": { - "builtin": { - "fs.Stats": true - } - }, - "gulp-watch>vinyl-file>vinyl>replace-ext": { - "builtin": { - "path.basename": true, - "path.dirname": true, - "path.extname": true, - "path.join": true - } - }, - "gulp-zip": { - "builtin": { - "buffer.constants.MAX_LENGTH": true, - "path.join": true - }, - "packages": { - "gulp-zip>get-stream": true, - "gulp-zip>plugin-error": true, - "gulp-zip>through2": true, - "gulp-zip>yazl": true, - "vinyl": true - } - }, - "gulp-zip>get-stream": { - "builtin": { - "buffer.constants.MAX_LENGTH": true, - "stream.PassThrough": true - }, - "globals": { - "Buffer.concat": true - }, - "packages": { - "pump": true - } - }, - "gulp-zip>plugin-error": { - "builtin": { - "util.inherits": true - }, - "packages": { - "gulp-watch>ansi-colors": true, - "gulp-zip>plugin-error>arr-union": true, - "gulp-zip>plugin-error>extend-shallow": true, - "webpack>micromatch>arr-diff": true - } - }, - "gulp-zip>plugin-error>extend-shallow": { - "packages": { - "gulp-zip>plugin-error>extend-shallow>is-extendable": true, - "webpack>micromatch>extend-shallow>assign-symbols": true - } - }, - "gulp-zip>plugin-error>extend-shallow>is-extendable": { - "packages": { - "@babel/register>clone-deep>is-plain-object": true - } - }, - "gulp-zip>through2": { - "builtin": { - "util.inherits": true - }, - "globals": { - "process.nextTick": true - }, - "packages": { - "gulp-zip>through2>readable-stream": true - } - }, - "gulp-zip>through2>readable-stream": { - "builtin": { - "buffer.Buffer": true, - "events.EventEmitter": true, - "stream": true, - "util": true - }, - "globals": { - "process.env.READABLE_STREAM": true, - "process.nextTick": true, - "process.stderr": true, - "process.stdout": true - }, - "packages": { - "@storybook/api>util-deprecate": true, - "browserify>string_decoder": true, - "pumpify>inherits": true - } - }, - "gulp-zip>yazl": { - "builtin": { - "events.EventEmitter": true, - "fs.createReadStream": true, - "fs.stat": true, - "stream.PassThrough": true, - "stream.Transform": true, - "util.inherits": true, - "zlib.DeflateRaw": true, - "zlib.deflateRaw": true - }, - "globals": { - "Buffer": true, - "setImmediate": true, - "utf8FileName.length": true - }, - "packages": { - "gulp-zip>yazl>buffer-crc32": true - } - }, - "gulp-zip>yazl>buffer-crc32": { - "builtin": { - "buffer.Buffer": true - } - }, - "gulp>glob-watcher": { - "packages": { - "gulp>glob-watcher>anymatch": true, - "gulp>glob-watcher>async-done": true, - "gulp>glob-watcher>chokidar": true, - "gulp>glob-watcher>is-negated-glob": true, - "gulp>glob-watcher>just-debounce": true, - "gulp>undertaker>object.defaults": true - } - }, - "gulp>glob-watcher>anymatch": { - "builtin": { - "path.sep": true - }, - "packages": { - "gulp>glob-watcher>anymatch>micromatch": true, - "gulp>glob-watcher>anymatch>normalize-path": true - } - }, - "gulp>glob-watcher>anymatch>micromatch": { - "builtin": { - "path.basename": true, - "path.sep": true, - "util.inspect": true - }, - "globals": { - "process.platform": true - }, - "packages": { - "3box>ipfs>kind-of": true, - "gulp>glob-watcher>anymatch>micromatch>define-property": true, - "gulp>glob-watcher>anymatch>micromatch>extend-shallow": true, - "gulp>glob-watcher>chokidar>braces": true, - "webpack>micromatch>arr-diff": true, - "webpack>micromatch>array-unique": true, - "webpack>micromatch>extglob": true, - "webpack>micromatch>fragment-cache": true, - "webpack>micromatch>nanomatch": true, - "webpack>micromatch>object.pick": true, - "webpack>micromatch>regex-not": true, - "webpack>micromatch>snapdragon": true, - "webpack>micromatch>to-regex": true - } - }, - "gulp>glob-watcher>anymatch>micromatch>define-property": { - "packages": { - "gulp>gulp-cli>isobject": true, - "webpack>micromatch>define-property>is-descriptor": true - } - }, - "gulp>glob-watcher>anymatch>micromatch>extend-shallow": { - "packages": { - "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": true, - "webpack>micromatch>extend-shallow>assign-symbols": true - } - }, - "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": { - "packages": { - "@babel/register>clone-deep>is-plain-object": true - } - }, - "gulp>glob-watcher>anymatch>normalize-path": { - "packages": { - "vinyl>remove-trailing-separator": true - } - }, - "gulp>glob-watcher>async-done": { - "builtin": { - "domain.create": true - }, - "globals": { - "process.nextTick": true - }, + "gulp-watch>vinyl-file>strip-bom-stream": { "packages": { - "end-of-stream": true, - "gulp>glob-watcher>async-done>process-nextick-args": true, - "gulp>glob-watcher>async-done>stream-exhaust": true, - "pump>once": true - } - }, - "gulp>glob-watcher>async-done>process-nextick-args": { - "globals": { - "process": true + "gulp-watch>vinyl-file>strip-bom": true, + "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true } }, - "gulp>glob-watcher>async-done>stream-exhaust": { + "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": { "builtin": { - "stream.Writable": true, "util.inherits": true }, "globals": { + "Buffer.concat": true, "setImmediate": true + }, + "packages": { + "readable-stream": true } }, - "gulp>glob-watcher>chokidar": { + "gulp-watch>vinyl-file>vinyl": { "builtin": { - "events.EventEmitter": true, - "fs": true, + "buffer.Buffer": true, "path.basename": true, "path.dirname": true, "path.extname": true, "path.join": true, "path.relative": true, - "path.resolve": true, - "path.sep": true + "stream.PassThrough": true, + "stream.Stream": true }, "globals": { - "clearTimeout": true, - "console.error": true, - "process.env.CHOKIDAR_INTERVAL": true, - "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true, - "process.env.CHOKIDAR_USEPOLLING": true, - "process.nextTick": true, - "process.platform": true, - "setTimeout": true - }, - "packages": { - "eslint>is-glob": true, - "gulp-watch>chokidar>async-each": true, - "gulp-watch>glob-parent": true, - "gulp-watch>path-is-absolute": true, - "gulp>glob-watcher>anymatch": true, - "gulp>glob-watcher>chokidar>braces": true, - "gulp>glob-watcher>chokidar>fsevents": true, - "gulp>glob-watcher>chokidar>is-binary-path": true, - "gulp>glob-watcher>chokidar>normalize-path": true, - "gulp>glob-watcher>chokidar>readdirp": true, - "gulp>glob-watcher>chokidar>upath": true, - "pumpify>inherits": true - } - }, - "gulp>glob-watcher>chokidar>braces": { - "packages": { - "gulp>glob-watcher>chokidar>braces>fill-range": true, - "gulp>gulp-cli>isobject": true, - "gulp>undertaker>arr-flatten": true, - "webpack>micromatch>array-unique": true, - "webpack>micromatch>braces>repeat-element": true, - "webpack>micromatch>braces>snapdragon-node": true, - "webpack>micromatch>braces>split-string": true, - "webpack>micromatch>extglob>extend-shallow": true, - "webpack>micromatch>snapdragon": true, - "webpack>micromatch>to-regex": true - } - }, - "gulp>glob-watcher>chokidar>braces>fill-range": { - "builtin": { - "util.inspect": true + "process.cwd": true }, "packages": { - "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true, - "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true, - "webpack>micromatch>braces>fill-range>repeat-string": true, - "webpack>micromatch>extglob>extend-shallow": true - } - }, - "gulp>glob-watcher>chokidar>braces>fill-range>is-number": { - "packages": { - "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true - } - }, - "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": { - "packages": { - "browserify>insert-module-globals>is-buffer": true - } - }, - "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": { - "packages": { - "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true, - "webpack>micromatch>braces>fill-range>repeat-string": true + "gulp-watch>vinyl-file>vinyl>clone": true, + "gulp-watch>vinyl-file>vinyl>clone-stats": true, + "gulp-watch>vinyl-file>vinyl>replace-ext": true } }, - "gulp>glob-watcher>chokidar>fsevents": { - "builtin": { - "events.EventEmitter": true, - "fs.stat": true, - "path.join": true, - "util.inherits": true - }, + "gulp-watch>vinyl-file>vinyl>clone": { "globals": { - "__dirname": true, - "process.nextTick": true, - "process.platform": true, - "setImmediate": true - }, - "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": true + "Buffer": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": { + "gulp-watch>vinyl-file>vinyl>clone-stats": { "builtin": { - "events.EventEmitter": true, - "fs.existsSync": true, - "fs.readFileSync": true, - "fs.renameSync": true, - "path.dirname": true, - "path.existsSync": true, - "path.join": true, - "path.resolve": true, - "url.parse": true, - "url.resolve": true, - "util.inherits": true - }, - "globals": { - "__dirname": true, - "console.log": true, - "process.arch": true, - "process.cwd": true, - "process.env": true, - "process.platform": true, - "process.version.substr": true, - "process.versions": true - }, - "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>detect-libc": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>semver": true + "fs.Stats": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>detect-libc": { + "gulp-watch>vinyl-file>vinyl>replace-ext": { "builtin": { - "child_process.spawnSync": true, - "fs.readdirSync": true, - "os.platform": true - }, - "globals": { - "process.env": true + "path.basename": true, + "path.dirname": true, + "path.extname": true, + "path.join": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt": { + "gulp-zip": { "builtin": { - "path": true, - "stream.Stream": true, - "url": true - }, - "globals": { - "console": true, - "process.argv": true, - "process.env.DEBUG_NOPT": true, - "process.env.NOPT_DEBUG": true, - "process.platform": true + "buffer.constants.MAX_LENGTH": true, + "path.join": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": true + "gulp-zip>get-stream": true, + "gulp-zip>plugin-error": true, + "gulp-zip>through2": true, + "gulp-zip>yazl": true, + "vinyl": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": { + "gulp-zip>get-stream": { "builtin": { - "child_process.exec": true, - "path": true + "buffer.constants.MAX_LENGTH": true, + "stream.PassThrough": true }, "globals": { - "process.env.COMPUTERNAME": true, - "process.env.ComSpec": true, - "process.env.EDITOR": true, - "process.env.HOSTNAME": true, - "process.env.PATH": true, - "process.env.PROMPT": true, - "process.env.PS1": true, - "process.env.Path": true, - "process.env.SHELL": true, - "process.env.USER": true, - "process.env.USERDOMAIN": true, - "process.env.USERNAME": true, - "process.env.VISUAL": true, - "process.env.path": true, - "process.nextTick": true, - "process.platform": true + "Buffer.concat": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true + "pump": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": { + "gulp-zip>plugin-error": { "builtin": { - "os.homedir": true + "util.inherits": true }, - "globals": { - "process.env": true, - "process.getuid": true, - "process.platform": true + "packages": { + "gulp-watch>ansi-colors": true, + "gulp-zip>plugin-error>arr-union": true, + "gulp-zip>plugin-error>extend-shallow": true, + "webpack>micromatch>arr-diff": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": { - "globals": { - "process.env.SystemRoot": true, - "process.env.TEMP": true, - "process.env.TMP": true, - "process.env.TMPDIR": true, - "process.env.windir": true, - "process.platform": true + "gulp-zip>plugin-error>extend-shallow": { + "packages": { + "gulp-zip>plugin-error>extend-shallow>is-extendable": true, + "webpack>micromatch>extend-shallow>assign-symbols": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog": { - "builtin": { - "events.EventEmitter": true, - "util": true - }, - "globals": { - "process.nextTick": true, - "process.stderr": true - }, + "gulp-zip>plugin-error>extend-shallow>is-extendable": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": true + "@babel/register>clone-deep>is-plain-object": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": { + "gulp-zip>through2": { "builtin": { - "events.EventEmitter": true, "util.inherits": true }, + "globals": { + "process.nextTick": true + }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>delegates": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": true + "gulp-zip>through2>readable-stream": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": { + "gulp-zip>through2>readable-stream": { "builtin": { + "buffer.Buffer": true, "events.EventEmitter": true, "stream": true, "util": true }, "globals": { - "process.browser": true, "process.env.READABLE_STREAM": true, + "process.nextTick": true, "process.stderr": true, - "process.stdout": true, - "process.version.slice": true, - "setImmediate": true + "process.stdout": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>isarray": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": { - "globals": { - "Buffer.isBuffer": true + "@storybook/api>util-deprecate": true, + "browserify>string_decoder": true, + "pumpify>inherits": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": { + "gulp-zip>yazl": { + "builtin": { + "events.EventEmitter": true, + "fs.createReadStream": true, + "fs.stat": true, + "stream.PassThrough": true, + "stream.Transform": true, + "util.inherits": true, + "zlib.DeflateRaw": true, + "zlib.deflateRaw": true + }, "globals": { - "process": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": { + "Buffer": true, + "setImmediate": true, + "utf8FileName.length": true + }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true + "gulp-zip>yazl>buffer-crc32": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": { + "gulp-zip>yazl>buffer-crc32": { "builtin": { - "util.deprecate": true + "buffer.Buffer": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge": { - "builtin": { - "util.format": true - }, - "globals": { - "clearInterval": true, - "process": true, - "setImmediate": true, - "setInterval": true - }, + "gulp>glob-watcher": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>aproba": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>object-assign": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": true + "gulp>glob-watcher>anymatch": true, + "gulp>glob-watcher>async-done": true, + "gulp>glob-watcher>chokidar": true, + "gulp>glob-watcher>is-negated-glob": true, + "gulp>glob-watcher>just-debounce": true, + "gulp>undertaker>object.defaults": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": { + "gulp>glob-watcher>anymatch": { "builtin": { - "os.type": true + "path.sep": true }, - "globals": { - "process.env.LANG": true, - "process.env.LC_ALL": true, - "process.env.LC_CTYPE": true + "packages": { + "gulp>glob-watcher>anymatch>micromatch": true, + "gulp>glob-watcher>anymatch>normalize-path": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": { + "gulp>glob-watcher>anymatch>micromatch": { "builtin": { - "assert.equal": true, - "events": true + "path.basename": true, + "path.sep": true, + "util.inspect": true }, "globals": { - "process": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": { + "process.platform": true + }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>code-point-at": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true + "3box>ipfs>kind-of": true, + "gulp>glob-watcher>anymatch>micromatch>define-property": true, + "gulp>glob-watcher>anymatch>micromatch>extend-shallow": true, + "gulp>glob-watcher>chokidar>braces": true, + "webpack>micromatch>arr-diff": true, + "webpack>micromatch>array-unique": true, + "webpack>micromatch>extglob": true, + "webpack>micromatch>fragment-cache": true, + "webpack>micromatch>nanomatch": true, + "webpack>micromatch>object.pick": true, + "webpack>micromatch>regex-not": true, + "webpack>micromatch>snapdragon": true, + "webpack>micromatch>to-regex": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": { + "gulp>glob-watcher>anymatch>micromatch>define-property": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true + "gulp>gulp-cli>isobject": true, + "webpack>micromatch>define-property>is-descriptor": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": { + "gulp>glob-watcher>anymatch>micromatch>extend-shallow": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true + "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": true, + "webpack>micromatch>extend-shallow>assign-symbols": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": { + "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true + "@babel/register>clone-deep>is-plain-object": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": { - "globals": { - "process.stderr": true, - "process.stdout": true + "gulp>glob-watcher>anymatch>normalize-path": { + "packages": { + "vinyl>remove-trailing-separator": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf": { + "gulp>glob-watcher>async-done": { "builtin": { - "assert": true, - "fs": true, - "path.join": true + "domain.create": true }, "globals": { - "process.platform": true, - "setTimeout": true + "process.nextTick": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": true + "end-of-stream": true, + "gulp>glob-watcher>async-done>process-nextick-args": true, + "gulp>glob-watcher>async-done>stream-exhaust": true, + "pump>once": true + } + }, + "gulp>glob-watcher>async-done>process-nextick-args": { + "globals": { + "process": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": { + "gulp>glob-watcher>async-done>stream-exhaust": { "builtin": { - "assert": true, - "events.EventEmitter": true, - "fs.lstat": true, - "fs.lstatSync": true, - "fs.readdir": true, - "fs.readdirSync": true, - "fs.stat": true, - "fs.statSync": true, - "path.join": true, - "path.resolve": true, - "util": true + "stream.Writable": true, + "util.inherits": true }, "globals": { - "console.error": true, - "process.cwd": true, - "process.nextTick": true, - "process.platform": true - }, - "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": true + "setImmediate": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": { + "gulp>glob-watcher>chokidar": { "builtin": { - "fs.lstat": true, - "fs.lstatSync": true, - "fs.readlink": true, - "fs.readlinkSync": true, - "fs.realpath": true, - "fs.realpathSync": true, - "fs.stat": true, - "fs.statSync": true, - "path.normalize": true, - "path.resolve": true + "events.EventEmitter": true, + "fs": true, + "path.basename": true, + "path.dirname": true, + "path.extname": true, + "path.join": true, + "path.relative": true, + "path.resolve": true, + "path.sep": true }, "globals": { + "clearTimeout": true, "console.error": true, - "console.trace": true, - "process.env.NODE_DEBUG": true, + "process.env.CHOKIDAR_INTERVAL": true, + "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true, + "process.env.CHOKIDAR_USEPOLLING": true, "process.nextTick": true, - "process.noDeprecation": true, "process.platform": true, - "process.throwDeprecation": true, - "process.traceDeprecation": true, - "process.version": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": { - "globals": { - "process.nextTick": true + "setTimeout": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true + "eslint>is-glob": true, + "gulp-watch>chokidar>async-each": true, + "gulp-watch>glob-parent": true, + "gulp-watch>path-is-absolute": true, + "gulp>glob-watcher>anymatch": true, + "gulp>glob-watcher>chokidar>braces": true, + "gulp>glob-watcher>chokidar>is-binary-path": true, + "gulp>glob-watcher>chokidar>normalize-path": true, + "gulp>glob-watcher>chokidar>readdirp": true, + "gulp>glob-watcher>chokidar>upath": true, + "pumpify>inherits": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": { - "builtin": { - "util.inherits": true + "gulp>glob-watcher>chokidar>braces": { + "packages": { + "gulp>glob-watcher>chokidar>braces>fill-range": true, + "gulp>gulp-cli>isobject": true, + "gulp>undertaker>arr-flatten": true, + "webpack>micromatch>array-unique": true, + "webpack>micromatch>braces>repeat-element": true, + "webpack>micromatch>braces>snapdragon-node": true, + "webpack>micromatch>braces>split-string": true, + "webpack>micromatch>extglob>extend-shallow": true, + "webpack>micromatch>snapdragon": true, + "webpack>micromatch>to-regex": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": { + "gulp>glob-watcher>chokidar>braces>fill-range": { "builtin": { - "path": true - }, - "globals": { - "console.error": true + "util.inspect": true }, "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": true + "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true, + "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true, + "webpack>micromatch>braces>fill-range>repeat-string": true, + "webpack>micromatch>extglob>extend-shallow": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": { + "gulp>glob-watcher>chokidar>braces>fill-range>is-number": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>balanced-match": true, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>concat-map": true + "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": { + "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": { "packages": { - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": { - "globals": { - "process.platform": true - } - }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>semver": { - "globals": { - "console": true, - "process": true + "browserify>insert-module-globals>is-buffer": true } }, - "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": { - "builtin": { - "buffer": true + "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": { + "packages": { + "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true, + "webpack>micromatch>braces>fill-range>repeat-string": true } }, "gulp>glob-watcher>chokidar>is-binary-path": { diff --git a/package.json b/package.json index 402ad0c2587a..78505dd26385 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "eth-json-rpc-filters": "^4.2.1", "eth-json-rpc-middleware": "^9.0.0", "eth-keyring-controller": "^7.0.2", - "eth-lattice-keyring": "^0.12.0", + "eth-lattice-keyring": "^0.12.3", "eth-method-registry": "^2.0.0", "eth-query": "^2.1.2", "eth-rpc-errors": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index 032905d61a02..79ad448d4e76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3598,11 +3598,16 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== -"@noble/secp256k1@1.6.3", "@noble/secp256k1@^1.5.5", "@noble/secp256k1@~1.6.0": +"@noble/secp256k1@1.6.3", "@noble/secp256k1@~1.6.0": version "1.6.3" resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94" integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ== +"@noble/secp256k1@^1.5.5", "@noble/secp256k1@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.0.tgz#d15357f7c227e751d90aa06b05a0e5cf993ba8c1" + integrity sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw== + "@nodelib/fs.scandir@2.1.3": version "2.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" @@ -9430,7 +9435,7 @@ component-emitter@1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= -component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0: +component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -9649,7 +9654,7 @@ cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -cookiejar@^2.1.0, cookiejar@^2.1.1, cookiejar@^2.1.3: +cookiejar@^2.1.0, cookiejar@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== @@ -10751,7 +10756,7 @@ detective@^5.2.0: defined "^1.0.0" minimist "^1.1.1" -dezalgo@1.0.3, dezalgo@^1.0.0: +dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" integrity sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ== @@ -12113,18 +12118,17 @@ eth-keyring-controller@^7.0.2: eth-simple-keyring "^4.2.0" obs-store "^4.0.3" -eth-lattice-keyring@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.12.0.tgz#d71bfd2dec031de2b63fc45a8c19d22953e82a3d" - integrity sha512-f3w1H3nRbwi5gD/ivdeLlAv3mC5/bGigwHM7WRGV99pDi8nVLxaQQx11n+XFB5f7/4CcNNi0gbFP6JJurN2oRw== +eth-lattice-keyring@^0.12.3: + version "0.12.3" + resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.12.3.tgz#32ee3db427d15f1d76f907a36ddc34f4aab205ba" + integrity sha512-Z7HBEVx7RkbQXoITO1pjZqdliCti3UpjO5ClETA/V4iqIz3VnAeub1LHRcEGBDv5EaDNnHJZmz7drLth2609Kw== dependencies: - "@ethereumjs/common" "2.4.0" "@ethereumjs/tx" "3.3.0" + "@ethereumjs/util" "^8.0.0" + "@noble/secp256k1" "^1.7.0" bn.js "^5.2.0" - ethereumjs-util "^7.0.10" - gridplus-sdk "^2.2.7" + gridplus-sdk "^2.2.9" rlp "^3.0.0" - secp256k1 "4.0.2" eth-lib@0.2.8: version "0.2.8" @@ -13061,7 +13065,7 @@ fast-redact@^3.0.0: resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.1.tgz#790fcff8f808c2e12fabbfb2be5cb2deda448fa0" integrity sha512-odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A== -fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.1.1: +fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.7: version "2.1.1" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== @@ -13573,16 +13577,6 @@ formidable@^1.2.0: resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659" integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg== -formidable@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff" - integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ== - dependencies: - dezalgo "1.0.3" - hexoid "1.0.0" - once "1.4.0" - qs "6.9.3" - forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" @@ -14394,10 +14388,10 @@ graphviz@0.0.9: dependencies: temp "~0.4.0" -gridplus-sdk@^2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/gridplus-sdk/-/gridplus-sdk-2.2.7.tgz#d916b25a77358aed8d6fc5f1ed887ba32d51efb4" - integrity sha512-acpMxOkqubJRGcCRrYm1DA40utwIATjpWj/Wyismw16nAF3wGeQ79zUo5KwddtA+OYcwmqfPQMaAQ58qE0VpYg== +gridplus-sdk@^2.2.9: + version "2.2.9" + resolved "https://registry.yarnpkg.com/gridplus-sdk/-/gridplus-sdk-2.2.9.tgz#bd98257fee13d82e19ee267dfa21cd12f81eea21" + integrity sha512-U39YxeLisEJmw9KCtKCQB6C8UTVRKTonhDxwcDpN8T23VZuxk2SOzdmvq/HS01l5N+p1QEKKzQF6OCFQ7nVcYA== dependencies: "@ethereumjs/common" "2.4.0" "@ethereumjs/tx" "3.3.0" @@ -14415,7 +14409,6 @@ gridplus-sdk@^2.2.7: js-sha3 "^0.8.0" rlp "^3.0.0" secp256k1 "4.0.2" - superagent "^7.1.3" growl@1.10.5: version "1.10.5" @@ -14907,11 +14900,6 @@ heap@~0.2.6: resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac" integrity sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw= -hexoid@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" - integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== - hi-base32@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/hi-base32/-/hi-base32-0.5.0.tgz#61329f76a31f31008533f1c36f2473e259d64571" @@ -19807,7 +19795,7 @@ mersenne-twister@^1.0.1, mersenne-twister@^1.1.0: resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a" integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o= -methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: +methods@^1.1.1, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== @@ -19905,7 +19893,7 @@ mime@1.6.0, mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@2.6.0, mime@^2.4.4: +mime@^2.4.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== @@ -21312,7 +21300,7 @@ on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@1.4.0, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -23509,17 +23497,12 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@6.9.3: - version "6.9.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e" - integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw== - qs@6.9.6: version "6.9.6" resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== -qs@^6.10.0, qs@^6.10.3, qs@^6.4.0, qs@^6.5.1, qs@^6.5.2: +qs@^6.10.0, qs@^6.4.0, qs@^6.5.1, qs@^6.5.2: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== @@ -26706,23 +26689,6 @@ superagent@^3.8.1: qs "^6.5.1" readable-stream "^2.3.5" -superagent@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6" - integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g== - dependencies: - component-emitter "^1.3.0" - cookiejar "^2.1.3" - debug "^4.3.4" - fast-safe-stringify "^2.1.1" - form-data "^4.0.0" - formidable "^2.0.1" - methods "^1.1.2" - mime "2.6.0" - qs "^6.10.3" - readable-stream "^3.6.0" - semver "^7.3.7" - superstruct@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.16.0.tgz#9af5e059acd08e774789ad8880962427ef68dace"