permissionless 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # permissionless
 
+## 0.1.40
+
+### Patch Changes
+
+- be1c3dede45bdfbffe168735cbd48fd967684818: Added encodeNonce util function
+
+## 0.1.39
+
+### Patch Changes
+
+- 3527daa505b73b343cbee257124d5416b7dff730: Fixed getSenderAddress, when rpc returns an UnknownRpcError
+
 ## 0.1.38
 
 ### Patch Changes

package/_cjs/actions/public/getSenderAddress.js

@@ -57,9 +57,11 @@ const getSenderAddress = async (client, args) => {
         });
     }
     catch (e) {
-        const err = e;
-        if (err.cause.name === "ContractFunctionRevertedError") {
-            const revertError = err.cause;
+        const revertError = e.walk((err) => err instanceof viem_1.ContractFunctionRevertedError ||
+            err instanceof viem_1.RpcRequestError ||
+            err instanceof viem_1.InvalidInputRpcError ||
+            err instanceof viem_1.UnknownRpcError);
+        if (revertError instanceof viem_1.ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? "";
             if (errorName === "SenderAddressResult" &&
                 revertError.data?.args &&
@@ -67,60 +69,82 @@ const getSenderAddress = async (client, args) => {
                 return revertError.data?.args[0];
             }
         }
-        if (err.cause.name === "CallExecutionError") {
-            const callExecutionError = err.cause;
-            if (callExecutionError.cause.name === "RpcRequestError") {
-                const revertError = callExecutionError.cause;
-                const hexStringRegex = /0x[a-fA-F0-9]+/;
-                const match = revertError.cause.data.match(hexStringRegex);
-                if (!match) {
-                    throw new Error("Failed to parse revert bytes from RPC response");
-                }
-                const data = match[0];
-                const error = (0, viem_1.decodeErrorResult)({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                });
-                return error.args[0];
+        if (revertError instanceof viem_1.RpcRequestError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            const match = revertError.cause.data.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
             }
-            if (callExecutionError.cause.name === "InvalidInputRpcError") {
-                const revertError = callExecutionError.cause;
-                const hexStringRegex = /0x[a-fA-F0-9]+/;
-                const match = revertError.cause.data.match(hexStringRegex);
-                if (!match) {
-                    throw new Error("Failed to parse revert bytes from RPC response");
-                }
-                const data = match[0];
-                const error = (0, viem_1.decodeErrorResult)({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                });
-                return error.args[0];
+            const data = match[0];
+            const error = (0, viem_1.decodeErrorResult)({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
+        }
+        if (revertError instanceof viem_1.InvalidInputRpcError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            const match = revertError.cause.data.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
+            }
+            const data = match[0];
+            const error = (0, viem_1.decodeErrorResult)({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
+        }
+        if (revertError instanceof viem_1.UnknownRpcError) {
+            const parsedBody = JSON.parse(revertError.cause.body);
+            const revertData = parsedBody.error.data;
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            const match = revertData.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
             }
+            const data = match[0];
+            const error = (0, viem_1.decodeErrorResult)({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
         }
         throw e;
     }

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

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

package/_cjs/utils/encodeNonce.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeNonce = void 0;
+const viem_1 = require("viem");
+function encodeNonce(args) {
+    const key = BigInt((0, viem_1.toHex)(args.key, { size: 24 }));
+    const sequence = BigInt((0, viem_1.toHex)(args.sequence, { size: 8 }));
+    return (key << BigInt(64)) + sequence;
+}
+exports.encodeNonce = encodeNonce;
+//# sourceMappingURL=encodeNonce.js.map

package/_cjs/utils/encodeNonce.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encodeNonce.js","sourceRoot":"","sources":["../../utils/encodeNonce.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,SAAgB,WAAW,CAAC,IAAuC;IAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAA,YAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAA,YAAK,EAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1D,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAA;AACzC,CAAC;AALD,kCAKC"}

package/_cjs/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENTRYPOINT_ADDRESS_V07 = exports.ENTRYPOINT_ADDRESS_V06 = exports.getEntryPointVersion = exports.getPackedUserOperation = exports.getAddressFromInitCodeOrPaymasterAndData = exports.providerToSmartAccountSigner = exports.isSmartAccountDeployed = exports.AccountOrClientNotFoundError = exports.signUserOperationHashWithECDSA = exports.walletClientToSmartAccountSigner = exports.getRequiredPrefund = exports.getUserOperationHash = exports.deepHexlify = exports.transactionReceiptStatus = exports.parseAccount = void 0;
+exports.ENTRYPOINT_ADDRESS_V07 = exports.ENTRYPOINT_ADDRESS_V06 = exports.encodeNonce = exports.getEntryPointVersion = exports.getPackedUserOperation = exports.getAddressFromInitCodeOrPaymasterAndData = exports.providerToSmartAccountSigner = exports.isSmartAccountDeployed = exports.AccountOrClientNotFoundError = exports.signUserOperationHashWithECDSA = exports.walletClientToSmartAccountSigner = exports.getRequiredPrefund = exports.getUserOperationHash = exports.deepHexlify = exports.transactionReceiptStatus = exports.parseAccount = void 0;
 const deepHexlify_1 = require("./deepHexlify.js");
 Object.defineProperty(exports, "deepHexlify", { enumerable: true, get: function () { return deepHexlify_1.deepHexlify; } });
 Object.defineProperty(exports, "transactionReceiptStatus", { enumerable: true, get: function () { return deepHexlify_1.transactionReceiptStatus; } });
@@ -25,6 +25,8 @@ function parseAccount(account) {
     return account;
 }
 exports.parseAccount = parseAccount;
+const encodeNonce_1 = require("./encodeNonce.js");
+Object.defineProperty(exports, "encodeNonce", { enumerable: true, get: function () { return encodeNonce_1.encodeNonce; } });
 const getEntryPointVersion_1 = require("./getEntryPointVersion.js");
 Object.defineProperty(exports, "ENTRYPOINT_ADDRESS_V06", { enumerable: true, get: function () { return getEntryPointVersion_1.ENTRYPOINT_ADDRESS_V06; } });
 Object.defineProperty(exports, "ENTRYPOINT_ADDRESS_V07", { enumerable: true, get: function () { return getEntryPointVersion_1.ENTRYPOINT_ADDRESS_V07; } });

package/_cjs/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":";;;AACA,+CAAqE;AAkCjE,4FAlCK,yBAAW,OAkCL;AADX,yGAjCkB,sCAAwB,OAiClB;AAhC5B,yGAAqG;AA4CjG,yHA5CK,mFAAwC,OA4CL;AA3C5C,6DAG6B;AA+BzB,mGAhCA,uCAAkB,OAgCA;AA9BtB,iEAG+B;AA0B3B,qGA3BA,2CAAoB,OA2BA;AAzBxB,qEAAiE;AAiC7D,uGAjCK,+CAAsB,OAiCL;AAhC1B,iFAA6E;AAiCzE,6GAjCK,2DAA4B,OAiCL;AAhChC,qFAIyC;AA0BrC,6GA7BA,6DAA4B,OA6BA;AAF5B,+GAzBA,+DAA8B,OAyBA;AAvBlC,yFAAqF;AAoBjF,iHApBK,mEAAgC,OAoBL;AAlBpC,SAAgB,YAAY,CAAC,OAA0B;IACnD,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IACjD,OAAO,OAAO,CAAA;AAClB,CAAC;AAJD,oCAIC;AACD,iEAI+B;AAoB3B,uGAvBA,6CAAsB,OAuBA;AACtB,uGAvBA,6CAAsB,OAuBA;AAFtB,qGApBA,2CAAoB,OAoBA;AAjBxB,qEAAiE;AAgB7D,uGAhBK,+CAAsB,OAgBL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":";;;AACA,+CAAqE;AAmCjE,4FAnCK,yBAAW,OAmCL;AADX,yGAlCkB,sCAAwB,OAkClB;AAjC5B,yGAAqG;AA6CjG,yHA7CK,mFAAwC,OA6CL;AA5C5C,6DAG6B;AAgCzB,mGAjCA,uCAAkB,OAiCA;AA/BtB,iEAG+B;AA2B3B,qGA5BA,2CAAoB,OA4BA;AA1BxB,qEAAiE;AAkC7D,uGAlCK,+CAAsB,OAkCL;AAjC1B,iFAA6E;AAkCzE,6GAlCK,2DAA4B,OAkCL;AAjChC,qFAIyC;AA2BrC,6GA9BA,6DAA4B,OA8BA;AAF5B,+GA1BA,+DAA8B,OA0BA;AAxBlC,yFAAqF;AAqBjF,iHArBK,mEAAgC,OAqBL;AAnBpC,SAAgB,YAAY,CAAC,OAA0B;IACnD,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IACjD,OAAO,OAAO,CAAA;AAClB,CAAC;AAJD,oCAIC;AACD,+CAA2C;AAyBvC,4FAzBK,yBAAW,OAyBL;AAxBf,iEAI+B;AAqB3B,uGAxBA,6CAAsB,OAwBA;AACtB,uGAxBA,6CAAsB,OAwBA;AAHtB,qGApBA,2CAAoB,OAoBA;AAjBxB,qEAAiE;AAgB7D,uGAhBK,+CAAsB,OAgBL"}

package/_esm/actions/public/getSenderAddress.js

@@ -1,4 +1,4 @@
-import { BaseError, concat, decodeErrorResult } from "viem";
+import { BaseError, ContractFunctionRevertedError, InvalidInputRpcError, RpcRequestError, UnknownRpcError, concat, decodeErrorResult } from "viem";
 import { simulateContract } from "viem/actions";
 import { getAction } from "viem/utils";
 export class InvalidEntryPointError extends BaseError {
@@ -78,9 +78,11 @@ export const getSenderAddress = async (client, args) => {
         });
     }
     catch (e) {
-        const err = e;
-        if (err.cause.name === "ContractFunctionRevertedError") {
-            const revertError = err.cause;
+        const revertError = e.walk((err) => err instanceof ContractFunctionRevertedError ||
+            err instanceof RpcRequestError ||
+            err instanceof InvalidInputRpcError ||
+            err instanceof UnknownRpcError);
+        if (revertError instanceof ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? "";
             if (errorName === "SenderAddressResult" &&
                 revertError.data?.args &&
@@ -88,63 +90,85 @@ export const getSenderAddress = async (client, args) => {
                 return revertError.data?.args[0];
             }
         }
-        if (err.cause.name === "CallExecutionError") {
-            const callExecutionError = err.cause;
-            if (callExecutionError.cause.name === "RpcRequestError") {
-                const revertError = callExecutionError.cause;
-                const hexStringRegex = /0x[a-fA-F0-9]+/;
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = revertError.cause.data.match(hexStringRegex);
-                if (!match) {
-                    throw new Error("Failed to parse revert bytes from RPC response");
-                }
-                const data = match[0];
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                });
-                return error.args[0];
+        if (revertError instanceof RpcRequestError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = revertError.cause.data.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
             }
-            if (callExecutionError.cause.name === "InvalidInputRpcError") {
-                //Ganache local testing returns "InvalidInputRpcError" with data in regular format
-                const revertError = callExecutionError.cause;
-                const hexStringRegex = /0x[a-fA-F0-9]+/;
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = revertError.cause.data.match(hexStringRegex);
-                if (!match) {
-                    throw new Error("Failed to parse revert bytes from RPC response");
-                }
-                const data = match[0];
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                });
-                return error.args[0];
+            const data = match[0];
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
+        }
+        if (revertError instanceof InvalidInputRpcError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = revertError.cause.data.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
+            }
+            const data = match[0];
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
+        }
+        if (revertError instanceof UnknownRpcError) {
+            const parsedBody = JSON.parse(revertError.cause.body);
+            const revertData = parsedBody.error.data;
+            const hexStringRegex = /0x[a-fA-F0-9]+/;
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = revertData.match(hexStringRegex);
+            if (!match) {
+                throw new Error("Failed to parse revert bytes from RPC response");
             }
+            const data = match[0];
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            });
+            return error.args[0];
         }
         throw e;
     }

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

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

package/_esm/utils/encodeNonce.js

@@ -0,0 +1,7 @@
+import { toHex } from "viem";
+export function encodeNonce(args) {
+    const key = BigInt(toHex(args.key, { size: 24 }));
+    const sequence = BigInt(toHex(args.sequence, { size: 8 }));
+    return (key << BigInt(64)) + sequence;
+}
+//# sourceMappingURL=encodeNonce.js.map

package/_esm/utils/encodeNonce.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encodeNonce.js","sourceRoot":"","sources":["../../utils/encodeNonce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAE5B,MAAM,UAAU,WAAW,CAAC,IAAuC;IAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1D,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAA;AACzC,CAAC"}

package/_esm/utils/index.js

@@ -11,7 +11,8 @@ export function parseAccount(account) {
         return { address: account, type: "json-rpc" };
     return account;
 }
+import { encodeNonce } from "./encodeNonce.js";
 import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07, getEntryPointVersion } from "./getEntryPointVersion.js";
 import { getPackedUserOperation } from "./getPackedUserOperation.js";
-export { transactionReceiptStatus, deepHexlify, getUserOperationHash, getRequiredPrefund, walletClientToSmartAccountSigner, signUserOperationHashWithECDSA, AccountOrClientNotFoundError, isSmartAccountDeployed, providerToSmartAccountSigner, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, getEntryPointVersion, ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 };
+export { transactionReceiptStatus, deepHexlify, getUserOperationHash, getRequiredPrefund, walletClientToSmartAccountSigner, signUserOperationHashWithECDSA, AccountOrClientNotFoundError, isSmartAccountDeployed, providerToSmartAccountSigner, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, getEntryPointVersion, encodeNonce, ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 };
 //# sourceMappingURL=index.js.map

package/_esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EAEH,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAEH,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EACH,4BAA4B,EAE5B,8BAA8B,EACjC,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAA;AAErF,MAAM,UAAU,YAAY,CAAC,OAA0B;IACnD,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IACjD,OAAO,OAAO,CAAA;AAClB,CAAC;AACD,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,gCAAgC,EAGhC,8BAA8B,EAE9B,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,wCAAwC,EACxC,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACtB,sBAAsB,EACzB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EAEH,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAEH,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EACH,4BAA4B,EAE5B,8BAA8B,EACjC,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAA;AAErF,MAAM,UAAU,YAAY,CAAC,OAA0B;IACnD,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IACjD,OAAO,OAAO,CAAA;AAClB,CAAC;AACD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,gCAAgC,EAGhC,8BAA8B,EAE9B,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,wCAAwC,EACxC,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACzB,CAAA"}

package/_types/actions/public/getSenderAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSenderAddress.d.ts","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,SAAS,EAET,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,GAAG,EAER,KAAK,SAAS,EAGjB,MAAM,MAAM,CAAA;AAIb,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EACR,2BAA2B,EAC3B,UAAU,EACb,MAAM,wBAAwB,CAAA;AAE/B,MAAM,MAAM,sBAAsB,CAAC,UAAU,SAAS,UAAU,IAC5D,UAAU,SAAS,2BAA2B,GACxC;IACI,QAAQ,EAAE,GAAG,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;CACtB,GACD;IACI,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,GAAG,CAAA;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAA;CACnB,CAAA;AAEX,qBAAa,sBAAuB,SAAQ,SAAS;IACxC,IAAI,SAA2B;gBAE5B,EACR,KAAK,EACL,UAAU,EACb,GAAE;QAAE,KAAK,CAAC,EAAE,SAAS,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO;CAUtD;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,gBAAgB,0IAKjB,OAAO,UAAU,EAAE,MAAM,CAAC,oIAEnC,QAAQ,OAAO,CAgJjB,CAAA"}
+{"version":3,"file":"getSenderAddress.d.ts","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,SAAS,EACT,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,GAAG,EAGR,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AAIb,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EACR,2BAA2B,EAC3B,UAAU,EACb,MAAM,wBAAwB,CAAA;AAE/B,MAAM,MAAM,sBAAsB,CAAC,UAAU,SAAS,UAAU,IAC5D,UAAU,SAAS,2BAA2B,GACxC;IACI,QAAQ,EAAE,GAAG,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;CACtB,GACD;IACI,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,GAAG,CAAA;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAA;CACnB,CAAA;AAEX,qBAAa,sBAAuB,SAAQ,SAAS;IACxC,IAAI,SAA2B;gBAE5B,EACR,KAAK,EACL,UAAU,EACb,GAAE;QAAE,KAAK,CAAC,EAAE,SAAS,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO;CAUtD;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,gBAAgB,0IAKjB,OAAO,UAAU,EAAE,MAAM,CAAC,oIAEnC,QAAQ,OAAO,CAiLjB,CAAA"}

package/_types/utils/encodeNonce.d.ts

@@ -0,0 +1,5 @@
+export declare function encodeNonce(args: {
+    key: bigint;
+    sequence: bigint;
+}): bigint;
+//# sourceMappingURL=encodeNonce.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"encodeNonce.d.ts","sourceRoot":"","sources":["../../utils/encodeNonce.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAK3E"}

package/_types/utils/index.d.ts

@@ -8,7 +8,8 @@ import { providerToSmartAccountSigner } from "./providerToSmartAccountSigner";
 import { AccountOrClientNotFoundError, type SignUserOperationHashWithECDSAParams, signUserOperationHashWithECDSA } from "./signUserOperationHashWithECDSA";
 import { walletClientToSmartAccountSigner } from "./walletClientToSmartAccountSigner";
 export declare function parseAccount(account: Address | Account): Account;
+import { encodeNonce } from "./encodeNonce";
 import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07, getEntryPointVersion } from "./getEntryPointVersion";
 import { getPackedUserOperation } from "./getPackedUserOperation";
-export { transactionReceiptStatus, deepHexlify, getUserOperationHash, getRequiredPrefund, walletClientToSmartAccountSigner, type GetRequiredPrefundReturnType, type GetUserOperationHashParams, signUserOperationHashWithECDSA, type SignUserOperationHashWithECDSAParams, AccountOrClientNotFoundError, isSmartAccountDeployed, providerToSmartAccountSigner, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, getEntryPointVersion, ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 };
+export { transactionReceiptStatus, deepHexlify, getUserOperationHash, getRequiredPrefund, walletClientToSmartAccountSigner, type GetRequiredPrefundReturnType, type GetUserOperationHashParams, signUserOperationHashWithECDSA, type SignUserOperationHashWithECDSAParams, AccountOrClientNotFoundError, isSmartAccountDeployed, providerToSmartAccountSigner, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, getEntryPointVersion, encodeNonce, ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACH,KAAK,0BAA0B,EAC/B,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EACH,4BAA4B,EAC5B,KAAK,oCAAoC,EACzC,8BAA8B,EACjC,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAA;AAErF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAIhE;AACD,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,gCAAgC,EAChC,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAC/B,8BAA8B,EAC9B,KAAK,oCAAoC,EACzC,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,wCAAwC,EACxC,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACtB,sBAAsB,EACzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACH,KAAK,0BAA0B,EAC/B,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EACH,4BAA4B,EAC5B,KAAK,oCAAoC,EACzC,8BAA8B,EACjC,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAA;AAErF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAIhE;AACD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,gCAAgC,EAChC,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAC/B,8BAA8B,EAC9B,KAAK,oCAAoC,EACzC,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,wCAAwC,EACxC,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACzB,CAAA"}

package/actions/public/getSenderAddress.test.ts

@@ -3,7 +3,7 @@ import { generatePrivateKey } from "viem/accounts"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
 import { getSimpleAccountClient } from "../../../permissionless-test/src/utils"
-import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "../../_types/types"
+import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "../../types"
 import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 } from "../../utils"
 import { getSenderAddress } from "./getSenderAddress"
 

package/actions/public/getSenderAddress.ts

@@ -1,14 +1,15 @@
 import {
     type Address,
     BaseError,
-    type CallExecutionErrorType,
     type Chain,
     type Client,
     type ContractFunctionExecutionErrorType,
-    type ContractFunctionRevertedErrorType,
+    ContractFunctionRevertedError,
     type Hex,
-    type RpcRequestErrorType,
+    InvalidInputRpcError,
+    RpcRequestError,
     type Transport,
+    UnknownRpcError,
     concat,
     decodeErrorResult
 } from "viem"
@@ -132,10 +133,15 @@ export const getSenderAddress = async <
             args: [initCode || concat([factory as Hex, factoryData as Hex])]
         })
     } catch (e) {
-        const err = e as ContractFunctionExecutionErrorType
+        const revertError = (e as ContractFunctionExecutionErrorType).walk(
+            (err) =>
+                err instanceof ContractFunctionRevertedError ||
+                err instanceof RpcRequestError ||
+                err instanceof InvalidInputRpcError ||
+                err instanceof UnknownRpcError
+        )
 
-        if (err.cause.name === "ContractFunctionRevertedError") {
-            const revertError = err.cause as ContractFunctionRevertedErrorType
+        if (revertError instanceof ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? ""
             if (
                 errorName === "SenderAddressResult" &&
@@ -146,84 +152,112 @@ export const getSenderAddress = async <
             }
         }
 
-        if (err.cause.name === "CallExecutionError") {
-            const callExecutionError = err.cause as CallExecutionErrorType
-            if (callExecutionError.cause.name === "RpcRequestError") {
-                const revertError =
-                    callExecutionError.cause as RpcRequestErrorType
+        if (revertError instanceof RpcRequestError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = (revertError as unknown as any).cause.data.match(
+                hexStringRegex
+            )
 
-                const hexStringRegex = /0x[a-fA-F0-9]+/
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = (revertError as unknown as any).cause.data.match(
-                    hexStringRegex
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
                 )
+            }
 
-                if (!match) {
-                    throw new Error(
-                        "Failed to parse revert bytes from RPC response"
-                    )
-                }
+            const data: Hex = match[0]
 
-                const data: Hex = match[0]
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
 
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                })
+            return error.args[0] as Address
+        }
+
+        if (revertError instanceof InvalidInputRpcError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = (revertError as unknown as any).cause.data.match(
+                hexStringRegex
+            )
 
-                return error.args[0] as Address
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
+                )
             }
 
