Remove more cruft

Author: jeffsmale90

packages/7715-permission-types/src/index.ts

@@ -20,38 +20,11 @@ export type {
 } from './types';
 
 export type {
-  Caveat,
-  ChecksumCaveat,
-  ChecksumEnforcersByChainId,
-  DeployedContractsByName,
-  DecodedPermission,
-  MakePermissionDecoderConfig,
-  PermissionDecoder,
-  PermissionDecoderConfig,
-  PermissionDecoderSpec,
-  PermissionType,
-  RuleDecoder,
-  ValidateAndDecodeResult,
   PayeeRule,
   RedeemerRule,
   ExpiryRule,
 } from './permissions';
 
 export {
-  EXECUTION_PERMISSION_EXPIRY_RULE_TYPE,
-  expiryRule,
-} from './permissions';
-export {
-  EXECUTION_PERMISSION_PAYEE_RULE_TYPE,
-  erc20PayeeRuleDecoder,
-  nativePayeeRuleDecoder,
-  EXECUTION_PERMISSION_REDEEMER_RULE_TYPE,
-  redeemerRuleDecoder,
-  makeNativeTokenStreamDecoderConfig,
-  makeNativeTokenPeriodicDecoderConfig,
-  makeNativeTokenAllowanceDecoderConfig,
-  makeErc20TokenStreamDecoderConfig,
-  makeErc20TokenPeriodicDecoderConfig,
-  makeErc20TokenAllowanceDecoderConfig,
-  makeTokenApprovalRevocationDecoderConfig,
+  makePermissionDecoderConfigs
 } from './permissions';

packages/7715-permission-types/src/permissions/caveats/erc20TokenAllowance.ts

