Skip to content

Commit

Permalink
chore: bump @metamask/user-operation-controller to ^21.0.0 (#29089)
Browse files Browse the repository at this point in the history 
<!--
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**

This PR bumps `@metamask/user-operation-controller` to `^21.0.0`

<!--
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/29089?quickstart=1)

## **Related issues**

Fixes: #28986

## **Manual testing steps**

## **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**

- [x] 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).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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]>
  • Loading branch information
@cryptodev-2s @metamaskbot
cryptodev-2s and metamaskbot authored Dec 19, 2024
1 parent 3b7c9cb commit 5855938
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 54 deletions.
24 changes: 21 additions & 3 deletions lavamoat/browserify/beta/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@
"TextEncoder": true
},
"packages": {
"@noble/hashes": true
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
}
},
"@noble/hashes": {
Expand All @@ -2170,6 +2170,24 @@
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
Expand Down Expand Up @@ -2248,7 +2266,7 @@
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
"@metamask/utils>@scure/base": true
}
},
Expand Down Expand Up @@ -3448,7 +3466,7 @@
},
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
}
},
Expand Down
24 changes: 21 additions & 3 deletions lavamoat/browserify/flask/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@
"TextEncoder": true
},
"packages": {
"@noble/hashes": true
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
}
},
"@noble/hashes": {
Expand All @@ -2170,6 +2170,24 @@
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
Expand Down Expand Up @@ -2248,7 +2266,7 @@
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
"@metamask/utils>@scure/base": true
}
},
Expand Down Expand Up @@ -3448,7 +3466,7 @@
},
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
}
},
Expand Down
24 changes: 21 additions & 3 deletions lavamoat/browserify/main/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@
"TextEncoder": true
},
"packages": {
"@noble/hashes": true
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
}
},
"@noble/hashes": {
Expand All @@ -2170,6 +2170,24 @@
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
Expand Down Expand Up @@ -2248,7 +2266,7 @@
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
"@metamask/utils>@scure/base": true
}
},
Expand Down Expand Up @@ -3448,7 +3466,7 @@
},
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
}
},
Expand Down
24 changes: 21 additions & 3 deletions lavamoat/browserify/mmi/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2247,7 +2247,7 @@
"TextEncoder": true
},
"packages": {
"@noble/hashes": true
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
}
},
"@noble/hashes": {
Expand All @@ -2262,6 +2262,24 @@
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
"crypto": true
}
},
"eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
"globals": {
"TextEncoder": true,
Expand Down Expand Up @@ -2340,7 +2358,7 @@
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
"@metamask/utils>@scure/base": true
}
},
Expand Down Expand Up @@ -3540,7 +3558,7 @@
},
"packages": {
"@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
"@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
"@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
"@metamask/snaps-utils": "^8.6.1",
"@metamask/solana-wallet-snap": "^1.0.3",
"@metamask/transaction-controller": "^42.0.0",
"@metamask/user-operation-controller": "^19.0.0",
"@metamask/user-operation-controller": "^21.0.0",
"@metamask/utils": "^10.0.1",
"@ngraveio/bc-ur": "^1.1.12",
"@noble/hashes": "^1.3.3",
Expand Down
2 changes: 1 addition & 1 deletion ui/ducks/metamask/metamask.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ export function isEIP1559Network(state, networkClientId) {
return (
state.metamask.networksMetadata?.[
networkClientId ?? selectedNetworkClientId
].EIPS[1559] === true
]?.EIPS[1559] === true
);
}

Expand Down
69 changes: 29 additions & 40 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5958,19 +5958,19 @@ __metadata:
languageName: node
linkType: hard

"@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.1":
version: 12.0.1
resolution: "@metamask/polling-controller@npm:12.0.1"
"@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.1, @metamask/polling-controller@npm:^12.0.2":
version: 12.0.2
resolution: "@metamask/polling-controller@npm:12.0.2"
dependencies:
"@metamask/base-controller": "npm:^7.0.2"
"@metamask/controller-utils": "npm:^11.4.2"
"@metamask/controller-utils": "npm:^11.4.4"
"@metamask/utils": "npm:^10.0.0"
"@types/uuid": "npm:^8.3.0"
fast-json-stable-stringify: "npm:^2.1.0"
uuid: "npm:^8.3.2"
peerDependencies:
"@metamask/network-controller": ^22.0.0
checksum: 10/eac9ed2fcc9697a2aa55e9746d4eac8d762dd6948b00d77cd2d4894b8c3e1a8e6ed5d0df4d01a69d9a7e2b3c09d9d7c1ffc6f9504023388dd7452d45b5d87065
checksum: 10/15bb6c087b506e15474d4d3555a37a540389c47674ac14052f7877bbf2be29e3bf78f2ea34a10d1ed21696bc0f45525cb2916e020a1b87e74ad695cb98ae4a94
languageName: node
linkType: hard

Expand Down Expand Up @@ -6432,14 +6432,14 @@ __metadata:
languageName: node
linkType: hard

