@agoric/orchestration 0.1.1-dev-d57b08e.0.d57b08e → 0.1.1-dev-2ae3f1f.0.2ae3f1f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-d57b08e.0.d57b08e",
+  "version": "0.1.1-dev-2ae3f1f.0.2ae3f1f",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -35,19 +35,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-d57b08e.0.d57b08e",
-    "@agoric/cosmic-proto": "0.4.1-dev-d57b08e.0.d57b08e",
-    "@agoric/ertp": "0.16.3-dev-d57b08e.0.d57b08e",
-    "@agoric/internal": "0.3.3-dev-d57b08e.0.d57b08e",
-    "@agoric/network": "0.1.1-dev-d57b08e.0.d57b08e",
-    "@agoric/notifier": "0.6.3-dev-d57b08e.0.d57b08e",
-    "@agoric/store": "0.9.3-dev-d57b08e.0.d57b08e",
-    "@agoric/time": "0.3.3-dev-d57b08e.0.d57b08e",
-    "@agoric/vat-data": "0.5.3-dev-d57b08e.0.d57b08e",
-    "@agoric/vats": "0.15.2-dev-d57b08e.0.d57b08e",
-    "@agoric/vow": "0.1.1-dev-d57b08e.0.d57b08e",
-    "@agoric/zoe": "0.26.3-dev-d57b08e.0.d57b08e",
-    "@agoric/zone": "0.2.3-dev-d57b08e.0.d57b08e",
+    "@agoric/async-flow": "0.1.1-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/cosmic-proto": "0.4.1-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/ertp": "0.16.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/internal": "0.3.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/network": "0.1.1-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/notifier": "0.6.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/store": "0.9.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/time": "0.3.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/vat-data": "0.5.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/vats": "0.15.2-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/vow": "0.1.1-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/zoe": "0.26.3-dev-2ae3f1f.0.2ae3f1f",
+    "@agoric/zone": "0.2.3-dev-2ae3f1f.0.2ae3f1f",
     "@cosmjs/encoding": "^0.36.0",
     "@endo/base64": "^1.0.12",
     "@endo/errors": "^1.2.13",
@@ -60,7 +60,7 @@
     "bs58": "^6.0.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-d57b08e.0.d57b08e",
+    "@agoric/swingset-liveslots": "0.10.3-dev-2ae3f1f.0.2ae3f1f",
     "@chain-registry/client": "^1.53.194",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -106,5 +106,5 @@
   "typeCoverage": {
     "atLeast": 97.46
   },
-  "gitHead": "d57b08e6945269499ff15845f664405099f0f39b"
+  "gitHead": "2ae3f1fb1423324b633432fe7149a26bcaadd843"
 }

package/src/stubs/{viem-abi.d.ts → viem-typedData.ts}

@@ -6,7 +6,12 @@
  * So we use tsup to do dead code elimination, aka tree-shaking,
  * while preserving type info.
  */
-export { encodeFunctionData } from 'viem/utils';
-export { decodeAbiParameters } from 'viem/utils';
-export { encodeAbiParameters } from 'viem/utils';
-//# sourceMappingURL=viem-abi.d.ts.map
+export {
+  hashStruct,
+  hashTypedData,
+  recoverTypedDataAddress,
+  verifyTypedData,
+  serializeTypedData,
+  validateTypedData,
+} from 'viem/utils';
+export { encodeType } from '../utils/viem-utils/hashTypedData.ts';

package/src/utils/abitype.d.ts

@@ -0,0 +1,6 @@
+import type { TypedDataType, TypedData } from 'abitype';
+export type TypedDataParameter<TN extends string = string, TT extends string = TypedDataType | keyof TypedData | `${keyof TypedData}[${string | ''}]`> = {
+    name: TN;
+    type: TT;
+};
+//# sourceMappingURL=abitype.d.ts.map

package/src/utils/abitype.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abitype.d.ts","sourceRoot":"","sources":["abitype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGxD,MAAM,MAAM,kBAAkB,CAC5B,EAAE,SAAS,MAAM,GAAG,MAAM,EAC1B,EAAE,SAAS,MAAM,GACb,aAAa,GACb,MAAM,SAAS,GACf,GAAG,MAAM,SAAS,IAAI,MAAM,GAAG,EAAE,GAAG,IACtC;IACF,IAAI,EAAE,EAAE,CAAC;IACT,IAAI,EAAE,EAAE,CAAC;CACV,CAAC"}

