@funkit/core 0.8.6 → 0.10.0

package/dist/src/wallet/FunWallet.js

@@ -25,29 +25,30 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @param {object} params - The parameters for the constructing fun wallet - (users, uniqueId) or walletAddr
      */
     constructor(params) {
-        super();
-        if (typeof params === "string") {
+        const chain = globalThis.globalEnvOption.chain;
+        super(chain);
+        if (typeof params === 'string') {
             if ((0, viem_1.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 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');
             }
         }
         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");
+                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');
             }
             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");
+                    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.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");
+                    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');
                 }
                 return [(0, viem_1.pad)(user.userId, { size: 32 }), user];
             }));
@@ -85,9 +86,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      */
     static async getAddressOffline(uniqueId, rpcUrl, factoryAddress) {
         const client = await (0, viem_1.createPublicClient)({
-            transport: (0, viem_1.http)(rpcUrl)
+            transport: (0, viem_1.http)(rpcUrl),
         });
-        return await constants_1.FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress, "getAddress", [(0, viem_1.keccak256)((0, viem_1.toBytes)(uniqueId))], client);
+        return await constants_1.FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress, 'getAddress', [(0, viem_1.keccak256)((0, viem_1.toBytes)(uniqueId))], client);
     }
     /**
      * Get all tokens for a specific chain
@@ -98,13 +99,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getTokens(chainIdInput, onlyVerifiedTokens = false) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({ chainIdentifier: globalThis.globalEnvOption.chain });
+            const chain = await data_1.Chain.getChain({
+                chainIdentifier: globalThis.globalEnvOption.chain,
+            });
             chainId = await chain.getChainId();
         }
         else {
             chainId = chainIdInput;
         }
-        if (chainId === "ALL") {
+        if (chainId === 'ALL') {
             return await (0, apis_1.getAllTokens)(await this.getAddress(), onlyVerifiedTokens);
         }
         else {
@@ -119,13 +122,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getNFTs(chainIdInput) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({ chainIdentifier: globalThis.globalEnvOption.chain });
+            const chain = await data_1.Chain.getChain({
+                chainIdentifier: globalThis.globalEnvOption.chain,
+            });
             chainId = await chain.getChainId();
         }
         else {
             chainId = chainIdInput;
         }
-        if (chainId === "ALL") {
+        if (chainId === 'ALL') {
             return await (0, apis_1.getAllNFTs)(await this.getAddress());
         }
         else {
@@ -142,20 +147,25 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     async getAssets(chainIdInput, onlyVerifiedTokens = false, checkStatus = false) {
         let chainId;
         if (!chainIdInput) {
-            const chain = await data_1.Chain.getChain({ chainIdentifier: globalThis.globalEnvOption.chain });
+            const chain = await data_1.Chain.getChain({
+                chainIdentifier: globalThis.globalEnvOption.chain,
+            });
             chainId = await chain.getChainId();
         }
         else {
             chainId = chainIdInput;
         }
         let tokens = {}, nfts = {}, lidoWithdrawals = {};
-        if (chainId === "ALL") {
+        if (chainId === 'ALL') {
             tokens = await (0, apis_1.getAllTokens)(await this.getAddress(), onlyVerifiedTokens);
             nfts = await (0, apis_1.getAllNFTs)(await this.getAddress());
             if (checkStatus) {
-                const ethMainnetLidoWithdrawals = await (0, apis_1.getLidoWithdrawals)("1", await this.getAddress());
-                const goerliLidoWithdrawals = await (0, apis_1.getLidoWithdrawals)("5", await this.getAddress());
-                lidoWithdrawals = { ...ethMainnetLidoWithdrawals, ...goerliLidoWithdrawals };
+                const ethMainnetLidoWithdrawals = await (0, apis_1.getLidoWithdrawals)('1', await this.getAddress());
+                const goerliLidoWithdrawals = await (0, apis_1.getLidoWithdrawals)('5', await this.getAddress());
+                lidoWithdrawals = {
+                    ...ethMainnetLidoWithdrawals,
+                    ...goerliLidoWithdrawals,
+                };
             }
         }
         else {
@@ -177,11 +187,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      */
     async getNonce(sender, key = (0, utils_1.generateRandomNonceKey)(), txOptions = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
-        const entryPointAddress = await chain.getAddress("entryPointAddress");
+        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 common_1.ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(entryPointAddress, 'getNonce', [sender, key], chain);
             retryCount--;
         }
         if (nonce !== undefined && nonce !== null) {
@@ -243,8 +253,8 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                     userId: group.groupId,
                     groupInfo: {
                         threshold: group.threshold,
-                        memberIds: group.memberIds
-                    }
+                        memberIds: group.memberIds,
+                    },
                 });
             });
         }
