@zerodev/permissions 5.3.2 → 5.4.1

package/_types/constants.d.ts

@@ -1,6 +1,18 @@
 export declare const ECDSA_SIGNER_CONTRACT = "0x6A6F069E2a08c2468e7724Ab3250CdBFBA14D4FF";
-export declare const WEBAUTHN_SIGNER_CONTRACT = "0x8AA55d4BfAE101609078681A69B5bc3181516612";
-export declare const CALL_POLICY_CONTRACT = "0xe4Fec84B7B002273ecC86baa65a831ddB92d30a8";
+export declare const WEBAUTHN_SIGNER_CONTRACT_V0_0_1 = "0x8AA55d4BfAE101609078681A69B5bc3181516612";
+/**
+ * @dev WEBAUTHN_SIGNER_CONTRACT_V0_0_2 updates
+ * - Fixed checkSignature issue
+ */
+export declare const WEBAUTHN_SIGNER_CONTRACT_V0_0_2 = "0x58625164e306242c7613223bDeb68fbe11300606";
+export declare const CALL_POLICY_CONTRACT_V0_0_1 = "0xe4Fec84B7B002273ecC86baa65a831ddB92d30a8";
+/**
+ * @dev CALL_POLICY_CONTRACT_V0_0_2 updates
+ * - Added ONE_OF condition
+ * - Added native ETH transfer support
+ * - Added `zeroAddress` target address support, which means you can approve any contracts with specific selector. (e.g. approve any ERC20 transfer)
+ */
+export declare const CALL_POLICY_CONTRACT_V0_0_2 = "0x67Fa43ca2D689beA4d10b9F2C96828828A2Ab275";
 export declare const GAS_POLICY_CONTRACT = "0xaeFC5AbC67FfD258abD0A3E54f65E70326F84b23";
 export declare const RATE_LIMIT_POLICY_CONTRACT = "0xf63d4139B25c836334edD76641356c6b74C86873";
 export declare const SIGNATURE_POLICY_CONTRACT = "0xF6A936c88D97E6fad13b98d2FD731Ff17eeD591d";

package/_types/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,+CACc,CAAA;AAChD,eAAO,MAAM,wBAAwB,+CACW,CAAA;AAChD,eAAO,MAAM,oBAAoB,+CAA+C,CAAA;AAChF,eAAO,MAAM,mBAAmB,+CAA+C,CAAA;AAC/E,eAAO,MAAM,0BAA0B,+CACS,CAAA;AAChD,eAAO,MAAM,yBAAyB,+CACU,CAAA;AAChD,eAAO,MAAM,oBAAoB,+CAA+C,CAAA;AAChF,eAAO,MAAM,yBAAyB,+CACU,CAAA;AAEhD,oBAAY,WAAW;IACnB,kBAAkB,WAAW;IAC7B,uBAAuB,WAAW;IAClC,oBAAoB,WAAW;CAClC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,+CACc,CAAA;AAChD,eAAO,MAAM,+BAA+B,+CACI,CAAA;AAChD;;;GAGG;AACH,eAAO,MAAM,+BAA+B,+CACI,CAAA;AAEhD,eAAO,MAAM,2BAA2B,+CACQ,CAAA;AAChD;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,+CACQ,CAAA;AAChD,eAAO,MAAM,mBAAmB,+CAA+C,CAAA;AAC/E,eAAO,MAAM,0BAA0B,+CACS,CAAA;AAChD,eAAO,MAAM,yBAAyB,+CACU,CAAA;AAChD,eAAO,MAAM,oBAAoB,+CAA+C,CAAA;AAChF,eAAO,MAAM,yBAAyB,+CACU,CAAA;AAEhD,oBAAY,WAAW;IACnB,kBAAkB,WAAW;IAC7B,uBAAuB,WAAW;IAClC,oBAAoB,WAAW;CAClC"}

package/_types/policies/callPolicyUtils.d.ts

