Skip to content

feat: add decoding rules for erc20-token-allowance and native-token-allowance #8553

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

Open
jeffsmale90 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

feat: add decoding rules for erc20-token-allowance and native-token-allowance #8553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ffe69b
Allow multiple permission types with matching caveats. Require only o…
jeffsmale90 Apr 23, 2026
acc0054
Disallow periodDuration values of uint256 maximum
jeffsmale90 Apr 23, 2026
3000c1b
Add decoding rules for new permissions:
jeffsmale90 Apr 23, 2026
84b409f
Changelog
jeffsmale90 Apr 23, 2026
ad34e77
Bump @metamask/7715-permission-types from ^0.5.0 to ^0.6.0
jeffsmale90 Apr 23, 2026
2b61b0a
Just some whitespace changes
jeffsmale90 Apr 23, 2026
c633a82
Update messenger-action-types
jeffsmale90 Apr 23, 2026
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 packages/gator-permissions-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- New decoding rules for `native-token-allowance` and `erc20-token-allowance` ([#8553](https://github.com/MetaMask/core/pull/8553))

### Changed

- Bump `@metamask/transaction-controller` from `^64.2.0` to `^64.3.0` ([#8482](https://github.com/MetaMask/core/pull/8482))
Expand Down
2 changes: 1 addition & 1 deletion packages/gator-permissions-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
},
"dependencies": {
"@metamask/7715-permission-types": "^0.5.0",
"@metamask/7715-permission-types": "^0.6.0",
"@metamask/abi-utils": "^2.0.3",
"@metamask/base-controller": "^9.1.0",
"@metamask/delegation-core": "^0.2.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/gator-permissions-controller/src/GatorPermissionsController-method-action-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ export type GatorPermissionsControllerInitializeAction = {
*
* @returns A decoded permission object suitable for UI consumption and follow-up actions.
* @throws If the origin is not allowed, the context cannot be decoded into exactly one delegation,
* or the enforcers/terms do not match a supported permission type.
* the enforcers do not match any supported permission type, no candidate type validates
* the caveat terms, or more than one permission type successfully validates
* (ambiguous delegation).
*/
export type GatorPermissionsControllerDecodePermissionFromPermissionContextForOriginAction =
{
Expand Down
32 changes: 16 additions & 16 deletions packages/gator-permissions-controller/src/GatorPermissionsController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ import { DELEGATION_FRAMEWORK_VERSION } from './constants';
import type { DecodedPermission } from './decodePermission';
import {
createPermissionRulesForContracts,
findRuleWithMatchingCaveatAddresses,
findRulesWithMatchingCaveatAddresses,
reconstructDecodedPermission,
selectUniqueRuleAndDecodedPermission,
} from './decodePermission';
import {
GatorPermissionsFetchError,
Expand Down Expand Up @@ -561,7 +562,9 @@ export class GatorPermissionsController extends BaseController<
*
* @returns A decoded permission object suitable for UI consumption and follow-up actions.
* @throws If the origin is not allowed, the context cannot be decoded into exactly one delegation,
* or the enforcers/terms do not match a supported permission type.
* the enforcers do not match any supported permission type, no candidate type validates
* the caveat terms, or more than one permission type successfully validates
* (ambiguous delegation).
*/
public decodePermissionFromPermissionContextForOrigin({
origin,
Expand Down Expand Up @@ -591,24 +594,21 @@ export class GatorPermissionsController extends BaseController<
const enforcers = caveats.map((caveat) => caveat.enforcer);
const permissionRules = createPermissionRulesForContracts(contracts);

// find the single rule where the specified enforcers contain all the required enforcers
// and no forbidden enforcers
const matchingRule = findRuleWithMatchingCaveatAddresses({
// Every rule where enforcer addresses match; multiple types may share the same
// caveat pattern and are disambiguated by validateAndDecodePermission.
const matchingRules = findRulesWithMatchingCaveatAddresses({
enforcers,
permissionRules,
});

// validate the terms of each caveat against the matching rule, returning the decoded result
// this happens in a single function, as decoding is an inherent part of validation.
const decodeResult = matchingRule.validateAndDecodePermission(caveats);

if (!decodeResult.isValid) {
throw new PermissionDecodingError({
cause: decodeResult.error,
});
}

const { expiry, data } = decodeResult;
const {
rule: matchingRule,
expiry,
data,
} = selectUniqueRuleAndDecodedPermission({
candidateRules: matchingRules,
caveats,
});

const permission = reconstructDecodedPermission({
chainId,
Expand Down
Loading
Loading