feat: revoke CAIP-25 endowment if only eip155 account or scope is removed #4978
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
this doesn't handle the snaps case for permitted chains. need to update. EDIT: unsure how to handle this for snaps as the mutator function only receives a caveat value which gives no insight into the Permission's origin |
Gudahtt
reviewed
Nov 25, 2024
…sider non-eth accounts
…ators' into jl/caip-multichain-revoke-in-mutators
adonesky1
reviewed
Nov 25, 2024
packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts
Show resolved
Hide resolved
adonesky1
reviewed
Nov 25, 2024
|
@metamaskbot publish-previews |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
Gudahtt
reviewed
Nov 26, 2024
| }); | ||
| }); | ||
|
|
||
| it('does not revoke the permission if the target scope does not exist but the permission only has wallet scopes', () => { |
There was a problem hiding this comment.
Nit: The "does not revoke" tests are a bit confusing because it's not clear what we do expect to happen. Could we re-phrase them to make clear that we expect the result to be a no-op? The same goes for those added later in this file as well
There was a problem hiding this comment.
Actually maybe these cases are already covered? I do see some "account does not exist" and "scope does not exist" test cases already.
Gudahtt
previously approved these changes
Nov 26, 2024
…ators' into jl/caip-multichain-revoke-in-mutators
adonesky1
approved these changes
Nov 26, 2024
Gudahtt
approved these changes
Nov 26, 2024
matthewwalsh0
pushed a commit
that referenced
this pull request
Nov 26, 2024
…oved (#4978) ## Explanation Updates the CAIP-25 mutators so that if the only eip155 account or scope is removed then the entire permission is revoked. ## References Related: MetaMask/metamask-extension#28709 ## Changelog <!-- If you're making any consumer-facing changes, list those changes here as if you were updating a changelog, using the template below as a guide. (CATEGORY is one of BREAKING, ADDED, CHANGED, DEPRECATED, REMOVED, or FIXED. For security-related issues, follow the Security Advisory process.) Please take care to name the exact pieces of the API you've added or changed (e.g. types, interfaces, functions, or methods). If there are any breaking changes, make sure to offer a solution for consumers to follow once they upgrade to the changes. Finally, if you're only making changes to development scripts or tests, you may replace the template below with "None". --> ### `@metamask/multichain` - **CHANGED**: `Caip25CaveatMutators.authorizedScopes.removeAccount` now revokes the CAIP-25 endowment if the only account is removed. - **CHANGED**: `Caip25CaveatMutators.authorizedScopes.removeScope` now revokes the CAIP-25 endowment if the only non-wallet scope is removed. - **CHANGED**: `setEthAccounts` no longer adds `wallet:eip155` to the optionalScopes if it does not already exist. ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've highlighted breaking changes using the "BREAKING" category above as appropriate - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes --------- Co-authored-by: Alex Donesky <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
Updates the CAIP-25 mutators so that if the only eip155 account or scope is removed then the entire permission is revoked.
References
Related: MetaMask/metamask-extension#28709
Changelog
@metamask/multichainCaip25CaveatMutators.authorizedScopes.removeAccountnow revokes the CAIP-25 endowment if the only account is removed.Caip25CaveatMutators.authorizedScopes.removeScopenow revokes the CAIP-25 endowment if the only non-wallet scope is removed.setEthAccountsno longer addswallet:eip155to the optionalScopes if it does not already exist.Checklist