Consume implementation from delegation-core for hashing caveats, and related constants.

Author: jeffsmale90

packages/delegation-toolkit/src/delegation.ts

@@ -1,16 +1,12 @@
 import {
   encodeDelegations as encodeDelegationsCore,
   decodeDelegations as decodeDelegationsCore,
+  getDelegationHash as getDelegationHashCore,
+  ANY_BENEFICIARY,
+  DELEGATION_TYPEHASH,
+  CAVEAT_TYPEHASH,
 } from '@metamask/delegation-core';
-import {
-  encodeAbiParameters,
-  parseAbiParameters,
-  keccak256,
-  hashMessage,
-  toBytes,
-  toHex,
-  getAddress,
-} from 'viem';
+import { hashMessage, toBytes, toHex, getAddress } from 'viem';
 import type {
   TypedData,
   AbiParameter,
@@ -23,13 +19,12 @@ import type {
 } from 'viem';
 
 import { type Caveats, resolveCaveats } from './caveatBuilder';
-import {
-  CAVEAT_ABI_TYPE_COMPONENTS,
-  getCaveatArrayPacketHash,
-} from './caveats';
+import { CAVEAT_ABI_TYPE_COMPONENTS } from './caveats';
 import { ROOT_AUTHORITY } from './constants';
 import type { Delegation } from './types';
 
+export { ANY_BENEFICIARY, DELEGATION_TYPEHASH, CAVEAT_TYPEHASH };
+
 /**
  * The ABI type components of a Delegation.
  */
@@ -141,21 +136,6 @@ export const decodePermissionContexts = (encoded: Hex[]): Delegation[][] => {
   return delegationChains;
 };
 
-/**
- * To be used in the allowList field of a gas delegation so as not to restrict who can redeem the gas delegation.
- */
-export const ANY_BENEFICIARY = '0x0000000000000000000000000000000000000a11';
-
-/**
- * To be used when generating a delegation hash to be signed
- * NOTE: signature is omitted from the Delegation typehash
- */
-export const DELEGATION_TYPEHASH = keccak256(
-  toHex(
-    'Delegation(address delegate,address delegator,bytes32 authority,Caveat[] caveats,uint256 salt)Caveat(address enforcer,bytes terms)',
-  ),
-);
-
 /**
  * TypedData to be used when signing a Delegation. Delegation value for `signature` and Caveat values for `args` are omitted as they cannot be known at signing time.
  */
@@ -200,19 +180,7 @@ export const prepDelegationHashForPasskeySign = (delegationHash: Hex) => {
 export const getDelegationHashOffchain = (input: Delegation): Hex => {
   const delegationStruct = toDelegationStruct(input);
 
-  const encoded = encodeAbiParameters(
-    parseAbiParameters('bytes32, address, address, bytes32, bytes32, uint'),
-    [
-      DELEGATION_TYPEHASH,
-      delegationStruct.delegate,
-      delegationStruct.delegator,
-      delegationStruct.authority,
-      getCaveatArrayPacketHash(delegationStruct.caveats),
-      delegationStruct.salt,
-    ],
-  );
-
-  return keccak256(encoded);
+  return getDelegationHashCore(delegationStruct);
 };
 
 type BaseCreateDelegationOptions = {