refactor: decompose rule decoders, and refactor permission decoding

packages/gator-permissions-controller/src/GatorPermissionsController.ts

@@ -30,10 +30,10 @@ import type { Hex } from '@metamask/utils';
 import { DELEGATION_FRAMEWORK_VERSION } from './constants';
 import type { DecodedPermission } from './decodePermission';
 import {
-  createPermissionRulesForContracts,
-  findRulesWithMatchingCaveatAddresses,
+  createPermissionDecodersForContracts,
+  findDecodersWithMatchingCaveatAddresses,
   reconstructDecodedPermission,
-  selectUniqueRuleAndDecodedPermission,
+  selectUniqueDecoderAndDecodedPermission,
 } from './decodePermission';
 import {
   GatorPermissionsFetchError,
@@ -592,22 +592,23 @@ export class GatorPermissionsController extends BaseController<
 
     try {
       const enforcers = caveats.map((caveat) => caveat.enforcer);
-      const permissionRules = createPermissionRulesForContracts(contracts);
+      const permissionDecoders =
+        createPermissionDecodersForContracts(contracts);
 
-      // Every rule where enforcer addresses match; multiple types may share the same
-      // caveat pattern and are disambiguated by validateAndDecodePermission.
-      const matchingRules = findRulesWithMatchingCaveatAddresses({
+      // Every decoder where enforcer addresses match; multiple types may share the
+      // same caveat pattern and are disambiguated by validateAndDecodePermission.
+      const matchingDecoders = findDecodersWithMatchingCaveatAddresses({
         enforcers,
-        permissionRules,
+        permissionDecoders,
       });
 
       const {
-        rule: { permissionType },
+        decoder: { permissionType },
         expiry,
         data,
         rules,
-      } = selectUniqueRuleAndDecodedPermission({
-        candidateRules: matchingRules,
+      } = selectUniqueDecoderAndDecodedPermission({
+        candidateDecoders: matchingDecoders,
         caveats,
       });
 

packages/gator-permissions-controller/src/constants.ts

@@ -18,3 +18,11 @@ export const EXECUTION_PERMISSION_REDEEMER_RULE_TYPE = 'redeemer' as const;
  * payee restrictions.
  */
 export const EXECUTION_PERMISSION_PAYEE_RULE_TYPE = 'payee' as const;
+
+/**
+ * `Rule.type` / `wallet_getSupportedExecutionPermissions` `ruleTypes` entry for
+ * permission expiry derived from a TimestampEnforcer caveat. The decoded
+ * permission additionally hoists the expiry value onto its top-level `expiry`
+ * field for convenience.
+ */
+export const EXECUTION_PERMISSION_EXPIRY_RULE_TYPE = 'expiry' as const;