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

Author: jeffsmale90

packages/delegation-core/src/delegation.ts

@@ -1,6 +1,6 @@
 import { encode, encodeSingle, decodeSingle } from '@metamask/abi-utils';
 import { type BytesLike } from '@metamask/utils';
-import { keccak_256 } from '@noble/hashes/sha3';
+import { keccak_256 as keccak256 } from '@noble/hashes/sha3';
 
 import {
   bytesLikeToBytes,
@@ -222,7 +222,7 @@ export function getDelegationHash(
       delegation.salt,
     ],
   );
-  const hash = keccak_256(encoded);
+  const hash = keccak256(encoded);
   return prepareResult(hash, options);
 }
 
@@ -247,7 +247,7 @@ function getCaveatsArrayHash(caveats: CaveatStruct[]): Uint8Array {
     encoded.set(caveatHash, i * 32);
   }
 
-  return keccak_256(encoded);
+  return keccak256(encoded);
 }
 
 /**
@@ -260,6 +260,6 @@ function getCaveatHash(caveat: CaveatStruct): Uint8Array {
     ['bytes32', 'address', 'bytes32'],
     [CAVEAT_TYPEHASH, caveat.enforcer, caveat.terms],
   );
-  const hash = keccak_256(encoded);
+  const hash = keccak256(encoded);
   return hash;
 }

packages/delegation-core/test/delegation.test.ts

@@ -1,3 +1,4 @@
+import { bytesToHex } from '@metamask/utils';
 import { describe, it, expect } from 'vitest';
 
 import {
@@ -7,7 +8,6 @@ import {
   getDelegationHash,
 } from '../src/delegation';
 import type { DelegationStruct, CaveatStruct } from '../src/types';
-import { bytesToHex } from '@metamask/utils';
 
 describe('delegation', () => {
   describe('ROOT_AUTHORITY', () => {

packages/delegation-toolkit/src/DelegationFramework/DelegationManager/constants.ts

@@ -1,4 +1,4 @@
-export { ROOT_AUTHORITY, ANY_DELEGATE } from '../../constants';
+export { ROOT_AUTHORITY, ANY_BENEFICIARY } from '../../delegation';
 
 export const NAME = 'DelegationManager';
 export const VERSION = '1.3.0';

packages/delegation-toolkit/src/DelegationFramework/HybridDeleGator/constants.ts

@@ -1,4 +1,4 @@
-export { ROOT_AUTHORITY, ANY_DELEGATE } from '../../constants';
+export { ROOT_AUTHORITY, ANY_BENEFICIARY } from '../../delegation';
 
 export const NAME = 'HybridDeleGator';
 export const VERSION = '1.3.0';

packages/delegation-toolkit/src/constants.ts

@@ -7,14 +7,3 @@ export enum Implementation {
   Hybrid = 'Hybrid',
   Stateless7702 = 'Stateless7702',
 }
-
-/**
- * To be used on a delegation as the root authority.
- */
-export const ROOT_AUTHORITY =
-  '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
-
-/**
- * To be used on a delegation as the any delegate.
- */
-export const ANY_DELEGATE = '0x0000000000000000000000000000000000000a11';

packages/delegation-toolkit/src/delegation.ts

@@ -1,16 +1,13 @@
 import {
   encodeDelegations as encodeDelegationsCore,
   decodeDelegations as decodeDelegationsCore,
+  getDelegationHash as getDelegationHashCore,
+  ANY_BENEFICIARY,
+  DELEGATION_TYPEHASH,
+  CAVEAT_TYPEHASH,
+  ROOT_AUTHORITY,
 } 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 +20,16 @@ import type {
 } from 'viem';
 
 import { type Caveats, resolveCaveats } from './caveatBuilder';
-import {
-  CAVEAT_ABI_TYPE_COMPONENTS,
-  getCaveatArrayPacketHash,
-} from './caveats';
-import { ROOT_AUTHORITY } from './constants';
+import { CAVEAT_ABI_TYPE_COMPONENTS } from './caveats';
 import type { Delegation } from './types';
 
+export {
+  ANY_BENEFICIARY,
+  DELEGATION_TYPEHASH,
+  CAVEAT_TYPEHASH,
+  ROOT_AUTHORITY,
+};
+
 /**
  * The ABI type components of a Delegation.
  */
@@ -141,21 +141,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 +185,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 = {

packages/delegation-toolkit/src/index.ts

@@ -1,10 +1,11 @@
 export { toMetaMaskSmartAccount } from './toMetaMaskSmartAccount';
 
 export {
-  ANY_BENEFICIARY,
   createDelegation,
   createOpenDelegation,
   signDelegation,
+  ROOT_AUTHORITY,
+  ANY_BENEFICIARY,
 } from './delegation';
 
 export type {
@@ -35,7 +36,7 @@ export {
   getDeleGatorEnvironment,
 } from './delegatorEnvironment';
 
-export { Implementation, ROOT_AUTHORITY, ANY_DELEGATE } from './constants';
+export { Implementation } from './constants';
 
 export { createExecution } from './executions';
 

packages/delegation-toolkit/test/delegation.test.ts

@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { stub } from 'sinon';
 
 import { resolveCaveats } from '../src/caveatBuilder';
-import { ROOT_AUTHORITY } from '../src/constants';
 import {
   type DelegationStruct,
+  ROOT_AUTHORITY,
   toDelegationStruct,
   createDelegation,
   createOpenDelegation,

packages/delegation-toolkit/test/experimental/delegationStorageTestData.ts

@@ -1,5 +1,7 @@
-import { ROOT_AUTHORITY } from '../../src/constants';
-import { getDelegationHashOffchain } from '../../src/delegation';
+import {
+  ROOT_AUTHORITY,
+  getDelegationHashOffchain,
+} from '../../src/delegation';
 import type { Delegation } from '../../src/types';
 
 export const TEST_ACCOUNT = '0x0E9bBA6e2D962645c5FB1064d86cc6dE6050739C';