@@ -1,5 +1,5 @@
-import { type Abi, type Hex } from "viem";
-import type { GeneratePermissionFromArgsParameters, PermissionCore } from "./types.js";
-export declare function getPermissionFromABI<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ abi, args, functionName }: GeneratePermissionFromArgsParameters<TAbi, TFunctionName>): Pick<PermissionCore, "selector" | "rules">;
-export declare const encodePermissionData: (permission: PermissionCore | PermissionCore[]) => Hex;
+import { type Abi, type Address, type Hex } from "viem";
+import { type GeneratePermissionWithPolicyAddressParameters, type PermissionCore } from "./types.js";
+export declare function getPermissionFromABI<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ abi, args, functionName, policyAddress }: GeneratePermissionWithPolicyAddressParameters<TAbi, TFunctionName>): Pick<PermissionCore, "selector" | "rules">;
+export declare const encodePermissionData: (permission: PermissionCore | PermissionCore[], policyAddress: Address) => Hex;
 //# sourceMappingURL=callPolicyUtils.d.ts.map

package/_types/policies/callPolicyUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callPolicyUtils.d.ts","sourceRoot":"","sources":["../../policies/callPolicyUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,GAAG,EAGR,KAAK,GAAG,EAOX,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAER,oCAAoC,EAEpC,cAAc,EACjB,MAAM,YAAY,CAAA;AAEnB,wBAAgB,oBAAoB,CAChC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,EACnD,EACE,GAAG,EACH,IAAI,EACJ,YAAY,EACf,EAAE,oCAAoC,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CAC/D,cAAc,EACd,UAAU,GAAG,OAAO,CACvB,CAwCA;AAED,eAAO,MAAM,oBAAoB,eACjB,cAAc,GAAG,cAAc,EAAE,KAC9C,GAgDF,CAAA"}
+{"version":3,"file":"callPolicyUtils.d.ts","sourceRoot":"","sources":["../../policies/callPolicyUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,GAAG,EAER,KAAK,OAAO,EAEZ,KAAK,GAAG,EAOX,MAAM,MAAM,CAAA;AAKb,OAAO,EAEH,KAAK,6CAA6C,EAGlD,KAAK,cAAc,EACtB,MAAM,YAAY,CAAA;AAEnB,wBAAgB,oBAAoB,CAChC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,EACnD,EACE,GAAG,EACH,IAAI,EACJ,YAAY,EACZ,aAAa,EAChB,EAAE,6CAA6C,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CACxE,cAAc,EACd,UAAU,GAAG,OAAO,CACvB,CA0EA;AAED,eAAO,MAAM,oBAAoB,eACjB,cAAc,GAAG,cAAc,EAAE,iBAC9B,OAAO,KACvB,GAkDF,CAAA"}

package/_types/policies/index.d.ts

@@ -1,7 +1,7 @@
 export { toGasPolicy, type GasPolicyParams } from "./toGasPolicy.js";
 export { toSignatureCallerPolicy, type SignatureCallerPolicyParams } from "./toSignatureCallerPolicy.js";
 export { toRateLimitPolicy, type RateLimitPolicyParams } from "./toRateLimitPolicy.js";
-export { toCallPolicy, type CallPolicyParams } from "./toCallPolicy.js";
+export { toCallPolicy, type CallPolicyParams, CallPolicyVersion } from "./toCallPolicy.js";
 export { toPolicyId } from "./utils/toPolicyId.js";
 export { toSudoPolicy, type SudoPolicyParams } from "./toSudoPolicy.js";
 export { CallType, ParamCondition } from "./types.js";

package/_types/policies/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../policies/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EACH,uBAAuB,EACvB,KAAK,2BAA2B,EACnC,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,iBAAiB,EACjB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EACH,iBAAiB,EACjB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../policies/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EACH,uBAAuB,EACvB,KAAK,2BAA2B,EACnC,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,iBAAiB,EACjB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACH,YAAY,EACZ,KAAK,gBAAgB,EACrB,iBAAiB,EACpB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EACH,iBAAiB,EACjB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAA"}

package/_types/policies/toCallPolicy.d.ts

@@ -1,8 +1,14 @@
-import type { Abi } from "viem";
+import type { Abi, Address } from "viem";
 import type { Policy, PolicyParams } from "../types.js";
 import { type Permission } from "./types.js";
+export declare enum CallPolicyVersion {
+    V0_0_1 = "0.0.1",
+    V0_0_2 = "0.0.2"
+}
+export declare const getCallPolicyAddress: (policyVersion: CallPolicyVersion, policyAddress?: Address) => Address;
 export type CallPolicyParams<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string> = PolicyParams & {
+    policyVersion: CallPolicyVersion;
     permissions?: Permission<TAbi, TFunctionName>[];
 };
-export declare function toCallPolicy<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ policyAddress, policyFlag, permissions }: CallPolicyParams<TAbi, TFunctionName>): Policy;
+export declare function toCallPolicy<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ policyAddress, policyFlag, policyVersion, permissions }: CallPolicyParams<TAbi, TFunctionName>): Policy;
 //# sourceMappingURL=toCallPolicy.d.ts.map

