permissionless 0.0.35 → 0.1.0

package/_cjs/accounts/simple/signerToSimpleSmartAccount.js

@@ -6,54 +6,60 @@ const accounts_1 = require("viem/accounts");
 const actions_1 = require("viem/actions");
 const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
 const getSenderAddress_1 = require("../../actions/public/getSenderAddress.js");
+const utils_1 = require("../../utils/index.js");
 const getUserOperationHash_1 = require("../../utils/getUserOperationHash.js");
 const isSmartAccountDeployed_1 = require("../../utils/isSmartAccountDeployed.js");
 const types_1 = require("../types.js");
-const getAccountInitCode = async (factoryAddress, owner, index = 0n) => {
+const getAccountInitCode = async (owner, index = 0n) => {
     if (!owner)
         throw new Error("Owner account not found");
-    return (0, viem_1.concatHex)([
-        factoryAddress,
-        (0, viem_1.encodeFunctionData)({
-            abi: [
-                {
-                    inputs: [
-                        {
-                            internalType: "address",
-                            name: "owner",
-                            type: "address"
-                        },
-                        {
-                            internalType: "uint256",
-                            name: "salt",
-                            type: "uint256"
-                        }
-                    ],
-                    name: "createAccount",
-                    outputs: [
-                        {
-                            internalType: "contract SimpleAccount",
-                            name: "ret",
-                            type: "address"
-                        }
-                    ],
-                    stateMutability: "nonpayable",
-                    type: "function"
-                }
-            ],
-            functionName: "createAccount",
-            args: [owner, index]
-        })
-    ]);
+    return (0, viem_1.encodeFunctionData)({
+        abi: [
+            {
+                inputs: [
+                    {
+                        internalType: "address",
+                        name: "owner",
+                        type: "address"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "salt",
+                        type: "uint256"
+                    }
+                ],
+                name: "createAccount",
+                outputs: [
+                    {
+                        internalType: "contract SimpleAccount",
+                        name: "ret",
+                        type: "address"
+                    }
+                ],
+                stateMutability: "nonpayable",
+                type: "function"
+            }
+        ],
+        functionName: "createAccount",
+        args: [owner, index]
+    });
 };
-const getAccountAddress = async ({ client, factoryAddress, entryPoint, owner, index = 0n }) => {
-    const initCode = await getAccountInitCode(factoryAddress, owner, index);
+const getAccountAddress = async ({ client, factoryAddress, entryPoint: entryPointAddress, owner, index = 0n }) => {
+    const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
+    const factoryData = await getAccountInitCode(owner, index);
+    if (entryPointVersion === "v0.6") {
+        return (0, getSenderAddress_1.getSenderAddress)(client, {
+            initCode: (0, viem_1.concatHex)([factoryAddress, factoryData]),
+            entryPoint: entryPointAddress
+        });
+    }
     return (0, getSenderAddress_1.getSenderAddress)(client, {
-        initCode,
-        entryPoint
+        factory: factoryAddress,
+        factoryData,
+        entryPoint: entryPointAddress
     });
 };
-async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entryPoint, index = 0n, address }) {
+async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entryPoint: entryPointAddress, index = 0n, address }) {
     const viemSigner = {
         ...signer,
         signTransaction: (_, __) => {
@@ -65,7 +71,7 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
             getAccountAddress({
                 client,
                 factoryAddress,
-                entryPoint,
+                entryPoint: entryPointAddress,
                 owner: viemSigner.address,
                 index
             }),
@@ -93,12 +99,12 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
         ...account,
         client: client,
         publicKey: accountAddress,
-        entryPoint: entryPoint,
+        entryPoint: entryPointAddress,
         source: "SimpleSmartAccount",
         async getNonce() {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 sender: accountAddress,
-                entryPoint: entryPoint
+                entryPoint: entryPointAddress
             });
         },
         async signUserOperation(userOperation) {
@@ -106,7 +112,7 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
                 message: {
                     raw: (0, getUserOperationHash_1.getUserOperationHash)({
                         userOperation,
-                        entryPoint: entryPoint,
+                        entryPoint: entryPointAddress,
                         chainId: chainId
                     })
                 }
@@ -118,7 +124,26 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
             smartAccountDeployed = await (0, isSmartAccountDeployed_1.isSmartAccountDeployed)(client, accountAddress);
             if (smartAccountDeployed)
                 return "0x";
-            return getAccountInitCode(factoryAddress, viemSigner.address, index);
+            return (0, viem_1.concatHex)([
+                factoryAddress,
+                await getAccountInitCode(viemSigner.address, index)
+            ]);
+        },
+        async getFactory() {
+            if (smartAccountDeployed)
+                return undefined;
+            smartAccountDeployed = await (0, isSmartAccountDeployed_1.isSmartAccountDeployed)(client, accountAddress);
+            if (smartAccountDeployed)
+                return undefined;
+            return factoryAddress;
+        },
+        async getFactoryData() {
+            if (smartAccountDeployed)
+                return undefined;
+            smartAccountDeployed = await (0, isSmartAccountDeployed_1.isSmartAccountDeployed)(client, accountAddress);
+            if (smartAccountDeployed)
+                return undefined;
+            return getAccountInitCode(viemSigner.address, index);
         },
         async encodeDeployCallData(_) {
             throw new Error("Simple account doesn't support account deployment");
@@ -126,6 +151,35 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
         async encodeCallData(args) {
             if (Array.isArray(args)) {
                 const argsArray = args;
+                if ((0, utils_1.getEntryPointVersion)(entryPointAddress) === "v0.6") {
+                    return (0, viem_1.encodeFunctionData)({
+                        abi: [
+                            {
+                                inputs: [
+                                    {
+                                        internalType: "address[]",
+                                        name: "dest",
+                                        type: "address[]"
+                                    },
+                                    {
+                                        internalType: "bytes[]",
+                                        name: "func",
+                                        type: "bytes[]"
+                                    }
+                                ],
+                                name: "executeBatch",
+                                outputs: [],
+                                stateMutability: "nonpayable",
+                                type: "function"
+                            }
+                        ],
+                        functionName: "executeBatch",
+                        args: [
+                            argsArray.map((a) => a.to),
+                            argsArray.map((a) => a.data)
+                        ]
+                    });
+                }
                 return (0, viem_1.encodeFunctionData)({
                     abi: [
                         {
@@ -135,6 +189,11 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
                                     name: "dest",
                                     type: "address[]"
                                 },
+                                {
+                                    internalType: "uint256[]",
+                                    name: "value",
+                                    type: "uint256[]"
+                                },
                                 {
                                     internalType: "bytes[]",
                                     name: "func",
@@ -150,6 +209,7 @@ async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entr
                     functionName: "executeBatch",
                     args: [
                         argsArray.map((a) => a.to),
+                        argsArray.map((a) => a.value),
                         argsArray.map((a) => a.data)
                     ]
                 });

package/_cjs/accounts/simple/signerToSimpleSmartAccount.js.map

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

package/_cjs/accounts/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../accounts/types.ts"],"names":[],"mappings":";;;AAAA,+BAOa;AAIb,MAAa,yCAA0C,SAAQ,gBAAS;IAEpE,YAAY,EAAE,QAAQ,KAA4B,EAAE;QAChD,KAAK,CACD;YACI,6FAA6F;YAC7F,qCAAqC;SACxC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACI,QAAQ;YACR,QAAQ,EAAE,SAAS;SACtB,CACJ,CAAA;QAXI;;;;mBAAO,2CAA2C;WAAA;IAY3D,CAAC;CACJ;AAdD,8FAcC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../accounts/types.ts"],"names":[],"mappings":";;;AAAA,+BAOa;AAKb,MAAa,yCAA0C,SAAQ,gBAAS;IAEpE,YAAY,EAAE,QAAQ,KAA4B,EAAE;QAChD,KAAK,CACD;YACI,6FAA6F;YAC7F,qCAAqC;SACxC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACI,QAAQ;YACR,QAAQ,EAAE,SAAS;SACtB,CACJ,CAAA;QAXI;;;;mBAAO,2CAA2C;WAAA;IAY3D,CAAC;CACJ;AAdD,8FAcC"}

package/_cjs/actions/bundler/chainId.js.map

@@ -1 +1 @@
-{"version":3,"file":"chainId.js","sourceRoot":"","sources":["../../../actions/bundler/chainId.ts"],"names":[],"mappings":";;;AA0BO,MAAM,OAAO,GAAG,KAAK,EAKxB,MAA8D,EAChE,EAAE;IACA,OAAO,MAAM,CACT,MAAM,MAAM,CAAC,OAAO,CAAC;QACjB,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,EAAE;KACb,CAAC,CACL,CAAA;AACL,CAAC,CAAA;AAbY,QAAA,OAAO,WAanB"}
+{"version":3,"file":"chainId.js","sourceRoot":"","sources":["../../../actions/bundler/chainId.ts"],"names":[],"mappings":";;;AA2BO,MAAM,OAAO,GAAG,KAAK,EAMxB,MAA0E,EAC5E,EAAE;IACA,OAAO,MAAM,CACT,MAAM,MAAM,CAAC,OAAO,CAAC;QACjB,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,EAAE;KACb,CAAC,CACL,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,OAAO,WAcnB"}

package/_cjs/actions/bundler/estimateUserOperationGas.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateUserOperationGas = void 0;
+const utils_1 = require("../../utils/index.js");
 const deepHexlify_1 = require("../../utils/deepHexlify.js");
 const getEstimateUserOperationGasError_1 = require("../../utils/errors/getEstimateUserOperationGasError.js");
 const estimateUserOperationGas = async (client, args, stateOverrides) => {
@@ -18,10 +19,26 @@ const estimateUserOperationGas = async (client, args, stateOverrides) => {
                 ]
                 : [userOperationWithBigIntAsHex, entryPoint]
         });
+        const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPoint);
+        if (entryPointVersion === "v0.6") {
+            const responseV06 = response;
+            return {
+                preVerificationGas: BigInt(responseV06.preVerificationGas || 0),
+                verificationGasLimit: BigInt(responseV06.verificationGasLimit || 0),
+                callGasLimit: BigInt(responseV06.callGasLimit || 0)
+            };
+        }
+        const responseV07 = response;
         return {
-            preVerificationGas: BigInt(response.preVerificationGas || 0),
-            verificationGasLimit: BigInt(response.verificationGasLimit || 0),
-            callGasLimit: BigInt(response.callGasLimit || 0)
+            preVerificationGas: BigInt(responseV07.preVerificationGas || 0),
+            verificationGasLimit: BigInt(responseV07.verificationGasLimit || 0),
+            callGasLimit: BigInt(responseV07.callGasLimit || 0),
+            paymasterVerificationGasLimit: responseV07.paymasterVerificationGasLimit
+                ? BigInt(responseV07.paymasterVerificationGasLimit)
+                : undefined,
+            paymasterPostOpGasLimit: responseV07.paymasterPostOpGasLimit
+                ? BigInt(responseV07.paymasterPostOpGasLimit)
+                : undefined
         };
     }
     catch (err) {

package/_cjs/actions/bundler/estimateUserOperationGas.js.map

@@ -1 +1 @@
-{"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":";;;AAaA,yDAAqD;AACrD,0GAG4D;AA8CrD,MAAM,wBAAwB,GAAG,KAAK,EAKzC,MAA8D,EAC9D,IAAkD,EAClD,cAA+B,EACsB,EAAE;IACvD,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAE1C,MAAM,4BAA4B,GAAG,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAA;IAC/D,MAAM,6BAA6B,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAA;IAEjE,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE,cAAc;gBAClB,CAAC,CAAC;oBACI,4BAA4B;oBAC5B,UAAU;oBACV,6BAA6B;iBAChC;gBACH,CAAC,CAAC,CAAC,4BAA4B,EAAE,UAAU,CAAC;SACnD,CAAC,CAAA;QAEF,OAAO;YACH,kBAAkB,EAAE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,IAAI,CAAC,CAAC;YAC5D,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,oBAAoB,IAAI,CAAC,CAAC;YAChE,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,CAAC;SACnD,CAAA;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,IAAA,mEAAgC,EAAC,GAAgB,EAAE,IAAI,CAAC,CAAA;IAClE,CAAC;AACL,CAAC,CAAA;AAlCY,QAAA,wBAAwB,4BAkCpC"}
+{"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":";;;AAcA,uCAAkD;AAClD,yDAAqD;AACrD,0GAG4D;AAiErD,MAAM,wBAAwB,GAAG,KAAK,EAMzC,MAA0E,EAC1E,IAA8D,EAC9D,cAA+B,EACwB,EAAE;IACzD,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAE1C,MAAM,4BAA4B,GAAG,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAA;IAC/D,MAAM,6BAA6B,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAA;IAEjE,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE,cAAc;gBAClB,CAAC,CAAC;oBACI,4BAA4B;oBAC5B,UAAU;oBACV,6BAA6B;iBAChC;gBACH,CAAC,CAAC,CAAC,4BAA4B,EAAE,UAAU,CAAC;SACnD,CAAC,CAAA;QAEF,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAA;QAE1D,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,QAInB,CAAA;YAED,OAAO;gBACH,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,IAAI,CAAC,CAAC;gBAC/D,oBAAoB,EAAE,MAAM,CACxB,WAAW,CAAC,oBAAoB,IAAI,CAAC,CACxC;gBACD,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;aACJ,CAAA;QACvD,CAAC;QAED,MAAM,WAAW,GAAG,QAMnB,CAAA;QAED,OAAO;YACH,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,IAAI,CAAC,CAAC;YAC/D,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,oBAAoB,IAAI,CAAC,CAAC;YACnE,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;YACnD,6BAA6B,EACzB,WAAW,CAAC,6BAA6B;gBACrC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,6BAA6B,CAAC;gBACnD,CAAC,CAAC,SAAS;YACnB,uBAAuB,EAAE,WAAW,CAAC,uBAAuB;gBACxD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC;gBAC7C,CAAC,CAAC,SAAS;SACgC,CAAA;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,IAAA,mEAAgC,EAAC,GAAgB,EAAE,IAAI,CAAC,CAAA;IAClE,CAAC;AACL,CAAC,CAAA;AApEY,QAAA,wBAAwB,4BAoEpC"}

package/_cjs/actions/bundler/getUserOperationByHash.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserOperationByHash = void 0;
+const getEntryPointVersion_1 = require("../../utils/getEntryPointVersion.js");
 const getUserOperationByHash = async (client, { hash }) => {
     const params = [hash];
     const response = await client.request({
@@ -9,18 +10,34 @@ const getUserOperationByHash = async (client, { hash }) => {
     });
     if (!response)
         return null;
-    const { userOperation, entryPoint, transactionHash, blockHash, blockNumber } = response;
+    const { userOperation, entryPoint: entryPointAddress, transactionHash, blockHash, blockNumber } = response;
     return {
-        userOperation: {
-            ...userOperation,
-            nonce: BigInt(userOperation.nonce),
-            callGasLimit: BigInt(userOperation.callGasLimit),
-            verificationGasLimit: BigInt(userOperation.verificationGasLimit),
-            preVerificationGas: BigInt(userOperation.preVerificationGas),
-            maxFeePerGas: BigInt(userOperation.maxFeePerGas),
-            maxPriorityFeePerGas: BigInt(userOperation.maxPriorityFeePerGas)
-        },
-        entryPoint: entryPoint,
+        userOperation: (entryPointAddress === getEntryPointVersion_1.ENTRYPOINT_ADDRESS_V06
+            ? {
+                ...userOperation,
+                nonce: BigInt(userOperation.nonce),
+                callGasLimit: BigInt(userOperation.callGasLimit),
+                verificationGasLimit: BigInt(userOperation.verificationGasLimit),
+                preVerificationGas: BigInt(userOperation.preVerificationGas),
+                maxFeePerGas: BigInt(userOperation.maxFeePerGas),
+                maxPriorityFeePerGas: BigInt(userOperation.maxPriorityFeePerGas)
+            }
+            : {
+                ...userOperation,
+                nonce: BigInt(userOperation.nonce),
+                callGasLimit: BigInt(userOperation.callGasLimit),
+                verificationGasLimit: BigInt(userOperation.verificationGasLimit),
+                preVerificationGas: BigInt(userOperation.preVerificationGas),
+                maxFeePerGas: BigInt(userOperation.maxFeePerGas),
+                maxPriorityFeePerGas: BigInt(userOperation.maxPriorityFeePerGas),
+                paymasterVerificationGasLimit: userOperation.paymasterVerificationGasLimit
+                    ? BigInt(userOperation.paymasterVerificationGasLimit)
+                    : undefined,
+                paymasterPostOpGasLimit: userOperation.paymasterVerificationGasLimit
+                    ? BigInt(userOperation.paymasterPostOpGasLimit)
+                    : undefined
+            }),
+        entryPoint: entryPointAddress,
         transactionHash: transactionHash,
         blockHash: blockHash,
         blockNumber: BigInt(blockNumber)

package/_cjs/actions/bundler/getUserOperationByHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserOperationByHash.js","sourceRoot":"","sources":["../../../actions/bundler/getUserOperationByHash.ts"],"names":[],"mappings":";;;AAwCO,MAAM,sBAAsB,GAAG,KAAK,EAKvC,MAA8D,EAC9D,EAAE,IAAI,EAA8C,EACM,EAAE;IAC5D,MAAM,MAAM,GAAW,CAAC,IAAI,CAAC,CAAA;IAE7B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,4BAA4B;QACpC,MAAM;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IAE1B,MAAM,EACF,aAAa,EACb,UAAU,EACV,eAAe,EACf,SAAS,EACT,WAAW,EACd,GAAG,QAAQ,CAAA;IAEZ,OAAO;QACH,aAAa,EAAE;YACX,GAAG,aAAa;YAChB,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YAClC,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;YAChD,oBAAoB,EAAE,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC;YAChE,kBAAkB,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC;YAC5D,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;YAChD,oBAAoB,EAAE,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC;SAClD;QAClB,UAAU,EAAE,UAAU;QACtB,eAAe,EAAE,eAAe;QAChC,SAAS,EAAE,SAAS;QACpB,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;KACnC,CAAA;AACL,CAAC,CAAA;AAxCY,QAAA,sBAAsB,0BAwClC"}
+{"version":3,"file":"getUserOperationByHash.js","sourceRoot":"","sources":["../../../actions/bundler/getUserOperationByHash.ts"],"names":[],"mappings":";;;AAMA,2EAAyE;AAoClE,MAAM,sBAAsB,GAAG,KAAK,EAMvC,MAA0E,EAC1E,EAAE,IAAI,EAA8C,EACkB,EAAE;IACxE,MAAM,MAAM,GAAW,CAAC,IAAI,CAAC,CAAA;IAE7B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,4BAA4B;QACpC,MAAM;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IAE1B,MAAM,EACF,aAAa,EACb,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EACf,SAAS,EACT,WAAW,EACd,GAAG,QAAQ,CAAA;IAEZ,OAAO;QACH,aAAa,EAAE,CAAC,iBAAiB,KAAK,6CAAsB;YACxD,CAAC,CAAC;gBACI,GAAG,aAAa;gBAChB,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;gBAClC,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;gBAChD,oBAAoB,EAAE,MAAM,CACxB,aAAa,CAAC,oBAAoB,CACrC;gBACD,kBAAkB,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC;gBAC5D,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;gBAChD,oBAAoB,EAAE,MAAM,CACxB,aAAa,CAAC,oBAAoB,CACrC;aACJ;YACH,CAAC,CAAC;gBACI,GAAG,aAAa;gBAChB,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;gBAClC,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;gBAChD,oBAAoB,EAAE,MAAM,CACxB,aAAa,CAAC,oBAAoB,CACrC;gBACD,kBAAkB,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC;gBAC5D,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC;gBAChD,oBAAoB,EAAE,MAAM,CACxB,aAAa,CAAC,oBAAoB,CACrC;gBACD,6BAA6B,EACzB,aAAa,CAAC,6BAA6B;oBACvC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,6BAA6B,CAAC;oBACrD,CAAC,CAAC,SAAS;gBACnB,uBAAuB,EACnB,aAAa,CAAC,6BAA6B;oBACvC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAuB,CAAC;oBAC/C,CAAC,CAAC,SAAS;aACtB,CAAoD;QAC3D,UAAU,EAAE,iBAAiB;QAC7B,eAAe,EAAE,eAAe;QAChC,SAAS,EAAE,SAAS;QACpB,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;KACnC,CAAA;AACL,CAAC,CAAA;AAnEY,QAAA,sBAAsB,0BAmElC"}

package/_cjs/actions/bundler/getUserOperationReceipt.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserOperationReceipt.js","sourceRoot":"","sources":["../../../actions/bundler/getUserOperationReceipt.ts"],"names":[],"mappings":";;;AAaA,yDAAkE;AA6D3D,MAAM,uBAAuB,GAAG,KAAK,EAKxC,MAA8D,EAC9D,EAAE,IAAI,EAA+C,EACM,EAAE;IAC7D,MAAM,MAAM,GAAW,CAAC,IAAI,CAAC,CAAA;IAE7B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IAE1B,MAAM,oBAAoB,GAAsC;QAC5D,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC7C,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE;YACL,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAe;YACjD,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3D,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;YACrC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;YACjD,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;YAC3B,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;YACvB,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAC7D,MAAM,EAAE,sCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACzD,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;YACzC,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAe;YACjD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;YACrC,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;SAChE;QACD,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;YACpC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC9C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;SACrB,CAAC,CAAC;KACN,CAAA;IAED,OAAO,oBAAoB,CAAA;AAC/B,CAAC,CAAA;AAnDY,QAAA,uBAAuB,2BAmDnC"}
+{"version":3,"file":"getUserOperationReceipt.js","sourceRoot":"","sources":["../../../actions/bundler/getUserOperationReceipt.ts"],"names":[],"mappings":";;;AAcA,yDAAkE;AA6D3D,MAAM,uBAAuB,GAAG,KAAK,EAMxC,MAA0E,EAC1E,EAAE,IAAI,EAA+C,EACM,EAAE;IAC7D,MAAM,MAAM,GAAW,CAAC,IAAI,CAAC,CAAA;IAE7B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IAE1B,MAAM,oBAAoB,GAAsC;QAC5D,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC7C,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE;YACL,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAe;YACjD,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3D,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;YACrC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;YACjD,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;YAC3B,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;YACvB,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAC7D,MAAM,EAAE,sCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACzD,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;YACzC,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAe;YACjD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;YACrC,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;SAChE;QACD,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;YACpC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC9C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;SACrB,CAAC,CAAC;KACN,CAAA;IAED,OAAO,oBAAoB,CAAA;AAC/B,CAAC,CAAA;AApDY,QAAA,uBAAuB,2BAoDnC"}

package/_cjs/actions/bundler/sendUserOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendUserOperation.js","sourceRoot":"","sources":["../../../actions/bundler/sendUserOperation.ts"],"names":[],"mappings":";;;AAgBA,yDAAqD;AACrD,4FAAwF;AAgCjF,MAAM,iBAAiB,GAAG,KAAK,EAKlC,MAA8D,EAC9D,IAA2C,EAC9B,EAAE;IACf,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAE1C,IAAI,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC3C,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE;gBACJ,IAAA,yBAAW,EAAC,aAAa,CAAiC;gBAC1D,UAAqB;aACxB;SACJ,CAAC,CAAA;QAEF,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,IAAA,qDAAyB,EAC3B,GAAgB,EAChB,IAAmC,CACtC,CAAA;IACL,CAAC;AACL,CAAC,CAAA;AA1BY,QAAA,iBAAiB,qBA0B7B"}
+{"version":3,"file":"sendUserOperation.js","sourceRoot":"","sources":["../../../actions/bundler/sendUserOperation.ts"],"names":[],"mappings":";;;AASA,yDAAqD;AACrD,4FAAwF;AAgCjF,MAAM,iBAAiB,GAAG,KAAK,EAMlC,MAA0E,EAC1E,IAAuD,EAC1C,EAAE;IACf,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAE1C,IAAI,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC3C,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE;gBACJ,IAAA,yBAAW,EAAC,aAAa,CAExB;gBACD,UAAU;aACb;SACJ,CAAC,CAAA;QAEF,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,IAAA,qDAAyB,EAC3B,GAAgB,EAChB,IAA+C,CAClD,CAAA;IACL,CAAC;AACL,CAAC,CAAA;AA7BY,QAAA,iBAAiB,qBA6B7B"}

package/_cjs/actions/bundler/supportedEntryPoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"supportedEntryPoints.js","sourceRoot":"","sources":["../../../actions/bundler/supportedEntryPoints.ts"],"names":[],"mappings":";;;AA0BO,MAAM,oBAAoB,GAAG,KAAK,EAKrC,MAA8D,EAC5C,EAAE;IACpB,OAAO,MAAM,CAAC,OAAO,CAAC;QAClB,MAAM,EAAE,0BAA0B;QAClC,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;AACN,CAAC,CAAA;AAXY,QAAA,oBAAoB,wBAWhC"}
+{"version":3,"file":"supportedEntryPoints.js","sourceRoot":"","sources":["../../../actions/bundler/supportedEntryPoints.ts"],"names":[],"mappings":";;;AA2BO,MAAM,oBAAoB,GAAG,KAAK,EAMrC,MAA0E,EACrD,EAAE;IACvB,OAAO,MAAM,CAAC,OAAO,CAAC;QAClB,MAAM,EAAE,0BAA0B;QAClC,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;AACN,CAAC,CAAA;AAZY,QAAA,oBAAoB,wBAYhC"}

package/_cjs/actions/pimlico/getUserOperationGasPrice.js

@@ -2,22 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserOperationGasPrice = void 0;
 const getUserOperationGasPrice = async (client) => {
-    const gasPrices = await client.request({
+    const gasPrice = await client.request({
         method: "pimlico_getUserOperationGasPrice",
         params: []
     });
     return {
         slow: {
-            maxFeePerGas: BigInt(gasPrices.slow.maxFeePerGas),
-            maxPriorityFeePerGas: BigInt(gasPrices.slow.maxPriorityFeePerGas)
+            maxFeePerGas: BigInt(gasPrice.slow.maxFeePerGas),
+            maxPriorityFeePerGas: BigInt(gasPrice.slow.maxPriorityFeePerGas)
         },
         standard: {
-            maxFeePerGas: BigInt(gasPrices.standard.maxFeePerGas),
-            maxPriorityFeePerGas: BigInt(gasPrices.standard.maxPriorityFeePerGas)
+            maxFeePerGas: BigInt(gasPrice.standard.maxFeePerGas),
+            maxPriorityFeePerGas: BigInt(gasPrice.standard.maxPriorityFeePerGas)
         },
         fast: {
-            maxFeePerGas: BigInt(gasPrices.fast.maxFeePerGas),
-            maxPriorityFeePerGas: BigInt(gasPrices.fast.maxPriorityFeePerGas)
+            maxFeePerGas: BigInt(gasPrice.fast.maxFeePerGas),
+            maxPriorityFeePerGas: BigInt(gasPrice.fast.maxPriorityFeePerGas)
         }
     };
 };

package/_cjs/actions/pimlico/getUserOperationGasPrice.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserOperationGasPrice.js","sourceRoot":"","sources":["../../../actions/pimlico/getUserOperationGasPrice.ts"],"names":[],"mappings":";;;AAwCO,MAAM,wBAAwB,GAAG,KAAK,EAKzC,MAAqE,EAChB,EAAE;IACvD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACnC,MAAM,EAAE,kCAAkC;QAC1C,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,OAAO;QACH,IAAI,EAAE;YACF,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;YACjD,oBAAoB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC;SACpE;QACD,QAAQ,EAAE;YACN,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC;YACrD,oBAAoB,EAAE,MAAM,CACxB,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAC1C;SACJ;QACD,IAAI,EAAE;YACF,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;YACjD,oBAAoB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC;SACpE;KACJ,CAAA;AACL,CAAC,CAAA;AA5BY,QAAA,wBAAwB,4BA4BpC"}
+{"version":3,"file":"getUserOperationGasPrice.js","sourceRoot":"","sources":["../../../actions/pimlico/getUserOperationGasPrice.ts"],"names":[],"mappings":";;;AAwCO,MAAM,wBAAwB,GAAG,KAAK,EAKzC,MAAqE,EAChB,EAAE;IACvD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,kCAAkC;QAC1C,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,OAAO;QACH,IAAI,EAAE;YACF,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;YAChD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC;SACnE;QACD,QAAQ,EAAE;YACN,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;YACpD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC;SACvE;QACD,IAAI,EAAE;YACF,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;YAChD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC;SACnE;KACJ,CAAA;AACL,CAAC,CAAA;AA1BY,QAAA,wBAAwB,4BA0BpC"}

package/_cjs/actions/pimlico/sponsorUserOperation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sponsorUserOperation = void 0;
 const deepHexlify_1 = require("../../utils/deepHexlify.js");
+const getEntryPointVersion_1 = require("../../utils/getEntryPointVersion.js");
 const sponsorUserOperation = async (client, args) => {
     const response = await client.request({
         method: "pm_sponsorUserOperation",
@@ -18,14 +19,25 @@ const sponsorUserOperation = async (client, args) => {
                 args.entryPoint
             ]
     });
-    const userOperation = {
-        ...args.userOperation,
-        paymasterAndData: response.paymasterAndData,
-        preVerificationGas: BigInt(response.preVerificationGas),
-        verificationGasLimit: BigInt(response.verificationGasLimit),
-        callGasLimit: BigInt(response.callGasLimit)
+    if (args.entryPoint === getEntryPointVersion_1.ENTRYPOINT_ADDRESS_V06) {
+        const responseV06 = response;
+        return {
+            paymasterAndData: responseV06.paymasterAndData,
+            preVerificationGas: BigInt(responseV06.preVerificationGas),
+            verificationGasLimit: BigInt(responseV06.verificationGasLimit),
+            callGasLimit: BigInt(responseV06.callGasLimit)
+        };
+    }
+    const responseV07 = response;
+    return {
+        callGasLimit: BigInt(responseV07.callGasLimit),
+        verificationGasLimit: BigInt(responseV07.verificationGasLimit),
+        preVerificationGas: BigInt(responseV07.preVerificationGas),
+        paymaster: responseV07.paymaster,
+        paymasterVerificationGasLimit: BigInt(responseV07.paymasterVerificationGasLimit),
+        paymasterPostOpGasLimit: BigInt(responseV07.paymasterPostOpGasLimit),
+        paymasterData: responseV07.paymasterData
     };
-    return userOperation;
 };
 exports.sponsorUserOperation = sponsorUserOperation;
 //# sourceMappingURL=sponsorUserOperation.js.map

package/_cjs/actions/pimlico/sponsorUserOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"sponsorUserOperation.js","sourceRoot":"","sources":["../../../actions/pimlico/sponsorUserOperation.ts"],"names":[],"mappings":";;;AAQA,yDAAqD;AAyC9C,MAAM,oBAAoB,GAAG,KAAK,EAKrC,MAAuE,EACvE,IAAqD,EACJ,EAAE;IACnD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,yBAAyB;QACjC,MAAM,EAAE,IAAI,CAAC,mBAAmB;YAC5B,CAAC,CAAC;gBACI,IAAA,yBAAW,EACP,IAAI,CAAC,aAAa,CACW;gBACjC,IAAI,CAAC,UAAU;gBACf;oBACI,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;iBAChD;aACJ;YACH,CAAC,CAAC;gBACI,IAAA,yBAAW,EACP,IAAI,CAAC,aAAa,CACW;gBACjC,IAAI,CAAC,UAAU;aAClB;KACV,CAAC,CAAA;IAEF,MAAM,aAAa,GAAkB;QACjC,GAAG,IAAI,CAAC,aAAa;QACrB,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,kBAAkB,EAAE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QACvD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QAC3D,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;KAC9C,CAAA;IAED,OAAO,aAAa,CAAA;AACxB,CAAC,CAAA;AArCY,QAAA,oBAAoB,wBAqChC"}
+{"version":3,"file":"sponsorUserOperation.js","sourceRoot":"","sources":["../../../actions/pimlico/sponsorUserOperation.ts"],"names":[],"mappings":";;;AAaA,yDAAqD;AACrD,2EAAyE;AAmElE,MAAM,oBAAoB,GAAG,KAAK,EAMrC,MAKC,EACD,IAAiE,EACJ,EAAE;IAC/D,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,yBAAyB;QACjC,MAAM,EAAE,IAAI,CAAC,mBAAmB;YAC5B,CAAC,CAAC;gBACI,IAAA,yBAAW,EACP,IAAI,CAAC,aAAa,CAGrB;gBACD,IAAI,CAAC,UAAU;gBACf;oBACI,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;iBAChD;aACJ;YACH,CAAC,CAAC;gBACI,IAAA,yBAAW,EACP,IAAI,CAAC,aAAa,CAGrB;gBACD,IAAI,CAAC,UAAU;aAClB;KACV,CAAC,CAAA;IAEF,IAAI,IAAI,CAAC,UAAU,KAAK,6CAAsB,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,QASnB,CAAA;QACD,OAAO;YACH,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;YAC1D,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;SACH,CAAA;IACnD,CAAC;IAED,MAAM,WAAW,GAAG,QASnB,CAAA;IAED,OAAO;QACH,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;QAC9C,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC;QAC9D,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;QAC1D,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,6BAA6B,EAAE,MAAM,CACjC,WAAW,CAAC,6BAA6B,CAC5C;QACD,uBAAuB,EAAE,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC;QACpE,aAAa,EAAE,WAAW,CAAC,aAAa;KACG,CAAA;AACnD,CAAC,CAAA;AA/EY,QAAA,oBAAoB,wBA+EhC"}

package/_cjs/actions/pimlico/validateSponsorshipPolicies.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateSponsorshipPolicies.js","sourceRoot":"","sources":["../../../actions/pimlico/validateSponsorshipPolicies.ts"],"names":[],"mappings":";;;AAOA,yDAAqD;AAqD9C,MAAM,2BAA2B,GAAG,KAAK,EAK5C,MAAuE,EACvE,IAAqD,EACL,EAAE;IAClD,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC;QACxB,MAAM,EAAE,gCAAgC;QACxC,MAAM,EAAE;YACJ,IAAA,yBAAW,EAAC,IAAI,CAAC,aAAa,CAAiC;YAC/D,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,oBAAoB;SAC5B;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAhBY,QAAA,2BAA2B,+BAgBvC"}
+{"version":3,"file":"validateSponsorshipPolicies.js","sourceRoot":"","sources":["../../../actions/pimlico/validateSponsorshipPolicies.ts"],"names":[],"mappings":";;;AAQA,yDAAqD;AAuD9C,MAAM,2BAA2B,GAAG,KAAK,EAM5C,MAKC,EACD,IAAiE,EACjB,EAAE;IAClD,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC;QACxB,MAAM,EAAE,gCAAgC;QACxC,MAAM,EAAE;YACJ,IAAA,yBAAW,EAAC,IAAI,CAAC,aAAa,CAE7B;YACD,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,oBAAoB;SAC5B;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAxBY,QAAA,2BAA2B,+BAwBvC"}

package/_cjs/actions/public/getAccountNonce.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAccountNonce.js","sourceRoot":"","sources":["../../../actions/public/getAccountNonce.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAE3C,qDAAiD;AAkC1C,MAAM,eAAe,GAAG,KAAK,EAIhC,MAAkC,EAClC,IAAqC,EACtB,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAA;IAEpD,OAAO,MAAM,IAAA,qBAAS,EAClB,MAAM,EACN,sBAAY,CACf,CAAC;QACE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE;YACD;gBACI,MAAM,EAAE;oBACJ;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,eAAe,EAAE,MAAM;gBACvB,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,YAAY,EAAE,UAAU;QACxB,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC;KACtB,CAAC,CAAA;AACN,CAAC,CAAA;AAxCY,QAAA,eAAe,mBAwC3B"}
+{"version":3,"file":"getAccountNonce.js","sourceRoot":"","sources":["../../../actions/public/getAccountNonce.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAG3C,qDAAiD;AAkC1C,MAAM,eAAe,GAAG,KAAK,EAIhC,MAAkC,EAClC,IAAqC,EACtB,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAA;IAEpD,OAAO,MAAM,IAAA,qBAAS,EAClB,MAAM,EACN,sBAAY,CACf,CAAC;QACE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE;YACD;gBACI,MAAM,EAAE;oBACJ;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,eAAe,EAAE,MAAM;gBACvB,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,YAAY,EAAE,UAAU;QACxB,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC;KACtB,CAAC,CAAA;AACN,CAAC,CAAA;AAxCY,QAAA,eAAe,mBAwC3B"}

package/_cjs/actions/public/getSenderAddress.js

@@ -19,7 +19,10 @@ class InvalidEntryPointError extends viem_1.BaseError {
 }
 exports.InvalidEntryPointError = InvalidEntryPointError;
 const getSenderAddress = async (client, args) => {
-    const { initCode, entryPoint } = args;
+    const { initCode, entryPoint, factory, factoryData } = args;
+    if (!initCode && !factory && !factoryData) {
+        throw new Error("Either `initCode` or `factory` and `factoryData` must be provided");
+    }
     try {
         await (0, getAction_1.getAction)(client, actions_1.simulateContract)({
             address: entryPoint,
@@ -50,7 +53,7 @@ const getSenderAddress = async (client, args) => {
                 }
             ],
             functionName: "getSenderAddress",
-            args: [initCode]
+            args: [initCode || (0, viem_1.concat)([factory, factoryData])]
         });
     }
     catch (e) {

package/_cjs/actions/public/getSenderAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSenderAddress.js","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":";;;AAAA,+BASa;AAEb,0CAA+C;AAE/C,qDAAiD;AAIjD,MAAa,sBAAuB,SAAQ,gBAAS;IAGjD,YAAY,EACR,KAAK,EACL,UAAU,KACmC,EAAE;QAC/C,KAAK,CACD,0CACI,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC,CAAC,EACtC,iGAAiG,EACjG;YACI,KAAK;SACR,CACJ,CAAA;QAbI;;;;mBAAO,wBAAwB;WAAA;IAcxC,CAAC;CACJ;AAhBD,wDAgBC;AA2BM,MAAM,gBAAgB,GAAG,KAAK,EAIjC,MAAkC,EAClC,IAAsC,EACtB,EAAE;IAClB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAErC,IAAI,CAAC;QACD,MAAM,IAAA,qBAAS,EACX,MAAM,EACN,0BAAgB,CACnB,CAAC;YACE,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE;gBACD;oBACI,MAAM,EAAE;wBACJ;4BACI,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,SAAS;yBAClB;qBACJ;oBACD,IAAI,EAAE,qBAAqB;oBAC3B,IAAI,EAAE,OAAO;iBAChB;gBACD;oBACI,MAAM,EAAE;wBACJ;4BACI,YAAY,EAAE,OAAO;4BACrB,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,OAAO;yBAChB;qBACJ;oBACD,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE,EAAE;oBACX,eAAe,EAAE,YAAY;oBAC7B,IAAI,EAAE,UAAU;iBACnB;aACJ;YACD,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,CAAC,QAAQ,CAAC;SACnB,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,CAAuC,CAAA;QAEnD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,+BAA+B,EAAE,CAAC;YACrD,MAAM,WAAW,GAAG,GAAG,CAAC,KAA0C,CAAA;YAClE,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAA;YACnD,IACI,SAAS,KAAK,qBAAqB;gBACnC,WAAW,CAAC,IAAI,EAAE,IAAI;gBACtB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAC3B,CAAC;gBACC,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAY,CAAA;YAC/C,CAAC;QACL,CAAC;QAED,MAAM,CAAC,CAAA;IACX,CAAC;IAED,MAAM,IAAI,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;AACpD,CAAC,CAAA;AA/DY,QAAA,gBAAgB,oBA+D5B"}
+{"version":3,"file":"getSenderAddress.js","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":";;;AAAA,+BAUa;AAEb,0CAA+C;AAM/C,qDAAiD;AAiBjD,MAAa,sBAAuB,SAAQ,gBAAS;IAGjD,YAAY,EACR,KAAK,EACL,UAAU,KACmC,EAAE;QAC/C,KAAK,CACD,0CACI,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC,CAAC,EACtC,iGAAiG,EACjG;YACI,KAAK;SACR,CACJ,CAAA;QAbI;;;;mBAAO,wBAAwB;WAAA;IAcxC,CAAC;CACJ;AAhBD,wDAgBC;AA2BM,MAAM,gBAAgB,GAAG,KAAK,EAKjC,MAAkC,EAClC,IAAkD,EAClC,EAAE;IAClB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IAE3D,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACX,mEAAmE,CACtE,CAAA;IACL,CAAC;IAED,IAAI,CAAC;QACD,MAAM,IAAA,qBAAS,EACX,MAAM,EACN,0BAAgB,CACnB,CAAC;YACE,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE;gBACD;oBACI,MAAM,EAAE;wBACJ;4BACI,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,SAAS;yBAClB;qBACJ;oBACD,IAAI,EAAE,qBAAqB;oBAC3B,IAAI,EAAE,OAAO;iBAChB;gBACD;oBACI,MAAM,EAAE;wBACJ;4BACI,YAAY,EAAE,OAAO;4BACrB,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,OAAO;yBAChB;qBACJ;oBACD,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE,EAAE;oBACX,eAAe,EAAE,YAAY;oBAC7B,IAAI,EAAE,UAAU;iBACnB;aACJ;YACD,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,CAAC,QAAQ,IAAI,IAAA,aAAM,EAAC,CAAC,OAAc,EAAE,WAAkB,CAAC,CAAC,CAAC;SACnE,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,CAAuC,CAAA;QAEnD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,+BAA+B,EAAE,CAAC;YACrD,MAAM,WAAW,GAAG,GAAG,CAAC,KAA0C,CAAA;YAClE,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAA;YACnD,IACI,SAAS,KAAK,qBAAqB;gBACnC,WAAW,CAAC,IAAI,EAAE,IAAI;gBACtB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAC3B,CAAC;gBACC,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAY,CAAA;YAC/C,CAAC;QACL,CAAC;QAED,MAAM,CAAC,CAAA;IACX,CAAC;IAED,MAAM,IAAI,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;AACpD,CAAC,CAAA;AAtEY,QAAA,gBAAgB,oBAsE5B"}

package/_cjs/actions/smartAccount/deployContract.js

@@ -7,7 +7,7 @@ const signUserOperationHashWithECDSA_1 = require("../../utils/signUserOperationH
 const waitForUserOperationReceipt_1 = require("../bundler/waitForUserOperationReceipt.js");
 const sendUserOperation_1 = require("./sendUserOperation.js");
 async function deployContract(client, args) {
-    const { abi, args: constructorArgs, bytecode, sponsorUserOperation, ...request } = args;
+    const { abi, args: constructorArgs, bytecode, middleware, ...request } = args;
     const { account: account_ = client.account } = request;
     if (!account_) {
         throw new signUserOperationHashWithECDSA_1.AccountOrClientNotFoundError({
@@ -15,10 +15,9 @@ async function deployContract(client, args) {
         });
     }
     const account = (0, utils_1.parseAccount)(account_);
-    const userOpHash = await (0, getAction_1.getAction)(client, sendUserOperation_1.sendUserOperation)({
+    const userOpHash = await (0, getAction_1.getAction)(client, (sendUserOperation_1.sendUserOperation))({
         userOperation: {
             sender: account.address,
-            paymasterAndData: "0x",
             maxFeePerGas: request.maxFeePerGas || 0n,
             maxPriorityFeePerGas: request.maxPriorityFeePerGas || 0n,
             callData: await account.encodeDeployCallData({
@@ -28,7 +27,7 @@ async function deployContract(client, args) {
             })
         },
         account: account,
-        sponsorUserOperation
+        middleware
     });
     const userOperationReceipt = await (0, getAction_1.getAction)(client, waitForUserOperationReceipt_1.waitForUserOperationReceipt)({
         hash: userOpHash

package/_cjs/actions/smartAccount/deployContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployContract.js","sourceRoot":"","sources":["../../../actions/smartAccount/deployContract.ts"],"names":[],"mappings":";;;AAWA,wCAA2C;AAC3C,qDAAiD;AACjD,+FAAyF;AACzF,wFAAoF;AAEpF,2DAAuD;AAsChD,KAAK,UAAU,cAAc,CAIhC,MAA2C,EAC3C,IAAqD;IAErD,MAAM,EACF,GAAG,EACH,IAAI,EAAE,eAAe,EACrB,QAAQ,EACR,oBAAoB,EACpB,GAAG,OAAO,EACb,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,OAAO,CAAA;IAEtD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6DAA4B,CAAC;YACnC,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAS,EAC9B,MAAM,EACN,qCAAiB,CACpB,CAAC;QACE,aAAa,EAAE;YACX,MAAM,EAAE,OAAO,CAAC,OAAO;YACvB,gBAAgB,EAAE,IAAI;YACtB,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;YACxC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,IAAI,EAAE;YACxD,QAAQ,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC;gBACzC,GAAG;gBACH,QAAQ;gBACR,IAAI,EAAE,eAAe;aACM,CAAC;SACnC;QACD,OAAO,EAAE,OAAO;QAChB,oBAAoB;KACvB,CAAC,CAAA;IAEF,MAAM,oBAAoB,GAAG,MAAM,IAAA,qBAAS,EACxC,MAAM,EACN,yDAA2B,CAC9B,CAAC;QACE,IAAI,EAAE,UAAU;KACnB,CAAC,CAAA;IAEF,OAAO,oBAAoB,EAAE,OAAO,CAAC,eAAe,CAAA;AACxD,CAAC;AApDD,wCAoDC"}
+{"version":3,"file":"deployContract.js","sourceRoot":"","sources":["../../../actions/smartAccount/deployContract.ts"],"names":[],"mappings":";;;AAYA,wCAA2C;AAC3C,qDAAiD;AACjD,+FAAyF;AACzF,wFAAoF;AAEpF,2DAAuD;AAyChD,KAAK,UAAU,cAAc,CAKhC,MAA2C,EAC3C,IAAiE;IAEjE,MAAM,EACF,GAAG,EACH,IAAI,EAAE,eAAe,EACrB,QAAQ,EACR,UAAU,EACV,GAAG,OAAO,EACb,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,OAAO,CAAA;IAEtD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6DAA4B,CAAC;YACnC,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAA6B,CAAA;IAElE,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAS,EAC9B,MAAM,EACN,CAAA,qCAA6B,CAAA,CAChC,CAAC;QACE,aAAa,EAAE;YACX,MAAM,EAAE,OAAO,CAAC,OAAO;YACvB,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;YACxC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,IAAI,EAAE;YACxD,QAAQ,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC;gBACzC,GAAG;gBACH,QAAQ;gBACR,IAAI,EAAE,eAAe;aACM,CAAC;SACnC;QACD,OAAO,EAAE,OAAO;QAChB,UAAU;KACb,CAAC,CAAA;IAEF,MAAM,oBAAoB,GAAG,MAAM,IAAA,qBAAS,EACxC,MAAM,EACN,yDAA2B,CAC9B,CAAC;QACE,IAAI,EAAE,UAAU;KACnB,CAAC,CAAA;IAEF,OAAO,oBAAoB,EAAE,OAAO,CAAC,eAAe,CAAA;AACxD,CAAC;AApDD,wCAoDC"}