From 516da613c73decb40389bb39718a52423344b2df Mon Sep 17 00:00:00 2001 From: Bilal Zahory Date: Fri, 23 Aug 2024 15:12:45 -0400 Subject: [PATCH] temp!: see body You need to link the branch in https://github.com/MetaMask/core/pull/4634, so build and replace my name w your name, then once matt walsh is done yapping it up, get that merged and deployed, then finally replace all the linking with the latest npm version for the user-operations-controller and transaction-controller. --- package.json | 8 +-- yarn.lock | 150 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 95 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index d8b69ce36eba..c8cb89f4f34e 100644 --- a/package.json +++ b/package.json @@ -228,7 +228,7 @@ "@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch", "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch", "@metamask/snaps-sdk": "^6.0.0", - "@metamask/transaction-controller": "^34.0.0", + "@metamask/transaction-controller": "file:/Users/bilalzahory/core/packages/transaction-controller", "@swc/types@0.1.5": "^0.1.6", "@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", "@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", @@ -355,14 +355,14 @@ "@metamask/scure-bip39": "^2.0.3", "@metamask/selected-network-controller": "^15.0.2", "@metamask/signature-controller": "^17.0.0", - "@metamask/smart-transactions-controller": "^11.0.0", + "@metamask/smart-transactions-controller": "file:/Users/bilalzahory/smart-transactions-controller", "@metamask/snaps-controllers": "^9.2.0", "@metamask/snaps-execution-environments": "^6.5.0", "@metamask/snaps-rpc-methods": "^9.1.4", "@metamask/snaps-sdk": "^6.0.0", "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch", - "@metamask/transaction-controller": "^34.0.0", - "@metamask/user-operation-controller": "^13.0.0", + "@metamask/transaction-controller": "file:/Users/bilalzahory/core/packages/transaction-controller", + "@metamask/user-operation-controller": "file:/Users/bilalzahory/core/packages/user-operation-controller", "@metamask/utils": "^8.2.1", "@ngraveio/bc-ur": "^1.1.12", "@noble/ciphers": "^0.5.2", diff --git a/yarn.lock b/yarn.lock index 6b6eeebf591b..4bb295c938d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4987,6 +4987,26 @@ __metadata: languageName: node linkType: hard +"@metamask/base-controller@npm:^6.0.2": + version: 6.0.2 + resolution: "@metamask/base-controller@npm:6.0.2" + dependencies: + "@metamask/utils": "npm:^9.1.0" + immer: "npm:^9.0.6" + checksum: 10/c154fec55611516c271ff920e34ba89b62a82784dac57bc6b2f165dd0a4ba4061857bb2ad78423accd49ce5ce3e50aeaf2f8048f547d31b7f74ff60ac70af744 + languageName: node + linkType: hard + +"@metamask/base-controller@npm:^6.0.3": + version: 6.0.3 + resolution: "@metamask/base-controller@npm:6.0.3" + dependencies: + "@metamask/utils": "npm:^9.1.0" + immer: "npm:^9.0.6" + checksum: 10/43e208627c673094e3b4a7766ef4df34cd5a9ec7f09721cc3e60123b69a22b82c68752b963d17f4ad925a01c6e5dc89f125cac33aeee4e90e0a8346a1d153aae + languageName: node + linkType: hard + "@metamask/bitcoin-wallet-snap@npm:^0.4.0": version: 0.4.0 resolution: "@metamask/bitcoin-wallet-snap@npm:0.4.0" @@ -5054,6 +5074,23 @@ __metadata: languageName: node linkType: hard +"@metamask/controller-utils@npm:^11.0.2": + version: 11.0.2 + resolution: "@metamask/controller-utils@npm:11.0.2" + dependencies: + "@ethereumjs/util": "npm:^8.1.0" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/ethjs-unit": "npm:^0.3.0" + "@metamask/utils": "npm:^9.1.0" + "@spruceid/siwe-parser": "npm:2.1.0" + "@types/bn.js": "npm:^5.1.5" + bn.js: "npm:^5.2.1" + eth-ens-namehash: "npm:^2.0.8" + fast-deep-equal: "npm:^3.1.3" + checksum: 10/b1e7784bd73279843d9c11761ffd3dba99240f26c7330ae2fa7beecaca61949175090a8ea0f02505135ff52cb45eb91c373c39a63307bf67cd4b4b7cd7c971e0 + languageName: node + linkType: hard + "@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.4": version: 8.0.4 resolution: "@metamask/controller-utils@npm:8.0.4" @@ -5880,27 +5917,15 @@ __metadata: languageName: node linkType: hard -"@metamask/nonce-tracker@npm:5.0.0": - version: 5.0.0 - resolution: "@metamask/nonce-tracker@npm:5.0.0" - dependencies: - "@ethersproject/providers": "npm:^5.7.2" - async-mutex: "npm:^0.3.1" - peerDependencies: - "@metamask/eth-block-tracker": ">=9" - checksum: 10/72bce31702c5575b6dd583dd772312994103ff25389643526284d0e4320588cb0c7b389739fbdb1828f3e6ab387deddfc8cf2b674aa65bf3054db089cafce1db - languageName: node - linkType: hard - -"@metamask/nonce-tracker@patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch": - version: 5.0.0 - resolution: "@metamask/nonce-tracker@patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch::version=5.0.0&hash=b362e2" +"@metamask/nonce-tracker@npm:^6.0.0": + version: 6.0.0 + resolution: "@metamask/nonce-tracker@npm:6.0.0" dependencies: "@ethersproject/providers": "npm:^5.7.2" async-mutex: "npm:^0.3.1" peerDependencies: "@metamask/eth-block-tracker": ">=9" - checksum: 10/89c3e5219edc104ecc5f7bfb81f818a0800f946c9dd11d54ac79558e4abdbc895032dc2d7fed400a2d46b03ee6370dc393d62ec15b6cc0f2d3b45bcba6240fe0 + checksum: 10/e62edd38eeaba6d917bc3aed38017294f2bfdb59120a9fb4f093fe96a46d8d9214453a802fe782faaf4a007f4cd5f393607c70a2ff8479ecd7ef18827cad067a languageName: node linkType: hard @@ -6067,6 +6092,22 @@ __metadata: languageName: node linkType: hard +"@metamask/polling-controller@npm:^9.0.1": + version: 9.0.1 + resolution: "@metamask/polling-controller@npm:9.0.1" + dependencies: + "@metamask/base-controller": "npm:^6.0.2" + "@metamask/controller-utils": "npm:^11.0.2" + "@metamask/utils": "npm:^9.1.0" + "@types/uuid": "npm:^8.3.0" + fast-json-stable-stringify: "npm:^2.1.0" + uuid: "npm:^8.3.2" + peerDependencies: + "@metamask/network-controller": ^20.0.0 + checksum: 10/e9e8c51013290a2e4b2817ba1e0915783474f6a55fe614e20acf92bf707e300bec1fa612c8019ae9afe9635d018fb5d5b106c8027446ba12767220db91cf1ee5 + languageName: node + linkType: hard + "@metamask/post-message-stream@npm:^7.0.0": version: 7.0.0 resolution: "@metamask/post-message-stream@npm:7.0.0" @@ -6264,9 +6305,9 @@ __metadata: languageName: node linkType: hard -"@metamask/smart-transactions-controller@npm:^11.0.0": - version: 11.0.0 - resolution: "@metamask/smart-transactions-controller@npm:11.0.0" +"@metamask/smart-transactions-controller@file:/Users/bilalzahory/smart-transactions-controller::locator=metamask-crx%40workspace%3A.": + version: 12.0.0 + resolution: "@metamask/smart-transactions-controller@file:/Users/bilalzahory/smart-transactions-controller#/Users/bilalzahory/smart-transactions-controller::hash=8d36fd&locator=metamask-crx%40workspace%3A." dependencies: "@babel/runtime": "npm:^7.24.1" "@ethereumjs/tx": "npm:^5.2.1" @@ -6276,14 +6317,14 @@ __metadata: "@metamask/controller-utils": "npm:^11.0.0" "@metamask/eth-json-rpc-provider": "npm:^4.1.0" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/network-controller": "npm:^19.0.0" + "@metamask/network-controller": "npm:^20.0.0" "@metamask/polling-controller": "npm:^8.0.0" - "@metamask/transaction-controller": "npm:^34.0.0" + "@metamask/transaction-controller": "file:/Users/bilalzahory/core/packages/transaction-controller" bignumber.js: "npm:^9.0.1" events: "npm:^3.3.0" fast-json-patch: "npm:^3.1.0" lodash: "npm:^4.17.21" - checksum: 10/741536fe1524c8c1acfad421e4d17c61500de9f64d7ef97ddccac6e16e830f3e9bbfb5c2b9281082fb2121cec077f3470ce8c40711f3c9524e88275c02e8b821 + checksum: 10/90464f20c913a7dc325542e1b7c5a3d80bd0c518aed145b6872c61e4baf62d7f080722112e1f1e3fd4b9d3b87eafd11b0ce32205b591246ad51ae922fdf7eaa0 languageName: node linkType: hard @@ -6527,9 +6568,9 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:^34.0.0": - version: 34.0.0 - resolution: "@metamask/transaction-controller@npm:34.0.0" +"@metamask/transaction-controller@file:/Users/bilalzahory/core/packages/transaction-controller::locator=metamask-crx%40workspace%3A.": + version: 35.2.0 + resolution: "@metamask/transaction-controller@file:/Users/bilalzahory/core/packages/transaction-controller#/Users/bilalzahory/core/packages/transaction-controller::hash=b63cfb&locator=metamask-crx%40workspace%3A." dependencies: "@ethereumjs/common": "npm:^3.2.0" "@ethereumjs/tx": "npm:^4.2.0" @@ -6537,17 +6578,13 @@ __metadata: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" - "@metamask/accounts-controller": "npm:^17.2.0" - "@metamask/approval-controller": "npm:^7.0.0" - "@metamask/base-controller": "npm:^6.0.0" - "@metamask/controller-utils": "npm:^11.0.0" + "@metamask/base-controller": "npm:^6.0.3" + "@metamask/controller-utils": "npm:^11.0.2" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/gas-fee-controller": "npm:^18.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^19.0.0" - "@metamask/nonce-tracker": "npm:^5.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/nonce-tracker": "npm:^6.0.0" + "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/utils": "npm:^9.1.0" async-mutex: "npm:^0.5.0" bn.js: "npm:^5.2.1" eth-method-registry: "npm:^4.0.0" @@ -6556,41 +6593,36 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@babel/runtime": ^7.23.9 - "@metamask/accounts-controller": ^17.0.0 + "@metamask/accounts-controller": ^18.0.0 "@metamask/approval-controller": ^7.0.0 - "@metamask/gas-fee-controller": ^18.0.0 - "@metamask/network-controller": ^19.0.0 - checksum: 10/170b760dec516ca191de8fa2e7afce6aeb445880fa5717387c047202643ec303382a9edbe6c80024cbfc2e219ef98de6f9785b13bb4032b7b1100f29e6f3948d + "@metamask/gas-fee-controller": ^19.0.0 + "@metamask/network-controller": ^20.0.0 + checksum: 10/f384088510d76977911883ebe111436a7399fab955795362a12cba1eee547d60efc97bb319936d54f09bda314460e9b2ce4a473c7609ea043cf5cdf91029d713 languageName: node linkType: hard -"@metamask/user-operation-controller@npm:^13.0.0": - version: 13.0.0 - resolution: "@metamask/user-operation-controller@npm:13.0.0" +"@metamask/user-operation-controller@file:/Users/bilalzahory/core/packages/user-operation-controller::locator=metamask-crx%40workspace%3A.": + version: 14.0.1 + resolution: "@metamask/user-operation-controller@file:/Users/bilalzahory/core/packages/user-operation-controller#/Users/bilalzahory/core/packages/user-operation-controller::hash=9897ed&locator=metamask-crx%40workspace%3A." dependencies: - "@metamask/approval-controller": "npm:^7.0.0" - "@metamask/base-controller": "npm:^6.0.0" - "@metamask/controller-utils": "npm:^11.0.0" + "@metamask/base-controller": "npm:^6.0.3" + "@metamask/controller-utils": "npm:^11.0.2" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/gas-fee-controller": "npm:^18.0.0" - "@metamask/keyring-controller": "npm:^17.1.0" - "@metamask/network-controller": "npm:^19.0.0" - "@metamask/polling-controller": "npm:^8.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/transaction-controller": "npm:^34.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/polling-controller": "npm:^9.0.1" + "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.1.0" bn.js: "npm:^5.2.1" immer: "npm:^9.0.6" lodash: "npm:^4.17.21" - superstruct: "npm:^1.0.3" uuid: "npm:^8.3.2" peerDependencies: "@metamask/approval-controller": ^7.0.0 - "@metamask/gas-fee-controller": ^18.0.0 + "@metamask/gas-fee-controller": ^19.0.0 "@metamask/keyring-controller": ^17.0.0 - "@metamask/network-controller": ^19.0.0 - "@metamask/transaction-controller": ^34.0.0 - checksum: 10/600dd845dfc30ff852d766bd012ce40b4a6fb2276538d358cbe3ef1ce5815e4dba8f94e4911b7cb0506857133b185923b43af73ec39c7628eb86eedfdaf8dc59 + "@metamask/network-controller": ^20.0.0 + "@metamask/transaction-controller": ^35.0.0 + checksum: 10/367ca18b5ccc8b3d3787e9d55811e46513db552c481dd45ca881ed693ae045b7bfb9388fcfc882eca416bc83e697b230618fade1671056279367cdbd3806b54a languageName: node linkType: hard @@ -25920,7 +25952,7 @@ __metadata: "@metamask/scure-bip39": "npm:^2.0.3" "@metamask/selected-network-controller": "npm:^15.0.2" "@metamask/signature-controller": "npm:^17.0.0" - "@metamask/smart-transactions-controller": "npm:^11.0.0" + "@metamask/smart-transactions-controller": "file:/Users/bilalzahory/smart-transactions-controller" "@metamask/snaps-controllers": "npm:^9.2.0" "@metamask/snaps-execution-environments": "npm:^6.5.0" "@metamask/snaps-rpc-methods": "npm:^9.1.4" @@ -25928,8 +25960,8 @@ __metadata: "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch" "@metamask/test-bundler": "npm:^1.0.0" "@metamask/test-dapp": "npm:^8.4.0" - "@metamask/transaction-controller": "npm:^34.0.0" - "@metamask/user-operation-controller": "npm:^13.0.0" + "@metamask/transaction-controller": "file:/Users/bilalzahory/core/packages/transaction-controller" + "@metamask/user-operation-controller": "file:/Users/bilalzahory/core/packages/user-operation-controller" "@metamask/utils": "npm:^8.2.1" "@ngraveio/bc-ur": "npm:^1.1.12" "@noble/ciphers": "npm:^0.5.2"