package/_types/policies/toCallPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toCallPolicy.d.ts","sourceRoot":"","sources":["../../policies/toCallPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAI/B,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAKvD,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAEtD,MAAM,MAAM,gBAAgB,CACxB,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,IACjD,YAAY,GAAG;IACf,WAAW,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAA;CAClD,CAAA;AAED,wBAAgB,YAAY,CACxB,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,EACnD,EACE,aAAoC,EACpC,UAA2C,EAC3C,WAAgB,EACnB,EAAE,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,CAuChD"}
+{"version":3,"file":"toCallPolicy.d.ts","sourceRoot":"","sources":["../../policies/toCallPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAOxC,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAKvD,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAEtD,oBAAY,iBAAiB;IACzB,MAAM,UAAU;IAChB,MAAM,UAAU;CACnB;AAED,eAAO,MAAM,oBAAoB,kBACd,iBAAiB,kBAChB,OAAO,KACxB,OAQF,CAAA;AAED,MAAM,MAAM,gBAAgB,CACxB,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,IACjD,YAAY,GAAG;IACf,aAAa,EAAE,iBAAiB,CAAA;IAChC,WAAW,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAA;CAClD,CAAA;AAED,wBAAgB,YAAY,CACxB,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EACrC,aAAa,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,EACnD,EACE,aAAa,EACb,UAA2C,EAC3C,aAAa,EACb,WAAgB,EACnB,EAAE,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,CA8ChD"}

package/_types/policies/types.d.ts

@@ -11,12 +11,13 @@ export declare enum ParamCondition {
     LESS_THAN = 2,
     GREATER_THAN_OR_EQUAL = 3,
     LESS_THAN_OR_EQUAL = 4,
-    NOT_EQUAL = 5
+    NOT_EQUAL = 5,
+    ONE_OF = 6
 }
 export interface ParamRule {
     condition: ParamCondition;
     offset: number;
-    param: Hex;
+    params: Hex | Hex[];
 }
 export type PermissionCore = {
     callType?: CallType;
@@ -40,11 +41,18 @@ export type Permission<TAbi extends Abi | readonly unknown[], TFunctionName exte
 } & GetFunctionArgs<TAbi, TFunctionName> : _FunctionName extends string ? {
     abi?: [Narrow<TAbi[number]>];
 } & GetFunctionArgs<TAbi, _FunctionName> : never);
