fix: handle keyring remove when import srp seedless error cp-13.0.0

[tuna1207]

Description

1. When importing SRP/Private key in social login flow, we add new keyring first then sync the SRP to seedless controller, if syncing to seedless controller fail we aren't doing anything and we have mismatch state between keyring controller and seedless controller
2. This PR catch error at seedless controller sync step and revert the added keyring in keyring controller

Changelog

CHANGELOG entry: null

Related issues

Fixes:

Manual testing steps

1. sign in using social account
2. try to add new SRP without internet enabled
3. shouldn't be able to add new SRP/Private key

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.

[cursor]

Bug: Error Masking During Cleanup

The error handling logic masks the original error if the removeAccount cleanup operation fails. In the try...catch blocks for addNewSeedPhraseBackup and addNewPrivateKeyBackup, if removeAccount throws an error during cleanup, it overwrites the original error, making debugging difficult.

app/scripts/metamask-controller.js#L5136-L5142

metamask-extension/app/scripts/metamask-controller.js

Lines 5136 to 5142 in 008b2e4

	);
	} catch (err) {
	// handle seedless controller import error by reverting keyring controller mnemonic import
	// KeyringController.removeAccount will remove keyring when it's emptied, currently there are no other method in keyring controller to remove keyring
	await this.keyringController.removeAccount(newAccountAddress);
	throw err;
	}

app/scripts/metamask-controller.js#L6393-L6399

metamask-extension/app/scripts/metamask-controller.js

Lines 6393 to 6399 in 008b2e4

	);
	} catch (err) {
	// handle seedless controller import error by reverting keyring controller mnemonic import
	// KeyringController.removeAccount will remove keyring when it's emptied, currently there are no other method in keyring controller to remove keyring
	await this.keyringController.removeAccount(importedAccountAddress);
	throw err;
	}

Fix in Cursor • Fix in Web

---

Was this report helpful? Give feedback by reacting with 👍 or 👎

[metamaskbot]

Builds ready [008b2e4]

• builds: chrome, firefox
• builds (beta): chrome, firefox
• 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 artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
  • 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, 14
  • content-script: 0
  • offscreen: 0

