From 7916a3fcb3be114327fc0fdb647f8693884e6b0a Mon Sep 17 00:00:00 2001 From: Michele Esposito <34438276+mikesposito@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:39:02 +0200 Subject: [PATCH] Update `@ethereumjs/tx` and `@ethereumjs/common` (#1514) * chore: update @ethereumjs/tx and @ethereumjs/common * chore: update @metamask/utils * yarn dedupe --------- Co-authored-by: legobt <6wbvkn0j@anonaddy.me> --- packages/address-book-controller/package.json | 2 +- packages/approval-controller/package.json | 2 +- packages/assets-controllers/package.json | 2 +- packages/base-controller/package.json | 2 +- packages/controller-utils/package.json | 2 +- packages/ens-controller/package.json | 2 +- packages/gas-fee-controller/package.json | 2 +- packages/keyring-controller/package.json | 6 +- .../src/KeyringController.test.ts | 19 +- packages/message-manager/package.json | 2 +- packages/network-controller/package.json | 2 +- packages/notification-controller/package.json | 2 +- packages/permission-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 6 +- .../src/TransactionController.test.ts | 17 +- .../src/TransactionController.ts | 13 +- yarn.lock | 204 ++++++++---------- 18 files changed, 124 insertions(+), 165 deletions(-) diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 5b6663cafcf..1e2e6c3b061 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -31,7 +31,7 @@ "dependencies": { "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", - "@metamask/utils": "^5.0.2" + "@metamask/utils": "^6.2.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.1.0", diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 6e2166e36e5..b34cba8eb5a 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@metamask/base-controller": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "eth-rpc-errors": "^4.0.2", "immer": "^9.0.6", "nanoid": "^3.1.31" diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 53a1b2a491f..44a9f999835 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -42,7 +42,7 @@ "@metamask/network-controller": "workspace:^", "@metamask/preferences-controller": "workspace:^", "@metamask/rpc-errors": "^5.1.1", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "@types/uuid": "^8.3.0", "abort-controller": "^3.0.0", "async-mutex": "^0.2.6", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index c193f2ccfc4..1b01e81988c 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -29,7 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "immer": "^9.0.6" }, "devDependencies": { diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index ca8b2a70966..50fab626e90 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -29,7 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "@spruceid/siwe-parser": "1.1.3", "eth-ens-namehash": "^2.0.8", "eth-query": "^2.1.2", diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index a31495a7863..8237cab94a3 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -33,7 +33,7 @@ "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/network-controller": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "ethereum-ens-network-map": "^1.0.2", "punycode": "^2.1.1" }, diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index 440953e3057..cefaa063c87 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -32,7 +32,7 @@ "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/network-controller": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "@types/uuid": "^8.3.0", "eth-query": "^2.1.2", "ethereumjs-util": "^7.0.10", diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index addd1b44beb..0387dbb6f99 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -29,7 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@keystonehq/metamask-airgapped-keyring": "^0.6.1", + "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/eth-keyring-controller": "^10.0.1", @@ -42,8 +42,8 @@ "immer": "^9.0.6" }, "devDependencies": { - "@ethereumjs/common": "^2.6.1", - "@ethereumjs/tx": "^3.5.2", + "@ethereumjs/common": "^3.2.0", + "@ethereumjs/tx": "^4.2.0", "@keystonehq/bc-ur-registry-eth": "^0.9.0", "@metamask/auto-changelog": "^3.1.0", "@metamask/scure-bip39": "^2.1.0", diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts index 2641f4990b0..d81e77549b9 100644 --- a/packages/keyring-controller/src/KeyringController.test.ts +++ b/packages/keyring-controller/src/KeyringController.test.ts @@ -1,9 +1,9 @@ -import Common from '@ethereumjs/common'; +import { Common } from '@ethereumjs/common'; import { TransactionFactory } from '@ethereumjs/tx'; import { CryptoHDKey, ETHSignature } from '@keystonehq/bc-ur-registry-eth'; import { MetaMaskKeyring as QRKeyring } from '@keystonehq/metamask-airgapped-keyring'; import { ControllerMessenger } from '@metamask/base-controller'; -import { isValidHexAddress, NetworkType } from '@metamask/controller-utils'; +import { isValidHexAddress } from '@metamask/controller-utils'; import { keyringBuilderFactory } from '@metamask/eth-keyring-controller'; import { normalize, @@ -1457,15 +1457,12 @@ describe('KeyringController', () => { type: 2, }, { - common: Common.forCustomChain( - NetworkType.mainnet, - { - name: 'goerli', - chainId: parseInt('5'), - networkId: parseInt('5'), - }, - 'london', - ), + common: Common.custom({ + name: 'goerli', + chainId: parseInt('5'), + networkId: parseInt('5'), + defaultHardfork: 'london', + }), }, ); const signedTx = await signProcessKeyringController.signTransaction( diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index 61fbbc73bc4..168211a7434 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -32,7 +32,7 @@ "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/eth-sig-util": "^6.0.0", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "@types/uuid": "^8.3.0", "ethereumjs-util": "^7.0.10", "jsonschema": "^1.2.4", diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index ff0fbe835f4..8be50e82ed0 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -35,7 +35,7 @@ "@metamask/eth-json-rpc-middleware": "^11.0.0", "@metamask/eth-json-rpc-provider": "^1.0.0", "@metamask/swappable-obj-proxy": "^2.1.0", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-block-tracker": "^7.0.1", "eth-query": "^2.1.2", diff --git a/packages/notification-controller/package.json b/packages/notification-controller/package.json index 90cec475a3d..5af7ae7960c 100644 --- a/packages/notification-controller/package.json +++ b/packages/notification-controller/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@metamask/base-controller": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "immer": "^9.0.6", "nanoid": "^3.1.31" }, diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index c485fe51f1a..9bffcd200b8 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -32,7 +32,7 @@ "@metamask/approval-controller": "workspace:^", "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "@types/deep-freeze-strict": "^1.1.0", "deep-freeze-strict": "^1.1.1", "eth-rpc-errors": "^4.0.2", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 330420d8541..32bfdda5796 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -33,7 +33,7 @@ "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/message-manager": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "eth-rpc-errors": "^4.0.2", "ethereumjs-util": "^7.0.10", "immer": "^9.0.6", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 1b60d0eec82..5e304e84d32 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -29,13 +29,13 @@ "test:watch": "jest --watch" }, "dependencies": { - "@ethereumjs/common": "^2.6.1", - "@ethereumjs/tx": "^3.5.2", + "@ethereumjs/common": "^3.2.0", + "@ethereumjs/tx": "^4.2.0", "@metamask/approval-controller": "workspace:^", "@metamask/base-controller": "workspace:^", "@metamask/controller-utils": "workspace:^", "@metamask/network-controller": "workspace:^", - "@metamask/utils": "^5.0.2", + "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", "eth-query": "^2.1.2", diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index cae4213f90a..bbfd8451d2c 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -1,6 +1,6 @@ /* eslint-disable jest/expect-expect */ -import Common from '@ethereumjs/common'; +import { Common } from '@ethereumjs/common'; import { ChainId, NetworkType, @@ -1586,15 +1586,12 @@ describe('TransactionController', () => { const config = controller.getCommonConfiguration(); expect(config).toStrictEqual( - Common.forCustomChain( - NetworkType.mainnet, - { - name: undefined, - chainId, - networkId: chainId, - }, - HARDFORK, - ), + Common.custom({ + name: undefined, + chainId, + networkId: chainId, + defaultHardfork: HARDFORK, + }), ); }, ); diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index 50b8e754d70..135d54ffdf7 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -1,4 +1,4 @@ -import Common from '@ethereumjs/common'; +import { Hardfork, Common, type ChainConfig } from '@ethereumjs/common'; import type { TypedTransaction } from '@ethereumjs/tx'; import { TransactionFactory } from '@ethereumjs/tx'; import type { @@ -54,7 +54,7 @@ import { ESTIMATE_GAS_ERROR, } from './utils'; -export const HARDFORK = 'london'; +export const HARDFORK = Hardfork.London; /** * @type Result @@ -640,17 +640,14 @@ export class TransactionController extends BaseController< return new Common({ chain, hardfork: HARDFORK }); } - const customChainParams = { + const customChainParams: Partial = { name, chainId: parseInt(chainId, 16), networkId: networkId === null ? NaN : parseInt(networkId, undefined), + defaultHardfork: HARDFORK, }; - return Common.forCustomChain( - NetworkType.mainnet, - customChainParams, - HARDFORK, - ); + return Common.custom(customChainParams); } /** diff --git a/yarn.lock b/yarn.lock index 6e833d9baab..3c7e6d70121 100644 --- a/yarn.lock +++ b/yarn.lock @@ -413,33 +413,6 @@ __metadata: languageName: node linkType: hard -"@chainsafe/as-sha256@npm:^0.4.1": - version: 0.4.1 - resolution: "@chainsafe/as-sha256@npm:0.4.1" - checksum: 6d86975e648ecdafd366802278ac15b392b252e967f3681412ec48b5a3518b936cc5e977517499882b084991446d25787d98f8f585891943688cc81549a44e9a - languageName: node - linkType: hard - -"@chainsafe/persistent-merkle-tree@npm:^0.6.1": - version: 0.6.1 - resolution: "@chainsafe/persistent-merkle-tree@npm:0.6.1" - dependencies: - "@chainsafe/as-sha256": ^0.4.1 - "@noble/hashes": ^1.3.0 - checksum: 74614b8d40970dc930d5bf741619498b0bbbde5ff24ce45fce6ad122143aa77bf57249a28175b1b972cf56bff57d529a4258b7222ab4e60c1261119b5986c51b - languageName: node - linkType: hard - -"@chainsafe/ssz@npm:^0.11.1": - version: 0.11.1 - resolution: "@chainsafe/ssz@npm:0.11.1" - dependencies: - "@chainsafe/as-sha256": ^0.4.1 - "@chainsafe/persistent-merkle-tree": ^0.6.1 - checksum: e3c2928f9ab4a0544e645f0302b9535046d1e6e1d4b3bd1c3dd6bc8e6302fddad6036d65e7900d1446f285f496051da05fa14c1bde590b511d03033907175c8f - languageName: node - linkType: hard - "@cspotcode/source-map-support@npm:^0.8.0": version: 0.8.1 resolution: "@cspotcode/source-map-support@npm:0.8.1" @@ -502,23 +475,13 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/common@npm:^2.6.1, @ethereumjs/common@npm:^2.6.3, @ethereumjs/common@npm:^2.6.4": - version: 2.6.5 - resolution: "@ethereumjs/common@npm:2.6.5" - dependencies: - crc-32: ^1.2.0 - ethereumjs-util: ^7.1.5 - checksum: 0143386f267ef01b7a8bb1847596f964ad58643c084e5fd8e3a0271a7bf8428605dbf38cbb92c84f6622080ad095abeb765f178c02d86ec52abf9e8a4c0e4ecf - languageName: node - linkType: hard - -"@ethereumjs/common@npm:^3.1.2": - version: 3.1.2 - resolution: "@ethereumjs/common@npm:3.1.2" +"@ethereumjs/common@npm:^3.2.0": + version: 3.2.0 + resolution: "@ethereumjs/common@npm:3.2.0" dependencies: - "@ethereumjs/util": ^8.0.6 + "@ethereumjs/util": ^8.1.0 crc-32: ^1.2.0 - checksum: e80a8bc86476f1ce878bacb1915d91681671bb5303291cdcece26e456ac13a6158f0f59625cb02a1cfbdd7c9a7dc8b175f8d8f0fee596b3eb9dfb965465ad43d + checksum: cb9cc11f5c868cb577ba611cebf55046e509218bbb89b47ccce010776dafe8256d70f8f43fab238aec74cf71f62601cd5842bc03a83261200802de365732a14b languageName: node linkType: hard @@ -531,53 +494,26 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/tx@npm:3.5.1": - version: 3.5.1 - resolution: "@ethereumjs/tx@npm:3.5.1" - dependencies: - "@ethereumjs/common": ^2.6.3 - ethereumjs-util: ^7.1.4 - checksum: ed17780314592eca96f7aed392707b55af713964a9ac8e5a1ba5b1a0d7cd90ced80d3793bc24e2ce7a5b4852cefae31af8731c5cf54cece48ada16c5dcb2713b - languageName: node - linkType: hard - -"@ethereumjs/tx@npm:^3.3.0, @ethereumjs/tx@npm:^3.5.2": - version: 3.5.2 - resolution: "@ethereumjs/tx@npm:3.5.2" - dependencies: - "@ethereumjs/common": ^2.6.4 - ethereumjs-util: ^7.1.5 - checksum: a34a7228a623b40300484d15875b9f31f0a612cfeab64a845f6866cf0bfe439519e9455ac6396149f29bc527cf0ee277ace082ae013a1075dcbf7193220a0146 - languageName: node - linkType: hard - -"@ethereumjs/tx@npm:^4.1.2": - version: 4.1.2 - resolution: "@ethereumjs/tx@npm:4.1.2" +"@ethereumjs/tx@npm:^4.0.2, @ethereumjs/tx@npm:^4.1.2, @ethereumjs/tx@npm:^4.2.0": + version: 4.2.0 + resolution: "@ethereumjs/tx@npm:4.2.0" dependencies: - "@chainsafe/ssz": ^0.11.1 - "@ethereumjs/common": ^3.1.2 + "@ethereumjs/common": ^3.2.0 "@ethereumjs/rlp": ^4.0.1 - "@ethereumjs/util": ^8.0.6 + "@ethereumjs/util": ^8.1.0 ethereum-cryptography: ^2.0.0 - peerDependencies: - c-kzg: ^1.0.8 - peerDependenciesMeta: - c-kzg: - optional: true - checksum: ad2fb692c3746cd5935b01c98b6b54046ae2a1fccff57ad2209e10446f3b279a204d7477accf05b27078445b14379314077769662142ac07117c45a5a1ea427f + checksum: 87a3f5f2452cfbf6712f8847525a80c213210ed453c211c793c5df801fe35ecef28bae17fadd222fcbdd94277478a47e52d2b916a90a6b30cda21f1e0cdaee42 languageName: node linkType: hard -"@ethereumjs/util@npm:^8.0.0, @ethereumjs/util@npm:^8.0.2, @ethereumjs/util@npm:^8.0.6": - version: 8.0.6 - resolution: "@ethereumjs/util@npm:8.0.6" +"@ethereumjs/util@npm:^8.0.0, @ethereumjs/util@npm:^8.0.2, @ethereumjs/util@npm:^8.0.6, @ethereumjs/util@npm:^8.1.0": + version: 8.1.0 + resolution: "@ethereumjs/util@npm:8.1.0" dependencies: - "@chainsafe/ssz": ^0.11.1 "@ethereumjs/rlp": ^4.0.1 ethereum-cryptography: ^2.0.0 micro-ftch: ^0.3.1 - checksum: 034e06cddec27417318434a1a7cd7a9dc0f0b447c1f54423c515d8809c9697386eee6429d0a1c13517a85c696e6fdba570b243d882e65764c274859606027015 + checksum: 9ae5dee8f12b0faf81cd83f06a41560e79b0ba96a48262771d897a510ecae605eb6d84f687da001ab8ccffd50f612ae50f988ef76e6312c752897f462f3ac08d languageName: node linkType: hard @@ -1182,29 +1118,29 @@ __metadata: languageName: node linkType: hard -"@keystonehq/base-eth-keyring@npm:^0.7.1": - version: 0.7.1 - resolution: "@keystonehq/base-eth-keyring@npm:0.7.1" +"@keystonehq/base-eth-keyring@npm:^0.14.1": + version: 0.14.1 + resolution: "@keystonehq/base-eth-keyring@npm:0.14.1" dependencies: - "@ethereumjs/tx": 3.5.1 + "@ethereumjs/tx": ^4.0.2 "@ethereumjs/util": ^8.0.0 - "@keystonehq/bc-ur-registry-eth": ^0.12.1 + "@keystonehq/bc-ur-registry-eth": ^0.19.1 hdkey: ^2.0.1 rlp: ^3.0.0 uuid: ^8.3.2 - checksum: c170be46fddbfe26a9500eb70c248160e15c71cdbd330b01705d5fc51313ae7bb314f4a9e731883b3e63943936394aba20bc30652173574be620e423b86129e2 + checksum: 2d61de9584631c68991686173a5356070a619a6f2873a822db35af56b8b7ee7b20b544374e0cd1972b139703362b56f5c566485eaea5a48644e34809af45b0a5 languageName: node linkType: hard -"@keystonehq/bc-ur-registry-eth@npm:^0.12.1": - version: 0.12.1 - resolution: "@keystonehq/bc-ur-registry-eth@npm:0.12.1" +"@keystonehq/bc-ur-registry-eth@npm:^0.19.1": + version: 0.19.1 + resolution: "@keystonehq/bc-ur-registry-eth@npm:0.19.1" dependencies: "@ethereumjs/util": ^8.0.0 - "@keystonehq/bc-ur-registry": ^0.5.0-alpha.5 + "@keystonehq/bc-ur-registry": ^0.6.0 hdkey: ^2.0.1 uuid: ^8.3.2 - checksum: 74c2b13cd2277478fb8a4932caf71f12a60c58b2d02322f8ee905eee11d6391deaeca712fe861955fb2b68ea0eaa0ff7155a31c66cd39d59433f2baffaf6c2ac + checksum: 51ca3ac78e68bec6b8ba1f1b938734fb7442f8b7b67f1befb8465d3b52ba1254fd5a0cf9f85825ab6a144b1c677cd6efb40a35fe4933f0e2df1fd5c4dda3c2fa languageName: node linkType: hard @@ -1231,17 +1167,28 @@ __metadata: languageName: node linkType: hard -"@keystonehq/metamask-airgapped-keyring@npm:^0.6.1": - version: 0.6.1 - resolution: "@keystonehq/metamask-airgapped-keyring@npm:0.6.1" +"@keystonehq/bc-ur-registry@npm:^0.6.0": + version: 0.6.3 + resolution: "@keystonehq/bc-ur-registry@npm:0.6.3" + dependencies: + "@ngraveio/bc-ur": ^1.1.5 + bs58check: ^2.1.2 + tslib: ^2.3.0 + checksum: ff4d936eefdc1a25e7383a9668f4dcdacebf7acdb293bc9c18357a30c60b31404e83c457510b07d2610badd435da6af5a3b8352081f863516f0cfb8e88ed3cc0 + languageName: node + linkType: hard + +"@keystonehq/metamask-airgapped-keyring@npm:^0.13.1": + version: 0.13.1 + resolution: "@keystonehq/metamask-airgapped-keyring@npm:0.13.1" dependencies: - "@ethereumjs/tx": ^3.3.0 - "@keystonehq/base-eth-keyring": ^0.7.1 - "@keystonehq/bc-ur-registry-eth": ^0.12.1 + "@ethereumjs/tx": ^4.0.2 + "@keystonehq/base-eth-keyring": ^0.14.1 + "@keystonehq/bc-ur-registry-eth": ^0.19.1 "@metamask/obs-store": ^7.0.0 rlp: ^2.2.6 uuid: ^8.3.2 - checksum: c01207728ce0003d0f6efe7e10c7339b513fdeb5c63c7d6bf916d663da9194a7b94d79f5d93b160d1270648dcd3996ee69e26b82786132db0f6570019a34fd58 + checksum: 9d9f4743c8017d90da7aeaf58a3f74113aac9852f40f6354ecc864126910e5dd15688d7b25539f0f6672308e551abe7319f1ce794a7a699b9b567cf40d2037ab languageName: node linkType: hard @@ -1299,7 +1246,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 jest: ^27.5.1 @@ -1333,7 +1280,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 eth-rpc-errors: ^4.0.2 @@ -1366,7 +1313,7 @@ __metadata: "@metamask/network-controller": "workspace:^" "@metamask/preferences-controller": "workspace:^" "@metamask/rpc-errors": ^5.1.1 - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 "@types/uuid": ^8.3.0 @@ -1414,7 +1361,7 @@ __metadata: resolution: "@metamask/base-controller@workspace:packages/base-controller" dependencies: "@metamask/auto-changelog": ^3.1.0 - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/sinon": ^9.0.10 deepmerge: ^4.2.2 @@ -1465,7 +1412,7 @@ __metadata: resolution: "@metamask/controller-utils@workspace:packages/controller-utils" dependencies: "@metamask/auto-changelog": ^3.1.0 - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@spruceid/siwe-parser": 1.1.3 "@types/jest": ^27.4.1 abort-controller: ^3.0.0 @@ -1551,7 +1498,7 @@ __metadata: "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" "@metamask/network-controller": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 ethereum-ens-network-map: ^1.0.2 @@ -1743,7 +1690,7 @@ __metadata: "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" "@metamask/network-controller": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/jest-when": ^2.7.3 "@types/uuid": ^8.3.0 @@ -1770,10 +1717,10 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/keyring-controller@workspace:packages/keyring-controller" dependencies: - "@ethereumjs/common": ^2.6.1 - "@ethereumjs/tx": ^3.5.2 + "@ethereumjs/common": ^3.2.0 + "@ethereumjs/tx": ^4.2.0 "@keystonehq/bc-ur-registry-eth": ^0.9.0 - "@keystonehq/metamask-airgapped-keyring": ^0.6.1 + "@keystonehq/metamask-airgapped-keyring": ^0.13.1 "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" @@ -1826,7 +1773,7 @@ __metadata: "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" "@metamask/eth-sig-util": ^6.0.0 - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/uuid": ^8.3.0 deepmerge: ^4.2.2 @@ -1860,7 +1807,7 @@ __metadata: "@metamask/eth-json-rpc-middleware": ^11.0.0 "@metamask/eth-json-rpc-provider": ^1.0.0 "@metamask/swappable-obj-proxy": ^2.1.0 - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/jest-when": ^2.7.3 "@types/lodash": ^4.14.191 @@ -1890,7 +1837,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 immer: ^9.0.6 @@ -1921,7 +1868,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/deep-freeze-strict": ^1.1.0 "@types/jest": ^27.4.1 deep-freeze-strict: ^1.1.1 @@ -2040,7 +1987,7 @@ __metadata: "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" "@metamask/message-manager": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 eth-rpc-errors: ^4.0.2 @@ -2068,14 +2015,14 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/transaction-controller@workspace:packages/transaction-controller" dependencies: - "@ethereumjs/common": ^2.6.1 - "@ethereumjs/tx": ^3.5.2 + "@ethereumjs/common": ^3.2.0 + "@ethereumjs/tx": ^4.2.0 "@metamask/approval-controller": "workspace:^" "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": "workspace:^" "@metamask/controller-utils": "workspace:^" "@metamask/network-controller": "workspace:^" - "@metamask/utils": ^5.0.2 + "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 async-mutex: ^0.2.6 @@ -2125,7 +2072,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^5.0.0, @metamask/utils@npm:^5.0.1, @metamask/utils@npm:^5.0.2": +"@metamask/utils@npm:^5.0.0, @metamask/utils@npm:^5.0.1": version: 5.0.2 resolution: "@metamask/utils@npm:5.0.2" dependencies: @@ -2138,6 +2085,20 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^6.2.0": + version: 6.2.0 + resolution: "@metamask/utils@npm:6.2.0" + dependencies: + "@ethereumjs/tx": ^4.1.2 + "@noble/hashes": ^1.3.1 + "@types/debug": ^4.1.7 + debug: ^4.3.4 + semver: ^7.3.8 + superstruct: ^1.0.3 + checksum: 0bc675358ecc09b3bc04da613d73666295d7afa51ff6b8554801585966900b24b8545bd93b8b2e9a17db867ebe421fe884baf3558ec4ca3199fa65504f677c1b + languageName: node + linkType: hard + "@ngraveio/bc-ur@npm:^1.1.5": version: 1.1.6 resolution: "@ngraveio/bc-ur@npm:1.1.6" @@ -2169,13 +2130,20 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.3.0, @noble/hashes@npm:^1.3.0, @noble/hashes@npm:~1.3.0": +"@noble/hashes@npm:1.3.0": version: 1.3.0 resolution: "@noble/hashes@npm:1.3.0" checksum: d7ddb6d7c60f1ce1f87facbbef5b724cdea536fc9e7f59ae96e0fc9de96c8f1a2ae2bdedbce10f7dcc621338dfef8533daa73c873f2b5c87fa1a4e05a95c2e2e languageName: node linkType: hard +"@noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0": + version: 1.3.1 + resolution: "@noble/hashes@npm:1.3.1" + checksum: 7fdefc0f7a0c1ec27acc6ff88841793e3f93ec4ce6b8a6a12bfc0dd70ae6b7c4c82fe305fdfeda1735d5ad4a9eebe761e6693b3d355689c559e91242f4bc95b1 + languageName: node + linkType: hard + "@noble/secp256k1@npm:1.6.3, @noble/secp256k1@npm:~1.6.0": version: 1.6.3 resolution: "@noble/secp256k1@npm:1.6.3" @@ -4627,7 +4595,7 @@ __metadata: languageName: node linkType: hard -"ethereumjs-util@npm:^7.0.10, ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.2, ethereumjs-util@npm:^7.1.4, ethereumjs-util@npm:^7.1.5": +"ethereumjs-util@npm:^7.0.10, ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.2": version: 7.1.5 resolution: "ethereumjs-util@npm:7.1.5" dependencies: