permissionless 0.2.22 → 0.2.24

package/_esm/accounts/etherspot/toEtherspotSmartAccount.js

@@ -0,0 +1,212 @@
+import { encodeAbiParameters, encodeFunctionData, encodePacked, toHex, zeroAddress } from "viem";
+import { entryPoint07Abi, entryPoint07Address, getUserOperationHash, toSmartAccount } from "viem/account-abstraction";
+import { getChainId } from "viem/actions";
+import { getAction } from "viem/utils";
+import { getAccountNonce } from "../../actions/public/getAccountNonce.js";
+import { getSenderAddress } from "../../actions/public/getSenderAddress.js";
+import { encode7579Calls } from "../../utils/encode7579Calls.js";
+import { toOwner } from "../../utils/index.js";
+import { DEFAULT_CONTRACT_ADDRESS, DUMMY_ECDSA_SIGNATURE } from "./constants.js";
+import { getInitMSAData } from "./utils/getInitMSAData.js";
+import { getNonceKeyWithEncoding } from "./utils/getNonceKey.js";
+/**
+ * The account creation ABI for a modular etherspot smart account
+ */
+const createAccountAbi = [
+    {
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "salt",
+                type: "bytes32"
+            },
+            {
+                internalType: "bytes",
+                name: "initCode",
+                type: "bytes"
+            }
+        ],
+        name: "createAccount",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address"
+            }
+        ],
+        stateMutability: "payable",
+        type: "function"
+    }
+];
+/**
+ * Get default addresses for Etherspot Smart Account based on chainId
+ * @param chainId
+ * @param validatorAddress
+ * @param accountLogicAddress
+ * @param factoryAddress
+ * @param metaFactoryAddress
+ */
+const getDefaultAddresses = ({ validatorAddress: _validatorAddress, metaFactoryAddress: _metaFactoryAddress, bootstrapAddress: _bootstrapAddress }) => {
+    const addresses = DEFAULT_CONTRACT_ADDRESS;
+    const validatorAddress = _validatorAddress ?? addresses.validatorAddress;
+    const metaFactoryAddress = _metaFactoryAddress ?? addresses?.metaFactoryAddress ?? zeroAddress;
+    const bootstrapAddress = _bootstrapAddress ?? addresses.bootstrapAddress ?? zeroAddress;
+    return {
+        validatorAddress,
+        metaFactoryAddress,
+        bootstrapAddress
+    };
+};
+/**
+ * Get the initialization data for a etherspot smart account
+ * @param entryPoint
+ * @param owner
+ * @param validatorAddress
+ */
+const getInitialisationData = ({ owner, validatorAddress, bootstrapAddress }) => {
+    const initMSAData = getInitMSAData(validatorAddress);
+    const initCode = encodeAbiParameters([{ type: "address" }, { type: "address" }, { type: "bytes" }], [owner, bootstrapAddress, initMSAData]);
+    return initCode;
+};
+/**
+ * Get the account initialization code for a etherspot smart account
+ * @param entryPoint
+ * @param owner
+ * @param index
+ * @param validatorAddress
+ * @param bootstrapAddress
+ */
+const getAccountInitCode = async ({ owner, index, validatorAddress, bootstrapAddress }) => {
+    if (!owner)
+        throw new Error("Owner account not found");
+    // Build the account initialization data
+    const initialisationData = getInitialisationData({
+        validatorAddress,
+        owner,
+        bootstrapAddress
+    });
+    return encodeFunctionData({
+        abi: createAccountAbi,
+        functionName: "createAccount",
+        args: [toHex(index, { size: 32 }), initialisationData]
+    });
+};
+export async function toEtherspotSmartAccount(parameters) {
+    const { client, owners, address, index = BigInt(0), metaFactoryAddress: _metaFactoryAddress, validatorAddress: _validatorAddress, bootstrapAddress: _bootstrapAddress } = parameters;
+    const localOwner = await toOwner({ owner: owners[0] });
+    const entryPoint = {
+        address: parameters.entryPoint?.address ?? entryPoint07Address,
+        abi: entryPoint07Abi,
+        version: parameters.entryPoint?.version ?? "0.7"
+    };
+    const { validatorAddress, metaFactoryAddress, bootstrapAddress } = getDefaultAddresses({
+        validatorAddress: _validatorAddress,
+        metaFactoryAddress: _metaFactoryAddress,
+        bootstrapAddress: _bootstrapAddress
+    });
+    // Helper to generate the init code for the smart account
+    const generateInitCode = () => getAccountInitCode({
+        owner: localOwner.address,
+        index,
+        validatorAddress,
+        bootstrapAddress
+    });
+    let accountAddress = address;
+    let chainId;
+    const getMemoizedChainId = async () => {
+        if (chainId)
+            return chainId;
+        chainId = client.chain
+            ? client.chain.id
+            : await getAction(client, getChainId, "getChainId")({});
+        return chainId;
+    };
+    const getFactoryArgs = async () => {
+        return {
+            factory: metaFactoryAddress,
+            factoryData: await generateInitCode()
+        };
+    };
+    return toSmartAccount({
+        client,
+        entryPoint,
+        getFactoryArgs,
+        async getAddress() {
+            if (accountAddress)
+                return accountAddress;
+            const { factory, factoryData } = await getFactoryArgs();
+            // Get the sender address based on the init code
+            accountAddress = await getSenderAddress(client, {
+                factory,
+                factoryData,
+                entryPointAddress: entryPoint.address
+            });
+            return accountAddress;
+        },
+        async encodeCalls(calls) {
+            return encode7579Calls({
+                mode: {
+                    type: calls.length > 1 ? "batchcall" : "call",
+                    revertOnError: false,
+                    selector: "0x",
+                    context: "0x"
+                },
+                callData: calls
+            });
+        },
+        async getNonce(_args) {
+            return getAccountNonce(client, {
+                address: await this.getAddress(),
+                entryPointAddress: entryPoint.address,
+                key: getNonceKeyWithEncoding(validatorAddress, 
+                /*args?.key ?? */ parameters.nonceKey ?? 0n)
+            });
+        },
+        async getStubSignature() {
+            return DUMMY_ECDSA_SIGNATURE;
+        },
+        async sign({ hash }) {
+            return this.signMessage({ message: hash });
+        },
+        async signMessage({ message }) {
+            let signature = await localOwner.signMessage({
+                message
+            });
+            const potentiallyIncorrectV = Number.parseInt(signature.slice(-2), 16);
+            if (![27, 28].includes(potentiallyIncorrectV)) {
+                const correctV = potentiallyIncorrectV + 27;
+                signature = (signature.slice(0, -2) +
+                    correctV.toString(16));
+            }
+            return encodePacked(["address", "bytes"], [validatorAddress, signature]);
+        },
+        async signTypedData(typedData) {
+            let signature = await localOwner.signTypedData(typedData);
+            const potentiallyIncorrectV = Number.parseInt(signature.slice(-2), 16);
+            if (![27, 28].includes(potentiallyIncorrectV)) {
+                const correctV = potentiallyIncorrectV + 27;
+                signature = (signature.slice(0, -2) +
+                    correctV.toString(16));
+            }
+            return encodePacked(["address", "bytes"], [validatorAddress, signature]);
+        },
+        async signUserOperation(parameters) {
+            const { chainId = await getMemoizedChainId(), ...userOperation } = parameters;
+            const hash = getUserOperationHash({
+                userOperation: {
+                    ...userOperation,
+                    sender: userOperation.sender ?? (await this.getAddress()),
+                    signature: "0x"
+                },
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
+                chainId: chainId
+            });
+            const signature = await localOwner.signMessage({
+                message: { raw: hash }
+            });
+            return signature;
+        }
+    });
+}
+//# sourceMappingURL=toEtherspotSmartAccount.js.map