package/src/utils/abitype.ts

@@ -0,0 +1,13 @@
+import type { TypedDataType, TypedData } from 'abitype';
+
+// Redefine abitype's TypedDataParameter to make it generic
+export type TypedDataParameter<
+  TN extends string = string,
+  TT extends string =
+    | TypedDataType
+    | keyof TypedData
+    | `${keyof TypedData}[${string | ''}]`,
+> = {
+  name: TN;
+  type: TT;
+};

package/src/utils/permit2/signatureTransfer.d.ts

@@ -0,0 +1,208 @@
+/**
+ * @file Signature transfer permit2 types and utilities
+ *
+ * @license MIT
+ * Copyright (c) 2021 Uniswap Lab
+ * Copied and adapted from https://github.com/Uniswap/sdks/blob/de28419fcae6e6ba6f88e4a4ae46b2fc9d226cd6/sdks/permit2-sdk/src/signatureTransfer.ts
+ *
+ * The modifications made are to generalize the witness type to allow defining the field name,
+ * and use viem types instead of ethers types.
+ *
+ * Some stylistic changes have also been made to conform to our code style.
+ */
+import type { TypedDataToPrimitiveTypes } from 'abitype';
+import type { Address, TypedData, TypedDataDefinition } from 'viem';
+import type { TypedDataParameter } from '../abitype.ts';
+interface WitnessDefinition<T extends TypedData = TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>> {
+    witnessField: TD;
+    witnessTypes: T;
+}
+export interface Witness<T extends TypedData = TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>> extends WitnessDefinition<T, TD> {
+    witness: TypedDataToPrimitiveTypes<T>[TD['type']];
+}
+export declare function makeWitness<T extends TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>>>(data: NoInfer<TypedDataToPrimitiveTypes<T>[TD['type']]>, types: T, typeParam: TD): Witness<T, TD>;
+export type TokenPermissions = {
+    token: Address;
+    amount: bigint;
+};
+export type PermitTransferFrom = {
+    permitted: TokenPermissions;
+    spender: Address;
+    nonce: bigint;
+    deadline: bigint;
+};
+export type PermitBatchTransferFrom = {
+    permitted: readonly TokenPermissions[];
+    spender: Address;
+    nonce: bigint;
+    deadline: bigint;
+};
+export declare const PermitTransferFromTypeParams: [{
+    readonly name: "permitted";
+    readonly type: "TokenPermissions";
+}, {
+    readonly name: "spender";
+    readonly type: "address";
+}, {
+    readonly name: "nonce";
+    readonly type: "uint256";
+}, {
+    readonly name: "deadline";
+    readonly type: "uint256";
+}];
+export declare const PermitBatchTransferFromTypeParams: [{
+    readonly name: "permitted";
+    readonly type: "TokenPermissions[]";
+}, {
+    readonly name: "spender";
+    readonly type: "address";
+}, {
+    readonly name: "nonce";
+    readonly type: "uint256";
+}, {
+    readonly name: "deadline";
+    readonly type: "uint256";
+}];
+export declare const PermitTransferFromTypes: {
+    readonly EIP712Domain: [{
+        readonly name: "name";
+        readonly type: "string";
+    }, {
+        readonly name: "chainId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "verifyingContract";
+        readonly type: "address";
+    }];
+    readonly PermitTransferFrom: [{
+        readonly name: "permitted";
+        readonly type: "TokenPermissions";
+    }, {
+        readonly name: "spender";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+    }, {
+        readonly name: "deadline";
+        readonly type: "uint256";
+    }];
+    readonly TokenPermissions: [{
+        readonly name: "token";
+        readonly type: "address";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+    }];
+};
+export declare const PermitBatchTransferFromTypes: {
+    readonly EIP712Domain: [{
+        readonly name: "name";
+        readonly type: "string";
+    }, {
+        readonly name: "chainId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "verifyingContract";
+        readonly type: "address";
+    }];
+    readonly PermitBatchTransferFrom: [{
+        readonly name: "permitted";
+        readonly type: "TokenPermissions[]";
+    }, {
+        readonly name: "spender";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+    }, {
+        readonly name: "deadline";
+        readonly type: "uint256";
+    }];
+    readonly TokenPermissions: [{
+        readonly name: "token";
+        readonly type: "address";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+    }];
+};
+export declare function permitWitnessTransferFromTypes<T extends TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>>(witness: WitnessDefinition<T, TD>): {
+    readonly EIP712Domain: [{
+        readonly name: "name";
+        readonly type: "string";
+    }, {
+        readonly name: "chainId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "verifyingContract";
+        readonly type: "address";
+    }];
+    readonly PermitWitnessTransferFrom: readonly [{
+        readonly name: "permitted";
+        readonly type: "TokenPermissions";
+    }, {
+        readonly name: "spender";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+    }, {
+        readonly name: "deadline";
+        readonly type: "uint256";
+    }, TD];
+    readonly TokenPermissions: [{
+        readonly name: "token";
+        readonly type: "address";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+    }];
+} & T;
+export declare function permitBatchWitnessTransferFromTypes<T extends TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>>(witness: WitnessDefinition<T, TD>): {
+    readonly EIP712Domain: [{
+        readonly name: "name";
+        readonly type: "string";
+    }, {
+        readonly name: "chainId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "verifyingContract";
+        readonly type: "address";
+    }];
+    readonly PermitBatchWitnessTransferFrom: readonly [{
+        readonly name: "permitted";
+        readonly type: "TokenPermissions[]";
+    }, {
+        readonly name: "spender";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+    }, {
+        readonly name: "deadline";
+        readonly type: "uint256";
+    }, TD];
+    readonly TokenPermissions: [{
+        readonly name: "token";
+        readonly type: "address";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+    }];
+} & T;
+export type PermitWitnessTransferFrom<T extends Record<string, unknown>, TN extends string = 'witness'> = PermitTransferFrom & {
+    [key in TN]: T;
+};
+export type PermitBatchWitnessTransferFrom<T extends Record<string, unknown>, TN extends string = 'witness'> = PermitBatchTransferFrom & {
+    [key in TN]: T;
+};
+export declare function permit2Domain(permit2Address: Address, chainId: number | bigint): {
+    readonly name: "Permit2";
+    readonly chainId: number | bigint;
+    readonly verifyingContract: `0x${string}`;
+};
+export declare function getPermitWitnessTransferFromData<T extends TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>>(permit: PermitTransferFrom, permit2Address: Address, chainId: number | bigint, witness: Witness<T, TD>): TypedDataDefinition<ReturnType<typeof permitWitnessTransferFromTypes<T, TD>>, 'PermitWitnessTransferFrom', 'PermitWitnessTransferFrom'>;
+export declare function getPermitBatchWitnessTransferFromData<T extends TypedData, TD extends TypedDataParameter<string, Extract<keyof T, string>> = TypedDataParameter<'witness', Extract<keyof T, string>>>(permit: PermitBatchTransferFrom, permit2Address: Address, chainId: number | bigint, witness: Witness<T, TD>): TypedDataDefinition<ReturnType<typeof permitBatchWitnessTransferFromTypes<T, TD>>, 'PermitBatchWitnessTransferFrom', 'PermitBatchWitnessTransferFrom'>;
+export {};
+//# sourceMappingURL=signatureTransfer.d.ts.map

