@funkit/core 2.3.9 → 2.3.11

package/dist/index.js

@@ -11767,7 +11767,12 @@ var getPaymasterType = (txOptions) => {
 };
 
 // src/utils/UserOpUtils.ts
-import { encodeAbiParameters as encodeAbiParameters2, keccak256 as keccak2562, toBytes as toBytes2, toHex as toHex2 } from "viem";
+import {
+  encodeAbiParameters as encodeAbiParameters2,
+  keccak256 as keccak2562,
+  toBytes as toBytes2,
+  toHex as toHex2
+} from "viem";
 var calcPreVerificationGas = (userOp) => {
   const ov = DefaultGasOverheads;
   const p = Object.assign(
@@ -12023,7 +12028,7 @@ var Chain = class _Chain {
       this.rpcUrl = chainInput.rpcUrl;
     } else if (chainInput.chainIdentifier instanceof _Chain) {
       return chainInput.chainIdentifier;
-    } else if (typeof chainInput.chainIdentifier === "number" || Number(chainInput.chainIdentifier)) {
+    } else if (chainInput.chainIdentifier !== void 0 && (typeof chainInput.chainIdentifier === "number" || Number(chainInput.chainIdentifier))) {
       this.id = chainInput.chainIdentifier.toString();
     } else {
       this.name = chainInput.chainIdentifier;
@@ -12103,15 +12108,15 @@ var Chain = class _Chain {
   }
   async getChainId(options) {
     await this.init(options);
-    return this.id;
+    return this.id ?? "";
   }
   async getChainName(options) {
     await this.init(options);
-    return this.name;
+    return this.name ?? "";
   }
   async getRpcUrl(options) {
     await this.init(options);
-    return this.rpcUrl;
+    return this.rpcUrl ?? "";
   }
   async getAddress(name, options) {
     await this.init(options);
@@ -12130,7 +12135,7 @@ var Chain = class _Chain {
   }
   async getCurrency(options) {
     await this.init(options);
-    return this.currency;
+    return this.currency ?? "";
   }
   async getClient(options) {
     await this.init(options);
@@ -12141,7 +12146,7 @@ var Chain = class _Chain {
     let result;
     try {
       result = await getUserOpGasPrice({
-        chainId: this.id,
+        chainId: this.id ?? "",
         apiKey: globalThis.globalEnvOption.apiKey,
         logger: options?.logger,
         signal: options?.signal
@@ -12177,7 +12182,7 @@ var Chain = class _Chain {
     }
     let { preVerificationGas, callGasLimit, verificationGasLimit } = await estimateOp({
       input: {
-        chainId: this.id,
+        chainId: this.id ?? "",
         entryPointAddress: this.addresses.entryPointAddress,
         userOp: estimationUserOp
       },
@@ -12572,11 +12577,11 @@ function encodeWalletSignature(data) {
 function encodeUserAuthInitData(groupUsers) {
   const groupIds = groupUsers.map((user) => user.userId);
   const groupInfos = groupUsers.map((user) => {
-    const paddedMemberIds = user.groupInfo.memberIds.map(
+    const paddedMemberIds = user.groupInfo?.memberIds.map(
       (memberId) => pad3(memberId, { size: 32 })
-    );
+    ) ?? [];
     const sortedMemberIds = paddedMemberIds.sort((a, b) => a > b ? -1 : 1);
-    return [sortedMemberIds, user.groupInfo.threshold];
+    return [sortedMemberIds, user.groupInfo?.threshold ?? 0];
   });
   return defaultAbiCoder.encode(
     ["bytes32[]", "tuple(bytes32[],uint256)[]"],
@@ -13240,7 +13245,7 @@ var Auth = class {
   async getWalletUniqueId(index = 0, skipDBActions = false, options) {
     await this.init();
     const authUniqueId = await getAuthUniqueId(
-      this.authId,
+      this.authId ?? "",
       await this.getAddress(),
       skipDBActions,
       options
@@ -13272,6 +13277,16 @@ var Auth = class {
         "https://docs.fun.xyz"
       );
     }
+    if (!this.signer) {
+      throw new InvalidParameterError6(
+        ErrorCode6.MissingParameter,
+        "signer is missing or incorrect",
+        "signer is missing or incorrect",
+        { options, signer: this.signer },
+        "Provide proper chain information from options field",
+        "https://docs.fun.xyz"
+      );
+    }
     const client = await chain.getClient(options);
     const txClient = this.client ?? createWalletClient2({
       account: this.signer,
@@ -13301,6 +13316,16 @@ var Auth = class {
     } else {
       tx = { to, value: BigInt(value), data };
     }
+    if (!this.account) {
+      throw new InvalidParameterError6(
+        ErrorCode6.MissingParameter,
+        "account is missing or incorrect",
+        "account is missing or incorrect",
+        { options, account: this.account },
+        "Provide proper chain information from options field",
+        "https://docs.fun.xyz"
+      );
+    }
     const hash = await txClient.sendTransaction({
       ...tx,
       account: this.signer ?? this.account,
@@ -13353,7 +13378,7 @@ var Auth = class {
   async getUserIds(wallet, chainId, options) {
     await this.init();
     return await getUserWalletIdentities({
-      authId: this.authId,
+      authId: this.authId ?? "",
       chainId,
       walletAddr: wallet,
       apiKey: globalThis.globalEnvOption.apiKey,
@@ -15683,7 +15708,7 @@ var FunWallet = class extends FirstClassActions {
           { chainIdentifier: chainIdentifier ?? 137 },
           txOptions
         ),
-        this.walletUniqueId,
+        this.walletUniqueId ?? "0x",
         txOptions
       );
     }
@@ -15820,7 +15845,7 @@ var FunWallet = class extends FirstClassActions {
       chainId = chainIdInput;
     }
     const tokens = await this.getTokens(chainId, onlyVerifiedTokens, options);
-    const lidoWithdrawals = checkStatus ? await this.getLidoWithdrawals(options) : {};
+    const lidoWithdrawals = checkStatus ? await this.getLidoWithdrawals(options) : [[], []];
     return { ...lidoWithdrawals, ...tokens };
   }
   /**
@@ -16183,11 +16208,11 @@ var FunWallet = class extends FirstClassActions {
     );
     if (isGroupOperation(finalOperation) && txOptions.skipDBAction !== true) {
       await signOp({
-        opId: finalOperation.opId,
+        opId: finalOperation.opId ?? "0x",
         chainId: await chain.getChainId(txOptions),
         signature: finalOperation.userOp.signature,
         signedBy: await auth.getAddress(),
-        threshold: this.userInfo?.get(finalOperation.groupId)?.groupInfo?.threshold,
+        threshold: this.userInfo?.get(finalOperation.groupId ?? "0x")?.groupInfo?.threshold,
         apiKey: globalThis.globalEnvOption.apiKey,
         logger: txOptions?.logger,
         signal: txOptions?.signal
@@ -16213,18 +16238,20 @@ var FunWallet = class extends FirstClassActions {
       txOptions
     );
     const chainId = await chain.getChainId(txOptions);
+    const finalOperationGroupId = finalOperation.groupId ?? "0x";
+    const finalOperationOpId = finalOperation.opId ?? "0x";
     if (finalTxOptions.skipDBAction !== true) {
       if (isGroupOperation(finalOperation)) {
         const groups = await getGroups({
-          groupIds: [finalOperation.groupId],
+          groupIds: [finalOperationGroupId],
           chainId,
           apiKey: globalThis.globalEnvOption.apiKey,
           logger: txOptions?.logger,
           signal: txOptions?.signal
         });
         if (groups && groups.length > 0) {
-          this.userInfo?.set(finalOperation.groupId, {
-            userId: finalOperation.groupId,
+          this.userInfo?.set(finalOperationGroupId, {
+            userId: finalOperationGroupId,
             groupInfo: {
               threshold: groups[0].threshold,
               memberIds: groups[0].memberIds
@@ -16233,7 +16260,7 @@ var FunWallet = class extends FirstClassActions {
         }
       }
     }
-    const threshold = this.userInfo?.get(finalOperation.groupId)?.groupInfo?.threshold ?? 1;
+    const threshold = this.userInfo?.get(finalOperationGroupId)?.groupInfo?.threshold ?? 1;
     if (threshold <= 1) {
       if (!finalOperation.userOp.signature || finalOperation.userOp.signature === "0x") {
         finalOperation.userOp.signature = await auth.signOp(
@@ -16246,7 +16273,7 @@ var FunWallet = class extends FirstClassActions {
     } else {
       if (finalTxOptions.skipDBAction !== true) {
         const storedOps = await getOps({
-          opIds: [finalOperation.opId],
+          opIds: [finalOperationOpId],
           chainId,
           apiKey: globalThis.globalEnvOption.apiKey,
           logger: txOptions?.logger,
@@ -16291,7 +16318,7 @@ var FunWallet = class extends FirstClassActions {
     if (isGroupOperation(finalOperation)) {
       receipt = await executeOp({
         input: {
-          opId: finalOperation.opId,
+          opId: finalOperationOpId,
           chainId,
           executedBy: await auth.getAddress(),
           entryPointAddress: await chain.getAddress(
@@ -16299,7 +16326,7 @@ var FunWallet = class extends FirstClassActions {
             txOptions
           ),
           signature: finalOperation.userOp.signature,
-          groupInfo: this.userInfo?.get(finalOperation.groupId)?.groupInfo
+          groupInfo: this.userInfo?.get(finalOperationGroupId)?.groupInfo
         },
         apiKey: globalThis.globalEnvOption.apiKey,
         logger: txOptions.logger,
@@ -16308,7 +16335,7 @@ var FunWallet = class extends FirstClassActions {
     } else {
       receipt = await executeOp({
         input: {
-          opId: finalOperation.opId,
+          opId: finalOperationOpId,
           chainId,
           executedBy: await auth.getAddress(),
           entryPointAddress: await chain.getAddress(
@@ -16324,7 +16351,7 @@ var FunWallet = class extends FirstClassActions {
       });
     }
     receipt = await getFullReceipt({
-      opId: finalOperation.opId,
+      opId: finalOperationOpId,
       chainId,
       userOpHash: receipt.userOpHash,
       apiKey: globalThis.globalEnvOption.apiKey,
@@ -16336,7 +16363,7 @@ var FunWallet = class extends FirstClassActions {
         authId: await auth.getAddress(),
         chainId,
         walletAddr: await this.getAddress(finalTxOptions),
-        userIds: Array.from(this.userInfo.keys()),
+        userIds: this.userInfo ? Array.from(this.userInfo.keys()) : [],
         walletUniqueId: this.walletUniqueId,
         apiKey: globalThis.globalEnvOption.apiKey,
         logger: finalTxOptions.logger,
@@ -16383,18 +16410,20 @@ var FunWallet = class extends FirstClassActions {
       txOptions
     );
     const chainId = await chain.getChainId(txOptions);
+    const finalOperationGroupId = finalOperation.groupId ?? "0x";
+    const finalOperationOpId = finalOperation.opId ?? "0x";
     if (finalTxOptions.skipDBAction !== true) {
       if (isGroupOperation(finalOperation)) {
         const groups = await getGroups({
-          groupIds: [finalOperation.groupId],
+          groupIds: [finalOperationGroupId],
           chainId,
           apiKey: globalThis.globalEnvOption.apiKey,
           logger: txOptions.logger,
           signal: txOptions.signal
         });
         if (groups && groups.length > 0) {
-          this.userInfo?.set(finalOperation.groupId, {
-            userId: finalOperation.groupId,
+          this.userInfo?.set(finalOperationGroupId, {
+            userId: finalOperationGroupId,
             groupInfo: {
               threshold: groups[0].threshold,
               memberIds: groups[0].memberIds
@@ -16403,7 +16432,7 @@ var FunWallet = class extends FirstClassActions {
         }
       }
     }
-    const threshold = this.userInfo?.get(finalOperation.groupId)?.groupInfo?.threshold ?? 1;
+    const threshold = this.userInfo?.get(finalOperationGroupId)?.groupInfo?.threshold ?? 1;
     if (threshold <= 1) {
       if (!finalOperation.userOp.signature || finalOperation.userOp.signature === "0x") {
         finalOperation.userOp.signature = await auth.signOp(
@@ -16416,7 +16445,7 @@ var FunWallet = class extends FirstClassActions {
     } else {
       if (finalTxOptions.skipDBAction !== true) {
         const storedOps = await getOps({
-          opIds: [finalOperation.opId],
+          opIds: [finalOperationOpId],
           chainId,
           apiKey: globalThis.globalEnvOption.apiKey,
           logger: txOptions.logger,
@@ -16460,7 +16489,7 @@ var FunWallet = class extends FirstClassActions {
     if (isGroupOperation(finalOperation)) {
       await scheduleOp({
         input: {
-          opId: finalOperation.opId,
+          opId: finalOperationOpId,
           chainId,
           scheduledBy: await auth.getAddress(),
           entryPointAddress: await chain.getAddress(
@@ -16468,7 +16497,7 @@ var FunWallet = class extends FirstClassActions {
             txOptions
           ),
           signature: finalOperation.userOp.signature,
-          groupInfo: this.userInfo?.get(finalOperation.groupId)?.groupInfo
+          groupInfo: this.userInfo?.get(finalOperationGroupId)?.groupInfo
         },
         apiKey: globalThis.globalEnvOption.apiKey,
         logger: txOptions.logger,
@@ -16477,7 +16506,7 @@ var FunWallet = class extends FirstClassActions {
     } else {
       await scheduleOp({
         input: {
-          opId: finalOperation.opId,
+          opId: finalOperationOpId,
           chainId,
           scheduledBy: await auth.getAddress(),
           entryPointAddress: await chain.getAddress(
@@ -16545,7 +16574,7 @@ var FunWallet = class extends FirstClassActions {
       }
     );
     if (rejectionMessage) rejectOperation.message = rejectionMessage;
-    rejectOperation.relatedOpIds = [operation.opId];
+    rejectOperation.relatedOpIds = [operation.opId ?? "0x"];
     rejectOperation.opType = OperationType.REJECTION;
     rejectOperation.opId = await createOp({
       op: rejectOperation,
@@ -16585,7 +16614,7 @@ var FunWallet = class extends FirstClassActions {
     return operation;
   }
   async getThisInitCode(chain, options) {
-    const owners = Array.from(this.userInfo.keys());
+    const owners = this.userInfo ? Array.from(this.userInfo.keys()) : [];
     const entryPointAddress = await chain.getAddress(
       "entryPointAddress",
       options
@@ -16598,9 +16627,9 @@ var FunWallet = class extends FirstClassActions {
     };
     const rbacInitData = toBytes32Arr(owners);
     let userAuthInitData = "0x";
-    const groupUsers = Array.from(this.userInfo.values()).filter(
+    const groupUsers = this.userInfo ? Array.from(this.userInfo.values()).filter(
       (user) => user.groupInfo !== null && user.groupInfo !== void 0
-    );
+    ) : [];
     if (groupUsers.length > 0) {
       userAuthInitData = encodeUserAuthInitData(groupUsers);
     }