permissionless 0.1.9 → 0.1.11

package/_types/accounts/safe/signerToSafeSmartAccount.d.ts

@@ -1,15 +1,15 @@
 import { type Address, type Chain, type Client, type Transport } from "viem";
-import type { ENTRYPOINT_ADDRESS_V06_TYPE, Prettify } from "../../types";
-import type { EntryPoint } from "../../types/entrypoint";
+import type { Prettify } from "../../types";
+import type { EntryPoint } from "../../types";
 import { type SmartAccount, type SmartAccountSigner } from "../types";
 export type SafeVersion = "1.4.1";
-export type SafeSmartAccount<entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE = ENTRYPOINT_ADDRESS_V06_TYPE, transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined> = SmartAccount<entryPoint, "SafeSmartAccount", transport, chain>;
+export type SafeSmartAccount<entryPoint extends EntryPoint, transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined> = SmartAccount<entryPoint, "SafeSmartAccount", transport, chain>;
 export type SignerToSafeSmartAccountParameters<entryPoint extends EntryPoint, TSource extends string = string, TAddress extends Address = Address> = Prettify<{
     signer: SmartAccountSigner<TSource, TAddress>;
     safeVersion: SafeVersion;
     entryPoint: entryPoint;
     address?: Address;
-    addModuleLibAddress?: Address;
+    safeModuleSetupAddress?: Address;
     safe4337ModuleAddress?: Address;
     safeProxyFactoryAddress?: Address;
     safeSingletonAddress?: Address;
@@ -30,5 +30,5 @@ export type SignerToSafeSmartAccountParameters<entryPoint extends EntryPoint, TS
  *
  * @returns A Private Key Simple Account.
  */
-export declare function signerToSafeSmartAccount<entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TSource extends string = string, TAddress extends Address = Address>(client: Client<TTransport, TChain>, { signer, address, safeVersion, entryPoint: entryPointAddress, addModuleLibAddress: _addModuleLibAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce, validUntil, validAfter, safeModules, setupTransactions }: SignerToSafeSmartAccountParameters<entryPoint, TSource, TAddress>): Promise<SafeSmartAccount<entryPoint, TTransport, TChain>>;
+export declare function signerToSafeSmartAccount<entryPoint extends EntryPoint, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TSource extends string = string, TAddress extends Address = Address>(client: Client<TTransport, TChain>, { signer, address, safeVersion, entryPoint: entryPointAddress, safeModuleSetupAddress: _safeModuleSetupAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce, validUntil, validAfter, safeModules, setupTransactions }: SignerToSafeSmartAccountParameters<entryPoint, TSource, TAddress>): Promise<SafeSmartAccount<entryPoint, TTransport, TChain>>;
 //# sourceMappingURL=signerToSafeSmartAccount.d.ts.map

package/_types/accounts/safe/signerToSafeSmartAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerToSafeSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/safe/signerToSafeSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAIX,KAAK,SAAS,EAcjB,MAAM,MAAM,CAAA;AAQb,OAAO,KAAK,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD,OAAO,EAEH,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAC1B,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,WAAW,GAAG,OAAO,CAAA;AAuIjC,MAAM,MAAM,gBAAgB,CACxB,UAAU,SACN,2BAA2B,GAAG,2BAA2B,EAC7D,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IACnD,YAAY,CAAC,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;AAyTlE,MAAM,MAAM,kCAAkC,CAC1C,UAAU,SAAS,UAAU,EAC7B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,QAAQ,SAAS,OAAO,GAAG,OAAO,IAClC,QAAQ,CAAC;IACT,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC7C,WAAW,EAAE,WAAW,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE;QAChB,EAAE,EAAE,OAAO,CAAA;QACX,IAAI,EAAE,OAAO,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KAChB,EAAE,CAAA;IACH,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;CAC1B,CAAC,CAAA;AAEF;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC1C,UAAU,SAAS,2BAA2B,EAC9C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,QAAQ,SAAS,OAAO,GAAG,OAAO,EAElC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,EAClC,EACI,MAAM,EACN,OAAO,EACP,WAAW,EACX,UAAU,EAAE,iBAAiB,EAC7B,mBAAmB,EAAE,oBAAoB,EACzC,qBAAqB,EAAE,sBAAsB,EAC7C,uBAAuB,EAAE,wBAAwB,EACjD,oBAAoB,EAAE,qBAAqB,EAC3C,gBAAgB,EAAE,iBAAiB,EACnC,wBAAwB,EAAE,yBAAyB,EACnD,SAAc,EACd,UAAc,EACd,UAAc,EACd,WAAgB,EAChB,iBAAsB,EACzB,EAAE,kCAAkC,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,GACrE,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CA4S3D"}
+{"version":3,"file":"signerToSafeSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/safe/signerToSafeSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAIX,KAAK,SAAS,EAgBjB,MAAM,MAAM,CAAA;AAQb,OAAO,KAAK,EAGR,QAAQ,EACX,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAA;AAQ5D,OAAO,EAEH,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAC1B,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,WAAW,GAAG,OAAO,CAAA;AA6KjC,MAAM,MAAM,gBAAgB,CACxB,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IACnD,YAAY,CAAC,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;AA0VlE,MAAM,MAAM,kCAAkC,CAC1C,UAAU,SAAS,UAAU,EAC7B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,QAAQ,SAAS,OAAO,GAAG,OAAO,IAClC,QAAQ,CAAC;IACT,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC7C,WAAW,EAAE,WAAW,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE;QAChB,EAAE,EAAE,OAAO,CAAA;QACX,IAAI,EAAE,OAAO,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KAChB,EAAE,CAAA;IACH,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;CAC1B,CAAC,CAAA;AAEF;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC1C,UAAU,SAAS,UAAU,EAC7B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,QAAQ,SAAS,OAAO,GAAG,OAAO,EAElC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,EAClC,EACI,MAAM,EACN,OAAO,EACP,WAAW,EACX,UAAU,EAAE,iBAAiB,EAC7B,sBAAsB,EAAE,uBAAuB,EAC/C,qBAAqB,EAAE,sBAAsB,EAC7C,uBAAuB,EAAE,wBAAwB,EACjD,oBAAoB,EAAE,qBAAqB,EAC3C,gBAAgB,EAAE,iBAAiB,EACnC,wBAAwB,EAAE,yBAAyB,EACnD,SAAc,EACd,UAAc,EACd,UAAc,EACd,WAAgB,EAChB,iBAAsB,EACzB,EAAE,kCAAkC,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,GACrE,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CA4S3D"}

package/_types/errors/sendUserOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendUserOperation.d.ts","sourceRoot":"","sources":["../../errors/sendUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,MAAM,0BAA0B,CAAC,UAAU,SAAS,UAAU,IAChE,sBAAsB,CAAC,UAAU,CAAC,GAAG;IACjC,IAAI,EAAE,wBAAwB,CAAA;CACjC,CAAA;AACL,qBAAa,sBAAsB,CAC/B,UAAU,SAAS,UAAU,CAC/B,SAAQ,SAAS;IACN,KAAK,EAAE,SAAS,CAAA;IAEhB,IAAI,SAA2B;gBAGpC,KAAK,EAAE,SAAS,EAChB,EACI,aAAa,EACb,UAAU,EACV,QAAQ,EACX,EAAE,2BAA2B,CAAC,UAAU,CAAC,GAAG;QACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB;CA4BR"}
+{"version":3,"file":"sendUserOperation.d.ts","sourceRoot":"","sources":["../../errors/sendUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,MAAM,0BAA0B,CAAC,UAAU,SAAS,UAAU,IAChE,sBAAsB,CAAC,UAAU,CAAC,GAAG;IACjC,IAAI,EAAE,wBAAwB,CAAA;CACjC,CAAA;AACL,qBAAa,sBAAsB,CAC/B,UAAU,SAAS,UAAU,CAC/B,SAAQ,SAAS;IACN,KAAK,EAAE,SAAS,CAAA;IAEhB,IAAI,SAA2B;gBAGpC,KAAK,EAAE,SAAS,EAChB,EACI,aAAa,EACb,UAAU,EACV,QAAQ,EACX,EAAE,2BAA2B,CAAC,UAAU,CAAC,GAAG;QACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB;CAkBR"}

package/_types/utils/getEntryPointVersion.d.ts

@@ -1,6 +1,8 @@
-import type { ENTRYPOINT_ADDRESS_V06_TYPE, ENTRYPOINT_ADDRESS_V07_TYPE } from "../types";
+import type { ENTRYPOINT_ADDRESS_V06_TYPE, ENTRYPOINT_ADDRESS_V07_TYPE, UserOperation } from "../types";
 import type { EntryPoint, GetEntryPointVersion } from "../types/entrypoint";
 export declare const ENTRYPOINT_ADDRESS_V06: ENTRYPOINT_ADDRESS_V06_TYPE;
 export declare const ENTRYPOINT_ADDRESS_V07: ENTRYPOINT_ADDRESS_V07_TYPE;
 export declare const getEntryPointVersion: (entryPoint: EntryPoint) => GetEntryPointVersion<EntryPoint>;
+export declare function isUserOperationVersion06(entryPoint: EntryPoint, _operation: UserOperation<"v0.6"> | UserOperation<"v0.7">): _operation is UserOperation<"v0.6">;
+export declare function isUserOperationVersion07(entryPoint: EntryPoint, _operation: UserOperation<"v0.6"> | UserOperation<"v0.7">): _operation is UserOperation<"v0.7">;
 //# sourceMappingURL=getEntryPointVersion.d.ts.map

package/_types/utils/getEntryPointVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getEntryPointVersion.d.ts","sourceRoot":"","sources":["../../utils/getEntryPointVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE3E,eAAO,MAAM,sBAAsB,EAAE,2BACW,CAAA;AAChD,eAAO,MAAM,sBAAsB,EAAE,2BACW,CAAA;AAEhD,eAAO,MAAM,oBAAoB,eACjB,UAAU,KACvB,qBAAqB,UAAU,CACyB,CAAA"}
+{"version":3,"file":"getEntryPointVersion.d.ts","sourceRoot":"","sources":["../../utils/getEntryPointVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,2BAA2B,EAC3B,2BAA2B,EAC3B,aAAa,EAChB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE3E,eAAO,MAAM,sBAAsB,EAAE,2BACW,CAAA;AAChD,eAAO,MAAM,sBAAsB,EAAE,2BACW,CAAA;AAEhD,eAAO,MAAM,oBAAoB,eACjB,UAAU,KACvB,qBAAqB,UAAU,CACyB,CAAA;AAE3D,wBAAgB,wBAAwB,CACpC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,GAC1D,UAAU,IAAI,aAAa,CAAC,MAAM,CAAC,CAErC;AAGD,wBAAgB,wBAAwB,CACpC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,GAC1D,UAAU,IAAI,aAAa,CAAC,MAAM,CAAC,CAErC"}

package/_types/utils/getUserOperationHash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserOperationHash.d.ts","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAO,MAAM,MAAM,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAmH3D,MAAM,MAAM,0BAA0B,CAAC,UAAU,SAAS,UAAU,IAAI;IACpE,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAA;IAC9D,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,oBAAoB,wIAIW,IAgB3C,CAAA"}
+{"version":3,"file":"getUserOperationHash.d.ts","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAO,MAAM,MAAM,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAqG3D,MAAM,MAAM,0BAA0B,CAAC,UAAU,SAAS,UAAU,IAAI;IACpE,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAA;IAC9D,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,oBAAoB,wIAIW,IAgB3C,CAAA"}

package/accounts/biconomy/signerToBiconomySmartAccount.ts

@@ -272,18 +272,19 @@ export async function signerToBiconomySmartAccount<
     return toSmartAccount({
         address: accountAddress,
         async signMessage({ message }) {
-            let signature = await signMessage(client, {
+            let signature: Hex = await signMessage(client, {
                 account: viemSigner,
                 message
             })
             const potentiallyIncorrectV = parseInt(signature.slice(-2), 16)
             if (![27, 28].includes(potentiallyIncorrectV)) {
                 const correctV = potentiallyIncorrectV + 27
-                signature = signature.slice(0, -2) + correctV.toString(16)
+                signature = (signature.slice(0, -2) +
+                    correctV.toString(16)) as Hex
             }
             return encodeAbiParameters(
                 [{ type: "bytes" }, { type: "address" }],
-                [signature as Hex, ecdsaModuleAddress]
+                [signature, ecdsaModuleAddress]
             )
         },
         async signTransaction(_, __) {

package/accounts/safe/signerToSafeSmartAccount.ts

@@ -17,7 +17,9 @@ import {
     hashTypedData,
     hexToBigInt,
     keccak256,
+    pad,
     toBytes,
+    toHex,
     zeroAddress
 } from "viem"
 import {
@@ -27,9 +29,17 @@ import {
     signTypedData
 } from "viem/actions"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
-import type { ENTRYPOINT_ADDRESS_V06_TYPE, Prettify } from "../../types"
-import type { EntryPoint } from "../../types/entrypoint"
-import { getEntryPointVersion } from "../../utils"
+import type {
+    EntryPointVersion,
+    GetEntryPointVersion,
+    Prettify
+} from "../../types"
+import type { EntryPoint, UserOperation } from "../../types"
+import {
+    getEntryPointVersion,
+    isUserOperationVersion06,
+    isUserOperationVersion07
+} from "../../utils/getEntryPointVersion"
 import { isSmartAccountDeployed } from "../../utils/isSmartAccountDeployed"
 import { toSmartAccount } from "../toSmartAccount"
 import {
@@ -40,7 +50,7 @@ import {
 
 export type SafeVersion = "1.4.1"
 
-const EIP712_SAFE_OPERATION_TYPE = {
+const EIP712_SAFE_OPERATION_TYPE_V06 = {
     SafeOp: [
         { type: "address", name: "safe" },
         { type: "uint256", name: "nonce" },
@@ -58,25 +68,63 @@ const EIP712_SAFE_OPERATION_TYPE = {
     ]
 }
 
+const EIP712_SAFE_OPERATION_TYPE_V07 = {
+    SafeOp: [
+        { type: "address", name: "safe" },
+        { type: "uint256", name: "nonce" },
+        { type: "bytes", name: "initCode" },
+        { type: "bytes", name: "callData" },
+        { type: "uint128", name: "verificationGasLimit" },
+        { type: "uint128", name: "callGasLimit" },
+        { type: "uint256", name: "preVerificationGas" },
+        { type: "uint128", name: "maxPriorityFeePerGas" },
+        { type: "uint128", name: "maxFeePerGas" },
+        { type: "bytes", name: "paymasterAndData" },
+        { type: "uint48", name: "validAfter" },
+        { type: "uint48", name: "validUntil" },
+        { type: "address", name: "entryPoint" }
+    ]
+}
+
 const SAFE_VERSION_TO_ADDRESSES_MAP: {
     [key in SafeVersion]: {
-        ADD_MODULES_LIB_ADDRESS: Address
-        SAFE_4337_MODULE_ADDRESS: Address
-        SAFE_PROXY_FACTORY_ADDRESS: Address
-        SAFE_SINGLETON_ADDRESS: Address
-        MULTI_SEND_ADDRESS: Address
-        MULTI_SEND_CALL_ONLY_ADDRESS: Address
+        [key in EntryPointVersion]: {
+            SAFE_MODULE_SETUP_ADDRESS: Address
+            SAFE_4337_MODULE_ADDRESS: Address
+            SAFE_PROXY_FACTORY_ADDRESS: Address
+            SAFE_SINGLETON_ADDRESS: Address
+            MULTI_SEND_ADDRESS: Address
+            MULTI_SEND_CALL_ONLY_ADDRESS: Address
+        }
     }
 } = {
     "1.4.1": {
-        ADD_MODULES_LIB_ADDRESS: "0x8EcD4ec46D4D2a6B64fE960B3D64e8B94B2234eb",
-        SAFE_4337_MODULE_ADDRESS: "0xa581c4A4DB7175302464fF3C06380BC3270b4037",
-        SAFE_PROXY_FACTORY_ADDRESS:
-            "0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67",
-        SAFE_SINGLETON_ADDRESS: "0x41675C099F32341bf84BFc5382aF534df5C7461a",
-        MULTI_SEND_ADDRESS: "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
-        MULTI_SEND_CALL_ONLY_ADDRESS:
-            "0x9641d764fc13c8B624c04430C7356C1C7C8102e2"
+        "v0.6": {
+            SAFE_MODULE_SETUP_ADDRESS:
+                "0x8EcD4ec46D4D2a6B64fE960B3D64e8B94B2234eb",
+            SAFE_4337_MODULE_ADDRESS:
+                "0xa581c4A4DB7175302464fF3C06380BC3270b4037",
+            SAFE_PROXY_FACTORY_ADDRESS:
+                "0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67",
+            SAFE_SINGLETON_ADDRESS:
+                "0x41675C099F32341bf84BFc5382aF534df5C7461a",
+            MULTI_SEND_ADDRESS: "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
+            MULTI_SEND_CALL_ONLY_ADDRESS:
+                "0x9641d764fc13c8B624c04430C7356C1C7C8102e2"
+        },
+        "v0.7": {
+            SAFE_MODULE_SETUP_ADDRESS:
+                "0x2dd68b007B46fBe91B9A7c3EDa5A7a1063cB5b47",
+            SAFE_4337_MODULE_ADDRESS:
+                "0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226",
+            SAFE_PROXY_FACTORY_ADDRESS:
+                "0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67",
+            SAFE_SINGLETON_ADDRESS:
+                "0x41675C099F32341bf84BFc5382aF534df5C7461a",
+            MULTI_SEND_ADDRESS: "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
+            MULTI_SEND_CALL_ONLY_ADDRESS:
+                "0x9641d764fc13c8B624c04430C7356C1C7C8102e2"
+        }
     }
 }
 
@@ -174,22 +222,21 @@ const encodeMultiSend = (
 }
 
 export type SafeSmartAccount<
-    entryPoint extends
-        ENTRYPOINT_ADDRESS_V06_TYPE = ENTRYPOINT_ADDRESS_V06_TYPE,
+    entryPoint extends EntryPoint,
     transport extends Transport = Transport,
     chain extends Chain | undefined = Chain | undefined
 > = SmartAccount<entryPoint, "SafeSmartAccount", transport, chain>
 
 const getInitializerCode = async ({
     owner,
-    addModuleLibAddress,
+    safeModuleSetupAddress,
     safe4337ModuleAddress,
     multiSendAddress,
     setupTransactions = [],
     safeModules = []
 }: {
     owner: Address
-    addModuleLibAddress: Address
+    safeModuleSetupAddress: Address
     safe4337ModuleAddress: Address
     multiSendAddress: Address
     setupTransactions?: {
@@ -201,7 +248,7 @@ const getInitializerCode = async ({
 }) => {
     const multiSendCallData = encodeMultiSend([
         {
-            to: addModuleLibAddress,
+            to: safeModuleSetupAddress,
             data: encodeFunctionData({
                 abi: [
                     {
@@ -292,9 +339,29 @@ const getInitializerCode = async ({
     })
 }
 
+function getPaymasterAndData(unpackedUserOperation: UserOperation<"v0.7">) {
+    return unpackedUserOperation.paymaster
+        ? concat([
+              unpackedUserOperation.paymaster,
+              pad(
+                  toHex(
+                      unpackedUserOperation.paymasterVerificationGasLimit || 0n
+                  ),
+                  {
+                      size: 16
+                  }
+              ),
+              pad(toHex(unpackedUserOperation.paymasterPostOpGasLimit || 0n), {
+                  size: 16
+              }),
+              unpackedUserOperation.paymasterData || ("0x" as Hex)
+          ])
+        : "0x"
+}
+
 const getAccountInitCode = async ({
     owner,
-    addModuleLibAddress,
+    safeModuleSetupAddress,
     safe4337ModuleAddress,
     safeSingletonAddress,
     multiSendAddress,
@@ -303,7 +370,7 @@ const getAccountInitCode = async ({
     safeModules = []
 }: {
     owner: Address
-    addModuleLibAddress: Address
+    safeModuleSetupAddress: Address
     safe4337ModuleAddress: Address
     safeSingletonAddress: Address
     multiSendAddress: Address
@@ -318,7 +385,7 @@ const getAccountInitCode = async ({
     if (!owner) throw new Error("Owner account not found")
     const initializer = await getInitializerCode({
         owner,
-        addModuleLibAddress,
+        safeModuleSetupAddress,
         safe4337ModuleAddress,
         multiSendAddress,
         setupTransactions,
@@ -370,7 +437,7 @@ const getAccountAddress = async <
 >({
     client,
     owner,
-    addModuleLibAddress,
+    safeModuleSetupAddress,
     safe4337ModuleAddress,
     safeProxyFactoryAddress,
     safeSingletonAddress,
@@ -381,7 +448,7 @@ const getAccountAddress = async <
 }: {
     client: Client<TTransport, TChain>
     owner: Address
-    addModuleLibAddress: Address
+    safeModuleSetupAddress: Address
     safe4337ModuleAddress: Address
     safeProxyFactoryAddress: Address
     safeSingletonAddress: Address
@@ -421,7 +488,7 @@ const getAccountAddress = async <
 
     const initializer = await getInitializerCode({
         owner,
-        addModuleLibAddress,
+        safeModuleSetupAddress,
         safe4337ModuleAddress,
         multiSendAddress,
         setupTransactions,
@@ -445,8 +512,10 @@ const getAccountAddress = async <
 
 const getDefaultAddresses = (
     safeVersion: SafeVersion,
+    entryPointAddress: EntryPoint,
     {
         addModuleLibAddress: _addModuleLibAddress,
+        safeModuleSetupAddress: _safeModuleSetupAddress,
         safe4337ModuleAddress: _safe4337ModuleAddress,
         safeProxyFactoryAddress: _safeProxyFactoryAddress,
         safeSingletonAddress: _safeSingletonAddress,
@@ -454,6 +523,7 @@ const getDefaultAddresses = (
         multiSendCallOnlyAddress: _multiSendCallOnlyAddress
     }: {
         addModuleLibAddress?: Address
+        safeModuleSetupAddress?: Address
         safe4337ModuleAddress?: Address
         safeProxyFactoryAddress?: Address
         safeSingletonAddress?: Address
@@ -461,28 +531,38 @@ const getDefaultAddresses = (
         multiSendCallOnlyAddress?: Address
     }
 ) => {
-    const addModuleLibAddress =
+    const entryPointVersion = getEntryPointVersion(entryPointAddress)
+
+    const safeModuleSetupAddress =
+        _safeModuleSetupAddress ??
         _addModuleLibAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].ADD_MODULES_LIB_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][entryPointVersion]
+            .SAFE_MODULE_SETUP_ADDRESS
     const safe4337ModuleAddress =
         _safe4337ModuleAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].SAFE_4337_MODULE_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][entryPointVersion]
+            .SAFE_4337_MODULE_ADDRESS
     const safeProxyFactoryAddress =
         _safeProxyFactoryAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].SAFE_PROXY_FACTORY_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][entryPointVersion]
+            .SAFE_PROXY_FACTORY_ADDRESS
     const safeSingletonAddress =
         _safeSingletonAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].SAFE_SINGLETON_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][entryPointVersion]
+            .SAFE_SINGLETON_ADDRESS
     const multiSendAddress =
         _multiSendAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].MULTI_SEND_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][entryPointVersion]
+            .MULTI_SEND_ADDRESS
 
     const multiSendCallOnlyAddress =
         _multiSendCallOnlyAddress ??
-        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion].MULTI_SEND_CALL_ONLY_ADDRESS
+        SAFE_VERSION_TO_ADDRESSES_MAP[safeVersion][
+            getEntryPointVersion(entryPointAddress)
+        ].MULTI_SEND_CALL_ONLY_ADDRESS
 
     return {
-        addModuleLibAddress,
+        safeModuleSetupAddress,
         safe4337ModuleAddress,
         safeProxyFactoryAddress,
         safeSingletonAddress,
@@ -500,7 +580,7 @@ export type SignerToSafeSmartAccountParameters<
     safeVersion: SafeVersion
     entryPoint: entryPoint
     address?: Address
-    addModuleLibAddress?: Address
+    safeModuleSetupAddress?: Address
     safe4337ModuleAddress?: Address
     safeProxyFactoryAddress?: Address
     safeSingletonAddress?: Address
@@ -523,7 +603,7 @@ export type SignerToSafeSmartAccountParameters<
  * @returns A Private Key Simple Account.
  */
 export async function signerToSafeSmartAccount<
-    entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE,
+    entryPoint extends EntryPoint,
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TSource extends string = string,
@@ -535,7 +615,7 @@ export async function signerToSafeSmartAccount<
         address,
         safeVersion,
         entryPoint: entryPointAddress,
-        addModuleLibAddress: _addModuleLibAddress,
+        safeModuleSetupAddress: _safeModuleSetupAddress,
         safe4337ModuleAddress: _safe4337ModuleAddress,
         safeProxyFactoryAddress: _safeProxyFactoryAddress,
         safeSingletonAddress: _safeSingletonAddress,
@@ -548,12 +628,6 @@ export async function signerToSafeSmartAccount<
         setupTransactions = []
     }: SignerToSafeSmartAccountParameters<entryPoint, TSource, TAddress>
 ): Promise<SafeSmartAccount<entryPoint, TTransport, TChain>> {
-    const entryPointVersion = getEntryPointVersion(entryPointAddress)
-
-    if (entryPointVersion !== "v0.6") {
-        throw new Error("Only EntryPoint 0.6 is supported")
-    }
-
     const chainId = await getChainId(client)
 
     const viemSigner: LocalAccount = {
@@ -564,14 +638,14 @@ export async function signerToSafeSmartAccount<
     } as LocalAccount
 
     const {
-        addModuleLibAddress,
+        safeModuleSetupAddress,
         safe4337ModuleAddress,
         safeProxyFactoryAddress,
         safeSingletonAddress,
         multiSendAddress,
         multiSendCallOnlyAddress
-    } = getDefaultAddresses(safeVersion, {
-        addModuleLibAddress: _addModuleLibAddress,
+    } = getDefaultAddresses(safeVersion, entryPointAddress, {
+        safeModuleSetupAddress: _safeModuleSetupAddress,
         safe4337ModuleAddress: _safe4337ModuleAddress,
         safeProxyFactoryAddress: _safeProxyFactoryAddress,
         safeSingletonAddress: _safeSingletonAddress,
@@ -584,7 +658,7 @@ export async function signerToSafeSmartAccount<
         (await getAccountAddress<TTransport, TChain>({
             client,
             owner: viemSigner.address,
-            addModuleLibAddress,
+            safeModuleSetupAddress,
             safe4337ModuleAddress,
             safeProxyFactoryAddress,
             safeSingletonAddress,
@@ -666,7 +740,44 @@ export async function signerToSafeSmartAccount<
                     entryPoint: entryPointAddress
                 })
             },
-            async signUserOperation(userOperation) {
+            async signUserOperation(
+                userOperation: UserOperation<GetEntryPointVersion<entryPoint>>
+            ) {
+                const message = {
+                    safe: accountAddress,
+                    callData: userOperation.callData,
+                    nonce: userOperation.nonce,
+                    initCode: userOperation.initCode ?? "0x",
+                    maxFeePerGas: userOperation.maxFeePerGas,
+                    maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas,
+                    preVerificationGas: userOperation.preVerificationGas,
+                    verificationGasLimit: userOperation.verificationGasLimit,
+                    callGasLimit: userOperation.callGasLimit,
+                    paymasterAndData: userOperation.paymasterAndData ?? "0x",
+                    validAfter: validAfter,
+                    validUntil: validUntil,
+                    entryPoint: entryPointAddress
+                }
+
+                if (
+                    isUserOperationVersion06(entryPointAddress, userOperation)
+                ) {
+                    message.paymasterAndData = userOperation.paymasterAndData
+                }
+
+                if (
+                    isUserOperationVersion07(entryPointAddress, userOperation)
+                ) {
+                    if (userOperation.factory && userOperation.factoryData) {
+                        message.initCode = concatHex([
+                            userOperation.factory,
+                            userOperation.factoryData
+                        ])
+                    }
+                    message.paymasterAndData =
+                        getPaymasterAndData(userOperation)
+                }
+
                 const signatures = [
                     {
                         signer: viemSigner.address,
@@ -676,27 +787,13 @@ export async function signerToSafeSmartAccount<
                                 chainId: chainId,
                                 verifyingContract: safe4337ModuleAddress
                             },
-                            types: EIP712_SAFE_OPERATION_TYPE,
+                            types:
+                                getEntryPointVersion(entryPointAddress) ===
+                                "v0.6"
+                                    ? EIP712_SAFE_OPERATION_TYPE_V06
+                                    : EIP712_SAFE_OPERATION_TYPE_V07,
                             primaryType: "SafeOp",
-                            message: {
-                                safe: accountAddress,
-                                callData: userOperation.callData,
-                                entryPoint: entryPointAddress,
-                                nonce: userOperation.nonce,
-                                initCode: userOperation.initCode,
-                                maxFeePerGas: userOperation.maxFeePerGas,
-                                maxPriorityFeePerGas:
-                                    userOperation.maxPriorityFeePerGas,
-                                preVerificationGas:
-                                    userOperation.preVerificationGas,
-                                verificationGasLimit:
-                                    userOperation.verificationGasLimit,
-                                callGasLimit: userOperation.callGasLimit,
-                                paymasterAndData:
-                                    userOperation.paymasterAndData,
-                                validAfter: validAfter,
-                                validUntil: validUntil
-                            }
+                            message: message
                         })
                     }
                 ]
@@ -715,53 +812,36 @@ export async function signerToSafeSmartAccount<
                 )
             },
             async getInitCode() {
-                if (safeDeployed) return "0x"
-
-                safeDeployed = await isSmartAccountDeployed(
-                    client,
-                    accountAddress
-                )
+                safeDeployed =
+                    safeDeployed ||
+                    (await isSmartAccountDeployed(client, accountAddress))
 
                 if (safeDeployed) return "0x"
 
-                const initCodeCallData = await getAccountInitCode({
-                    owner: viemSigner.address,
-                    addModuleLibAddress,
-                    safe4337ModuleAddress,
-                    safeSingletonAddress,
-                    multiSendAddress,
-                    saltNonce,
-                    setupTransactions,
-                    safeModules
-                })
-
-                return concatHex([safeProxyFactoryAddress, initCodeCallData])
+                return concatHex([
+                    (await this.getFactory()) ?? "0x",
+                    (await this.getFactoryData()) ?? "0x"
+                ])
             },
             async getFactory() {
-                if (safeDeployed) return undefined
-
-                safeDeployed = await isSmartAccountDeployed(
-                    client,
-                    accountAddress
-                )
+                safeDeployed =
+                    safeDeployed ||
+                    (await isSmartAccountDeployed(client, accountAddress))
 
                 if (safeDeployed) return undefined
 
                 return safeProxyFactoryAddress
             },
             async getFactoryData() {
-                if (safeDeployed) return undefined
-
-                safeDeployed = await isSmartAccountDeployed(
-                    client,
-                    accountAddress
-                )
+                safeDeployed =
+                    safeDeployed ||
+                    (await isSmartAccountDeployed(client, accountAddress))
 
                 if (safeDeployed) return undefined
 
                 return await getAccountInitCode({
                     owner: viemSigner.address,
-                    addModuleLibAddress,
+                    safeModuleSetupAddress,
                     safe4337ModuleAddress,
                     safeSingletonAddress,
                     multiSendAddress,

package/errors/sendUserOperation.ts

@@ -25,17 +25,7 @@ export class SendUserOperationError<
         }
     ) {
         const prettyArgs = prettyPrint({
-            sender: userOperation.sender,
-            nonce: userOperation.nonce,
-            initCode: userOperation.initCode,
-            callData: userOperation.callData,
-            callGasLimit: userOperation.callGasLimit,
-            verificationGasLimit: userOperation.verificationGasLimit,
-            preVerificationGas: userOperation.preVerificationGas,
-            maxFeePerGas: userOperation.maxFeePerGas,
-            maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas,
-            paymasterAndData: userOperation.paymasterAndData,
-            signature: userOperation.signature,
+            ...userOperation,
             entryPoint
         })
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.1.9",
+    "version": "0.1.11",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",

package/utils/getEntryPointVersion.ts

@@ -1,6 +1,7 @@
 import type {
     ENTRYPOINT_ADDRESS_V06_TYPE,
-    ENTRYPOINT_ADDRESS_V07_TYPE
+    ENTRYPOINT_ADDRESS_V07_TYPE,
+    UserOperation
 } from "../types"
 import type { EntryPoint, GetEntryPointVersion } from "../types/entrypoint"
 
@@ -13,3 +14,18 @@ export const getEntryPointVersion = (
     entryPoint: EntryPoint
 ): GetEntryPointVersion<EntryPoint> =>
     entryPoint === ENTRYPOINT_ADDRESS_V06 ? "v0.6" : "v0.7"
+
+export function isUserOperationVersion06(
+    entryPoint: EntryPoint,
+    _operation: UserOperation<"v0.6"> | UserOperation<"v0.7">
+): _operation is UserOperation<"v0.6"> {
+    return getEntryPointVersion(entryPoint) === "v0.6"
+}
+
+// Type predicate to check if the UserOperation is V07.
+export function isUserOperationVersion07(
+    entryPoint: EntryPoint,
+    _operation: UserOperation<"v0.6"> | UserOperation<"v0.7">
+): _operation is UserOperation<"v0.7"> {
+    return getEntryPointVersion(entryPoint) === "v0.7"
+}