@@ -267,7 +277,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The operation to create the wallet.
      */
     async create(auth, userId, txOptions = globalThis.globalEnvOption) {
-        const transactionParams = { to: await this.getAddress(), data: "0x", value: 0n };
+        const transactionParams = {
+            to: await this.getAddress(),
+            data: '0x',
+            value: 0n,
+        };
         return await this.createOperation(auth, userId, transactionParams, txOptions);
     }
     /**
@@ -321,17 +335,19 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The created and prepared operation.
      */
     async createOperation(auth, userId, transactionParams, txOptions = globalThis.globalEnvOption) {
-        if (!userId || userId === "") {
-            throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, "userId is required", { userId: userId }, "Provide userId when createOperation", "https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions");
+        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');
         }
         userId = (0, viem_1.pad)(userId, { size: 32 }).toLowerCase();
         const chain = await data_1.Chain.getChain({ chainIdentifier: txOptions.chain });
         const sender = await this.getAddress();
-        const initCode = (await chain.addressIsContract(sender)) ? "0x" : await this.getThisInitCode(chain);
-        let paymasterAndData = "0x";
+        const initCode = (await chain.addressIsContract(sender))
+            ? '0x'
+            : await this.getThisInitCode(chain);
+        let paymasterAndData = '0x';
         let maxFeePerGas, maxPriorityFeePerGas;
         const chainId = await chain.getChainId();
-        const OPStackChains = ["10", "8453"];
+        const OPStackChains = ['10', '8453'];
         if (OPStackChains.includes(chainId)) {
             const gasPrice = await chain.getFeeData();
             maxFeePerGas = gasPrice.maxFeePerGas;
@@ -348,18 +364,26 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             maxFeePerGas,
             maxPriorityFeePerGas,
             initCode,
-            nonce: txOptions.nonce !== null && txOptions.nonce !== undefined ? txOptions.nonce : await this.getNonce(sender),
+            nonce: txOptions.nonce !== null && txOptions.nonce !== undefined
+                ? txOptions.nonce
+                : await this.getNonce(sender),
             preVerificationGas: 100000n,
             callGasLimit: BigInt(10e6),
-            verificationGasLimit: BigInt(10e6)
+            verificationGasLimit: BigInt(10e6),
         };
+        if ((await chain.getChainId()) === '36865') {
+            partialOp.callGasLimit = BigInt(10e5);
+            partialOp.verificationGasLimit = BigInt(10e5);
+        }
         const isGroupOp = (await auth.getUserId()) !== userId;
         const operation = new data_1.Operation(partialOp, {
             chainId: await chain.getChainId(),
-            opType: isGroupOp ? data_1.OperationType.GROUP_OPERATION : data_1.OperationType.SINGLE_OPERATION,
+            opType: isGroupOp
+                ? data_1.OperationType.GROUP_OPERATION
+                : data_1.OperationType.SINGLE_OPERATION,
             authType: isGroupOp ? data_1.AuthType.MULTI_SIG : data_1.AuthType.ECDSA,
             walletAddr: await this.getAddress(),
-            proposer: await auth.getAddress()
+            proposer: await auth.getAddress(),
         });
         if (isGroupOp) {
             operation.groupId = (0, viem_1.pad)(userId, { size: 32 });
@@ -374,6 +398,10 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                     paymasterAndData = (await sponsor.getPaymasterAndData(txOptions)).toLowerCase();
                 }
             }
+            else if (txOptions.gasSponsor.useCheckoutSponsor) {
+                const sponsor = new sponsors_1.CheckoutSponsor(txOptions);
+                paymasterAndData = (await sponsor.getPaymasterAndData(txOptions)).toLowerCase();
+            }
             else {
                 const sponsor = new sponsors_1.GaslessSponsor(txOptions);
                 paymasterAndData = (await sponsor.getPaymasterAndData(txOptions)).toLowerCase();
@@ -381,6 +409,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         }
         operation.userOp.paymasterAndData = paymasterAndData;
         const estimatedOperation = await this.estimateOperation(auth, userId, operation, txOptions);
+        if (txOptions.bypassInit) {
+            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));
         if (txOptions.skipDBAction !== true) {
@@ -430,15 +461,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                         userId: operation.groupId,
                         groupInfo: {
                             threshold: groups[0].threshold,
-                            memberIds: groups[0].memberIds
-                        }
+                            memberIds: groups[0].memberIds,
+                        },
                     });
                 }
             }
         }
         const threshold = this.userInfo?.get(operation.groupId)?.groupInfo?.threshold ?? 1;
         if (threshold <= 1) {
-            if (!operation.userOp.signature || operation.userOp.signature === "0x") {
+            if (!operation.userOp.signature || operation.userOp.signature === '0x') {
                 operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
             }
         }
@@ -448,7 +479,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 const storedOps = await (0, OperationApis_1.getOps)([operation.opId], chainId);
                 let collectedSigCount;
                 if ((0, utils_1.isSignatureMissing)(await auth.getUserId(), storedOps[0]?.signatures)) {
-                    collectedSigCount = storedOps[0]?.signatures?.length ? storedOps[0]?.signatures?.length + 1 : 1;
+                    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));
                     }
@@ -457,11 +490,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                     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 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');
                 }
             }
             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 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');
             }
         }
         let receipt;
@@ -470,9 +503,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 opId: operation.opId,
                 chainId,
                 executedBy: await auth.getAddress(),
-                entryPointAddress: await chain.getAddress("entryPointAddress"),
+                entryPointAddress: await chain.getAddress('entryPointAddress'),
                 signature: operation.userOp.signature,
-                groupInfo: this.userInfo?.get(operation.groupId)?.groupInfo
+                groupInfo: this.userInfo?.get(operation.groupId)?.groupInfo,
             });
         }
         else {
@@ -480,29 +513,23 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 opId: operation.opId,
                 chainId,
                 executedBy: await auth.getAddress(),
-                entryPointAddress: await chain.getAddress("entryPointAddress"),
+                entryPointAddress: await chain.getAddress('entryPointAddress'),
                 signature: operation.userOp.signature,
-                userOp: operation.userOp
+                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(), Array.from(this.userInfo.keys()), this.walletUniqueId);
-            if ((0, utils_1.isGroupOperation)(operation)) {
-                const group = this.userInfo.get(operation.groupId);
-                if (group && group.groupInfo) {
-                    await (0, GroupApis_1.createGroup)(operation.groupId, chainId, group.groupInfo.threshold, await this.getAddress(), group.groupInfo.memberIds);
-                }
-            }
             if (txOptions?.gasSponsor?.sponsorAddress) {
                 const paymasterType = (0, PaymasterUtils_1.getPaymasterType)(txOptions);
                 (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), receipt.txId, {
-                    action: "sponsor",
-                    amount: -1,
+                    action: 'sponsor',
+                    amount: -1, //Get amount from lazy processing
                     from: txOptions.gasSponsor.sponsorAddress,
                     to: await this.getAddress(),
-                    token: "eth",
-                    txid: receipt.txId
+                    token: 'eth',
+                    txid: receipt.txId,
                 }, paymasterType, txOptions.gasSponsor.sponsorAddress);
             }
         }