package/src/utils/permit2/signatureTransfer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signatureTransfer.d.ts","sourceRoot":"","sources":["signatureTransfer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,mBAAmB,EAEpB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKxD,UAAU,iBAAiB,CACzB,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;IAEzD,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,CAAC,CAAC;CACjB;AAED,MAAM,WAAW,OAAO,CACtB,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CACzD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;CACnD;AAED,wBAAgB,WAAW,CACzB,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,EAE/D,IAAI,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EACvD,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAMhB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAQF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;EAKA,CAAC;AAE1C,eAAO,MAAM,iCAAiC;;;;;;;;;;;;EAKL,CAAC;AAO1C,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIN,CAAC;AAE/B,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIX,CAAC;AAE/B,wBAAgB,8BAA8B,CAC5C,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,EACzD,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAWlC;AAED,wBAAgB,mCAAmC,CACjD,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,EACzD,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAWlC;AAED,MAAM,MAAM,yBAAyB,CACnC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,MAAM,GAAG,SAAS,IAC3B,kBAAkB,GAAG;KAAG,GAAG,IAAI,EAAE,GAAG,CAAC;CAAE,CAAC;AAE5C,MAAM,MAAM,8BAA8B,CACxC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,MAAM,GAAG,SAAS,IAC3B,uBAAuB,GAAG;KAAG,GAAG,IAAI,EAAE,GAAG,CAAC;CAAE,CAAC;AAEjD,wBAAgB,aAAa,CAC3B,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,MAAM,GAAG,MAAM;;;;EAOzB;AAKD,wBAAgB,gCAAgC,CAC9C,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,EAEzD,MAAM,EAAE,kBAAkB,EAC1B,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,GACtB,mBAAmB,CACpB,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EACxD,2BAA2B,EAC3B,2BAA2B,CAC5B,CAoBA;AAED,wBAAgB,qCAAqC,CACnD,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC7D,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,EAEzD,MAAM,EAAE,uBAAuB,EAC/B,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,GACtB,mBAAmB,CACpB,UAAU,CAAC,OAAO,mCAAmC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAC7D,gCAAgC,EAChC,gCAAgC,CACjC,CAoBA"}

