@funkit/core 2.3.3 → 2.3.5

package/dist/index.js

@@ -11505,7 +11505,9 @@ import {
 } from "@funkit/utils";
 
 // src/utils/ApiUtils.ts
-import { retry } from "@lifeomic/attempt";
+import {
+  retry
+} from "@lifeomic/attempt";
 import {
   AccessDeniedError,
   ErrorCode,
@@ -11650,7 +11652,7 @@ var sendRequest = async (uri, method, apiKey, body, retryOptions) => {
     );
   }
 };
-async function sendGetRequest(uri, endpoint, apiKey = globalThis.globalEnvOption?.apiKey, retryOptions = {}) {
+async function sendGetRequest(uri, endpoint, apiKey = globalThis.globalEnvOption.apiKey, retryOptions = {}) {
   return await sendRequest(
     `${uri}/${endpoint}`,
     "GET",
@@ -11659,7 +11661,7 @@ async function sendGetRequest(uri, endpoint, apiKey = globalThis.globalEnvOption
     retryOptions
   );
 }
-async function sendPostRequest(uri, endpoint, body, apiKey = globalThis.globalEnvOption?.apiKey, retryOptions = {}) {
+async function sendPostRequest(uri, endpoint, body, apiKey = globalThis.globalEnvOption.apiKey, retryOptions = {}) {
   return await sendRequest(
     `${uri}/${endpoint}`,
     "POST",
@@ -11778,7 +11780,7 @@ var getWalletPermitNonce = async (walletAddr, chain, nonceKey = 0) => {
       chain
     );
   } catch (_err) {
-    return 0;
+    return 0n;
   }
 };
 var getPermitHash = (token, to, amount, nonce, walletAddr, chainId) => {
@@ -11896,7 +11898,6 @@ import {
   toBytes as toBytes2,
   toHex as toHex2
 } from "viem";
-import { safeParseJson } from "@funkit/utils";
 var calcPreVerificationGas = (userOp) => {
   const ov = DefaultGasOverheads;
   const p = Object.assign(
@@ -11924,12 +11925,11 @@ function encode(typevalues, forSignature) {
 }
 function packUserOp(op, forSignature = true) {
   if (forSignature) {
-    let encoded = encodeAbiParameters2(
+    const encoded = encodeAbiParameters2(
       [userOpTypeSig],
       [{ ...op, signature: "0x" }]
     );
-    encoded = "0x" + encoded.slice(66, encoded.length - 64);
-    return encoded;
+    return `0x${encoded.slice(66, encoded.length - 64)}`;
   }
   const typevalues = UserOpType.components.map((c) => ({
     type: c.type,
@@ -11937,15 +11937,6 @@ function packUserOp(op, forSignature = true) {
   }));
   return encode(typevalues, forSignature);
 }
-var getPromiseFromOp = async (op) => {
-  const out = {};
-  await Promise.all(
-    Object.keys(op).map(async (key) => {
-      out[key] = await op[key];
-    })
-  );
-  return out;
-};
 async function gasCalculation(txid, chain) {
   if (!txid || txid === "0x")
     return { gasUsed: "-1", opFee: "-1", opFeeUSD: "-1" };
@@ -11983,9 +11974,6 @@ var stringify = (object) => {
     // return everything else unchanged
   );
 };
-var objectify = (op) => {
-  return safeParseJson(stringify(op));
-};
 var DefaultGasOverheads = {
   fixed: 28e3,
   perUserOp: 18300,
@@ -12863,6 +12851,7 @@ var Token = class _Token {
 
 // src/viem/ContractInterface.ts
 var ContractInterface = class {
+  // biome-ignore lint/suspicious/noExplicitAny: Strict typing here clashes when importing from JSON
   constructor(abi) {
     this.abi = abi;
   }
@@ -12941,11 +12930,11 @@ var parseClient = async (chainOrClient) => {
   if (chainOrClient instanceof Chain) {
     const chain = chainOrClient;
     return await chain.getClient();
-  } else if (typeof chainOrClient.readContract === "function") {
+  }
+  if (typeof chainOrClient.readContract === "function") {
     return chainOrClient;
-  } else {
-    throw new Error("No client or chain provided");
   }
+  throw new Error("No client or chain provided");
 };
 var getItemFromAbi = (abi, name, type) => {
   const item = abi.find((item2) => item2.name === name && item2.type === type);
@@ -13123,7 +13112,7 @@ var convertProviderToClient = ({
   viemChain
 }) => {
   const chain = viemChain ? viemChain : mainnet;
-  if (provider.request) {
+  if (typeof provider.request === "function") {
     return createWalletClient({
       chain,
       transport: custom(provider)
@@ -13157,7 +13146,8 @@ var convertSignerToClient = ({
       async request({ method, params }) {
         if (method === "eth_requestAccounts") {
           return [await signer.getAddress()];
-        } else if (method === "personal_sign") {
+        }
+        if (method === "personal_sign") {
           return await signer.signMessage(toBytes4(params[0]));
         }
       }
@@ -13278,13 +13268,12 @@ var Auth = class {
     }
     if (isGroupOp) {
       return signature;
-    } else {
-      const walletSignature = {
-        userId: await this.getUserId(),
-        signature
-      };
-      return encodeWalletSignature(walletSignature);
     }
+    const walletSignature = {
+      userId: await this.getUserId(),
+      signature
+    };
+    return encodeWalletSignature(walletSignature);
   }
   /**
    * Signs an operation using the stored signer and returns the signature.
@@ -13406,22 +13395,21 @@ var Auth = class {
         hash,
         timeout: 3e4
       });
-    } else {
-      const maxRetry = 10;
-      let retryCount = 0;
-      while (retryCount < maxRetry) {
-        try {
-          return await client.waitForTransactionReceipt({
-            hash,
-            timeout: 3e4
-          });
-        } catch (_err) {
-          retryCount++;
-          await new Promise((r) => setTimeout(r, 5e3));
-        }
+    }
+    const maxRetry = 10;
+    let retryCount = 0;
+    while (retryCount < maxRetry) {
+      try {
+        return await client.waitForTransactionReceipt({
+          hash,
+          timeout: 3e4
+        });
+      } catch (_err) {
+        retryCount++;
+        await new Promise((r) => setTimeout(r, 5e3));
       }
-      throw Error("Failed to get transaction receipt after several retries");
     }
+    throw Error("Failed to get transaction receipt after several retries");
   }
   /**
    * Sends an array of transactions and returns an array of corresponding transaction receipts.
@@ -13591,7 +13579,8 @@ var decodeCalldata = (callData) => {
   );
   if (callData.includes(execFromEntryPointFeeSelector)) {
     return _decodeExecWithFee(callData);
-  } else if (callData.includes(execFromEntryPointSelector)) {
+  }
+  if (callData.includes(execFromEntryPointSelector)) {
     return _decodeExec(callData);
   }
   throw new Error(
@@ -13599,7 +13588,7 @@ var decodeCalldata = (callData) => {
   );
 };
 var _decodeExecWithFee = (callData) => {
-  const walletcalldata = "0x" + callData.slice(SELECTOR_LENGTH);
+  const walletcalldata = `0x${callData.slice(SELECTOR_LENGTH)}`;
   const [target, value, calldata] = decodeAbiParameters2(
     [{ type: "address" }, { type: "uint256" }, { type: "bytes" }],
     walletcalldata
@@ -13611,7 +13600,7 @@ var _decodeExecWithFee = (callData) => {
   };
 };
 var _decodeExec = (callData) => {
-  const walletcalldata = "0x" + callData.slice(SELECTOR_LENGTH);
+  const walletcalldata = `0x${callData.slice(SELECTOR_LENGTH)}`;
   const [target, value, calldata] = decodeAbiParameters2(
     [{ type: "address" }, { type: "uint256" }, { type: "bytes" }],
     walletcalldata
@@ -13824,9 +13813,8 @@ var removeOwnerTxParams = async (params, txOptions = globalThis.globalEnvOption)
 var convertTimestampToBigInt = (timestamp) => {
   if (Math.abs(Date.now() - timestamp) < Math.abs(Date.now() - timestamp * 1e3)) {
     return BigInt(Math.floor(timestamp)) / 1000n;
-  } else {
-    return BigInt(Math.floor(timestamp));
   }
+  return BigInt(Math.floor(timestamp));
 };
 
 // src/actions/BatchActions.ts
@@ -13891,7 +13879,7 @@ var getWithdrawQueueInterface = () => {
   return new ContractInterface(WITHDRAW_QUEUE_ABI);
 };
 var isRequestUnstakeParams = (input) => {
-  return input.amounts !== void 0;
+  return "amounts" in input ? input.amounts !== void 0 : false;
 };
 var isFinishUnstakeParams = (input) => {
   return input.recipient !== void 0;
@@ -14017,18 +14005,8 @@ var getReadyToWithdrawRequests = async (params, txOptions) => {
   const withdrawalQueueAddr = getWithdrawalQueue(
     await chain.getChainId()
   );
-  const withdrawalRequests = await getWithdrawQueueInterface().readFromChain(
-    withdrawalQueueAddr,
-    "getWithdrawalRequests",
-    [params.walletAddress],
-    chain
-  );
-  const withdrawalStatusTx = await getWithdrawQueueInterface().readFromChain(
-    withdrawalQueueAddr,
-    "getWithdrawalStatus",
-    [withdrawalRequests],
-    chain
-  );
+  const withdrawalRequests = await getWithdrawQueueInterface().readFromChain(withdrawalQueueAddr, "getWithdrawalRequests", [params.walletAddress], chain);
+  const withdrawalStatusTx = await getWithdrawQueueInterface().readFromChain(withdrawalQueueAddr, "getWithdrawalStatus", [withdrawalRequests], chain);
   const readyToWithdraw = [];
   for (let i = 0; i < withdrawalStatusTx.length; i++) {
     if (withdrawalStatusTx[i].isFinalized) {
@@ -14358,7 +14336,7 @@ var Sponsor = class {
   }
   async batchTransaction(transactions) {
     const batchActionsData = transactions.map(
-      (transaction) => transaction.data ? transaction.data : "0x"
+      (transaction) => transaction.data ?? "0x"
     );
     const value = transactions.reduce(
       (acc, transaction) => transaction.value ? acc + BigInt(transaction.value) : acc,
@@ -14457,52 +14435,52 @@ var CheckoutSponsor = class extends Sponsor {
     );
   }
   async lockDeposit() {
-    throw new Error(`lockDeposit is not supported on CheckoutSponsor`);
+    throw new Error("lockDeposit is not supported on CheckoutSponsor");
   }
   async unlockDepositAfter(_blocksToWait) {
-    throw new Error(`unlockDepositAfter is not supported on CheckoutSponsor`);
+    throw new Error("unlockDepositAfter is not supported on CheckoutSponsor");
   }
   /** True if the specified sponsor is in blacklist mode. **/
   async getListMode(_sponsor, _options = globalThis.globalEnvOption) {
-    throw new Error(`getListMode is not supported on CheckoutSponsor`);
+    throw new Error("getListMode is not supported on CheckoutSponsor");
   }
   async setToBlacklistMode() {
-    throw new Error(`setToBlacklistMode is not supported on Checkout Sponsor`);
+    throw new Error("setToBlacklistMode is not supported on Checkout Sponsor");
   }
   async setToWhitelistMode() {
-    throw new Error(`setToWhitelistMode is not supported on Checkout Sponsor`);
+    throw new Error("setToWhitelistMode is not supported on Checkout Sponsor");
   }
   async batchTransaction(_transactions) {
-    throw new Error(`batchTransaction is not supported on Checkout Sponsor`);
+    throw new Error("batchTransaction is not supported on Checkout Sponsor");
   }
   async addSpenderToWhitelist(_spender) {
     throw new Error(
-      `addSpenderToWhitelist is not supported on Checkout Sponsor`
+      "addSpenderToWhitelist is not supported on Checkout Sponsor"
     );
   }
   async removeSpenderFromWhitelist(_spender) {
     throw new Error(
-      `removeSpenderFromWhitelist is not supported on Checkout Sponsor`
+      "removeSpenderFromWhitelist is not supported on Checkout Sponsor"
     );
   }
   async batchWhitelistSpenders(_spenders, _modes) {
     throw new Error(
-      `batchWhitelistSpenders is not supported on Checkout Sponsor`
+      "batchWhitelistSpenders is not supported on Checkout Sponsor"
     );
   }
   async addSpenderToBlacklist(_spender) {
     throw new Error(
-      `addSpenderToBlacklist is not supported on Checkout Sponsor`
+      "addSpenderToBlacklist is not supported on Checkout Sponsor"
     );
   }
   async removeSpenderFromBlacklist(_spender) {
     throw new Error(
-      `removeSpenderFromBlacklist is not supported on Checkout Sponsor`
+      "removeSpenderFromBlacklist is not supported on Checkout Sponsor"
     );
   }
   async batchBlacklistSpenders(_spenders, _modes) {
     throw new Error(
-      `batchBlacklistSpenders is not supported on Checkout Sponsor`
+      "batchBlacklistSpenders is not supported on Checkout Sponsor"
     );
   }
 };
@@ -14622,10 +14600,6 @@ var GaslessSponsor = class extends Sponsor {
       chain
     );
   }
-  static async getPaymasterAddress(options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    return await chain.getAddress(this.name);
-  }
 };
 
 // src/sponsors/TokenSponsor.ts
@@ -14713,7 +14687,7 @@ var TokenSponsor = class extends Sponsor {
     const nonce = await getWalletPermitNonce(walletAddr, chain);
     const client = await chain.getClient();
     const chainId = await client.getChainId();
-    const hash = await getPermitHash(
+    const hash = getPermitHash(
       tokenAddress,
       paymasterAddress,
       decAmount,
@@ -15005,10 +14979,6 @@ var TokenSponsor = class extends Sponsor {
     }
     return this.batchTransaction(calldata);
   }
-  static async getPaymasterAddress(options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    return await chain.getAddress(this.name);
-  }
 };
 
 // src/wallet/FunWallet.ts
@@ -15069,32 +15039,40 @@ import {
 async function getOnChainGroupData(groupId, chain, walletAddr) {
   const userAuthContractAddr = await chain.getAddress("userAuthAddress");
   const groupKey = keccak2566(concat5([groupId, userAuthContractAddr]));
-  const storedGroupData = await WALLET_CONTRACT_INTERFACE.readFromChain(
-    walletAddr,
-    "getState",
-    [groupKey],
-    chain
-  );
+  let storedGroupData;
+  try {
+    storedGroupData = await WALLET_CONTRACT_INTERFACE.readFromChain(
+      walletAddr,
+      "getState",
+      [groupKey],
+      chain
+    );
+  } catch (err) {
+    if (err instanceof Error && err.message.match(/returned no data/)) {
+      storedGroupData = "0x";
+    } else {
+      throw err;
+    }
+  }
   if (storedGroupData === "0x") {
     return {
       memberIds: [],
       threshold: 0
     };
-  } else {
-    const [storedGroup] = decodeAbiParameters3(
-      [
-        {
-          type: "tuple",
-          components: [{ type: "bytes32[]" }, { type: "uint256" }]
-        }
-      ],
-      storedGroupData
-    );
-    return {
-      memberIds: storedGroup[0],
-      threshold: Number(storedGroup[1])
-    };
   }
+  const [storedGroup] = decodeAbiParameters3(
+    [
+      {
+        type: "tuple",
+        components: [{ type: "bytes32[]" }, { type: "uint256" }]
+      }
+    ],
+    storedGroupData
+  );
+  return {
+    memberIds: storedGroup[0],
+    threshold: Number(storedGroup[1])
+  };
 }
 
 // src/actions/FirstClassActions.ts
@@ -15681,9 +15659,8 @@ var FunWallet = class extends FirstClassActions {
     }
     if (nonce !== void 0 && nonce !== null) {
       return BigInt(nonce);
-    } else {
-      return BigInt(key << 64n);
     }
+    return BigInt(key << 64n);
   }
   /**
    * Retrieves a list of operations associated with the wallet.
@@ -16450,13 +16427,12 @@ var FunWallet = class extends FirstClassActions {
         params.data,
         feedata
       ]);
-    } else {
-      return WALLET_CONTRACT_INTERFACE.encodeData("execFromEntryPoint", [
-        params.to,
-        params.value,
-        params.data
-      ]);
     }
+    return WALLET_CONTRACT_INTERFACE.encodeData("execFromEntryPoint", [
+      params.to,
+      params.value,
+      params.data
+    ]);
   }
 };
 export {
@@ -16558,7 +16534,6 @@ export {
   getOpHash,
   getPaymasterType,
   getPermitHash,
-  getPromiseFromOp,
   getSelectorFromCall,
   getTargetFromCall,
   getTokenAddressBySymbolAndChainId,
@@ -16575,7 +16550,6 @@ export {
   isSignatureMissing,
   isTokenTransferParams,
   isWalletInitOp,
-  objectify,
   parseClient,
   parseOptions,
   randomBytes,