@@ -530,15 +557,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                         userId: operation.groupId,
                         groupInfo: {
                             threshold: groups[0].threshold,
-                            memberIds: groups[0].memberIds
-                        }
+                            memberIds: groups[0].memberIds,
+                        },
                     });
                 }
             }
         }
         const threshold = this.userInfo?.get(operation.groupId)?.groupInfo?.threshold ?? 1;
         if (threshold <= 1) {
-            if (!operation.userOp.signature || operation.userOp.signature === "0x") {
+            if (!operation.userOp.signature || operation.userOp.signature === '0x') {
                 operation.userOp.signature = await auth.signOp(operation, chain, (0, utils_1.isGroupOperation)(operation));
             }
         }
@@ -548,7 +575,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 const storedOps = await (0, OperationApis_1.getOps)([operation.opId], chainId);
                 let collectedSigCount;
                 if ((0, utils_1.isSignatureMissing)(await auth.getUserId(), storedOps[0]?.signatures)) {
-                    collectedSigCount = storedOps[0]?.signatures?.length ? storedOps[0]?.signatures?.length + 1 : 1;
+                    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));
                     }
@@ -557,11 +586,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                     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 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');
                 }
             }
             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 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');
             }
         }
         if ((0, utils_1.isGroupOperation)(operation)) {
@@ -569,9 +598,9 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 opId: operation.opId,
                 chainId,
                 scheduledBy: await auth.getAddress(),
-                entryPointAddress: await chain.getAddress("entryPointAddress"),
+                entryPointAddress: await chain.getAddress('entryPointAddress'),
                 signature: operation.userOp.signature,
-                groupInfo: this.userInfo?.get(operation.groupId)?.groupInfo
+                groupInfo: this.userInfo?.get(operation.groupId)?.groupInfo,
             });
         }
         else {
@@ -579,13 +608,13 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
                 opId: operation.opId,
                 chainId,
                 scheduledBy: await auth.getAddress(),
-                entryPointAddress: await chain.getAddress("entryPointAddress"),
+                entryPointAddress: await chain.getAddress('entryPointAddress'),
                 signature: operation.userOp.signature,
-                userOp: operation.userOp
+                userOp: operation.userOp,
             });
         }
         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 errors_1.InternalFailureError(errors_1.ErrorCode.ServerFailure, 'Operation id is required', operation, 'Make sure you are scheduling a valid operation', 'https://docs.fun.xyz/');
         }
         return operation.opId;
     }
@@ -610,7 +639,11 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
      * @returns {Promise<Operation>} The prepared rejection operation.
      */
     async createRejectOperation(auth, groupId, operation, rejectionMessage, txOptions = globalThis.globalEnvOption) {
-        const rejectOperation = await this.transfer(auth, groupId, { to: await this.getAddress(), amount: 0, token: "eth" }, { ...txOptions, skipDBAction: true, nonce: BigInt(operation.userOp.nonce) });
+        const rejectOperation = await this.transfer(auth, groupId, { to: await this.getAddress(), amount: 0, token: 'eth' }, {
+            ...txOptions,
+            skipDBAction: true,
+            nonce: BigInt(operation.userOp.nonce),
+        });
         if (rejectionMessage)
             rejectOperation.message = rejectionMessage;
         rejectOperation.relatedOpIds = [operation.opId];
@@ -633,7 +666,7 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
         const res = await chain.estimateOpGas(operation.userOp);
         operation.userOp = {
             ...operation.userOp,
-            ...res
+            ...res,
         };
         const { maxFeePerGas, maxPriorityFeePerGas } = await chain.getFeeData();
         operation.userOp.maxFeePerGas = maxFeePerGas;
@@ -642,15 +675,15 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
     }
     async getThisInitCode(chain) {
         const owners = Array.from(this.userInfo.keys());
-        const entryPointAddress = await chain.getAddress("entryPointAddress");
-        const factoryAddress = await chain.getAddress("factoryAddress");
-        const rbac = await chain.getAddress("rbacAddress");
-        const userAuth = await chain.getAddress("userAuthAddress");
+        const entryPointAddress = await chain.getAddress('entryPointAddress');
+        const factoryAddress = await chain.getAddress('factoryAddress');
+        const rbac = await chain.getAddress('rbacAddress');
+        const userAuth = await chain.getAddress('userAuthAddress');
         const loginData = {
-            salt: this.walletUniqueId
+            salt: this.walletUniqueId,
         };
         const rbacInitData = (0, data_1.toBytes32Arr)(owners);
-        let userAuthInitData = "0x";
+        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);
@@ -659,28 +692,28 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             entryPointAddress,
             factoryAddress,
             implementationAddress: constants_1.AddressZero,