package/src/utils/permit2/signatureTransfer.ts

@@ -0,0 +1,240 @@
+/**
+ * @file Signature transfer permit2 types and utilities
+ *
+ * @license MIT
+ * Copyright (c) 2021 Uniswap Lab
+ * Copied and adapted from https://github.com/Uniswap/sdks/blob/de28419fcae6e6ba6f88e4a4ae46b2fc9d226cd6/sdks/permit2-sdk/src/signatureTransfer.ts
+ *
+ * The modifications made are to generalize the witness type to allow defining the field name,
+ * and use viem types instead of ethers types.
+ *
+ * Some stylistic changes have also been made to conform to our code style.
+ */
+
+import type { TypedDataToPrimitiveTypes } from 'abitype';
+import type {
+  Address,
+  TypedData,
+  TypedDataDefinition,
+  TypedDataDomain,
+} from 'viem';
+import type { TypedDataParameter } from '../abitype.ts';
+
+const PERMIT2_DOMAIN_NAME = 'Permit2';
+
+// TODO: disallow witness type field being another Permit field name
+interface WitnessDefinition<
+  T extends TypedData = TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+> {
+  witnessField: TD;
+  witnessTypes: T;
+}
+
+export interface Witness<
+  T extends TypedData = TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+> extends WitnessDefinition<T, TD> {
+  witness: TypedDataToPrimitiveTypes<T>[TD['type']];
+}
+
+export function makeWitness<
+  T extends TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>>,
+>(
+  data: NoInfer<TypedDataToPrimitiveTypes<T>[TD['type']]>,
+  types: T,
+  typeParam: TD,
+): Witness<T, TD> {
+  return {
+    witness: data,
+    witnessTypes: types,
+    witnessField: typeParam,
+  };
+}
+
+export type TokenPermissions = {
+  token: Address;
+  amount: bigint;
+};
+
+export type PermitTransferFrom = {
+  permitted: TokenPermissions;
+  spender: Address;
+  nonce: bigint;
+  deadline: bigint;
+};
+
+export type PermitBatchTransferFrom = {
+  permitted: readonly TokenPermissions[];
+  spender: Address;
+  nonce: bigint;
+  deadline: bigint;
+};
+
+const Permit2DomainTypeParams = [
+  { name: 'name', type: 'string' },
+  { name: 'chainId', type: 'uint256' },
+  { name: 'verifyingContract', type: 'address' },
+] as const satisfies TypedDataParameter[];
+
+export const PermitTransferFromTypeParams = [
+  { name: 'permitted', type: 'TokenPermissions' },
+  { name: 'spender', type: 'address' },
+  { name: 'nonce', type: 'uint256' },
+  { name: 'deadline', type: 'uint256' },
+] as const satisfies TypedDataParameter[];
+
+export const PermitBatchTransferFromTypeParams = [
+  { name: 'permitted', type: 'TokenPermissions[]' },
+  { name: 'spender', type: 'address' },
+  { name: 'nonce', type: 'uint256' },
+  { name: 'deadline', type: 'uint256' },
+] as const satisfies TypedDataParameter[];
+
+const TokenPermissionTypeParams = [
+  { name: 'token', type: 'address' },
+  { name: 'amount', type: 'uint256' },
+] as const satisfies TypedDataParameter[];
+
+export const PermitTransferFromTypes = {
+  EIP712Domain: Permit2DomainTypeParams,
+  PermitTransferFrom: PermitTransferFromTypeParams,
+  TokenPermissions: TokenPermissionTypeParams,
+} as const satisfies TypedData;
+
+export const PermitBatchTransferFromTypes = {
+  EIP712Domain: Permit2DomainTypeParams,
+  PermitBatchTransferFrom: PermitBatchTransferFromTypeParams,
+  TokenPermissions: TokenPermissionTypeParams,
+} as const satisfies TypedData;
+
+export function permitWitnessTransferFromTypes<
+  T extends TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+>(witness: WitnessDefinition<T, TD>) {
+  return {
+    EIP712Domain: Permit2DomainTypeParams,
+    PermitWitnessTransferFrom: [
+      ...PermitTransferFromTypeParams,
+      // Enable runtime type to accept undefined field for base type extraction
+      ...((witness ? [witness.witnessField] : []) as [TD]),
+    ],
+    TokenPermissions: TokenPermissionTypeParams,
+    ...witness?.witnessTypes,
+  } as const satisfies TypedData;
+}
+
+export function permitBatchWitnessTransferFromTypes<
+  T extends TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+>(witness: WitnessDefinition<T, TD>) {
+  return {
+    EIP712Domain: Permit2DomainTypeParams,
+    PermitBatchWitnessTransferFrom: [
+      ...PermitBatchTransferFromTypeParams,
+      // Enable runtime type to accept undefined field for base type extraction
+      ...((witness ? [witness.witnessField] : []) as [TD]),
+    ],
+    TokenPermissions: TokenPermissionTypeParams,
+    ...witness?.witnessTypes,
+  } as const satisfies TypedData;
+}
+
+export type PermitWitnessTransferFrom<
+  T extends Record<string, unknown>,
+  TN extends string = 'witness',
+> = PermitTransferFrom & { [key in TN]: T };
+
+export type PermitBatchWitnessTransferFrom<
+  T extends Record<string, unknown>,
+  TN extends string = 'witness',
+> = PermitBatchTransferFrom & { [key in TN]: T };
+
+export function permit2Domain(
+  permit2Address: Address,
+  chainId: number | bigint,
+) {
+  return {
+    name: PERMIT2_DOMAIN_NAME,
+    chainId,
+    verifyingContract: permit2Address,
+  } as const satisfies TypedDataDomain;
+}
+
+// XXX: restore permit to be either PermitTransferFrom or PermitBatchTransferFrom
+// and remove duplication between the two functions below
+// Original method was `SignatureTransfer.getPermitData`
+export function getPermitWitnessTransferFromData<
+  T extends TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+>(
+  permit: PermitTransferFrom,
+  permit2Address: Address,
+  chainId: number | bigint,
+  witness: Witness<T, TD>,
+): TypedDataDefinition<
+  ReturnType<typeof permitWitnessTransferFromTypes<T, TD>>,
+  'PermitWitnessTransferFrom',
+  'PermitWitnessTransferFrom'
+> {
+  // type MessageType = TypedDataToPrimitiveTypes<
+  //   ReturnType<typeof permitWitnessTransferFromTypes<T, TD>>
+  // >['PermitWitnessTransferFrom'];
+
+  const domain = permit2Domain(permit2Address, chainId);
+
+  const types = permitWitnessTransferFromTypes(witness);
+
+  return {
+    // @ts-expect-error some generic type inference issue
+    domain,
+    types,
+    primaryType: 'PermitWitnessTransferFrom',
+    // @ts-expect-error some generic type inference issue
+    message: {
+      ...permit,
+      [witness.witnessField.name]: witness.witness,
+    },
+  };
+}
+
+export function getPermitBatchWitnessTransferFromData<
+  T extends TypedData,
+  TD extends TypedDataParameter<string, Extract<keyof T, string>> =
+    TypedDataParameter<'witness', Extract<keyof T, string>>,
+>(
+  permit: PermitBatchTransferFrom,
+  permit2Address: Address,
+  chainId: number | bigint,
+  witness: Witness<T, TD>,
+): TypedDataDefinition<
+  ReturnType<typeof permitBatchWitnessTransferFromTypes<T, TD>>,
+  'PermitBatchWitnessTransferFrom',
+  'PermitBatchWitnessTransferFrom'
+> {
+  // type MessageType = TypedDataToPrimitiveTypes<
+  //   ReturnType<typeof permitBatchWitnessTransferFromTypes<T, TD>>
+  // >['PermitBatchWitnessTransferFrom'];
+
+  const domain = permit2Domain(permit2Address, chainId);
+
+  const types = permitBatchWitnessTransferFromTypes(witness);
+
+  return {
+    // @ts-expect-error some generic type inference issue
+    domain,
+    types,
+    primaryType: 'PermitBatchWitnessTransferFrom',
+    // @ts-expect-error some generic type inference issue
+    message: {
+      ...permit,
+      [witness.witnessField.name]: witness.witness,
+    },
+  };
+}