package/_esm/accounts/etherspot/toEtherspotSmartAccount.js.map

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

package/_esm/accounts/etherspot/utils/getInitMSAData.js

@@ -0,0 +1,42 @@
+import { encodeFunctionData, zeroAddress } from "viem";
+import { EtherspotBootstrapAbi, EtherspotOnInstallAbi } from "../abi/EtherspotBootstrapAbi.js";
+export const getInitMSAData = (ecdsaValidatorAddress) => {
+    const validators = makeBootstrapConfig(ecdsaValidatorAddress, "0x");
+    const executors = makeBootstrapConfig(zeroAddress, "0x");
+    const hook = _makeBootstrapConfig(zeroAddress, "0x");
+    const fallbacks = makeBootstrapConfig(zeroAddress, "0x");
+    const initMSAData = encodeFunctionData({
+        abi: EtherspotBootstrapAbi,
+        functionName: "initMSA",
+        args: [validators, executors, hook, fallbacks]
+    });
+    return initMSAData;
+};
+const _makeBootstrapConfig = (module, data) => {
+    const config = {
+        module: "",
+        data: ""
+    };
+    config.module = module;
+    config.data = encodeFunctionData({
+        abi: EtherspotOnInstallAbi,
+        functionName: "onInstall",
+        args: [data]
+    });
+    return config;
+};
+const makeBootstrapConfig = (module, data) => {
+    const config = [];
+    const data1 = encodeFunctionData({
+        abi: EtherspotOnInstallAbi,
+        functionName: "onInstall",
+        args: [data]
+    });
+    const newConfig = {
+        module: module,
+        data: data1
+    };
+    config.push(newConfig);
+    return config;
+};
+//# sourceMappingURL=getInitMSAData.js.map