UI Startup Metrics (1297 ± 63 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1297	1170	1536	63	1333	1432
			load	1108	979	1340	59	1149	1199
			domContentLoaded	1100	976	1334	59	1141	1194
			domInteractive	19	14	49	8	17	42
			firstPaint	778	72	1253	451	1144	1196
			backgroundConnect	216	204	255	8	217	235
			firstReactRender	20	15	52	5	20	31
			getState	9	4	53	9	9	27
			initialActions	2	0	16	4	2	13
			loadScripts	891	766	1128	59	931	977
			setupStore	7	4	15	2	7	11
	Webpack	Home	uiStartup	2380	2023	2834	132	2464	2565
			load	1879	1487	2236	137	1967	2114
			domContentLoaded	1872	1480	2225	136	1963	2110
			domInteractive	19	12	114	17	15	64
			firstPaint	173	65	1721	170	177	343
			backgroundConnect	37	10	288	55	28	233
			firstReactRender	180	89	386	78	214	340
			getState	13	4	247	24	12	18
			initialActions	9	2	190	24	6	16
			loadScripts	1865	1476	2211	135	1957	2108
			setupStore	20	6	218	33	16	38
Firefox	Browserify	Home	uiStartup	1488	1301	2138	167	1530	1911
			load	1283	1139	1761	105	1324	1468
			domContentLoaded	1283	1139	1761	105	1323	1468
			domInteractive	116	36	495	83	105	297
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	30	15	220	25	32	59
			firstReactRender	28	20	66	10	29	58
			getState	11	3	174	20	10	36
			initialActions	9	0	197	32	3	16
			loadScripts	1261	1125	1741	104	1301	1443
			setupStore	9	4	88	10	7	22
	Webpack	Home	uiStartup	1832	1565	2770	214	1929	2279
			load	1538	1321	2068	151	1647	1806
			domContentLoaded	1538	1321	2067	151	1647	1806
			domInteractive	93	33	305	47	94	182
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	33	16	227	25	35	62
			firstReactRender	54	42	69	5	57	62
			getState	11	2	95	13	14	27
			initialActions	11	1	238	33	10	58
			loadScripts	1512	1299	1976	142	1613	1784
			setupStore	18	5	279	37	16	73

Benchmark value 1297 exceeds gate value 1234 for chrome browserify home mean uiStartup
Benchmark value 1109 exceeds gate value 1070 for chrome browserify home mean load
Benchmark value 1101 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 216 exceeds gate value 10 for chrome browserify home mean backgroundConnect
Benchmark value 3 exceeds gate value 1 for chrome browserify home mean initialActions
Benchmark value 892 exceeds gate value 830 for chrome browserify home mean loadScripts
Benchmark value 1432 exceeds gate value 1365 for chrome browserify home p95 uiStartup
Benchmark value 1200 exceeds gate value 1190 for chrome browserify home p95 load
Benchmark value 1195 exceeds gate value 1180 for chrome browserify home p95 domContentLoaded
Benchmark value 42 exceeds gate value 41 for chrome browserify home p95 domInteractive
Benchmark value 1197 exceeds gate value 1180 for chrome browserify home p95 firstPaint
Benchmark value 236 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 13 exceeds gate value 1.2 for chrome browserify home p95 initialActions
Benchmark value 978 exceeds gate value 940 for chrome browserify home p95 loadScripts
Benchmark value 2381 exceeds gate value 2192 for chrome webpack home mean uiStartup
Benchmark value 1879 exceeds gate value 1711 for chrome webpack home mean load
Benchmark value 1872 exceeds gate value 1704 for chrome webpack home mean domContentLoaded
Benchmark value 9 exceeds gate value 7 for chrome webpack home mean initialActions
Benchmark value 1865 exceeds gate value 1699 for chrome webpack home mean loadScripts
Benchmark value 2566 exceeds gate value 2454 for chrome webpack home p95 uiStartup
Benchmark value 2115 exceeds gate value 2030 for chrome webpack home p95 load
Benchmark value 2110 exceeds gate value 2005 for chrome webpack home p95 domContentLoaded
Benchmark value 65 exceeds gate value 57 for chrome webpack home p95 domInteractive
Benchmark value 343 exceeds gate value 334 for chrome webpack home p95 firstPaint
Benchmark value 233 exceeds gate value 90 for chrome webpack home p95 backgroundConnect
Benchmark value 16 exceeds gate value 7 for chrome webpack home p95 initialActions
Benchmark value 2108 exceeds gate value 1970 for chrome webpack home p95 loadScripts
Benchmark value 1489 exceeds gate value 1405 for firefox browserify home mean uiStartup
Benchmark value 1284 exceeds gate value 1245 for firefox browserify home mean load
Benchmark value 1283 exceeds gate value 1239 for firefox browserify home mean domContentLoaded
Benchmark value 117 exceeds gate value 110 for firefox browserify home mean domInteractive
Benchmark value 31 exceeds gate value 25 for firefox browserify home mean backgroundConnect
Benchmark value 28 exceeds gate value 25 for firefox browserify home mean firstReactRender
Benchmark value 9 exceeds gate value 1 for firefox browserify home mean initialActions
Benchmark value 1261 exceeds gate value 1230 for firefox browserify home mean loadScripts
Benchmark value 1911 exceeds gate value 1660 for firefox browserify home p95 uiStartup
Benchmark value 297 exceeds gate value 195 for firefox browserify home p95 domInteractive
Benchmark value 58 exceeds gate value 55 for firefox browserify home p95 firstReactRender
Benchmark value 36 exceeds gate value 24 for firefox browserify home p95 getState
Benchmark value 16 exceeds gate value 2 for firefox browserify home p95 initialActions
Benchmark value 1832 exceeds gate value 1615 for firefox webpack home mean uiStartup
Benchmark value 1539 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 1538 exceeds gate value 1380 for firefox webpack home mean domContentLoaded
Benchmark value 33 exceeds gate value 26 for firefox webpack home mean backgroundConnect
Benchmark value 54 exceeds gate value 38 for firefox webpack home mean firstReactRender
Benchmark value 12 exceeds gate value 1 for firefox webpack home mean initialActions
Benchmark value 1512 exceeds gate value 1360 for firefox webpack home mean loadScripts
Benchmark value 19 exceeds gate value 13 for firefox webpack home mean setupStore
Benchmark value 2279 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1806 exceeds gate value 1660 for firefox webpack home p95 load
Benchmark value 1806 exceeds gate value 1660 for firefox webpack home p95 domContentLoaded
Benchmark value 182 exceeds gate value 156 for firefox webpack home p95 domInteractive
Benchmark value 62 exceeds gate value 49 for firefox webpack home p95 backgroundConnect
Benchmark value 62 exceeds gate value 50 for firefox webpack home p95 firstReactRender
Benchmark value 58 exceeds gate value 2 for firefox webpack home p95 initialActions
Benchmark value 1784 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Benchmark value 73 exceeds gate value 28 for firefox webpack home p95 setupStore
Sum of mean exceeds: 2053ms | Sum of p95 exceeds: 2310.8ms
Sum of all benchmark exceeds: 4363.8ms

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

• background: 170 Bytes (0%)
• ui: 0 Bytes (0%)
• common: 15 Bytes (0%)

[himanshuchawla009]

lgtm

[lwin-kyaw]

LGTM