fix: Extract gator permission expiry from delegation context #37874
Conversation
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
Fixes #464 - Permission with expiry showing 'No expiration' - Extract expiry timestamp from permissionResponse.context by decoding delegation - Find TimestampEnforcer caveat and decode the terms field (last 32 hex chars) - Convert BigInt timestamp to readable date format - Add comprehensive test coverage for all edge cases: - Valid expiry extraction - No TimestampEnforcer caveat - Invalid delegation count (0 or >1) - Invalid terms length - Zero timestamp - Decoding errors - Remove unused imports and debug logs
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
Collaborator
✨ Files requiring CODEOWNER review ✨👨🔧 @MetaMask/core-extension-ux (2 files, +169 -30)
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
...mponents/multichain/pages/gator-permissions/components/review-gator-permission-item.test.tsx
Show resolved
Hide resolved
Collaborator
Builds ready [542ada2]
UI Startup Metrics (1214 ± 97 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
…missionItem tests - Add beforeEach hooks to configure decodeDelegations and getDeleGatorEnvironment mocks for NATIVE and ERC20 token test suites - Update test assertions to verify actual expiration date content instead of just element presence - Fix variable naming conflicts in edge case tests to avoid scope shadowing - Ensures tests correctly validate expiration date extraction from delegation context
Collaborator
Builds ready [9261685]
UI Startup Metrics (1261 ± 86 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
MoMannn
requested changes
Nov 17, 2025
Contributor
MoMannn
left a comment
MoMannn
left a comment
There was a problem hiding this comment.
Some tests are failing. Run yarn test:unit:coverage --shard=4/6 locally to check.
| if (!rules) { | ||
| const getExpirationDate = useCallback((): string => { | ||
| try { | ||
| const delegations = decodeDelegations(permissionContext); |
Contributor
There was a problem hiding this comment.
This looks like it might be usable in different places. Could we wrap it into a reusable function that returns expiry or 0 and move it to: gator-permissions-utils file.
Contributor
There was a problem hiding this comment.
Then you can also move most of the test to utils testing the function and only basic test that shows or shows no expiration in the item tests.
Contributor
|
Would it make sense to merge this into: #37768 and have a single PR? |
- Created extractExpiryTimestampFromDelegation() in time-utils.ts - Returns expiry timestamp or 0, making it reusable across components - Simplified review-gator-permission-item.tsx from ~60 lines to ~10 lines - Moved comprehensive tests from component to utility tests - Component tests now focus on UI behavior only
Collaborator
Builds ready [741e6c2]
UI Startup Metrics (1213 ± 79 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Jest's it() function doesn't accept timeout as third parameter with async callbacks. Removed invalid timeout arguments from two test cases that were causing TypeScript errors.
|
|
||
| if (!expiry || expiry === 0) { | ||
| return 0; | ||
| } |
There was a problem hiding this comment.
Bug: Timestamp Overflow Leads to Conversion Crash
Converting a uint128 value larger than Number.MAX_SAFE_INTEGER to Number produces Infinity, which passes the validation checks and gets returned. When convertTimestampToReadableDate receives Infinity, it throws an uncaught error. The function should check for Infinity and return 0, or validate that the timestamp is within a reasonable range before conversion.
Collaborator
Builds ready [d790d8a]
UI Startup Metrics (1223 ± 91 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Jest's beforeAll/afterAll don't accept timeout as second parameter with async callbacks. Removed invalid timeout arguments that were causing issues.
Collaborator
Builds ready [8596ba0]
UI Startup Metrics (1242 ± 101 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
MoMannn
requested changes
Nov 19, 2025
| } | ||
|
|
||
| const dateTime = DateTime.fromSeconds(timestamp); | ||
| const dateTime = DateTime.fromSeconds(timestamp, { zone: 'utc' }); |
Contributor
There was a problem hiding this comment.
This is used in multiple places, is it ok to change to UTC generally?
| * @param chainId - The chain ID hex string | ||
| * @returns The expiration timestamp in seconds, or 0 if no expiration exists | ||
| */ | ||
| export const extractExpiryTimestampFromDelegation = ( |
Contributor
There was a problem hiding this comment.
We talked also about possibly moving this to the core gator permissions controller package. Looking more carefully I think that would be best. Since logic for this is already in the core but seems it does not work correctly: https://github.com/MetaMask/core/blob/33179969f4aa3df91b31a6ec18ba67da6b574c82/packages/gator-permissions-controller/src/decodePermission/decodePermission.ts#L124 I think it would be best to fix that logic there.
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.
Description
Fixes #464 - Gator permissions with expiry were displaying "No expiration" in the UI.
Root Cause: The expiry timestamp is not stored directly on the permission object. Instead, it's encoded within the
permissionResponse.contextfield as part of the delegation'sTimestampEnforcercaveat.Solution:
permissionContextusingdecodeDelegations()from@metamask/delegation-coreTimestampEnforcercaveat in the delegationtermsfield (uint128 encoding)Changelog
CHANGELOG entry: Fixed gator permissions displaying "No expiration" when expiry timestamp exists
Related issues
Fixes: #464
Manual testing steps
jeff.dripfund.xyzjeff.dripfund.xyzScreenshots/Recordings
Before
Permission showed "No expiration" despite having an expiry timestamp in the delegation context.
After
Permission now correctly displays the expiration date (e.g., "11/13/2026") extracted from the
TimestampEnforcercaveat.Pre-merge author checklist
Pre-merge reviewer checklist
Note
Derives gator permission expiration from delegation context (TimestampEnforcer) and updates UI to show the correct UTC date.
shared/lib/gator-permissions/time-utils.ts):extractExpiryTimestampFromDelegation(permissionContext, chainId)usingdecodeDelegationsandgetDeleGatorEnvironmentto parseTimestampEnforcerterms and return expiry or0.convertTimestampToReadableDateto format in UTC.review-gator-permission-item.tsx):extractExpiryTimestampFromDelegationand render formatted expiration or "No expiration".Written by Cursor Bugbot for commit 8596ba0. This will update automatically on new commits. Configure here.