package/_esm/accounts/etherspot/utils/getInitMSAData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getInitMSAData.js","sourceRoot":"","sources":["../../../../accounts/etherspot/utils/getInitMSAData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AACpE,OAAO,EACH,qBAAqB,EACrB,qBAAqB,EACxB,MAAM,iCAAiC,CAAA;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,qBAA8B,EAAE,EAAE;IAC7D,MAAM,UAAU,GAAG,mBAAmB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IACxD,MAAM,IAAI,GAAG,oBAAoB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IACxD,MAAM,WAAW,GAAG,kBAAkB,CAAC;QACnC,GAAG,EAAE,qBAAqB;QAC1B,YAAY,EAAE,SAAS;QACvB,IAAI,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC;KACjD,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE;IAC1D,MAAM,MAAM,GAAG;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;KACX,CAAA;IAED,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;IAEtB,MAAM,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC7B,GAAG,EAAE,qBAAqB;QAC1B,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,CAAC,IAAqB,CAAC;KAChC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE;IACzD,MAAM,MAAM,GAGN,EAAE,CAAA;IAER,MAAM,KAAK,GAAG,kBAAkB,CAAC;QAC7B,GAAG,EAAE,qBAAqB;QAC1B,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,CAAC,IAAqB,CAAC;KAChC,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG;QACd,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,KAAK;KACd,CAAA;IACD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACtB,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA"}

package/_esm/accounts/etherspot/utils/getNonceKey.js

@@ -0,0 +1,15 @@
+import { concatHex, pad, toHex } from "viem";
+import { VALIDATOR_MODE, VALIDATOR_TYPE } from "../constants.js";
+export const getNonceKeyWithEncoding = (validatorAddress, nonceKey = 0n) => {
+    const validatorMode = VALIDATOR_MODE.DEFAULT;
+    const validatorType = VALIDATOR_TYPE.ROOT;
+    const encoding = pad(concatHex([
+        validatorAddress, // 20 bytes
+        validatorMode, // 1 byte
+        validatorType, // 1 byte
+        toHex(nonceKey, { size: 2 }) // 2 byte
+    ]), { size: 24 }); // 24 bytes
+    const encodedNonceKey = BigInt(encoding);
+    return encodedNonceKey;
+};
+//# sourceMappingURL=getNonceKey.js.map

package/_esm/accounts/etherspot/utils/getNonceKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNonceKey.js","sourceRoot":"","sources":["../../../../accounts/etherspot/utils/getNonceKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhE,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACnC,gBAAyB,EACzB,QAAQ,GAAG,EAAE,EACf,EAAE;IACA,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAA;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAA;IACzC,MAAM,QAAQ,GAAG,GAAG,CAChB,SAAS,CAAC;QACN,gBAAgB,EAAE,WAAW;QAC7B,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS;KACzC,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA,CAAC,WAAW;IACb,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACxC,OAAO,eAAe,CAAA;AAC1B,CAAC,CAAA"}

package/_esm/accounts/etherspot/utils/wrapMessageHash.js

