m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Ensure ledger keyring message event listener are removed on metamask lock (#14691)

Browse Source 
* Ensure ledger keyring message event listener are removed on metamask lock

* Clean up
This commit is contained in:
Dan J Miller 2022-05-12 13:36:14 -02:30 committed by ryanml
parent c0957866a9
commit f4094925f0
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/metamask-controller.js
View File

@ -4104,6 +4104,12 @@ export default class MetamaskController extends EventEmitter {
if (trezorKeyring) { if (trezorKeyring) {
trezorKeyring.dispose(); trezorKeyring.dispose();
} }
const [ledgerKeyring] = this.keyringController.getKeyringsByType(
KEYRING_TYPES.LEDGER,
);
ledgerKeyring?.destroy?.();
return this.keyringController.setLocked(); return this.keyringController.setLocked();
} }

3
lavamoat/browserify/beta/policy.json
View File

@ -2750,7 +2750,8 @@
"globals": { "globals": {
"clearInterval": true, "clearInterval": true,
"setInterval": true, "setInterval": true,
"setTimeout": true "setTimeout": true,
"removeEventListener": true
}, },
"packages": { "packages": {
"events": true "events": true

3
lavamoat/browserify/flask/policy.json
View File

@ -2768,7 +2768,8 @@
"globals": { "globals": {
"clearInterval": true, "clearInterval": true,
"setInterval": true, "setInterval": true,
"setTimeout": true "setTimeout": true,
"removeEventListener": true
}, },
"packages": { "packages": {
"events": true "events": true

3
lavamoat/browserify/main/policy.json
View File

@ -2750,7 +2750,8 @@
"globals": { "globals": {
"clearInterval": true, "clearInterval": true,
"setInterval": true, "setInterval": true,
"setTimeout": true "setTimeout": true,
"removeEventListener": true
}, },
"packages": { "packages": {
"events": true "events": true

2
package.json
View File

@ -117,7 +117,7 @@
"@metamask/contract-metadata": "^1.31.0", "@metamask/contract-metadata": "^1.31.0",
"@metamask/controllers": "^28.0.0", "@metamask/controllers": "^28.0.0",
"@metamask/design-tokens": "^1.5.1", "@metamask/design-tokens": "^1.5.1",
"@metamask/eth-ledger-bridge-keyring": "^0.11.0", "@metamask/eth-ledger-bridge-keyring": "^0.12.0",
"@metamask/eth-token-tracker": "^4.0.0", "@metamask/eth-token-tracker": "^4.0.0",
"@metamask/etherscan-link": "^2.1.0", "@metamask/etherscan-link": "^2.1.0",
"@metamask/iframe-execution-environment-service": "^0.11.1", "@metamask/iframe-execution-environment-service": "^0.11.1",

8
yarn.lock
View File

@ -2842,10 +2842,10 @@
resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f" resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f"
integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A== integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A==
"@metamask/eth-ledger-bridge-keyring@^0.11.0": "@metamask/eth-ledger-bridge-keyring@^0.12.0":
version "0.11.0" version "0.12.0"
resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.11.0.tgz#8502e2fd36c89aff7de6724354217274917cecd3" resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.12.0.tgz#d3986e0dbbfeab713f4e0338bf4e5c74a2265bdd"
integrity sha512-fCwM8LYC6SXLfsKc4oNiAatz2X8p/pjbM5zMfm4nb4sZPshBAWU32M4vnB3BSVeQEsisGuLfOWCOWhxmq25n+Q== integrity sha512-kceBQc/wKCAdChZeI1P0Fs0FS15WtiD2Q87MqmfuJYpOriWRx/RmjKZoa6EJe2vy20KurlZRcKIiU8nFQ0e/ag==
dependencies: dependencies:
"@ethereumjs/tx" "^3.2.0" "@ethereumjs/tx" "^3.2.0"
eth-sig-util "^2.0.0" eth-sig-util "^2.0.0"