+type ConditionValue<TAbiParameter extends AbiParameter, TAbiParameterKind extends AbiParameterKind> = {
+    condition: ParamCondition.ONE_OF;
+    value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>[];
+} | {
+    condition: Exclude<ParamCondition, ParamCondition.ONE_OF>;
+    value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>;
+};
 export type CombinedArgs<TAbiParameters extends readonly AbiParameter[], TAbiParameterKind extends AbiParameterKind = AbiParameterKind> = {
-    [K in keyof TAbiParameters]: {
-        condition: ParamCondition;
-        value: AbiParameterToPrimitiveType<TAbiParameters[K], TAbiParameterKind>;
-    } | null;
+    [K in keyof TAbiParameters]: ConditionValue<TAbiParameters[K], TAbiParameterKind> | null;
+};
+export type GeneratePermissionWithPolicyAddressParameters<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string> = GeneratePermissionFromArgsParameters<TAbi, TFunctionName> & {
+    policyAddress: Address;
 };
 export type GeneratePermissionFromArgsParameters<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string, _FunctionName = TAbi extends Abi ? InferFunctionName<TAbi, TFunctionName> : never> = {
     functionName?: _FunctionName;
@@ -53,4 +61,5 @@ export type GeneratePermissionFromArgsParameters<TAbi extends Abi | readonly unk
 } & GetFunctionArgs<TAbi, TFunctionName> : _FunctionName extends string ? {
     abi: [Narrow<TAbi[number]>];
 } & GetFunctionArgs<TAbi, _FunctionName> : never);
+export {};
 //# sourceMappingURL=types.d.ts.map

package/_types/policies/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../policies/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../policies/types.ts"],"names":[],"mappings":"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"}

package/_types/signers/index.d.ts

@@ -1,5 +1,5 @@
 export { toECDSASigner, type ECDSAModularSignerParams } from "./toECDSASigner.js";
-export { toWebAuthnSigner, type WebAuthnModularSignerParams } from "./toWebAuthnSigner.js";
+export { toWebAuthnSigner, type WebAuthnModularSignerParams, WebAuthnSignerVersion } from "./toWebAuthnSigner.js";
 export { WebAuthnMode, toWebAuthnKey } from "@zerodev/webauthn-key";
 export { toSignerId } from "./utils/toSignerId.js";
 export { toEmptyECDSASigner } from "./toEmptyECDSASigner.js";

package/_types/signers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../signers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,KAAK,wBAAwB,EAChC,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACH,gBAAgB,EAChB,KAAK,2BAA2B,EACnC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../signers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,KAAK,wBAAwB,EAChC,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACH,gBAAgB,EAChB,KAAK,2BAA2B,EAChC,qBAAqB,EACxB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA"}

package/_types/signers/toWebAuthnSigner.d.ts

@@ -1,8 +1,14 @@
 import type { WebAuthnKey } from "@zerodev/webauthn-key";
-import { type Chain, type Client, type Transport } from "viem";
+import { type Address, type Chain, type Client, type Transport } from "viem";
 import type { ModularSigner, ModularSignerParams } from "../types.js";
+export declare enum WebAuthnSignerVersion {
+    V0_0_1 = "0.0.1",
+    V0_0_2 = "0.0.2"
+}
 export type WebAuthnModularSignerParams = ModularSignerParams & {
     webAuthnKey: WebAuthnKey;
+    webAuthnSignerVersion: WebAuthnSignerVersion;
 };
-export declare const toWebAuthnSigner: <TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { signerContractAddress, webAuthnKey }: WebAuthnModularSignerParams) => Promise<ModularSigner>;
+export declare const getWebAuthnSignerAddress: (webAuthnSignerVersion: WebAuthnSignerVersion, webAuthnSignerAddress?: Address) => Address;
+export declare const toWebAuthnSigner: <TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { signerContractAddress, webAuthnKey, webAuthnSignerVersion }: WebAuthnModularSignerParams) => Promise<ModularSigner>;
 //# sourceMappingURL=toWebAuthnSigner.d.ts.map

