+
+
+
{{@if(it.applyLavaMoat)}}
diff --git a/app/notification.html b/app/notification.html
index 1f348f680f8b..209a642a38ad 100644
--- a/app/notification.html
+++ b/app/notification.html
@@ -33,6 +33,8 @@
+
+
{{@if(it.applyLavaMoat)}}
diff --git a/app/popup.html b/app/popup.html
index 831fe6122370..978c237db181 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -13,6 +13,8 @@
+
+
{{@if(it.applyLavaMoat)}}
diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
index 450c5959737e..0f61d9888ef1 100644
--- a/app/scripts/app-init.js
+++ b/app/scripts/app-init.js
@@ -127,6 +127,10 @@ chrome.runtime.onMessage.addListener(() => {
return false;
});
+chrome.runtime.onStartup.addListener(() => {
+ globalThis.isFirstTimeProfileLoaded = true;
+});
+
/*
* This content script is injected programmatically because
* MAIN world injection does not work properly via manifest
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 736e60603202..0239eda85a17 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -491,11 +491,6 @@ function setupController(initState, initLangCode, remoteSourcePort) {
controller.setupTrustedCommunication(portStream, remotePort.sender);
if (isManifestV3) {
- // Message below if captured by UI code in app/scripts/ui.js which will trigger UI initialisation
- // This ensures that UI is initialised only after background is ready
- // It fixes the issue of blank screen coming when extension is loaded, the issue is very frequent in MV3
- remotePort.postMessage({ name: EXTENSION_MESSAGES.CONNECTION_READY });
-
// If we get a WORKER_KEEP_ALIVE message, we respond with an ACK
remotePort.onMessage.addListener((message) => {
if (message.name === WORKER_KEEP_ALIVE_MESSAGE) {
diff --git a/app/scripts/controllers/ens/index.js b/app/scripts/controllers/ens/index.js
index 85477ef7e5cf..47363a1562e6 100644
--- a/app/scripts/controllers/ens/index.js
+++ b/app/scripts/controllers/ens/index.js
@@ -27,6 +27,11 @@ export default class EnsController {
}
this.store = new ObservableStore(initState);
+
+ this.resetState = () => {
+ this.store.updateState(initState);
+ };
+
onNetworkDidChange(() => {
this.store.putState(initState);
const chainId = getCurrentChainId();
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 1c87c6181ba5..a18332624162 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -166,11 +166,9 @@ export default class MetaMetricsController {
// Code below submits any pending segmentApiCalls to Segment if/when the controller is re-instantiated
if (isManifestV3) {
- Object.values(segmentApiCalls).forEach(
- ({ eventType, payload, callback }) => {
- this._submitSegmentAPICall(eventType, payload, callback);
- },
- );
+ Object.values(segmentApiCalls).forEach(({ eventType, payload }) => {
+ this._submitSegmentAPICall(eventType, payload);
+ });
}
// Close out event fragments that were created but not progressed. An
@@ -961,6 +959,11 @@ export default class MetaMetricsController {
// Saving segmentApiCalls in controller store in MV3 ensures that events are tracked
// even if service worker terminates before events are submiteed to segment.
_submitSegmentAPICall(eventType, payload, callback) {
+ const { metaMetricsId, participateInMetaMetrics } = this.state;
+ if (!participateInMetaMetrics || !metaMetricsId) {
+ return;
+ }
+
const messageId = payload.messageId || generateRandomId();
let timestamp = new Date();
if (payload.timestamp) {
@@ -979,7 +982,6 @@ export default class MetaMetricsController {
...modifiedPayload,
timestamp: modifiedPayload.timestamp.toString(),
},
- callback,
},
},
});
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 297a219123ed..abe9949fe26b 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -362,7 +362,7 @@ describe('MetaMetricsController', function () {
it('should track an event if user has not opted in, but isOptIn is true', function () {
const mock = sinon.mock(segment);
const metaMetricsController = getMetaMetricsController({
- participateInMetaMetrics: false,
+ participateInMetaMetrics: true,
});
mock
.expects('track')
@@ -394,7 +394,7 @@ describe('MetaMetricsController', function () {
it('should track an event during optin and allow for metaMetricsId override', function () {
const mock = sinon.mock(segment);
const metaMetricsController = getMetaMetricsController({
- participateInMetaMetrics: false,
+ participateInMetaMetrics: true,
});
mock
.expects('track')
diff --git a/app/scripts/controllers/permissions/flask/snap-permissions.js b/app/scripts/controllers/permissions/flask/snap-permissions.js
index 1a1d78c5d2d3..f8465ee1b07c 100644
--- a/app/scripts/controllers/permissions/flask/snap-permissions.js
+++ b/app/scripts/controllers/permissions/flask/snap-permissions.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
+import { endowmentPermissionBuilders } from '@metamask/snaps-controllers';
import {
restrictedMethodPermissionBuilders,
selectHooks,
diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
index 1e3fad4a4829..f717bcbc551f 100644
--- a/app/scripts/controllers/permissions/specifications.js
+++ b/app/scripts/controllers/permissions/specifications.js
@@ -1,6 +1,6 @@
import { constructPermission, PermissionType } from '@metamask/controllers';
///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { endowmentCaveatSpecifications as snapsEndowmentCaveatSpecifications } from '@metamask/snap-controllers';
+import { endowmentCaveatSpecifications as snapsEndowmentCaveatSpecifications } from '@metamask/snaps-controllers';
import { caveatSpecifications as snapsCaveatsSpecifications } from '@metamask/rpc-methods';
///: END:ONLY_INCLUDE_IN
import {
@@ -11,7 +11,7 @@ import {
/**
* This file contains the specifications of the permissions and caveats
* that are recognized by our permission system. See the PermissionController
- * README in @metamask/snap-controllers for details.
+ * README in @metamask/controllers for details.
*/
/**
diff --git a/app/scripts/controllers/permissions/specifications.test.js b/app/scripts/controllers/permissions/specifications.test.js
index f199e9122215..7e1dc24dff4e 100644
--- a/app/scripts/controllers/permissions/specifications.test.js
+++ b/app/scripts/controllers/permissions/specifications.test.js
@@ -16,7 +16,7 @@ describe('PermissionController specifications', () => {
describe('caveat specifications', () => {
it('getCaveatSpecifications returns the expected specifications object', () => {
const caveatSpecifications = getCaveatSpecifications({});
- expect(Object.keys(caveatSpecifications)).toHaveLength(5);
+ expect(Object.keys(caveatSpecifications)).toHaveLength(6);
expect(
caveatSpecifications[CaveatTypes.restrictReturnedAccounts].type,
).toStrictEqual(CaveatTypes.restrictReturnedAccounts);
@@ -33,6 +33,9 @@ describe('PermissionController specifications', () => {
expect(caveatSpecifications.snapCronjob.type).toStrictEqual(
SnapCaveatType.SnapCronjob,
);
+ expect(caveatSpecifications.transactionOrigin.type).toStrictEqual(
+ SnapCaveatType.TransactionOrigin,
+ );
});
describe('restrictReturnedAccounts', () => {
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 8c7e2c2148d6..476d020ee1ac 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -115,6 +115,10 @@ export default class SwapsController {
swapsState: { ...initialState.swapsState },
});
+ this.resetState = () => {
+ this.store.updateState({ swapsState: { ...initialState.swapsState } });
+ };
+
this._fetchTradesInfo = fetchTradesInfo;
this._getCurrentChainId = getCurrentChainId;
this._getEIP1559GasFeeEstimates = getEIP1559GasFeeEstimates;
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 5becce48b40c..2b42ed3ff10f 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -151,6 +151,11 @@ export default class TransactionController extends EventEmitter {
this.getTokenStandardAndDetails = opts.getTokenStandardAndDetails;
this.memStore = new ObservableStore({});
+
+ this.resetState = () => {
+ this._updateMemstore();
+ };
+
this.query = new EthQuery(this.provider);
this.txGasUtil = new TxGasUtil(this.provider);
diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index 7e57a8ee9732..9f0600d65914 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -62,6 +62,10 @@ export default class AccountTracker {
};
this.store = new ObservableStore(initState);
+ this.resetState = () => {
+ this.store.updateState(initState);
+ };
+
this._provider = opts.provider;
this._query = pify(new EthQuery(this._provider));
this._blockTracker = opts.blockTracker;
diff --git a/app/scripts/lib/decrypt-message-manager.js b/app/scripts/lib/decrypt-message-manager.js
index f5d221485cbb..4805ec398ca1 100644
--- a/app/scripts/lib/decrypt-message-manager.js
+++ b/app/scripts/lib/decrypt-message-manager.js
@@ -41,6 +41,14 @@ export default class DecryptMessageManager extends EventEmitter {
unapprovedDecryptMsgs: {},
unapprovedDecryptMsgCount: 0,
});
+
+ this.resetState = () => {
+ this.memStore.updateState({
+ unapprovedDecryptMsgs: {},
+ unapprovedDecryptMsgCount: 0,
+ });
+ };
+
this.messages = [];
this.metricsEvent = opts.metricsEvent;
}
diff --git a/app/scripts/lib/encryption-public-key-manager.js b/app/scripts/lib/encryption-public-key-manager.js
index 5f2b74993655..cf96c320a203 100644
--- a/app/scripts/lib/encryption-public-key-manager.js
+++ b/app/scripts/lib/encryption-public-key-manager.js
@@ -36,6 +36,14 @@ export default class EncryptionPublicKeyManager extends EventEmitter {
unapprovedEncryptionPublicKeyMsgs: {},
unapprovedEncryptionPublicKeyMsgCount: 0,
});
+
+ this.resetState = () => {
+ this.memStore.updateState({
+ unapprovedEncryptionPublicKeyMsgs: {},
+ unapprovedEncryptionPublicKeyMsgCount: 0,
+ });
+ };
+
this.messages = [];
this.metricsEvent = opts.metricsEvent;
}
diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
index 6f80bb75b7b5..dfc4e3ec3aaf 100644
--- a/app/scripts/lib/message-manager.js
+++ b/app/scripts/lib/message-manager.js
@@ -36,6 +36,14 @@ export default class MessageManager extends EventEmitter {
unapprovedMsgs: {},
unapprovedMsgCount: 0,
});
+
+ this.resetState = () => {
+ this.memStore.updateState({
+ unapprovedMsgs: {},
+ unapprovedMsgCount: 0,
+ });
+ };
+
this.messages = [];
this.metricsEvent = metricsEvent;
}
diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
index 493288907a90..338458a66db0 100644
--- a/app/scripts/lib/personal-message-manager.js
+++ b/app/scripts/lib/personal-message-manager.js
@@ -43,6 +43,14 @@ export default class PersonalMessageManager extends EventEmitter {
unapprovedPersonalMsgs: {},
unapprovedPersonalMsgCount: 0,
});
+
+ this.resetState = () => {
+ this.memStore.updateState({
+ unapprovedPersonalMsgs: {},
+ unapprovedPersonalMsgCount: 0,
+ });
+ };
+
this.messages = [];
this.metricsEvent = metricsEvent;
}
diff --git a/app/scripts/lib/typed-message-manager.js b/app/scripts/lib/typed-message-manager.js
index 60356ba8a522..397e27b0c3c7 100644
--- a/app/scripts/lib/typed-message-manager.js
+++ b/app/scripts/lib/typed-message-manager.js
@@ -43,6 +43,14 @@ export default class TypedMessageManager extends EventEmitter {
unapprovedTypedMessages: {},
unapprovedTypedMessagesCount: 0,
});
+
+ this.resetState = () => {
+ this.memStore.updateState({
+ unapprovedTypedMessages: {},
+ unapprovedTypedMessagesCount: 0,
+ });
+ };
+
this.messages = [];
this.metricsEvent = metricsEvent;
}
diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js
index b3eff23d7c6d..c8b335d9435e 100644
--- a/app/scripts/metamask-controller.actions.test.js
+++ b/app/scripts/metamask-controller.actions.test.js
@@ -23,6 +23,12 @@ const browserPolyfillMock = {
},
getPlatformInfo: async () => 'mac',
},
+ storage: {
+ local: {
+ get: sinon.stub().resolves({}),
+ set: sinon.stub().resolves(),
+ },
+ },
};
let loggerMiddlewareMock;
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fdf441cef079..ecbf520034cf 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -52,9 +52,10 @@ import {
CronjobController,
SnapController,
IframeExecutionService,
-} from '@metamask/snap-controllers';
+} from '@metamask/snaps-controllers';
///: END:ONLY_INCLUDE_IN
+import browser from 'webextension-polyfill';
import {
ASSET_TYPES,
TRANSACTION_STATUSES,
@@ -100,6 +101,7 @@ import {
getTokenValueParam,
hexToDecimal,
} from '../../shared/lib/metamask-controller-utils';
+import { isManifestV3 } from '../../shared/modules/mv3.utils';
import {
onMessageReceived,
checkForMultipleVersionsRunning,
@@ -139,6 +141,7 @@ import seedPhraseVerifier from './lib/seed-phrase-verifier';
import MetaMetricsController from './controllers/metametrics';
import { segment } from './lib/segment';
import createMetaRPCHandler from './lib/createMetaRPCHandler';
+
import {
CaveatMutatorFactories,
getCaveatSpecifications,
@@ -417,6 +420,7 @@ export default class MetamaskController extends EventEmitter {
: GAS_API_BASE_URL;
this.gasFeeController = new GasFeeController({
+ state: initState.GasFeeController,
interval: 10000,
messenger: gasFeeMessenger,
clientId: SWAPS_CLIENT_ID,
@@ -481,26 +485,30 @@ export default class MetamaskController extends EventEmitter {
);
// token exchange rate tracker
- this.tokenRatesController = new TokenRatesController({
- onTokensStateChange: (listener) =>
- this.tokensController.subscribe(listener),
- onCurrencyRateStateChange: (listener) =>
- this.controllerMessenger.subscribe(
- `${this.currencyRateController.name}:stateChange`,
- listener,
- ),
- onNetworkStateChange: (cb) =>
- this.networkController.store.subscribe((networkState) => {
- const modifiedNetworkState = {
- ...networkState,
- provider: {
- ...networkState.provider,
- chainId: hexToDecimal(networkState.provider.chainId),
- },
- };
- return cb(modifiedNetworkState);
- }),
- });
+ this.tokenRatesController = new TokenRatesController(
+ {
+ onTokensStateChange: (listener) =>
+ this.tokensController.subscribe(listener),
+ onCurrencyRateStateChange: (listener) =>
+ this.controllerMessenger.subscribe(
+ `${this.currencyRateController.name}:stateChange`,
+ listener,
+ ),
+ onNetworkStateChange: (cb) =>
+ this.networkController.store.subscribe((networkState) => {
+ const modifiedNetworkState = {
+ ...networkState,
+ provider: {
+ ...networkState.provider,
+ chainId: hexToDecimal(networkState.provider.chainId),
+ },
+ };
+ return cb(modifiedNetworkState);
+ }),
+ },
+ undefined,
+ initState.TokenRatesController,
+ );
this.ensController = new EnsController({
provider: this.provider,
@@ -583,6 +591,7 @@ export default class MetamaskController extends EventEmitter {
keyringTypes: additionalKeyrings,
initState: initState.KeyringController,
encryptor: opts.encryptor || undefined,
+ cacheEncryptionKey: isManifestV3,
});
this.keyringController.memStore.subscribe((state) =>
this._onKeyringControllerUpdate(state),
@@ -661,7 +670,7 @@ export default class MetamaskController extends EventEmitter {
///: BEGIN:ONLY_INCLUDE_IN(flask)
this.snapExecutionService = new IframeExecutionService({
iframeUrl: new URL(
- 'https://metamask.github.io/iframe-execution-environment/0.10.0',
+ 'https://metamask.github.io/iframe-execution-environment/0.11.0',
),
messenger: this.controllerMessenger.getRestricted({
name: 'ExecutionService',
@@ -719,6 +728,7 @@ export default class MetamaskController extends EventEmitter {
});
this.rateLimitController = new RateLimitController({
+ state: initState.RateLimitController,
messenger: this.controllerMessenger.getRestricted({
name: 'RateLimitController',
}),
@@ -1029,6 +1039,24 @@ export default class MetamaskController extends EventEmitter {
// ensure isClientOpenAndUnlocked is updated when memState updates
this.on('update', (memState) => this._onStateUpdate(memState));
+ /**
+ * All controllers in Memstore but not in store. They are not persisted.
+ * On chrome profile re-start, they will be re-initialized.
+ */
+ const resetOnRestartStore = {
+ AccountTracker: this.accountTracker.store,
+ TxController: this.txController.memStore,
+ TokenRatesController: this.tokenRatesController,
+ MessageManager: this.messageManager.memStore,
+ PersonalMessageManager: this.personalMessageManager.memStore,
+ DecryptMessageManager: this.decryptMessageManager.memStore,
+ EncryptionPublicKeyManager: this.encryptionPublicKeyManager.memStore,
+ TypesMessageManager: this.typedMessageManager.memStore,
+ SwapsController: this.swapsController.store,
+ EnsController: this.ensController.store,
+ ApprovalController: this.approvalController,
+ };
+
this.store.updateStructure({
AppStateController: this.appStateController.store,
TransactionController: this.txController.store,
@@ -1057,21 +1085,14 @@ export default class MetamaskController extends EventEmitter {
CronjobController: this.cronjobController,
NotificationController: this.notificationController,
///: END:ONLY_INCLUDE_IN
+ ...resetOnRestartStore,
});
this.memStore = new ComposableObservableStore({
config: {
AppStateController: this.appStateController.store,
NetworkController: this.networkController.store,
- AccountTracker: this.accountTracker.store,
- TxController: this.txController.memStore,
CachedBalancesController: this.cachedBalancesController.store,
- TokenRatesController: this.tokenRatesController,
- MessageManager: this.messageManager.memStore,
- PersonalMessageManager: this.personalMessageManager.memStore,
- DecryptMessageManager: this.decryptMessageManager.memStore,
- EncryptionPublicKeyManager: this.encryptionPublicKeyManager.memStore,
- TypesMessageManager: this.typedMessageManager.memStore,
KeyringController: this.keyringController.memStore,
PreferencesController: this.preferencesController.store,
MetaMetricsController: this.metaMetricsController.store,
@@ -1085,9 +1106,6 @@ export default class MetamaskController extends EventEmitter {
PermissionLogController: this.permissionLogController.store,
SubjectMetadataController: this.subjectMetadataController,
BackupController: this.backupController,
- SwapsController: this.swapsController.store,
- EnsController: this.ensController.store,
- ApprovalController: this.approvalController,
AnnouncementController: this.announcementController,
GasFeeController: this.gasFeeController,
TokenListController: this.tokenListController,
@@ -1099,18 +1117,43 @@ export default class MetamaskController extends EventEmitter {
CronjobController: this.cronjobController,
NotificationController: this.notificationController,
///: END:ONLY_INCLUDE_IN
+ ...resetOnRestartStore,
},
controllerMessenger: this.controllerMessenger,
});
- this.memStore.subscribe(this.sendUpdate.bind(this));
- const password = process.env.CONF?.PASSWORD;
+ // if this is the first time, clear the state of by calling these methods
+ const resetMethods = [
+ this.accountTracker.resetState,
+ this.txController.resetState,
+ this.messageManager.resetState,
+ this.personalMessageManager.resetState,
+ this.decryptMessageManager.resetState,
+ this.encryptionPublicKeyManager.resetState,
+ this.typedMessageManager.resetState,
+ this.swapsController.resetState,
+ this.ensController.resetState,
+ this.approvalController.clear.bind(this.approvalController),
+ // WE SHOULD ADD TokenListController.resetState here too. But it's not implemented yet.
+ ];
+
+ if (isManifestV3) {
+ if (globalThis.isFirstTimeProfileLoaded === true) {
+ this.resetStates(resetMethods);
+ }
+ } else {
+ // it's always the first time in MV2
+ this.resetStates(resetMethods);
+ }
+
+ // Automatic login via config password or loginToken
if (
- password &&
!this.isUnlocked() &&
this.onboardingController.store.getState().completedOnboarding
) {
- this.submitPassword(password);
+ this._loginUser();
+ } else {
+ this._startUISync();
}
// Lazily update the store with the current extension environment
@@ -1137,6 +1180,18 @@ export default class MetamaskController extends EventEmitter {
checkForMultipleVersionsRunning();
}
+ resetStates(resetMethods) {
+ resetMethods.forEach((resetMethod) => {
+ try {
+ resetMethod();
+ } catch (err) {
+ console.error(err);
+ }
+ });
+
+ globalThis.isFirstTimeProfileLoaded = false;
+ }
+
///: BEGIN:ONLY_INCLUDE_IN(flask)
/**
* Constructor helper for getting Snap permission specifications.
@@ -2110,6 +2165,8 @@ export default class MetamaskController extends EventEmitter {
///: BEGIN:ONLY_INCLUDE_IN(flask)
// Clear snap state
this.snapController.clearState();
+ // Clear notification state
+ this.notificationController.clear();
///: END:ONLY_INCLUDE_IN
// clear accounts in accountTracker
@@ -2334,6 +2391,68 @@ export default class MetamaskController extends EventEmitter {
return this.keyringController.fullUpdate();
}
+ async _loginUser() {
+ try {
+ // Automatic login via config password
+ const password = process.env.CONF?.PASSWORD;
+ if (password) {
+ await this.submitPassword(password);
+ }
+ // Automatic login via storage encryption key
+ else if (isManifestV3) {
+ await this.submitEncryptionKey();
+ }
+ // Updating accounts in this.accountTracker before starting UI syncing ensure that
+ // state has account balance before it is synced with UI
+ await this.accountTracker._updateAccounts();
+ } finally {
+ this._startUISync();
+ }
+ }
+
+ _startUISync() {
+ // Message startUISync is used in MV3 to start syncing state with UI
+ // Sending this message after login is completed helps to ensure that incomplete state without
+ // account details are not flushed to UI.
+ this.emit('startUISync');
+ this.startUISync = true;
+ this.memStore.subscribe(this.sendUpdate.bind(this));
+ }
+
+ /**
+ * Submits a user's encryption key to log the user in via login token
+ */
+ async submitEncryptionKey() {
+ try {
+ const { loginToken, loginSalt } = await browser.storage.session.get([
+ 'loginToken',
+ 'loginSalt',
+ ]);
+ if (loginToken && loginSalt) {
+ const { vault } = this.keyringController.store.getState();
+
+ if (vault.salt !== loginSalt) {
+ console.warn(
+ 'submitEncryptionKey: Stored salt and vault salt do not match',
+ );
+ await this.clearLoginArtifacts();
+ return;
+ }
+
+ await this.keyringController.submitEncryptionKey(loginToken, loginSalt);
+ }
+ } catch (e) {
+ // If somehow this login token doesn't work properly,
+ // remove it and the user will get shown back to the unlock screen
+ await this.clearLoginArtifacts();
+ throw e;
+ }
+ }
+
+ async clearLoginArtifacts() {
+ await browser.storage.session.remove(['loginToken', 'loginSalt']);
+ }
+
/**
* Submits a user's password to check its validity.
*
@@ -3472,6 +3591,23 @@ export default class MetamaskController extends EventEmitter {
});
};
this.on('update', handleUpdate);
+ const startUISync = () => {
+ if (outStream._writableState.ended) {
+ return;
+ }
+ // send notification to client-side
+ outStream.write({
+ jsonrpc: '2.0',
+ method: 'startUISync',
+ });
+ };
+
+ if (this.startUISync) {
+ startUISync();
+ } else {
+ this.once('startUISync', startUISync);
+ }
+
outStream.on('end', () => {
this.activeControllerConnections -= 1;
this.emit(
@@ -3915,12 +4051,20 @@ export default class MetamaskController extends EventEmitter {
* @private
*/
async _onKeyringControllerUpdate(state) {
- const { keyrings } = state;
+ const {
+ keyrings,
+ encryptionKey: loginToken,
+ encryptionSalt: loginSalt,
+ } = state;
const addresses = keyrings.reduce(
(acc, { accounts }) => acc.concat(accounts),
[],
);
+ if (isManifestV3) {
+ await browser.storage.session.set({ loginToken, loginSalt });
+ }
+
if (!addresses.length) {
return;
}
@@ -4312,6 +4456,10 @@ export default class MetamaskController extends EventEmitter {
);
ledgerKeyring?.destroy?.();
+ if (isManifestV3) {
+ this.clearLoginArtifacts();
+ }
+
return this.keyringController.setLocked();
}
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 5fc7232ce4e9..b2aaf665f805 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -102,11 +102,14 @@ const CUSTOM_RPC_CHAIN_ID = '0x539';
describe('MetaMaskController', function () {
let metamaskController;
+
const sandbox = sinon.createSandbox();
const noop = () => undefined;
before(async function () {
+ globalThis.isFirstTimeProfileLoaded = true;
await ganacheServer.start();
+ sinon.spy(MetaMaskController.prototype, 'resetStates');
});
beforeEach(function () {
@@ -160,6 +163,18 @@ describe('MetaMaskController', function () {
await ganacheServer.quit();
});
+ describe('should reset states on first time profile load', function () {
+ it('should reset state', function () {
+ assert(metamaskController.resetStates.calledOnce);
+ assert.equal(globalThis.isFirstTimeProfileLoaded, false);
+ });
+
+ it('should not reset states if already set', function () {
+ // global.isFirstTime should also remain false
+ assert.equal(globalThis.isFirstTimeProfileLoaded, false);
+ });
+ });
+
describe('#getAccounts', function () {
it('returns first address when dapp calls web3.eth.getAccounts', async function () {
const password = 'a-fake-password';
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index c0f0bb7d1130..d335f60e544e 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -15,7 +15,6 @@ import launchMetaMaskUi, { updateBackgroundConnection } from '../../ui';
import {
ENVIRONMENT_TYPE_FULLSCREEN,
ENVIRONMENT_TYPE_POPUP,
- EXTENSION_MESSAGES,
PLATFORM_FIREFOX,
} from '../../shared/constants/app';
import { isManifestV3 } from '../../shared/modules/mv3.utils';
@@ -117,11 +116,13 @@ async function start() {
if (isManifestV3) {
/*
* In case of MV3 the issue of blank screen was very frequent, it is caused by UI initialising before background is ready to send state.
- * Code below ensures that UI is rendered only after CONNECTION_READY message is received thus background is ready.
+ * Code below ensures that UI is rendered only after "CONNECTION_READY" or "startUISync"
+ * messages are received thus the background is ready, and ensures that streams and
+ * phishing warning page load only after the "startUISync" message is received.
* In case the UI is already rendered, only update the streams.
*/
const messageListener = async (message) => {
- if (message?.name === EXTENSION_MESSAGES.CONNECTION_READY) {
+ if (message?.data?.method === 'startUISync') {
if (isUIInitialised) {
// Currently when service worker is revived we create new streams
// in later version we might try to improve it by reviving same streams.
diff --git a/app/scripts/use-snow.js b/app/scripts/use-snow.js
new file mode 100644
index 000000000000..11b01d78d1de
--- /dev/null
+++ b/app/scripts/use-snow.js
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/unambiguous
+(function () {
+ const log = console.log.bind(console);
+ const msg = 'SNOW INTERCEPTED NEW WINDOW CREATION IN METAMASK APP: ';
+ window.top.SNOW((win) => {
+ log(msg, win, win?.frameElement);
+ });
+})();
diff --git a/development/build/index.js b/development/build/index.js
index a1a6874e68f6..eb93a6bde193 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -66,6 +66,7 @@ async function defineAndRunBuildTasks() {
isLavaMoat,
policyOnly,
shouldIncludeLockdown,
+ shouldIncludeSnow,
shouldLintFenceFiles,
skipStats,
version,
@@ -81,6 +82,7 @@ async function defineAndRunBuildTasks() {
livereload,
browserPlatforms,
shouldIncludeLockdown,
+ shouldIncludeSnow,
buildType,
});
@@ -230,6 +232,12 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
'Whether to include SES lockdown files in the extension bundle. Setting this to `false` can be useful during development if you want to handle lockdown errors later.',
type: 'boolean',
})
+ .option('snow', {
+ default: true,
+ description:
+ 'Whether to include Snow files in the extension bundle. Setting this to `false` can be useful during development if you want to handle Snow errors later.',
+ type: 'boolean',
+ })
.option('policy-only', {
default: false,
description:
@@ -263,6 +271,7 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
buildVersion,
lintFenceFiles,
lockdown,
+ snow,
policyOnly,
skipStats,
task,
@@ -292,6 +301,7 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
isLavaMoat: process.argv[0].includes('lavamoat'),
policyOnly,
shouldIncludeLockdown: lockdown,
+ shouldIncludeSnow: snow,
shouldLintFenceFiles,
skipStats,
version,
diff --git a/development/build/static.js b/development/build/static.js
index 7e3ccf02fadb..af1b55c93671 100644
--- a/development/build/static.js
+++ b/development/build/static.js
@@ -15,11 +15,21 @@ module.exports = function createStaticAssetTasks({
livereload,
browserPlatforms,
shouldIncludeLockdown = true,
+ shouldIncludeSnow = true,
buildType,
}) {
- const [copyTargetsProd, copyTargetsDev] = getCopyTargets(
- shouldIncludeLockdown,
- );
+ const copyTargetsProds = {};
+ const copyTargetsDevs = {};
+
+ browserPlatforms.forEach((browser) => {
+ const [copyTargetsProd, copyTargetsDev] = getCopyTargets(
+ shouldIncludeLockdown,
+ // Snow currently only works on Chromium based browsers
+ shouldIncludeSnow && browser === 'chrome',
+ );
+ copyTargetsProds[browser] = copyTargetsProd;
+ copyTargetsDevs[browser] = copyTargetsDev;
+ });
const additionalBuildTargets = {
[BuildType.beta]: [
@@ -37,60 +47,60 @@ module.exports = function createStaticAssetTasks({
};
if (Object.keys(additionalBuildTargets).includes(buildType)) {
- copyTargetsProd.push(...additionalBuildTargets[buildType]);
- copyTargetsDev.push(...additionalBuildTargets[buildType]);
+ Object.entries(copyTargetsProds).forEach(([_, copyTargetsProd]) =>
+ copyTargetsProd.push(...additionalBuildTargets[buildType]),
+ );
+ Object.entries(copyTargetsDevs).forEach(([_, copyTargetsDev]) =>
+ copyTargetsDev.push(...additionalBuildTargets[buildType]),
+ );
}
- const prod = createTask(
- TASKS.STATIC_PROD,
- composeSeries(
- ...copyTargetsProd.map((target) => {
- return async function copyStaticAssets() {
- await performCopy(target);
- };
- }),
- ),
- );
- const dev = createTask(
- TASKS.STATIC_DEV,
- composeSeries(
- ...copyTargetsDev.map((target) => {
- return async function copyStaticAssets() {
- await setupLiveCopy(target);
- };
- }),
- ),
- );
+ const prodTasks = [];
+ Object.entries(copyTargetsProds).forEach(([browser, copyTargetsProd]) => {
+ copyTargetsProd.forEach((target) => {
+ prodTasks.push(async function copyStaticAssets() {
+ await performCopy(target, browser);
+ });
+ });
+ });
+
+ const devTasks = [];
+ Object.entries(copyTargetsDevs).forEach(([browser, copyTargetsDev]) => {
+ copyTargetsDev.forEach((target) => {
+ devTasks.push(async function copyStaticAssets() {
+ await setupLiveCopy(target, browser);
+ });
+ });
+ });
+
+ const prod = createTask(TASKS.STATIC_PROD, composeSeries(...prodTasks));
+ const dev = createTask(TASKS.STATIC_DEV, composeSeries(...devTasks));
return { dev, prod };
- async function setupLiveCopy(target) {
+ async function setupLiveCopy(target, browser) {
const pattern = target.pattern || '/**/*';
watch(target.src + pattern, (event) => {
livereload.changed(event.path);
- performCopy(target);
+ performCopy(target, browser);
});
- await performCopy(target);
+ await performCopy(target, browser);
}
- async function performCopy(target) {
- await Promise.all(
- browserPlatforms.map(async (platform) => {
- if (target.pattern) {
- await copyGlob(
- target.src,
- `${target.src}${target.pattern}`,
- `./dist/${platform}/${target.dest}`,
- );
- } else {
- await copyGlob(
- target.src,
- `${target.src}`,
- `./dist/${platform}/${target.dest}`,
- );
- }
- }),
- );
+ async function performCopy(target, browser) {
+ if (target.pattern) {
+ await copyGlob(
+ target.src,
+ `${target.src}${target.pattern}`,
+ `./dist/${browser}/${target.dest}`,
+ );
+ } else {
+ await copyGlob(
+ target.src,
+ `${target.src}`,
+ `./dist/${browser}/${target.dest}`,
+ );
+ }
}
async function copyGlob(baseDir, srcGlob, dest) {
@@ -104,7 +114,7 @@ module.exports = function createStaticAssetTasks({
}
};
-function getCopyTargets(shouldIncludeLockdown) {
+function getCopyTargets(shouldIncludeLockdown, shouldIncludeSnow) {
const allCopyTargets = [
{
src: `./app/_locales/`,
@@ -147,6 +157,16 @@ function getCopyTargets(shouldIncludeLockdown) {
src: `./node_modules/globalthis/dist/browser.js`,
dest: `globalthis.js`,
},
+ {
+ src: shouldIncludeSnow
+ ? `./node_modules/@lavamoat/snow/snow.prod.js`
+ : EMPTY_JS_FILE,
+ dest: `snow.js`,
+ },
+ {
+ src: shouldIncludeSnow ? `./app/scripts/use-snow.js` : EMPTY_JS_FILE,
+ dest: `use-snow.js`,
+ },
{
src: shouldIncludeLockdown
? `./node_modules/ses/dist/lockdown.umd.min.js`
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index ac2f28d589c4..ec8653289217 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -490,6 +490,7 @@
"@metamask/controllers>abort-controller": true,
"@metamask/controllers>async-mutex": true,
"@metamask/controllers>eth-json-rpc-infura": true,
+ "@metamask/controllers>eth-keyring-controller": true,
"@metamask/controllers>eth-method-registry": true,
"@metamask/controllers>eth-phishing-detect": true,
"@metamask/controllers>ethereumjs-wallet": true,
@@ -504,7 +505,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -660,6 +660,37 @@
"safe-event-emitter": true
}
},
+ "@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto.getRandomValues": true,
+ "crypto.subtle.decrypt": true,
+ "crypto.subtle.deriveKey": true,
+ "crypto.subtle.encrypt": true,
+ "crypto.subtle.importKey": true
+ },
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+ "globals": {
+ "atob": true,
+ "btoa": true
+ }
+ },
"@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/controllers>eth-method-registry>ethjs": true
@@ -1274,6 +1305,7 @@
"@metamask/controllers>web3": true,
"@metamask/controllers>web3-provider-engine": true,
"@metamask/metamask-eth-abis": true,
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1282,7 +1314,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -1296,6 +1327,18 @@
"uuid": true
}
},
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1396,7 +1439,7 @@
"setTimeout": true
}
},
- "@metamask/snap-controllers>nanoid": {
+ "@metamask/snaps-controllers>nanoid": {
"globals": {
"crypto.getRandomValues": true
}
@@ -2354,7 +2397,7 @@
"TextEncoder": true
},
"packages": {
- "@metamask/snap-utils>superstruct": true,
+ "@metamask/snaps-utils>superstruct": true,
"browserify>buffer": true,
"nock>debug": true
}
@@ -2465,8 +2508,8 @@
"browserify>buffer": true,
"browserify>events": true,
"eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/browser-passworder": true,
"eth-keyring-controller>@metamask/eth-hd-keyring": true,
- "eth-keyring-controller>browser-passworder": true,
"eth-keyring-controller>eth-simple-keyring": true,
"eth-keyring-controller>obs-store": true,
"eth-sig-util": true
@@ -2480,6 +2523,15 @@
"ethereumjs-wallet>randombytes": true
}
},
+ "eth-keyring-controller>@metamask/browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto": true
+ },
+ "packages": {
+ "browserify>buffer": true
+ }
+ },
"eth-keyring-controller>@metamask/eth-hd-keyring": {
"packages": {
"browserify>buffer": true,
@@ -2509,21 +2561,6 @@
"msCrypto": true
}
},
- "eth-keyring-controller>browser-passworder": {
- "globals": {
- "btoa": true,
- "crypto": true
- },
- "packages": {
- "eth-keyring-controller>browser-passworder>browserify-unibabel": true
- }
- },
- "eth-keyring-controller>browser-passworder>browserify-unibabel": {
- "globals": {
- "atob": true,
- "btoa": true
- }
- },
"eth-keyring-controller>eth-simple-keyring": {
"packages": {
"browserify>buffer": true,
@@ -4947,6 +4984,7 @@
"Node": true
},
"packages": {
+ "@lavamoat/snow>is-cross-origin>is-window": true,
"proxyquire>fill-keys>is-object": true,
"react-inspector>is-dom>is-window": true
}
@@ -5346,4 +5384,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index f2fa87fe8301..fcbf820d7a74 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -635,6 +635,7 @@
"@metamask/controllers>abort-controller": true,
"@metamask/controllers>async-mutex": true,
"@metamask/controllers>eth-json-rpc-infura": true,
+ "@metamask/controllers>eth-keyring-controller": true,
"@metamask/controllers>eth-method-registry": true,
"@metamask/controllers>eth-phishing-detect": true,
"@metamask/controllers>ethereumjs-wallet": true,
@@ -649,7 +650,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -805,6 +805,37 @@
"safe-event-emitter": true
}
},
+ "@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto.getRandomValues": true,
+ "crypto.subtle.decrypt": true,
+ "crypto.subtle.deriveKey": true,
+ "crypto.subtle.encrypt": true,
+ "crypto.subtle.importKey": true
+ },
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+ "globals": {
+ "atob": true,
+ "btoa": true
+ }
+ },
"@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/controllers>eth-method-registry>ethjs": true
@@ -1428,8 +1459,9 @@
"@metamask/rpc-methods>@metamask/controllers": true,
"@metamask/rpc-methods>@metamask/key-tree": true,
"@metamask/rpc-methods>nanoid": true,
- "@metamask/snap-utils": true,
- "@metamask/snap-utils>superstruct": true,
+ "@metamask/snaps-utils": true,
+ "@metamask/snaps-utils>@noble/hashes": true,
+ "@metamask/snaps-utils>superstruct": true,
"eth-block-tracker>@metamask/utils": true,
"eth-rpc-errors": true
}
@@ -1462,6 +1494,7 @@
"@metamask/controllers>web3": true,
"@metamask/controllers>web3-provider-engine": true,
"@metamask/metamask-eth-abis": true,
+ "@metamask/rpc-methods>@metamask/controllers>eth-keyring-controller": true,
"@metamask/rpc-methods>@metamask/controllers>eth-method-registry": true,
"@metamask/rpc-methods>@metamask/controllers>ethereumjs-wallet": true,
"@metamask/rpc-methods>nanoid": true,
@@ -1470,7 +1503,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -1484,6 +1516,18 @@
"uuid": true
}
},
+ "@metamask/rpc-methods>@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
"@metamask/rpc-methods>@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/rpc-methods>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1570,8 +1614,8 @@
"@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
"@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
"@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
- "@metamask/snap-utils>@noble/hashes": true,
- "@metamask/snap-utils>@scure/base": true,
+ "@metamask/snaps-utils>@noble/hashes": true,
+ "@metamask/snaps-utils>@scure/base": true,
"eth-block-tracker>@metamask/utils": true
}
},
@@ -1593,8 +1637,8 @@
},
"@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
"packages": {
- "@metamask/snap-utils>@noble/hashes": true,
- "@metamask/snap-utils>@scure/base": true
+ "@metamask/snaps-utils>@noble/hashes": true,
+ "@metamask/snaps-utils>@scure/base": true
}
},
"@metamask/rpc-methods>nanoid": {
@@ -1650,6 +1694,7 @@
"@metamask/controllers>web3": true,
"@metamask/controllers>web3-provider-engine": true,
"@metamask/metamask-eth-abis": true,
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1658,7 +1703,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -1672,6 +1716,18 @@
"uuid": true
}
},
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1772,7 +1828,7 @@
"setTimeout": true
}
},
- "@metamask/snap-controllers": {
+ "@metamask/snaps-controllers": {
"globals": {
"URL": true,
"clearTimeout": true,
@@ -1790,23 +1846,23 @@
"@metamask/post-message-stream": true,
"@metamask/providers>@metamask/object-multiplex": true,
"@metamask/rpc-methods": true,
- "@metamask/snap-controllers>@metamask/browser-passworder": true,
- "@metamask/snap-controllers>@metamask/controllers": true,
- "@metamask/snap-controllers>@xstate/fsm": true,
- "@metamask/snap-controllers>concat-stream": true,
- "@metamask/snap-controllers>gunzip-maybe": true,
- "@metamask/snap-controllers>json-rpc-middleware-stream": true,
- "@metamask/snap-controllers>nanoid": true,
- "@metamask/snap-controllers>readable-web-to-node-stream": true,
- "@metamask/snap-controllers>tar-stream": true,
- "@metamask/snap-utils": true,
+ "@metamask/snaps-controllers>@metamask/browser-passworder": true,
+ "@metamask/snaps-controllers>@metamask/controllers": true,
+ "@metamask/snaps-controllers>@xstate/fsm": true,
+ "@metamask/snaps-controllers>concat-stream": true,
+ "@metamask/snaps-controllers>gunzip-maybe": true,
+ "@metamask/snaps-controllers>json-rpc-middleware-stream": true,
+ "@metamask/snaps-controllers>nanoid": true,
+ "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+ "@metamask/snaps-controllers>tar-stream": true,
+ "@metamask/snaps-utils": true,
"eth-block-tracker>@metamask/utils": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"pump": true
}
},
- "@metamask/snap-controllers>@metamask/browser-passworder": {
+ "@metamask/snaps-controllers>@metamask/browser-passworder": {
"globals": {
"btoa": true,
"crypto.getRandomValues": true,
@@ -1819,7 +1875,7 @@
"browserify>buffer": true
}
},
- "@metamask/snap-controllers>@metamask/controllers": {
+ "@metamask/snaps-controllers>@metamask/controllers": {
"globals": {
"Headers": true,
"URL": true,
@@ -1847,15 +1903,15 @@
"@metamask/controllers>web3": true,
"@metamask/controllers>web3-provider-engine": true,
"@metamask/metamask-eth-abis": true,
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry": true,
- "@metamask/snap-controllers>@metamask/controllers>ethereumjs-wallet": true,
- "@metamask/snap-controllers>nanoid": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-keyring-controller": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry": true,
+ "@metamask/snaps-controllers>@metamask/controllers>ethereumjs-wallet": true,
+ "@metamask/snaps-controllers>nanoid": true,
"browserify>buffer": true,
"browserify>events": true,
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -1869,21 +1925,33 @@
"uuid": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-keyring-controller": {
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs": true
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry": {
+ "packages": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs": true
+ }
+ },
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs": {
"globals": {
"clearInterval": true,
"setInterval": true
},
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
"browserify>buffer": true,
"ethjs>ethjs-filter": true,
"ethjs>ethjs-provider-http": true,
@@ -1893,17 +1961,17 @@
"ethjs>number-to-bn": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
"browserify>buffer": true,
"ethjs>js-sha3": true,
"ethjs>number-to-bn": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
"ethjs-query>babel-runtime": true,
"ethjs>ethjs-filter": true,
"ethjs>ethjs-util": true,
@@ -1911,15 +1979,15 @@
"promise-to-callback": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
"browserify>buffer": true,
"ethjs>js-sha3": true,
"ethjs>number-to-bn": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
+ "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
"globals": {
"console": true
},
@@ -1930,9 +1998,9 @@
"promise-to-callback": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>ethereumjs-wallet": {
+ "@metamask/snaps-controllers>@metamask/controllers>ethereumjs-wallet": {
"packages": {
- "@metamask/snap-controllers>@metamask/controllers>ethereumjs-wallet>uuid": true,
+ "@metamask/snaps-controllers>@metamask/controllers>ethereumjs-wallet>uuid": true,
"@truffle/codec>utf8": true,
"browserify>buffer": true,
"browserify>crypto-browserify": true,
@@ -1944,20 +2012,20 @@
"ethers>@ethersproject/json-wallets>scrypt-js": true
}
},
- "@metamask/snap-controllers>@metamask/controllers>ethereumjs-wallet>uuid": {
+ "@metamask/snaps-controllers>@metamask/controllers>ethereumjs-wallet>uuid": {
"globals": {
"crypto": true,
"msCrypto": true
}
},
- "@metamask/snap-controllers>concat-stream": {
+ "@metamask/snaps-controllers>concat-stream": {
"packages": {
- "@metamask/snap-controllers>concat-stream>readable-stream": true,
+ "@metamask/snaps-controllers>concat-stream>readable-stream": true,
"browserify>buffer": true,
"pumpify>inherits": true
}
},
- "@metamask/snap-controllers>concat-stream>readable-stream": {
+ "@metamask/snaps-controllers>concat-stream>readable-stream": {
"packages": {
"@storybook/api>util-deprecate": true,
"browserify>browser-resolve": true,
@@ -1968,19 +2036,19 @@
"pumpify>inherits": true
}
},
- "@metamask/snap-controllers>gunzip-maybe": {
+ "@metamask/snaps-controllers>gunzip-maybe": {
"packages": {
- "@metamask/snap-controllers>gunzip-maybe>browserify-zlib": true,
- "@metamask/snap-controllers>gunzip-maybe>is-deflate": true,
- "@metamask/snap-controllers>gunzip-maybe>is-gzip": true,
- "@metamask/snap-controllers>gunzip-maybe>peek-stream": true,
- "@metamask/snap-controllers>gunzip-maybe>pumpify": true,
- "@metamask/snap-controllers>gunzip-maybe>through2": true
+ "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": true,
+ "@metamask/snaps-controllers>gunzip-maybe>is-deflate": true,
+ "@metamask/snaps-controllers>gunzip-maybe>is-gzip": true,
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream": true,
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify": true,
+ "@metamask/snaps-controllers>gunzip-maybe>through2": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>browserify-zlib": {
+ "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": {
"packages": {
- "@metamask/snap-controllers>gunzip-maybe>browserify-zlib>pako": true,
+ "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib>pako": true,
"browserify>assert": true,
"browserify>buffer": true,
"browserify>process": true,
@@ -1988,15 +2056,15 @@
"readable-stream": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>peek-stream": {
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream": {
"packages": {
- "@metamask/snap-controllers>gunzip-maybe>peek-stream>duplexify": true,
- "@metamask/snap-controllers>gunzip-maybe>peek-stream>through2": true,
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": true,
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": true,
"browserify>buffer": true,
"terser>source-map-support>buffer-from": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>peek-stream>duplexify": {
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": {
"packages": {
"browserify>buffer": true,
"browserify>process": true,
@@ -2006,7 +2074,7 @@
"readable-stream": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>peek-stream>through2": {
+ "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": {
"packages": {
"browserify>process": true,
"browserify>util": true,
@@ -2014,14 +2082,14 @@
"watchify>xtend": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>pumpify": {
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify": {
"packages": {
- "@metamask/snap-controllers>gunzip-maybe>pumpify>duplexify": true,
- "@metamask/snap-controllers>gunzip-maybe>pumpify>pump": true,
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": true,
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": true,
"pumpify>inherits": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>pumpify>duplexify": {
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": {
"packages": {
"browserify>buffer": true,
"browserify>process": true,
@@ -2031,14 +2099,14 @@
"readable-stream": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>pumpify>pump": {
+ "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": {
"packages": {
"browserify>browser-resolve": true,
"end-of-stream": true,
"pump>once": true
}
},
- "@metamask/snap-controllers>gunzip-maybe>through2": {
+ "@metamask/snaps-controllers>gunzip-maybe>through2": {
"packages": {
"browserify>process": true,
"browserify>util": true,
@@ -2046,8 +2114,9 @@
"watchify>xtend": true
}
},
- "@metamask/snap-controllers>json-rpc-middleware-stream": {
+ "@metamask/snaps-controllers>json-rpc-middleware-stream": {
"globals": {
+ "console.warn": true,
"setTimeout": true
},
"packages": {
@@ -2055,17 +2124,17 @@
"readable-stream": true
}
},
- "@metamask/snap-controllers>nanoid": {
+ "@metamask/snaps-controllers>nanoid": {
"globals": {
"crypto.getRandomValues": true
}
},
- "@metamask/snap-controllers>readable-web-to-node-stream": {
+ "@metamask/snaps-controllers>readable-web-to-node-stream": {
"packages": {
- "@metamask/snap-controllers>readable-web-to-node-stream>readable-stream": true
+ "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": true
}
},
- "@metamask/snap-controllers>readable-web-to-node-stream>readable-stream": {
+ "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": {
"packages": {
"@storybook/api>util-deprecate": true,
"browserify>browser-resolve": true,
@@ -2076,10 +2145,10 @@
"pumpify>inherits": true
}
},
- "@metamask/snap-controllers>tar-stream": {
+ "@metamask/snaps-controllers>tar-stream": {
"packages": {
- "@metamask/snap-controllers>tar-stream>fs-constants": true,
- "@metamask/snap-controllers>tar-stream>readable-stream": true,
+ "@metamask/snaps-controllers>tar-stream>fs-constants": true,
+ "@metamask/snaps-controllers>tar-stream>readable-stream": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>string_decoder": true,
@@ -2089,12 +2158,12 @@
"pumpify>inherits": true
}
},
- "@metamask/snap-controllers>tar-stream>fs-constants": {
+ "@metamask/snaps-controllers>tar-stream>fs-constants": {
"packages": {
"browserify>constants-browserify": true
}
},
- "@metamask/snap-controllers>tar-stream>readable-stream": {
+ "@metamask/snaps-controllers>tar-stream>readable-stream": {
"packages": {
"@storybook/api>util-deprecate": true,
"browserify>browser-resolve": true,
@@ -2105,18 +2174,18 @@
"pumpify>inherits": true
}
},
- "@metamask/snap-utils": {
+ "@metamask/snaps-utils": {
"globals": {
"URL": true
},
"packages": {
"@babel/core": true,
"@babel/core>@babel/types": true,
- "@metamask/snap-utils>@noble/hashes": true,
- "@metamask/snap-utils>@scure/base": true,
- "@metamask/snap-utils>cron-parser": true,
- "@metamask/snap-utils>rfdc": true,
- "@metamask/snap-utils>superstruct": true,
+ "@metamask/snaps-utils>@noble/hashes": true,
+ "@metamask/snaps-utils>@scure/base": true,
+ "@metamask/snaps-utils>cron-parser": true,
+ "@metamask/snaps-utils>rfdc": true,
+ "@metamask/snaps-utils>superstruct": true,
"browserify": true,
"browserify>buffer": true,
"browserify>crypto-browserify": true,
@@ -2127,25 +2196,25 @@
"semver": true
}
},
- "@metamask/snap-utils>@noble/hashes": {
+ "@metamask/snaps-utils>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
- "@metamask/snap-utils>@scure/base": {
+ "@metamask/snaps-utils>@scure/base": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
}
},
- "@metamask/snap-utils>cron-parser": {
+ "@metamask/snaps-utils>cron-parser": {
"packages": {
"browserify>browser-resolve": true,
"luxon": true
}
},
- "@metamask/snap-utils>rfdc": {
+ "@metamask/snaps-utils>rfdc": {
"packages": {
"browserify>buffer": true
}
@@ -3137,7 +3206,7 @@
"TextEncoder": true
},
"packages": {
- "@metamask/snap-utils>superstruct": true,
+ "@metamask/snaps-utils>superstruct": true,
"browserify>buffer": true,
"nock>debug": true
}
@@ -3248,8 +3317,8 @@
"browserify>buffer": true,
"browserify>events": true,
"eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/browser-passworder": true,
"eth-keyring-controller>@metamask/eth-hd-keyring": true,
- "eth-keyring-controller>browser-passworder": true,
"eth-keyring-controller>eth-simple-keyring": true,
"eth-keyring-controller>obs-store": true,
"eth-sig-util": true
@@ -3263,6 +3332,15 @@
"ethereumjs-wallet>randombytes": true
}
},
+ "eth-keyring-controller>@metamask/browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto": true
+ },
+ "packages": {
+ "browserify>buffer": true
+ }
+ },
"eth-keyring-controller>@metamask/eth-hd-keyring": {
"packages": {
"browserify>buffer": true,
@@ -3292,21 +3370,6 @@
"msCrypto": true
}
},
- "eth-keyring-controller>browser-passworder": {
- "globals": {
- "btoa": true,
- "crypto": true
- },
- "packages": {
- "eth-keyring-controller>browser-passworder>browserify-unibabel": true
- }
- },
- "eth-keyring-controller>browser-passworder>browserify-unibabel": {
- "globals": {
- "atob": true,
- "btoa": true
- }
- },
"eth-keyring-controller>eth-simple-keyring": {
"packages": {
"browserify>buffer": true,
@@ -5780,6 +5843,7 @@
"Node": true
},
"packages": {
+ "@lavamoat/snow>is-cross-origin>is-window": true,
"proxyquire>fill-keys>is-object": true,
"react-inspector>is-dom>is-window": true
}
@@ -6236,4 +6300,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index ac2f28d589c4..ec8653289217 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -490,6 +490,7 @@
"@metamask/controllers>abort-controller": true,
"@metamask/controllers>async-mutex": true,
"@metamask/controllers>eth-json-rpc-infura": true,
+ "@metamask/controllers>eth-keyring-controller": true,
"@metamask/controllers>eth-method-registry": true,
"@metamask/controllers>eth-phishing-detect": true,
"@metamask/controllers>ethereumjs-wallet": true,
@@ -504,7 +505,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -660,6 +660,37 @@
"safe-event-emitter": true
}
},
+ "@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto.getRandomValues": true,
+ "crypto.subtle.decrypt": true,
+ "crypto.subtle.deriveKey": true,
+ "crypto.subtle.encrypt": true,
+ "crypto.subtle.importKey": true
+ },
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+ }
+ },
+ "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+ "globals": {
+ "atob": true,
+ "btoa": true
+ }
+ },
"@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/controllers>eth-method-registry>ethjs": true
@@ -1274,6 +1305,7 @@
"@metamask/controllers>web3": true,
"@metamask/controllers>web3-provider-engine": true,
"@metamask/metamask-eth-abis": true,
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1282,7 +1314,6 @@
"deep-freeze-strict": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
- "eth-keyring-controller": true,
"eth-query": true,
"eth-rpc-errors": true,
"eth-sig-util": true,
@@ -1296,6 +1327,18 @@
"uuid": true
}
},
+ "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+ "packages": {
+ "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+ "browserify>buffer": true,
+ "browserify>events": true,
+ "eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+ "eth-keyring-controller>eth-simple-keyring": true,
+ "eth-keyring-controller>obs-store": true,
+ "eth-sig-util": true
+ }
+ },
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1396,7 +1439,7 @@
"setTimeout": true
}
},
- "@metamask/snap-controllers>nanoid": {
+ "@metamask/snaps-controllers>nanoid": {
"globals": {
"crypto.getRandomValues": true
}
@@ -2354,7 +2397,7 @@
"TextEncoder": true
},
"packages": {
- "@metamask/snap-utils>superstruct": true,
+ "@metamask/snaps-utils>superstruct": true,
"browserify>buffer": true,
"nock>debug": true
}
@@ -2465,8 +2508,8 @@
"browserify>buffer": true,
"browserify>events": true,
"eth-keyring-controller>@metamask/bip39": true,
+ "eth-keyring-controller>@metamask/browser-passworder": true,
"eth-keyring-controller>@metamask/eth-hd-keyring": true,
- "eth-keyring-controller>browser-passworder": true,
"eth-keyring-controller>eth-simple-keyring": true,
"eth-keyring-controller>obs-store": true,
"eth-sig-util": true
@@ -2480,6 +2523,15 @@
"ethereumjs-wallet>randombytes": true
}
},
+ "eth-keyring-controller>@metamask/browser-passworder": {
+ "globals": {
+ "btoa": true,
+ "crypto": true
+ },
+ "packages": {
+ "browserify>buffer": true
+ }
+ },
"eth-keyring-controller>@metamask/eth-hd-keyring": {
"packages": {
"browserify>buffer": true,
@@ -2509,21 +2561,6 @@
"msCrypto": true
}
},
- "eth-keyring-controller>browser-passworder": {
- "globals": {
- "btoa": true,
- "crypto": true
- },
- "packages": {
- "eth-keyring-controller>browser-passworder>browserify-unibabel": true
- }
- },
- "eth-keyring-controller>browser-passworder>browserify-unibabel": {
- "globals": {
- "atob": true,
- "btoa": true
- }
- },
"eth-keyring-controller>eth-simple-keyring": {
"packages": {
"browserify>buffer": true,
@@ -4947,6 +4984,7 @@
"Node": true
},
"packages": {
+ "@lavamoat/snow>is-cross-origin>is-window": true,
"proxyquire>fill-keys>is-object": true,
"react-inspector>is-dom>is-window": true
}
@@ -5346,4 +5384,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/lavamoat/browserify/policy-override.json b/lavamoat/browserify/policy-override.json
index 9bc3387269c9..b8c26285a525 100644
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@@ -38,7 +38,7 @@
"crypto.getRandomValues": true
}
},
- "eth-keyring-controller>browser-passworder": {
+ "eth-keyring-controller>@metamask/browser-passworder": {
"globals": {
"crypto": true
}
@@ -87,7 +87,7 @@
"crypto.getRandomValues": true
}
},
- "@metamask/snap-controllers>nanoid": {
+ "@metamask/snaps-controllers>nanoid": {
"globals": {
"crypto.getRandomValues": true
}
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index de3161d63beb..c080ec25a38c 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -1813,6 +1813,7 @@
},
"packages": {
"chokidar>braces": true,
+ "chokidar>fsevents": true,
"chokidar>glob-parent": true,
"chokidar>is-binary-path": true,
"chokidar>normalize-path": true,
@@ -1839,6 +1840,12 @@
"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,
@@ -4184,6 +4191,7 @@
"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,
@@ -4332,552 +4340,1319 @@
"webpack>micromatch>braces>fill-range>repeat-string": 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": {
+ "gulp-watch>chokidar>fsevents": {
"builtin": {
+ "events.EventEmitter": true,
+ "fs.stat": true,
"path.join": true,
- "path.relative": true,
"util.inherits": true
},
"globals": {
+ "__dirname": true,
+ "process.nextTick": true,
+ "process.platform": true,
"setImmediate": true
},
"packages": {
- "fs-extra>graceful-fs": true,
- "gulp-watch>chokidar>readdirp>micromatch": true,
- "readable-stream": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp": true
}
},
- "gulp-watch>chokidar>readdirp>micromatch": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp": {
"builtin": {
- "path.basename": true,
- "path.sep": true,
- "util.inspect": true
+ "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": {
- "process.platform": true
+ "__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-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>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>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>fsevents>node-pre-gyp>detect-libc": {
+ "builtin": {
+ "child_process.spawnSync": true,
+ "fs.readdirSync": true,
+ "os.platform": true
+ },
+ "globals": {
+ "process.env": true
}
},
- "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
+ "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
+ },
"packages": {
- "@babel/register>clone-deep>is-plain-object": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true,
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
}
},
- "gulp-watch>chokidar>readdirp>micromatch>extglob": {
+ "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
+ },
"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>nopt>osenv>os-homedir": true,
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
}
},
- "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": {
- "packages": {
- "webpack>micromatch>define-property>is-descriptor": 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>extglob>expand-brackets": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
"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
+ "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>expand-brackets>debug": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": {
"builtin": {
- "fs.SyncWriteStream": true,
- "net.Socket": true,
- "tty.WriteStream": true,
- "tty.isatty": true,
+ "events.EventEmitter": true,
"util": true
},
"globals": {
- "chrome": true,
- "console": true,
- "document": true,
- "localStorage": true,
- "navigator": true,
- "process": true
+ "process.nextTick": true,
+ "process.stderr": 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>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
}
},
- "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": {
+ "builtin": {
+ "events.EventEmitter": true,
+ "util.inherits": true
+ },
"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>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>define-property>is-descriptor>is-accessor-descriptor": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": {
+ "builtin": {
+ "events.EventEmitter": true,
+ "stream": true,
+ "util": true
+ },
+ "globals": {
+ "process.browser": true,
+ "process.env.READABLE_STREAM": true,
+ "process.stderr": true,
+ "process.stdout": true,
+ "process.version.slice": true,
+ "setImmediate": true
+ },
"packages": {
- "gulp-watch>anymatch>micromatch>kind-of": true
+ "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>define-property>is-descriptor>is-data-descriptor": {
- "packages": {
- "gulp-watch>anymatch>micromatch>kind-of": 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>extend-shallow": {
- "packages": {
- "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": 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>extend-shallow": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": {
"packages": {
- "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
}
},
- "gulp-watch>chokidar>upath": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": {
"builtin": {
- "path": true
+ "util.deprecate": true
}
},
- "gulp-watch>fancy-log": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": {
+ "builtin": {
+ "util.format": true
+ },
"globals": {
- "console": true,
- "process.argv.indexOf": true,
- "process.stderr.write": true,
- "process.stdout.write": true
+ "clearInterval": true,
+ "process": true,
+ "setImmediate": true,
+ "setInterval": true
},
"packages": {
- "fancy-log>ansi-gray": true,
- "fancy-log>color-support": true,
- "fancy-log>time-stamp": true
+ "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>glob-parent": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": {
"builtin": {
- "os.platform": true,
- "path": true
+ "os.type": 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
+ "globals": {
+ "process.env.LANG": true,
+ "process.env.LC_ALL": true,
+ "process.env.LC_CTYPE": true
}
},
- "gulp-watch>glob-parent>path-dirname": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": {
"builtin": {
- "path": true,
- "util.inspect": true
+ "assert.equal": true,
+ "events": true
},
"globals": {
- "process.platform": true
+ "process": true
}
},
- "gulp-watch>path-is-absolute": {
- "globals": {
- "process.platform": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": {
+ "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
}
},
- "gulp-watch>vinyl-file": {
- "builtin": {
- "path.resolve": true
- },
- "globals": {
- "process.cwd": true
- },
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
"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>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true
}
},
- "gulp-watch>vinyl-file>strip-bom": {
- "globals": {
- "Buffer.isBuffer": true
- },
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": {
"packages": {
- "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
}
},
- "gulp-watch>vinyl-file>strip-bom-stream": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": {
"packages": {
- "gulp-watch>vinyl-file>strip-bom": true,
- "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true
}
},
- "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": {
+ "globals": {
+ "process.stderr": true,
+ "process.stdout": true
+ }
+ },
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
"builtin": {
- "util.inherits": true
+ "assert": true,
+ "fs": true,
+ "path.join": true
},
"globals": {
- "Buffer.concat": true,
- "setImmediate": true
+ "process.platform": true,
+ "setTimeout": true
},
"packages": {
- "readable-stream": true
+ "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": true
}
},
- "gulp-watch>vinyl-file>vinyl": {
+ "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
+ },
+ "globals": {
+ "console.error": true,
+ "process.cwd": true,
+ "process.nextTick": true,
+ "process.platform": 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-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": {
+ "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>kind-of": 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
+ },
+ "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>glob-watcher>async-done>stream-exhaust": {
+ "builtin": {
+ "stream.Writable": true,
+ "util.inherits": true
+ },
+ "globals": {
+ "setImmediate": true
+ }
+ },
+ "gulp>glob-watcher>chokidar": {
+ "builtin": {
+ "events.EventEmitter": true,
+ "fs": true,
"path.basename": true,
"path.dirname": true,
"path.extname": true,
"path.join": true,
"path.relative": true,
- "stream.PassThrough": true,
- "stream.Stream": true
+ "path.resolve": true,
+ "path.sep": true
},
"globals": {
- "process.cwd": true
+ "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": {
- "gulp-watch>vinyl-file>vinyl>clone": true,
- "gulp-watch>vinyl-file>vinyl>clone-stats": true,
- "gulp-watch>vinyl-file>vinyl>replace-ext": 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>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-watch>vinyl-file>vinyl>clone": {
- "globals": {
- "Buffer": 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-watch>vinyl-file>vinyl>clone-stats": {
+ "gulp>glob-watcher>chokidar>braces>fill-range": {
"builtin": {
- "fs.Stats": true
+ "util.inspect": 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-watch>vinyl-file>vinyl>replace-ext": {
+ "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>glob-watcher>chokidar>fsevents": {
"builtin": {
- "path.basename": true,
+ "events.EventEmitter": true,
+ "fs.stat": true,
+ "path.join": true,
+ "util.inherits": true
+ },
+ "globals": {
+ "__dirname": true,
+ "process.nextTick": true,
+ "process.platform": true,
+ "setImmediate": true
+ },
+ "packages": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": true
+ }
+ },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": {
+ "builtin": {
+ "events.EventEmitter": true,
+ "fs.existsSync": true,
+ "fs.readFileSync": true,
+ "fs.renameSync": true,
"path.dirname": true,
- "path.extname": true,
- "path.join": 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
}
},
- "gulp-zip": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>detect-libc": {
"builtin": {
- "buffer.constants.MAX_LENGTH": true,
- "path.join": true
+ "child_process.spawnSync": true,
+ "fs.readdirSync": true,
+ "os.platform": true
+ },
+ "globals": {
+ "process.env": true
+ }
+ },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt": {
+ "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
},
"packages": {
- "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>abbrev": true,
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
}
},
- "gulp-zip>get-stream": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
"builtin": {
- "buffer.constants.MAX_LENGTH": true,
- "stream.PassThrough": true
+ "child_process.exec": true,
+ "path": true
},
"globals": {
- "Buffer.concat": true
+ "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
},
"packages": {
- "pump": true
+ "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
}
},
- "gulp-zip>plugin-error": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": {
"builtin": {
- "util.inherits": true
+ "os.homedir": 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
+ "globals": {
+ "process.env": true,
+ "process.getuid": 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>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>is-extendable": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog": {
+ "builtin": {
+ "events.EventEmitter": true,
+ "util": true
+ },
+ "globals": {
+ "process.nextTick": true,
+ "process.stderr": true
+ },
"packages": {
- "@babel/register>clone-deep>is-plain-object": true
+ "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
}
},
- "gulp-zip>through2": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": {
"builtin": {
+ "events.EventEmitter": true,
"util.inherits": true
},
- "globals": {
- "process.nextTick": true
- },
"packages": {
- "gulp-zip>through2>readable-stream": true
+ "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": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>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.stdout": true,
+ "process.version.slice": true,
+ "setImmediate": true
},
"packages": {
- "@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>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-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
- },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": {
"globals": {
- "Buffer": true,
- "setImmediate": true,
- "utf8FileName.length": true
- },
- "packages": {
- "gulp-zip>yazl>buffer-crc32": true
+ "Buffer.isBuffer": true
}
},
- "gulp-zip>yazl>buffer-crc32": {
- "builtin": {
- "buffer.Buffer": true
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": {
+ "globals": {
+ "process": true
}
},
- "gulp>glob-watcher": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": {
"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>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
}
},
- "gulp>glob-watcher>anymatch": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": {
"builtin": {
- "path.sep": true
- },
- "packages": {
- "gulp>glob-watcher>anymatch>micromatch": true,
- "gulp>glob-watcher>anymatch>normalize-path": true
+ "util.deprecate": true
}
},
- "gulp>glob-watcher>anymatch>micromatch": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge": {
"builtin": {
- "path.basename": true,
- "path.sep": true,
- "util.inspect": true
+ "util.format": true
},
"globals": {
- "process.platform": true
+ "clearInterval": true,
+ "process": true,
+ "setImmediate": true,
+ "setInterval": true
},
"packages": {
- "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>kind-of": 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>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>micromatch>define-property": {
- "packages": {
- "gulp>gulp-cli>isobject": true,
- "webpack>micromatch>define-property>is-descriptor": true
+ "gulp>glob-watcher>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>glob-watcher>anymatch>micromatch>extend-shallow": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": {
+ "builtin": {
+ "assert.equal": true,
+ "events": true
+ },
+ "globals": {
+ "process": true
+ }
+ },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": {
"packages": {
- "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>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
}
},
- "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
"packages": {
- "@babel/register>clone-deep>is-plain-object": true
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true
}
},
- "gulp>glob-watcher>anymatch>normalize-path": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": {
"packages": {
- "vinyl>remove-trailing-separator": true
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
}
},
- "gulp>glob-watcher>async-done": {
- "builtin": {
- "domain.create": true
- },
- "globals": {
- "process.nextTick": true
- },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": {
"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>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true
}
},
- "gulp>glob-watcher>async-done>process-nextick-args": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": {
"globals": {
- "process": true
+ "process.stderr": true,
+ "process.stdout": true
}
},
- "gulp>glob-watcher>async-done>stream-exhaust": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf": {
"builtin": {
- "stream.Writable": true,
- "util.inherits": true
+ "assert": true,
+ "fs": true,
+ "path.join": true
},
"globals": {
- "setImmediate": true
+ "process.platform": true,
+ "setTimeout": true
+ },
+ "packages": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": true
}
},
- "gulp>glob-watcher>chokidar": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": {
"builtin": {
+ "assert": true,
"events.EventEmitter": true,
- "fs": true,
- "path.basename": true,
- "path.dirname": true,
- "path.extname": true,
+ "fs.lstat": true,
+ "fs.lstatSync": true,
+ "fs.readdir": true,
+ "fs.readdirSync": true,
+ "fs.stat": true,
+ "fs.statSync": true,
"path.join": true,
- "path.relative": true,
"path.resolve": true,
- "path.sep": true
+ "util": 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.cwd": true,
"process.nextTick": true,
- "process.platform": true,
- "setTimeout": true
+ "process.platform": 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>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>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
}
},
- "gulp>glob-watcher>chokidar>braces": {
+ "gulp>glob-watcher>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>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": {
+ "globals": {
+ "process.nextTick": true
+ },
"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>once": true,
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true
}
},
- "gulp>glob-watcher>chokidar>braces>fill-range": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": {
"builtin": {
- "util.inspect": true
+ "util.inherits": true
+ }
+ },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": {
+ "builtin": {
+ "path": true
+ },
+ "globals": {
+ "console.error": 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>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": true
}
},
- "gulp>glob-watcher>chokidar>braces>fill-range>is-number": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": {
"packages": {
- "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true
+ "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": {
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": {
"packages": {
- "browserify>insert-module-globals>is-buffer": true
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": 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>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
+ }
+ },
+ "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": {
+ "builtin": {
+ "buffer": true
}
},
"gulp>glob-watcher>chokidar>is-binary-path": {
diff --git a/package.json b/package.json
index 8588c254c5ab..a952c5b17418 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"scripts": {
"setup": "yarn install && yarn setup:postinstall",
"setup:postinstall": "yarn patch-package && yarn allow-scripts",
- "start": "yarn build:dev dev --apply-lavamoat=false",
+ "start": "yarn build:dev dev --apply-lavamoat=false --snow=false",
"start:lavamoat": "yarn build:dev dev --apply-lavamoat=true",
"start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false",
"dist": "yarn build dist",
@@ -122,11 +122,11 @@
"@metamask/obs-store": "^5.0.0",
"@metamask/post-message-stream": "^6.0.0",
"@metamask/providers": "^10.2.1",
- "@metamask/rpc-methods": "^0.23.0",
+ "@metamask/rpc-methods": "^0.24.1",
"@metamask/slip44": "^2.1.0",
"@metamask/smart-transactions-controller": "^3.0.0",
- "@metamask/snap-controllers": "^0.23.0",
- "@metamask/snap-utils": "^0.23.0",
+ "@metamask/snaps-controllers": "^0.24.1",
+ "@metamask/snaps-utils": "^0.24.1",
"@ngraveio/bc-ur": "^1.1.6",
"@popperjs/core": "^2.4.0",
"@reduxjs/toolkit": "^1.6.2",
@@ -138,6 +138,7 @@
"@spruceid/siwe-parser": "^1.1.3",
"@truffle/codec": "^0.11.18",
"@truffle/decoder": "^5.1.0",
+ "@lavamoat/snow": "^1.2.1",
"@zxing/browser": "^0.0.10",
"@zxing/library": "0.8.0",
"await-semaphore": "^0.1.1",
@@ -155,7 +156,7 @@
"eth-ens-namehash": "^2.0.8",
"eth-json-rpc-filters": "^4.2.1",
"eth-json-rpc-middleware": "^9.0.1",
- "eth-keyring-controller": "^7.0.2",
+ "eth-keyring-controller": "^8.0.1",
"eth-lattice-keyring": "^0.12.3",
"eth-method-registry": "^2.0.0",
"eth-query": "^2.1.2",
diff --git a/shared/constants/permissions.test.js b/shared/constants/permissions.test.js
index 433d6629c3b5..e12b6ab93721 100644
--- a/shared/constants/permissions.test.js
+++ b/shared/constants/permissions.test.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
+import { endowmentPermissionBuilders } from '@metamask/snaps-controllers';
import { restrictedMethodPermissionBuilders } from '@metamask/rpc-methods';
import {
EndowmentPermissions,
diff --git a/shared/constants/permissions.ts b/shared/constants/permissions.ts
index dbd39b51e69b..a21d345394c8 100644
--- a/shared/constants/permissions.ts
+++ b/shared/constants/permissions.ts
@@ -11,6 +11,7 @@ export const RestrictedMethods = Object.freeze({
snap_getBip32PublicKey: 'snap_getBip32PublicKey',
snap_getBip32Entropy: 'snap_getBip32Entropy',
snap_getBip44Entropy: 'snap_getBip44Entropy',
+ snap_getEntropy: 'snap_getEntropy',
'wallet_snap_*': 'wallet_snap_*',
///: END:ONLY_INCLUDE_IN
} as const);
@@ -25,6 +26,7 @@ export const EndowmentPermissions = Object.freeze({
'endowment:long-running': 'endowment:long-running',
'endowment:transaction-insight': 'endowment:transaction-insight',
'endowment:cronjob': 'endowment:cronjob',
+ 'endowment:ethereum-provider': 'endowment:ethereum-provider',
} as const);
// Methods / permissions in external packages that we are temporarily excluding.
diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js
index 27b754750297..5ef37e4331d1 100644
--- a/test/e2e/run-all.js
+++ b/test/e2e/run-all.js
@@ -13,10 +13,13 @@ const getTestPathsForTestDir = async (testDir) => {
return testPaths;
};
-function chunk(array, chunkSize) {
+// Heavily inspired by: https://stackoverflow.com/a/51514813
+// Splits the array into totalChunks chunks with a decent spread of items in each chunk
+function chunk(array, totalChunks) {
+ const copyArray = [...array];
const result = [];
- for (let i = 0; i < array.length; i += chunkSize) {
- result.push(array.slice(i, i + chunkSize));
+ for (let chunkIndex = totalChunks; chunkIndex > 0; chunkIndex--) {
+ result.push(copyArray.splice(0, Math.ceil(copyArray.length / chunkIndex)));
}
return result;
}
@@ -77,8 +80,7 @@ async function main() {
// For running E2Es in parallel in CI
const currentChunkIndex = process.env.CIRCLE_NODE_INDEX ?? 0;
const totalChunks = process.env.CIRCLE_NODE_TOTAL ?? 1;
- const chunkSize = Math.ceil(testPaths.length / totalChunks);
- const chunks = chunk(testPaths, chunkSize);
+ const chunks = chunk(testPaths, totalChunks);
const currentChunk = chunks[currentChunkIndex];
for (const testPath of currentChunk) {
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index a940e21b92f3..1cc1906b0b3a 100644
--- a/test/e2e/snaps/enums.js
+++ b/test/e2e/snaps/enums.js
@@ -1,3 +1,3 @@
module.exports = {
- TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/4.0.2/',
+ TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/4.1.1/',
};
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index bc78e10cfb25..332aac1e0ae3 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -29,7 +29,7 @@ describe('Test Snap update', function () {
await driver.press('#password', driver.Key.ENTER);
// open a new tab and navigate to test snaps page and connect
- await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+ await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
// find and scroll to the correct card and click first
const snapButton = await driver.findElement('#connectUpdateNew');
@@ -41,7 +41,7 @@ describe('Test Snap update', function () {
// switch to metamask extension and click connect
let windowHandles = await driver.waitUntilXWindowHandles(
- 3,
+ 2,
1000,
10000,
);
@@ -59,7 +59,7 @@ describe('Test Snap update', function () {
await driver.delay(2000);
// approve install of snap
- windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
+ windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
await driver.switchToWindowWithTitle(
'MetaMask Notification',
windowHandles,
@@ -69,8 +69,17 @@ describe('Test Snap update', function () {
tag: 'button',
});
+ // wait for permissions popover, click checkboxes and confirm
+ await driver.delay(1000);
+ await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
+ await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+ await driver.clickElement({
+ text: 'Confirm',
+ tag: 'button',
+ });
+
// navigate to test snap page
- windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
+ windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000);
@@ -81,7 +90,7 @@ describe('Test Snap update', function () {
await driver.clickElement('#connectUpdateNew');
// switch to metamask extension and click connect
- await driver.waitUntilXWindowHandles(3, 1000, 10000);
+ await driver.waitUntilXWindowHandles(2, 1000, 10000);
await driver.delay(1000);
// approve update of snap
@@ -96,13 +105,13 @@ describe('Test Snap update', function () {
});
// navigate to test snap page
- windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
+ windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// look for the correct version text
const versionResult = await driver.findElement('#updateSnapVersion');
await driver.delay(1000);
- assert.equal(await versionResult.getText(), '"2.0.0"');
+ assert.equal(await versionResult.getText(), '"4.0.2"');
},
);
});
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 9c87f6c6690f..e09da607bea2 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -397,7 +397,7 @@ describe('MetaMask Import UI', function () {
// error should occur
await driver.waitForSelector({
css: '.error',
- text: "The account you're are trying to import is a duplicate",
+ text: 'The account you are trying to import is a duplicate',
});
},
);
diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js
index 75a8488a8a6d..1d2add75d6bd 100644
--- a/test/lib/mock-encryptor.js
+++ b/test/lib/mock-encryptor.js
@@ -12,6 +12,12 @@ const mockEncryptor = {
return Promise.resolve(cacheVal || {});
},
+ encryptWithDetail(_, dataObj) {
+ cacheVal = dataObj;
+
+ return Promise.resolve({ vault: mockHex, exportedKeyString: '' });
+ },
+
encryptWithKey(key, dataObj) {
return this.encrypt(key, dataObj);
},
diff --git a/test/lib/render-helpers.js b/test/lib/render-helpers.js
index 27ac3f80e643..f407392baed5 100644
--- a/test/lib/render-helpers.js
+++ b/test/lib/render-helpers.js
@@ -137,3 +137,12 @@ export function renderControlledInput(InputComponent, props) {
};
return { user: userEvent.setup(), ...render(
+
+
+
-
-
-
+ {
it('should render correctly', () => {
const { getByRole } = render(