Merge branch 'develop' into editing-flow

README.md

@@ -83,8 +83,13 @@ If you are using VS Code and are unable to make commits from the source control
 
 To start a development build (e.g. with logging and file watching) run `yarn start`.
 
-Alternatively, one can skip wallet onboarding and preload the vault state with a specific SRP by adding `TEST_SRP='<insert SRP here>'` and `PASSWORD='<insert wallet password here>'` to the `.metamaskrc` file and running `yarn start:skip-onboarding`.
+#### Development build with wallet state
+You can start a development build with a preloaded wallet state, by adding `TEST_SRP='<insert SRP here>'` and `PASSWORD='<insert wallet password here>'` to the `.metamaskrc` file. Then you have the following options:
+1. Start the wallet with the default fixture flags, by running `yarn start:with-state`.
+2. Check the list of available fixture flags, by running `yarn start:with-state --help`.
+3. Start the wallet with custom fixture flags, by running `yarn start:with-state --FIXTURE_NAME=VALUE` for example `yarn start:with-state --withAccounts=100`. You can pass as many flags as you want. The rest of the fixtures will take the default values.
 
+#### Development build with Webpack
 You can also start a development build using the `yarn webpack` command, or `yarn webpack --watch`. This uses an alternative build system that is much faster, but not yet production ready. See the [Webpack README](./development/webpack/README.md) for more information.
 
 #### React and Redux DevTools

app/scripts/background.js

@@ -77,7 +77,7 @@ import {
   getPlatform,
   shouldEmitDappViewedEvent,
 } from './lib/util';
-import { generateSkipOnboardingState } from './skip-onboarding';
+import { generateWalletState } from './fixtures/generate-wallet-state';
 import { createOffscreen } from './offscreen';
 
 /* eslint-enable import/first */
