feat: add `scopes` field to `KeyringAccount` #29195

ccharly · 2024-12-13T11:22:54Z

Description

Testing the new scopes added on the KeyringAccount.

Related issues

Requires this PR to be merged first:

refactor: use new @metamask/keyring-api layout (split packages) #28861

Related to:

Manual testing steps

Use a previous stable version

git checkout Version-v12.10.0 # Or use a release build

Run it:

yarn
yarn start:flask

Create a bunch of accounts (EVM, non-EVM (Solana/Bitcoin), hardware-wallet, Snap EVM accounts like the SSK)

Save your extension logs (Settings > Advanced)
Now disable your extension (chrome://extensions)
Stops your yarn start:flask
Now, update your extension by going back to this PR (or by using the latest RC if you're validating an RC version)

git checkout feat/keyring-account-scopes

Re-run it:

yarn
yarn start:flask

Re-enable your extension (chrome://extensions)
Open up your console logs (looking at the service worker)
You should now see some migrations running like:

You should also see some other migrations from the Snap keyring this like so:

Save your extension logs again (Settings > Advanced, and use a different filename)
Now, compare your 2 .json files

Screenshots/Recordings

Before

After

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 · 2024-12-13T11:23:08Z

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.

socket-security · 2024-12-13T11:24:09Z

New, updated, and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@metamask/accounts-controller@21.0.1 🔁 npm/@metamask/accounts-controller@20.0.2	None	`0`	272 kB	metamaskbot
npm/@metamask/bitcoin-wallet-snap@0.9.0 🔁 npm/@metamask/bitcoin-wallet-snap@0.8.2	None	`0`	1.48 MB	metamaskbot
npm/@metamask/eth-snap-keyring@8.1.0 🔁 npm/@metamask/eth-snap-keyring@7.0.0	None	`0`	360 kB	metamaskbot
npm/@metamask/keyring-internal-snap-client@2.0.0 🔁 npm/@metamask/keyring-internal-snap-client@1.0.0	None	`0`	32.2 kB	metamaskbot
npm/@metamask/keyring-snap-client@2.0.0 🔁 npm/@metamask/keyring-snap-client@1.0.0	None	`0`	59.2 kB	metamaskbot
npm/@metamask/solana-wallet-snap@1.1.0 🔁 npm/@metamask/solana-wallet-snap@1.0.4	None	`0`	995 kB	metamaskbot
npm/@scure/base@1.1.7 🔁 npm/@scure/base@1.1.9	None	`0`	122 kB	paulmillr
npm/crc-32@1.2.0 🔁 npm/crc-32@1.2.2	None	`0`	13.3 kB	sheetjs
npm/exit-on-epipe@1.0.1	None	`0`	5 kB	sheetjs
npm/printj@1.1.2	None	`0`	113 kB	sheetjs

🚮 Removed packages: npm/@metamask/keyring-api@12.0.0, npm/@metamask/keyring-internal-api@1.0.0

View full report↗︎

metamaskbot · 2025-01-17T13:30:55Z

Builds ready [9e94e59]

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
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- content-script: 0
- offscreen: 0

Page Load Metrics (1782 ± 107 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1544	2446	1781	228	110
		domContentLoaded	1533	2373	1752	219	105
		load	1545	2447	1782	224	107
		domInteractive	21	204	55	45	21
		backgroundConnect	7	98	29	25	12
		firstReactRender	16	98	41	27	13
		getState	5	93	20	24	12
		initialActions	0	0	0	0	0
		loadScripts	1121	1787	1308	176	84
		setupStore	6	66	13	15	7
		uiStartup	1753	2720	2032	263	126

Bundle size diffs [🚀 Bundle size reduced!]

background: -38.65 KiB (-0.65%)
ui: 0 Bytes (0.00%)
common: -73.09 KiB (-0.84%)

gantunesr · 2025-01-20T12:18:29Z

Manual tested the migration test case:

Logs reported as expected

State updated as expected

Initial state

"internalAccounts": {
  "accounts": {
    "3b61f8b2-9a9a-4954-b8da-f829b9092ee7": {
      "id": "3b61f8b2-9a9a-4954-b8da-f829b9092ee7",
      "address": "0xc5b2b5ae370876c0122910f92a13bef85a133e56",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 1",
        "importTime": 1737373698776,
        "lastSelected": 1737373698776,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "d2e1a3b0-dedf-4fa5-85d0-aa4fedfb2b32": {
      "id": "d2e1a3b0-dedf-4fa5-85d0-aa4fedfb2b32",
      "address": "0x9491938151d774cf46ad422f28b75ab3364a7240",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 2",
        "importTime": 1737373703412,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "c401e0e4-8c48-4406-8e6a-a5de2ffd998f": {
      "id": "c401e0e4-8c48-4406-8e6a-a5de2ffd998f",
      "address": "0x79821ea7ab5c5a34a24b2fd547c544ac15a7b121",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 3",
        "importTime": 1737373703583,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "d28b8763-ce68-4a71-91f1-85d6fb8187d6": {
      "id": "d28b8763-ce68-4a71-91f1-85d6fb8187d6",
      "address": "0xdf8c8269f35274c5ba5c18f091407c8b1c29d7b1",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 4",
        "importTime": 1737373703748,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "43538253-4d95-4da4-adc0-9a256b0ffff9": {
      "id": "43538253-4d95-4da4-adc0-9a256b0ffff9",
      "address": "0x5ea510e7e1d3b3d4ec9e0615893b6552479b9d52",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 5",
        "importTime": 1737373703922,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "2ea26aa9-69c6-4d53-88ea-f65b6781ed18": {
      "id": "2ea26aa9-69c6-4d53-88ea-f65b6781ed18",
      "address": "0x28f9c91ef587099460642ac1ad9785aa711b98ad",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 6",
        "importTime": 1737373704094,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "725c20d2-abdb-464e-9952-23a0783ee71d": {
      "id": "725c20d2-abdb-464e-9952-23a0783ee71d",
      "address": "0x194cca48fe7eb9e1786ea15f6bd2674c38b1827e",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 7",
        "importTime": 1737373706290,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "fffcfee3-ca32-4e3a-9772-f0da52ad7d6f": {
      "type": "bip122:p2wpkh",
      "id": "fffcfee3-ca32-4e3a-9772-f0da52ad7d6f",
      "address": "bc1qq4c8nqyu7hqvl9z85kj0m7p8adfnggt9lwp4lx",
      "options": {
        "scope": "bip122:000000000019d6689c085ae165831e93",
        "index": 0
      },
      "methods": [
        "sendBitcoin"
      ],
      "metadata": {
        "name": "Bitcoin Account",
        "importTime": 1737373980982,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/bitcoin-wallet-snap",
          "name": "Bitcoin",
          "enabled": true
        },
        "lastSelected": 1737373980995
      }
    },
    "9efc9170-7a0e-4039-a2d5-91ee21344027": {
      "type": "bip122:p2wpkh",
      "id": "9efc9170-7a0e-4039-a2d5-91ee21344027",
      "address": "tb1q2uh98jcgv7kj2n6683rl8mc0e42ks45xjnggej",
      "options": {
        "scope": "bip122:000000000933ea01ad0ee984209779ba",
        "index": 0
      },
      "methods": [
        "sendBitcoin"
      ],
      "metadata": {
        "name": "Bitcoin Testnet Account",
        "importTime": 1737373988986,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/bitcoin-wallet-snap",
          "name": "Bitcoin",
          "enabled": true
        },
        "lastSelected": 1737373989000
      }
    },
    "8502ef9f-9e73-4a88-beef-6c686d25c1b7": {
      "type": "solana:data-account",
      "id": "8502ef9f-9e73-4a88-beef-6c686d25c1b7",
      "address": "7rNDaLreKMEDG9vBYPWvjDLX3LU4tEbMPEN6pTxdGVNL",
      "options": {
        "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
      },
      "methods": [
        "sendAndConfirmTransaction"
      ],
      "metadata": {
        "name": "Solana Account 1",
        "importTime": 1737373995496,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/solana-wallet-snap",
          "name": "Solana",
          "enabled": true
        },
        "lastSelected": 1737373995510
      }
    },
    "bd2e74e3-30d1-40c8-90d9-4e2f6cde4e46": {
      "id": "bd2e74e3-30d1-40c8-90d9-4e2f6cde4e46",
      "options": {},
      "address": "0xe9c53207e3dc5a59dba0b7e5fa946030e39eaff7",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "SSK Account",
        "importTime": 1737374023616,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374023633
      }
    },
    "81d94ebd-13ab-45d0-ae2e-a27798ab16b1": {
      "id": "81d94ebd-13ab-45d0-ae2e-a27798ab16b1",
      "options": {},
      "address": "0x8c8443089057dfea92546b2422641afd7632ca35",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "SSK Account 2",
        "importTime": 1737374027656,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374027674
      }
    },
    "05e5a618-ec82-45fb-a1c6-aa58c64d36f0": {
      "id": "05e5a618-ec82-45fb-a1c6-aa58c64d36f0",
      "options": {},
      "address": "0xb5e9ee46e6a61b688ed2be8de16975bc81f1d3da",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "SSK Account 3",
        "importTime": 1737374034228,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374034248,
        "nameLastUpdatedAt": 1737374034249
      }
    },
    "179f9fbf-7b26-4592-8493-dbafcfa83e4c": {
      "id": "179f9fbf-7b26-4592-8493-dbafcfa83e4c",
      "address": "0xeae1dfdf3c9cda4d52a452716950b41eea864c5e",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 1",
        "importTime": 1737374151129,
        "keyring": {
          "type": "Ledger Hardware"
        },
        "lastSelected": 1737374151133,
        "nameLastUpdatedAt": 1737374151133
      }
    },
    "a4a41a3d-13d9-4ef3-be2f-aa28f47879aa": {
      "id": "a4a41a3d-13d9-4ef3-be2f-aa28f47879aa",
      "address": "0x3a3fc52253e62cf4f3573814aa410736c9db5d0c",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 2",
        "importTime": 1737374151651,
        "keyring": {
          "type": "Ledger Hardware"
        },
        "lastSelected": 1737374151656,
        "nameLastUpdatedAt": 1737374151656
      }
    },
    "8c028de9-0094-44af-be0a-335ded0c6117": {
      "id": "8c028de9-0094-44af-be0a-335ded0c6117",
      "address": "0x91db5ca06149ace5ac5a476020ded0eb5b9d21c7",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 3",
        "importTime": 1737374152169,
        "keyring": {
          "type": "Ledger Hardware"
        },
        "lastSelected": 1737374152174,
        "nameLastUpdatedAt": 1737374152174
      }
    }
  },
  "selectedAccount": "8c028de9-0094-44af-be0a-335ded0c6117"
},

After migration state state

"internalAccounts": {
  "accounts": {
    "3b61f8b2-9a9a-4954-b8da-f829b9092ee7": {
      "id": "3b61f8b2-9a9a-4954-b8da-f829b9092ee7",
      "address": "0xc5b2b5ae370876c0122910f92a13bef85a133e56",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 1",
        "importTime": 1737373698776,
        "lastSelected": 1737373698776,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "d2e1a3b0-dedf-4fa5-85d0-aa4fedfb2b32": {
      "id": "d2e1a3b0-dedf-4fa5-85d0-aa4fedfb2b32",
      "address": "0x9491938151d774cf46ad422f28b75ab3364a7240",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 2",
        "importTime": 1737373703412,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "c401e0e4-8c48-4406-8e6a-a5de2ffd998f": {
      "id": "c401e0e4-8c48-4406-8e6a-a5de2ffd998f",
      "address": "0x79821ea7ab5c5a34a24b2fd547c544ac15a7b121",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 3",
        "importTime": 1737373703583,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "d28b8763-ce68-4a71-91f1-85d6fb8187d6": {
      "id": "d28b8763-ce68-4a71-91f1-85d6fb8187d6",
      "address": "0xdf8c8269f35274c5ba5c18f091407c8b1c29d7b1",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 4",
        "importTime": 1737373703748,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "43538253-4d95-4da4-adc0-9a256b0ffff9": {
      "id": "43538253-4d95-4da4-adc0-9a256b0ffff9",
      "address": "0x5ea510e7e1d3b3d4ec9e0615893b6552479b9d52",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 5",
        "importTime": 1737373703922,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "2ea26aa9-69c6-4d53-88ea-f65b6781ed18": {
      "id": "2ea26aa9-69c6-4d53-88ea-f65b6781ed18",
      "address": "0x28f9c91ef587099460642ac1ad9785aa711b98ad",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 6",
        "importTime": 1737373704094,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "725c20d2-abdb-464e-9952-23a0783ee71d": {
      "id": "725c20d2-abdb-464e-9952-23a0783ee71d",
      "address": "0x194cca48fe7eb9e1786ea15f6bd2674c38b1827e",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Account 7",
        "importTime": 1737373706290,
        "lastSelected": 0,
        "keyring": {
          "type": "HD Key Tree"
        }
      }
    },
    "179f9fbf-7b26-4592-8493-dbafcfa83e4c": {
      "id": "179f9fbf-7b26-4592-8493-dbafcfa83e4c",
      "address": "0xeae1dfdf3c9cda4d52a452716950b41eea864c5e",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 1",
        "nameLastUpdatedAt": 1737374151133,
        "importTime": 1737374151129,
        "lastSelected": 1737374151133,
        "keyring": {
          "type": "Ledger Hardware"
        }
      }
    },
    "a4a41a3d-13d9-4ef3-be2f-aa28f47879aa": {
      "id": "a4a41a3d-13d9-4ef3-be2f-aa28f47879aa",
      "address": "0x3a3fc52253e62cf4f3573814aa410736c9db5d0c",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 2",
        "nameLastUpdatedAt": 1737374151656,
        "importTime": 1737374151651,
        "lastSelected": 1737374151656,
        "keyring": {
          "type": "Ledger Hardware"
        }
      }
    },
    "8c028de9-0094-44af-be0a-335ded0c6117": {
      "id": "8c028de9-0094-44af-be0a-335ded0c6117",
      "address": "0x91db5ca06149ace5ac5a476020ded0eb5b9d21c7",
      "options": {},
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "scopes": [
        "eip155"
      ],
      "type": "eip155:eoa",
      "metadata": {
        "name": "Ledger 3",
        "nameLastUpdatedAt": 1737374152174,
        "importTime": 1737374152169,
        "lastSelected": 1737374152174,
        "keyring": {
          "type": "Ledger Hardware"
        }
      }
    },
    "fffcfee3-ca32-4e3a-9772-f0da52ad7d6f": {
      "type": "bip122:p2wpkh",
      "id": "fffcfee3-ca32-4e3a-9772-f0da52ad7d6f",
      "address": "bc1qq4c8nqyu7hqvl9z85kj0m7p8adfnggt9lwp4lx",
      "options": {
        "scope": "bip122:000000000019d6689c085ae165831e93",
        "index": 0
      },
      "methods": [
        "sendBitcoin"
      ],
      "scopes": [
        "bip122:000000000019d6689c085ae165831e93"
      ],
      "metadata": {
        "name": "Bitcoin Account",
        "importTime": 1737373980982,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/bitcoin-wallet-snap",
          "name": "Bitcoin",
          "enabled": true
        },
        "lastSelected": 1737373980995
      }
    },
    "9efc9170-7a0e-4039-a2d5-91ee21344027": {
      "type": "bip122:p2wpkh",
      "id": "9efc9170-7a0e-4039-a2d5-91ee21344027",
      "address": "tb1q2uh98jcgv7kj2n6683rl8mc0e42ks45xjnggej",
      "options": {
        "scope": "bip122:000000000933ea01ad0ee984209779ba",
        "index": 0
      },
      "methods": [
        "sendBitcoin"
      ],
      "scopes": [
        "bip122:000000000933ea01ad0ee984209779ba"
      ],
      "metadata": {
        "name": "Bitcoin Testnet Account",
        "importTime": 1737373988986,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/bitcoin-wallet-snap",
          "name": "Bitcoin",
          "enabled": true
        },
        "lastSelected": 1737373989000
      }
    },
    "8502ef9f-9e73-4a88-beef-6c686d25c1b7": {
      "type": "solana:data-account",
      "id": "8502ef9f-9e73-4a88-beef-6c686d25c1b7",
      "address": "7rNDaLreKMEDG9vBYPWvjDLX3LU4tEbMPEN6pTxdGVNL",
      "options": {
        "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
      },
      "methods": [
        "sendAndConfirmTransaction"
      ],
      "scopes": [
        "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
        "solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z",
        "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
      ],
      "metadata": {
        "name": "Solana Account 1",
        "importTime": 1737373995496,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/solana-wallet-snap",
          "name": "Solana",
          "enabled": true
        },
        "lastSelected": 1737373995510
      }
    },
    "bd2e74e3-30d1-40c8-90d9-4e2f6cde4e46": {
      "id": "bd2e74e3-30d1-40c8-90d9-4e2f6cde4e46",
      "options": {},
      "address": "0xe9c53207e3dc5a59dba0b7e5fa946030e39eaff7",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "scopes": [
        "eip155"
      ],
      "metadata": {
        "name": "SSK Account",
        "importTime": 1737374023616,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374023633
      }
    },
    "81d94ebd-13ab-45d0-ae2e-a27798ab16b1": {
      "id": "81d94ebd-13ab-45d0-ae2e-a27798ab16b1",
      "options": {},
      "address": "0x8c8443089057dfea92546b2422641afd7632ca35",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "scopes": [
        "eip155"
      ],
      "metadata": {
        "name": "SSK Account 2",
        "importTime": 1737374027656,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374027674
      }
    },
    "05e5a618-ec82-45fb-a1c6-aa58c64d36f0": {
      "id": "05e5a618-ec82-45fb-a1c6-aa58c64d36f0",
      "options": {},
      "address": "0xb5e9ee46e6a61b688ed2be8de16975bc81f1d3da",
      "methods": [
        "personal_sign",
        "eth_sign",
        "eth_signTransaction",
        "eth_signTypedData_v1",
        "eth_signTypedData_v3",
        "eth_signTypedData_v4"
      ],
      "type": "eip155:eoa",
      "scopes": [
        "eip155"
      ],
      "metadata": {
        "name": "SSK Account 3",
        "importTime": 1737374034228,
        "keyring": {
          "type": "Snap Keyring"
        },
        "snap": {
          "id": "npm:@metamask/snap-simple-keyring-snap",
          "name": "MetaMask Simple Snap Keyring",
          "enabled": true
        },
        "lastSelected": 1737374034248
      }
    }
  },
  "selectedAccount": "8c028de9-0094-44af-be0a-335ded0c6117"
},

Extension works as expected

Screen.Recording.2025-01-20.at.9.17.00.AM.mov

gantunesr

Looks good, left some minor comments

app/scripts/migrations/105.ts

yarn.lock

lavamoat/browserify/main/policy.json

metamaskbot · 2025-01-20T15:18:34Z

Builds ready [0d3dfe4]

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
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- content-script: 0
- offscreen: 0

Page Load Metrics (1742 ± 104 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	425	2208	1650	342	164
		domContentLoaded	1431	2192	1708	217	104
		load	1437	2212	1742	217	104
		domInteractive	25	110	38	20	10
		backgroundConnect	7	89	40	25	12
		firstReactRender	16	89	33	23	11
		getState	5	78	20	21	10
		initialActions	0	1	0	0	0
		loadScripts	1021	1573	1229	141	68
		setupStore	6	87	12	17	8
		uiStartup	1692	2497	2016	226	109

Bundle size diffs [🚀 Bundle size reduced!]

background: -38.65 KiB (-0.65%)
ui: 0 Bytes (0.00%)
common: -73.09 KiB (-0.84%)

metamaskbot · 2025-01-20T16:24:57Z

Builds ready [19b9874]

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, 13
- content-script: 0
- offscreen: 0

Page Load Metrics (1687 ± 75 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1446	2032	1690	149	72
		domContentLoaded	1438	2007	1657	148	71
		load	1446	2082	1687	155	75
		domInteractive	24	86	38	17	8
		backgroundConnect	6	83	27	26	12
		firstReactRender	16	96	40	26	12
		getState	4	71	23	22	11
		initialActions	0	1	0	0	0
		loadScripts	1042	1474	1212	124	59
		setupStore	6	90	12	18	9
		uiStartup	1616	2403	1947	207	99

Bundle size diffs [🚀 Bundle size reduced!]

background: -38.65 KiB (-0.65%)
ui: 0 Bytes (0.00%)
common: -73.09 KiB (-0.83%)

danroc

LGTM

darkwing

UX pieces approved.

ccharly and others added 21 commits December 3, 2024 17:00

refactor: use new accounts packages

f6d5942

chore: lavamoat:auto

cbd9f36

chore: yarn dedupe

bf4405f

chore: update resolutions

de54690

Merge branch 'main' into refactor/use-new-accounts-packages

356eab7

chore: update resolutions

0584a61

Merge branch 'main' into refactor/use-new-accounts-packages

0fb1493

chore: dedupe + lavamoat:auto

a2b7d0b

chore: update deps

a39c3df

chore: lint

6dce397

chore: update deps

238f522

chore: remove preview builds

ab65f1f

Merge branch 'main' into refactor/use-new-accounts-packages

7cf8701

chore: dedupe

dfa88e1

Merge branch 'main' into refactor/use-new-accounts-packages

9584e9e

Merge branch 'main' into refactor/use-new-accounts-packages

dc10d94

chore: lavamoat:auto

5ea8323

chore: dedupe

45784bb

Merge branch 'main' into refactor/use-new-accounts-packages

50035f3

Merge branch 'main' into refactor/use-new-accounts-packages

384c9e9

ci: add flags.circleci.timeoutMinutes

281c5bf

metamaskbot added the team-accounts label Dec 13, 2024

feat: use new scopes from KeyringAccount

5a28bd5

ccharly force-pushed the feat/keyring-account-scopes branch from d1cc825 to 81c5c8f Compare December 13, 2024 11:36

ccharly changed the title ~~Feat/keyring account scopes~~ feat(keyring-api)!: add scopes field to KeyringAccount Dec 13, 2024

ccharly mentioned this pull request Dec 13, 2024

feat!: add scopes field to KeyringAccount MetaMask/core#5066

Merged

4 tasks

ccharly force-pushed the feat/keyring-account-scopes branch from ecb5bc1 to 3a72085 Compare December 13, 2024 17:12

fix: add resolution for keyring-snap-client

98e9e2d

ccharly added 2 commits January 16, 2025 23:07

chore: dedupe + lavamoat:auto

14977ad

chore: bump accounts-controller to 21.0.1

c70c99a

ccharly force-pushed the feat/keyring-account-scopes branch from f8e088a to c70c99a Compare January 17, 2025 11:42

ccharly added 3 commits January 17, 2025 13:50

Merge branch 'main' into feat/keyring-account-scopes

739071f

refactor: use account type and scopes constants

ca66450

refactor: use account type/scopes/methods constants for solana

9e94e59

ccharly marked this pull request as ready for review January 17, 2025 12:58

darioAnongba previously approved these changes Jan 17, 2025

View reviewed changes

gantunesr reviewed Jan 20, 2025

View reviewed changes

app/scripts/migrations/105.ts Outdated Show resolved Hide resolved

yarn.lock Outdated Show resolved Hide resolved

lavamoat/browserify/main/policy.json Show resolved Hide resolved

lavamoat/browserify/main/policy.json Show resolved Hide resolved

ccharly added 2 commits January 20, 2025 15:29

Merge branch 'main' into feat/keyring-account-scopes

070d493

refactor(migration/105): use Omit

0d3dfe4

ccharly dismissed darioAnongba’s stale review via 0d3dfe4 January 20, 2025 14:43

Merge branch 'main' into feat/keyring-account-scopes

19b9874

gantunesr approved these changes Jan 20, 2025

View reviewed changes

danroc approved these changes Jan 21, 2025

View reviewed changes

zone-live approved these changes Jan 21, 2025

View reviewed changes

pedronfigueiredo approved these changes Jan 21, 2025

View reviewed changes

ccharly enabled auto-merge January 21, 2025 16:52

darkwing approved these changes Jan 21, 2025

View reviewed changes

ccharly added this pull request to the merge queue Jan 21, 2025

NidhiKJha approved these changes Jan 21, 2025

View reviewed changes

Merged via the queue into main with commit f856a3b Jan 21, 2025
72 checks passed

ccharly deleted the feat/keyring-account-scopes branch January 21, 2025 17:51

github-actions bot locked and limited conversation to collaborators Jan 21, 2025

metamaskbot added the release-12.12.0 Issue or pull request that will be included in release 12.12.0 label Jan 21, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add `scopes` field to `KeyringAccount` #29195

feat: add `scopes` field to `KeyringAccount` #29195

ccharly commented Dec 13, 2024 •

edited

Loading

github-actions bot commented Dec 13, 2024

socket-security bot commented Dec 13, 2024 •

edited

Loading

metamaskbot commented Jan 17, 2025

gantunesr commented Jan 20, 2025 •

edited

Loading

gantunesr left a comment

metamaskbot commented Jan 20, 2025

metamaskbot commented Jan 20, 2025

danroc left a comment

darkwing left a comment

feat: add scopes field to KeyringAccount #29195

feat: add scopes field to KeyringAccount #29195

Conversation

ccharly commented Dec 13, 2024 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

github-actions bot commented Dec 13, 2024

socket-security bot commented Dec 13, 2024 • edited Loading

metamaskbot commented Jan 17, 2025

gantunesr commented Jan 20, 2025 • edited Loading

gantunesr left a comment

Choose a reason for hiding this comment

metamaskbot commented Jan 20, 2025

metamaskbot commented Jan 20, 2025

danroc left a comment

Choose a reason for hiding this comment

darkwing left a comment

Choose a reason for hiding this comment

feat: add `scopes` field to `KeyringAccount` #29195

feat: add `scopes` field to `KeyringAccount` #29195

ccharly commented Dec 13, 2024 •

edited

Loading

socket-security bot commented Dec 13, 2024 •

edited

Loading

gantunesr commented Jan 20, 2025 •

edited

Loading