package/src/utils/permit2/signatureTransferHelpers.d.ts

@@ -0,0 +1,21 @@
+/**
+ * @file Helpers for working with permit2 signature transfer witness types
+ *
+ * This is original code that was adapted for permit2-sdk, unlike @see ./permit2SignatureTransfer.ts
+ */
+import type { TypedData } from 'viem';
+import type { TypedDataParameter } from '../abitype.ts';
+import { PermitBatchTransferFromTypeParams, PermitTransferFromTypeParams } from './signatureTransfer.ts';
+export declare const makeWitnessTypeStringExtractor: ({ encodeType, }: {
+    encodeType: ({ primaryType, types, }: {
+        primaryType: string;
+        types: TypedData;
+    }) => string;
+}) => (types: TypedData) => string;
+export declare const extractWitnessFieldFromTypes: <T extends Readonly<TypedDataParameter>>(types: {
+    PermitBatchWitnessTransferFrom: readonly [...typeof PermitBatchTransferFromTypeParams, T];
+} | {
+    PermitWitnessTransferFrom: readonly [...typeof PermitTransferFromTypeParams, T];
+}) => T;
+export declare const isPermit2MessageType: (type: string) => type is "PermitWitnessTransferFrom" | "PermitBatchWitnessTransferFrom";
+//# sourceMappingURL=signatureTransferHelpers.d.ts.map

package/src/utils/permit2/signatureTransferHelpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signatureTransferHelpers.d.ts","sourceRoot":"","sources":["signatureTransferHelpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACL,iCAAiC,EAEjC,4BAA4B,EAE7B,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,8BAA8B,GAAI,iBAE5C;IACD,UAAU,EAAE,CAAC,EACX,WAAW,EACX,KAAK,GACN,EAAE;QACD,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,SAAS,CAAC;KAClB,KAAK,MAAM,CAAC;CACd,MAiBsC,OAAO,SAAS,WA0BtD,CAAC;AAUF,eAAO,MAAM,4BAA4B,GACvC,CAAC,SAAS,QAAQ,CAAC,kBAAkB,CAAC,EAEtC,OACI;IACE,8BAA8B,EAAE,SAAS,CACvC,GAAG,OAAO,iCAAiC,EAC3C,CAAC,CACF,CAAC;CACH,GACD;IACE,yBAAyB,EAAE,SAAS,CAClC,GAAG,OAAO,4BAA4B,EACtC,CAAC,CACF,CAAC;CACH,KACJ,CAqCF,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,2EAKhD,CAAC"}