Conversation
adonesky1
commented
Mar 24, 2025
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
7f7d307 to
b6a1c5d
Compare
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
jiexi
reviewed
Mar 24, 2025
Member
There was a problem hiding this comment.
adapters probably isn't the best descriptor for these anymore. getters/setters seem more appropriate now, but a problem for later
jiexi
reviewed
Mar 24, 2025
|
|
||
| updatedScopesObject[scopeString] = { | ||
| ...scopeObject, | ||
| accounts: uniq(caipAccounts), |
Member
There was a problem hiding this comment.
nit. thoughts on doing this uniq call at the top of this helper?
Contributor
Author
There was a problem hiding this comment.
not sure I follow? Where are you thinking?
jiexi
reviewed
Mar 24, 2025
| * @param requestedCaip25CaveatValue - CAIP-25 request values. | ||
| * @returns Accounts available for requesting. | ||
| */ | ||
| export function getAllAccountsFromCaip25Caveat( |
Member
There was a problem hiding this comment.
thoughts on just calling this getPermittedAccounts? The ending of this one sticks out from the rest. I can see why getPermittedAccounts might conflict in other contexts though, but maybe that can be fixed with a rename on import by the code that imports this package?
Contributor
Author
There was a problem hiding this comment.
Agreed that its not a great name, especially since others don't follow that naming convention. I'm going to change it to getAllAccounts for now since really this is used before the caveat is persisted... but it can be used for the caveat persisted or not...
jiexi
reviewed
Mar 24, 2025
| // If its a wallet scope or a wallet:* scope we don't filter it | ||
| if (isWalletScope(scopeString)) { | ||
| updatedScopesObject[scopeString] = scopeObject; | ||
| } else if (chainIds.includes(scopeString)) { |
Member
There was a problem hiding this comment.
can these two statements be combined into one guard?
jiexi
reviewed
Mar 24, 2025
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
jiexi
reviewed
Mar 25, 2025
| }); | ||
| }); | ||
|
|
||
| describe('setPermittedAccounts', () => { |
Member
There was a problem hiding this comment.
is it okay if we add a scenario to setting accounts where there is no scope for that account defined in the caveat?
jiexi
reviewed
Mar 25, 2025
| }; | ||
|
|
||
| /** | ||
| * Sets the permitted accounts for the given scopes object. |
Member
There was a problem hiding this comment.
worth mentioning the caveat that the scope must already exist in the scopesObject?
jiexi
reviewed
Mar 25, 2025
| }; | ||
|
|
||
| /** | ||
| * Sets the permitted accounts for the given CAIP-25 caveat value. |
jiexi
previously approved these changes
Mar 25, 2025
jiexi
approved these changes
Mar 25, 2025
…more-chain-agnostic
Merged
adonesky1
added a commit
that referenced
this pull request
Mar 25, 2025
## @metamask/chain-agnostic-permission ## [0.3.0] ### Added - Export `KnownSessionProperties` enum ([#5522](#5522)) - Add more chain agnostic utility functions for interfacing w/ caip25 permission ([#5536](#5536)) - New `setPermittedAccounts` function that allows setting accounts for any CAIP namespace, not just EVM scopes. - New `addPermittedChainId` and `setPermittedChainIds` functions for managing permitted chains across any CAIP namespace. - New `generateCaip25Caveat` function to generate a valid `endowment:caip25` permission caveat from given accounts and chains of any CAIP namespace. - New `isWalletScope` utility function to detect wallet-related scopes. ### Changed - **BREAKING:** An error is now thrown in the caveat validator when a `caip25:endowment` permission caveat has no scopes in either `requiredScopes` or `optionalScopes` ([#5548](#5548))
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Currently the utility/helper functions we expose to interface with and help construct a valid caip25 permission caveat are very eth/evm centric (i.e.
setPermittedAccounts,addPermittedEthChainId,getPermittedEthChainIdsetc)This PR adds some new helpers that are actually chain agnostic
References
see @david0xd 's PR here
and my extension PR ontop of it that uses these changes:
MetaMask/metamask-extension#31253
@metamask/chain-agnostic-permissioncaip-permission-adapter-eth-accounts.tstocaip-permission-adapter-accounts.tsto better reflect its more generalized functionality.setPermittedAccountsfunction that allows setting accounts for any CAIP namespace, not just EVM scopes.addPermittedChainIdandsetPermittedChainIdsfunctions for managing permitted chains across any CAIP namespace.generateCaip25Caveatfunction to simplify modification of CAIP-25 permissions after UI confirmation.isWalletScopeutility function to detect wallet-related scopes.CHANGED : BREAKING Thecaip25:endowmentpermission caveat validator now throws an error when bothrequiredScopesandoptionalScopescontain no scopes.Moved to another PR: https://github.com/MetaMask/core/pull/5548.diff
Checklist