fix: cp-12.17.0 bump @metamask/keyring-controller from ^21.0.3 to ^21.0.4

[mikesposito]

Description

Bumping @metamask/keyring-controller to ^21.0.4

## [21.0.4]

### Fixed

- Ensure no duplicate accounts are persisted ([#5710](https://github.com/MetaMask/core/pull/5710))

Related issues

Fixes: #32097

Manual testing steps

In order to test the fix, you first need a wallet bricked because of a duplicate account:

• Checkout on the v12.16.0 release branch and build locally (a version with multi-srp support)
• Import or create an SRP (I used child guilt hollow arrive average popular nasty soon summer like scheme diary pill country rapid)
• Import an account that is part of the mnemonic (e.g. I used 0x80842b7e3cfb1118e86a427cdec418e3b4179ef5bbbfd71c02a76349831c8a8b which is the account at index 2 of the above SRP)
• Add a new account on the main HD - note that you'll be able to add the account, but (1) the account is the same as the imported one (expectable) and (2) the newly added account is wrongly labeled as "imported"
• Lock the wallet
• Unlock it with the right password - you will see the reported error:

Error: KeyringController - The account you are trying to import is a duplicate
await in withLock		
submitPassword	@	metamask-controller.js:4343
await in submitPassword		
(anonymous)	@	createMetaRPCHandler.js:23

Testing the fix

• Without removing the extension from the browser, switch to this PR branch and build again
• Visit chrome://extensions/ and reload the extension
• Try to login again, you should be able to access the wallet again

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.

[socket-security]

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	@​metamask/​keyring-controller@​21.0.3 ⏵ 21.0.4				+1

View full report

[cryptodev-2s]

LGTM!

[metamaskbot]

Builds ready [e0afbb2]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (test): chrome, firefox
• builds (test-flask): chrome, firefox
• build viz: Build System
• bundle size: Bundle Size Stats
• user-actions-benchmark: User Actions Stats
• storybook: Storybook
• typescript migration: Dashboard
• all CircleCI 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, 13
  • content-script: 0
  • offscreen: 0

UI Startup Metrics (1181 ± 51 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1181	1077	1293	51	1221	1272
			load	1022	935	1133	45	1047	1103
			domContentLoaded	1017	930	1125	44	1042	1097
			domInteractive	17	13	31	5	16	28
			firstPaint	667	75	1132	407	1030	1086
			backgroundConnect	6	3	17	2	7	9
			firstReactRender	20	15	49	5	20	32
			getState	12	4	35	7	18	25
			initialActions	0	0	1	0	0	1
			loadScripts	784	704	891	42	816	859
			setupStore	8	5	18	2	8	13
	Webpack	Home	uiStartup	2148	1723	2566	159	2259	2394
			load	1666	1358	2025	121	1749	1874
			domContentLoaded	1659	1354	2014	120	1740	1865
			domInteractive	17	11	76	12	13	44
			firstPaint	192	81	608	83	235	319
			backgroundConnect	28	10	247	26	29	63
			firstReactRender	214	54	378	119	319	363
			getState	12	4	40	7	15	28
			initialActions	5	1	271	27	3	5
			loadScripts	1651	1353	1991	121	1736	1858
			setupStore	17	6	62	8	20	30
Firefox	Browserify	Home	uiStartup	1381	1193	1652	93	1444	1569
			load	1223	1017	1472	100	1292	1409
			domContentLoaded	1223	1017	1471	100	1292	1409
			domInteractive	108	38	240	33	120	170
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	22	14	106	13	20	47
			firstReactRender	23	19	56	5	24	34
			getState	7	4	23	2	8	10
			initialActions	0	0	1	0	0	1
			loadScripts	1204	991	1449	100	1270	1389
			setupStore	9	4	176	18	7	12
	Webpack	Home	uiStartup	1493	1341	1798	117	1568	1743
			load	1281	1160	1545	98	1343	1500
			domContentLoaded	1280	1160	1544	98	1343	1500
			domInteractive	84	55	267	29	94	135
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	15	116	16	23	44
			firstReactRender	35	29	50	5	36	44
			getState	8	3	32	4	9	12
			initialActions	1	0	2	1	1	1
			loadScripts	1258	1141	1523	96	1315	1481
			setupStore	9	5	59	8	8	26

Bundle size diffs [🚀 Bundle size reduced!]

• background: 0 Bytes (0%)
• ui: 0 Bytes (0%)
• common: -102 Bytes (0%)