@@ -0,0 +1,18 @@
+import { concatHex, encodeAbiParameters, keccak256, stringToHex } from "viem";
+import { domainSeparator } from "viem";
+export const wrapMessageHash = (messageHash, { accountAddress, chainId }) => {
+    const _domainSeparator = domainSeparator({
+        domain: {
+            name: "ModularEtherspotWallet",
+            chainId,
+            verifyingContract: accountAddress
+        }
+    });
+    const wrappedMessageHash = keccak256(encodeAbiParameters([{ type: "bytes32" }, { type: "bytes32" }], [
+        keccak256(stringToHex("ModularEtherspotWallet(bytes32 hash)")),
+        messageHash
+    ]));
+    const digest = keccak256(concatHex(["0x1901", _domainSeparator, wrappedMessageHash]));
+    return digest;
+};
+//# sourceMappingURL=wrapMessageHash.js.map

package/_esm/accounts/etherspot/utils/wrapMessageHash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapMessageHash.js","sourceRoot":"","sources":["../../../../accounts/etherspot/utils/wrapMessageHash.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,SAAS,EACT,mBAAmB,EACnB,SAAS,EACT,WAAW,EACd,MAAM,MAAM,CAAA;AACb,OAAO,EAAgB,eAAe,EAAE,MAAM,MAAM,CAAA;AAOpD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,WAAgB,EAChB,EAAE,cAAc,EAAE,OAAO,EAAyB,EACpD,EAAE;IACA,MAAM,gBAAgB,GAAG,eAAe,CAAC;QACrC,MAAM,EAAE;YACJ,IAAI,EAAE,wBAAwB;YAC9B,OAAO;YACP,iBAAiB,EAAE,cAAc;SACpC;KACJ,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAG,SAAS,CAChC,mBAAmB,CACf,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAC1C;QACI,SAAS,CAAC,WAAW,CAAC,sCAAsC,CAAC,CAAC;QAC9D,WAAW;KACd,CACJ,CACJ,CAAA;IAED,MAAM,MAAM,GAAG,SAAS,CACpB,SAAS,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC,CAC9D,CAAA;IAED,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA"}

package/_esm/accounts/index.js

@@ -1,11 +1,12 @@
 import { toSimpleSmartAccount } from "./simple/toSimpleSmartAccount.js";
 import { toLightSmartAccount } from "./light/toLightSmartAccount.js";
 import { toTrustSmartAccount } from "./trust/toTrustSmartAccount.js";
+import { toEtherspotSmartAccount } from "./etherspot/toEtherspotSmartAccount.js";
 import { toSafeSmartAccount } from "./safe/toSafeSmartAccount.js";
 import { toEcdsaKernelSmartAccount } from "./kernel/toEcdsaKernelSmartAccount.js";
 import { toKernelSmartAccount } from "./kernel/toKernelSmartAccount.js";
 import { toBiconomySmartAccount } from "./biconomy/toBiconomySmartAccount.js";
 import { toNexusSmartAccount } from "./nexus/toNexusSmartAccount.js";
 import { toThirdwebSmartAccount } from "./thirdweb/toThirdwebSmartAccount.js";
-export { toSimpleSmartAccount, toLightSmartAccount, toTrustSmartAccount, toSafeSmartAccount, toEcdsaKernelSmartAccount, toKernelSmartAccount, toNexusSmartAccount, toBiconomySmartAccount, toThirdwebSmartAccount };
+export { toSimpleSmartAccount, toLightSmartAccount, toTrustSmartAccount, toSafeSmartAccount, toEcdsaKernelSmartAccount, toKernelSmartAccount, toNexusSmartAccount, toBiconomySmartAccount, toThirdwebSmartAccount, toEtherspotSmartAccount };
 //# sourceMappingURL=index.js.map

