@funkit/core 2.0.1 → 2.1.1

package/dist/src/wallet/FunWallet.js

@@ -1,24 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FunWallet = void 0;
-const api_base_1 = require("@funkit/api-base");
-const viem_1 = require("viem");
-const FirstClassActions_1 = require("../actions/FirstClassActions");
-const AccessControlApis_1 = require("../apis/AccessControlApis");
-const GroupApis_1 = require("../apis/GroupApis");
-const OperationApis_1 = require("../apis/OperationApis");
-const PaymasterApis_1 = require("../apis/PaymasterApis");
-const UserApis_1 = require("../apis/UserApis");
-const common_1 = require("../common");
-const constants_1 = require("../common/constants");
-const config_1 = require("../config");
-const data_1 = require("../data");
-const errors_1 = require("../errors");
-const sponsors_1 = require("../sponsors");
-const utils_1 = require("../utils");
-const PaymasterUtils_1 = require("../utils/PaymasterUtils");
-const TypeUtils_1 = require("../utils/TypeUtils");
-class FunWallet extends FirstClassActions_1.FirstClassActions {
+import { getAllWalletNFTs, getAllWalletNFTsByChainId, getAllWalletTokens, getAllWalletTokensByChainId, getMoonpayOffRampUrl, getMoonpayOnRampSupportedCurrencies, getMoonpayOnRampUrl, getWalletLidoWithdrawalsByChainId, } from '@funkit/api-base';
+import { concat, createPublicClient, encodeAbiParameters, http, isAddress, isHex, keccak256, pad, toBytes, } from 'viem';
+import { FirstClassActions } from '../actions/FirstClassActions';
+import { checkWalletAccessInitialization, initializeWalletAccess, } from '../apis/AccessControlApis';
+import { getGroups } from '../apis/GroupApis';
+import { createOp, deleteOp, executeOp, getFullReceipt, getOps, getOpsOfWallet, scheduleOp, signOp, } from '../apis/OperationApis';
+import { addTransaction } from '../apis/PaymasterApis';
+import { addUserToWallet } from '../apis/UserApis';
+import { ENTRYPOINT_CONTRACT_INTERFACE, WALLET_CONTRACT_INTERFACE, } from '../common';
+import { AddressZero, FACTORY_CONTRACT_INTERFACE } from '../common/constants';
+import { parseOptions } from '../config';
+import { AuthType, Chain, encodeLoginData, encodeUserAuthInitData, Operation, OperationStatus, OperationType, toBytes32Arr, Token, } from '../data';
+import { ErrorCode, InternalFailureError, InvalidParameterError, } from '../errors';
+import { CheckoutSponsor, GaslessSponsor, TokenSponsor } from '../sponsors';
+import { generateRandomNonceKey, getWalletAddress, isGroupOperation, isSignatureMissing, isWalletInitOp, } from '../utils';
+import { getPaymasterType } from '../utils/PaymasterUtils';
+import { isBytes32 } from '../utils/TypeUtils';
+export class FunWallet extends FirstClassActions {
+    walletUniqueId;
+    userInfo;
+    address;
     /**
      * Creates FunWallet object
      * @constructor
@@ -28,29 +28,29 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const chain = globalThis.globalEnvOption.chain;
         super(chain);
         if (typeof params === 'string') {
-            if ((0, viem_1.isAddress)(params)) {
+            if (isAddress(params)) {
                 this.address = params;
             }
             else {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InvalidParameter, 'string input must be an address type', params, 'Provide either (uniqueId, users) or walletAddr when constructing a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
+                throw new InvalidParameterError(ErrorCode.InvalidParameter, 'string input must be an address type', params, 'Provide either (uniqueId, users) or walletAddr when constructing a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
             }
         }
         else {
             const { users, uniqueId } = params;
-            if (!uniqueId || !(0, TypeUtils_1.isBytes32)(uniqueId) || !users || users.length <= 0) {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InvalidParameter, 'uniqueId must be bytes32 and users must be non-empty', params, 'The uniqueId field should be a 32 byte Hexstring and the users field should be an array of User objects', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
+            if (!uniqueId || !isBytes32(uniqueId) || !users || users.length <= 0) {
+                throw new InvalidParameterError(ErrorCode.InvalidParameter, 'uniqueId must be bytes32 and users must be non-empty', params, 'The uniqueId field should be a 32 byte Hexstring and the users field should be an array of User objects', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
             }
             this.userInfo = new Map(users?.map((user) => {
-                if (!user.userId || !(0, viem_1.isHex)(user.userId)) {
-                    throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InvalidParameter, 'userId is required and must be a hex string', users, 'Provide hex string userId when creating a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
+                if (!user.userId || !isHex(user.userId)) {
+                    throw new InvalidParameterError(ErrorCode.InvalidParameter, 'userId is required and must be a hex string', users, 'Provide hex string userId when creating a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
                 }
                 if (user.groupInfo &&
                     (!Number.isInteger(user.groupInfo.threshold) ||
                         !Array.isArray(user.groupInfo.memberIds) ||
-                        !user.groupInfo.memberIds.every((memberId) => (0, viem_1.isHex)(memberId)))) {
-                    throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InvalidParameter, 'groupInfo must be an object with threshold as integer and memberIds as array of hex strings', users, 'Provide valid groupInfo when creating a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
+                        !user.groupInfo.memberIds.every((memberId) => isHex(memberId)))) {
+                    throw new InvalidParameterError(ErrorCode.InvalidParameter, 'groupInfo must be an object with threshold as integer and memberIds as array of hex strings', users, 'Provide valid groupInfo when creating a FunWallet', 'https://docs.fun.xyz/how-to-guides/execute-transactions/create-funwallet#create-funwallet-manual-funwallet-creation');
                 }
-                return [(0, viem_1.pad)(user.userId, { size: 32 }), user];
+                return [pad(user.userId, { size: 32 }), user];
             }));
             this.walletUniqueId = uniqueId;
         }
@@ -63,7 +63,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getAddress(txOptions = globalThis.globalEnvOption) {
         if (!this.address) {
             const chainIdentifier = txOptions.chain;
-            this.address = await (0, utils_1.getWalletAddress)(await data_1.Chain.getChain({ chainIdentifier: chainIdentifier ?? 137 }), this.walletUniqueId);
+            this.address = await getWalletAddress(await Chain.getChain({ chainIdentifier: chainIdentifier ?? 137 }), this.walletUniqueId);
         }
         return this.address;
     }
@@ -76,7 +76,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     static async getAddress(uniqueId, apiKey) {
         ;
         globalThis.globalEnvOption.apiKey = apiKey;
-        return await (0, utils_1.getWalletAddress)(await data_1.Chain.getChain({ chainIdentifier: 137 }), (0, viem_1.keccak256)((0, viem_1.toBytes)(uniqueId)));
+        return await getWalletAddress(await Chain.getChain({ chainIdentifier: 137 }), keccak256(toBytes(uniqueId)));
     }
     /**
      * Retrieves the wallet address associated with the provided unique ID in an offline environment.
@@ -86,10 +86,10 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Address>} The wallet address.
      */
     static async getAddressOffline(uniqueId, rpcUrl, factoryAddress) {
-        const client = await (0, viem_1.createPublicClient)({
-            transport: (0, viem_1.http)(rpcUrl),
+        const client = await createPublicClient({
+            transport: http(rpcUrl),
         });
-        return await constants_1.FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress, 'getAddress', [(0, viem_1.keccak256)((0, viem_1.toBytes)(uniqueId))], client);
+        return await FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress, 'getAddress', [keccak256(toBytes(uniqueId))], client);
     }
     /**
      * Get all tokens for a specific chain
@@ -100,7 +100,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getTokens(chainIdInput, onlyVerifiedTokens = false) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({
+            const chain = await Chain.getChain({
                 chainIdentifier: globalThis.globalEnvOption.chain,
             });
             chainId = await chain.getChainId();
@@ -110,12 +110,12 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         }
         const walletAddress = await this.getAddress();
         return chainId === 'ALL'
-            ? await (0, api_base_1.getAllWalletTokens)({
+            ? await getAllWalletTokens({
                 walletAddress,
                 onlyVerifiedTokens,
                 apiKey: globalThis.globalEnvOption.apiKey,
             })
-            : await (0, api_base_1.getAllWalletTokensByChainId)({
+            : await getAllWalletTokensByChainId({
                 chainId,
                 walletAddress,
                 onlyVerifiedTokens,
@@ -130,7 +130,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getNFTs(chainIdInput) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({
+            const chain = await Chain.getChain({
                 chainIdentifier: globalThis.globalEnvOption.chain,
             });
             chainId = await chain.getChainId();
@@ -140,11 +140,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         }
         const walletAddress = await this.getAddress();
         return chainId === 'ALL'
-            ? await (0, api_base_1.getAllWalletNFTs)({
+            ? await getAllWalletNFTs({
                 walletAddress,
                 apiKey: globalThis.globalEnvOption.apiKey,
             })
-            : await (0, api_base_1.getAllWalletNFTsByChainId)({
+            : await getAllWalletNFTsByChainId({
                 chainId,
                 walletAddress,
                 apiKey: globalThis.globalEnvOption.apiKey,
@@ -152,7 +152,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     }
     async getLidoWithdrawals() {
         const walletAddress = await this.getAddress();
-        return await (0, api_base_1.getWalletLidoWithdrawalsByChainId)({
+        return await getWalletLidoWithdrawalsByChainId({
             chainId: '1',
             walletAddress,
             apiKey: globalThis.globalEnvOption.apiKey,
@@ -168,7 +168,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getAssets(chainIdInput, onlyVerifiedTokens = false, checkStatus = false) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({
+            const chain = await Chain.getChain({
                 chainIdentifier: globalThis.globalEnvOption.chain,
             });
             chainId = await chain.getChainId();
@@ -188,13 +188,13 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @param {EnvOption} txOptions - Transaction environment options (default: global environment options).
      * @returns {Promise<bigint>} The nonce value.
      */
-    async getNonce(sender, key = (0, utils_1.generateRandomNonceKey)(), txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+    async getNonce(sender, key = generateRandomNonceKey(), txOptions = globalThis.globalEnvOption) {
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const entryPointAddress = await chain.getAddress('entryPointAddress');
         let nonce = undefined;
         let retryCount = 3;
         while ((nonce === undefined || nonce === null) && retryCount > 0) {
-            nonce = await common_1.ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(entryPointAddress, 'getNonce', [sender, key], chain);
+            nonce = await ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(entryPointAddress, 'getNonce', [sender, key], chain);
             retryCount--;
         }
         if (nonce !== undefined && nonce !== null) {
@@ -210,9 +210,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @param {EnvOption} txOptions - Transaction environment options (default: global environment options).
      * @returns {Promise<Operation[]>} A list of operations.
      */
-    async getOperations(status = data_1.OperationStatus.ALL, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
-        return await (0, OperationApis_1.getOpsOfWallet)(await this.getAddress(txOptions), await chain.getChainId(), status);
+    async getOperations(status = OperationStatus.ALL, txOptions = globalThis.globalEnvOption) {
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+        return await getOpsOfWallet(await this.getAddress(txOptions), await chain.getChainId(), status);
     }
     /**
      * Retrieves a specific operation by its ID.
@@ -221,8 +221,8 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The requested operation.
      */
     async getOperation(opId, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
-        return (await (0, OperationApis_1.getOps)([opId], await chain.getChainId()))[0];
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+        return (await getOps([opId], await chain.getChainId()))[0];
     }
     /**
      * Retrieves a list of users associated with the wallet and their potential corresponding group information.
@@ -231,7 +231,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<User[]>} A list of users with their group information.
      */
     async getUsers(auth, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const storedUserIds = await auth.getUserIds(await this.getAddress(txOptions), await chain.getChainId());
         const userIds = new Set([...storedUserIds]);
         if (this.userInfo) {
@@ -242,15 +242,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const users = [];
         const groupIds = [];
         for (const userId of userIds) {
-            if ((0, viem_1.pad)(userId, { size: 32 }).toLowerCase() === (await auth.getUserId())) {
-                users.push({ userId: (0, viem_1.pad)(userId, { size: 32 }) });
+            if (pad(userId, { size: 32 }).toLowerCase() === (await auth.getUserId())) {
+                users.push({ userId: pad(userId, { size: 32 }) });
             }
             else {
-                groupIds.push((0, viem_1.pad)(userId, { size: 32 }));
+                groupIds.push(pad(userId, { size: 32 }));
             }
         }
         if (groupIds && groupIds.length > 0) {
-            const groups = await (0, GroupApis_1.getGroups)(groupIds, await chain.getChainId());
+            const groups = await getGroups(groupIds, await chain.getChainId());
             groups.forEach((group) => {
                 users.push({
                     userId: group.groupId,
@@ -269,7 +269,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<boolean>} `true` if the address is a contract, `false` otherwise.
      */
     async getDeploymentStatus(txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         return await chain.addressIsContract(await this.getAddress(txOptions));
     }
     /**
@@ -294,15 +294,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns A Promise that resolves when the wallet is saved to the authentication system.
      */
     async saveWalletToAuth(auth, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const walletAddr = await this.getAddress(txOptions);
         const userId = await auth.getUserId();
         const users = await auth.getUserIds(walletAddr, await chain.getChainId());
         if (!users.includes(userId)) {
-            if ((await (0, AccessControlApis_1.checkWalletAccessInitialization)(walletAddr)) === false) {
-                await (0, AccessControlApis_1.initializeWalletAccess)(walletAddr, await auth.getAddress());
+            if ((await checkWalletAccessInitialization(walletAddr)) === false) {
+                await initializeWalletAccess(walletAddr, await auth.getAddress());
             }
-            await (0, UserApis_1.addUserToWallet)(await auth.getAddress(), await chain.getChainId(), walletAddr, [userId], this.walletUniqueId);
+            await addUserToWallet(await auth.getAddress(), await chain.getChainId(), walletAddr, [userId], this.walletUniqueId);
         }
     }
     /**
@@ -312,7 +312,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<string>} The on-ramp URL.
      */
     async onRamp(address, currencyCode) {
-        return await (0, api_base_1.getMoonpayOnRampUrl)({
+        return await getMoonpayOnRampUrl({
             apiKey: globalThis.globalEnvOption.apiKey,
             walletAddr: address ? address : await this.getAddress(),
             currencyCode: currencyCode ? currencyCode : undefined,
@@ -324,7 +324,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<string>} The off-ramp URL.
      */
     async offRamp(address) {
-        return await (0, api_base_1.getMoonpayOffRampUrl)({
+        return await getMoonpayOffRampUrl({
             apiKey: globalThis.globalEnvOption.apiKey,
             walletAddr: address ? address : await this.getAddress(),
         });
@@ -334,7 +334,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<MoonpayCurrency[]>} The supported currencies.
      */
     async getSupportedCurrencies() {
-        return await (0, api_base_1.getMoonpayOnRampSupportedCurrencies)({
+        return await getMoonpayOnRampSupportedCurrencies({
             apiKey: globalThis.globalEnvOption.apiKey,
         });
     }
@@ -348,10 +348,10 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      */
     async createOperation(auth, userId, transactionParams, txOptions = globalThis.globalEnvOption) {
         if (!userId || userId === '') {
-            throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, 'userId is required', { userId }, 'Provide userId when createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+            throw new InvalidParameterError(ErrorCode.MissingParameter, 'userId is required', { userId }, 'Provide userId when createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
         }
-        userId = (0, viem_1.pad)(userId, { size: 32 }).toLowerCase();
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        userId = pad(userId, { size: 32 }).toLowerCase();
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const sender = await this.getAddress(txOptions);
         const initCode = (await chain.addressIsContract(sender))
             ? '0x'
@@ -388,21 +388,21 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             partialOp.verificationGasLimit = BigInt(10e5);
         }
         const isGroupOp = (await auth.getUserId()) !== userId;
-        const operation = new data_1.Operation(partialOp, {
+        const operation = new Operation(partialOp, {
             chainId: await chain.getChainId(),
             opType: isGroupOp
-                ? data_1.OperationType.GROUP_OPERATION
-                : data_1.OperationType.SINGLE_OPERATION,
-            authType: isGroupOp ? data_1.AuthType.MULTI_SIG : data_1.AuthType.ECDSA,
+                ? OperationType.GROUP_OPERATION
+                : OperationType.SINGLE_OPERATION,
+            authType: isGroupOp ? AuthType.MULTI_SIG : AuthType.ECDSA,
             walletAddr: await this.getAddress(txOptions),
             proposer: await auth.getAddress(),
         });
         if (isGroupOp) {
-            operation.groupId = (0, viem_1.pad)(userId, { size: 32 });
+            operation.groupId = pad(userId, { size: 32 });
         }
         if (txOptions.gasSponsor && Object.keys(txOptions.gasSponsor).length > 0) {
             if (txOptions.gasSponsor.token) {
-                const sponsor = new sponsors_1.TokenSponsor(txOptions);
+                const sponsor = new TokenSponsor(txOptions);
                 if (txOptions.gasSponsor.usePermit) {
                     paymasterAndData = (await sponsor.getPaymasterAndDataPermit(operation, await this.getAddress(txOptions), userId, auth)).toLowerCase();
                 }
@@ -411,11 +411,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 }
             }
             else if (txOptions.gasSponsor.useCheckoutSponsor) {
-                const sponsor = new sponsors_1.CheckoutSponsor(txOptions);
+                const sponsor = new CheckoutSponsor(txOptions);
                 paymasterAndData = (await sponsor.getPaymasterAndData(txOptions)).toLowerCase();
             }
             else {
-                const sponsor = new sponsors_1.GaslessSponsor(txOptions);
+                const sponsor = new GaslessSponsor(txOptions);
                 paymasterAndData = (await sponsor.getPaymasterAndData(txOptions)).toLowerCase();
             }
         }
@@ -425,12 +425,12 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             estimatedOperation.userOp.initCode = '0x';
         }
         // sign the userOp directly here as we do not have the opId yet
-        estimatedOperation.userOp.signature = await auth.signOp(estimatedOperation, chain, (0, utils_1.isGroupOperation)(operation));
+        estimatedOperation.userOp.signature = await auth.signOp(estimatedOperation, chain, isGroupOperation(operation));
         if (txOptions.skipDBAction !== true) {
-            const opId = await (0, OperationApis_1.createOp)(estimatedOperation);
+            const opId = await createOp(estimatedOperation);
             estimatedOperation.opId = opId;
-            if (!(await (0, AccessControlApis_1.checkWalletAccessInitialization)(sender))) {
-                await (0, AccessControlApis_1.initializeWalletAccess)(sender, await auth.getAddress());
+            if (!(await checkWalletAccessInitialization(sender))) {
+                await initializeWalletAccess(sender, await auth.getAddress());
             }
         }
         return estimatedOperation;
@@ -443,11 +443,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The signed operation.
      */
     async signOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
-        operation = data_1.Operation.convertTypeToObject(operation);
-        operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
-        if ((0, utils_1.isGroupOperation)(operation) && txOptions.skipDBAction !== true) {
-            await (0, OperationApis_1.signOp)(operation.opId, await chain.getChainId(), operation.userOp.signature, await auth.getAddress(), this.userInfo?.get(operation.groupId)?.groupInfo?.threshold);
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+        operation = Operation.convertTypeToObject(operation);
+        operation.userOp.signature = await auth.signOp(operation, chain, isGroupOperation(operation));
+        if (isGroupOperation(operation) && txOptions.skipDBAction !== true) {
+            await signOp(operation.opId, await chain.getChainId(), operation.userOp.signature, await auth.getAddress(), this.userInfo?.get(operation.groupId)?.groupInfo?.threshold);
         }
         return operation;
     }
@@ -459,14 +459,14 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<ExecutionReceipt>} The execution receipt of the operation.
      */
     async executeOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
-        txOptions = (0, config_1.parseOptions)(txOptions);
-        operation = data_1.Operation.convertTypeToObject(operation);
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        txOptions = parseOptions(txOptions);
+        operation = Operation.convertTypeToObject(operation);
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const chainId = await chain.getChainId();
         if (txOptions.skipDBAction !== true) {
             // cache group info
-            if ((0, utils_1.isGroupOperation)(operation)) {
-                const groups = await (0, GroupApis_1.getGroups)([operation.groupId], chainId);
+            if (isGroupOperation(operation)) {
+                const groups = await getGroups([operation.groupId], chainId);
                 if (groups && groups.length > 0) {
                     // could be empty as a new wallet wants to create a group
                     this.userInfo?.set(operation.groupId, {
@@ -482,36 +482,36 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const threshold = this.userInfo?.get(operation.groupId)?.groupInfo?.threshold ?? 1;
         if (threshold <= 1) {
             if (!operation.userOp.signature || operation.userOp.signature === '0x') {
-                operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
+                operation.userOp.signature = await auth.signOp(operation, chain, isGroupOperation(operation));
             }
         }
         else {
             if (txOptions.skipDBAction !== true) {
                 // check remote collected signature
-                const storedOps = await (0, OperationApis_1.getOps)([operation.opId], chainId);
+                const storedOps = await getOps([operation.opId], chainId);
                 let collectedSigCount;
-                if ((0, utils_1.isSignatureMissing)(await auth.getUserId(), storedOps[0]?.signatures)) {
+                if (isSignatureMissing(await auth.getUserId(), storedOps[0]?.signatures)) {
                     collectedSigCount = storedOps[0]?.signatures?.length
                         ? storedOps[0]?.signatures?.length + 1
                         : 1;
                     if (collectedSigCount >= threshold) {
-                        operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
+                        operation.userOp.signature = await auth.signOp(operation, chain, isGroupOperation(operation));
                     }
                 }
                 else {
                     collectedSigCount = storedOps[0]?.signatures?.length ?? 1;
                 }
                 if (collectedSigCount < threshold) {
-                    throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, collectedSigCount, chainId }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                    throw new InvalidParameterError(ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, collectedSigCount, chainId }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
                 }
             }
             else {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, chainId, skipDBAction: txOptions.skipDBAction }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                throw new InvalidParameterError(ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, chainId, skipDBAction: txOptions.skipDBAction }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
             }
         }
         let receipt;
-        if ((0, utils_1.isGroupOperation)(operation)) {
-            receipt = await (0, OperationApis_1.executeOp)({
+        if (isGroupOperation(operation)) {
+            receipt = await executeOp({
                 opId: operation.opId,
                 chainId,
                 executedBy: await auth.getAddress(),
@@ -521,7 +521,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             });
         }
         else {
-            receipt = await (0, OperationApis_1.executeOp)({
+            receipt = await executeOp({
                 opId: operation.opId,
                 chainId,
                 executedBy: await auth.getAddress(),
@@ -530,12 +530,12 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 userOp: operation.userOp,
             });
         }
-        receipt = await (0, OperationApis_1.getFullReceipt)(operation.opId, chainId, receipt.userOpHash);
-        if ((0, utils_1.isWalletInitOp)(operation.userOp) && txOptions.skipDBAction !== true) {
-            await (0, UserApis_1.addUserToWallet)(await auth.getAddress(), chainId, await this.getAddress(txOptions), Array.from(this.userInfo.keys()), this.walletUniqueId);
+        receipt = await getFullReceipt(operation.opId, chainId, receipt.userOpHash);
+        if (isWalletInitOp(operation.userOp) && txOptions.skipDBAction !== true) {
+            await addUserToWallet(await auth.getAddress(), chainId, await this.getAddress(txOptions), Array.from(this.userInfo.keys()), this.walletUniqueId);
             if (txOptions?.gasSponsor?.sponsorAddress) {
-                const paymasterType = (0, PaymasterUtils_1.getPaymasterType)(txOptions);
-                (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), receipt.txId, {
+                const paymasterType = getPaymasterType(txOptions);
+                addTransaction(await chain.getChainId(), Date.now(), receipt.txId, {
                     action: 'sponsor',
                     amount: -1, //Get amount from lazy processing
                     from: txOptions.gasSponsor.sponsorAddress,
@@ -555,14 +555,14 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Hex>} The ID of the scheduled operation.
      */
     async scheduleOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
-        txOptions = (0, config_1.parseOptions)(txOptions);
-        operation = data_1.Operation.convertTypeToObject(operation);
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        txOptions = parseOptions(txOptions);
+        operation = Operation.convertTypeToObject(operation);
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const chainId = await chain.getChainId();
         if (txOptions.skipDBAction !== true) {
             // cache group info
-            if ((0, utils_1.isGroupOperation)(operation)) {
-                const groups = await (0, GroupApis_1.getGroups)([operation.groupId], chainId);
+            if (isGroupOperation(operation)) {
+                const groups = await getGroups([operation.groupId], chainId);
                 if (groups && groups.length > 0) {
                     // could be empty as a new wallet wants to create a group
                     this.userInfo?.set(operation.groupId, {
@@ -578,35 +578,35 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const threshold = this.userInfo?.get(operation.groupId)?.groupInfo?.threshold ?? 1;
         if (threshold <= 1) {
             if (!operation.userOp.signature || operation.userOp.signature === '0x') {
-                operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
+                operation.userOp.signature = await auth.signOp(operation, chain, isGroupOperation(operation));
             }
         }
         else {
             if (txOptions.skipDBAction !== true) {
                 // check remote collected signature
-                const storedOps = await (0, OperationApis_1.getOps)([operation.opId], chainId);
+                const storedOps = await getOps([operation.opId], chainId);
                 let collectedSigCount;
-                if ((0, utils_1.isSignatureMissing)(await auth.getUserId(), storedOps[0]?.signatures)) {
+                if (isSignatureMissing(await auth.getUserId(), storedOps[0]?.signatures)) {
                     collectedSigCount = storedOps[0]?.signatures?.length
                         ? storedOps[0]?.signatures?.length + 1
                         : 1;
                     if (collectedSigCount >= threshold) {
-                        operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
+                        operation.userOp.signature = await auth.signOp(operation, chain, isGroupOperation(operation));
                     }
                 }
                 else {
                     collectedSigCount = storedOps[0]?.signatures?.length ?? 1;
                 }
                 if (collectedSigCount < threshold) {
-                    throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, collectedSigCount, chainId }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                    throw new InvalidParameterError(ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, collectedSigCount, chainId }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
                 }
             }
             else {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, chainId, skipDBAction: txOptions.skipDBAction }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                throw new InvalidParameterError(ErrorCode.InsufficientSignatures, 'Signatures are not sufficient to execute the operation', { threshold, chainId, skipDBAction: txOptions.skipDBAction }, 'Only execute operation with enough signatures', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
             }
         }
-        if ((0, utils_1.isGroupOperation)(operation)) {
-            await (0, OperationApis_1.scheduleOp)({
+        if (isGroupOperation(operation)) {
+            await scheduleOp({
                 opId: operation.opId,
                 chainId,
                 scheduledBy: await auth.getAddress(),
@@ -616,7 +616,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             });
         }
         else {
-            await (0, OperationApis_1.scheduleOp)({
+            await scheduleOp({
                 opId: operation.opId,
                 chainId,
                 scheduledBy: await auth.getAddress(),
@@ -626,7 +626,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             });
         }
         if (!operation.opId) {
-            throw new errors_1.InternalFailureError(errors_1.ErrorCode.ServerFailure, 'Operation id is required', operation, 'Make sure you are scheduling a valid operation', 'https://docs.fun.xyz/');
+            throw new InternalFailureError(ErrorCode.ServerFailure, 'Operation id is required', operation, 'Make sure you are scheduling a valid operation', 'https://docs.fun.xyz/');
         }
         return operation.opId;
     }
@@ -638,8 +638,8 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<void>} A promise that resolves after the operation is removed.
      */
     async removeOperation(_, operationId, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
-        await (0, OperationApis_1.deleteOp)(operationId, await chain.getChainId());
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+        await deleteOp(operationId, await chain.getChainId());
     }
     /**
      * Creates and prepares a rejection operation for an existing operation.
@@ -659,8 +659,8 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         if (rejectionMessage)
             rejectOperation.message = rejectionMessage;
         rejectOperation.relatedOpIds = [operation.opId];
-        rejectOperation.opType = data_1.OperationType.REJECTION;
-        rejectOperation.opId = (await (0, OperationApis_1.createOp)(rejectOperation));
+        rejectOperation.opType = OperationType.REJECTION;
+        rejectOperation.opId = (await createOp(rejectOperation));
         return rejectOperation;
     }
     /**
@@ -672,7 +672,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The updated operation with gas estimation details.
      */
     async estimateOperation(auth, userId, operation, txOptions = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
+        const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
         const estimateGasSignature = await auth.getEstimateGasSignature(userId, operation);
         operation.userOp.signature = estimateGasSignature.toLowerCase();
         const estimationPaymasterAddress = await chain.getAddress('estimationPaymasterAddress');
@@ -700,16 +700,16 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const loginData = {
             salt: this.walletUniqueId,
         };
-        const rbacInitData = (0, data_1.toBytes32Arr)(owners);
+        const rbacInitData = toBytes32Arr(owners);
         let userAuthInitData = '0x';
         const groupUsers = Array.from(this.userInfo.values()).filter((user) => user.groupInfo !== null && user.groupInfo !== undefined);
         if (groupUsers.length > 0) {
-            userAuthInitData = (0, data_1.encodeUserAuthInitData)(groupUsers);
+            userAuthInitData = encodeUserAuthInitData(groupUsers);
         }
         const initCodeParams = {
             entryPointAddress,
             factoryAddress,
-            implementationAddress: constants_1.AddressZero,
+            implementationAddress: AddressZero,
             loginData,
             verificationAddresses: [rbac, userAuth],
             verificationData: [rbacInitData, userAuthInitData],
@@ -717,7 +717,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         return this.getInitCode(initCodeParams);
     }
     getInitCode(input) {
-        const encodedVerificationInitdata = (0, viem_1.encodeAbiParameters)([
+        const encodedVerificationInitdata = encodeAbiParameters([
             {
                 type: 'address[]',
                 name: 'verificationAddresses',
@@ -727,12 +727,12 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 name: 'verificationData',
             },
         ], [input.verificationAddresses, input.verificationData]);
-        const initializerCallData = common_1.WALLET_CONTRACT_INTERFACE.encodeData('initialize', [input.entryPointAddress, encodedVerificationInitdata]);
-        const data = constants_1.FACTORY_CONTRACT_INTERFACE.encodeData('createAccount', [
+        const initializerCallData = WALLET_CONTRACT_INTERFACE.encodeData('initialize', [input.entryPointAddress, encodedVerificationInitdata]);
+        const data = FACTORY_CONTRACT_INTERFACE.encodeData('createAccount', [
             initializerCallData,
-            (0, data_1.encodeLoginData)(input.loginData),
+            encodeLoginData(input.loginData),
         ]);
-        return (0, viem_1.concat)([input.factoryAddress, data]);
+        return concat([input.factoryAddress, data]);
     }
     /**
      * Encodes arbitrary transactions calls to include fees
@@ -751,18 +751,18 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 options.fee.token = options.gasSponsor.token;
             }
             if (!options.fee.token) {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, 'EnvOption.fee.token or EnvOption.gasSponsor.token is required', { options }, 'Provide EnvOption.fee.token or EnvOption.gasSponsor.token when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                throw new InvalidParameterError(ErrorCode.MissingParameter, 'EnvOption.fee.token or EnvOption.gasSponsor.token is required', { options }, 'Provide EnvOption.fee.token or EnvOption.gasSponsor.token when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
             }
             if (!options.fee.recipient) {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, 'EnvOption.fee.recipient is required', { options }, 'Provide EnvOption.fee.recipient when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
+                throw new InvalidParameterError(ErrorCode.MissingParameter, 'EnvOption.fee.recipient is required', { options }, 'Provide EnvOption.fee.recipient when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions');
             }
-            const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-            const token = new data_1.Token(options.fee.token, chain);
+            const chain = await Chain.getChain({ chainIdentifier: options.chain });
+            const token = new Token(options.fee.token, chain);
             if (options.fee.gasPercent && !token.isNative) {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.InvalidParameterCombination, 'GasPercent is only valid for native tokens', { options }, 'Use native token as the fee token if you want to charge fee based on percentage', 'https://docs.fun.xyz/how-to-guides/configure-environment/set-developer-fee');
+                throw new InvalidParameterError(ErrorCode.InvalidParameterCombination, 'GasPercent is only valid for native tokens', { options }, 'Use native token as the fee token if you want to charge fee based on percentage', 'https://docs.fun.xyz/how-to-guides/configure-environment/set-developer-fee');
             }
             if (token.isNative) {
-                options.fee.token = constants_1.AddressZero;
+                options.fee.token = AddressZero;
             }
             else {
                 options.fee.token = await token.getAddress();
@@ -772,20 +772,20 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             }
             else if (options.fee.gasPercent) {
                 const feedata = [options.fee.token, options.fee.recipient, 1];
-                const estimateGasCalldata = common_1.WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPointWithFee', [params.to, params.value, params.data, feedata]);
+                const estimateGasCalldata = WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPointWithFee', [params.to, params.value, params.data, feedata]);
                 const operation = await this.createOperation(auth, userId, { to: params.to, value: params.value, data: estimateGasCalldata }, { ...options, fee: undefined });
                 const gasUsed = await operation.getMaxTxCost();
                 options.fee.amount = Math.ceil((Number(gasUsed) * options.fee.gasPercent) / 100);
             }
             else {
-                throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, 'EnvOption.fee.amount or EnvOption.fee.gasPercent is required', { options }, 'Provide either EnvOption.fee.amount or EnvOption.fee.gasPercent when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/configure-environment/set-developer-fee');
+                throw new InvalidParameterError(ErrorCode.MissingParameter, 'EnvOption.fee.amount or EnvOption.fee.gasPercent is required', { options }, 'Provide either EnvOption.fee.amount or EnvOption.fee.gasPercent when calling wallet.createOperation', 'https://docs.fun.xyz/how-to-guides/configure-environment/set-developer-fee');
             }
             const feedata = [
                 options.fee.token,
                 options.fee.recipient,
                 options.fee.amount,
             ];
-            return common_1.WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPointWithFee', [
+            return WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPointWithFee', [
                 params.to,
                 params.value,
                 params.data,
@@ -793,7 +793,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             ]);
         }
         else {
-            return common_1.WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPoint', [
+            return WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPoint', [
                 params.to,
                 params.value,
                 params.data,
@@ -801,5 +801,4 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         }
     }
 }
-exports.FunWallet = FunWallet;
 //# sourceMappingURL=FunWallet.js.map