From a744f8fa9c727c5944166b2bee8915fd5575c598 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 12 Sep 2024 16:45:39 +0200 Subject: [PATCH 1/7] refactor: use new accounts packages --- package.json | 11 ++ packages/accounts-controller/package.json | 1 + .../src/AccountsController.test.ts | 12 +- .../src/AccountsController.ts | 9 +- .../accounts-controller/src/tests/mocks.ts | 12 +- packages/assets-controllers/package.json | 4 +- .../src/AccountTrackerController.test.ts | 2 +- .../src/NftController.test.ts | 2 +- .../assets-controllers/src/NftController.ts | 2 +- .../src/TokenDetectionController.test.ts | 2 +- .../src/TokenRatesController.test.ts | 2 +- .../src/TokenRatesController.ts | 2 +- .../src/TokensController.test.ts | 2 +- .../src/TokensController.ts | 2 +- packages/chain-controller/package.json | 3 +- .../src/ChainController.test.ts | 2 +- .../chain-controller/src/ChainController.ts | 2 +- .../chain-controller/src/SnapHandlerClient.ts | 4 +- packages/keyring-controller/package.json | 1 + .../src/KeyringController.test.ts | 2 +- .../src/KeyringController.ts | 4 +- .../tests/mocks/mockErc4337Keyring.ts | 2 +- .../tests/mocks/mockKeyring.ts | 2 +- packages/profile-sync-controller/package.json | 1 + .../UserStorageController.test.ts | 2 +- .../user-storage/UserStorageController.ts | 3 +- .../user-storage/__fixtures__/mockAccounts.ts | 3 +- .../user-storage/accounts/user-storage.ts | 2 +- yarn.lock | 104 ++++++++++++++---- 29 files changed, 136 insertions(+), 66 deletions(-) diff --git a/package.json b/package.json index 19cc9247fd..a6d814ecbe 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,17 @@ "pre-push": "yarn lint" }, "resolutions": { + "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-b85bfaa", + "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.0.0-b85bfaa", + "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.0.0-b85bfaa", + "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa", + "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa", + "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa", + "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa", + "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa", + "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa", + "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa", + "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa", "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/package.json b/packages/accounts-controller/package.json index a68ef814cc..331d6f67e0 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -51,6 +51,7 @@ "@metamask/base-controller": "^7.0.2", "@metamask/eth-snap-keyring": "^5.0.1", "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-internal-api": "^0.0.1", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", "@metamask/utils": "^10.0.0", diff --git a/packages/accounts-controller/src/AccountsController.test.ts b/packages/accounts-controller/src/AccountsController.test.ts index 4905119e45..94a00e1ae4 100644 --- a/packages/accounts-controller/src/AccountsController.test.ts +++ b/packages/accounts-controller/src/AccountsController.test.ts @@ -1,15 +1,11 @@ import { ControllerMessenger } from '@metamask/base-controller'; +import { BtcAccountType, EthAccountType } from '@metamask/keyring-api'; +import { KeyringTypes } from '@metamask/keyring-controller'; +import { BtcMethod, EthMethod } from '@metamask/keyring-internal-api'; import type { InternalAccount, InternalAccountType, -} from '@metamask/keyring-api'; -import { - BtcAccountType, - BtcMethod, - EthAccountType, - EthMethod, -} from '@metamask/keyring-api'; -import { KeyringTypes } from '@metamask/keyring-controller'; +} from '@metamask/keyring-internal-api'; import type { SnapControllerState } from '@metamask/snaps-controllers'; import { SnapStatus } from '@metamask/snaps-utils'; import type { CaipChainId } from '@metamask/utils'; diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index 54f2d01614..fc2934373f 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -5,12 +5,7 @@ import type { } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import { SnapKeyring } from '@metamask/eth-snap-keyring'; -import type { InternalAccount } from '@metamask/keyring-api'; -import { - EthAccountType, - EthMethod, - isEvmAccountType, -} from '@metamask/keyring-api'; +import { EthAccountType } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { KeyringControllerState, @@ -19,6 +14,8 @@ import type { KeyringControllerGetAccountsAction, KeyringControllerStateChangeEvent, } from '@metamask/keyring-controller'; +import { EthMethod, isEvmAccountType } from '@metamask/keyring-internal-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapControllerState, SnapStateChange, diff --git a/packages/accounts-controller/src/tests/mocks.ts b/packages/accounts-controller/src/tests/mocks.ts index b41388fb2f..98325129e9 100644 --- a/packages/accounts-controller/src/tests/mocks.ts +++ b/packages/accounts-controller/src/tests/mocks.ts @@ -1,14 +1,10 @@ +import { BtcAccountType, EthAccountType } from '@metamask/keyring-api'; +import { KeyringTypes } from '@metamask/keyring-controller'; import type { InternalAccount, InternalAccountType, -} from '@metamask/keyring-api'; -import { - BtcAccountType, - BtcMethod, - EthAccountType, - EthMethod, -} from '@metamask/keyring-api'; -import { KeyringTypes } from '@metamask/keyring-controller'; +} from '@metamask/keyring-internal-api'; +import { BtcMethod, EthMethod } from '@metamask/keyring-internal-api'; import { v4 } from 'uuid'; export const createMockInternalAccount = ({ diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 40fe58ca11..b7b32adb35 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -79,11 +79,10 @@ "@metamask/approval-controller": "^7.1.1", "@metamask/auto-changelog": "^3.4.4", "@metamask/ethjs-provider-http": "^0.3.0", - "@metamask/keyring-api": "^10.1.0", "@metamask/keyring-controller": "^19.0.0", + "@metamask/keyring-internal-api": "^0.0.1", "@metamask/network-controller": "^22.0.2", "@metamask/preferences-controller": "^15.0.0", - "@metamask/providers": "^18.1.1", "@types/jest": "^27.4.1", "@types/lodash": "^4.14.191", "@types/node": "^16.18.54", @@ -104,7 +103,6 @@ "@metamask/keyring-controller": "^19.0.0", "@metamask/network-controller": "^22.0.0", "@metamask/preferences-controller": "^15.0.0", - "@metamask/providers": "^18.1.0", "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" }, "engines": { diff --git a/packages/assets-controllers/src/AccountTrackerController.test.ts b/packages/assets-controllers/src/AccountTrackerController.test.ts index bd27eecb87..8b82b7b4c6 100644 --- a/packages/assets-controllers/src/AccountTrackerController.test.ts +++ b/packages/assets-controllers/src/AccountTrackerController.test.ts @@ -1,6 +1,6 @@ import { ControllerMessenger } from '@metamask/base-controller'; import { query, toChecksumHexAddress } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { type NetworkClientId, type NetworkClientConfiguration, diff --git a/packages/assets-controllers/src/NftController.test.ts b/packages/assets-controllers/src/NftController.test.ts index 2fd003dac4..dc9c9a4a8f 100644 --- a/packages/assets-controllers/src/NftController.test.ts +++ b/packages/assets-controllers/src/NftController.test.ts @@ -20,7 +20,7 @@ import { NFT_API_BASE_URL, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/NftController.ts b/packages/assets-controllers/src/NftController.ts index 63c60b53aa..df159b91a9 100644 --- a/packages/assets-controllers/src/NftController.ts +++ b/packages/assets-controllers/src/NftController.ts @@ -26,7 +26,7 @@ import { NFT_API_BASE_URL, NFT_API_VERSION, } from '@metamask/controller-utils'; -import { type InternalAccount } from '@metamask/keyring-api'; +import { type InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientId, NetworkControllerGetNetworkClientByIdAction, diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts index 6a1a69e5ea..a084b5a0ac 100644 --- a/packages/assets-controllers/src/TokenDetectionController.test.ts +++ b/packages/assets-controllers/src/TokenDetectionController.test.ts @@ -6,8 +6,8 @@ import { convertHexToDecimal, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; import type { KeyringControllerState } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { getDefaultNetworkControllerState, RpcEndpointType, diff --git a/packages/assets-controllers/src/TokenRatesController.test.ts b/packages/assets-controllers/src/TokenRatesController.test.ts index 4648151769..db41deddd4 100644 --- a/packages/assets-controllers/src/TokenRatesController.test.ts +++ b/packages/assets-controllers/src/TokenRatesController.test.ts @@ -7,7 +7,7 @@ import { toChecksumHexAddress, toHex, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/TokenRatesController.ts b/packages/assets-controllers/src/TokenRatesController.ts index 50ffd583c9..f25702bbf8 100644 --- a/packages/assets-controllers/src/TokenRatesController.ts +++ b/packages/assets-controllers/src/TokenRatesController.ts @@ -14,7 +14,7 @@ import { FALL_BACK_VS_CURRENCY, toHex, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction, diff --git a/packages/assets-controllers/src/TokensController.test.ts b/packages/assets-controllers/src/TokensController.test.ts index 1f3aa57ea1..250382cd5c 100644 --- a/packages/assets-controllers/src/TokensController.test.ts +++ b/packages/assets-controllers/src/TokensController.test.ts @@ -13,7 +13,7 @@ import { convertHexToDecimal, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/TokensController.ts b/packages/assets-controllers/src/TokensController.ts index feb5293d8c..be24f364b5 100644 --- a/packages/assets-controllers/src/TokensController.ts +++ b/packages/assets-controllers/src/TokensController.ts @@ -24,7 +24,7 @@ import { isValidHexAddress, safelyExecute, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { abiERC721 } from '@metamask/metamask-eth-abis'; import type { NetworkClientId, diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index 2640fb1d56..7ec8564d9d 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -49,7 +49,8 @@ "dependencies": { "@metamask/base-controller": "^7.0.2", "@metamask/chain-api": "^0.1.0", - "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-internal-api": "^0.0.1", + "@metamask/keyring-snap-sdk": "^0.0.1", "@metamask/snaps-controllers": "^9.10.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", diff --git a/packages/chain-controller/src/ChainController.test.ts b/packages/chain-controller/src/ChainController.test.ts index 734a82a231..8fe506561f 100644 --- a/packages/chain-controller/src/ChainController.test.ts +++ b/packages/chain-controller/src/ChainController.test.ts @@ -1,5 +1,5 @@ import { ControllerMessenger } from '@metamask/base-controller'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapId } from '@metamask/snaps-sdk'; import type { AllowedActions, ChainControllerActions } from './ChainController'; diff --git a/packages/chain-controller/src/ChainController.ts b/packages/chain-controller/src/ChainController.ts index 86d32636a9..4e262bd053 100644 --- a/packages/chain-controller/src/ChainController.ts +++ b/packages/chain-controller/src/ChainController.ts @@ -5,7 +5,7 @@ import type { } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import type { CaipAssetType, BalancesResult, Chain } from '@metamask/chain-api'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import type { CaipChainId } from '@metamask/utils'; diff --git a/packages/chain-controller/src/SnapHandlerClient.ts b/packages/chain-controller/src/SnapHandlerClient.ts index fa03a16407..37e31161a1 100644 --- a/packages/chain-controller/src/SnapHandlerClient.ts +++ b/packages/chain-controller/src/SnapHandlerClient.ts @@ -1,4 +1,4 @@ -import type { JsonRpcRequest } from '@metamask/keyring-api/dist/JsonRpcRequest'; +import type { JsonRpcRequest } from '@metamask/keyring-snap-sdk'; import type { SnapController } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import { HandlerType } from '@metamask/snaps-utils'; @@ -78,7 +78,7 @@ export class SnapHandlerClient { */ constructor({ handler, - // Follow same pattern than for @metamask/keyring-api + // Follow same pattern than for @metamask/keyring-snap-client snapId, origin = 'metamask', }: { diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index b3b05df49c..4a957dfe88 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -55,6 +55,7 @@ "@metamask/eth-sig-util": "^8.0.0", "@metamask/eth-simple-keyring": "^6.0.5", "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-internal-api": "^0.0.1", "@metamask/message-manager": "^11.0.1", "@metamask/utils": "^10.0.0", "async-mutex": "^0.5.0", diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts index d8e6218725..18a0c2319d 100644 --- a/packages/keyring-controller/src/KeyringController.test.ts +++ b/packages/keyring-controller/src/KeyringController.test.ts @@ -12,7 +12,7 @@ import { encrypt, } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring/dist/simple-keyring'; -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english'; import type { KeyringClass } from '@metamask/utils'; import { diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 375397fd60..e2e0d46c22 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -10,14 +10,14 @@ import * as encryptorUtils from '@metamask/browser-passworder'; import HDKeyring from '@metamask/eth-hd-keyring'; import { normalize as ethNormalize } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring'; +import type { KeyringExecutionContext } from '@metamask/keyring-api'; import type { EthBaseTransaction, EthBaseUserOperation, EthKeyring, EthUserOperation, EthUserOperationPatch, - KeyringExecutionContext, -} from '@metamask/keyring-api'; +} from '@metamask/keyring-internal-api'; import type { PersonalMessageParams, TypedMessageParams, diff --git a/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts b/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts index 2838ea0b55..6d3f0d3e68 100644 --- a/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts +++ b/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts @@ -1,4 +1,4 @@ -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Hex, Json } from '@metamask/utils'; export class MockErc4337Keyring implements EthKeyring { diff --git a/packages/keyring-controller/tests/mocks/mockKeyring.ts b/packages/keyring-controller/tests/mocks/mockKeyring.ts index 9ce4b50caf..38770fbcbd 100644 --- a/packages/keyring-controller/tests/mocks/mockKeyring.ts +++ b/packages/keyring-controller/tests/mocks/mockKeyring.ts @@ -1,4 +1,4 @@ -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Json, Hex } from '@metamask/utils'; export class MockKeyring implements EthKeyring { diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index d6e374bac6..2aca1f5e65 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -117,6 +117,7 @@ "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/accounts-controller": "^20.0.0", "@metamask/auto-changelog": "^3.4.4", + "@metamask/keyring-internal-api": "^0.0.1", "@metamask/providers": "^18.1.1", "@metamask/snaps-controllers": "^9.10.0", "@types/jest": "^27.4.1", diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts index 70d65648a6..54b86b1ac7 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts @@ -1,5 +1,5 @@ import { ControllerMessenger } from '@metamask/base-controller'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type nock from 'nock'; import encryption, { createSHA256Hash } from '../../shared/encryption'; diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts index ee71b0dc2a..a587bdfa0a 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts @@ -11,7 +11,6 @@ import type { StateMetadata, } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; -import { type InternalAccount, isEvmAccountType } from '@metamask/keyring-api'; import { type KeyringControllerGetStateAction, type KeyringControllerLockEvent, @@ -19,6 +18,8 @@ import { type KeyringControllerAddNewAccountAction, KeyringTypes, } from '@metamask/keyring-controller'; +import { isEvmAccountType } from '@metamask/keyring-internal-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkConfiguration } from '@metamask/network-controller'; import type { HandleSnapRequest } from '@metamask/snaps-controllers'; diff --git a/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts b/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts index 5103853d44..8664fcd6cc 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts @@ -1,5 +1,6 @@ -import { EthAccountType, type InternalAccount } from '@metamask/keyring-api'; +import { EthAccountType } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { LOCALIZED_DEFAULT_ACCOUNT_NAMES } from '../accounts/constants'; import { mapInternalAccountToUserStorageAccount } from '../accounts/user-storage'; diff --git a/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts b/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts index c02ef96fad..374063a20f 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts @@ -1,4 +1,4 @@ -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { USER_STORAGE_VERSION_KEY, diff --git a/yarn.lock b/yarn.lock index 3a83064d1e..5f09a7cdd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2044,6 +2044,7 @@ __metadata: "@metamask/eth-snap-keyring": "npm:^5.0.1" "@metamask/keyring-api": "npm:^10.1.0" "@metamask/keyring-controller": "npm:^19.0.0" + "@metamask/keyring-internal-api": "npm:^0.0.1" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2161,13 +2162,12 @@ __metadata: "@metamask/controller-utils": "npm:^11.4.3" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" - "@metamask/keyring-api": "npm:^10.1.0" "@metamask/keyring-controller": "npm:^19.0.0" + "@metamask/keyring-internal-api": "npm:^0.0.1" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/network-controller": "npm:^22.0.2" "@metamask/polling-controller": "npm:^12.0.1" "@metamask/preferences-controller": "npm:^15.0.0" - "@metamask/providers": "npm:^18.1.1" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" @@ -2199,7 +2199,6 @@ __metadata: "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 "@metamask/preferences-controller": ^15.0.0 - "@metamask/providers": ^18.1.0 webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 languageName: unknown linkType: soft @@ -2298,7 +2297,8 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" "@metamask/chain-api": "npm:^0.1.0" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^0.0.1" + "@metamask/keyring-snap-sdk": "npm:^0.0.1" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2671,12 +2671,16 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^5.0.1": - version: 5.0.1 - resolution: "@metamask/eth-snap-keyring@npm:5.0.1" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-b85bfaa": + version: 6.0.0-b85bfaa + resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-b85bfaa" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" + "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-internal-api": "npm:0.0.1" + "@metamask/keyring-snap-client": "npm:0.0.1" + "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" @@ -2684,9 +2688,7 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" - peerDependencies: - "@metamask/keyring-api": ^10.1.0 - checksum: 10/4d9d700b7c2ecc1b17e92f716f7aeb04bbd03836601b5d37f639bed7fba4d5f00bafadf5359d2416c319cdf18eb2f9417c7353654737af87a6e8579d5e5bab79 + checksum: 10/3c4f4118db44dec6eac91d7c5790725f16917de6896285e0edce8b707ed50accbde6100d0a7292ab4f41e00ac18dfd399459c3edd6eaf701520001ff6e2dac8e languageName: node linkType: hard @@ -2954,20 +2956,16 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^10.1.0": - version: 10.1.0 - resolution: "@metamask/keyring-api@npm:10.1.0" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.0.0-b85bfaa": + version: 11.0.0-b85bfaa + resolution: "@metamask-previews/keyring-api@npm:11.0.0-b85bfaa" dependencies: - "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" - "@types/uuid": "npm:^9.0.8" bech32: "npm:^2.0.0" uuid: "npm:^9.0.1" - webextension-polyfill: "npm:^0.12.0" - peerDependencies: - "@metamask/providers": ^18.1.0 - checksum: 10/de22b9f5f3aecc290210fa78161e157aa8358f8dad421a093c9f6dbe35c4755067472a732f10d1ddbfba789e871c64edd8ea1c4c7316a392b214a187efd46ebe + checksum: 10/cb028f8fdf621c6fd05770b8fc3f64f8e2ef3935f082c2ab902d80a3b542bb0add8ef42d46c689245dd5956710c7eae4b609e0caf52bb00979271b0b8fcc2a19 languageName: node linkType: hard @@ -2989,6 +2987,7 @@ __metadata: "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/eth-simple-keyring": "npm:^6.0.5" "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^0.0.1" "@metamask/message-manager": "npm:^11.0.1" "@metamask/providers": "npm:^18.1.1" "@metamask/scure-bip39": "npm:^2.1.1" @@ -3013,6 +3012,72 @@ __metadata: languageName: unknown linkType: soft +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa": + version: 0.0.1-b85bfaa + resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-b85bfaa" + dependencies: + "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.2.1" + bech32: "npm:^2.0.0" + deepmerge: "npm:^4.2.2" + checksum: 10/5ad1e12569140d8205306857bdbc70d471c772095c0ce5f022e7de5902dad32787b51b5d29e91509e95b8c27df32912c697501f887b613060f871b406874732e + languageName: node + linkType: hard + +"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa": + version: 0.0.1-b85bfaa + resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-b85bfaa" + dependencies: + "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-internal-api": "npm:0.0.1" + "@metamask/keyring-snap-sdk": "npm:0.0.1" + "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/snaps-controllers": "npm:^9.10.0" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/snaps-utils": "npm:^8.3.0" + "@metamask/superstruct": "npm:^3.1.0" + "@types/uuid": "npm:^9.0.8" + deepmerge: "npm:^4.2.2" + uuid: "npm:^9.0.1" + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/edaa7b22dc9ae057cd83a5759177a77512bcc9067a28a1de35139dbcb7d10aea90db239df98fc749f9334a368bdcdc3a1bc0012e574ecb8cb718901a4d3afe3f + languageName: node + linkType: hard + +"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa": + version: 0.0.1-b85bfaa + resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-b85bfaa" + dependencies: + "@metamask/keyring-internal-api": "npm:0.0.1" + "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.2.1" + deepmerge: "npm:^4.2.2" + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/e1ad3cc228f8c3f22a361a91c2263c5d7b42857595454f03c1abe279e58df40b91cc01fc4a75e7acada00cf7fcb413008b532b6ce0c9e4280069d79e7d59cd41 + languageName: node + linkType: hard + +"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa": + version: 0.0.1-b85bfaa + resolution: "@metamask-previews/keyring-utils@npm:0.0.1-b85bfaa" + dependencies: + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.2.1" + "@types/uuid": "npm:^9.0.8" + deepmerge: "npm:^4.2.2" + uuid: "npm:^9.0.1" + checksum: 10/de099c80be0a9cea6c52d143ac298504f32c56db44e2bcf83777cd0127b01fd7bd36d8a12816fa6f1a8a6ea3580806b4e66969bebf3b275e8b2ab9e7fee35a57 + languageName: node + linkType: hard + "@metamask/logging-controller@npm:^6.0.2, @metamask/logging-controller@workspace:packages/logging-controller": version: 0.0.0-use.local resolution: "@metamask/logging-controller@workspace:packages/logging-controller" @@ -3378,6 +3443,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.2" "@metamask/keyring-api": "npm:^10.1.0" "@metamask/keyring-controller": "npm:^19.0.0" + "@metamask/keyring-internal-api": "npm:^0.0.1" "@metamask/network-controller": "npm:^22.0.2" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" From 276bda9065b54556528f7599a052ee03ec7fbc9a Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Fri, 29 Nov 2024 18:36:35 +0100 Subject: [PATCH 2/7] chore: use new preview builds --- package.json | 22 ++++---- .../src/AccountsController.test.ts | 8 ++- .../src/AccountsController.ts | 7 ++- .../accounts-controller/src/tests/mocks.ts | 8 ++- .../src/KeyringController.ts | 6 +-- .../user-storage/UserStorageController.ts | 2 +- yarn.lock | 51 ++++++++++--------- 7 files changed, 59 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index a6d814ecbe..4f8f0c6511 100644 --- a/package.json +++ b/package.json @@ -42,17 +42,17 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-b85bfaa", - "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.0.0-b85bfaa", - "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.0.0-b85bfaa", - "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa", - "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa", - "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa", - "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa", - "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa", - "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa", - "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa", - "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa", + "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-b250745", + "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.0.0-b250745", + "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.0.0-b250745", + "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b250745", + "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b250745", + "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b250745", + "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b250745", + "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745", + "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745", + "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b250745", + "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b250745", "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.test.ts b/packages/accounts-controller/src/AccountsController.test.ts index 94a00e1ae4..e082ea1c38 100644 --- a/packages/accounts-controller/src/AccountsController.test.ts +++ b/packages/accounts-controller/src/AccountsController.test.ts @@ -1,7 +1,11 @@ import { ControllerMessenger } from '@metamask/base-controller'; -import { BtcAccountType, EthAccountType } from '@metamask/keyring-api'; +import { + BtcAccountType, + EthAccountType, + BtcMethod, + EthMethod, +} from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; -import { BtcMethod, EthMethod } from '@metamask/keyring-internal-api'; import type { InternalAccount, InternalAccountType, diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index fc2934373f..234d454472 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -5,7 +5,11 @@ import type { } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import { SnapKeyring } from '@metamask/eth-snap-keyring'; -import { EthAccountType } from '@metamask/keyring-api'; +import { + EthAccountType, + EthMethod, + isEvmAccountType, +} from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { KeyringControllerState, @@ -14,7 +18,6 @@ import type { KeyringControllerGetAccountsAction, KeyringControllerStateChangeEvent, } from '@metamask/keyring-controller'; -import { EthMethod, isEvmAccountType } from '@metamask/keyring-internal-api'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapControllerState, diff --git a/packages/accounts-controller/src/tests/mocks.ts b/packages/accounts-controller/src/tests/mocks.ts index 98325129e9..c5224ab0be 100644 --- a/packages/accounts-controller/src/tests/mocks.ts +++ b/packages/accounts-controller/src/tests/mocks.ts @@ -1,10 +1,14 @@ -import { BtcAccountType, EthAccountType } from '@metamask/keyring-api'; +import { + BtcAccountType, + EthAccountType, + BtcMethod, + EthMethod, +} from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { InternalAccount, InternalAccountType, } from '@metamask/keyring-internal-api'; -import { BtcMethod, EthMethod } from '@metamask/keyring-internal-api'; import { v4 } from 'uuid'; export const createMockInternalAccount = ({ diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index e2e0d46c22..06ed76bca3 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -10,14 +10,14 @@ import * as encryptorUtils from '@metamask/browser-passworder'; import HDKeyring from '@metamask/eth-hd-keyring'; import { normalize as ethNormalize } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring'; -import type { KeyringExecutionContext } from '@metamask/keyring-api'; import type { + KeyringExecutionContext, EthBaseTransaction, EthBaseUserOperation, - EthKeyring, EthUserOperation, EthUserOperationPatch, -} from '@metamask/keyring-internal-api'; +} from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { PersonalMessageParams, TypedMessageParams, diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts index a587bdfa0a..05ac0c7610 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts @@ -11,6 +11,7 @@ import type { StateMetadata, } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; +import { isEvmAccountType } from '@metamask/keyring-api'; import { type KeyringControllerGetStateAction, type KeyringControllerLockEvent, @@ -18,7 +19,6 @@ import { type KeyringControllerAddNewAccountAction, KeyringTypes, } from '@metamask/keyring-controller'; -import { isEvmAccountType } from '@metamask/keyring-internal-api'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkConfiguration } from '@metamask/network-controller'; import type { HandleSnapRequest } from '@metamask/snaps-controllers'; diff --git a/yarn.lock b/yarn.lock index 5f09a7cdd3..0ae4c48f72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2671,9 +2671,9 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-b85bfaa": - version: 6.0.0-b85bfaa - resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-b85bfaa" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-b250745": + version: 6.0.0-b250745 + resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-b250745" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" @@ -2688,7 +2688,10 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" - checksum: 10/3c4f4118db44dec6eac91d7c5790725f16917de6896285e0edce8b707ed50accbde6100d0a7292ab4f41e00ac18dfd399459c3edd6eaf701520001ff6e2dac8e + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/35d9cb8065248345d9282bdbaa80edc1b916d3ba36583b20592c75636d991d8aa72d2daa8eb7be61de8b7d06dba6659d85f7d4267d953d175c9bd55636fd5d3c languageName: node linkType: hard @@ -2956,16 +2959,16 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.0.0-b85bfaa": - version: 11.0.0-b85bfaa - resolution: "@metamask-previews/keyring-api@npm:11.0.0-b85bfaa" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.0.0-b250745": + version: 11.0.0-b250745 + resolution: "@metamask-previews/keyring-api@npm:11.0.0-b250745" dependencies: "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" bech32: "npm:^2.0.0" uuid: "npm:^9.0.1" - checksum: 10/cb028f8fdf621c6fd05770b8fc3f64f8e2ef3935f082c2ab902d80a3b542bb0add8ef42d46c689245dd5956710c7eae4b609e0caf52bb00979271b0b8fcc2a19 + checksum: 10/cffd4cadd534d8a220055321e5656480700a69e8185c96c3b3f0436ed7d1197acce1d2a5d1e12108db475321b1483aa3378f5897dcae4de4650a6370c52c6261 languageName: node linkType: hard @@ -3012,9 +3015,9 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-b85bfaa": - version: 0.0.1-b85bfaa - resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-b85bfaa" +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-b250745": + version: 0.0.1-b250745 + resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-b250745" dependencies: "@metamask/keyring-api": "npm:11.0.0" "@metamask/keyring-utils": "npm:0.0.1" @@ -3022,13 +3025,13 @@ __metadata: "@metamask/utils": "npm:^9.2.1" bech32: "npm:^2.0.0" deepmerge: "npm:^4.2.2" - checksum: 10/5ad1e12569140d8205306857bdbc70d471c772095c0ce5f022e7de5902dad32787b51b5d29e91509e95b8c27df32912c697501f887b613060f871b406874732e + checksum: 10/47cb871ca6dc2a41675372d88c05b857eb6fdc9f5e5b1cd5e2772c08b2fb544fa600542a543ef8104d895eee3d61174cba8421dc575979234b25dfcf58c3ed92 languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-b85bfaa": - version: 0.0.1-b85bfaa - resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-b85bfaa" +"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-b250745": + version: 0.0.1-b250745 + resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-b250745" dependencies: "@metamask/keyring-api": "npm:11.0.0" "@metamask/keyring-internal-api": "npm:0.0.1" @@ -3044,13 +3047,13 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/edaa7b22dc9ae057cd83a5759177a77512bcc9067a28a1de35139dbcb7d10aea90db239df98fc749f9334a368bdcdc3a1bc0012e574ecb8cb718901a4d3afe3f + checksum: 10/1362bff4d6e02ad4454b8239dce67b19657ab0ce56712ff1760ec5d83491c1068a60e208e7d0ff283a8d3a0b6a44a94701e3b0683540ecaf861a8355db922bda languageName: node linkType: hard -"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-b85bfaa": - version: 0.0.1-b85bfaa - resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-b85bfaa" +"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745": + version: 0.0.1-b250745 + resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-b250745" dependencies: "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" @@ -3061,20 +3064,20 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/e1ad3cc228f8c3f22a361a91c2263c5d7b42857595454f03c1abe279e58df40b91cc01fc4a75e7acada00cf7fcb413008b532b6ce0c9e4280069d79e7d59cd41 + checksum: 10/8f26bd9547a2ce92539f99e5778ceb3ac3b3e310cfb03a925cd997ba923fbbd3c9247052af1b1109d72ec169d00fd9fcc66202e1a2a8a65f69aec9845192abbc languageName: node linkType: hard -"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-b85bfaa": - version: 0.0.1-b85bfaa - resolution: "@metamask-previews/keyring-utils@npm:0.0.1-b85bfaa" +"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-b250745": + version: 0.0.1-b250745 + resolution: "@metamask-previews/keyring-utils@npm:0.0.1-b250745" dependencies: "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" "@types/uuid": "npm:^9.0.8" deepmerge: "npm:^4.2.2" uuid: "npm:^9.0.1" - checksum: 10/de099c80be0a9cea6c52d143ac298504f32c56db44e2bcf83777cd0127b01fd7bd36d8a12816fa6f1a8a6ea3580806b4e66969bebf3b275e8b2ab9e7fee35a57 + checksum: 10/c1548424839670124b9f27580f62ee0ed1170c730c043d0e09843efa432ec8bfc2f71f1ada69a3104d636a6bace4028309cf850c403afdaadf053c314ff7c59e languageName: node linkType: hard From 5ba3d123d66f6b5aa9df87f947c5f57be72b7a29 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Mon, 2 Dec 2024 18:02:04 +0100 Subject: [PATCH 3/7] chore: use new preview builds --- package.json | 22 +++++------ yarn.lock | 106 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 77 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 4f8f0c6511..8a70067159 100644 --- a/package.json +++ b/package.json @@ -42,17 +42,17 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-b250745", - "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.0.0-b250745", - "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.0.0-b250745", - "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b250745", - "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-b250745", - "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b250745", - "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-b250745", - "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745", - "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745", - "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b250745", - "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-b250745", + "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-72196d6", + "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-72196d6", + "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-72196d6", + "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6", + "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6", + "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6", + "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6", + "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6", + "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6", + "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-72196d6", + "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-72196d6", "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/yarn.lock b/yarn.lock index 0ae4c48f72..0c54f96bef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2671,13 +2671,13 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-b250745": - version: 6.0.0-b250745 - resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-b250745" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-72196d6": + version: 6.0.0-72196d6 + resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-72196d6" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" - "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-snap-client": "npm:0.0.1" "@metamask/keyring-snap-sdk": "npm:0.0.1" @@ -2685,13 +2685,13 @@ __metadata: "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^9.3.0" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/35d9cb8065248345d9282bdbaa80edc1b916d3ba36583b20592c75636d991d8aa72d2daa8eb7be61de8b7d06dba6659d85f7d4267d953d175c9bd55636fd5d3c + checksum: 10/72480bb93fe8a508201de90f4a50a11bad50b813befa54a237c20b008cfa6784fb060dd96e8fde4a1662a671c0b9ec608179630eb66b4fb6d1193535c4200570 languageName: node linkType: hard @@ -2959,16 +2959,32 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.0.0-b250745": - version: 11.0.0-b250745 - resolution: "@metamask-previews/keyring-api@npm:11.0.0-b250745" +"@metamask/keyring-api@npm:11.1.0": + version: 11.1.0 + resolution: "@metamask/keyring-api@npm:11.1.0" dependencies: - "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^9.3.0" + "@types/uuid": "npm:^9.0.8" bech32: "npm:^2.0.0" uuid: "npm:^9.0.1" - checksum: 10/cffd4cadd534d8a220055321e5656480700a69e8185c96c3b3f0436ed7d1197acce1d2a5d1e12108db475321b1483aa3378f5897dcae4de4650a6370c52c6261 + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/29a2cf68a9b38a427ab89bf8880864c06aae0b3587c53a55ff6bb2eaf9d27ec703bf2143916914844dd9497d221d092d12cb32cf101b41535d6859aa4aaa6bcb + languageName: node + linkType: hard + +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-72196d6": + version: 11.1.0-72196d6 + resolution: "@metamask-previews/keyring-api@npm:11.1.0-72196d6" + dependencies: + "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.3.0" + bech32: "npm:^2.0.0" + checksum: 10/f80bab5d4a3c982afc374a2b828ea35f0733f9af87c2fb1e36132fbc3a11032e2a5da71eb9f620d08de2f7a8afc983de95464a39b96dab0d683f9fe41bab7a96 languageName: node linkType: hard @@ -3015,25 +3031,23 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-b250745": - version: 0.0.1-b250745 - resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-b250745" +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6": + version: 0.0.1-72196d6 + resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-72196d6" dependencies: - "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" - bech32: "npm:^2.0.0" - deepmerge: "npm:^4.2.2" - checksum: 10/47cb871ca6dc2a41675372d88c05b857eb6fdc9f5e5b1cd5e2772c08b2fb544fa600542a543ef8104d895eee3d61174cba8421dc575979234b25dfcf58c3ed92 + "@metamask/utils": "npm:^9.3.0" + checksum: 10/54035b313cb95fd785c558c64120ab94f2a9c143560fbfeb3a0df7686019d63c3d9de94fad852c00e0efe476bdbfcdf651a93d40a31699fdebe78ff1ab709afb languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-b250745": - version: 0.0.1-b250745 - resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-b250745" +"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6": + version: 0.0.1-72196d6 + resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-72196d6" dependencies: - "@metamask/keyring-api": "npm:11.0.0" + "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" @@ -3042,42 +3056,37 @@ __metadata: "@metamask/snaps-utils": "npm:^8.3.0" "@metamask/superstruct": "npm:^3.1.0" "@types/uuid": "npm:^9.0.8" - deepmerge: "npm:^4.2.2" uuid: "npm:^9.0.1" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/1362bff4d6e02ad4454b8239dce67b19657ab0ce56712ff1760ec5d83491c1068a60e208e7d0ff283a8d3a0b6a44a94701e3b0683540ecaf861a8355db922bda + checksum: 10/f32a863d4b803089ff0dc0fe793d9447271f4c54e1b1e78136b11b31b64e7fc8345ecec7782a358e41204b1006df9d88979e5d826d5f1aa4dbde9a148f2bab6b languageName: node linkType: hard -"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-b250745": - version: 0.0.1-b250745 - resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-b250745" +"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6": + version: 0.0.1-72196d6 + resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-72196d6" dependencies: "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" - deepmerge: "npm:^4.2.2" + "@metamask/utils": "npm:^9.3.0" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/8f26bd9547a2ce92539f99e5778ceb3ac3b3e310cfb03a925cd997ba923fbbd3c9247052af1b1109d72ec169d00fd9fcc66202e1a2a8a65f69aec9845192abbc + checksum: 10/1e53a4c87bd2584ba4f5365aa8c35e3b51ecd42c487849c1d5e4e731917e4463a008e018bf27b1020a755ff62b20ac83dd7fb280343534ddaf7fbe8b7818bec9 languageName: node linkType: hard -"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-b250745": - version: 0.0.1-b250745 - resolution: "@metamask-previews/keyring-utils@npm:0.0.1-b250745" +"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-72196d6": + version: 0.0.1-72196d6 + resolution: "@metamask-previews/keyring-utils@npm:0.0.1-72196d6" dependencies: "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" - "@types/uuid": "npm:^9.0.8" - deepmerge: "npm:^4.2.2" - uuid: "npm:^9.0.1" - checksum: 10/c1548424839670124b9f27580f62ee0ed1170c730c043d0e09843efa432ec8bfc2f71f1ada69a3104d636a6bace4028309cf850c403afdaadf053c314ff7c59e + "@metamask/utils": "npm:^9.3.0" + checksum: 10/7d2456559ac020bfde0acbe628278c9f29df020f8fde091316d9abfd427f22088772cfe4fdf9c506771c8c698c20705bef442b72b28c30bf59540fba5919840f languageName: node linkType: hard @@ -3918,6 +3927,23 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^9.3.0": + version: 9.3.0 + resolution: "@metamask/utils@npm:9.3.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + debug: "npm:^4.3.4" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/ed6648cd973bbf3b4eb0e862903b795a99d27784c820e19f62f0bc0ddf353e98c2858d7e9aaebc0249a586391b344e35b9249d13c08e3ea0c74b23dc1c6b1558 + languageName: node + linkType: hard + "@ngraveio/bc-ur@npm:^1.1.5": version: 1.1.13 resolution: "@ngraveio/bc-ur@npm:1.1.13" From 23fc04cd0b0426bded4682b5cef709c97b853459 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 5 Dec 2024 12:33:45 +0100 Subject: [PATCH 4/7] chore: update resolutions --- package.json | 24 +++++++++--------- yarn.lock | 69 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index bf625ebe69..e9d17241f2 100644 --- a/package.json +++ b/package.json @@ -42,17 +42,19 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-72196d6", - "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-72196d6", - "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-72196d6", - "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6", - "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6", - "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6", - "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6", - "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6", - "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6", - "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-72196d6", - "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-72196d6", + "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-5143ee2", + "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-5143ee2", + "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-5143ee2", + "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2", + "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2", + "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2", + "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2", + "@metamask/keyring-snap-internal-client@^0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2", + "@metamask/keyring-snap-internal-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2", + "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2", + "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2", + "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-5143ee2", + "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-5143ee2", "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/yarn.lock b/yarn.lock index 82ccd07508..a8dcb809a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2671,15 +2671,15 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-72196d6": - version: 6.0.0-72196d6 - resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-72196d6" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-5143ee2": + version: 6.0.0-5143ee2 + resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-5143ee2" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-internal-api": "npm:0.0.1" - "@metamask/keyring-snap-client": "npm:0.0.1" + "@metamask/keyring-snap-internal-client": "npm:0.0.1" "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2691,7 +2691,7 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/72480bb93fe8a508201de90f4a50a11bad50b813befa54a237c20b008cfa6784fb060dd96e8fde4a1662a671c0b9ec608179630eb66b4fb6d1193535c4200570 + checksum: 10/2a47eba15bdefa5160f1480113ba18e91d36397a4244930291ee85e2dee4d76033f24c5a5c96eb318948f72012ab382146afa197c5dfde377b4b88c120045f7a languageName: node linkType: hard @@ -2976,15 +2976,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-72196d6": - version: 11.1.0-72196d6 - resolution: "@metamask-previews/keyring-api@npm:11.1.0-72196d6" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-5143ee2": + version: 11.1.0-5143ee2 + resolution: "@metamask-previews/keyring-api@npm:11.1.0-5143ee2" dependencies: "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" bech32: "npm:^2.0.0" - checksum: 10/f80bab5d4a3c982afc374a2b828ea35f0733f9af87c2fb1e36132fbc3a11032e2a5da71eb9f620d08de2f7a8afc983de95464a39b96dab0d683f9fe41bab7a96 + checksum: 10/35fab8ea04c5ddf40855aa857e0c7da0c0faec498546c5fb96142c97c92db1e591cb470a0c12f73caf96acb7542df88c39355ab72d13a1c1736cd7aa75258c70 languageName: node linkType: hard @@ -3031,24 +3031,41 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-72196d6": - version: 0.0.1-72196d6 - resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-72196d6" +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2": + version: 0.0.1-5143ee2 + resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-5143ee2" dependencies: "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/54035b313cb95fd785c558c64120ab94f2a9c143560fbfeb3a0df7686019d63c3d9de94fad852c00e0efe476bdbfcdf651a93d40a31699fdebe78ff1ab709afb + checksum: 10/008149af56270166ba41ea39695c20e53f9eb42e0a69639353edc7aac4443d3c3056cabd4c99909498d9031a5aadd77808b461f55c7e63facb73ff7a528a2e13 languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-72196d6": - version: 0.0.1-72196d6 - resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-72196d6" +"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2": + version: 0.0.1-5143ee2 + resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-5143ee2" dependencies: "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-internal-api": "npm:0.0.1" + "@metamask/keyring-snap-sdk": "npm:0.0.1" + "@metamask/keyring-utils": "npm:0.0.1" + "@metamask/superstruct": "npm:^3.1.0" + "@types/uuid": "npm:^9.0.8" + uuid: "npm:^9.0.1" + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/082892d84b77f2befad959f7003672c7d9e7983a0cce0af6c2b8af53e13f4f684b2e193ba7beeaecffa8773739dd243c4d67753005e068d9f0805e271f2604dc + languageName: node + linkType: hard + +"@metamask/keyring-snap-internal-client@npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2": + version: 0.0.1-5143ee2 + resolution: "@metamask-previews/keyring-snap-internal-client@npm:0.0.1-5143ee2" + dependencies: + "@metamask/keyring-api": "npm:11.1.0" + "@metamask/keyring-snap-client": "npm:0.0.1" "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/snaps-controllers": "npm:^9.10.0" @@ -3060,13 +3077,13 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/f32a863d4b803089ff0dc0fe793d9447271f4c54e1b1e78136b11b31b64e7fc8345ecec7782a358e41204b1006df9d88979e5d826d5f1aa4dbde9a148f2bab6b + checksum: 10/155493dac189d78d3294037d4ffbda0ae6ec2460b4e5d27c57b1802fe436c0144452effc71cde64c99d3ffbbad0355f3c987dc36b9d55a33ba0d3f175c43edfe languageName: node linkType: hard -"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-72196d6": - version: 0.0.1-72196d6 - resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-72196d6" +"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2": + version: 0.0.1-5143ee2 + resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-5143ee2" dependencies: "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" @@ -3076,17 +3093,17 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/1e53a4c87bd2584ba4f5365aa8c35e3b51ecd42c487849c1d5e4e731917e4463a008e018bf27b1020a755ff62b20ac83dd7fb280343534ddaf7fbe8b7818bec9 + checksum: 10/e1ecf4270961192f5ab3bc0aad035e5c792d2a3dcbed03da88d45e1f7f270c69243598640e25360005c1dc1b71655d5e1da8aa28278fda7988210f657f36891b languageName: node linkType: hard -"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-72196d6": - version: 0.0.1-72196d6 - resolution: "@metamask-previews/keyring-utils@npm:0.0.1-72196d6" +"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-5143ee2": + version: 0.0.1-5143ee2 + resolution: "@metamask-previews/keyring-utils@npm:0.0.1-5143ee2" dependencies: "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/7d2456559ac020bfde0acbe628278c9f29df020f8fde091316d9abfd427f22088772cfe4fdf9c506771c8c698c20705bef442b72b28c30bf59540fba5919840f + checksum: 10/e169f1071d09306e821c982c121873e81fc5bfa618b75071e156bf1cab1069ebb29944fa0b7ca2b15dee72bccde59b8ff4211f48b4e574212afd1bdfb0d28eef languageName: node linkType: hard From 9c296dcb765a3c878b2f8dbc1919ceabc5116ce5 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 5 Dec 2024 20:46:38 +0100 Subject: [PATCH 5/7] chore: update resolutions --- package.json | 26 +++---- packages/chain-controller/package.json | 2 +- .../chain-controller/src/SnapHandlerClient.ts | 2 +- yarn.lock | 70 +++++++------------ 4 files changed, 40 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index e9d17241f2..32563c6224 100644 --- a/package.json +++ b/package.json @@ -42,19 +42,19 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-5143ee2", - "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-5143ee2", - "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-5143ee2", - "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2", - "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2", - "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2", - "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2", - "@metamask/keyring-snap-internal-client@^0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2", - "@metamask/keyring-snap-internal-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2", - "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2", - "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2", - "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-5143ee2", - "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-5143ee2", + "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-f78dac4", + "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-f78dac4", + "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-f78dac4", + "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4", + "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4", + "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4", + "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4", + "@metamask/keyring-snap-internal-client@^0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4", + "@metamask/keyring-snap-internal-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4", + "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-f78dac4", + "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-f78dac4", + "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-f78dac4", + "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-f78dac4", "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/chain-controller/package.json b/packages/chain-controller/package.json index b4a4460f96..1fc82bf44f 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -50,7 +50,7 @@ "@metamask/base-controller": "^7.0.2", "@metamask/chain-api": "^0.1.0", "@metamask/keyring-internal-api": "^0.0.1", - "@metamask/keyring-snap-sdk": "^0.0.1", + "@metamask/keyring-utils": "^0.0.1", "@metamask/snaps-controllers": "^9.10.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", diff --git a/packages/chain-controller/src/SnapHandlerClient.ts b/packages/chain-controller/src/SnapHandlerClient.ts index 37e31161a1..d89d529a69 100644 --- a/packages/chain-controller/src/SnapHandlerClient.ts +++ b/packages/chain-controller/src/SnapHandlerClient.ts @@ -1,4 +1,4 @@ -import type { JsonRpcRequest } from '@metamask/keyring-snap-sdk'; +import type { JsonRpcRequest } from '@metamask/keyring-utils'; import type { SnapController } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import { HandlerType } from '@metamask/snaps-utils'; diff --git a/yarn.lock b/yarn.lock index a8dcb809a0..8fc50f7046 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2298,7 +2298,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.2" "@metamask/chain-api": "npm:^0.1.0" "@metamask/keyring-internal-api": "npm:^0.0.1" - "@metamask/keyring-snap-sdk": "npm:^0.0.1" + "@metamask/keyring-utils": "npm:^0.0.1" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2671,16 +2671,15 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-5143ee2": - version: 6.0.0-5143ee2 - resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-5143ee2" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-f78dac4": + version: 6.0.0-f78dac4 + resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-f78dac4" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-internal-api": "npm:0.0.1" "@metamask/keyring-snap-internal-client": "npm:0.0.1" - "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" @@ -2688,10 +2687,9 @@ __metadata: "@metamask/utils": "npm:^9.3.0" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" - webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/2a47eba15bdefa5160f1480113ba18e91d36397a4244930291ee85e2dee4d76033f24c5a5c96eb318948f72012ab382146afa197c5dfde377b4b88c120045f7a + checksum: 10/8f5189057376c583d592dde2f45f8d798d962d0a455bba8fb517ea7b57ccd411cacf13eccadd40acfaa6291be584ad2405e8d9c661a2464ac42612f1975d4387 languageName: node linkType: hard @@ -2976,15 +2974,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-5143ee2": - version: 11.1.0-5143ee2 - resolution: "@metamask-previews/keyring-api@npm:11.1.0-5143ee2" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-f78dac4": + version: 11.1.0-f78dac4 + resolution: "@metamask-previews/keyring-api@npm:11.1.0-f78dac4" dependencies: "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" bech32: "npm:^2.0.0" - checksum: 10/35fab8ea04c5ddf40855aa857e0c7da0c0faec498546c5fb96142c97c92db1e591cb470a0c12f73caf96acb7542df88c39355ab72d13a1c1736cd7aa75258c70 + checksum: 10/a7b11d764fc8fc6dcfd51845f4203e82503f8fe4218f454db1fef1a92ca638cd379c685b5760b853ca595c568cc906c8daa97eb1dcdffd3f4c4449acfbb31d31 languageName: node linkType: hard @@ -3031,24 +3029,23 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-5143ee2": - version: 0.0.1-5143ee2 - resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-5143ee2" +"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4": + version: 0.0.1-f78dac4 + resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-f78dac4" dependencies: "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/008149af56270166ba41ea39695c20e53f9eb42e0a69639353edc7aac4443d3c3056cabd4c99909498d9031a5aadd77808b461f55c7e63facb73ff7a528a2e13 + checksum: 10/d071f4203a1c1778e19deacb1affcc8dbdc8ad2daf4e3ede674a70b62a1ec8fef818ea1573dc9f4507c3d69a3194027fa461bdc92d506ec85c587fd3c3ad4177 languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-5143ee2": - version: 0.0.1-5143ee2 - resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-5143ee2" +"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4": + version: 0.0.1-f78dac4 + resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-f78dac4" dependencies: "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/superstruct": "npm:^3.1.0" "@types/uuid": "npm:^9.0.8" @@ -3056,17 +3053,16 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/082892d84b77f2befad959f7003672c7d9e7983a0cce0af6c2b8af53e13f4f684b2e193ba7beeaecffa8773739dd243c4d67753005e068d9f0805e271f2604dc + checksum: 10/e0579484ff2ff7c02df61b8bff668033b0cd193b20ef9dd8c7a8f4c4dcb10b89648db63b4e0bff702bc8456642cac69bc7b028bc60a21dbd9974ba8106a7db8e languageName: node linkType: hard -"@metamask/keyring-snap-internal-client@npm:@metamask-previews/keyring-snap-internal-client@0.0.1-5143ee2": - version: 0.0.1-5143ee2 - resolution: "@metamask-previews/keyring-snap-internal-client@npm:0.0.1-5143ee2" +"@metamask/keyring-snap-internal-client@npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4": + version: 0.0.1-f78dac4 + resolution: "@metamask-previews/keyring-snap-internal-client@npm:0.0.1-f78dac4" dependencies: "@metamask/keyring-api": "npm:11.1.0" "@metamask/keyring-snap-client": "npm:0.0.1" - "@metamask/keyring-snap-sdk": "npm:0.0.1" "@metamask/keyring-utils": "npm:0.0.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -3077,33 +3073,17 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/155493dac189d78d3294037d4ffbda0ae6ec2460b4e5d27c57b1802fe436c0144452effc71cde64c99d3ffbbad0355f3c987dc36b9d55a33ba0d3f175c43edfe - languageName: node - linkType: hard - -"@metamask/keyring-snap-sdk@npm:@metamask-previews/keyring-snap-sdk@0.0.1-5143ee2": - version: 0.0.1-5143ee2 - resolution: "@metamask-previews/keyring-snap-sdk@npm:0.0.1-5143ee2" - dependencies: - "@metamask/keyring-internal-api": "npm:0.0.1" - "@metamask/keyring-utils": "npm:0.0.1" - "@metamask/snaps-sdk": "npm:^6.7.0" - "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.3.0" - webextension-polyfill: "npm:^0.12.0" - peerDependencies: - "@metamask/providers": ^18.1.0 - checksum: 10/e1ecf4270961192f5ab3bc0aad035e5c792d2a3dcbed03da88d45e1f7f270c69243598640e25360005c1dc1b71655d5e1da8aa28278fda7988210f657f36891b + checksum: 10/8e6ca76e450746b6b40346ff7213409bd631d45ac7bd5a230678af30660f935f4862fe48d2a472f77b7bd7f1bf9da563d2a68da5afa6958f0eab88a08e621d67 languageName: node linkType: hard -"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-5143ee2": - version: 0.0.1-5143ee2 - resolution: "@metamask-previews/keyring-utils@npm:0.0.1-5143ee2" +"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-f78dac4": + version: 0.0.1-f78dac4 + resolution: "@metamask-previews/keyring-utils@npm:0.0.1-f78dac4" dependencies: "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/e169f1071d09306e821c982c121873e81fc5bfa618b75071e156bf1cab1069ebb29944fa0b7ca2b15dee72bccde59b8ff4211f48b4e574212afd1bdfb0d28eef + checksum: 10/b5227621f6d63e5e52f50831994e12755341333712eae98bad686890923be8fdf3044cddf2c3e5f0550fd42c60745d0bcebfa0e6479d60c5f7fadaba34fda315 languageName: node linkType: hard From cd7a16a8a6f8a6f57e1a6b8a47ae1afa0ed7cba9 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Tue, 10 Dec 2024 17:00:52 +0100 Subject: [PATCH 6/7] chore: use official packages + remove resolutions --- package.json | 13 -- packages/accounts-controller/package.json | 6 +- packages/assets-controllers/package.json | 2 +- packages/chain-controller/package.json | 4 +- packages/keyring-controller/package.json | 4 +- packages/profile-sync-controller/package.json | 4 +- yarn.lock | 118 ++++++++---------- 7 files changed, 60 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index 32563c6224..aef015b61a 100644 --- a/package.json +++ b/package.json @@ -42,19 +42,6 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/eth-snap-keyring@npm:^5.0.1": "npm:@metamask-previews/eth-snap-keyring@6.0.0-f78dac4", - "@metamask/keyring-api@npm:11.0.0": "npm:@metamask-previews/keyring-api@11.1.0-f78dac4", - "@metamask/keyring-api@npm:^10.1.0": "npm:@metamask-previews/keyring-api@11.1.0-f78dac4", - "@metamask/keyring-internal-api@^0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4", - "@metamask/keyring-internal-api@npm:0.0.1": "npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4", - "@metamask/keyring-snap-client@^0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4", - "@metamask/keyring-snap-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4", - "@metamask/keyring-snap-internal-client@^0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4", - "@metamask/keyring-snap-internal-client@npm:0.0.1": "npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4", - "@metamask/keyring-snap-sdk@^0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-f78dac4", - "@metamask/keyring-snap-sdk@npm:0.0.1": "npm:@metamask-previews/keyring-snap-sdk@0.0.1-f78dac4", - "@metamask/keyring-utils@^0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-f78dac4", - "@metamask/keyring-utils@npm:0.0.1": "npm:@metamask-previews/keyring-utils@0.0.1-f78dac4", "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/package.json b/packages/accounts-controller/package.json index a0d69c17f9..6f224b7150 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -49,9 +49,9 @@ "dependencies": { "@ethereumjs/util": "^8.1.0", "@metamask/base-controller": "^7.0.2", - "@metamask/eth-snap-keyring": "^5.0.1", - "@metamask/keyring-api": "^10.1.0", - "@metamask/keyring-internal-api": "^0.0.1", + "@metamask/eth-snap-keyring": "^7.0.0", + "@metamask/keyring-api": "^12.0.0", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", "@metamask/utils": "^10.0.0", diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 797b2d4b47..64431dddf8 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -80,7 +80,7 @@ "@metamask/auto-changelog": "^3.4.4", "@metamask/ethjs-provider-http": "^0.3.0", "@metamask/keyring-controller": "^19.0.1", - "@metamask/keyring-internal-api": "^0.0.1", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/network-controller": "^22.1.0", "@metamask/preferences-controller": "^15.0.1", "@types/jest": "^27.4.1", diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index 1fc82bf44f..3e238e9aa0 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -49,8 +49,8 @@ "dependencies": { "@metamask/base-controller": "^7.0.2", "@metamask/chain-api": "^0.1.0", - "@metamask/keyring-internal-api": "^0.0.1", - "@metamask/keyring-utils": "^0.0.1", + "@metamask/keyring-internal-api": "^1.0.0", + "@metamask/keyring-utils": "^1.0.0", "@metamask/snaps-controllers": "^9.10.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 3064fd325a..f4fa313296 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -54,8 +54,8 @@ "@metamask/eth-hd-keyring": "^7.0.4", "@metamask/eth-sig-util": "^8.0.0", "@metamask/eth-simple-keyring": "^6.0.5", - "@metamask/keyring-api": "^10.1.0", - "@metamask/keyring-internal-api": "^0.0.1", + "@metamask/keyring-api": "^12.0.0", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/message-manager": "^11.0.2", "@metamask/utils": "^10.0.0", "async-mutex": "^0.5.0", diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index e118fc67a2..0377ccb706 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -101,7 +101,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.2", - "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-api": "^12.0.0", "@metamask/keyring-controller": "^19.0.1", "@metamask/network-controller": "^22.1.0", "@metamask/snaps-sdk": "^6.7.0", @@ -117,7 +117,7 @@ "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/accounts-controller": "^20.0.1", "@metamask/auto-changelog": "^3.4.4", - "@metamask/keyring-internal-api": "^0.0.1", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/providers": "^18.1.1", "@metamask/snaps-controllers": "^9.10.0", "@types/jest": "^27.4.1", diff --git a/yarn.lock b/yarn.lock index 8fc50f7046..e4461cdfeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2041,10 +2041,10 @@ __metadata: "@ethereumjs/util": "npm:^8.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/eth-snap-keyring": "npm:^5.0.1" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/eth-snap-keyring": "npm:^7.0.0" + "@metamask/keyring-api": "npm:^12.0.0" "@metamask/keyring-controller": "npm:^19.0.1" - "@metamask/keyring-internal-api": "npm:^0.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2163,7 +2163,7 @@ __metadata: "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" "@metamask/keyring-controller": "npm:^19.0.1" - "@metamask/keyring-internal-api": "npm:^0.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/network-controller": "npm:^22.1.0" "@metamask/polling-controller": "npm:^12.0.2" @@ -2297,8 +2297,8 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" "@metamask/chain-api": "npm:^0.1.0" - "@metamask/keyring-internal-api": "npm:^0.0.1" - "@metamask/keyring-utils": "npm:^0.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2671,15 +2671,15 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@6.0.0-f78dac4": - version: 6.0.0-f78dac4 - resolution: "@metamask-previews/eth-snap-keyring@npm:6.0.0-f78dac4" +"@metamask/eth-snap-keyring@npm:^7.0.0": + version: 7.0.0 + resolution: "@metamask/eth-snap-keyring@npm:7.0.0" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" - "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-internal-api": "npm:0.0.1" - "@metamask/keyring-snap-internal-client": "npm:0.0.1" + "@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/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" @@ -2687,9 +2687,11 @@ __metadata: "@metamask/utils": "npm:^9.3.0" "@types/uuid": "npm:^9.0.8" 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/8f5189057376c583d592dde2f45f8d798d962d0a455bba8fb517ea7b57ccd411cacf13eccadd40acfaa6291be584ad2405e8d9c661a2464ac42612f1975d4387 + checksum: 10/7a82cd2c19204776d31e29716844ac6f304ce4b136b36728be8e7b19ac2be6b46d0c72cc9707c48669a7a342994ce401aafbfe3f0b47769748ab86ae2169cbbd languageName: node linkType: hard @@ -2957,32 +2959,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:11.1.0": - version: 11.1.0 - resolution: "@metamask/keyring-api@npm:11.1.0" +"@metamask/keyring-api@npm:^12.0.0": + version: 12.0.0 + resolution: "@metamask/keyring-api@npm:12.0.0" dependencies: - "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/keyring-utils": "npm:^1.0.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - "@types/uuid": "npm:^9.0.8" bech32: "npm:^2.0.0" - uuid: "npm:^9.0.1" - webextension-polyfill: "npm:^0.12.0" - peerDependencies: - "@metamask/providers": ^18.1.0 - checksum: 10/29a2cf68a9b38a427ab89bf8880864c06aae0b3587c53a55ff6bb2eaf9d27ec703bf2143916914844dd9497d221d092d12cb32cf101b41535d6859aa4aaa6bcb - languageName: node - linkType: hard - -"@metamask/keyring-api@npm:@metamask-previews/keyring-api@11.1.0-f78dac4": - version: 11.1.0-f78dac4 - resolution: "@metamask-previews/keyring-api@npm:11.1.0-f78dac4" - dependencies: - "@metamask/keyring-utils": "npm:0.0.1" - "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.3.0" - bech32: "npm:^2.0.0" - checksum: 10/a7b11d764fc8fc6dcfd51845f4203e82503f8fe4218f454db1fef1a92ca638cd379c685b5760b853ca595c568cc906c8daa97eb1dcdffd3f4c4449acfbb31d31 + checksum: 10/ba8b75c55d3fcb9f8b52c58ff141cba81f7c416c3fa684e089965717ea129d50e8df7a73e7ab1c96eaf59d70b6e2dd8a618434939b75ef0d3402b547b5196877 languageName: node linkType: hard @@ -3003,8 +2988,8 @@ __metadata: "@metamask/eth-hd-keyring": "npm:^7.0.4" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/eth-simple-keyring": "npm:^6.0.5" - "@metamask/keyring-api": "npm:^10.1.0" - "@metamask/keyring-internal-api": "npm:^0.0.1" + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/message-manager": "npm:^11.0.2" "@metamask/providers": "npm:^18.1.1" "@metamask/scure-bip39": "npm:^2.1.1" @@ -3029,61 +3014,58 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:@metamask-previews/keyring-internal-api@0.0.1-f78dac4": - version: 0.0.1-f78dac4 - resolution: "@metamask-previews/keyring-internal-api@npm:0.0.1-f78dac4" +"@metamask/keyring-internal-api@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-internal-api@npm:1.0.0" dependencies: - "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-utils": "npm:0.0.1" + "@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/d071f4203a1c1778e19deacb1affcc8dbdc8ad2daf4e3ede674a70b62a1ec8fef818ea1573dc9f4507c3d69a3194027fa461bdc92d506ec85c587fd3c3ad4177 + checksum: 10/dd0fff93ddfdce008f1db82d404bd040d09840413723c831819d3a7f4c2819a4303657e4acd7578cfd22bd05ad9c7aa563fc88f13f2f06999e2325ada71b824c languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:@metamask-previews/keyring-snap-client@0.0.1-f78dac4": - version: 0.0.1-f78dac4 - resolution: "@metamask-previews/keyring-snap-client@npm:0.0.1-f78dac4" +"@metamask/keyring-internal-snap-client@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-internal-snap-client@npm:1.0.0" dependencies: - "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-utils": "npm:0.0.1" - "@metamask/superstruct": "npm:^3.1.0" - "@types/uuid": "npm:^9.0.8" - uuid: "npm:^9.0.1" + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-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" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/e0579484ff2ff7c02df61b8bff668033b0cd193b20ef9dd8c7a8f4c4dcb10b89648db63b4e0bff702bc8456642cac69bc7b028bc60a21dbd9974ba8106a7db8e + checksum: 10/4c02429235bf5b3609fe2d728f0f976fc87cc276483c092d155b181eeb1f167953a96226c4f6b64f6700084f8a66e5b02944ba0accf201e3514e83df205389e1 languageName: node linkType: hard -"@metamask/keyring-snap-internal-client@npm:@metamask-previews/keyring-snap-internal-client@0.0.1-f78dac4": - version: 0.0.1-f78dac4 - resolution: "@metamask-previews/keyring-snap-internal-client@npm:0.0.1-f78dac4" +"@metamask/keyring-snap-client@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-snap-client@npm:1.0.0" dependencies: - "@metamask/keyring-api": "npm:11.1.0" - "@metamask/keyring-snap-client": "npm:0.0.1" - "@metamask/keyring-utils": "npm:0.0.1" - "@metamask/snaps-controllers": "npm:^9.10.0" - "@metamask/snaps-sdk": "npm:^6.7.0" - "@metamask/snaps-utils": "npm:^8.3.0" + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" "@metamask/superstruct": "npm:^3.1.0" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - checksum: 10/8e6ca76e450746b6b40346ff7213409bd631d45ac7bd5a230678af30660f935f4862fe48d2a472f77b7bd7f1bf9da563d2a68da5afa6958f0eab88a08e621d67 + checksum: 10/7b3ee4ab6b39f8e06d55dee2c29f778eeb2eeb8bb311eccaab07d1f8a855fa920bf52e78bd2be0f3ddcb66dc475282d740de0cc7337ccd99e956302a706d76a0 languageName: node linkType: hard -"@metamask/keyring-utils@npm:@metamask-previews/keyring-utils@0.0.1-f78dac4": - version: 0.0.1-f78dac4 - resolution: "@metamask-previews/keyring-utils@npm:0.0.1-f78dac4" +"@metamask/keyring-utils@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-utils@npm:1.0.0" dependencies: "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.3.0" - checksum: 10/b5227621f6d63e5e52f50831994e12755341333712eae98bad686890923be8fdf3044cddf2c3e5f0550fd42c60745d0bcebfa0e6479d60c5f7fadaba34fda315 + checksum: 10/f74f7343a7154b029e0fa4c25735c589eba4dc25a9e323d43b7c733ce5dbb23ce603a4f02aac455163993649ceeaf714b8b843985ba7a9cb00b926b3b8dc6b51 languageName: node linkType: hard @@ -3432,9 +3414,9 @@ __metadata: "@metamask/accounts-controller": "npm:^20.0.1" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-api": "npm:^12.0.0" "@metamask/keyring-controller": "npm:^19.0.1" - "@metamask/keyring-internal-api": "npm:^0.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/network-controller": "npm:^22.1.0" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" From 470d2e31445678ec8bb5b9002886a825de48b271 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Tue, 10 Dec 2024 18:24:02 +0100 Subject: [PATCH 7/7] chore(keyring-controller): remove @metamask/providers dep --- packages/keyring-controller/package.json | 8 +------- yarn.lock | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 3ade55e011..48050fdaeb 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -69,7 +69,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^3.4.4", - "@metamask/providers": "^18.1.1", "@metamask/scure-bip39": "^2.1.1", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", @@ -80,12 +79,7 @@ "typedoc": "^0.24.8", "typedoc-plugin-missing-exports": "^2.0.0", "typescript": "~5.2.2", - "uuid": "^8.3.2", - "webextension-polyfill": "^0.12.0" - }, - "peerDependencies": { - "@metamask/providers": "^18.1.0", - "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" + "uuid": "^8.3.2" }, "engines": { "node": "^18.18 || >=20" diff --git a/yarn.lock b/yarn.lock index 4601bc2797..60afecedad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2980,7 +2980,6 @@ __metadata: "@metamask/keyring-api": "npm:^12.0.0" "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/message-manager": "npm:^11.0.3" - "@metamask/providers": "npm:^18.1.1" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" @@ -2996,10 +2995,6 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.2.2" uuid: "npm:^8.3.2" - webextension-polyfill: "npm:^0.12.0" - peerDependencies: - "@metamask/providers": ^18.1.0 - webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 languageName: unknown linkType: soft