feat: add entropySource to non-evm accounts #30549

PatrykLucka · 2025-02-25T13:14:15Z

Description

Adds entropySource to non-EVM accounts to ensure that the primary keyring ID is provided to the Solana snap during account creation. This will help maintain compatibility for the multi-SRP feature, even though we are not using it yet.

Manual testing steps

Create a local flask build with yarn start:flask
Create a solana account
Dump state and look in AccountsController store (metamask.accounts)

Screenshots/Recordings

Before

After

Expected behaviour

entropySource should be present in account.options

{
        "97efa6e1-4de8-486f-94d6-14707ce91024": {
          "type": "solana:data-account",
          "id": "97efa6e1-4de8-486f-94d6-14707ce91024",
          "address": "4QoCH9mHHaUMmJBHMFdeAn6DLJV7qcCYrLy7dAKDdee6",
          "options": {
            "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
            "entropySource": "01JN1FPDGHYKA2K6JQBKEGV56T"
          },
          "methods": [
            "sendAndConfirmTransaction"
          ],
          "scopes": [
            "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
            "solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z",
            "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
          ],
          "metadata": {
            "name": "Solana Account 1",
            "importTime": 1740585525303,
            "keyring": {
              "type": "Snap Keyring"
            },
            "snap": {
              "id": "npm:@metamask/solana-wallet-snap",
              "name": "Solana",
              "enabled": true
            },
            "lastSelected": 1740585525308,
            "nameLastUpdatedAt": 1740585525310
          }
        }
      },
      "selectedAccount": "97efa6e1-4de8-486f-94d6-14707ce91024"
    },

Pre-merge author checklist

I've followed MetaMask Contributor Docs and MetaMask Extension Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

github-actions · 2025-02-25T13:14:32Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

metamaskbot · 2025-02-25T13:49:46Z

Builds ready [ccfc68d]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (1762 ± 88 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1486	2094	1755	189	91
		domContentLoaded	1433	2078	1728	185	89
		load	1495	2096	1762	182	88
		domInteractive	27	90	41	17	8
		backgroundConnect	9	80	34	21	10
		firstReactRender	15	75	30	21	10
		getState	5	73	26	23	11
		initialActions	0	0	0	0	0
		loadScripts	1023	1564	1266	158	76
		setupStore	8	61	23	20	10
		uiStartup	1657	2349	2011	193	93

shane-t

Passes manual tests

metamaskbot · 2025-02-26T16:48:51Z

Builds ready [0979f7a]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (1595 ± 53 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	342	1783	1521	288	138
		domContentLoaded	1383	1782	1562	113	54
		load	1394	1788	1595	111	53
		domInteractive	24	78	32	12	6
		backgroundConnect	11	131	39	27	13
		firstReactRender	14	78	36	24	11
		getState	4	59	14	15	7
		initialActions	0	1	0	0	0
		loadScripts	1020	1359	1170	97	46
		setupStore	7	52	11	10	5
		uiStartup	1609	2193	1812	148	71

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 0 Bytes (0.00%)
ui: 30 Bytes (0.00%)
common: 113 Bytes (0.00%)

ui/components/multichain/account-list-menu/account-list-menu.tsx

Co-authored-by: Charly Chevalier <[email protected]>

ui/hooks/accounts/useMultichainWalletSnapClient.ts

Co-authored-by: Charly Chevalier <[email protected]>

ui/selectors/selectors.js

Co-authored-by: Charly Chevalier <[email protected]>

ccharly · 2025-02-26T17:31:29Z

ui/components/multichain/account-list-menu/account-list-menu.tsx

-    await bitcoinWalletSnapClient.createAccount(network);
+    await bitcoinWalletSnapClient.createAccount(
+      network,
+      primaryKeyring.metadata.id,


Current Bitcoin Snap does not support this entropySource and will throw an error if we pass it there.

Since we're about to use our new version of the Snap, we might wanna support this too.

For now, Bitcoin support is disabled, so this won't break anything (unless we use the bitcoin build flag + create an account).

cc: @danroc @gantunesr @darioAnongba

Maybe we should leave it unchanged for Bitcoin for now

ccharly · 2025-02-26T17:35:00Z

Tested on my side, not approving the PR for now (just waiting for some internal decision about the Bitcoin case).

$ jq '.metamask | {keyrings, keyringsMetadata}'
{
  "keyrings": [
    {
      "type": "HD Key Tree",
      "accounts": [
        "0xb5e5196de890271ba5f6c696fb0abbc7d3a5c6c5"
      ]
    },
    {
      "type": "Snap Keyring",
      "accounts": [
        "4wRTxSXApFzKS4tk4fqQiEcSYe43NyYX1Xvh6VhzfkkE",
        "JDSQGLPQ9RCcXrvaxZiayoWzMo4FktaywDDJcBTQktyr"
      ]
    }
  ],
  "keyringsMetadata": [
    {
      "id": "01JN1M20V7KEFB8W68WH7A9173",
      "name": ""
    },
    {
      "id": "01JN1M29DZ4052VGS2GFMEWP97",
      "name": ""
    }
  ]
}

$ jq '.metamask.internalAccounts.accounts | to_entries[] | .value.options' state.json
{}
{
  "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
  "entropySource": "01JN1M20V7KEFB8W68WH7A9173"
}
{
  "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
  "entropySource": "01JN1M20V7KEFB8W68WH7A9173"
}

ui/components/multichain/account-list-menu/account-list-menu.tsx

metamaskbot · 2025-02-26T17:55:01Z

Builds ready [2b0dda9]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (1592 ± 57 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1449	1902	1589	111	53
		domContentLoaded	1432	1858	1562	103	50
		load	1458	1955	1592	119	57
		domInteractive	24	86	35	17	8
		backgroundConnect	11	99	39	21	10
		firstReactRender	14	56	20	12	6
		getState	4	52	14	15	7
		initialActions	0	1	0	0	0
		loadScripts	1042	1415	1150	98	47
		setupStore	7	57	13	14	7
		uiStartup	1663	2279	1807	134	65

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 0 Bytes (0.00%)
ui: 28 Bytes (0.00%)
common: 113 Bytes (0.00%)

Co-authored-by: Charly Chevalier <[email protected]>

metamaskbot · 2025-02-26T19:04:36Z

Builds ready [ca84bad]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (1746 ± 63 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	271	2009	1515	512	246
		domContentLoaded	1508	1995	1721	136	65
		load	1520	2012	1746	132	63
		domInteractive	26	117	44	25	12
		backgroundConnect	13	71	29	20	10
		firstReactRender	15	86	40	24	12
		getState	4	55	15	17	8
		initialActions	0	1	0	0	0
		loadScripts	1086	1536	1287	121	58
		setupStore	8	63	17	18	9
		uiStartup	1733	2321	2002	144	69

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 0 Bytes (0.00%)
ui: 28 Bytes (0.00%)
common: 113 Bytes (0.00%)

PatrykLucka self-assigned this Feb 25, 2025

metamaskbot added the team-mmi PRs from the MMI team label Feb 25, 2025

PatrykLucka force-pushed the add-entropy-srouce-for-non-evm-accounts branch from ccfc68d to a6ccbb8 Compare February 26, 2025 15:48

PatrykLucka changed the base branch from multi-srp-mvp-2 to main February 26, 2025 15:48

PatrykLucka force-pushed the add-entropy-srouce-for-non-evm-accounts branch from a6ccbb8 to b7e2608 Compare February 26, 2025 15:58

feat: add entropySource to non-evm accounts

0979f7a

PatrykLucka force-pushed the add-entropy-srouce-for-non-evm-accounts branch from b7e2608 to 0979f7a Compare February 26, 2025 16:11

PatrykLucka marked this pull request as ready for review February 26, 2025 16:35

PatrykLucka requested a review from a team as a code owner February 26, 2025 16:35

shane-t self-requested a review February 26, 2025 16:35

shane-t previously approved these changes Feb 26, 2025

View reviewed changes

shane-t requested a review from danroc February 26, 2025 16:38