permissionless 0.1.31 → 0.1.32

package/_esm/accounts/safe/signerToSafeSmartAccount.js

@@ -1,10 +1,337 @@
-import { concat, concatHex, encodeFunctionData, encodePacked, getContractAddress, hashMessage, hashTypedData, hexToBigInt, keccak256, pad, toBytes, toHex, zeroAddress } from "viem";
+import { concat, concatHex, encodeAbiParameters, encodeFunctionData, encodePacked, getContractAddress, hashMessage, hashTypedData, hexToBigInt, keccak256, pad, toBytes, toHex, zeroAddress } from "viem";
 import { getChainId, readContract, signMessage, signTypedData } from "viem/actions";
 import { getAccountNonce } from "../../actions/public/getAccountNonce.js";
+import { encode7579CallData } from "../../utils/encode7579CallData.js";
 import { getEntryPointVersion, isUserOperationVersion06, isUserOperationVersion07 } from "../../utils/getEntryPointVersion.js";
 import { isSmartAccountDeployed } from "../../utils/isSmartAccountDeployed.js";
 import { toSmartAccount } from "../toSmartAccount.js";
 import { SignTransactionNotSupportedBySmartAccount } from "../types.js";
+const multiSendAbi = [
+    {
+        inputs: [
+            {
+                internalType: "bytes",
+                name: "transactions",
+                type: "bytes"
+            }
+        ],
+        name: "multiSend",
+        outputs: [],
+        stateMutability: "payable",
+        type: "function"
+    }
+];
+const initSafe7579Abi = [
+    {
+        type: "function",
+        name: "initSafe7579",
+        inputs: [
+            {
+                name: "safe7579",
+                type: "address",
+                internalType: "address"
+            },
+            {
+                name: "executors",
+                type: "tuple[]",
+                internalType: "struct ModuleInit[]",
+                components: [
+                    {
+                        name: "module",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    {
+                        name: "initData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    }
+                ]
+            },
+            {
+                name: "fallbacks",
+                type: "tuple[]",
+                internalType: "struct ModuleInit[]",
+                components: [
+                    {
+                        name: "module",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    {
+                        name: "initData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    }
+                ]
+            },
+            {
+                name: "hooks",
+                type: "tuple[]",
+                internalType: "struct ModuleInit[]",
+                components: [
+                    {
+                        name: "module",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    {
+                        name: "initData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    }
+                ]
+            },
+            {
+                name: "attesters",
+                type: "address[]",
+                internalType: "address[]"
+            },
+            {
+                name: "threshold",
+                type: "uint8",
+                internalType: "uint8"
+            }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+    }
+];
+const preValidationSetupAbi = [
+    {
+        type: "function",
+        name: "preValidationSetup",
+        inputs: [
+            {
+                name: "initHash",
+                type: "bytes32",
+                internalType: "bytes32"
+            },
+            {
+                name: "to",
+                type: "address",
+                internalType: "address"
+            },
+            {
+                name: "preInit",
+                type: "bytes",
+                internalType: "bytes"
+            }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+    }
+];
+const enableModulesAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address[]",
+                name: "modules",
+                type: "address[]"
+            }
+        ],
+        name: "enableModules",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function"
+    }
+];
+const setupAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address[]",
+                name: "_owners",
+                type: "address[]"
+            },
+            {
+                internalType: "uint256",
+                name: "_threshold",
+                type: "uint256"
+            },
+            {
+                internalType: "address",
+                name: "to",
+                type: "address"
+            },
+            {
+                internalType: "bytes",
+                name: "data",
+                type: "bytes"
+            },
+            {
+                internalType: "address",
+                name: "fallbackHandler",
+                type: "address"
+            },
+            {
+                internalType: "address",
+                name: "paymentToken",
+                type: "address"
+            },
+            {
+                internalType: "uint256",
+                name: "payment",
+                type: "uint256"
+            },
+            {
+                internalType: "address payable",
+                name: "paymentReceiver",
+                type: "address"
+            }
+        ],
+        name: "setup",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function"
+    }
+];
+const createProxyWithNonceAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_singleton",
+                type: "address"
+            },
+            {
+                internalType: "bytes",
+                name: "initializer",
+                type: "bytes"
+            },
+            {
+                internalType: "uint256",
+                name: "saltNonce",
+                type: "uint256"
+            }
+        ],
+        name: "createProxyWithNonce",
+        outputs: [
+            {
+                internalType: "contract SafeProxy",
+                name: "proxy",
+                type: "address"
+            }
+        ],
+        stateMutability: "nonpayable",
+        type: "function"
+    }
+];
+const proxyCreationCodeAbi = [
+    {
+        inputs: [],
+        name: "proxyCreationCode",
+        outputs: [
+            {
+                internalType: "bytes",
+                name: "",
+                type: "bytes"
+            }
+        ],
+        stateMutability: "pure",
+        type: "function"
+    }
+];
+const setupSafeAbi = [
+    {
+        type: "function",
+        name: "setupSafe",
+        inputs: [
+            {
+                name: "initData",
+                type: "tuple",
+                internalType: "struct Safe7579Launchpad.InitData",
+                components: [
+                    {
+                        name: "singleton",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    {
+                        name: "owners",
+                        type: "address[]",
+                        internalType: "address[]"
+                    },
+                    {
+                        name: "threshold",
+                        type: "uint256",
+                        internalType: "uint256"
+                    },
+                    {
+                        name: "setupTo",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    {
+                        name: "setupData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    },
+                    {
+                        name: "safe7579",
+                        type: "address",
+                        internalType: "contract ISafe7579"
+                    },
+                    {
+                        name: "validators",
+                        type: "tuple[]",
+                        internalType: "struct ModuleInit[]",
+                        components: [
+                            {
+                                name: "module",
+                                type: "address",
+                                internalType: "address"
+                            },
+                            {
+                                name: "initData",
+                                type: "bytes",
+                                internalType: "bytes"
+                            }
+                        ]
+                    },
+                    {
+                        name: "callData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    }
+                ]
+            }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+    }
+];
+const executeUserOpWithErrorStringAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "to",
+                type: "address"
+            },
+            {
+                internalType: "uint256",
+                name: "value",
+                type: "uint256"
+            },
+            {
+                internalType: "bytes",
+                name: "data",
+                type: "bytes"
+            },
+            {
+                internalType: "uint8",
+                name: "operation",
+                type: "uint8"
+            }
+        ],
+        name: "executeUserOpWithErrorString",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function"
+    }
+];
 const EIP712_SAFE_OPERATION_TYPE_V06 = {
     SafeOp: [
         { type: "address", name: "safe" },
@@ -101,45 +428,128 @@ const encodeMultiSend = (txs) => {
         .map((tx) => encodeInternalTransaction(tx))
         .join("")}`;
     return encodeFunctionData({
-        abi: [
+        abi: multiSendAbi,
+        functionName: "multiSend",
+        args: [data]
+    });
+};
+const get7579LaunchPadInitData = ({ safe4337ModuleAddress, safeSingletonAddress, erc7569LaunchpadAddress, owner, validators, executors, fallbacks, hooks, attesters, attestersThreshold }) => {
+    const initData = {
+        singleton: safeSingletonAddress,
+        owners: [owner],
+        threshold: BigInt(1),
+        setupTo: erc7569LaunchpadAddress,
+        setupData: encodeFunctionData({
+            abi: initSafe7579Abi,
+            functionName: "initSafe7579",
+            args: [
+                safe4337ModuleAddress, // SAFE_7579_ADDRESS,
+                executors.map((executor) => ({
+                    module: executor.address,
+                    initData: executor.context
+                })),
+                fallbacks.map((fallback) => ({
+                    module: fallback.address,
+                    initData: fallback.context
+                })),
+                hooks.map((hook) => ({
+                    module: hook.address,
+                    initData: hook.context
+                })),
+                attesters,
+                attestersThreshold
+            ]
+        }),
+        safe7579: safe4337ModuleAddress,
+        validators: validators
+    };
+    return initData;
+};
+const getInitializerCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, multiSendAddress, safeSingletonAddress, erc7569LaunchpadAddress, setupTransactions = [], safeModules = [], validators = [], executors = [], fallbacks = [], hooks = [], attesters = [], attestersThreshold = 0 }) => {
+    if (erc7569LaunchpadAddress) {
+        const initData = get7579LaunchPadInitData({
+            safe4337ModuleAddress,
+            safeSingletonAddress,
+            erc7569LaunchpadAddress,
+            owner,
+            validators,
+            executors,
+            fallbacks,
+            hooks,
+            attesters,
+            attestersThreshold
+        });
+        const initHash = keccak256(encodeAbiParameters([
+            {
+                internalType: "address",
+                name: "singleton",
+                type: "address"
+            },
+            {
+                internalType: "address[]",
+                name: "owners",
+                type: "address[]"
+            },
+            {
+                internalType: "uint256",
+                name: "threshold",
+                type: "uint256"
+            },
+            {
+                internalType: "address",
+                name: "setupTo",
+                type: "address"
+            },
             {
-                inputs: [
+                internalType: "bytes",
+                name: "setupData",
+                type: "bytes"
+            },
+            {
+                internalType: "contract ISafe7579",
+                name: "safe7579",
+                type: "address"
+            },
+            {
+                internalType: "struct ModuleInit[]",
+                name: "validators",
+                type: "tuple[]",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "module",
+                        type: "address"
+                    },
                     {
                         internalType: "bytes",
-                        name: "transactions",
+                        name: "initData",
                         type: "bytes"
                     }
-                ],
-                name: "multiSend",
-                outputs: [],
-                stateMutability: "payable",
-                type: "function"
+                ]
             }
-        ],
-        functionName: "multiSend",
-        args: [data]
-    });
-};
-const getInitializerCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, multiSendAddress, setupTransactions = [], safeModules = [] }) => {
+        ], [
+            initData.singleton,
+            initData.owners,
+            initData.threshold,
+            initData.setupTo,
+            initData.setupData,
+            initData.safe7579,
+            initData.validators.map((validator) => ({
+                module: validator.address,
+                initData: validator.context
+            }))
+        ]));
+        return encodeFunctionData({
+            abi: preValidationSetupAbi,
+            functionName: "preValidationSetup",
+            args: [initHash, zeroAddress, "0x"]
+        });
+    }
     const multiSendCallData = encodeMultiSend([
         {
             to: safeModuleSetupAddress,
             data: encodeFunctionData({
-                abi: [
-                    {
-                        inputs: [
-                            {
-                                internalType: "address[]",
-                                name: "modules",
-                                type: "address[]"
-                            }
-                        ],
-                        name: "enableModules",
-                        outputs: [],
-                        stateMutability: "nonpayable",
-                        type: "function"
-                    }
-                ],
+                abi: enableModulesAbi,
                 functionName: "enableModules",
                 args: [[safe4337ModuleAddress, ...safeModules]]
             }),
@@ -149,56 +559,7 @@ const getInitializerCode = async ({ owner, safeModuleSetupAddress, safe4337Modul
         ...setupTransactions.map((tx) => ({ ...tx, operation: 0 }))
     ]);
     return encodeFunctionData({
-        abi: [
-            {
-                inputs: [
-                    {
-                        internalType: "address[]",
-                        name: "_owners",
-                        type: "address[]"
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "_threshold",
-                        type: "uint256"
-                    },
-                    {
-                        internalType: "address",
-                        name: "to",
-                        type: "address"
-                    },
-                    {
-                        internalType: "bytes",
-                        name: "data",
-                        type: "bytes"
-                    },
-                    {
-                        internalType: "address",
-                        name: "fallbackHandler",
-                        type: "address"
-                    },
-                    {
-                        internalType: "address",
-                        name: "paymentToken",
-                        type: "address"
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "payment",
-                        type: "uint256"
-                    },
-                    {
-                        internalType: "address payable",
-                        name: "paymentReceiver",
-                        type: "address"
-                    }
-                ],
-                name: "setup",
-                outputs: [],
-                stateMutability: "nonpayable",
-                type: "function"
-            }
-        ],
+        abi: setupAbi,
         functionName: "setup",
         args: [
             [owner],
@@ -227,83 +588,63 @@ function getPaymasterAndData(unpackedUserOperation) {
         ])
         : "0x";
 }
-const getAccountInitCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, safeSingletonAddress, multiSendAddress, saltNonce = BigInt(0), setupTransactions = [], safeModules = [] }) => {
-    if (!owner)
+const getAccountInitCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, safeSingletonAddress, erc7569LaunchpadAddress, multiSendAddress, saltNonce = BigInt(0), setupTransactions = [], safeModules = [], validators = [], executors = [], fallbacks = [], hooks = [], attesters = [], attestersThreshold = 0 }) => {
+    if (!owner) {
         throw new Error("Owner account not found");
+    }
     const initializer = await getInitializerCode({
         owner,
         safeModuleSetupAddress,
         safe4337ModuleAddress,
         multiSendAddress,
         setupTransactions,
-        safeModules
+        safeSingletonAddress,
+        safeModules,
+        erc7569LaunchpadAddress,
+        validators,
+        executors,
+        fallbacks,
+        hooks,
+        attesters,
+        attestersThreshold
     });
     const initCodeCallData = encodeFunctionData({
-        abi: [
-            {
-                inputs: [
-                    {
-                        internalType: "address",
-                        name: "_singleton",
-                        type: "address"
-                    },
-                    {
-                        internalType: "bytes",
-                        name: "initializer",
-                        type: "bytes"
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "saltNonce",
-                        type: "uint256"
-                    }
-                ],
-                name: "createProxyWithNonce",
-                outputs: [
-                    {
-                        internalType: "contract SafeProxy",
-                        name: "proxy",
-                        type: "address"
-                    }
-                ],
-                stateMutability: "nonpayable",
-                type: "function"
-            }
-        ],
+        abi: createProxyWithNonceAbi,
         functionName: "createProxyWithNonce",
-        args: [safeSingletonAddress, initializer, saltNonce]
+        args: [
+            erc7569LaunchpadAddress ?? safeSingletonAddress,
+            initializer,
+            saltNonce
+        ]
     });
     return initCodeCallData;
 };
-const getAccountAddress = async ({ client, owner, safeModuleSetupAddress, safe4337ModuleAddress, safeProxyFactoryAddress, safeSingletonAddress, multiSendAddress, setupTransactions = [], safeModules = [], saltNonce = BigInt(0) }) => {
+const getAccountAddress = async ({ client, owner, safeModuleSetupAddress, safe4337ModuleAddress, safeProxyFactoryAddress, safeSingletonAddress, multiSendAddress, erc7569LaunchpadAddress, setupTransactions = [], safeModules = [], saltNonce = BigInt(0), validators = [], executors = [], fallbacks = [], hooks = [], attesters = [], attestersThreshold = 0 }) => {
     const proxyCreationCode = await readContract(client, {
-        abi: [
-            {
-                inputs: [],
-                name: "proxyCreationCode",
-                outputs: [
-                    {
-                        internalType: "bytes",
-                        name: "",
-                        type: "bytes"
-                    }
-                ],
-                stateMutability: "pure",
-                type: "function"
-            }
-        ],
+        abi: proxyCreationCodeAbi,
         address: safeProxyFactoryAddress,
         functionName: "proxyCreationCode"
     });
-    const deploymentCode = encodePacked(["bytes", "uint256"], [proxyCreationCode, hexToBigInt(safeSingletonAddress)]);
     const initializer = await getInitializerCode({
         owner,
         safeModuleSetupAddress,
         safe4337ModuleAddress,
         multiSendAddress,
         setupTransactions,
-        safeModules
+        safeSingletonAddress,
+        safeModules,
+        erc7569LaunchpadAddress,
+        validators,
+        executors,
+        fallbacks,
+        hooks,
+        attesters,
+        attestersThreshold
     });
+    const deploymentCode = encodePacked(["bytes", "uint256"], [
+        proxyCreationCode,
+        hexToBigInt(erc7569LaunchpadAddress ?? safeSingletonAddress)
+    ]);
     const salt = keccak256(encodePacked(["bytes32", "uint256"], [keccak256(encodePacked(["bytes"], [initializer])), saltNonce]));
     return getContractAddress({
         from: safeProxyFactoryAddress,
@@ -341,13 +682,43 @@ const getDefaultAddresses = (safeVersion, entryPointAddress, { addModuleLibAddre
         multiSendCallOnlyAddress
     };
 };
+function isErc7579Args(args) {
+    return args.erc7569LaunchpadAddress !== undefined;
+}
 /**
  * @description Creates an Simple Account from a private key.
  *
  * @returns A Private Key Simple Account.
  */
-export async function signerToSafeSmartAccount(client, { signer, address, safeVersion, entryPoint: entryPointAddress, safeModuleSetupAddress: _safeModuleSetupAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce = BigInt(0), validUntil = 0, validAfter = 0, safeModules = [], setupTransactions = [] }) {
+export async function signerToSafeSmartAccount(client, args) {
     const chainId = client.chain?.id ?? (await getChainId(client));
+    const { signer, address, safeVersion, entryPoint: entryPointAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, erc7569LaunchpadAddress, saltNonce = BigInt(0), validUntil = 0, validAfter = 0, nonceKey } = args;
+    let _safeModuleSetupAddress = undefined;
+    let _multiSendAddress = undefined;
+    let _multiSendCallOnlyAddress = undefined;
+    let safeModules = undefined;
+    let setupTransactions = [];
+    let validators = [];
+    let executors = [];
+    let fallbacks = [];
+    let hooks = [];
+    let attesters = [];
+    let attestersThreshold = 0;
+    if (!isErc7579Args(args)) {
+        _safeModuleSetupAddress = args.safeModuleSetupAddress;
+        _multiSendAddress = args.multiSendAddress;
+        _multiSendCallOnlyAddress = args.multiSendCallOnlyAddress;
+        safeModules = args.safeModules;
+        setupTransactions = args.setupTransactions ?? [];
+    }
+    if (isErc7579Args(args)) {
+        validators = args.validators ?? [];
+        executors = args.executors ?? [];
+        fallbacks = args.fallbacks ?? [];
+        hooks = args.hooks ?? [];
+        attesters = args.attesters ?? [];
+        attestersThreshold = args.attestersThreshold ?? 0;
+    }
     const viemSigner = {
         ...signer,
         signTransaction: (_, __) => {
@@ -371,15 +742,26 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
             safeProxyFactoryAddress,
             safeSingletonAddress,
             multiSendAddress,
+            erc7569LaunchpadAddress,
             saltNonce,
             setupTransactions,
-            safeModules
+            safeModules,
+            validators,
+            executors,
+            fallbacks,
+            hooks,
+            attesters,
+            attestersThreshold
         }));
     if (!accountAddress)
         throw new Error("Account address not found");
     let safeDeployed = await isSmartAccountDeployed(client, accountAddress);
     const safeSmartAccount = toSmartAccount({
         address: accountAddress,
+        client: client,
+        publicKey: accountAddress,
+        entryPoint: entryPointAddress,
+        source: "SafeSmartAccount",
         async signMessage({ message }) {
             const messageHash = hashTypedData({
                 domain: {
@@ -420,14 +802,11 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                 }
             }));
         },
-        client: client,
-        publicKey: accountAddress,
-        entryPoint: entryPointAddress,
-        source: "SafeSmartAccount",
-        async getNonce() {
+        async getNonce(key) {
             return getAccountNonce(client, {
                 sender: accountAddress,
-                entryPoint: entryPointAddress
+                entryPoint: entryPointAddress,
+                key: key ?? nonceKey
             });
         },
         async signUserOperation(userOperation) {
@@ -446,8 +825,10 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                 validUntil: validUntil,
                 entryPoint: entryPointAddress
             };
+            let isDeployed = false;
             if (isUserOperationVersion06(entryPointAddress, userOperation)) {
                 message.paymasterAndData = userOperation.paymasterAndData;
+                isDeployed = userOperation.initCode === "0x";
             }
             if (isUserOperationVersion07(entryPointAddress, userOperation)) {
                 if (userOperation.factory && userOperation.factoryData) {
@@ -458,6 +839,11 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                 }
                 message.paymasterAndData =
                     getPaymasterAndData(userOperation);
+                isDeployed = !userOperation.factory;
+            }
+            let verifyingContract = safe4337ModuleAddress;
+            if (erc7569LaunchpadAddress && !isDeployed) {
+                verifyingContract = userOperation.sender;
             }
             const signatures = [
                 {
@@ -465,8 +851,8 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                     data: await signTypedData(client, {
                         account: viemSigner,
                         domain: {
-                            chainId: chainId,
-                            verifyingContract: safe4337ModuleAddress
+                            chainId,
+                            verifyingContract
                         },
                         types: getEntryPointVersion(entryPointAddress) ===
                             "v0.6"
@@ -514,20 +900,81 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                 safe4337ModuleAddress,
                 safeSingletonAddress,
                 multiSendAddress,
+                erc7569LaunchpadAddress,
                 saltNonce,
                 setupTransactions,
-                safeModules
+                safeModules,
+                validators,
+                executors,
+                fallbacks,
+                hooks,
+                attesters,
+                attestersThreshold
             });
         },
         async encodeDeployCallData(_) {
             throw new Error("Safe account doesn't support account deployment");
         },
         async encodeCallData(args) {
+            const isArray = Array.isArray(args);
+            if (erc7569LaunchpadAddress) {
+                // First transaction will be slower because we need to enable 7579 modules
+                safeDeployed =
+                    safeDeployed ||
+                        (await isSmartAccountDeployed(client, accountAddress));
+                if (!safeDeployed) {
+                    const initData = get7579LaunchPadInitData({
+                        safe4337ModuleAddress,
+                        safeSingletonAddress,
+                        erc7569LaunchpadAddress,
+                        owner: viemSigner.address,
+                        validators,
+                        executors,
+                        fallbacks,
+                        hooks,
+                        attesters,
+                        attestersThreshold
+                    });
+                    return encodeFunctionData({
+                        abi: setupSafeAbi,
+                        functionName: "setupSafe",
+                        args: [
+                            {
+                                ...initData,
+                                validators: initData.validators.map((validator) => ({
+                                    module: validator.address,
+                                    initData: validator.context
+                                })),
+                                callData: encode7579CallData({
+                                    mode: {
+                                        type: isArray
+                                            ? "batchcall"
+                                            : "call",
+                                        revertOnError: false,
+                                        selector: "0x",
+                                        context: "0x"
+                                    },
+                                    callData: args
+                                })
+                            }
+                        ]
+                    });
+                }
+                return encode7579CallData({
+                    mode: {
+                        type: isArray ? "batchcall" : "call",
+                        revertOnError: false,
+                        selector: "0x",
+                        context: "0x"
+                    },
+                    callData: args
+                });
+            }
             let to;
             let value;
             let data;
             let operationType = 0;
-            if (Array.isArray(args)) {
+            if (isArray) {
                 const argsArray = args;
                 to = multiSendCallOnlyAddress;
                 value = BigInt(0);
@@ -541,36 +988,7 @@ export async function signerToSafeSmartAccount(client, { signer, address, safeVe
                 value = singleTransaction.value;
             }
             return encodeFunctionData({
-                abi: [
-                    {
-                        inputs: [
-                            {
-                                internalType: "address",
-                                name: "to",
-                                type: "address"
-                            },
-                            {
-                                internalType: "uint256",
-                                name: "value",
-                                type: "uint256"
-                            },
-                            {
-                                internalType: "bytes",
-                                name: "data",
-                                type: "bytes"
-                            },
-                            {
-                                internalType: "uint8",
-                                name: "operation",
-                                type: "uint8"
-                            }
-                        ],
-                        name: "executeUserOpWithErrorString",
-                        outputs: [],
-                        stateMutability: "nonpayable",
-                        type: "function"
-                    }
-                ],
+                abi: executeUserOpWithErrorStringAbi,
                 functionName: "executeUserOpWithErrorString",
                 args: [to, value, data, operationType]
             });