-            if (callExecutionError.cause.name === "InvalidInputRpcError") {
-                //Ganache local testing returns "InvalidInputRpcError" with data in regular format
-                const revertError =
-                    callExecutionError.cause as RpcRequestErrorType
+            const data: Hex = match[0]
 
-                const hexStringRegex = /0x[a-fA-F0-9]+/
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = (revertError as unknown as any).cause.data.match(
-                    hexStringRegex
-                )
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
 
-                if (!match) {
-                    throw new Error(
-                        "Failed to parse revert bytes from RPC response"
-                    )
-                }
+            return error.args[0] as Address
+        }
 
-                const data: Hex = match[0]
+        if (revertError instanceof UnknownRpcError) {
+            const parsedBody = JSON.parse(
+                (revertError as unknown as any).cause.body
+            )
+            const revertData = parsedBody.error.data
 
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                })
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = revertData.match(hexStringRegex)
 
-                return error.args[0] as Address
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
+                )
             }
+
+            const data: Hex = match[0]
+
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
+
+            return error.args[0] as Address
         }
 
         throw e

package/package.json

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

package/utils/encodeNonce.test.ts

@@ -0,0 +1,38 @@
+import { encodeNonce } from "permissionless/utils"
+import { toHex } from "viem"
+import { describe, expect, test } from "vitest"
+
+describe("encodeNonce", () => {
+    test("should encode key and sequence correctly", async () => {
+        const key = 123456789012345678901234n
+        const sequence = 9876543210n
+        const expectedKey = BigInt(toHex(key, { size: 24 }))
+        const expectedSequence = BigInt(toHex(sequence, { size: 8 }))
+
+        const result = encodeNonce({ key, sequence })
+
+        expect(result).toBe((expectedKey << BigInt(64)) + expectedSequence)
+    })
+
+    test("should handle zero values correctly", () => {
+        const key = BigInt(0)
+        const sequence = BigInt(0)
+        const expectedKey = BigInt(toHex(key, { size: 24 }))
+        const expectedSequence = BigInt(toHex(sequence, { size: 8 }))
+
+        const result = encodeNonce({ key, sequence })
+
+        expect(result).toBe((expectedKey << BigInt(64)) + expectedSequence)
+    })
+
+    test("should handle large values correctly", () => {
+        const key = BigInt("0xFFFFFFFFFFFFFFFFFFFFFFFF")
+        const sequence = BigInt("0xFFFFFFFF")
+        const expectedKey = BigInt(toHex(key, { size: 24 }))
+        const expectedSequence = BigInt(toHex(sequence, { size: 8 }))
+
+        const result = encodeNonce({ key, sequence })
+
+        expect(result).toBe((expectedKey << BigInt(64)) + expectedSequence)
+    })
+})

package/utils/encodeNonce.ts

@@ -0,0 +1,8 @@
+import { toHex } from "viem"
+
+export function encodeNonce(args: { key: bigint; sequence: bigint }): bigint {
+    const key = BigInt(toHex(args.key, { size: 24 }))
+    const sequence = BigInt(toHex(args.sequence, { size: 8 }))
+
+    return (key << BigInt(64)) + sequence
+}

package/utils/index.ts

@@ -23,6 +23,7 @@ export function parseAccount(account: Address | Account): Account {
         return { address: account, type: "json-rpc" }
     return account
 }
+import { encodeNonce } from "./encodeNonce"
 import {
     ENTRYPOINT_ADDRESS_V06,
     ENTRYPOINT_ADDRESS_V07,
@@ -47,6 +48,7 @@ export {
     getAddressFromInitCodeOrPaymasterAndData,
     getPackedUserOperation,
     getEntryPointVersion,
+    encodeNonce,
     ENTRYPOINT_ADDRESS_V06,
     ENTRYPOINT_ADDRESS_V07
 }