Skip to content

Commit 547b264

Browse files
chore: Update to the latest transaction controller (#29395)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Updates from v42 to v42.1 in order to get the validation of the gas limit hexadecimal string properties. See MetaMask/core#5093 for more details. <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29395?quickstart=1) ## **Related issues** Fixes: MetaMask/MetaMask-planning#3826 ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: MetaMask Bot <[email protected]>
1 parent 695d0db commit 547b264

File tree

6 files changed

+77
-17
lines changed

6 files changed

+77
-17
lines changed

lavamoat/browserify/beta/policy.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,7 @@
18351835
"@metamask/network-controller": true,
18361836
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
18371837
"@metamask/rpc-errors": true,
1838-
"@metamask/utils": true,
1838+
"@metamask/transaction-controller>@metamask/utils": true,
18391839
"@metamask/name-controller>async-mutex": true,
18401840
"bn.js": true,
18411841
"browserify>buffer": true,
@@ -2256,6 +2256,21 @@
22562256
"semver": true
22572257
}
22582258
},
2259+
"@metamask/transaction-controller>@metamask/utils": {
2260+
"globals": {
2261+
"TextDecoder": true,
2262+
"TextEncoder": true
2263+
},
2264+
"packages": {
2265+
"@metamask/utils>@metamask/superstruct": true,
2266+
"@noble/hashes": true,
2267+
"@metamask/utils>@scure/base": true,
2268+
"browserify>buffer": true,
2269+
"nock>debug": true,
2270+
"@metamask/utils>pony-cause": true,
2271+
"semver": true
2272+
}
2273+
},
22592274
"@ngraveio/bc-ur": {
22602275
"packages": {
22612276
"@ngraveio/bc-ur>@keystonehq/alias-sampling": true,

lavamoat/browserify/flask/policy.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,7 @@
18351835
"@metamask/network-controller": true,
18361836
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
18371837
"@metamask/rpc-errors": true,
1838-
"@metamask/utils": true,
1838+
"@metamask/transaction-controller>@metamask/utils": true,
18391839
"@metamask/name-controller>async-mutex": true,
18401840
"bn.js": true,
18411841
"browserify>buffer": true,
@@ -2256,6 +2256,21 @@
22562256
"semver": true
22572257
}
22582258
},
2259+
"@metamask/transaction-controller>@metamask/utils": {
2260+
"globals": {
2261+
"TextDecoder": true,
2262+
"TextEncoder": true
2263+
},
2264+
"packages": {
2265+
"@metamask/utils>@metamask/superstruct": true,
2266+
"@noble/hashes": true,
2267+
"@metamask/utils>@scure/base": true,
2268+
"browserify>buffer": true,
2269+
"nock>debug": true,
2270+
"@metamask/utils>pony-cause": true,
2271+
"semver": true
2272+
}
2273+
},
22592274
"@ngraveio/bc-ur": {
22602275
"packages": {
22612276
"@ngraveio/bc-ur>@keystonehq/alias-sampling": true,

lavamoat/browserify/main/policy.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,7 @@
18351835
"@metamask/network-controller": true,
18361836
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
18371837
"@metamask/rpc-errors": true,
1838-
"@metamask/utils": true,
1838+
"@metamask/transaction-controller>@metamask/utils": true,
18391839
"@metamask/name-controller>async-mutex": true,
18401840
"bn.js": true,
18411841
"browserify>buffer": true,
@@ -2256,6 +2256,21 @@
22562256
"semver": true
22572257
}
22582258
},
2259+
"@metamask/transaction-controller>@metamask/utils": {
2260+
"globals": {
2261+
"TextDecoder": true,
2262+
"TextEncoder": true
2263+
},
2264+
"packages": {
2265+
"@metamask/utils>@metamask/superstruct": true,
2266+
"@noble/hashes": true,
2267+
"@metamask/utils>@scure/base": true,
2268+
"browserify>buffer": true,
2269+
"nock>debug": true,
2270+
"@metamask/utils>pony-cause": true,
2271+
"semver": true
2272+
}
2273+
},
22592274
"@ngraveio/bc-ur": {
22602275
"packages": {
22612276
"@ngraveio/bc-ur>@keystonehq/alias-sampling": true,

lavamoat/browserify/mmi/policy.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,7 @@
19271927
"@metamask/network-controller": true,
19281928
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
19291929
"@metamask/rpc-errors": true,
1930-
"@metamask/utils": true,
1930+
"@metamask/transaction-controller>@metamask/utils": true,
19311931
"@metamask/name-controller>async-mutex": true,
19321932
"bn.js": true,
19331933
"browserify>buffer": true,
@@ -2348,6 +2348,21 @@
23482348
"semver": true
23492349
}
23502350
},
2351+
"@metamask/transaction-controller>@metamask/utils": {
2352+
"globals": {
2353+
"TextDecoder": true,
2354+
"TextEncoder": true
2355+
},
2356+
"packages": {
2357+
"@metamask/utils>@metamask/superstruct": true,
2358+
"@noble/hashes": true,
2359+
"@metamask/utils>@scure/base": true,
2360+
"browserify>buffer": true,
2361+
"nock>debug": true,
2362+
"@metamask/utils>pony-cause": true,
2363+
"semver": true
2364+
}
2365+
},
23512366
"@ngraveio/bc-ur": {
23522367
"packages": {
23532368
"@ngraveio/bc-ur>@keystonehq/alias-sampling": true,

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
"@metamask/snaps-sdk": "^6.14.0",
350350
"@metamask/snaps-utils": "^8.7.0",
351351
"@metamask/solana-wallet-snap": "^1.0.4",
352-
"@metamask/transaction-controller": "^42.0.0",
352+
"@metamask/transaction-controller": "^42.1.0",
353353
"@metamask/user-operation-controller": "^21.0.0",
354354
"@metamask/utils": "^10.0.1",
355355
"@ngraveio/bc-ur": "^1.1.12",

yarn.lock

+12-12
Original file line numberDiff line numberDiff line change
@@ -5095,13 +5095,13 @@ __metadata:
50955095
languageName: node
50965096
linkType: hard
50975097

5098-
"@metamask/base-controller@npm:^7.0.0, @metamask/base-controller@npm:^7.0.1, @metamask/base-controller@npm:^7.0.2":
5099-
version: 7.0.2
5100-
resolution: "@metamask/base-controller@npm:7.0.2"
5098+
"@metamask/base-controller@npm:^7.0.0, @metamask/base-controller@npm:^7.0.1, @metamask/base-controller@npm:^7.0.2, @metamask/base-controller@npm:^7.1.0":
5099+
version: 7.1.0
5100+
resolution: "@metamask/base-controller@npm:7.1.0"
51015101
dependencies:
51025102
"@metamask/utils": "npm:^10.0.0"
51035103
immer: "npm:^9.0.6"
5104-
checksum: 10/6f78ec5af840c9947aa8eac6e402df6469600260d613a92196daefd5b072097a176fe5da1c386f2d36853513254b74140d667d817a12880c46f088e18ff3606a
5104+
checksum: 10/5a0b50c1e096cbf6483e308eddb3ca2e5e1865b803b5dba778bf635ec59657290895e21ada71c7508d8e34ff9695a192a414fd75e287d290346359ef8e23960a
51055105
languageName: node
51065106
linkType: hard
51075107

@@ -6446,23 +6446,23 @@ __metadata:
64466446
languageName: node
64476447
linkType: hard
64486448

6449-
"@metamask/transaction-controller@npm:^42.0.0":
6450-
version: 42.0.0
6451-
resolution: "@metamask/transaction-controller@npm:42.0.0"
6449+
"@metamask/transaction-controller@npm:^42.1.0":
6450+
version: 42.1.0
6451+
resolution: "@metamask/transaction-controller@npm:42.1.0"
64526452
dependencies:
64536453
"@ethereumjs/common": "npm:^3.2.0"
64546454
"@ethereumjs/tx": "npm:^4.2.0"
64556455
"@ethereumjs/util": "npm:^8.1.0"
64566456
"@ethersproject/abi": "npm:^5.7.0"
64576457
"@ethersproject/contracts": "npm:^5.7.0"
64586458
"@ethersproject/providers": "npm:^5.7.0"
6459-
"@metamask/base-controller": "npm:^7.0.2"
6459+
"@metamask/base-controller": "npm:^7.1.0"
64606460
"@metamask/controller-utils": "npm:^11.4.4"
64616461
"@metamask/eth-query": "npm:^4.0.0"
64626462
"@metamask/metamask-eth-abis": "npm:^3.1.1"
64636463
"@metamask/nonce-tracker": "npm:^6.0.0"
6464-
"@metamask/rpc-errors": "npm:^7.0.1"
6465-
"@metamask/utils": "npm:^10.0.0"
6464+
"@metamask/rpc-errors": "npm:^7.0.2"
6465+
"@metamask/utils": "npm:^11.0.1"
64666466
async-mutex: "npm:^0.5.0"
64676467
bn.js: "npm:^5.2.1"
64686468
eth-method-registry: "npm:^4.0.0"
@@ -6476,7 +6476,7 @@ __metadata:
64766476
"@metamask/eth-block-tracker": ">=9"
64776477
"@metamask/gas-fee-controller": ^22.0.0
64786478
"@metamask/network-controller": ^22.0.0
6479-
checksum: 10/73c510803a720b4c1da0b82f1279a404a9b11c4ab76f8e5e4378c65d5d08bbb32c52062abfe319476cc3f5e2623a8987775c4524e55aa94002af73d73721b869
6479+
checksum: 10/9f842e2b68e84cbffdda301a0e15faab08226fd8e22eb954690ed41df60fe92c24acffdd9186b4c9f1da911a368cbe22cdb9ee046fc02d079c53f76100c66755
64806480
languageName: node
64816481
linkType: hard
64826482

@@ -26683,7 +26683,7 @@ __metadata:
2668326683
"@metamask/solana-wallet-snap": "npm:^1.0.4"
2668426684
"@metamask/test-bundler": "npm:^1.0.0"
2668526685
"@metamask/test-dapp": "npm:8.13.0"
26686-
"@metamask/transaction-controller": "npm:^42.0.0"
26686+
"@metamask/transaction-controller": "npm:^42.1.0"
2668726687
"@metamask/user-operation-controller": "npm:^21.0.0"
2668826688
"@metamask/utils": "npm:^10.0.1"
2668926689
"@ngraveio/bc-ur": "npm:^1.1.12"

0 commit comments

Comments
 (0)