@@ -4,7 +4,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import {
@@ -61,7 +61,7 @@ export function makeErc20TokenAllowanceDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { erc20PeriodicEnforcer, valueLteEnforcer } = contractAddresses;
 
   const valueLteTerms = getTermsByEnforcer({

packages/7715-permission-types/src/permissions/caveats/erc20TokenPeriodic.ts

@@ -6,7 +6,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import {
@@ -61,7 +61,7 @@ export function makeErc20TokenPeriodicDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { erc20PeriodicEnforcer, valueLteEnforcer } = contractAddresses;
 
   const valueLteTerms = getTermsByEnforcer({

packages/7715-permission-types/src/permissions/caveats/erc20TokenStream.ts

@@ -6,7 +6,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import { getTermsByEnforcer, ZERO_32_BYTES } from '../utils';
@@ -57,7 +57,7 @@ export function makeErc20TokenStreamDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { erc20StreamingEnforcer, valueLteEnforcer } = contractAddresses;
 
   const valueLteTerms = getTermsByEnforcer({

packages/7715-permission-types/src/permissions/caveats/nativeTokenAllowance.ts

@@ -6,7 +6,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import {
@@ -63,7 +63,7 @@ export function makeNativeTokenAllowanceDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { nativeTokenPeriodicEnforcer, exactCalldataEnforcer } =
     contractAddresses;
 

packages/7715-permission-types/src/permissions/caveats/nativeTokenPeriodic.ts

@@ -6,7 +6,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import { getTermsByEnforcer, MAX_PERIOD_DURATION } from '../utils';
@@ -57,7 +57,7 @@ export function makeNativeTokenPeriodicDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { nativeTokenPeriodicEnforcer, exactCalldataEnforcer } =
     contractAddresses;
 

packages/7715-permission-types/src/permissions/caveats/nativeTokenStream.ts

@@ -6,7 +6,7 @@ import { redeemerRuleDecoder } from '../rules/redeemer';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import { getTermsByEnforcer } from '../utils';
@@ -57,7 +57,7 @@ export function makeNativeTokenStreamDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { nativeTokenStreamingEnforcer, exactCalldataEnforcer } =
     contractAddresses;
 

packages/7715-permission-types/src/permissions/caveats/tokenApprovalRevocation.ts

@@ -4,7 +4,7 @@ import { expiryRule } from '../rules/expiry';
 import type {
   ChecksumCaveat,
   ChecksumEnforcersByChainId,
-  DecodedPermission,
+  DecodedPermissionData,
   MakePermissionDecoderConfig,
 } from '../types';
 import { getTermsByEnforcer } from '../utils';
@@ -46,7 +46,7 @@ export function makeTokenApprovalRevocationDecoderConfig(
 function validateAndDecodeData(
   caveats: ChecksumCaveat[],
   contractAddresses: ChecksumEnforcersByChainId,
-): DecodedPermission['permission']['data'] {
+): DecodedPermissionData {
   const { approvalRevocationEnforcer } = contractAddresses;
 
   const terms = getTermsByEnforcer({

packages/7715-permission-types/src/permissions/index.ts

@@ -8,46 +8,10 @@ import { makeTokenApprovalRevocationDecoderConfig } from './caveats/tokenApprova
 import type { DeployedContractsByName, PermissionDecoderConfig } from './types';
 import { getChecksumEnforcersByChainId } from './utils';
 
-export type {
-  Caveat,
-  ChecksumCaveat,
-  ChecksumEnforcersByChainId,
-  DeployedContractsByName,
-  DecodedPermission,
-  MakePermissionDecoderConfig,
-  PermissionDecoder,
-  PermissionDecoderConfig,
-  PermissionDecoderSpec,
-  PermissionType,
-  RuleDecoder,
-  ValidateAndDecodeResult,
-} from './types';
-
 export type { ExpiryRule } from './rules/expiry';
 export type { PayeeRule } from './rules/payee';
 export type { RedeemerRule } from './rules/redeemer';
 
-export {
-  EXECUTION_PERMISSION_EXPIRY_RULE_TYPE,
-  expiryRule,
-} from './rules/expiry';
-export {
-  EXECUTION_PERMISSION_PAYEE_RULE_TYPE,
-  erc20PayeeRuleDecoder,
-  nativePayeeRuleDecoder,
-} from './rules/payee';
-export {
-  EXECUTION_PERMISSION_REDEEMER_RULE_TYPE,
-  redeemerRuleDecoder,
-} from './rules/redeemer';
-export { makeNativeTokenStreamDecoderConfig } from './caveats/nativeTokenStream';
-export { makeNativeTokenPeriodicDecoderConfig } from './caveats/nativeTokenPeriodic';
-export { makeNativeTokenAllowanceDecoderConfig } from './caveats/nativeTokenAllowance';
-export { makeErc20TokenStreamDecoderConfig } from './caveats/erc20TokenStream';
-export { makeErc20TokenPeriodicDecoderConfig } from './caveats/erc20TokenPeriodic';
-export { makeErc20TokenAllowanceDecoderConfig } from './caveats/erc20TokenAllowance';
-export { makeTokenApprovalRevocationDecoderConfig } from './caveats/tokenApprovalRevocation';
-
 /**
  * Builds the canonical set of permission decoders for a chain.
  *

packages/7715-permission-types/src/permissions/types.ts

@@ -1,12 +1,6 @@
-import type { Hex, PermissionRequest, PermissionTypes, Rule } from '../types';
+import type { Caveat } from '@metamask/delegation-core';
 
-/**
- * Minimal caveat representation used by permission decoders.
- */
-export type Caveat<TEnforcer extends Hex = Hex> = {
-  enforcer: TEnforcer;
-  terms: Hex;
-};
+import type { Hex, PermissionTypes, Rule } from '../types';
 
 /**
  * Checksummed enforcer contract addresses for a chain (from getChecksumEnforcersByChainId).
@@ -27,36 +21,17 @@ export type ChecksumEnforcersByChainId = {
 };
 
 /** Caveat with checksummed enforcer address; used by rule decode functions. */
-export type ChecksumCaveat = Caveat;
+export type ChecksumCaveat = Caveat<Hex>;
 
 /**
- * A partially reconstructed permission object decoded from a permission context.
+ * Type of the `data` parameter of a decoded permission.
  */
-export type DecodedPermission = Pick<
-  PermissionRequest<PermissionTypes>,
-  'chainId' | 'from' | 'to'
-> & {
-  permission: Omit<
-    PermissionRequest<PermissionTypes>['permission'],
-    'isAdjustmentAllowed' | 'type' | 'data'
-  > & {
-    type: PermissionTypes['type'];
-    data: PermissionTypes['data'];
-    justification?: string;
-  };
-  /**
-   * @deprecated Use `rules` instead.
-   */
-  expiry: number | null;
-  origin: string;
-  /** Rules recovered from caveats (e.g. redeemer allowlist). */
-  rules?: Rule[];
-};
+export type DecodedPermissionData = PermissionTypes['data'];
 
 /**
  * Supported permission type identifiers that can be decoded from a permission context.
  */
-export type PermissionType = DecodedPermission['permission']['type'];
+export type PermissionType = PermissionTypes['type'];
 
 /**
  * A function that inspects checksummed caveats and optionally produces a Rule.
@@ -79,7 +54,7 @@ export type PermissionDecoderConfig = {
   validateAndDecodeData: (
     caveats: ChecksumCaveat[],
     contractAddresses: ChecksumEnforcersByChainId,
-  ) => DecodedPermission['permission']['data'];
+  ) => DecodedPermissionData;
 };
 
 /**
@@ -98,7 +73,7 @@ export type ValidateAndDecodeResult =
   | {
       isValid: true;
       expiry: number | null;
-      data: DecodedPermission['permission']['data'];
+      data: DecodedPermissionData;
       rules?: Rule[];
     }
   | { isValid: false; error: Error };