Skip to content

fix: existing EVM permissions removed when a Solana Wallet Standard connection is rejected #20309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 25, 2025
+56 −39
Merged

fix: existing EVM permissions removed when a Solana Wallet Standard connection is rejected #20309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
715f153
feat: support partial wallet_revokeSession
ffmcgee725 Sep 24, 2025
6e85d05
Merge branch 'main' into jc/WAPI-728
ffmcgee725 Sep 24, 2025
c861b7f
Merge branch 'main' into jc/WAPI-728
ffmcgee725 Sep 24, 2025
ebb433f
dedupe
ffmcgee725 Sep 24, 2025
8245b86
Merge branch 'main' into jc/WAPI-728
ffmcgee725 Sep 24, 2025
776b3e5
Merge branch 'main' into jc/WAPI-728
ffmcgee725 Sep 24, 2025
13c67e9
merge main fix conflicts
ffmcgee725 Sep 25, 2025
352f3fd
Merge branch 'main' into jc/WAPI-728
ffmcgee725 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/core/BackgroundBridge/BackgroundBridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,10 @@ export class BackgroundBridge extends EventEmitter {
PermissionController,
origin,
),
updateCaveat: PermissionController.updateCaveat.bind(
PermissionController,
origin,
),
getSelectedNetworkClientId: () =>
NetworkController.state.selectedNetworkClientId,
revokePermissionForOrigin: PermissionController.revokePermission.bind(
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@
"@metamask/mobile-wallet-protocol-core": "^0.1.1",
"@metamask/mobile-wallet-protocol-wallet-client": "^0.1.1",
"@metamask/multichain-account-service": "^0.10.0",
"@metamask/multichain-api-client": "^0.6.5",
"@metamask/multichain-api-middleware": "^1.0.0",
"@metamask/multichain-api-client": "^0.7.0",
"@metamask/multichain-api-middleware": "1.1.0",
"@metamask/multichain-network-controller": "^0.12.0",
"@metamask/multichain-transactions-controller": "^5.0.0",
"@metamask/network-controller": "^24.1.0",
Expand Down Expand Up @@ -276,7 +276,7 @@
"@metamask/snaps-sdk": "^9.3.0",
"@metamask/snaps-utils": "^11.5.0",
"@metamask/solana-wallet-snap": "^2.3.11",
"@metamask/solana-wallet-standard": "^0.5.1",
"@metamask/solana-wallet-standard": "^0.6.0",
"@metamask/stake-sdk": "^3.2.0",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/swaps-controller": "^14.0.0",
Expand Down
85 changes: 49 additions & 36 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6916,7 +6916,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/chain-agnostic-permission@npm:^1.0.0, @metamask/chain-agnostic-permission@npm:^1.1.0":
"@metamask/chain-agnostic-permission@npm:^1.0.0, @metamask/chain-agnostic-permission@npm:^1.1.0, @metamask/chain-agnostic-permission@npm:^1.1.1":
version: 1.1.1
resolution: "@metamask/chain-agnostic-permission@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -7217,7 +7217,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6, @metamask/eth-json-rpc-provider@npm:^4.1.7, @metamask/eth-json-rpc-provider@npm:^4.1.8":
"@metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6, @metamask/eth-json-rpc-provider@npm:^4.1.7":
version: 4.1.8
resolution: "@metamask/eth-json-rpc-provider@npm:4.1.8"
dependencies:
Expand All @@ -7230,6 +7230,19 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-json-rpc-provider@npm:^5.0.0":
version: 5.0.0
resolution: "@metamask/eth-json-rpc-provider@npm:5.0.0"
dependencies:
"@metamask/json-rpc-engine": ^10.1.0
"@metamask/rpc-errors": ^7.0.2
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^11.8.0
uuid: ^8.3.2
checksum: 82bdf6450189ffafdcfe47321f1397551bcc987404f7cf9bc15906a22408e7455e510085c8c904a75f67ec20908cc42cdd9cec333d23f112ed9094585f29b998
languageName: node
linkType: hard

"@metamask/eth-ledger-bridge-keyring@npm:11.1.0":
version: 11.1.0
resolution: "@metamask/eth-ledger-bridge-keyring@npm:11.1.0"
Expand Down Expand Up @@ -7469,14 +7482,14 @@ __metadata:
languageName: node
linkType: hard

"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3":
version: 10.0.3
resolution: "@metamask/json-rpc-engine@npm:10.0.3"
"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0":
version: 10.1.0
resolution: "@metamask/json-rpc-engine@npm:10.1.0"
dependencies:
"@metamask/rpc-errors": ^7.0.2
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^11.1.0
checksum: 1ad7e23e3a4017da8bb70a8ed8d4932475d42c60ace0d088f462a8e438cbf9154eaec4ba79621661fed95ff50ff6fa3db479404086238ab9eb5b3e9153c1051c
"@metamask/utils": ^11.8.0
checksum: 2fd45acb75ddc0c0b17e6854fab6a1b422ecd79ae22e55d927138447ad6272102b178b8a2c868c34851b2bbcde1908cc347f043d6bdc52beb6450e03156c4105
languageName: node
linkType: hard

Expand Down Expand Up @@ -7719,29 +7732,29 @@ __metadata:
languageName: node
linkType: hard

"@metamask/multichain-api-client@npm:^0.6.5":
version: 0.6.5
resolution: "@metamask/multichain-api-client@npm:0.6.5"
checksum: d758e3e8037935582483e1709ec91d954cf9c2049131e4fdec74d8ad005df59c431104b0b694174205b398fa0e304f31dd4bfefddf6388d76d5bc15e7a4feb9a
"@metamask/multichain-api-client@npm:^0.7.0":
version: 0.7.0
resolution: "@metamask/multichain-api-client@npm:0.7.0"
checksum: 6282dee05eaf56bab53fc2a04ed159f11af21d14383d5d143472ebeb2d4482d45eafbfbdd2c748c48b566d52c97294d6911bc9750513ab94cd57c6950cda6bcb
languageName: node
linkType: hard

"@metamask/multichain-api-middleware@npm:^1.0.0":
version: 1.0.0
resolution: "@metamask/multichain-api-middleware@npm:1.0.0"
"@metamask/multichain-api-middleware@npm:1.1.0":
version: 1.1.0
resolution: "@metamask/multichain-api-middleware@npm:1.1.0"
dependencies:
"@metamask/api-specs": ^0.14.0
"@metamask/chain-agnostic-permission": ^1.0.0
"@metamask/controller-utils": ^11.10.0
"@metamask/json-rpc-engine": ^10.0.3
"@metamask/network-controller": ^24.0.0
"@metamask/chain-agnostic-permission": ^1.1.1
"@metamask/controller-utils": ^11.14.0
"@metamask/json-rpc-engine": ^10.1.0
"@metamask/network-controller": ^24.2.0
"@metamask/permission-controller": ^11.0.6
"@metamask/rpc-errors": ^7.0.2
"@metamask/utils": ^11.2.0
"@metamask/utils": ^11.8.0
"@open-rpc/meta-schema": ^1.14.6
"@open-rpc/schema-utils-js": ^2.0.5
jsonschema: ^1.4.1
checksum: 5696b782205cc884e8667775498eaa37691a42ee5becb9edc6d8d872683e6c0d29b2fcc599871c98110040fe381f7e2327cd97499ee6a410b022fea52a88aec2
checksum: 44901fba2f243bcbf37139179d5a6e24029566688ae44f59de81531ddeb9d8a77c5fe728f522048d64e23fb079195530962c87217d9f2a21975989de654f5b0a
languageName: node
linkType: hard

Expand Down Expand Up @@ -7786,21 +7799,21 @@ __metadata:
languageName: node
linkType: hard

"@metamask/network-controller@npm:^24.0.0, @metamask/network-controller@npm:^24.1.0":
version: 24.1.0
resolution: "@metamask/network-controller@npm:24.1.0"
"@metamask/network-controller@npm:^24.1.0, @metamask/network-controller@npm:^24.2.0":
version: 24.2.0
resolution: "@metamask/network-controller@npm:24.2.0"
dependencies:
"@metamask/base-controller": ^8.1.0
"@metamask/controller-utils": ^11.12.0
"@metamask/base-controller": ^8.4.0
"@metamask/controller-utils": ^11.14.0
"@metamask/eth-block-tracker": ^12.0.1
"@metamask/eth-json-rpc-infura": ^10.2.0
"@metamask/eth-json-rpc-middleware": ^17.0.1
"@metamask/eth-json-rpc-provider": ^4.1.8
"@metamask/eth-json-rpc-provider": ^5.0.0
"@metamask/eth-query": ^4.0.0
"@metamask/json-rpc-engine": ^10.0.3
"@metamask/json-rpc-engine": ^10.1.0
"@metamask/rpc-errors": ^7.0.2
"@metamask/swappable-obj-proxy": ^2.3.0
"@metamask/utils": ^11.4.2
"@metamask/utils": ^11.8.0
async-mutex: ^0.5.0
fast-deep-equal: ^3.1.3
immer: ^9.0.6
Expand All @@ -7810,7 +7823,7 @@ __metadata:
uuid: ^8.3.2
peerDependencies:
"@metamask/error-reporting-service": ^2.0.0
checksum: aa84f02a44b8d80477dffba68bcbe16a22e76ea29d713aa50a3f10fdbb38a239a7b7aa73091c7f05eb03c8d2065af11f0869252235db91efcf48a3f42b39577a
checksum: 2db7c2e351e6ed861dbed8e8b5c06d61a76f5e957b9557acc2c8bf22ebd2746d62b3519f59142a224f8815044a5f021d72b226bff3a51ddc12a2df84caa4c5a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -8436,17 +8449,17 @@ __metadata:
languageName: node
linkType: hard

"@metamask/solana-wallet-standard@npm:^0.5.1":
version: 0.5.1
resolution: "@metamask/solana-wallet-standard@npm:0.5.1"
"@metamask/solana-wallet-standard@npm:^0.6.0":
version: 0.6.0
resolution: "@metamask/solana-wallet-standard@npm:0.6.0"
dependencies:
"@solana/wallet-standard-chains": ^1.1.1
"@solana/wallet-standard-features": ^1.3.0
"@wallet-standard/base": ^1.1.0
"@wallet-standard/features": ^1.1.0
"@wallet-standard/wallet": ^1.1.0
bs58: ^6.0.0
checksum: ef99cc804ace265eaf0be4079628fa658b2529a1f7feedf7e2fcf1d68086826eeae832a5fbfc1a7b21806a34adb8f2b7b4a43386b4203fa6a4827ccf2ea6add1
checksum: fccf25ffe04403bf5a6d04132a9baa5d6c69051832212cb1858f19e56eb75dffa9b9acaa0ef8a37aa1f59872ffd561d66e1ca91953d36378317ef4280510f66d
languageName: node
linkType: hard

Expand Down Expand Up @@ -33728,8 +33741,8 @@ __metadata:
"@metamask/mobile-wallet-protocol-core": ^0.1.1
"@metamask/mobile-wallet-protocol-wallet-client": ^0.1.1
"@metamask/multichain-account-service": ^0.10.0
"@metamask/multichain-api-client": ^0.6.5
"@metamask/multichain-api-middleware": ^1.0.0
"@metamask/multichain-api-client": ^0.7.0
"@metamask/multichain-api-middleware": 1.1.0
"@metamask/multichain-network-controller": ^0.12.0
"@metamask/multichain-transactions-controller": ^5.0.0
"@metamask/network-controller": ^24.1.0
Expand Down Expand Up @@ -33766,7 +33779,7 @@ __metadata:
"@metamask/snaps-sdk": ^9.3.0
"@metamask/snaps-utils": ^11.5.0
"@metamask/solana-wallet-snap": ^2.3.11
"@metamask/solana-wallet-standard": ^0.5.1
"@metamask/solana-wallet-standard": ^0.6.0
"@metamask/stake-sdk": ^3.2.0
"@metamask/swappable-obj-proxy": ^2.1.0
"@metamask/swaps-controller": ^14.0.0
Expand Down
Loading