"@metamask/user-operation-controller@npm:^19.0.0":
version: 19.0.0
resolution: "@metamask/user-operation-controller@npm:19.0.0"
"@metamask/user-operation-controller@npm:^21.0.0":
version: 21.0.0
resolution: "@metamask/user-operation-controller@npm:21.0.0"
dependencies:
"@metamask/base-controller": "npm:^7.0.2"
"@metamask/controller-utils": "npm:^11.4.3"
"@metamask/controller-utils": "npm:^11.4.4"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/polling-controller": "npm:^12.0.1"
"@metamask/polling-controller": "npm:^12.0.2"
"@metamask/rpc-errors": "npm:^7.0.1"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^10.0.0"
Expand All @@ -6449,11 +6449,12 @@ __metadata:
uuid: "npm:^8.3.2"
peerDependencies:
"@metamask/approval-controller": ^7.0.0
"@metamask/eth-block-tracker": ">=9"
"@metamask/gas-fee-controller": ^22.0.0
"@metamask/keyring-controller": ^19.0.0
"@metamask/network-controller": ^22.0.0
"@metamask/transaction-controller": ^40.0.0
checksum: 10/ca3d8ee77243eb3bdc455420185d5c41d45cb5520735af0b05c1792d66fdb6a7404c557b053b16b6fded57124da21c3bb0b6b1c943d290e9808164f05453a8d9
"@metamask/transaction-controller": ^42.0.0
checksum: 10/c9d794ea386c57c3213714181444a0483bdff361de386716f4c38b0e99c411db91183d8bcc1f229b3bdcf9b1611219636c39b726e9f56e23d29b3fb7874c0e0a
languageName: node
linkType: hard

Expand Down Expand Up @@ -6596,13 +6597,20 @@ __metadata:
languageName: node
linkType: hard

"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0, @noble/hashes@npm:~1.4.0":
"@noble/hashes@npm:1.4.0, @noble/hashes@npm:~1.4.0":
version: 1.4.0
resolution: "@noble/hashes@npm:1.4.0"
checksum: 10/e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6
languageName: node
linkType: hard

"@noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0":
version: 1.5.0
resolution: "@noble/hashes@npm:1.5.0"
checksum: 10/da7fc7af52af7afcf59810a7eea6155075464ff462ffda2572dc6d57d53e2669b1ea2ec774e814f6273f1697e567f28d36823776c9bf7068cba2a2855140f26e
languageName: node
linkType: hard

"@noble/hashes@npm:~1.1.1":
version: 1.1.3
resolution: "@noble/hashes@npm:1.1.3"
Expand Down Expand Up @@ -7750,9 +7758,9 @@ __metadata:
linkType: hard

"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
version: 1.1.7
resolution: "@scure/base@npm:1.1.7"
checksum: 10/fc50ffaab36cb46ff9fa4dc5052a06089ab6a6707f63d596bb34aaaec76173c9a564ac312a0b981b5e7a5349d60097b8878673c75d6cbfc4da7012b63a82099b
version: 1.1.9
resolution: "@scure/base@npm:1.1.9"
checksum: 10/f0ab7f687bbcdee2a01377fe3cd808bf63977999672751295b6a92625d5322f4754a96d40f6bd579bc367aad48ecf8a4e6d0390e70296e6ded1076f52adb16bb
languageName: node
linkType: hard

Expand Down Expand Up @@ -15820,14 +15828,11 @@ __metadata:
linkType: hard

"crc-32@npm:^1.2.0":
version: 1.2.0
resolution: "crc-32@npm:1.2.0"
dependencies:
exit-on-epipe: "npm:~1.0.1"
printj: "npm:~1.1.0"
version: 1.2.2
resolution: "crc-32@npm:1.2.2"
bin:
crc32: ./bin/crc32.njs
checksum: 10/10c648c986b005ed0ea8393bb0d1ccb99e7a102505b136d313dee6abe204aa682d9bb9bc6fd180f9cd98ef92aa029964f1cc96a2a85eb50507dedd9ead1a262f
crc32: bin/crc32.njs
checksum: 10/824f696a5baaf617809aa9cd033313c8f94f12d15ebffa69f10202480396be44aef9831d900ab291638a8022ed91c360696dd5b1ba691eb3f34e60be8835b7c3
languageName: node
linkType: hard

Expand Down Expand Up @@ -19092,13 +19097,6 @@ __metadata:
languageName: node
linkType: hard

"exit-on-epipe@npm:~1.0.1":
version: 1.0.1
resolution: "exit-on-epipe@npm:1.0.1"
checksum: 10/b180aa277aec5bef2609b34e5876061f421a1f81bf343beb213c4d60b382ddcb6b83012833f0ba329d6bc38042685c8d89b1c52ea495b9b6327948ea80627398
languageName: node
linkType: hard

"exit@npm:^0.1.2":
version: 0.1.2
resolution: "exit@npm:0.1.2"
Expand Down Expand Up @@ -26621,7 +26619,7 @@ __metadata:
"@metamask/test-bundler": "npm:^1.0.0"
"@metamask/test-dapp": "npm:8.13.0"
"@metamask/transaction-controller": "npm:^42.0.0"
"@metamask/user-operation-controller": "npm:^19.0.0"
"@metamask/user-operation-controller": "npm:^21.0.0"
"@metamask/utils": "npm:^10.0.1"
"@ngraveio/bc-ur": "npm:^1.1.12"
"@noble/hashes": "npm:^1.3.3"
Expand Down Expand Up @@ -30285,15 +30283,6 @@ __metadata:
languageName: node
linkType: hard

"printj@npm:~1.1.0":
version: 1.1.2
resolution: "printj@npm:1.1.2"
bin:
printj: ./bin/printj.njs
checksum: 10/45376a5ee7ef2e0d7ff0b4fecc893d73995a332e63d7e0622a544fe662c8213d22f0c9750e627c6d732a7d7a543266be960e6cd51cf19485cce87cf80468bb41
languageName: node
linkType: hard

"prismjs@npm:^1.27.0":
version: 1.29.0
resolution: "prismjs@npm:1.29.0"
Expand Down

0 comments on commit 5855938

Please sign in to comment.