Add erc20TokenPeriodTransfer terms builder

Author: jeffsmale90

packages/delegation-core/src/caveats/erc20Streaming.ts

@@ -71,18 +71,18 @@ export function createERC20StreamingTerms(
     throw new Error('Invalid tokenAddress: must be a valid address');
   }
 
-  let tokenAddressHex: string;
+  let prefixedTokenAddressHex: string;
 
   if (typeof tokenAddress === 'string') {
     if (!isHexString(tokenAddress) || tokenAddress.length !== 42) {
       throw new Error('Invalid tokenAddress: must be a valid address');
     }
-    tokenAddressHex = tokenAddress.slice(2);
+    prefixedTokenAddressHex = tokenAddress;
   } else {
     if (tokenAddress.length !== 20) {
       throw new Error('Invalid tokenAddress: must be a valid address');
     }
-    tokenAddressHex = bytesToHex(tokenAddress).slice(2);
+    prefixedTokenAddressHex = bytesToHex(tokenAddress);
   }
 
   if (initialAmount < 0n) {
@@ -116,7 +116,7 @@ export function createERC20StreamingTerms(
   const amountPerSecondHex = toHexString({ value: amountPerSecond, size: 32 });
   const startTimeHex = toHexString({ value: startTime, size: 32 });
 
-  const hexValue = `0x${tokenAddressHex}${initialAmountHex}${maxAmountHex}${amountPerSecondHex}${startTimeHex}`;
+  const hexValue = `${prefixedTokenAddressHex}${initialAmountHex}${maxAmountHex}${amountPerSecondHex}${startTimeHex}`;
 
   return prepareResult(hexValue, encodingOptions);
 }

packages/delegation-core/src/caveats/erc20TokenPeriodTransfer.ts

@@ -0,0 +1,95 @@
+import {
+  defaultOptions,
+  prepareResult,
+  type EncodingOptions,
+  type ResultValue,
+} from '../returns';
+import type { Hex } from '../types';
+import { toHexString } from '../utils';
+import { type BytesLike, isHexString, bytesToHex } from '@metamask/utils';
+
+/**
+ * Terms for configuring a periodic transfer allowance of ERC20 tokens.
+ */
+export type ERC20TokenPeriodTransferTerms = {
+  /** The address of the ERC20 token. */
+  tokenAddress: BytesLike;
+  /** The maximum amount that can be transferred within each period. */
+  periodAmount: bigint;
+  /** The duration of each period in seconds. */
+  periodDuration: number;
+  /** Unix timestamp when the first period begins. */
+  startDate: number;
+};
+
+/**
+ * Creates terms for an ERC20TokenPeriodTransfer caveat that validates that ERC20 token transfers
+ * do not exceed a specified amount within a given time period. The transferable amount resets at the
+ * beginning of each period, and any unused tokens are forfeited once the period ends.
+ *
+ * @param terms - The terms for the ERC20TokenPeriodTransfer caveat.
+ * @param encodingOptions - The encoding options for the result.
+ * @returns The terms as a 128-byte hex string (32 bytes for each parameter).
+ * @throws Error if any of the numeric parameters are invalid.
+ */
+export function createERC20TokenPeriodTransferTerms(
+  terms: ERC20TokenPeriodTransferTerms,
+  encodingOptions?: EncodingOptions<'hex'>,
+): Hex;
+export function createERC20TokenPeriodTransferTerms(
+  terms: ERC20TokenPeriodTransferTerms,
+  encodingOptions: EncodingOptions<'bytes'>,
+): Uint8Array;
+/**
+ * Creates terms for an ERC20TokenPeriodTransfer caveat that validates that ERC20 token transfers
+ * do not exceed a specified amount within a given time period.
+ *
+ * @param terms - The terms for the ERC20TokenPeriodTransfer caveat.
+ * @param encodingOptions - The encoding options for the result.
+ * @returns The terms as a 128-byte hex string (32 bytes for each parameter).
+ * @throws Error if any of the numeric parameters are invalid.
+ */
+export function createERC20TokenPeriodTransferTerms(
+  terms: ERC20TokenPeriodTransferTerms,
+  encodingOptions: EncodingOptions<ResultValue> = defaultOptions,
+): Hex | Uint8Array {
+  const { tokenAddress, periodAmount, periodDuration, startDate } = terms;
+
+  if (!tokenAddress) {
+    throw new Error('Invalid tokenAddress: must be a valid address');
+  }
+
+  let prefixedTokenAddressHex: string;
+
+  if (typeof tokenAddress === 'string') {
+    if (!isHexString(tokenAddress) || tokenAddress.length !== 42) {
+      throw new Error('Invalid tokenAddress: must be a valid address');
+    }
+    prefixedTokenAddressHex = tokenAddress;
+  } else {
+    if (tokenAddress.length !== 20) {
+      throw new Error('Invalid tokenAddress: must be a valid address');
+    }
+    prefixedTokenAddressHex = bytesToHex(tokenAddress);
+  }
+
+  if (periodAmount <= 0n) {
+    throw new Error('Invalid periodAmount: must be a positive number');
+  }
+
+  if (periodDuration <= 0) {
+    throw new Error('Invalid periodDuration: must be a positive number');
+  }
+
+  if (startDate <= 0) {
+    throw new Error('Invalid startDate: must be a positive number');
+  }
+
+  const periodAmountHex = toHexString({ value: periodAmount, size: 32 });
+  const periodDurationHex = toHexString({ value: periodDuration, size: 32 });
+  const startDateHex = toHexString({ value: startDate, size: 32 });
+
+  const hexValue = `${prefixedTokenAddressHex}${periodAmountHex}${periodDurationHex}${startDateHex}`;
+
+  return prepareResult(hexValue, encodingOptions);
+}

packages/delegation-core/src/caveats/index.ts

@@ -4,3 +4,4 @@ export { createNativeTokenPeriodTransferTerms } from './nativeTokenPeriodTransfe
 export { createExactCalldataTerms } from './exactCalldata';
 export { createNativeTokenStreamingTerms } from './nativeTokenStreaming';
 export { createERC20StreamingTerms } from './erc20Streaming';
+export { createERC20TokenPeriodTransferTerms } from './erc20TokenPeriodTransfer';

packages/delegation-core/src/index.ts

@@ -11,6 +11,7 @@ export {
   createExactCalldataTerms,
   createNativeTokenStreamingTerms,
   createERC20StreamingTerms,
+  createERC20TokenPeriodTransferTerms,
 } from './caveats';
 
 export {

packages/delegation-toolkit/src/caveatBuilder/erc20PeriodTransferBuilder.ts

@@ -1,7 +1,7 @@
-import { concat, isAddress, toHex } from 'viem';
 import type { Address } from 'viem';
 
 import type { Caveat, DeleGatorEnvironment } from '../types';
+import { createERC20TokenPeriodTransferTerms } from '@metamask/delegation-core';
 
 export const erc20PeriodTransfer = 'erc20PeriodTransfer';
 
@@ -26,28 +26,12 @@ export const erc20PeriodTransferBuilder = (
   periodDuration: number,
   startDate: number,
 ): Caveat => {
-  if (!isAddress(tokenAddress)) {
-    throw new Error('Invalid tokenAddress: must be a valid address');
-  }
-
-  if (periodAmount <= 0n) {
-    throw new Error('Invalid periodAmount: must be a positive number');
-  }
-
-  if (periodDuration <= 0) {
-    throw new Error('Invalid periodDuration: must be a positive number');
-  }
-
-  if (startDate <= 0) {
-    throw new Error('Invalid startDate: must be a positive number');
-  }
-
-  const terms = concat([
+  const terms = createERC20TokenPeriodTransferTerms({
     tokenAddress,
-    toHex(periodAmount, { size: 32 }),
-    toHex(periodDuration, { size: 32 }),
-    toHex(startDate, { size: 32 }),
-  ]);
+    periodAmount,
+    periodDuration,
+    startDate,
+  });
 
   const {
     caveatEnforcers: { ERC20PeriodTransferEnforcer },