package/_esm/accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,oBAAoB,EACvB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAKH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAIH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAKH,kBAAkB,EACrB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAIH,yBAAyB,EAC5B,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAKH,oBAAoB,EACvB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAIH,sBAAsB,EACzB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAIH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAIH,sBAAsB,EACzB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAIH,oBAAoB,EAKpB,mBAAmB,EAInB,mBAAmB,EAKnB,kBAAkB,EAIlB,yBAAyB,EAKzB,oBAAoB,EAIpB,mBAAmB,EAInB,sBAAsB,EAItB,sBAAsB,EACzB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,oBAAoB,EACvB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAKH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAIH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAIH,uBAAuB,EAC1B,MAAM,wCAAwC,CAAA;AAE/C,OAAO,EAKH,kBAAkB,EACrB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAIH,yBAAyB,EAC5B,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAKH,oBAAoB,EACvB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAIH,sBAAsB,EACzB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAIH,mBAAmB,EACtB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAIH,sBAAsB,EACzB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAIH,oBAAoB,EAKpB,mBAAmB,EAInB,mBAAmB,EAKnB,kBAAkB,EAIlB,yBAAyB,EAKzB,oBAAoB,EAIpB,mBAAmB,EAInB,sBAAsB,EAItB,sBAAsB,EAItB,uBAAuB,EAC1B,CAAA"}

package/_esm/accounts/safe/index.js

@@ -0,0 +1,8 @@
+import { toSafeSmartAccount } from "./toSafeSmartAccount.js";
+import { signUserOperation } from "./signUserOperation.js";
+const SafeSmartAccount = {
+    toSafeSmartAccount,
+    signUserOperation
+};
+export { SafeSmartAccount };
+//# sourceMappingURL=index.js.map

package/_esm/accounts/safe/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../accounts/safe/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,kBAAkB,EACrB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,MAAM,gBAAgB,GAAG;IACrB,kBAAkB;IAClB,iBAAiB;CACpB,CAAA;AAED,OAAO,EAKH,gBAAgB,EACnB,CAAA"}

package/_esm/accounts/safe/signUserOperation.js

@@ -0,0 +1,94 @@
+import { concat, concatHex, decodeAbiParameters, encodeAbiParameters, encodePacked } from "viem";
+import { toOwner } from "../../utils/index.js";
+import { EIP712_SAFE_OPERATION_TYPE_V06, EIP712_SAFE_OPERATION_TYPE_V07, getDefaultAddresses, getPaymasterAndData } from "./toSafeSmartAccount.js";
+export async function signUserOperation(parameters) {
+    const { chainId, entryPoint, validAfter = 0, validUntil = 0, safe4337ModuleAddress: _safe4337ModuleAddress, version, owners, signatures: existingSignatures, account, ...userOperation } = parameters;
+    const { safe4337ModuleAddress } = getDefaultAddresses(version, entryPoint.version, {
+        safe4337ModuleAddress: _safe4337ModuleAddress
+    });
+    const message = {
+        safe: userOperation.sender,
+        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: entryPoint.address
+    };
+    if ("initCode" in userOperation) {
+        message.paymasterAndData = userOperation.paymasterAndData ?? "0x";
+    }
+    if ("factory" in userOperation) {
+        if (userOperation.factory && userOperation.factoryData) {
+            message.initCode = concatHex([
+                userOperation.factory,
+                userOperation.factoryData
+            ]);
+        }
+        if (!userOperation.sender) {
+            throw new Error("Sender is required");
+        }
+        message.paymasterAndData = getPaymasterAndData({
+            ...userOperation,
+            sender: userOperation.sender
+        });
+    }
+    const localOwners = [
+        await toOwner({
+            owner: account
+        })
+    ];
+    let unPackedSignatures = [];
+    if (existingSignatures) {
+        const decoded = decodeAbiParameters([
+            {
+                components: [
+                    { type: "address", name: "signer" },
+                    { type: "bytes", name: "data" }
+                ],
+                name: "signatures",
+                type: "tuple[]"
+            }
+        ], existingSignatures);
+        unPackedSignatures = decoded[0];
+    }
+    const signatures = [
+        ...unPackedSignatures,
+        ...(await Promise.all(localOwners.map(async (localOwner) => ({
+            signer: localOwner.address,
+            data: await localOwner.signTypedData({
+                domain: {
+                    chainId,
+                    verifyingContract: safe4337ModuleAddress
+                },
+                types: entryPoint.version === "0.6"
+                    ? EIP712_SAFE_OPERATION_TYPE_V06
+                    : EIP712_SAFE_OPERATION_TYPE_V07,
+                primaryType: "SafeOp",
+                message: message
+            })
+        }))))
+    ];
+    if (signatures.length !== owners.length) {
+        return encodeAbiParameters([
+            {
+                components: [
+                    { type: "address", name: "signer" },
+                    { type: "bytes", name: "data" }
+                ],
+                name: "signatures",
+                type: "tuple[]"
+            }
+        ], [signatures]);
+    }
+    signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
+    const signatureBytes = concat(signatures.map((sig) => sig.data));
+    return encodePacked(["uint48", "uint48", "bytes"], [validAfter, validUntil, signatureBytes]);
+}
+//# sourceMappingURL=signUserOperation.js.map