package/_types/signers/toWebAuthnSigner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toWebAuthnSigner.d.ts","sourceRoot":"","sources":["../../signers/toWebAuthnSigner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAYxD,OAAO,EACH,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,SAAS,EAKjB,MAAM,MAAM,CAAA;AAKb,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAErE,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC5D,WAAW,EAAE,WAAW,CAAA;CAC3B,CAAA;AAiFD,eAAO,MAAM,gBAAgB,0LAQtB,2BAA2B,KAC/B,QAAQ,aAAa,CAkFvB,CAAA"}
+{"version":3,"file":"toWebAuthnSigner.d.ts","sourceRoot":"","sources":["../../signers/toWebAuthnSigner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAYxD,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,SAAS,EAKjB,MAAM,MAAM,CAAA;AAQb,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAErE,oBAAY,qBAAqB;IAC7B,MAAM,UAAU;IAChB,MAAM,UAAU;CACnB;AAED,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC5D,WAAW,EAAE,WAAW,CAAA;IACxB,qBAAqB,EAAE,qBAAqB,CAAA;CAC/C,CAAA;AAiFD,eAAO,MAAM,wBAAwB,0BACV,qBAAqB,0BACpB,OAAO,KAChC,OAQF,CAAA;AAED,eAAO,MAAM,gBAAgB,iNAStB,2BAA2B,KAC/B,QAAQ,aAAa,CAuFvB,CAAA"}

package/constants.ts

@@ -1,8 +1,24 @@
 export const ECDSA_SIGNER_CONTRACT =
     "0x6A6F069E2a08c2468e7724Ab3250CdBFBA14D4FF"
-export const WEBAUTHN_SIGNER_CONTRACT =
+export const WEBAUTHN_SIGNER_CONTRACT_V0_0_1 =
     "0x8AA55d4BfAE101609078681A69B5bc3181516612"
-export const CALL_POLICY_CONTRACT = "0xe4Fec84B7B002273ecC86baa65a831ddB92d30a8"
+/**
+ * @dev WEBAUTHN_SIGNER_CONTRACT_V0_0_2 updates
+ * - Fixed checkSignature issue
+ */
+export const WEBAUTHN_SIGNER_CONTRACT_V0_0_2 =
+    "0x58625164e306242c7613223bDeb68fbe11300606"
+
+export const CALL_POLICY_CONTRACT_V0_0_1 =
+    "0xe4Fec84B7B002273ecC86baa65a831ddB92d30a8"
+/**
+ * @dev CALL_POLICY_CONTRACT_V0_0_2 updates
+ * - Added ONE_OF condition
+ * - Added native ETH transfer support
+ * - Added `zeroAddress` target address support, which means you can approve any contracts with specific selector. (e.g. approve any ERC20 transfer)
+ */
+export const CALL_POLICY_CONTRACT_V0_0_2 =
+    "0x67Fa43ca2D689beA4d10b9F2C96828828A2Ab275"
 export const GAS_POLICY_CONTRACT = "0xaeFC5AbC67FfD258abD0A3E54f65E70326F84b23"
 export const RATE_LIMIT_POLICY_CONTRACT =
     "0xf63d4139B25c836334edD76641356c6b74C86873"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zerodev/permissions",
-    "version": "5.3.2",
+    "version": "5.4.1",
     "author": "ZeroDev",
     "main": "./_cjs/index.js",
     "module": "./_esm/index.js",

package/policies/callPolicyUtils.ts

@@ -1,6 +1,7 @@
 import {
     type Abi,
     type AbiFunction,
+    type Address,
     type GetAbiItemParameters,
     type Hex,
     encodeAbiParameters,
@@ -10,11 +11,16 @@ import {
     toFunctionSelector,
     toHex
 } from "viem"
-import type {
-    CombinedArgs,
-    GeneratePermissionFromArgsParameters,
-    ParamRule,
-    PermissionCore
+import {
+    CALL_POLICY_CONTRACT_V0_0_1,
+    CALL_POLICY_CONTRACT_V0_0_2
+} from "../constants.js"
+import {
+    type CombinedArgs,
+    type GeneratePermissionWithPolicyAddressParameters,
+    ParamCondition,
+    type ParamRule,
+    type PermissionCore
 } from "./types.js"
 
 export function getPermissionFromABI<
@@ -23,8 +29,9 @@ export function getPermissionFromABI<
 >({
     abi,
     args,
-    functionName
-}: GeneratePermissionFromArgsParameters<TAbi, TFunctionName>): Pick<
+    functionName,
+    policyAddress
+}: GeneratePermissionWithPolicyAddressParameters<TAbi, TFunctionName>): Pick<
     PermissionCore,
     "selector" | "rules"
 > {
@@ -46,10 +53,16 @@ export function getPermissionFromABI<
     let paramRules: ParamRule[] = []
     if (args && Array.isArray(args)) {
         paramRules = (args as CombinedArgs<AbiFunction["inputs"]>)
-            .map(
-                (arg, i) =>
-                    arg && {
-                        param: pad(
+            .map((arg, i) => {
+                if (!arg) return null
+                if (policyAddress === CALL_POLICY_CONTRACT_V0_0_1) {
+                    if (arg.condition === ParamCondition.ONE_OF) {
+                        throw Error(
+                            "The ONE_OF condition is only supported from CALL_POLICY_CONTRACT_V0_0_2 onwards. Please use CALL_POLICY_CONTRACT_V0_0_2 or a later version."
+                        )
+                    }
+                    return {
+                        params: pad(
                             isHex(arg.value)
                                 ? arg.value
                                 : toHex(
@@ -60,7 +73,35 @@ export function getPermissionFromABI<
                         offset: i * 32,
                         condition: arg.condition
                     }
-            )
+                }
+                let params: Hex[]
+                if (arg.condition === ParamCondition.ONE_OF) {
+                    params = arg.value.map((value) =>
+                        pad(
+                            isHex(value)
+                                ? value
+                                : toHex(value as Parameters<typeof toHex>[0]),
+                            { size: 32 }
+                        )
+                    )
+                } else {
+                    params = [
+                        pad(
+                            isHex(arg.value)
+                                ? arg.value
+                                : toHex(
+                                      arg.value as Parameters<typeof toHex>[0]
+                                  ),
+                            { size: 32 }
+                        )
+                    ]
+                }
+                return {
+                    params,
+                    offset: i * 32,
+                    condition: arg.condition
+                }
+            })
             .filter((rule) => rule) as ParamRule[]
     }
     return {
@@ -70,7 +111,8 @@ export function getPermissionFromABI<
 }
 
 export const encodePermissionData = (
-    permission: PermissionCore | PermissionCore[]
+    permission: PermissionCore | PermissionCore[],
+    policyAddress: Address
 ): Hex => {
     const permissionParam = {
         components: [
@@ -102,10 +144,12 @@ export const encodePermissionData = (
                         name: "offset",
                         type: "uint64"
                     },
-
                     {
-                        name: "param",
-                        type: "bytes32"
+                        name: "params",
+                        type:
+                            policyAddress === CALL_POLICY_CONTRACT_V0_0_2
+                                ? "bytes32[]"
+                                : "bytes32"
                     }
                 ],
                 name: "rules",

package/policies/index.ts

@@ -7,7 +7,11 @@ export {
     toRateLimitPolicy,
     type RateLimitPolicyParams
 } from "./toRateLimitPolicy.js"
-export { toCallPolicy, type CallPolicyParams } from "./toCallPolicy.js"
+export {
+    toCallPolicy,
+    type CallPolicyParams,
+    CallPolicyVersion
+} from "./toCallPolicy.js"
 export { toPolicyId } from "./utils/toPolicyId.js"
 export { toSudoPolicy, type SudoPolicyParams } from "./toSudoPolicy.js"
 export { CallType, ParamCondition } from "./types.js"

package/policies/toCallPolicy.ts

@@ -1,7 +1,10 @@
-import type { Abi } from "viem"
+import type { Abi, Address } from "viem"
 import { concatHex, pad } from "viem"
-import { PolicyFlags } from "../constants.js"
-import { CALL_POLICY_CONTRACT } from "../constants.js"
+import {
+    CALL_POLICY_CONTRACT_V0_0_1,
+    CALL_POLICY_CONTRACT_V0_0_2,
+    PolicyFlags
+} from "../constants.js"
 import type { Policy, PolicyParams } from "../types.js"
 import {
     encodePermissionData,
@@ -9,10 +12,29 @@ import {
 } from "./callPolicyUtils.js"
 import { CallType, type Permission } from "./types.js"
 
+export enum CallPolicyVersion {
+    V0_0_1 = "0.0.1",
+    V0_0_2 = "0.0.2"
+}
+
+export const getCallPolicyAddress = (
+    policyVersion: CallPolicyVersion,
+    policyAddress?: Address
+): Address => {
+    if (policyAddress) return policyAddress
+    switch (policyVersion) {
+        case CallPolicyVersion.V0_0_1:
+            return CALL_POLICY_CONTRACT_V0_0_1
+        case CallPolicyVersion.V0_0_2:
+            return CALL_POLICY_CONTRACT_V0_0_2
+    }
+}
+
 export type CallPolicyParams<
     TAbi extends Abi | readonly unknown[],
     TFunctionName extends string | undefined = string
 > = PolicyParams & {
+    policyVersion: CallPolicyVersion
     permissions?: Permission<TAbi, TFunctionName>[]
 }
 
@@ -20,15 +42,19 @@ export function toCallPolicy<
     TAbi extends Abi | readonly unknown[],
     TFunctionName extends string | undefined = string
 >({
-    policyAddress = CALL_POLICY_CONTRACT,
+    policyAddress,
     policyFlag = PolicyFlags.FOR_ALL_VALIDATION,
+    policyVersion,
     permissions = []
 }: CallPolicyParams<TAbi, TFunctionName>): Policy {
+    const callPolicyAddress = getCallPolicyAddress(policyVersion, policyAddress)
+
     const generatedPermissionParams = permissions?.map((perm) =>
         getPermissionFromABI({
             abi: perm.abi as Abi,
             functionName: perm.functionName as string,
-            args: perm.args as []
+            args: perm.args as [],
+            policyAddress: callPolicyAddress
         })
     )
 
@@ -44,17 +70,21 @@ export function toCallPolicy<
             rules: perm.rules ?? generatedPermissionParams?.[index]?.rules ?? []
         })) ?? []
 
-    const encodedPermissionData = encodePermissionData(permissions)
+    const encodedPermissionData = encodePermissionData(
+        permissions,
+        callPolicyAddress
+    )
 
     return {
         getPolicyData: () => {
             return encodedPermissionData
         },
         getPolicyInfoInBytes: () => {
-            return concatHex([policyFlag, policyAddress])
+            return concatHex([policyFlag, callPolicyAddress])
         },
         policyParams: {
             type: "call",
+            policyVersion,
             policyAddress,
             policyFlag,
             permissions

package/policies/types.ts

@@ -23,13 +23,14 @@ export enum ParamCondition {
     LESS_THAN = 2,
     GREATER_THAN_OR_EQUAL = 3,
     LESS_THAN_OR_EQUAL = 4,
-    NOT_EQUAL = 5
+    NOT_EQUAL = 5,
+    ONE_OF = 6
 }
 
 export interface ParamRule {
     condition: ParamCondition
     offset: number
-    param: Hex
+    params: Hex | Hex[]
 }
 
 export type PermissionCore = {
@@ -93,14 +94,34 @@ export type Permission<
             >
           : never)
 
+type ConditionValue<
+    TAbiParameter extends AbiParameter,
+    TAbiParameterKind extends AbiParameterKind
+> =
+    | {
+          condition: ParamCondition.ONE_OF
+          value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>[]
+      }
+    | {
+          condition: Exclude<ParamCondition, ParamCondition.ONE_OF>
+          value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>
+      }
+
 export type CombinedArgs<
     TAbiParameters extends readonly AbiParameter[],
     TAbiParameterKind extends AbiParameterKind = AbiParameterKind
 > = {
-    [K in keyof TAbiParameters]: {
-        condition: ParamCondition
-        value: AbiParameterToPrimitiveType<TAbiParameters[K], TAbiParameterKind>
-    } | null
+    [K in keyof TAbiParameters]: ConditionValue<
+        TAbiParameters[K],
+        TAbiParameterKind
+    > | null
+}
+
+export type GeneratePermissionWithPolicyAddressParameters<
+    TAbi extends Abi | readonly unknown[],
+    TFunctionName extends string | undefined = string
+> = GeneratePermissionFromArgsParameters<TAbi, TFunctionName> & {
+    policyAddress: Address
 }
 
 export type GeneratePermissionFromArgsParameters<

package/signers/index.ts

@@ -4,7 +4,8 @@ export {
 } from "./toECDSASigner.js"
 export {
     toWebAuthnSigner,
-    type WebAuthnModularSignerParams
+    type WebAuthnModularSignerParams,
+    WebAuthnSignerVersion
 } from "./toWebAuthnSigner.js"
 export { WebAuthnMode, toWebAuthnKey } from "@zerodev/webauthn-key"
 export { toSignerId } from "./utils/toSignerId.js"

package/signers/toWebAuthnSigner.ts

@@ -12,6 +12,7 @@ import {
 import type { TypedData } from "abitype"
 import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts"
 import {
+    type Address,
     type Chain,
     type Client,
     type LocalAccount,
@@ -25,11 +26,20 @@ import {
 import { type SignableMessage, encodeAbiParameters } from "viem"
 import { toAccount } from "viem/accounts"
 import { getChainId, signMessage } from "viem/actions"
-import { WEBAUTHN_SIGNER_CONTRACT } from "../constants.js"
+import {
+    WEBAUTHN_SIGNER_CONTRACT_V0_0_1,
+    WEBAUTHN_SIGNER_CONTRACT_V0_0_2
+} from "../constants.js"
 import type { ModularSigner, ModularSignerParams } from "../types.js"
 
+export enum WebAuthnSignerVersion {
+    V0_0_1 = "0.0.1",
+    V0_0_2 = "0.0.2"
+}
+
 export type WebAuthnModularSignerParams = ModularSignerParams & {
     webAuthnKey: WebAuthnKey
+    webAuthnSignerVersion: WebAuthnSignerVersion
 }
 
 const signMessageUsingWebAuthn = async (
@@ -111,16 +121,35 @@ const signMessageUsingWebAuthn = async (
     return encodedSignature
 }
 
+export const getWebAuthnSignerAddress = (
+    webAuthnSignerVersion: WebAuthnSignerVersion,
+    webAuthnSignerAddress?: Address
+): Address => {
+    if (webAuthnSignerAddress) return webAuthnSignerAddress
+    switch (webAuthnSignerVersion) {
+        case WebAuthnSignerVersion.V0_0_1:
+            return WEBAUTHN_SIGNER_CONTRACT_V0_0_1
+        case WebAuthnSignerVersion.V0_0_2:
+            return WEBAUTHN_SIGNER_CONTRACT_V0_0_2
+    }
+}
+
 export const toWebAuthnSigner = async <
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined
 >(
     client: Client<TTransport, TChain, undefined>,
     {
-        signerContractAddress = WEBAUTHN_SIGNER_CONTRACT,
-        webAuthnKey
+        signerContractAddress,
+        webAuthnKey,
+        webAuthnSignerVersion
     }: WebAuthnModularSignerParams
 ): Promise<ModularSigner> => {
+    const webAuthnSignerAddress = getWebAuthnSignerAddress(
+        webAuthnSignerVersion,
+        signerContractAddress
+    )
+
     const chainId = await getChainId(client)
 
     const account: LocalAccount = toAccount({
@@ -161,7 +190,7 @@ export const toWebAuthnSigner = async <
 
     return {
         account,
-        signerContractAddress,
+        signerContractAddress: webAuthnSignerAddress,
         getSignerData: () => {
             return encodeAbiParameters(
                 [