@@ -559,15 +559,15 @@ export async function loadStateFromPersistence() {
   // migrations
   const migrator = new Migrator({
     migrations,
-    defaultVersion: process.env.SKIP_ONBOARDING
+    defaultVersion: process.env.WITH_STATE
       ? FIXTURE_STATE_METADATA_VERSION
       : null,
   });
   migrator.on('error', console.warn);
 
-  if (process.env.SKIP_ONBOARDING) {
-    const skipOnboardingStateOverrides = await generateSkipOnboardingState();
-    firstTimeState = { ...firstTimeState, ...skipOnboardingStateOverrides };
+  if (process.env.WITH_STATE) {
+    const stateOverrides = await generateWalletState();
+    firstTimeState = { ...firstTimeState, ...stateOverrides };
   }
 
   // read from disk

app/scripts/fixtures/generate-wallet-state.js

@@ -0,0 +1,318 @@
+import { ControllerMessenger } from '@metamask/base-controller';
+import { KeyringController } from '@metamask/keyring-controller';
+import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
+import { UI_NOTIFICATIONS } from '../../../shared/notifications';
+import { E2E_SRP, defaultFixture } from '../../../test/e2e/default-fixture';
+import FixtureBuilder from '../../../test/e2e/fixture-builder';
+import { encryptorFactory } from '../lib/encryptor-factory';
+import { FIXTURES_APP_STATE } from './with-app-state';
+import { FIXTURES_NETWORKS } from './with-networks';
+import { FIXTURES_PREFERENCES } from './with-preferences';
+import { FIXTURES_ERC20_TOKENS } from './with-erc20-tokens';
+import { withAddressBook } from './with-address-book';
+import { withConfirmedTransactions } from './with-confirmed-transactions';
+import { withUnreadNotifications } from './with-unread-notifications';
+
+const FIXTURES_CONFIG = process.env.WITH_STATE
+  ? JSON.parse(process.env.WITH_STATE)
+  : {};
+
+/**
+ * Generates the wallet state based on the fixtures set in the environment variable.
+ *
+ * @returns {Promise<object>} The generated wallet state.
+ */
+export async function generateWalletState() {
+  const fixtureBuilder = new FixtureBuilder({ inputChainId: '0xaa36a7' });
+
+  const { vault, accounts } = await generateVaultAndAccount(
+    process.env.TEST_SRP || E2E_SRP,
+    process.env.PASSWORD,
+  );
+
+  fixtureBuilder
+    .withAccountsController(generateAccountsControllerState(accounts))
+    .withAddressBookController(generateAddressBookControllerState())
+    .withAnnouncementController(generateAnnouncementControllerState())
+    .withAppStateController(FIXTURES_APP_STATE)
+    .withKeyringController(generateKeyringControllerState(vault))
+    .withNetworkController(generateNetworkControllerState())
+    .withNotificationServicesController(
+      generateNotificationControllerState(accounts[0]),
+    )
+    .withPreferencesController(generatePreferencesControllerState(accounts))
+    .withTokensController(generateTokensControllerState(accounts[0]))
+    .withTransactionController(generateTransactionControllerState(accounts[0]));
+
+  return fixtureBuilder.fixture.data;
+}
+
+/**
+ * Generates a new vault and account based on the provided seed phrase and password.
+ *
+ * @param {string} encodedSeedPhrase - The encoded seed phrase.
+ * @param {string} password - The password for the vault.
+ * @returns {Promise<{vault: object, account: string}>} The generated vault and account.
+ */
+async function generateVaultAndAccount(encodedSeedPhrase, password) {
+  const controllerMessenger = new ControllerMessenger();
+  const keyringControllerMessenger = controllerMessenger.getRestricted({
+    name: 'KeyringController',
+  });
+  const krCtrl = new KeyringController({
+    encryptor: encryptorFactory(600_000),
+    messenger: keyringControllerMessenger,
+  });
+
+  const seedPhraseAsBuffer = Buffer.from(encodedSeedPhrase);
+  const _convertMnemonicToWordlistIndices = (mnemonic) => {
+    const indices = mnemonic
+      .toString()
+      .split(' ')
+      .map((word) => wordlist.indexOf(word));
+    return new Uint8Array(new Uint16Array(indices).buffer);
+  };
+
+  await krCtrl.createNewVaultAndRestore(
+    password,
+    _convertMnemonicToWordlistIndices(seedPhraseAsBuffer),
+  );
+
+  const accounts = [];
+  const account = krCtrl.state.keyrings[0].accounts[0];
+  accounts.push(account);
+
+  for (let i = 1; i < FIXTURES_CONFIG.withAccounts; i++) {
+    const newAccount = await krCtrl.addNewAccount(i);
+    accounts.push(newAccount);
+  }
+  const { vault } = krCtrl.state;
+
+  return { vault, accounts };
+}
+
+/**
+ * Generates the state for the KeyringController.
+ *
+ * @param {object} vault - The vault object.
+ * @returns {object} The generated KeyringController state.
+ */
+function generateKeyringControllerState(vault) {
+  console.log('Generating KeyringController state');
+
+  return {
+    ...defaultFixture().data.KeyringController,
+    vault,
+  };
+}
+
+/**
+ * Generates the state for the AccountsController.
+ *
+ * @param {string} accounts - The account addresses.
+ * @returns {object} The generated AccountsController state.
+ */
+function generateAccountsControllerState(accounts) {
+  console.log('Generating AccountsController state');
+  const internalAccounts = {
+    selectedAccount: 'account-id',
+    accounts: {},
+  };
+
+  accounts.forEach((account, index) => {
+    internalAccounts.accounts[`acount-id-${index}`] = {
+      selectedAccount: 'account-id',
+      id: 'account-id',
+      address: account,
+      metadata: {
+        name: `Account ${index + 1}`,
+        lastSelected: 1665507600000,
+        keyring: {
+          type: 'HD Key Tree',
+        },
+      },
+      options: {},
+      methods: [
+        'personal_sign',
+        'eth_signTransaction',
+        'eth_signTypedData_v1',
+        'eth_signTypedData_v3',
+        'eth_signTypedData_v4',
+      ],
+      type: 'eip155:eoa',
+    };
+  });
+  return {
+    internalAccounts,
+  };
+}
+
+/**
+ * Generates the state for the AddressBookController.
+ *
+ * @returns {object} The generated AddressBookController state.
+ */
+function generateAddressBookControllerState() {
+  console.log('Generating AddressBookController state');
+
+  const numEntries = FIXTURES_CONFIG.withContacts;
+  if (numEntries > 0) {
+    return withAddressBook(numEntries);
+  }
+
+  return {};
+}
+
+/**
+ * Generates the state for the AnnouncementController.
+ * All the what's new modals are dismissed for convenience.
+ *
+ * @returns {object} The generated AnnouncementController state.
+ */
+function generateAnnouncementControllerState() {
+  console.log('Generating AnnouncementController state');
+
+  const allAnnouncementsAlreadyShown = Object.keys(UI_NOTIFICATIONS).reduce(
+    (acc, val) => {
+      acc[val] = {
+        ...UI_NOTIFICATIONS[val],
+        isShown: true,
+      };
+      return acc;
+    },
+    {},
+  );
+  return allAnnouncementsAlreadyShown;
+}
+
+/**
+ * Generates the state for the NotificationController.
+ *
+ * @param {string} account - The account address to add the notifications to.
+ * @returns {object} The generated NotificationController state.
+ */
+function generateNotificationControllerState(account) {
+  console.log('Generating NotificationController state');
+
+  let notifications = {};
+
+  if (FIXTURES_CONFIG.withUnreadNotifications > 0) {
+    notifications = withUnreadNotifications(
+      account,
+      FIXTURES_CONFIG.withUnreadNotifications,
+    );
+  }
+  return notifications;
+}
+
+/**
+ * Generates the state for the NetworkController.
+ * Sepolia is always pre-loaded and set as the active provider.
+ *
+ * @returns {object} The generated NetworkController state.
+ */
+function generateNetworkControllerState() {
+  console.log('Generating NetworkController state');
+
+  const defaultNetworkState = {
+    ...defaultFixture().data.NetworkController,
+    networkConfigurations: {},
+    networksMetadata: {
+      sepolia: {
+        EIPS: {
+          1559: true,
+        },
+        status: 'available',
+      },
+    },
+    selectedNetworkClientId: 'sepolia',
+  };
+
+  if (FIXTURES_CONFIG.withNetworks) {
+    return {
+      ...defaultNetworkState,
+      ...FIXTURES_NETWORKS,
+    };
+  }
+  return defaultNetworkState;
+}
+
+/**
+ * Generates the state for the PreferencesController.
+ *
+ * @param {string} accounts - The account addresses.
+ * @returns {object} The generated PreferencesController state.
+ */
+function generatePreferencesControllerState(accounts) {
+  console.log('Generating PreferencesController state');
+  let preferencesControllerState = {};
+
+  if (FIXTURES_CONFIG.withPreferences) {
+    preferencesControllerState = FIXTURES_PREFERENCES;
+  }
+
+  // Add account identities
+  preferencesControllerState.identities = Object.assign(
+    ...accounts.map((address, index) => ({
+      [address]: {
+        address,
+        lastSelected: 1725363500048,
+        name: `Account ${index + 1}`,
+      },
+    })),
+  );
+
+  preferencesControllerState.lostIdentities = Object.assign(
+    ...accounts.map((address, index) => ({
+      [address]: {
+        address,
+        lastSelected: 1725363500048,
+        name: `Account ${index + 1}`,
+      },
+    })),
+  );
+
+  return preferencesControllerState;
+}
+
+/**
+ * Generates the state for the TokensController.
+ *
+ * @param {string} account - The account address to add the transactions to.
+ * @returns {object} The generated TokensController state.
+ */
+function generateTokensControllerState(account) {
+  console.log('Generating TokensController state');
+
+  const tokens = FIXTURES_ERC20_TOKENS;
+  if (FIXTURES_CONFIG.withErc20Tokens) {
+    // Update `myAccount` key for the account address
+    for (const network of Object.values(tokens.allTokens)) {
+      network[account] = network.myAccount;
+      delete network.myAccount;
+    }
+    return tokens;
+  }
+  return {};
+}
+
+/**
+ * Generates the state for the TransactionController.
+ *
+ * @param {string} account - The account address to add the transactions to.
+ * @returns {object} The generated TransactionController state.
+ */
+function generateTransactionControllerState(account) {
+  console.log('Generating TransactionController state');
+
+  let transactions = {};
+
+  if (FIXTURES_CONFIG.withConfirmedTransactions > 0) {
+    transactions = withConfirmedTransactions(
+      account,
+      FIXTURES_CONFIG.withConfirmedTransactions,
+    );
+  }
+
+  return transactions;
+}