package/_esm/accounts/safe/signUserOperation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signUserOperation.js","sourceRoot":"","sources":["../../../accounts/safe/signUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAUH,MAAM,EACN,SAAS,EACT,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACf,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EACH,8BAA8B,EAC9B,8BAA8B,EAE9B,mBAAmB,EACnB,mBAAmB,EACtB,MAAM,yBAAyB,CAAA;AAEhC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACnC,UAiBC;IAED,MAAM,EACF,OAAO,EACP,UAAU,EACV,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EACd,qBAAqB,EAAE,sBAAsB,EAC7C,OAAO,EACP,MAAM,EACN,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EACP,GAAG,aAAa,EACnB,GAAG,UAAU,CAAA;IAEd,MAAM,EAAE,qBAAqB,EAAE,GAAG,mBAAmB,CACjD,OAAO,EACP,UAAU,CAAC,OAAO,EAClB;QACI,qBAAqB,EAAE,sBAAsB;KAChD,CACJ,CAAA;IAED,MAAM,OAAO,GAAG;QACZ,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,QAAQ,EAAE,aAAa,CAAC,QAAQ,IAAI,IAAI;QACxC,YAAY,EAAE,aAAa,CAAC,YAAY;QACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;QACxD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;QACpD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;QACxD,YAAY,EAAE,aAAa,CAAC,YAAY;QACxC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,IAAI,IAAI;QACxD,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU,CAAC,OAAO;KACjC,CAAA;IAED,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;QAC9B,OAAO,CAAC,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,IAAI,IAAI,CAAA;IACrE,CAAC;IAED,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;QAC7B,IAAI,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YACrD,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;gBACzB,aAAa,CAAC,OAAO;gBACrB,aAAa,CAAC,WAAW;aAC5B,CAAC,CAAA;QACN,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACzC,CAAC;QACD,OAAO,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;YAC3C,GAAG,aAAa;YAChB,MAAM,EAAE,aAAa,CAAC,MAAM;SAC/B,CAAC,CAAA;IACN,CAAC;IAED,MAAM,WAAW,GAAG;QAChB,MAAM,OAAO,CAAC;YACV,KAAK,EAAE,OAAiD;SAC3D,CAAC;KACL,CAAA;IAED,IAAI,kBAAkB,GAA8C,EAAE,CAAA;IAEtE,IAAI,kBAAkB,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,mBAAmB,CAC/B;YACI;gBACI,UAAU,EAAE;oBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;iBAClC;gBACD,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;aAClB;SACJ,EACD,kBAAkB,CACrB,CAAA;QAED,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,UAAU,GAAqC;QACjD,GAAG,kBAAkB;QACrB,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CACjB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;YACnC,MAAM,EAAE,UAAU,CAAC,OAAO;YAC1B,IAAI,EAAE,MAAM,UAAU,CAAC,aAAa,CAAC;gBACjC,MAAM,EAAE;oBACJ,OAAO;oBACP,iBAAiB,EAAE,qBAAqB;iBAC3C;gBACD,KAAK,EACD,UAAU,CAAC,OAAO,KAAK,KAAK;oBACxB,CAAC,CAAC,8BAA8B;oBAChC,CAAC,CAAC,8BAA8B;gBACxC,WAAW,EAAE,QAAQ;gBACrB,OAAO,EAAE,OAAO;aACnB,CAAC;SACL,CAAC,CAAC,CACN,CAAC;KACL,CAAA;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,mBAAmB,CACtB;YACI;gBACI,UAAU,EAAE;oBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;iBAClC;gBACD,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;aAClB;SACJ,EACD,CAAC,UAAU,CAAC,CACf,CAAA;IACL,CAAC;IAED,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CACtE,CAAA;IACD,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IAEhE,OAAO,YAAY,CACf,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC7B,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAC3C,CAAA;AACL,CAAC"}