-            loginData: loginData,
+            loginData,
             verificationAddresses: [rbac, userAuth],
-            verificationData: [rbacInitData, userAuthInitData]
+            verificationData: [rbacInitData, userAuthInitData],
         };
         return this.getInitCode(initCodeParams);
     }
     getInitCode(input) {
         const encodedVerificationInitdata = (0, viem_1.encodeAbiParameters)([
             {
-                type: "address[]",
-                name: "verificationAddresses"
+                type: 'address[]',
+                name: 'verificationAddresses',
             },
             {
-                type: "bytes[]",
-                name: "verificationData"
-            }
+                type: 'bytes[]',
+                name: 'verificationData',
+            },
         ], [input.verificationAddresses, input.verificationData]);
-        const initializerCallData = common_1.WALLET_CONTRACT_INTERFACE.encodeData("initialize", [
-            input.entryPointAddress,
-            encodedVerificationInitdata
+        const initializerCallData = common_1.WALLET_CONTRACT_INTERFACE.encodeData('initialize', [input.entryPointAddress, encodedVerificationInitdata]);
+        const data = constants_1.FACTORY_CONTRACT_INTERFACE.encodeData('createAccount', [
+            initializerCallData,
+            (0, data_1.encodeLoginData)(input.loginData),
         ]);
-        const data = constants_1.FACTORY_CONTRACT_INTERFACE.encodeData("createAccount", [initializerCallData, (0, data_1.encodeLoginData)(input.loginData)]);
         return (0, viem_1.concat)([input.factoryAddress, data]);
     }
     /**
@@ -694,18 +727,21 @@ class FunWallet extends FirstClassActions_1.FirstClassActions {
             params.value = 0n;
         }
         if (options.fee) {
-            if (!options.fee.token && options.gasSponsor && options.gasSponsor.token) {
+            if (!options.fee.token &&
+                options.gasSponsor &&
+                options.gasSponsor.token) {
                 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 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');
             }
             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 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');
             }
-            const token = new data_1.Token(options.fee.token);
+            const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+            const token = new data_1.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 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');
             }
             if (token.isNative) {
                 options.fee.token = constants_1.AddressZero;
@@ -718,24 +754,32 @@ 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 = common_1.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");
-            }
-            const feedata = [options.fee.token, options.fee.recipient, options.fee.amount];
-            return common_1.WALLET_CONTRACT_INTERFACE.encodeData("execFromEntryPointWithFee", [params.to, params.value, params.data, feedata]);
+                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');
+            }
+            const feedata = [
+                options.fee.token,
+                options.fee.recipient,
+                options.fee.amount,
+            ];
+            return common_1.WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPointWithFee', [
+                params.to,
+                params.value,
+                params.data,
+                feedata,
+            ]);
         }
         else {
-            return common_1.WALLET_CONTRACT_INTERFACE.encodeData("execFromEntryPoint", [params.to, params.value, params.data]);
+            return common_1.WALLET_CONTRACT_INTERFACE.encodeData('execFromEntryPoint', [
+                params.to,
+                params.value,
+                params.data,
+            ]);
         }
     }
 }