From 2a41698ea60f22c6733ebe9119f9815763c13507 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 28 Nov 2024 15:07:38 +0100 Subject: [PATCH] chore: wip --- package.json | 6 +++ .../src/AccountsController.ts | 4 ++ yarn.lock | 42 +++++++++---------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index e1b7daf6165..7a8293cd29b 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,12 @@ "pre-push": "yarn lint" }, "resolutions": { + "@metamask/eth-snap-keyring@7.0.0": "npm:@metamask-previews/eth-snap-keyring@7.0.0-ac29af4", + "@metamask/eth-snap-keyring@^7.0.0": "npm:@metamask-previews/eth-snap-keyring@7.0.0-ac29af4", + "@metamask/keyring-api@12.0.0": "npm:@metamask-previews/keyring-api@12.0.0-ac29af4", + "@metamask/keyring-api@^12.0.0": "npm:@metamask-previews/keyring-api@12.0.0-ac29af4", + "@metamask/keyring-internal-api@1.0.0": "npm:@metamask-previews/keyring-internal-api@1.0.0-ac29af4", + "@metamask/keyring-internal-api@^1.0.0": "npm:@metamask-previews/keyring-internal-api@1.0.0-ac29af4", "elliptic@6.5.4": "^6.5.7", "fast-xml-parser@^4.3.4": "^4.4.1", "ws@7.4.6": "^7.5.10" diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index 234d454472d..4280a09eb5f 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -8,6 +8,7 @@ import { SnapKeyring } from '@metamask/eth-snap-keyring'; import { EthAccountType, EthMethod, + EthScopes, isEvmAccountType, } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; @@ -203,6 +204,7 @@ export const EMPTY_ACCOUNT = { options: {}, methods: [], type: EthAccountType.Eoa, + scopes: [EthScopes.Namespace], metadata: { name: '', keyring: { @@ -582,6 +584,7 @@ export class AccountsController extends BaseController< EthMethod.SignTypedDataV3, EthMethod.SignTypedDataV4, ], + scopes: [EthScopes.Namespace], type: EthAccountType.Eoa, metadata: { name: '', @@ -656,6 +659,7 @@ export class AccountsController extends BaseController< EthMethod.SignTypedDataV3, EthMethod.SignTypedDataV4, ], + scopes: [EthScopes.Namespace], type: EthAccountType.Eoa, metadata: { name: this.#populateExistingMetadata(id, 'name') ?? '', diff --git a/yarn.lock b/yarn.lock index 60e7d188b78..91b7f6810b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2673,15 +2673,16 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/eth-snap-keyring@npm:7.0.0" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@7.0.0-ac29af4": + version: 7.0.0-ac29af4 + resolution: "@metamask-previews/eth-snap-keyring@npm:7.0.0-ac29af4" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" - "@metamask/keyring-api": "npm:^12.0.0" - "@metamask/keyring-internal-api": "npm:^1.0.0" - "@metamask/keyring-internal-snap-client": "npm:^1.0.0" + "@metamask/keyring-api": "npm:12.0.0" + "@metamask/keyring-internal-api": "npm:1.0.0" + "@metamask/keyring-internal-snap-client": "npm:1.0.0" + "@metamask/keyring-utils": "npm:1.0.0" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" @@ -2691,9 +2692,8 @@ __metadata: uuid: "npm:^9.0.1" webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/keyring-api": ^12.0.0 "@metamask/providers": ^18.1.0 - checksum: 10/7a82cd2c19204776d31e29716844ac6f304ce4b136b36728be8e7b19ac2be6b46d0c72cc9707c48669a7a342994ce401aafbfe3f0b47769748ab86ae2169cbbd + checksum: 10/4c565f9a7d4ab5dc0771c3f8c1167360056dffc21c03c5c8ecdbc42de727c377a36d8f9544eded9addc8b01c855bda6634085a74c20511cbb4561bd8d9962d2b languageName: node linkType: hard @@ -2950,15 +2950,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^12.0.0": - version: 12.0.0 - resolution: "@metamask/keyring-api@npm:12.0.0" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@12.0.0-ac29af4": + version: 12.0.0-ac29af4 + resolution: "@metamask-previews/keyring-api@npm:12.0.0-ac29af4" dependencies: - "@metamask/keyring-utils": "npm:^1.0.0" + "@metamask/keyring-utils": "npm:1.0.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" bech32: "npm:^2.0.0" - checksum: 10/ba8b75c55d3fcb9f8b52c58ff141cba81f7c416c3fa684e089965717ea129d50e8df7a73e7ab1c96eaf59d70b6e2dd8a618434939b75ef0d3402b547b5196877 + checksum: 10/770d556ef2832dc32a73fa1c349b6c5ab112e3d26c928fa7a24058655307a360bcc5c94f475a010a83ba5903642f8a366c65015726ceb9de209eb657f0617776 languageName: node linkType: hard @@ -3000,19 +3000,19 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:^1.0.0": - version: 1.0.0 - resolution: "@metamask/keyring-internal-api@npm:1.0.0" +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@1.0.0-ac29af4": + version: 1.0.0-ac29af4 + resolution: "@metamask-previews/keyring-internal-api@npm:1.0.0-ac29af4" dependencies: - "@metamask/keyring-api": "npm:^12.0.0" - "@metamask/keyring-utils": "npm:^1.0.0" + "@metamask/keyring-api": "npm:12.0.0" + "@metamask/keyring-utils": "npm:1.0.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/dd0fff93ddfdce008f1db82d404bd040d09840413723c831819d3a7f4c2819a4303657e4acd7578cfd22bd05ad9c7aa563fc88f13f2f06999e2325ada71b824c + checksum: 10/87c19bcc147488b40bb6c063e465bc262bb439edf499466c22a5939a1a3248d615852a3358e8345a4885c977f933e8cebd276bed3abfedee31f0d9dfbaeeda8e languageName: node linkType: hard -"@metamask/keyring-internal-snap-client@npm:^1.0.0": +"@metamask/keyring-internal-snap-client@npm:1.0.0": version: 1.0.0 resolution: "@metamask/keyring-internal-snap-client@npm:1.0.0" dependencies: @@ -3045,7 +3045,7 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-utils@npm:^1.0.0": +"@metamask/keyring-utils@npm:1.0.0, @metamask/keyring-utils@npm:^1.0.0": version: 1.0.0 resolution: "@metamask/keyring-utils@npm:1.0.0" dependencies: