@funkit/core 2.3.6 → 2.3.8

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/actions/AccessControl.ts
 import { getAddress, pad as pad6 } from "viem";
-import { ErrorCode as ErrorCode8, InvalidParameterError as InvalidParameterError7 } from "@funkit/utils";
+import { ErrorCode as ErrorCode7, InvalidParameterError as InvalidParameterError7 } from "@funkit/utils";
 
 // src/auth/Auth.ts
 import {
@@ -19,7 +19,7 @@ import {
   getUserWalletsByAddr
 } from "@funkit/api-base";
 import {
-  ErrorCode as ErrorCode7,
+  ErrorCode as ErrorCode6,
   InvalidParameterError as InvalidParameterError6,
   ResourceNotFoundError as ResourceNotFoundError4
 } from "@funkit/utils";
@@ -11498,23 +11498,19 @@ import {
 } from "@funkit/api-base";
 import { FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO } from "@funkit/chains";
 import {
-  ErrorCode as ErrorCode4,
-  InternalFailureError as InternalFailureError2,
+  ErrorCode as ErrorCode3,
+  InternalFailureError,
   InvalidParameterError as InvalidParameterError3,
   ResourceNotFoundError as ResourceNotFoundError3
 } from "@funkit/utils";
 
+// src/utils/index.ts
+import { toHex as toHex3 } from "viem";
+
 // src/utils/ApiUtils.ts
 import {
-  retry
-} from "@lifeomic/attempt";
-import {
-  AccessDeniedError,
-  ErrorCode,
-  InternalFailureError,
   InvalidParameterError,
   ResourceNotFoundError,
-  ThrottlingError,
   UserOpFailureError
 } from "@funkit/utils";
 var errorHandler = (err, context) => {
@@ -11536,155 +11532,17 @@ var DEFAULT_RETRY_OPTIONS = {
   beforeAttempt: null,
   calculateDelay: null
 };
-var sendRequest = async (uri, method, apiKey, body, retryOptions) => {
-  try {
-    const headers = {
-      "Content-Type": "application/json"
-    };
-    if (apiKey) {
-      headers["X-Api-Key"] = apiKey;
-    }
-    const finalRetryOptions = {
-      ...DEFAULT_RETRY_OPTIONS,
-      ...retryOptions || {}
-    };
-    return retry(async () => {
-      const response = await fetch(uri, {
-        method,
-        headers,
-        redirect: "follow",
-        body: method !== "GET" ? stringify(body) : void 0
-      });
-      const json = await response.json();
-      if (response.ok) {
-        return json;
-      }
-      if (response.status === 400) {
-        throw new InvalidParameterError(
-          ErrorCode.InvalidParameter,
-          `bad request ${JSON.stringify(json)}`,
-          `bad request ${JSON.stringify(json)}`,
-          { body },
-          "check the api call parameters. its mostly because some call parameters are wrong",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (response.status === 403) {
-        throw new AccessDeniedError(
-          ErrorCode.Unauthorized,
-          "Invalid API key or insufficient access.",
-          "Invalid API key or insufficient access.",
-          { apiKey },
-          "Check your api key at https://app.fun.xyz and check with fun team if you believe something is off",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (response.status === 404) {
-        throw new ResourceNotFoundError(
-          ErrorCode.ServerMissingData,
-          JSON.stringify(json),
-          JSON.stringify(json),
-          { body },
-          "check the api call parameters. its mostly because some call parameters are wrong",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (response.status === 429) {
-        throw new ThrottlingError(
-          ErrorCode.RequestLimitExceeded,
-          `too many requests ${JSON.stringify(json)}`,
-          `too many requests ${JSON.stringify(json)}`,
-          { body },
-          "you are making too many requests. please slow down. Reach out to fun team if you need more quota",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (response.status === 500) {
-        if (json.errorCode === ErrorCode.UserOpFailureError) {
-          throw new UserOpFailureError(
-            ErrorCode.UserOpFailureError,
-            JSON.stringify(json),
-            JSON.stringify(json),
-            { body },
-            "fix user op failure. Most of the time this is due to invalid parameters",
-            "https://docs.fun.xyz"
-          );
-        }
-        throw new InternalFailureError(
-          ErrorCode.ServerFailure,
-          `server failure ${JSON.stringify(json)}`,
-          json.errorMsg,
-          { body },
-          "retry later. if it still fails, please contact us.",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (response.status === 504) {
-        throw new InternalFailureError(
-          ErrorCode.ServerTimeout,
-          `server timeout failure ${JSON.stringify(json)}`,
-          json.errorMsg,
-          { body },
-          "retry later. if it still fails, please contact us.",
-          "https://docs.fun.xyz"
-        );
-      }
-      if (!response.ok) {
-        throw new InternalFailureError(
-          ErrorCode.UnknownServerError,
-          `unknown server failure ${JSON.stringify(json)}`,
-          json.errorMsg,
-          { body },
-          "retry later. if it still fails, please contact us.",
-          "https://docs.fun.xyz"
-        );
-      }
-      return {};
-    }, finalRetryOptions);
-  } catch (err) {
-    throw new InternalFailureError(
-      ErrorCode.ServerConnectionError,
-      `Cannot connect to Fun API Service ${err}`,
-      "",
-      { body },
-      "retry later. if it still fails, please contact us.",
-      "https://docs.fun.xyz"
-    );
-  }
-};
-async function sendGetRequest(uri, endpoint, apiKey = globalThis.globalEnvOption.apiKey, retryOptions = {}) {
-  return await sendRequest(
-    `${uri}/${endpoint}`,
-    "GET",
-    apiKey,
-    void 0,
-    retryOptions
-  );
-}
-async function sendPostRequest(uri, endpoint, body, apiKey = globalThis.globalEnvOption.apiKey, retryOptions = {}) {
-  return await sendRequest(
-    `${uri}/${endpoint}`,
-    "POST",
-    apiKey,
-    body,
-    retryOptions
-  );
-}
-async function sendDeleteRequest(uri, endpoint, apiKey = globalThis.globalEnvOption.apiKey) {
-  await sendRequest(`${uri}/${endpoint}`, "DELETE", apiKey);
-}
-async function sendPutRequest(uri, endpoint, body, apiKey = globalThis.globalEnvOption.apiKey) {
-  await sendRequest(`${uri}/${endpoint}`, "PUT", apiKey, body);
-}
 
 // src/utils/AuthUtils.ts
 import { v4 as uuidv4 } from "uuid";
 import { generatePrivateKey as generateRandomPrivateKey } from "viem/accounts";
 import { createUser, getUserUniqueId } from "@funkit/api-base";
-var getAuthUniqueId = async (authId, addr = "NO_ADDRESS", skipDBActions = false) => {
+var getAuthUniqueId = async (authId, addr = "NO_ADDRESS", skipDBActions = false, options) => {
   const authUniqueId = (skipDBActions ? addr : await getUserUniqueId({
     authId,
-    apiKey: globalThis.globalEnvOption.apiKey
+    apiKey: globalThis.globalEnvOption.apiKey,
+    logger: options?.logger,
+    signal: options?.signal
   })) || uuidv4();
   const words = authId.split("###");
   const method = words[0].startsWith("0x") ? "eoa" : words[0];
@@ -11693,7 +11551,9 @@ var getAuthUniqueId = async (authId, addr = "NO_ADDRESS", skipDBActions = false)
     addr,
     method,
     userUniqueId: authUniqueId,
-    apiKey: globalThis.globalEnvOption.apiKey
+    apiKey: globalThis.globalEnvOption.apiKey,
+    logger: options?.logger,
+    signal: options?.signal
   });
   return authUniqueId;
 };
@@ -11702,7 +11562,7 @@ var generatePrivateKey = () => {
 };
 
 // src/utils/ChainUtils.ts
-import { getAssetFromFaucet } from "@funkit/api-base";
+import { getAssetFromFaucet, sendGetRequest } from "@funkit/api-base";
 import {
   concat,
   decodeAbiParameters,
@@ -11714,7 +11574,7 @@ import {
   toBytes,
   toHex
 } from "viem";
-import { ErrorCode as ErrorCode2, InvalidParameterError as InvalidParameterError2 } from "@funkit/utils";
+import { ErrorCode, InvalidParameterError as InvalidParameterError2 } from "@funkit/utils";
 var isAddress = (address) => {
   try {
     const [decodedAddr] = decodeAbiParameters(
@@ -11727,8 +11587,11 @@ var isAddress = (address) => {
   }
 };
 var fundWallet = async (auth, wallet, value, txOptions = globalThis.globalEnvOption) => {
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const chainId = await chain.getChainId();
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const chainId = await chain.getChainId(txOptions);
   const to = await wallet.getAddress();
   let txData;
   if (gasSpecificChain[chainId]) {
@@ -11736,7 +11599,7 @@ var fundWallet = async (auth, wallet, value, txOptions = globalThis.globalEnvOpt
     let maxPriorityFee;
     let maxFee;
     try {
-      const { standard } = await getGasStation(gasStationUrl);
+      const { standard } = await getGasStation(gasStationUrl, txOptions);
       maxPriorityFee = standard.maxPriorityFee;
       maxFee = standard.maxFee;
     } catch (_err) {
@@ -11771,13 +11634,14 @@ var randomBytes = (length) => {
   }
   return toHex(bytes);
 };
-var getWalletPermitNonce = async (walletAddr, chain, nonceKey = 0) => {
+var getWalletPermitNonce = async (walletAddr, chain, nonceKey = 0, options) => {
   try {
     return await WALLET_CONTRACT_INTERFACE.readFromChain(
       walletAddr,
       "getNonce",
       [nonceKey],
-      chain
+      chain,
+      options
     );
   } catch (_err) {
     return 0n;
@@ -11821,15 +11685,19 @@ var getPermitHash = (token, to, amount, nonce, walletAddr, chainId) => {
   );
   return keccak256(concat([DOMAIN_SEPARATOR, PERMIT_HASH]));
 };
-var getGasStation = async (gasStationUrl) => {
-  return await sendRequest(gasStationUrl, "GET", "");
+var getGasStation = async (gasStationUrl, options) => {
+  return await sendGetRequest({
+    uri: gasStationUrl,
+    apiKey: globalThis.globalEnvOption.apiKey,
+    signal: options?.signal
+  });
 };
-var useFaucet = async (chainIdentifier, wallet) => {
-  const chain = await Chain.getChain({ chainIdentifier });
-  const chainName = await chain.getChainName();
+var useFaucet = async (chainIdentifier, wallet, txOptions) => {
+  const chain = await Chain.getChain({ chainIdentifier }, txOptions);
+  const chainName = await chain.getChainName(txOptions);
   if (chainName !== "goerli") {
     throw new InvalidParameterError2(
-      ErrorCode2.InvalidChainIdentifier,
+      ErrorCode.InvalidChainIdentifier,
       "Only Goerli is supported",
       "Only Goerli is supported",
       chainIdentifier,
@@ -11843,25 +11711,33 @@ var useFaucet = async (chainIdentifier, wallet) => {
       token: "eth",
       chain: chainName,
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     }),
     getAssetFromFaucet({
       token: "usdc",
       chain: chainName,
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     }),
     getAssetFromFaucet({
       token: "usdt",
       chain: chainName,
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     }),
     getAssetFromFaucet({
       token: "dai",
       chain: chainName,
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     })
   ]);
   return [ethRequest, usdcRequest, usdtRequest, daiRequest];
@@ -11891,13 +11767,7 @@ var getPaymasterType = (txOptions) => {
 };
 
 // src/utils/UserOpUtils.ts
-import {
-  encodeAbiParameters as encodeAbiParameters2,
-  formatUnits,
-  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(
@@ -11937,43 +11807,6 @@ function packUserOp(op, forSignature = true) {
   }));
   return encode(typevalues, forSignature);
 }
-async function gasCalculation(txid, chain) {
-  if (!txid || txid === "0x")
-    return { gasUsed: "-1", opFee: "-1", opFeeUSD: "-1" };
-  const provider = await chain.getClient();
-  const txReceipt = await provider.waitForTransactionReceipt({
-    hash: txid
-  });
-  const gasUsed = txReceipt.gasUsed;
-  const gasPrice = txReceipt.effectiveGasPrice;
-  const opFee = gasUsed * gasPrice;
-  const chainPrice = BigInt(
-    Math.ceil(await getPriceData(await chain.getCurrency()) * 100)
-  );
-  const opFeeUSD = opFee * BigInt(chainPrice);
-  return {
-    gasUsed: gasUsed.toString(),
-    opFee: formatUnits(opFee, 18).toString(),
-    opFeeUSD: formatUnits(opFeeUSD, 20).toString()
-  };
-}
-var PRICE_URL = "https://min-api.cryptocompare.com/data/price";
-async function getPriceData(chainCurrency) {
-  const data = await sendRequest(
-    `${PRICE_URL}?fsym=${chainCurrency}&tsyms=USD`,
-    "GET",
-    "",
-    {}
-  );
-  return data.USD;
-}
-var stringify = (object) => {
-  return JSON.stringify(
-    object,
-    (_, value) => typeof value === "bigint" ? toHex2(value) : value
-    // return everything else unchanged
-  );
-};
 var DefaultGasOverheads = {
   fixed: 28e3,
   perUserOp: 18300,
@@ -12063,20 +11896,21 @@ var userOpTypeSig = {
   name: "userOp",
   type: "tuple"
 };
-async function getOpHash(chain, userOp) {
-  const entryPointAddress = await chain.getAddress("entryPointAddress");
+async function getOpHash(chain, userOp, options) {
+  const entryPointAddress = await chain.getAddress("entryPointAddress", options);
   return await ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(
     entryPointAddress,
     "getUserOpHash",
     [userOp],
-    chain
+    chain,
+    options
   );
 }
 
 // src/utils/TokenUtils.ts
 import { getAssetErc20ByChainAndSymbol } from "@funkit/api-base";
-import { ErrorCode as ErrorCode3, ResourceNotFoundError as ResourceNotFoundError2 } from "@funkit/utils";
-async function getTokenAddressBySymbolAndChainId(inputSymbol, inputChainId) {
+import { ErrorCode as ErrorCode2, ResourceNotFoundError as ResourceNotFoundError2 } from "@funkit/utils";
+async function getTokenAddressBySymbolAndChainId(inputSymbol, inputChainId, options) {
   const normalizedSymbol = inputSymbol.toLowerCase();
   if (BASE_WRAP_TOKEN_ADDR?.[inputChainId]?.[normalizedSymbol]) {
     return BASE_WRAP_TOKEN_ADDR[inputChainId][normalizedSymbol];
@@ -12084,13 +11918,15 @@ async function getTokenAddressBySymbolAndChainId(inputSymbol, inputChainId) {
   const tokenInfo = await getAssetErc20ByChainAndSymbol({
     chainId: inputChainId,
     symbol: normalizedSymbol,
-    apiKey: globalThis.globalEnvOption.apiKey
+    apiKey: globalThis.globalEnvOption.apiKey,
+    logger: options?.logger,
+    signal: options?.signal
   });
   if (tokenInfo.address) {
     return tokenInfo.address;
   }
   throw new ResourceNotFoundError2(
-    ErrorCode3.TokenNotFound,
+    ErrorCode2.TokenNotFound,
     "token symbol does not exist on provided chain",
     "token symbol does not exist on provided chain",
     { symbol: inputSymbol, chainId: inputChainId },
@@ -12125,14 +11961,15 @@ var generateRandomNonce = () => {
   const randomKey = generateRandomNonceKey();
   return randomKey << 64n;
 };
-var getWalletAddress = async (chain, walletUniqueId) => {
+var getWalletAddress = async (chain, walletUniqueId, options) => {
   const data = encodeLoginData({ salt: walletUniqueId });
-  const factoryAddress = await chain.getAddress("factoryAddress");
+  const factoryAddress = await chain.getAddress("factoryAddress", options);
   return await FACTORY_CONTRACT_INTERFACE.readFromChain(
     factoryAddress,
     "getAddress",
     [data],
-    chain
+    chain,
+    options
   );
 };
 var isWalletInitOp = (userOp) => {
@@ -12158,6 +11995,15 @@ var isSignatureMissing = (userId, signatures) => {
   return sigMissing;
 };
 
+// src/utils/index.ts
+var stringify = (object) => {
+  return JSON.stringify(
+    object,
+    (_, value) => typeof value === "bigint" ? toHex3(value) : value
+    // return everything else unchanged
+  );
+};
+
 // src/data/Chain.ts
 var Chain = class _Chain {
   constructor(chainInput) {
@@ -12165,7 +12011,7 @@ var Chain = class _Chain {
     this.addresses = {};
     if (!chainInput.chainIdentifier && !chainInput.rpcUrl) {
       throw new InvalidParameterError3(
-        ErrorCode4.InvalidChainIdentifier,
+        ErrorCode3.InvalidChainIdentifier,
         "valid chain identifier or rpcUrl is required, could be chainId, chainName, Fun Chain object, or rpcUrl",
         "valid chain identifier or rpcUrl is required, could be chainId, chainName, Fun Chain object, or rpcUrl",
         { chainInput },
@@ -12183,11 +12029,11 @@ var Chain = class _Chain {
       this.name = chainInput.chainIdentifier;
     }
   }
-  static async getChain(chainInput) {
+  static async getChain(chainInput, options) {
     if (chainInput.chainIdentifier instanceof _Chain) {
       return chainInput.chainIdentifier;
     }
-    if (!_Chain.chain || await _Chain.chain.getChainId() !== chainInput.chainIdentifier?.toString() && await _Chain.chain.getChainName() !== chainInput.chainIdentifier?.toString() && await _Chain.chain.getRpcUrl() !== chainInput.rpcUrl) {
+    if (!_Chain.chain || await _Chain.chain.getChainId(options) !== chainInput.chainIdentifier?.toString() && await _Chain.chain.getChainName(options) !== chainInput.chainIdentifier?.toString() && await _Chain.chain.getRpcUrl(options) !== chainInput.rpcUrl) {
       if (typeof chainInput.chainIdentifier === "string") {
         chainInput.chainIdentifier = chainInput.chainIdentifier.replace(
           /\s/g,
@@ -12204,35 +12050,39 @@ var Chain = class _Chain {
     }
     return _Chain.chain;
   }
-  async init() {
+  async init(options) {
     if (this.initialized) return;
     if (this.id) {
-      await this.loadChain(this.id);
+      await this.loadChain(this.id, options);
     } else if (this.name) {
-      await this.loadChain(this.name);
+      await this.loadChain(this.name, options);
     } else if (this.rpcUrl) {
-      await this.loadChainFromRpc();
+      await this.loadChainFromRpc(options);
     }
     this.initialized = true;
   }
-  async loadChainFromRpc() {
+  async loadChainFromRpc(options) {
     this.client = createPublicClient({
       transport: http(this.rpcUrl)
     });
     this.id = (await this.client.getChainId()).toString();
-    await this.loadChain(this.id);
+    await this.loadChain(this.id, options);
   }
-  async loadChain(identifier) {
+  async loadChain(identifier, options) {
     let chain;
     if (!Number(identifier)) {
       chain = await getChainFromName({
         name: identifier,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options?.logger,
+        signal: options?.signal
       });
     } else {
       chain = await getChainFromId({
         chainId: identifier,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options?.logger,
+        signal: options?.signal
       });
     }
     this.id = chain.id;
@@ -12251,24 +12101,24 @@ var Chain = class _Chain {
     this.client = createPublicClient({ transport: http(this.rpcUrl) });
     Object.assign(this, { ...this, addresses });
   }
-  async getChainId() {
-    await this.init();
+  async getChainId(options) {
+    await this.init(options);
     return this.id;
   }
-  async getChainName() {
-    await this.init();
+  async getChainName(options) {
+    await this.init(options);
     return this.name;
   }
-  async getRpcUrl() {
-    await this.init();
+  async getRpcUrl(options) {
+    await this.init(options);
     return this.rpcUrl;
   }
-  async getAddress(name) {
-    await this.init();
+  async getAddress(name, options) {
+    await this.init(options);
     const res = this.addresses[name];
     if (!res) {
       throw new ResourceNotFoundError3(
-        ErrorCode4.AddressNotFound,
+        ErrorCode3.AddressNotFound,
         "address not found",
         "address not found",
         { name },
@@ -12278,21 +12128,23 @@ var Chain = class _Chain {
     }
     return res;
   }
-  async getCurrency() {
-    await this.init();
+  async getCurrency(options) {
+    await this.init(options);
     return this.currency;
   }
-  async getClient() {
-    await this.init();
+  async getClient(options) {
+    await this.init(options);
     return this.client;
   }
-  async getFeeData() {
-    await this.init();
+  async getFeeData(options) {
+    await this.init(options);
     let result;
     try {
       result = await getUserOpGasPrice({
         chainId: this.id,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options?.logger,
+        signal: options?.signal
       });
     } catch (_err) {
       const fallBackGasPrice = await this.client.getGasPrice();
@@ -12303,11 +12155,11 @@ var Chain = class _Chain {
     }
     return result;
   }
-  async estimateOpGas(partialOp) {
-    await this.init();
+  async estimateOpGas(partialOp, options) {
+    await this.init(options);
     if (!this.addresses || !this.addresses.entryPointAddress) {
-      throw new InternalFailureError2(
-        ErrorCode4.AddressNotFound,
+      throw new InternalFailureError(
+        ErrorCode3.AddressNotFound,
         "entryPointAddress is required",
         "",
         { partialOp },
@@ -12329,7 +12181,9 @@ var Chain = class _Chain {
         entryPointAddress: this.addresses.entryPointAddress,
         userOp: estimationUserOp
       },
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     });
     if (!preVerificationGas || !verificationGasLimit || !callGasLimit) {
       throw new Error(
@@ -12345,20 +12199,25 @@ var Chain = class _Chain {
     verificationGasLimit = BigInt(verificationGasLimit) + 200000n;
     return { preVerificationGas, verificationGasLimit, callGasLimit };
   }
-  async getTxId(userOpHash, timeout = 6e4, interval = 5e3, fromBlock) {
+  async getTxId(userOpHash, timeout = 6e4, interval = 5e3, fromBlock, options) {
     const endtime = Date.now() + timeout;
-    const client = await this.getClient();
-    const entryPointAddress = await this.getAddress("entryPointAddress");
+    const client = await this.getClient(options);
+    const entryPointAddress = await this.getAddress(
+      "entryPointAddress",
+      options
+    );
     const fromBlockFinal = fromBlock || await client.getBlockNumber() - 100n;
     while (Date.now() < endtime) {
       let events;
-      if (await client.getChainId() === 84531 || await client.getChainId() === 36865) {
+      const chainId = await client.getChainId();
+      if (chainId === 84531 || chainId === 36865) {
         events = await ENTRYPOINT_CONTRACT_INTERFACE.getLog(
           entryPointAddress,
           "UserOperationEvent",
           { userOpHash },
           client,
-          fromBlockFinal
+          fromBlockFinal,
+          options
         );
       } else {
         const filter = await ENTRYPOINT_CONTRACT_INTERFACE.createFilter(
@@ -12366,7 +12225,8 @@ var Chain = class _Chain {
           "UserOperationEvent",
           [userOpHash],
           client,
-          fromBlockFinal
+          fromBlockFinal,
+          options
         );
         events = await client.getFilterLogs({ filter });
       }
@@ -12377,21 +12237,21 @@ var Chain = class _Chain {
     }
     return null;
   }
-  async addressIsContract(address) {
-    return isContract(address, await this.getClient());
+  async addressIsContract(address, options) {
+    return isContract(address, await this.getClient(options));
   }
 };
 
 // src/data/NFT.ts
 import { isAddress as isAddress2 } from "viem";
 import { getNftAddress, getNftName } from "@funkit/api-base";
-import { ErrorCode as ErrorCode5, InvalidParameterError as InvalidParameterError4 } from "@funkit/utils";
+import { ErrorCode as ErrorCode4, InvalidParameterError as InvalidParameterError4 } from "@funkit/utils";
 var NFT = class _NFT {
   constructor(input) {
     this.name = "";
     if (!input) {
       throw new InvalidParameterError4(
-        ErrorCode5.InvalidNFTIdentifier,
+        ErrorCode4.InvalidNFTIdentifier,
         "valid NFT identifier is required, could be address or name",
         "valid NFT identifier is required, could be address or name",
         { input },
@@ -12406,37 +12266,47 @@ var NFT = class _NFT {
     }
   }
   async approve(spender, tokenId, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const data = ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "approve",
       [spender, tokenId]
     );
     return { ...data, chain };
   }
   async ownerOf(tokenId, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await ERC721_CONTRACT_INTERFACE.readFromChain(
-      await this.getAddress(),
+      await this.getAddress(options),
       "ownerOf",
       [tokenId],
-      chain
+      chain,
+      options
     );
   }
   async approveForAll(spender, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const data = ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "setApprovalForAll",
       [spender, true]
     );
     return { ...data, chain };
   }
-  async getAddress() {
+  async getAddress(options) {
     if (!this.address) {
       if (!this.name) {
         throw new InvalidParameterError4(
-          ErrorCode5.InvalidNFTIdentifier,
+          ErrorCode4.InvalidNFTIdentifier,
           "valid NFT identifier is required, could be address or name",
           "valid NFT identifier is required, could be address or name",
           {},
@@ -12446,7 +12316,9 @@ var NFT = class _NFT {
       }
       const nft = await getNftAddress({
         name: this.name,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options?.logger,
+        signal: options?.signal
       });
       return nft.address;
     }
@@ -12454,47 +12326,66 @@ var NFT = class _NFT {
   }
   async getName(options = globalThis.globalEnvOption) {
     if (!this.name && this.address) {
-      const chain = await Chain.getChain({ chainIdentifier: options.chain });
+      const chain = await Chain.getChain(
+        { chainIdentifier: options.chain },
+        options
+      );
       const nft = await getNftName({
-        chainId: await chain.getChainId(),
+        chainId: await chain.getChainId(options),
         nftAddress: this.address,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options.logger,
+        signal: options.signal
       });
       return nft.name;
     }
     return this.name;
   }
   async getBalance(address, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await ERC721_CONTRACT_INTERFACE.readFromChain(
-      await this.getAddress(),
+      await this.getAddress(options),
       "balanceOf",
       [address],
-      chain
+      chain,
+      options
     );
   }
   async getApproved(tokenId, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await ERC721_CONTRACT_INTERFACE.readFromChain(
-      await this.getAddress(),
+      await this.getAddress(options),
       "getApproved",
       [tokenId],
-      chain
+      chain,
+      options
     );
   }
   async revokeForAll(spender, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const data = ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "setApprovalForAll",
       [spender, false]
     );
     return { ...data, chain };
   }
   async transfer(sender, spender, tokenId, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const data = ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "transferFrom",
       [sender, spender, tokenId]
     );
@@ -12508,9 +12399,9 @@ var NFT = class _NFT {
     const nft = new _NFT(data);
     return await nft.approveForAll(spender, options);
   }
-  static async getAddress(data) {
+  static async getAddress(data, options) {
     const nft = new _NFT(data);
-    return await nft.getAddress();
+    return await nft.getAddress(options);
   }
   static async getApproved(data, tokenId, options = globalThis.globalEnvOption) {
     const nft = new _NFT(data);
@@ -12559,13 +12450,17 @@ var Operation = class _Operation {
   static convertTypeToObject(op) {
     return new _Operation(op.userOp, op);
   }
-  async getOpHash(chain) {
-    const entryPointAddress = await chain.getAddress("entryPointAddress");
+  async getOpHash(chain, options) {
+    const entryPointAddress = await chain.getAddress(
+      "entryPointAddress",
+      options
+    );
     return await ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(
       entryPointAddress,
       "getUserOpHash",
       [this.userOp],
-      chain
+      chain,
+      options
     );
   }
   getMaxTxCost() {
@@ -12584,16 +12479,22 @@ var Operation = class _Operation {
     if (!this.userOp.signature || this.userOp.signature === "0x") {
       this.userOp.signature = await auth.getEstimateGasSignature(userId, this);
     }
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const res = await chain.estimateOpGas({
-      ...this.userOp,
-      paymasterAndData: "0x",
-      maxFeePerGas: 0n,
-      maxPriorityFeePerGas: 0n,
-      preVerificationGas: 0n,
-      callGasLimit: 0n,
-      verificationGasLimit: BigInt(1e7)
-    });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const res = await chain.estimateOpGas(
+      {
+        ...this.userOp,
+        paymasterAndData: "0x",
+        maxFeePerGas: 0n,
+        maxPriorityFeePerGas: 0n,
+        preVerificationGas: 0n,
+        callGasLimit: 0n,
+        verificationGasLimit: BigInt(1e7)
+      },
+      options
+    );
     this.userOp.preVerificationGas = res.preVerificationGas;
     this.userOp.verificationGasLimit = res.verificationGasLimit;
     this.userOp.callGasLimit = res.callGasLimit;
@@ -12690,10 +12591,10 @@ function toBytes32Arr(data) {
 }
 
 // src/data/Token.ts
-import { formatUnits as formatUnits2, isAddress as isAddress3, parseUnits } from "viem";
+import { formatUnits, isAddress as isAddress3, parseUnits } from "viem";
 import {
-  ErrorCode as ErrorCode6,
-  InternalFailureError as InternalFailureError3,
+  ErrorCode as ErrorCode5,
+  InternalFailureError as InternalFailureError2,
   InvalidParameterError as InvalidParameterError5
 } from "@funkit/utils";
 var wrappedNativeTokens = {
@@ -12716,20 +12617,28 @@ var Token = class _Token {
     }
     this.symbol = input.toLowerCase();
   }
-  async getAddress() {
-    const chainId = await this.chain.getChainId();
+  async getAddress(options) {
+    const chainId = await this.chain.getChainId(options);
     if (this.isNative) {
       const nativeName = wrappedNativeTokens[this.symbol];
-      return await getTokenAddressBySymbolAndChainId(nativeName, chainId);
+      return await getTokenAddressBySymbolAndChainId(
+        nativeName,
+        chainId,
+        options
+      );
     }
     if (this.address) {
       return this.address;
     }
     if (this.symbol) {
-      return await getTokenAddressBySymbolAndChainId(this.symbol, chainId);
+      return await getTokenAddressBySymbolAndChainId(
+        this.symbol,
+        chainId,
+        options
+      );
     }
-    throw new InternalFailureError3(
-      ErrorCode6.ServerMissingData,
+    throw new InternalFailureError2(
+      ErrorCode5.ServerMissingData,
       "server missing token symbol and address info",
       "",
       { symbol: this.symbol, address: this.address, isNative: this.isNative },
@@ -12737,42 +12646,44 @@ var Token = class _Token {
       "https://docs.fun.xyz"
     );
   }
-  async getDecimals() {
+  async getDecimals(options) {
     if (this.isNative) {
       return 18n;
     }
     return await ERC20_CONTRACT_INTERFACE.readFromChain(
-      await this.getAddress(),
+      await this.getAddress(options),
       "decimals",
       [],
-      this.chain
+      this.chain,
+      options
     );
   }
-  async getBalance(address) {
-    const amount = await this.getBalanceBN(address);
-    const decimals = await this.getDecimals();
-    return formatUnits2(amount, Number(decimals));
+  async getBalance(address, options) {
+    const amount = await this.getBalanceBN(address, options);
+    const decimals = await this.getDecimals(options);
+    return formatUnits(amount, Number(decimals));
   }
-  async getBalanceBN(address) {
+  async getBalanceBN(address, options) {
     const chain = this.chain;
     let amount = 0n;
     if (this.isNative) {
-      const client = await chain.getClient();
+      const client = await chain.getClient(options);
       amount = await client.getBalance({ address });
     } else {
       amount = await ERC20_CONTRACT_INTERFACE.readFromChain(
-        await this.getAddress(),
+        await this.getAddress(options),
         "balanceOf",
         [address],
-        chain
+        chain,
+        options
       );
     }
     return amount;
   }
-  async getApproval(owner, spender) {
+  async getApproval(owner, spender, options) {
     if (this.isNative) {
       throw new InvalidParameterError5(
-        ErrorCode6.InvalidParameter,
+        ErrorCode5.InvalidParameter,
         "Native token can not approve",
         "Native token can not approve",
         { isNative: this.isNative },
@@ -12783,66 +12694,67 @@ var Token = class _Token {
     const chain = this.chain;
     return BigInt(
       await ERC20_CONTRACT_INTERFACE.readFromChain(
-        await this.getAddress(),
+        await this.getAddress(options),
         "allowance",
         [owner, spender],
-        chain
+        chain,
+        options
       )
     );
   }
-  async getDecimalAmount(amount) {
-    const decimals = await this.getDecimals();
+  async getDecimalAmount(amount, options) {
+    const decimals = await this.getDecimals(options);
     return parseUnits(`${amount}`, Number(decimals));
   }
-  async approve(spender, amount) {
-    const amountDec = await this.getDecimalAmount(amount);
+  async approve(spender, amount, options) {
+    const amountDec = await this.getDecimalAmount(amount, options);
     const calldata = ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "approve",
       [spender, amountDec]
     );
     const { to, data, value } = calldata;
     return { to, data, value };
   }
-  async transfer(spender, amount) {
-    const amountDec = await this.getDecimalAmount(amount);
+  async transfer(spender, amount, options) {
+    const amountDec = await this.getDecimalAmount(amount, options);
     return ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
-      await this.getAddress(),
+      await this.getAddress(options),
       "transfer",
       [spender, amountDec]
     );
   }
-  static async getAddress(data, chain) {
+  static async getAddress(data, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getAddress();
+    return await token.getAddress(options);
   }
-  static async getDecimals(data, chain) {
+  static async getDecimals(data, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getDecimals();
+    return await token.getDecimals(options);
   }
-  static async getBalance(data, address, chain) {
+  static async getBalance(data, address, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getBalance(address);
+    return await token.getBalance(address, options);
   }
-  static async getBalanceBN(data, address, chain) {
+  static async getBalanceBN(data, address, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getBalanceBN(address);
+    return await token.getBalanceBN(address, options);
   }
-  static async getApproval(data, owner, spender, chain) {
+  static async getApproval(data, owner, spender, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getApproval(owner, spender);
+    return await token.getApproval(owner, spender, options);
   }
-  static async getDecimalAmount(data, amount, chain) {
+  static async getDecimalAmount(data, amount, chain, options) {
     const token = new _Token(data, chain);
-    return await token.getDecimalAmount(amount);
+    return await token.getDecimalAmount(amount, options);
   }
-  static async approve(data, spender, amount, chain) {
+  static async approve(data, spender, amount, chain, options) {
     const token = new _Token(data, chain);
-    return await token.approve(spender, amount);
+    return await token.approve(spender, amount, options);
   }
-  static async transfer(data, spender, amount, chain) {
+  static async transfer(data, spender, amount, chain, options) {
     const token = new _Token(data, chain);
-    return await token.transfer(spender, amount);
+    return await token.transfer(spender, amount, options);
   }
   static isNative(data) {
     return data.toLowerCase() in wrappedNativeTokens;
@@ -12855,8 +12767,8 @@ var ContractInterface = class {
   constructor(abi) {
     this.abi = abi;
   }
-  async readFromChain(address, functionName, args, chainOrClient) {
-    const client = await parseClient(chainOrClient);
+  async readFromChain(address, functionName, args, chainOrClient, options) {
+    const client = await parseClient(chainOrClient, options);
     try {
       return await client.readContract({
         abi: this.abi,
@@ -12877,15 +12789,16 @@ var ContractInterface = class {
       );
     }
   }
-  async batchReadFromChain(address, chainOrClient, calls) {
-    const client = await parseClient(chainOrClient);
+  async batchReadFromChain(address, chainOrClient, calls, options) {
+    const client = await parseClient(chainOrClient, options);
     return await Promise.all(
       calls.map(async (call) => {
         return this.readFromChain(
           address,
           call.functionName,
           call.args ? call.args : [],
-          client
+          client,
+          options
         );
       })
     );
@@ -12905,8 +12818,8 @@ var ContractInterface = class {
       args
     });
   }
-  async createFilter(address, eventName, args, chainOrClient, fromBlock) {
-    const client = await parseClient(chainOrClient);
+  async createFilter(address, eventName, args, chainOrClient, fromBlock, options) {
+    const client = await parseClient(chainOrClient, options);
     return await client.createContractEventFilter({
       abi: this.abi,
       address,
@@ -12915,8 +12828,8 @@ var ContractInterface = class {
       fromBlock
     });
   }
-  async getLog(address, name, args, chainOrClient, fromBlock) {
-    const client = await parseClient(chainOrClient);
+  async getLog(address, name, args, chainOrClient, fromBlock, options) {
+    const client = await parseClient(chainOrClient, options);
     const event = getItemFromAbi(this.abi, name, "event");
     return await client.getLogs({
       address,
@@ -12926,10 +12839,10 @@ var ContractInterface = class {
     });
   }
 };
-var parseClient = async (chainOrClient) => {
+var parseClient = async (chainOrClient, options) => {
   if (chainOrClient instanceof Chain) {
     const chain = chainOrClient;
-    return await chain.getClient();
+    return await chain.getClient(options);
   }
   if (typeof chainOrClient.readContract === "function") {
     return chainOrClient;
@@ -13214,7 +13127,7 @@ var Auth = class {
         privateKey = `0x${authInput.privateKey}`;
       } else {
         throw new InvalidParameterError6(
-          ErrorCode7.InvalidParameter,
+          ErrorCode6.InvalidParameter,
           "privateKey is not a valid one",
           "privateKey is not a valid one",
           authInput.privateKey,
@@ -13225,7 +13138,7 @@ var Auth = class {
       this.signer = privateKeyToAccount(privateKey);
     } else {
       throw new InvalidParameterError6(
-        ErrorCode7.MissingParameter,
+        ErrorCode6.MissingParameter,
         "valid authInput is required",
         "valid authInput is required",
         authInput,
@@ -13282,9 +13195,9 @@ var Auth = class {
    * @param {boolean} isGroupOp - Whether the operation is a group operation (default: false).
    * @returns {Promise<Hex>} The signature of the operation.
    */
-  async signOp(operation, chain, isGroupOp = false) {
+  async signOp(operation, chain, isGroupOp = false, options) {
     await this.init();
-    const opHash = await operation.getOpHash(chain);
+    const opHash = await operation.getOpHash(chain, options);
     return await this.signHash(opHash, isGroupOp);
   }
   /**
@@ -13324,12 +13237,13 @@ var Auth = class {
    * @param {boolean} skipDBActions - Whether to skip database actions (default: false).
    * @returns {Promise<Hex>} The generated unique ID for the wallet.
    */
-  async getWalletUniqueId(index = 0, skipDBActions = false) {
+  async getWalletUniqueId(index = 0, skipDBActions = false, options) {
     await this.init();
     const authUniqueId = await getAuthUniqueId(
       this.authId,
       await this.getAddress(),
-      skipDBActions
+      skipDBActions,
+      options
     );
     return keccak2564(toBytes5(`${authUniqueId}-${index}`));
   }
@@ -13341,13 +13255,16 @@ var Auth = class {
    */
   async sendTx(txData, options = globalThis.globalEnvOption) {
     await this.init();
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const chainId = await chain.getChainId();
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const chainId = await chain.getChainId(options);
     const { to, data } = txData;
     const { value = 0n } = txData;
     if (!chain || !chainId) {
       throw new InvalidParameterError6(
-        ErrorCode7.MissingParameter,
+        ErrorCode6.MissingParameter,
         "chain object is missing or incorrect",
         "chain object is missing or incorrect",
         { options, chainId },
@@ -13355,11 +13272,11 @@ var Auth = class {
         "https://docs.fun.xyz"
       );
     }
-    const client = await chain.getClient();
+    const client = await chain.getClient(options);
     const txClient = this.client ?? createWalletClient2({
       account: this.signer,
       transport: http2(client.transport.url),
-      chain: chains[preProcessesChains[await chain.getChainId()]]
+      chain: chains[preProcessesChains[await chain.getChainId(options)]]
     });
     let tx;
     let maxFee;
@@ -13367,7 +13284,7 @@ var Auth = class {
     if (gasSpecificChain2[chainId]) {
       const { backupFee, backupPriorityFee, gasStationUrl } = gasSpecificChain2[chainId];
       try {
-        const { standard } = await getGasStation(gasStationUrl);
+        const { standard } = await getGasStation(gasStationUrl, options);
         maxPriorityFee = standard.maxPriorityFee;
         maxFee = standard.maxFee;
       } catch (_err) {
@@ -13388,7 +13305,7 @@ var Auth = class {
       ...tx,
       account: this.signer ?? this.account,
       // TODO: Handle missing account?
-      chain: chains[preProcessesChains[await chain.getChainId()]]
+      chain: chains[preProcessesChains[await chain.getChainId(options)]]
     });
     if (chainId !== "1" && chainId !== "5") {
       return await client.waitForTransactionReceipt({
@@ -13433,13 +13350,15 @@ var Auth = class {
    * @param {string} chainId - The chain identifier.
    * @returns {Promise<Hex[]>} An array of user IDs associated with the wallet address.
    */
-  async getUserIds(wallet, chainId) {
+  async getUserIds(wallet, chainId, options) {
     await this.init();
     return await getUserWalletIdentities({
       authId: this.authId,
       chainId,
       walletAddr: wallet,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     });
   }
   /**
@@ -13447,13 +13366,15 @@ var Auth = class {
    * @param {string} [chainId] - Optional chain identifier.
    * @returns {Promise<Wallet[]>} An array of wallet objects associated with the address.
    */
-  async getWallets(chainId) {
+  async getWallets(chainId, options) {
     await this.init();
     try {
       return await getUserWalletsByAddr({
         addr: await this.getAddress(),
         chainId,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: options?.logger,
+        signal: options?.signal
       });
     } catch (err) {
       if (err instanceof ResourceNotFoundError4) {
@@ -13698,15 +13619,18 @@ var MerkleTree = class {
 };
 
 // src/actions/AccessControl.ts
-var createFeeRecipientAndTokenMerkleTree = async (params) => {
+var createFeeRecipientAndTokenMerkleTree = async (params, txOptions) => {
   const recipients = (params.feeRecipientWhitelist ?? []).map(
     (recipient) => getAddress(recipient)
   );
-  const options = globalThis.globalEnvOption;
-  const chain = await Chain.getChain({ chainIdentifier: options.chain });
+  const chain = await Chain.getChain(
+    // TODO: Temporary fallback, remove after refactoring -- Panda
+    { chainIdentifier: globalThis.globalEnvOption.chain },
+    txOptions
+  );
   const tokens = await Promise.all(
     (params.feeTokenWhitelist ?? []).map(
-      (token) => Token.getAddress(token, chain)
+      (token) => Token.getAddress(token, chain, txOptions)
     )
   );
   const feeRecipientAndTokenMerkleTree = new MerkleTree([
@@ -13728,7 +13652,7 @@ var createTargetSelectorMerkleTree = (params) => {
 var createSessionKeyTransactionParams = async (params, txOptions = globalThis.globalEnvOption) => {
   if (params.targetWhitelist.length === 0) {
     throw new InvalidParameterError7(
-      ErrorCode8.MissingParameter,
+      ErrorCode7.MissingParameter,
       "targetWhitelist is required",
       "targetWhitelist is required",
       { params },
@@ -13738,7 +13662,7 @@ var createSessionKeyTransactionParams = async (params, txOptions = globalThis.gl
   }
   if (params.userId === void 0) {
     throw new InvalidParameterError7(
-      ErrorCode8.MissingParameter,
+      ErrorCode7.MissingParameter,
       "userId is required",
       "userId is required",
       { params },
@@ -13773,8 +13697,11 @@ var createSessionKeyTransactionParams = async (params, txOptions = globalThis.gl
     "addUserToRole",
     [roleId, userId]
   );
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const rbacAddress = await chain.getAddress("rbacAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const rbacAddress = await chain.getAddress("rbacAddress", txOptions);
   return RBAC_CONTRACT_INTERFACE.encodeTransactionParams(
     rbacAddress,
     "multiCall",
@@ -13793,8 +13720,11 @@ var createSessionUser = async (auth, params) => {
   );
 };
 var addOwnerTxParams = async (params, txOptions = globalThis.globalEnvOption) => {
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const rbacAddress = await chain.getAddress("rbacAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const rbacAddress = await chain.getAddress("rbacAddress", txOptions);
   return RBAC_CONTRACT_INTERFACE.encodeTransactionParams(
     rbacAddress,
     "addOwner",
@@ -13802,8 +13732,11 @@ var addOwnerTxParams = async (params, txOptions = globalThis.globalEnvOption) =>
   );
 };
 var removeOwnerTxParams = async (params, txOptions = globalThis.globalEnvOption) => {
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const rbacAddress = await chain.getAddress("rbacAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const rbacAddress = await chain.getAddress("rbacAddress", txOptions);
   return RBAC_CONTRACT_INTERFACE.encodeTransactionParams(
     rbacAddress,
     "removeOwner",
@@ -13836,8 +13769,11 @@ var createGroupTxParams = async (params, txOptions = globalThis.globalEnvOption)
   group.userIds = group.userIds.map((userId) => {
     return pad7(userId, { size: 32 });
   });
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const userAuthAddress = await chain.getAddress("userAuthAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const userAuthAddress = await chain.getAddress("userAuthAddress", txOptions);
   return USER_AUTHENTICATION_CONTRACT_INTERFACE.encodeTransactionParams(
     userAuthAddress,
     "createMultiSigGroup",
@@ -13849,8 +13785,11 @@ var updateGroupTxParams = async (params, txOptions = globalThis.globalEnvOption)
   group.userIds = group.userIds.map((userId) => {
     return pad7(userId, { size: 32 });
   }).sort((a, b) => b.localeCompare(a));
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const userAuthAddress = await chain.getAddress("userAuthAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const userAuthAddress = await chain.getAddress("userAuthAddress", txOptions);
   return USER_AUTHENTICATION_CONTRACT_INTERFACE.encodeTransactionParams(
     userAuthAddress,
     "updateMultiSigGroup",
@@ -13859,8 +13798,11 @@ var updateGroupTxParams = async (params, txOptions = globalThis.globalEnvOption)
 };
 var removeGroupTxParams = async (params, txOptions = globalThis.globalEnvOption) => {
   const { groupId } = params;
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const userAuthAddress = await chain.getAddress("userAuthAddress");
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const userAuthAddress = await chain.getAddress("userAuthAddress", txOptions);
   return USER_AUTHENTICATION_CONTRACT_INTERFACE.encodeTransactionParams(
     userAuthAddress,
     "deleteMultiSigGroup",
@@ -13871,8 +13813,8 @@ var removeGroupTxParams = async (params, txOptions = globalThis.globalEnvOption)
 // src/actions/Stake.ts
 import { isAddress as isAddress4, parseEther as parseEther2 } from "viem";
 import {
-  ErrorCode as ErrorCode9,
-  InternalFailureError as InternalFailureError4,
+  ErrorCode as ErrorCode8,
+  InternalFailureError as InternalFailureError3,
   InvalidParameterError as InvalidParameterError8
 } from "@funkit/utils";
 var getWithdrawQueueInterface = () => {
@@ -13885,14 +13827,17 @@ var isFinishUnstakeParams = (input) => {
   return input.recipient !== void 0;
 };
 var stakeTransactionParams = async (params, txOptions = globalThis.globalEnvOption) => {
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const lidoAddress = getSteth(await chain.getChainId());
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const lidoAddress = getSteth(await chain.getChainId(txOptions));
   return { to: lidoAddress, value: parseEther2(`${params.amount}`), data: "0x" };
 };
 var requestUnstakeTransactionParams = async (params, txOptions = globalThis.globalEnvOption) => {
   if (!isAddress4(params.recipient ?? "")) {
     throw new InvalidParameterError8(
-      ErrorCode9.InvalidParameter,
+      ErrorCode8.InvalidParameter,
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -13900,13 +13845,16 @@ var requestUnstakeTransactionParams = async (params, txOptions = globalThis.glob
       "https://docs.fun.xyz"
     );
   }
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const chainId = await chain.getChainId();
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const chainId = await chain.getChainId(txOptions);
   const steth = getSteth(chainId);
   const withdrawalQueue = getWithdrawalQueue(chainId);
   if (!steth || !withdrawalQueue || steth.length === 0 || withdrawalQueue.length === 0) {
     throw new InvalidParameterError8(
-      ErrorCode9.ChainNotSupported,
+      ErrorCode8.ChainNotSupported,
       "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
       "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
       { params },
@@ -13931,7 +13879,10 @@ var requestUnstakeTransactionParams = async (params, txOptions = globalThis.glob
       params.recipient
     ]
   );
-  const approveAndExecAddress = await chain.getAddress("approveAndExecAddress");
+  const approveAndExecAddress = await chain.getAddress(
+    "approveAndExecAddress",
+    txOptions
+  );
   return APPROVE_AND_EXEC_CONTRACT_INTERFACE.encodeTransactionParams(
     approveAndExecAddress,
     "approveAndExecute",
@@ -13941,7 +13892,7 @@ var requestUnstakeTransactionParams = async (params, txOptions = globalThis.glob
 var finishUnstakeTransactionParams = async (params, txOptions = globalThis.globalEnvOption) => {
   if (!isAddress4(params.recipient ?? "")) {
     throw new InvalidParameterError8(
-      ErrorCode9.InvalidParameter,
+      ErrorCode8.InvalidParameter,
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -13949,12 +13900,17 @@ var finishUnstakeTransactionParams = async (params, txOptions = globalThis.globa
       "https://docs.fun.xyz"
     );
   }
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-  const withdrawQueueAddress = getWithdrawalQueue(await chain.getChainId());
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
+  const withdrawQueueAddress = getWithdrawalQueue(
+    await chain.getChainId(txOptions)
+  );
   const readyToWithdrawRequestIds = (await getReadyToWithdrawRequests(params, txOptions)).slice(0, 5);
   if (readyToWithdrawRequestIds.length === 0) {
     throw new InvalidParameterError8(
-      ErrorCode9.InvalidParameter,
+      ErrorCode8.InvalidParameter,
       "Not ready to withdraw requests",
       "Not ready to withdraw requests",
       { params },
@@ -13966,17 +13922,19 @@ var finishUnstakeTransactionParams = async (params, txOptions = globalThis.globa
     withdrawQueueAddress,
     "getLastCheckpointIndex",
     [],
-    chain
+    chain,
+    txOptions
   );
   const hints = await getWithdrawQueueInterface().readFromChain(
     withdrawQueueAddress,
     "findCheckpointHints",
     [readyToWithdrawRequestIds, 1, lastCheckpoint],
-    chain
+    chain,
+    txOptions
   );
   if (!hints) {
-    throw new InternalFailureError4(
-      ErrorCode9.CheckPointHintsNotFound,
+    throw new InternalFailureError3(
+      ErrorCode8.CheckPointHintsNotFound,
       "lido checkpoint hints are not found when batching the withdrawal",
       "",
       { params, readyToWithdrawRequestIds, lastCheckpoint, hints },
@@ -13993,7 +13951,7 @@ var finishUnstakeTransactionParams = async (params, txOptions = globalThis.globa
 var getReadyToWithdrawRequests = async (params, txOptions) => {
   if (!isAddress4(params.recipient ?? "")) {
     throw new InvalidParameterError8(
-      ErrorCode9.InvalidParameter,
+      ErrorCode8.InvalidParameter,
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       "Recipient address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14001,12 +13959,27 @@ var getReadyToWithdrawRequests = async (params, txOptions) => {
       "https://docs.fun.xyz"
     );
   }
-  const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+  const chain = await Chain.getChain(
+    { chainIdentifier: txOptions.chain },
+    txOptions
+  );
   const withdrawalQueueAddr = getWithdrawalQueue(
-    await chain.getChainId()
+    await chain.getChainId(txOptions)
+  );
+  const withdrawalRequests = await getWithdrawQueueInterface().readFromChain(
+    withdrawalQueueAddr,
+    "getWithdrawalRequests",
+    [params.walletAddress],
+    chain,
+    txOptions
+  );
+  const withdrawalStatusTx = await getWithdrawQueueInterface().readFromChain(
+    withdrawalQueueAddr,
+    "getWithdrawalStatus",
+    [withdrawalRequests],
+    chain,
+    txOptions
   );
-  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) {
@@ -14028,7 +14001,7 @@ var getWithdrawalQueue = (chainId) => {
       return "0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1";
     default:
       throw new InvalidParameterError8(
-        ErrorCode9.ChainNotSupported,
+        ErrorCode8.ChainNotSupported,
         "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
         "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
         { chainId },
@@ -14047,7 +14020,7 @@ var getSteth = (chainId) => {
       return "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84";
     default:
       throw new InvalidParameterError8(
-        ErrorCode9.ChainNotSupported,
+        ErrorCode8.ChainNotSupported,
         "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
         "Incorrect chainId, staking only available on Ethereum mainnet and Goerli",
         { chainId },
@@ -14059,18 +14032,18 @@ var getSteth = (chainId) => {
 
 // src/actions/Token.ts
 import { isAddress as isAddress5, parseEther as parseEther3 } from "viem";
-import { ErrorCode as ErrorCode10, InvalidParameterError as InvalidParameterError9 } from "@funkit/utils";
+import { ErrorCode as ErrorCode9, InvalidParameterError as InvalidParameterError9 } from "@funkit/utils";
 var isERC721TransferParams = (obj) => {
   return "tokenId" in obj;
 };
 var isTokenTransferParams = (obj) => {
   return "amount" in obj && "token" in obj && "to" in obj;
 };
-var erc721TransferTransactionParams = async (params) => {
+var erc721TransferTransactionParams = async (params, options) => {
   const { to, tokenId, collection, from } = params;
   if (!isAddress5(to ?? "") || !isAddress5(from ?? "")) {
     throw new InvalidParameterError9(
-      ErrorCode10.InvalidParameter,
+      ErrorCode9.InvalidParameter,
       "To/from address is not a valid address, please make sure it is a valid checksum address.",
       "To/from address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14078,18 +14051,18 @@ var erc721TransferTransactionParams = async (params) => {
       "https://docs.fun.xyz"
     );
   }
-  const tokenAddr = isAddress5(collection) ? collection : await NFT.getAddress(collection);
+  const tokenAddr = isAddress5(collection) ? collection : await NFT.getAddress(collection, options);
   return ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
     tokenAddr,
     "transferFrom",
     [from, to, tokenId]
   );
 };
-var tokenTransferTransactionParams = async (params, chain) => {
+var tokenTransferTransactionParams = async (params, chain, options) => {
   const { to, amount, token } = params;
   if (!isAddress5(to)) {
     throw new InvalidParameterError9(
-      ErrorCode10.InvalidParameter,
+      ErrorCode9.InvalidParameter,
       "To address is not a valid address, please make sure it is a valid checksum address.",
       "To address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14105,10 +14078,10 @@ var tokenTransferTransactionParams = async (params, chain) => {
       value: parseEther3(`${amount}`)
     };
   }
-  const tokenAddr = await tokenObj.getAddress();
+  const tokenAddr = await tokenObj.getAddress(options);
   if (!tokenAddr) {
     throw new InvalidParameterError9(
-      ErrorCode10.TokenNotFound,
+      ErrorCode9.TokenNotFound,
       "Token address not found. Please check the token passed in.",
       "Token address not found. Please check the token passed in.",
       { params },
@@ -14116,18 +14089,18 @@ var tokenTransferTransactionParams = async (params, chain) => {
       "https://docs.fun.xyz"
     );
   }
-  const convertedAmount = await tokenObj.getDecimalAmount(amount);
+  const convertedAmount = await tokenObj.getDecimalAmount(amount, options);
   return ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
     tokenAddr,
     "transfer",
     [to, convertedAmount]
   );
 };
-var tokenTransferFromTransactionParams = async (params, chain) => {
+var tokenTransferFromTransactionParams = async (params, chain, options) => {
   const { to, amount, token, from } = params;
   if (!isAddress5(to ?? "") || !isAddress5(from ?? "")) {
     throw new InvalidParameterError9(
-      ErrorCode10.InvalidParameter,
+      ErrorCode9.InvalidParameter,
       "To/from address is not a valid address, please make sure it is a valid checksum address.",
       "To/from address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14143,10 +14116,10 @@ var tokenTransferFromTransactionParams = async (params, chain) => {
       value: parseEther3(`${amount}`)
     };
   }
-  const tokenAddr = await tokenObj.getAddress();
+  const tokenAddr = await tokenObj.getAddress(options);
   if (!tokenAddr) {
     throw new InvalidParameterError9(
-      ErrorCode10.TokenNotFound,
+      ErrorCode9.TokenNotFound,
       "Token address not found. Please check the token passed in.",
       "Token address not found. Please check the token passed in.",
       { params },
@@ -14154,7 +14127,7 @@ var tokenTransferFromTransactionParams = async (params, chain) => {
       "https://docs.fun.xyz"
     );
   }
-  const convertedAmount = await tokenObj.getDecimalAmount(amount);
+  const convertedAmount = await tokenObj.getDecimalAmount(amount, options);
   return ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
     tokenAddr,
     "transferFrom",
@@ -14167,11 +14140,11 @@ var isERC20ApproveParams = (obj) => {
 var isERC721ApproveParams = (obj) => {
   return "tokenId" in obj && "collection" in obj;
 };
-var erc20ApproveTransactionParams = async (params) => {
+var erc20ApproveTransactionParams = async (params, options) => {
   const { spender, amount, token } = params;
   if (!isAddress5(spender ?? "")) {
     throw new InvalidParameterError9(
-      ErrorCode10.InvalidParameter,
+      ErrorCode9.InvalidParameter,
       "Spender address is not a valid address, please make sure it is a valid checksum address.",
       "Spender address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14179,22 +14152,23 @@ var erc20ApproveTransactionParams = async (params) => {
       "https://docs.fun.xyz"
     );
   }
-  const chain = await Chain.getChain({
-    chainIdentifier: globalThis.globalEnvOption.chain
-  });
+  const chain = await Chain.getChain(
+    { chainIdentifier: globalThis.globalEnvOption.chain },
+    options
+  );
   const tokenObj = new Token(token, chain);
-  const convertedAmount = await tokenObj.getDecimalAmount(amount);
+  const convertedAmount = await tokenObj.getDecimalAmount(amount, options);
   return ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
-    await tokenObj.getAddress(),
+    await tokenObj.getAddress(options),
     "approve",
     [spender, convertedAmount]
   );
 };
-var erc721ApproveTransactionParams = async (params) => {
+var erc721ApproveTransactionParams = async (params, options) => {
   const { spender, tokenId, collection } = params;
   if (!isAddress5(spender ?? "")) {
     throw new InvalidParameterError9(
-      ErrorCode10.InvalidParameter,
+      ErrorCode9.InvalidParameter,
       "Spender address is not a valid address, please make sure it is a valid checksum address.",
       "Spender address is not a valid address, please make sure it is a valid checksum address.",
       { params },
@@ -14202,7 +14176,7 @@ var erc721ApproveTransactionParams = async (params) => {
       "https://docs.fun.xyz"
     );
   }
-  const tokenAddr = isAddress5(collection) ? collection : await NFT.getAddress(collection);
+  const tokenAddr = isAddress5(collection) ? collection : await NFT.getAddress(collection, options);
   return ERC721_CONTRACT_INTERFACE.encodeTransactionParams(
     tokenAddr,
     "approve",
@@ -14226,7 +14200,7 @@ var SocketSort = /* @__PURE__ */ ((SocketSort2) => {
 })(SocketSort || {});
 
 // src/config/Config.ts
-import { ErrorCode as ErrorCode11, InvalidParameterError as InvalidParameterError10 } from "@funkit/utils";
+import { ErrorCode as ErrorCode10, InvalidParameterError as InvalidParameterError10 } from "@funkit/utils";
 function getEnvOptions() {
   return globalThis.globalEnvOption;
 }
@@ -14243,7 +14217,7 @@ async function configureEnvironment(option) {
   globalEnvOption.apiKey = option.apiKey ? option.apiKey : globalEnvOption.apiKey;
   if (!globalEnvOption.apiKey) {
     throw new InvalidParameterError10(
-      ErrorCode11.MissingParameter,
+      ErrorCode10.MissingParameter,
       "apiKey is required",
       "apiKey is required",
       { option },
@@ -14302,22 +14276,29 @@ var Sponsor = class {
     this.paymasterType = paymasterType;
   }
   async getPaymasterAddress(options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const chainId = await chain.getChainId();
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const chainId = await chain.getChainId(options);
     if (!this.paymasterAddress && chainId !== this.chainId) {
-      this.paymasterAddress = await chain.getAddress(this.name);
+      this.paymasterAddress = await chain.getAddress(this.name, options);
       this.chainId = chainId;
     }
     return this.paymasterAddress;
   }
   /** True if the specified sponsor is in blacklist mode. **/
   async getListMode(sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getListMode",
       [sponsor],
-      chain
+      chain,
+      options
     );
   }
   async setToBlacklistMode() {
@@ -14416,8 +14397,16 @@ var CheckoutSponsor = class extends Sponsor {
     return paymasterAddress.toLowerCase();
   }
   async stake(_sponsor, amount, options) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "deposit",
@@ -14426,8 +14415,16 @@ var CheckoutSponsor = class extends Sponsor {
     );
   }
   async unstake(receiver, amount, options) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawTo",
@@ -14488,7 +14485,7 @@ var CheckoutSponsor = class extends Sponsor {
 // src/sponsors/GaslessSponsor.ts
 import { concat as concat3 } from "viem";
 import { PaymasterType as PaymasterType3 } from "@funkit/api-base";
-import { ErrorCode as ErrorCode12, ResourceNotFoundError as ResourceNotFoundError5 } from "@funkit/utils";
+import { ErrorCode as ErrorCode11, ResourceNotFoundError as ResourceNotFoundError5 } from "@funkit/utils";
 var GaslessSponsor = class extends Sponsor {
   constructor(options = globalThis.globalEnvOption) {
     super(
@@ -14500,17 +14497,23 @@ var GaslessSponsor = class extends Sponsor {
   }
   async getFunSponsorAddress(options = globalThis.globalEnvOption) {
     if (!this.sponsorAddress) {
-      const chain = await Chain.getChain({ chainIdentifier: options.chain });
-      if (GASLESS_SPONSOR_SUPPORT_CHAINS.includes(await chain.getChainId())) {
-        this.sponsorAddress = await chain.getAddress("funGaslessSponsorAddress");
+      const chain = await Chain.getChain(
+        { chainIdentifier: options.chain },
+        options
+      );
+      if (GASLESS_SPONSOR_SUPPORT_CHAINS.includes(await chain.getChainId(options))) {
+        this.sponsorAddress = await chain.getAddress(
+          "funGaslessSponsorAddress",
+          options
+        );
       } else {
         throw new ResourceNotFoundError5(
-          ErrorCode12.MissingParameter,
+          ErrorCode11.MissingParameter,
           "The network you are working with does not support gasless Fun Sponsor. You will need to run and manage your own gasless sponsor.",
           "The network you are working with does not support gasless Fun Sponsor. You will need to run and manage your own gasless sponsor.",
           {
             gaslessSponsorSupportChains: GASLESS_SPONSOR_SUPPORT_CHAINS,
-            chain: await chain.getChainId()
+            chain: await chain.getChainId(options)
           },
           "Manage your own gasless sponsor, or use a supported network.",
           "https://docs.fun.xyz"
@@ -14525,8 +14528,16 @@ var GaslessSponsor = class extends Sponsor {
     return concat3([paymasterAddress, sponsor]);
   }
   async stake(sponsor, amount, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "addDepositTo",
@@ -14535,8 +14546,16 @@ var GaslessSponsor = class extends Sponsor {
     );
   }
   async unstake(receiver, amount, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawDepositTo",
@@ -14544,28 +14563,39 @@ var GaslessSponsor = class extends Sponsor {
     );
   }
   async getUnlockBlock(sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getUnlockBlock",
       [sponsor],
-      chain
+      chain,
+      options
     );
   }
   async getLockState(sponsor, options = globalThis.globalEnvOption) {
     const unlockBlock = Number(await this.getUnlockBlock(sponsor, options));
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const client = await chain.getClient();
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const client = await chain.getClient(options);
     const currentBlock = await client.getBlockNumber();
     return unlockBlock === 0 || unlockBlock > currentBlock;
   }
   async getBalance(sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getBalance",
       [sponsor],
-      chain
+      chain,
+      options
     );
   }
   async lockDeposit() {
@@ -14583,21 +14613,29 @@ var GaslessSponsor = class extends Sponsor {
     );
   }
   async getSpenderBlacklistMode(spender, sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getSpenderBlacklistMode",
       [spender, sponsor],
-      chain
+      chain,
+      options
     );
   }
   async getSpenderWhitelistMode(spender, sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getSpenderWhitelistMode",
       [spender, sponsor],
-      chain
+      chain,
+      options
     );
   }
 };
@@ -14606,7 +14644,7 @@ var GaslessSponsor = class extends Sponsor {
 import { concat as concat4, encodeAbiParameters as encodeAbiParameters4 } from "viem";
 import { PaymasterType as PaymasterType4, addTransaction } from "@funkit/api-base";
 import {
-  ErrorCode as ErrorCode13,
+  ErrorCode as ErrorCode12,
   InvalidParameterError as InvalidParameterError11,
   ResourceNotFoundError as ResourceNotFoundError6
 } from "@funkit/utils";
@@ -14620,7 +14658,7 @@ var TokenSponsor = class extends Sponsor {
     );
     if (!options.gasSponsor?.token) {
       throw new InvalidParameterError11(
-        ErrorCode13.MissingParameter,
+        ErrorCode12.MissingParameter,
         "token field is missing",
         "token field is missing",
         { gasSponsor: options.gasSponsor },
@@ -14632,17 +14670,23 @@ var TokenSponsor = class extends Sponsor {
   }
   async getFunSponsorAddress(options = globalThis.globalEnvOption) {
     if (!this.sponsorAddress) {
-      const chain = await Chain.getChain({ chainIdentifier: options.chain });
-      if (TOKEN_SPONSOR_SUPPORT_CHAINS.includes(await chain.getChainId())) {
-        this.sponsorAddress = await chain.getAddress("funTokenSponsorAddress");
+      const chain = await Chain.getChain(
+        { chainIdentifier: options.chain },
+        options
+      );
+      if (TOKEN_SPONSOR_SUPPORT_CHAINS.includes(await chain.getChainId(options))) {
+        this.sponsorAddress = await chain.getAddress(
+          "funTokenSponsorAddress",
+          options
+        );
       } else {
         throw new ResourceNotFoundError6(
-          ErrorCode13.MissingParameter,
+          ErrorCode12.MissingParameter,
           "The network you are working with does not support token Fun Sponsor. You will need to run and manage your own token sponsor.",
           "The network you are working with does not support token Fun Sponsor. You will need to run and manage your own token sponsor.",
           {
             tokenSponsorSupportChains: TOKEN_SPONSOR_SUPPORT_CHAINS,
-            chain: await chain.getChainId()
+            chain: await chain.getChainId(options)
           },
           "Manage your own token sponsor, or use a supported network",
           "https://docs.fun.xyz"
@@ -14652,40 +14696,56 @@ var TokenSponsor = class extends Sponsor {
     return this.sponsorAddress;
   }
   async getPaymasterAndData(options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({
-      chainIdentifier: globalThis.globalEnvOption.chain
-    });
-    const tokenAddress = await Token.getAddress(this.token, chain);
+    const chain = await Chain.getChain(
+      {
+        chainIdentifier: globalThis.globalEnvOption.chain
+      },
+      options
+    );
+    const tokenAddress = await Token.getAddress(this.token, chain, options);
     const paymasterAddress = await this.getPaymasterAddress(options);
     const sponsor = await this.getFunSponsorAddress(options);
     return concat4([paymasterAddress, sponsor, tokenAddress]);
   }
   async getPaymasterAndDataPermit(partialOp, walletAddr, userId, auth, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const estimateGasSignature = await auth.getEstimateGasSignature(
       userId,
       partialOp
     );
     partialOp.userOp.signature = estimateGasSignature.toLowerCase();
     const estimationPaymasterAddress = await chain.getAddress(
-      "estimationPaymasterAddress"
+      "estimationPaymasterAddress",
+      options
     );
-    const { callGasLimit, verificationGasLimit, preVerificationGas } = await chain.estimateOpGas({
-      ...partialOp.userOp,
-      paymasterAndData: estimationPaymasterAddress
-    });
-    const { maxFeePerGas } = await chain.getFeeData();
+    const { callGasLimit, verificationGasLimit, preVerificationGas } = await chain.estimateOpGas(
+      {
+        ...partialOp.userOp,
+        paymasterAndData: estimationPaymasterAddress
+      },
+      options
+    );
+    const { maxFeePerGas } = await chain.getFeeData(options);
     const paymasterAddress = await this.getPaymasterAddress(options);
     const requiredGas = (callGasLimit + (verificationGasLimit + 400000n) * 3n + preVerificationGas) * BigInt(maxFeePerGas);
-    const tokenAddress = await Token.getAddress(this.token, chain);
+    const tokenAddress = await Token.getAddress(this.token, chain, options);
     const decAmount = await TOKEN_PAYMASTER_CONTRACT_INTERFACE.readFromChain(
       paymasterAddress,
       "getTokenValueOfEth",
       [tokenAddress, requiredGas],
-      chain
+      chain,
+      options
     );
-    const nonce = await getWalletPermitNonce(walletAddr, chain);
-    const client = await chain.getClient();
+    const nonce = await getWalletPermitNonce(
+      walletAddr,
+      chain,
+      void 0,
+      options
+    );
+    const client = await chain.getClient(options);
     const chainId = await client.getChainId();
     const hash = getPermitHash(
       tokenAddress,
@@ -14719,8 +14779,13 @@ var TokenSponsor = class extends Sponsor {
   }
   async stake(sponsor, amount, options = globalThis.globalEnvOption) {
     const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
-    const chain = await Chain.getChain({ chainIdentifier });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain({ chainIdentifier }, options);
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "addEthDepositTo",
@@ -14730,8 +14795,13 @@ var TokenSponsor = class extends Sponsor {
   }
   async unstake(receiver, amount, options = globalThis.globalEnvOption) {
     const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
-    const chain = await Chain.getChain({ chainIdentifier });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const chain = await Chain.getChain({ chainIdentifier }, options);
+    const amountdec = await Token.getDecimalAmount(
+      "eth",
+      amount,
+      chain,
+      options
+    );
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawEthDepositTo",
@@ -14739,39 +14809,53 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async getUnlockBlock(sponsor, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({
-      chainIdentifier: globalThis.globalEnvOption.chain
-    });
-    const tokenAddr = await Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      {
+        chainIdentifier: globalThis.globalEnvOption.chain
+      },
+      options
+    );
+    const tokenAddr = Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain, options);
     return (await this.getAllTokenData(tokenAddr, sponsor, options)).unlockBlock;
   }
   // false means unlocked, true means locked
   async getLockState(sponsor, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddr = await Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const tokenAddr = Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain, options);
     const unlockBlock = await this.getUnlockBlock(tokenAddr, sponsor);
-    const provider = await chain.getClient();
+    const provider = await chain.getClient(options);
     const currentBlock = await provider.getBlockNumber();
     return unlockBlock === 0n || unlockBlock > currentBlock;
   }
   async getTokenInfo(token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const tokenAddress = await Token.getAddress(token, chain, options);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getToken",
       [tokenAddress],
-      chain
+      chain,
+      options
     );
   }
   async getAllTokenData(spender, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const tokenAddress = await Token.getAddress(token, chain, options);
     const data = await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getAllTokenData",
       [tokenAddress, spender],
-      chain
+      chain,
+      options
     );
     return {
       unlockBlock: data[0],
@@ -14779,29 +14863,40 @@ var TokenSponsor = class extends Sponsor {
     };
   }
   async getTokenBalance(spender, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const tokenData = new Token(token, chain);
-    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress();
+    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress(options);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenBalance",
       [tokenAddress, spender],
-      chain
+      chain,
+      options
     );
   }
   async getAllTokens(options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getAllTokens",
       [],
-      chain
+      chain,
+      options
     );
   }
   async addUsableToken(oracle, token, aggregator, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const decimals = await Token.getDecimals(token, chain);
-    const tokenAddress = await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const decimals = await Token.getDecimals(token, chain, options);
+    const tokenAddress = await Token.getAddress(token, chain, options);
     const data = [oracle, tokenAddress, decimals, aggregator];
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
@@ -14810,10 +14905,13 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async depositToken(token, spender, amount, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const tokenObj = new Token(token, chain);
-    const tokenAddress = await tokenObj.getAddress();
-    const amountDec = await tokenObj.getDecimalAmount(amount);
+    const tokenAddress = await tokenObj.getAddress(options);
+    const amountDec = await tokenObj.getDecimalAmount(amount, options);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "addTokenDepositTo",
@@ -14821,10 +14919,13 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async withdrawToken(token, receiver, amount, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const tokenObj = new Token(token, chain);
-    const tokenAddress = await tokenObj.getAddress();
-    const amountdec = await tokenObj.getDecimalAmount(amount);
+    const tokenAddress = await tokenObj.getAddress(options);
+    const amountdec = await tokenObj.getDecimalAmount(amount, options);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawTokenDepositTo",
@@ -14832,9 +14933,12 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async lockTokenDeposit(token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const tokenData = new Token(token, chain);
-    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress();
+    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress(options);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "lockTokenDeposit",
@@ -14842,9 +14946,12 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async unlockTokenDepositAfter(token, blocksToWait, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const tokenData = new Token(token, chain);
-    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress();
+    const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress(options);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "unlockTokenDepositAfter",
@@ -14867,9 +14974,12 @@ var TokenSponsor = class extends Sponsor {
   }
   async approve(approver, token, amount, options = globalThis.globalEnvOption) {
     const gasSponsorAddress = await this.getPaymasterAddress();
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     addTransaction({
-      chainId: await chain.getChainId(),
+      chainId: await chain.getChainId(options),
       timestamp: Date.now(),
       txid: "0x",
       transaction: {
@@ -14881,36 +14991,50 @@ var TokenSponsor = class extends Sponsor {
       },
       paymasterType: this.paymasterType,
       sponsorAddress: approver,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options.logger,
+      signal: options.signal
     });
-    return Token.approve(token, gasSponsorAddress, amount, chain);
+    return Token.approve(token, gasSponsorAddress, amount, chain, options);
   }
   async getSpenderBlacklisted(spender, sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getSpenderBlacklisted",
       [spender, sponsor],
-      chain
+      chain,
+      options
     );
   }
   async getSpenderWhitelisted(spender, sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getSpenderWhitelisted",
       [spender, sponsor],
-      chain
+      chain,
+      options
     );
   }
   async getTokenWhitelisted(sponsor, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const tokenAddress = await Token.getAddress(token, chain, options);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenWhitelisted",
       [tokenAddress, sponsor],
-      chain
+      chain,
+      options
     );
   }
   async setTokenToWhitelistMode() {
@@ -14921,10 +15045,13 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async batchWhitelistTokens(tokens, modes, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const calldata = [];
     for (let i = 0; i < tokens.length; i++) {
-      const tokenAddress = await Token.getAddress(tokens[i], chain);
+      const tokenAddress = await Token.getAddress(tokens[i], chain, options);
       calldata.push(
         this.contractInterface.encodeData("setTokenWhitelistMode", [
           tokenAddress,
@@ -14939,22 +15066,30 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async getTokenListMode(sponsor, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenListMode",
       [sponsor],
-      chain
+      chain,
+      options
     );
   }
   async getTokenBlacklisted(sponsor, token, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
+    const tokenAddress = await Token.getAddress(token, chain, options);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenBlacklisted",
       [tokenAddress, sponsor],
-      chain
+      chain,
+      options
     );
   }
   async setTokenToBlacklistMode() {
@@ -14965,10 +15100,13 @@ var TokenSponsor = class extends Sponsor {
     );
   }
   async batchBlacklistTokens(tokens, modes, options = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: options.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: options.chain },
+      options
+    );
     const calldata = [];
     for (let i = 0; i < tokens.length; i++) {
-      const tokenAddress = await Token.getAddress(tokens[i], chain);
+      const tokenAddress = await Token.getAddress(tokens[i], chain, options);
       calldata.push(
         this.contractInterface.encodeTransactionParams(
           await this.getPaymasterAddress(),
@@ -15017,15 +15155,15 @@ import {
   toBytes as toBytes7
 } from "viem";
 import {
-  ErrorCode as ErrorCode15,
-  InternalFailureError as InternalFailureError5,
+  ErrorCode as ErrorCode14,
+  InternalFailureError as InternalFailureError4,
   InvalidParameterError as InvalidParameterError13
 } from "@funkit/utils";
 
 // src/actions/FirstClassActions.ts
 import { pad as pad8 } from "viem";
 import {
-  ErrorCode as ErrorCode14,
+  ErrorCode as ErrorCode13,
   InvalidParameterError as InvalidParameterError12,
   ResourceNotFoundError as ResourceNotFoundError7
 } from "@funkit/utils";
@@ -15036,8 +15174,11 @@ import {
   decodeAbiParameters as decodeAbiParameters3,
   keccak256 as keccak2566
 } from "viem";
-async function getOnChainGroupData(groupId, chain, walletAddr) {
-  const userAuthContractAddr = await chain.getAddress("userAuthAddress");
+async function getOnChainGroupData(groupId, chain, walletAddr, options) {
+  const userAuthContractAddr = await chain.getAddress(
+    "userAuthAddress",
+    options
+  );
   const groupKey = keccak2566(concat5([groupId, userAuthContractAddr]));
   let storedGroupData;
   try {
@@ -15045,7 +15186,8 @@ async function getOnChainGroupData(groupId, chain, walletAddr) {
       walletAddr,
       "getState",
       [groupKey],
-      chain
+      chain,
+      options
     );
   } catch (err) {
     if (err instanceof Error && err.message.match(/returned no data/)) {
@@ -15090,28 +15232,34 @@ var FirstClassActions = class {
    * @throws {InvalidParameterError} When provided parameters are missing or incorrect.
    */
   async transfer(auth, userId, params, txOptions = globalThis.globalEnvOption) {
-    const overrideChain = await Chain.getChain({
-      chainIdentifier: txOptions?.chain
-    });
+    const overrideChain = await Chain.getChain(
+      { chainIdentifier: txOptions?.chain },
+      txOptions
+    );
     let transactionParams;
     if (isERC721TransferParams(params)) {
-      params.from = params.from ? params.from : await this.getAddress();
-      transactionParams = await erc721TransferTransactionParams(params);
+      params.from = params.from ? params.from : await this.getAddress(txOptions);
+      transactionParams = await erc721TransferTransactionParams(
+        params,
+        txOptions
+      );
     } else if (isTokenTransferParams(params)) {
       if (params.from) {
         transactionParams = await tokenTransferFromTransactionParams(
           params,
-          overrideChain ?? this.chain
+          overrideChain ?? this.chain,
+          txOptions
         );
       } else {
         transactionParams = await tokenTransferTransactionParams(
           params,
-          overrideChain ?? this.chain
+          overrideChain ?? this.chain,
+          txOptions
         );
       }
     } else {
       throw new InvalidParameterError12(
-        ErrorCode14.InvalidParameter,
+        ErrorCode13.InvalidParameter,
         "Params were missing or incorrect",
         "Params were missing or incorrect",
         { params },
@@ -15138,12 +15286,15 @@ var FirstClassActions = class {
   async tokenApprove(auth, userId, params, txOptions = globalThis.globalEnvOption) {
     let transactionParams;
     if (isERC20ApproveParams(params)) {
-      transactionParams = await erc20ApproveTransactionParams(params);
+      transactionParams = await erc20ApproveTransactionParams(params, txOptions);
     } else if (isERC721ApproveParams(params)) {
-      transactionParams = await erc721ApproveTransactionParams(params);
+      transactionParams = await erc721ApproveTransactionParams(
+        params,
+        txOptions
+      );
     } else {
       throw new InvalidParameterError12(
-        ErrorCode14.InvalidParameter,
+        ErrorCode13.InvalidParameter,
         "Params were missing or incorrect",
         "Params were missing or incorrect",
         { params },
@@ -15185,7 +15336,7 @@ var FirstClassActions = class {
    * @throws {InvalidParameterError} When provided parameters are missing or incorrect.
    */
   async unstake(auth, userId, params, txOptions = globalThis.globalEnvOption) {
-    params.recipient ??= await this.getAddress();
+    params.recipient ??= await this.getAddress(txOptions);
     let transactionParams;
     if (isRequestUnstakeParams(params)) {
       transactionParams = await requestUnstakeTransactionParams(
@@ -15199,7 +15350,7 @@ var FirstClassActions = class {
       );
     } else {
       throw new InvalidParameterError12(
-        ErrorCode14.InvalidParameter,
+        ErrorCode13.InvalidParameter,
         "Params were missing or incorrect",
         "Params were missing or incorrect",
         { params },
@@ -15281,15 +15432,19 @@ var FirstClassActions = class {
   async addUserToGroup(auth, userId, params, txOptions = globalThis.globalEnvOption) {
     params.userId = pad8(params.userId, { size: 32 });
     params.groupId = pad8(params.groupId, { size: 32 });
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const onChainGroupData = await getOnChainGroupData(
       params.groupId,
       chain,
-      await this.getAddress()
+      await this.getAddress(txOptions),
+      txOptions
     );
     if (!onChainGroupData || onChainGroupData.memberIds.length === 0) {
       throw new ResourceNotFoundError7(
-        ErrorCode14.GroupNotFound,
+        ErrorCode13.GroupNotFound,
         "group is not found",
         "group is not found",
         { params },
@@ -15302,7 +15457,7 @@ var FirstClassActions = class {
     members.add(params.userId);
     if (members.size <= originalMembers.size) {
       throw new InvalidParameterError12(
-        ErrorCode14.UserAlreadyExists,
+        ErrorCode13.UserAlreadyExists,
         "user already exists in group",
         "user already exists in group",
         { params, originalMembers, userId: params.userId },
@@ -15331,15 +15486,19 @@ var FirstClassActions = class {
   async removeUserFromGroup(auth, userId, params, txOptions = globalThis.globalEnvOption) {
     params.userId = pad8(params.userId, { size: 32 });
     params.groupId = pad8(params.groupId, { size: 32 });
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const onChainGroupData = await getOnChainGroupData(
       params.groupId,
       chain,
-      await this.getAddress()
+      await this.getAddress(txOptions),
+      txOptions
     );
     if (!onChainGroupData || onChainGroupData.memberIds.length === 0) {
       throw new ResourceNotFoundError7(
-        ErrorCode14.GroupNotFound,
+        ErrorCode13.GroupNotFound,
         "group is not found",
         "group is not found",
         { params },
@@ -15352,7 +15511,7 @@ var FirstClassActions = class {
     members.delete(params.userId);
     if (members.size >= originalMembers.size) {
       throw new ResourceNotFoundError7(
-        ErrorCode14.UserNotFound,
+        ErrorCode13.UserNotFound,
         "user does not exist in group",
         "user does not exist in group",
         { params, originalMembers, userId: params.userId },
@@ -15380,15 +15539,19 @@ var FirstClassActions = class {
    */
   async updateThresholdOfGroup(auth, userId, params, txOptions = globalThis.globalEnvOption) {
     params.groupId = pad8(params.groupId, { size: 32 });
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const onChainGroupData = await getOnChainGroupData(
       params.groupId,
       chain,
-      await this.getAddress()
+      await this.getAddress(txOptions),
+      txOptions
     );
     if (!onChainGroupData || onChainGroupData.memberIds.length === 0) {
       throw new ResourceNotFoundError7(
-        ErrorCode14.GroupNotFound,
+        ErrorCode13.GroupNotFound,
         "group is not found",
         "group is not found",
         { params },
@@ -15398,7 +15561,7 @@ var FirstClassActions = class {
     }
     if (!Number.isInteger(params.threshold) || params.threshold < 1 || params.threshold > onChainGroupData.memberIds.length) {
       throw new InvalidParameterError12(
-        ErrorCode14.InvalidThreshold,
+        ErrorCode13.InvalidThreshold,
         "threshold can not be 0 or bigger than number of members in the group",
         "threshold can not be 0 or bigger than number of members in the group",
         { params, memberIds: onChainGroupData.memberIds },
@@ -15438,7 +15601,7 @@ var FirstClassActions = class {
    * @returns {Promise<Operation>} The prepared batch operation.
    */
   async createBatchOperation(auth, userId, params, txOptions = globalThis.globalEnvOption) {
-    const walletAddress = await this.getAddress();
+    const walletAddress = await this.getAddress(txOptions);
     const txParams = createExecuteBatchTxParams(params, walletAddress);
     return await this.createOperation(auth, userId, txParams, txOptions);
   }
@@ -15459,7 +15622,7 @@ var FunWallet = class extends FirstClassActions {
         this.address = params;
       } else {
         throw new InvalidParameterError13(
-          ErrorCode15.InvalidParameter,
+          ErrorCode14.InvalidParameter,
           "string input must be an address type",
           "string input must be an address type",
           params,
@@ -15471,7 +15634,7 @@ var FunWallet = class extends FirstClassActions {
       const { users, uniqueId } = params;
       if (!uniqueId || !isBytes32(uniqueId) || !users || users.length <= 0) {
         throw new InvalidParameterError13(
-          ErrorCode15.InvalidParameter,
+          ErrorCode14.InvalidParameter,
           "uniqueId must be bytes32 and users must be non-empty",
           "uniqueId must be bytes32 and users must be non-empty",
           params,
@@ -15483,7 +15646,7 @@ var FunWallet = class extends FirstClassActions {
         users?.map((user) => {
           if (!user.userId || !isHex3(user.userId)) {
             throw new InvalidParameterError13(
-              ErrorCode15.InvalidParameter,
+              ErrorCode14.InvalidParameter,
               "userId is required and must be a hex string",
               "userId is required and must be a hex string",
               users,
@@ -15493,7 +15656,7 @@ var FunWallet = class extends FirstClassActions {
           }
           if (user.groupInfo && (!Number.isInteger(user.groupInfo.threshold) || !Array.isArray(user.groupInfo.memberIds) || !user.groupInfo.memberIds.every((memberId) => isHex3(memberId)))) {
             throw new InvalidParameterError13(
-              ErrorCode15.InvalidParameter,
+              ErrorCode14.InvalidParameter,
               "groupInfo must be an object with threshold as integer and memberIds as array of hex strings",
               "groupInfo must be an object with threshold as integer and memberIds as array of hex strings",
               users,
@@ -15516,8 +15679,12 @@ var FunWallet = class extends FirstClassActions {
     if (!this.address) {
       const chainIdentifier = txOptions.chain;
       this.address = await getWalletAddress(
-        await Chain.getChain({ chainIdentifier: chainIdentifier ?? 137 }),
-        this.walletUniqueId
+        await Chain.getChain(
+          { chainIdentifier: chainIdentifier ?? 137 },
+          txOptions
+        ),
+        this.walletUniqueId,
+        txOptions
       );
     }
     return this.address;
@@ -15528,11 +15695,12 @@ var FunWallet = class extends FirstClassActions {
    * @param {string} apiKey - The API key to access the required resources.
    * @returns {Promise<Address>} The wallet address.
    */
-  static async getAddress(uniqueId, apiKey) {
+  static async getAddress(uniqueId, apiKey, options) {
     globalThis.globalEnvOption.apiKey = apiKey;
     return await getWalletAddress(
-      await Chain.getChain({ chainIdentifier: 137 }),
-      keccak2567(toBytes7(uniqueId))
+      await Chain.getChain({ chainIdentifier: 137 }, options),
+      keccak2567(toBytes7(uniqueId)),
+      options
     );
   }
   /**
@@ -15542,15 +15710,16 @@ var FunWallet = class extends FirstClassActions {
    * @param {Address} factoryAddress - The address of the factory contract.
    * @returns {Promise<Address>} The wallet address.
    */
-  static async getAddressOffline(uniqueId, rpcUrl, factoryAddress) {
-    const client = await createPublicClient2({
+  static async getAddressOffline(uniqueId, rpcUrl, factoryAddress, options) {
+    const client = createPublicClient2({
       transport: http3(rpcUrl)
     });
     return await FACTORY_CONTRACT_INTERFACE.readFromChain(
       factoryAddress,
       "getAddress",
       [keccak2567(toBytes7(uniqueId))],
-      client
+      client,
+      options
     );
   }
   /**
@@ -15559,26 +15728,33 @@ var FunWallet = class extends FirstClassActions {
    * @param {boolean} onlyVerifiedTokens If true, only return alchemy tokens that are verified(filters spam) - defaults to false
    * @returns JSON
    */
-  async getTokens(chainIdInput, onlyVerifiedTokens = false) {
+  async getTokens(chainIdInput, onlyVerifiedTokens = false, options) {
     let chainId;
     if (!chainIdInput) {
-      const chain = await Chain.getChain({
-        chainIdentifier: globalThis.globalEnvOption.chain
-      });
-      chainId = await chain.getChainId();
+      const chain = await Chain.getChain(
+        {
+          chainIdentifier: globalThis.globalEnvOption.chain
+        },
+        options
+      );
+      chainId = await chain.getChainId(options);
     } else {
       chainId = chainIdInput;
     }
-    const walletAddress = await this.getAddress();
+    const walletAddress = await this.getAddress(options);
     return chainId === "ALL" ? await getAllWalletTokens({
       walletAddress,
       onlyVerifiedTokens,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     }) : await getAllWalletTokensByChainId({
       chainId,
       walletAddress,
       onlyVerifiedTokens,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     });
   }
   /**
@@ -15586,32 +15762,41 @@ var FunWallet = class extends FirstClassActions {
    * @param {string} chainId string version of the chainId or ALL. If empty, then default to the one in globalEnvOption
    * @returns array
    */
-  async getNFTs(chainIdInput) {
+  async getNFTs(chainIdInput, options) {
     let chainId;
     if (!chainIdInput) {
-      const chain = await Chain.getChain({
-        chainIdentifier: globalThis.globalEnvOption.chain
-      });
-      chainId = await chain.getChainId();
+      const chain = await Chain.getChain(
+        {
+          chainIdentifier: globalThis.globalEnvOption.chain
+        },
+        options
+      );
+      chainId = await chain.getChainId(options);
     } else {
       chainId = chainIdInput;
     }
-    const walletAddress = await this.getAddress();
+    const walletAddress = await this.getAddress(options);
     return chainId === "ALL" ? await getAllWalletNFTs({
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     }) : await getAllWalletNFTsByChainId({
       chainId,
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     });
   }
-  async getLidoWithdrawals() {
-    const walletAddress = await this.getAddress();
+  async getLidoWithdrawals(options) {
+    const walletAddress = await this.getAddress(options);
     return await getWalletLidoWithdrawalsByChainId({
       chainId: "1",
       walletAddress,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: options?.logger,
+      signal: options?.signal
     });
   }
   /**
@@ -15621,18 +15806,21 @@ var FunWallet = class extends FirstClassActions {
    * @param {boolean} checkStatus true if you want to check if the address has any pending lido withdrawals
    * @returns JSON of all tokens owned by address
    */
-  async getAssets(chainIdInput, onlyVerifiedTokens = false, checkStatus = false) {
+  async getAssets(chainIdInput, onlyVerifiedTokens = false, checkStatus = false, options) {
     let chainId;
     if (!chainIdInput) {
-      const chain = await Chain.getChain({
-        chainIdentifier: globalThis.globalEnvOption.chain
-      });
-      chainId = await chain.getChainId();
+      const chain = await Chain.getChain(
+        {
+          chainIdentifier: globalThis.globalEnvOption.chain
+        },
+        options
+      );
+      chainId = await chain.getChainId(options);
     } else {
       chainId = chainIdInput;
     }
-    const tokens = await this.getTokens(chainId, onlyVerifiedTokens);
-    const lidoWithdrawals = checkStatus ? await this.getLidoWithdrawals() : {};
+    const tokens = await this.getTokens(chainId, onlyVerifiedTokens, options);
+    const lidoWithdrawals = checkStatus ? await this.getLidoWithdrawals(options) : {};
     return { ...lidoWithdrawals, ...tokens };
   }
   /**
@@ -15644,8 +15832,14 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<bigint>} The nonce value.
    */
   async getNonce(sender, key = generateRandomNonceKey(), txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-    const entryPointAddress = await chain.getAddress("entryPointAddress");
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
+    const entryPointAddress = await chain.getAddress(
+      "entryPointAddress",
+      txOptions
+    );
     let nonce = void 0;
     let retryCount = 3;
     while ((nonce === void 0 || nonce === null) && retryCount > 0) {
@@ -15653,7 +15847,8 @@ var FunWallet = class extends FirstClassActions {
         entryPointAddress,
         "getNonce",
         [sender, key],
-        chain
+        chain,
+        txOptions
       );
       retryCount--;
     }
@@ -15669,12 +15864,17 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<OperationData[]>} A list of operations.
    */
   async getOperations(status = OperationStatus.ALL, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     return await getOpsOfWallet({
       walletAddr: await this.getAddress(txOptions),
-      chainId: await chain.getChainId(),
+      chainId: await chain.getChainId(txOptions),
       status,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     });
   }
   /**
@@ -15684,11 +15884,16 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<OperationData>} The requested operation.
    */
   async getOperation(opId, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     return (await getOps({
       opIds: [opId],
-      chainId: await chain.getChainId(),
-      apiKey: globalThis.globalEnvOption.apiKey
+      chainId: await chain.getChainId(txOptions),
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     }))[0];
   }
   /**
@@ -15698,10 +15903,14 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<User[]>} A list of users with their group information.
    */
   async getUsers(auth, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const storedUserIds = await auth.getUserIds(
       await this.getAddress(txOptions),
-      await chain.getChainId()
+      await chain.getChainId(txOptions),
+      txOptions
     );
     const userIds = /* @__PURE__ */ new Set([...storedUserIds]);
     if (this.userInfo) {
@@ -15721,8 +15930,10 @@ var FunWallet = class extends FirstClassActions {
     if (groupIds && groupIds.length > 0) {
       const groups = await getGroups({
         groupIds,
-        chainId: await chain.getChainId(),
-        apiKey: globalThis.globalEnvOption.apiKey
+        chainId: await chain.getChainId(txOptions),
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       });
       for (const group of groups) {
         users.push({
@@ -15742,8 +15953,14 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<boolean>} `true` if the address is a contract, `false` otherwise.
    */
   async getDeploymentStatus(txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-    return await chain.addressIsContract(await this.getAddress(txOptions));
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
+    return await chain.addressIsContract(
+      await this.getAddress(txOptions),
+      txOptions
+    );
   }
   /**
    * Creates the wallet.
@@ -15772,28 +15989,41 @@ var FunWallet = class extends FirstClassActions {
    * @returns A Promise that resolves when the wallet is saved to the authentication system.
    */
   async saveWalletToAuth(auth, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const walletAddr = await this.getAddress(txOptions);
     const userId = await auth.getUserId();
-    const users = await auth.getUserIds(walletAddr, await chain.getChainId());
+    const users = await auth.getUserIds(
+      walletAddr,
+      await chain.getChainId(txOptions),
+      txOptions
+    );
     if (!users.includes(userId)) {
       if (await checkWalletAccessInitialization({
         walletAddr,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       }) === false) {
         await initializeWalletAccess({
           walletAddr,
           creatorAddr: await auth.getAddress(),
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions?.logger,
+          signal: txOptions?.signal
         });
       }
       await addUserToWallet({
         authId: await auth.getAddress(),
-        chainId: await chain.getChainId(),
+        chainId: await chain.getChainId(txOptions),
         walletAddr,
         userIds: [userId],
         walletUniqueId: this.walletUniqueId,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       });
     }
   }
@@ -15808,7 +16038,7 @@ var FunWallet = class extends FirstClassActions {
   async createOperation(auth, userId, transactionParams, txOptions = globalThis.globalEnvOption) {
     if (!userId || userId === "") {
       throw new InvalidParameterError13(
-        ErrorCode15.MissingParameter,
+        ErrorCode14.MissingParameter,
         "userId is required",
         "userId is required",
         { userId },
@@ -15819,16 +16049,19 @@ var FunWallet = class extends FirstClassActions {
     const normalizedUserId = pad9(userId, {
       size: 32
     }).toLowerCase();
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const sender = await this.getAddress(txOptions);
-    const initCode = await chain.addressIsContract(sender) ? "0x" : await this.getThisInitCode(chain);
+    const initCode = await chain.addressIsContract(sender, txOptions) ? "0x" : await this.getThisInitCode(chain, txOptions);
     let paymasterAndData = "0x";
     let maxFeePerGas;
     let maxPriorityFeePerGas;
-    const chainId = await chain.getChainId();
+    const chainId = await chain.getChainId(txOptions);
     const OPStackChains = ["10", "8453"];
     if (OPStackChains.includes(chainId)) {
-      const gasPrice = await chain.getFeeData();
+      const gasPrice = await chain.getFeeData(txOptions);
       maxFeePerGas = gasPrice.maxFeePerGas;
       maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas;
     } else {
@@ -15847,18 +16080,18 @@ var FunWallet = class extends FirstClassActions {
       maxFeePerGas,
       maxPriorityFeePerGas,
       initCode,
-      nonce: txOptions.nonce !== null && txOptions.nonce !== void 0 ? txOptions.nonce : await this.getNonce(sender),
+      nonce: txOptions.nonce !== null && txOptions.nonce !== void 0 ? txOptions.nonce : await this.getNonce(sender, void 0, txOptions),
       preVerificationGas: 100000n,
       callGasLimit: BigInt(1e7),
       verificationGasLimit: BigInt(1e7)
     };
-    if (await chain.getChainId() === "36865") {
+    if (await chain.getChainId(txOptions) === "36865") {
       partialOp.callGasLimit = BigInt(1e6);
       partialOp.verificationGasLimit = BigInt(1e6);
     }
     const isGroupOp = await auth.getUserId() !== normalizedUserId;
     const operation = new Operation(partialOp, {
-      chainId: await chain.getChainId(),
+      chainId: await chain.getChainId(txOptions),
       opType: isGroupOp ? OperationType.GROUP_OPERATION : OperationType.SINGLE_OPERATION,
       authType: isGroupOp ? AuthType2.MULTI_SIG : AuthType2.ECDSA,
       walletAddr: await this.getAddress(txOptions),
@@ -15901,22 +16134,29 @@ var FunWallet = class extends FirstClassActions {
     estimatedOperation.userOp.signature = await auth.signOp(
       estimatedOperation,
       chain,
-      isGroupOperation(operation)
+      isGroupOperation(operation),
+      txOptions
     );
     if (txOptions.skipDBAction !== true) {
       const opId = await createOp({
         op: estimatedOperation,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       });
       estimatedOperation.opId = opId;
       if (!await checkWalletAccessInitialization({
         walletAddr: sender,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       })) {
         await initializeWalletAccess({
           walletAddr: sender,
           creatorAddr: await auth.getAddress(),
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions?.logger,
+          signal: txOptions?.signal
         });
       }
     }
@@ -15930,21 +16170,27 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<Operation>} The signed operation.
    */
   async signOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const finalOperation = Operation.convertTypeToObject(operation);
     finalOperation.userOp.signature = await auth.signOp(
       finalOperation,
       chain,
-      isGroupOperation(finalOperation)
+      isGroupOperation(finalOperation),
+      txOptions
     );
     if (isGroupOperation(finalOperation) && txOptions.skipDBAction !== true) {
       await signOp({
         opId: finalOperation.opId,
-        chainId: await chain.getChainId(),
+        chainId: await chain.getChainId(txOptions),
         signature: finalOperation.userOp.signature,
         signedBy: await auth.getAddress(),
         threshold: this.userInfo?.get(finalOperation.groupId)?.groupInfo?.threshold,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions?.logger,
+        signal: txOptions?.signal
       });
     }
     return finalOperation;
@@ -15960,16 +16206,21 @@ var FunWallet = class extends FirstClassActions {
   async executeOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
     const finalTxOptions = parseOptions(txOptions);
     const finalOperation = Operation.convertTypeToObject(operation);
-    const chain = await Chain.getChain({
-      chainIdentifier: finalTxOptions.chain
-    });
-    const chainId = await chain.getChainId();
+    const chain = await Chain.getChain(
+      {
+        chainIdentifier: finalTxOptions.chain
+      },
+      txOptions
+    );
+    const chainId = await chain.getChainId(txOptions);
     if (finalTxOptions.skipDBAction !== true) {
       if (isGroupOperation(finalOperation)) {
         const groups = await getGroups({
           groupIds: [finalOperation.groupId],
           chainId,
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions?.logger,
+          signal: txOptions?.signal
         });
         if (groups && groups.length > 0) {
           this.userInfo?.set(finalOperation.groupId, {
@@ -15988,7 +16239,8 @@ var FunWallet = class extends FirstClassActions {
         finalOperation.userOp.signature = await auth.signOp(
           finalOperation,
           chain,
-          isGroupOperation(finalOperation)
+          isGroupOperation(finalOperation),
+          txOptions
         );
       }
     } else {
@@ -15996,7 +16248,9 @@ var FunWallet = class extends FirstClassActions {
         const storedOps = await getOps({
           opIds: [finalOperation.opId],
           chainId,
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions?.logger,
+          signal: txOptions?.signal
         });
         let collectedSigCount;
         if (isSignatureMissing(await auth.getUserId(), storedOps[0]?.signatures)) {
@@ -16005,7 +16259,8 @@ var FunWallet = class extends FirstClassActions {
             finalOperation.userOp.signature = await auth.signOp(
               finalOperation,
               chain,
-              isGroupOperation(finalOperation)
+              isGroupOperation(finalOperation),
+              txOptions
             );
           }
         } else {
@@ -16013,7 +16268,7 @@ var FunWallet = class extends FirstClassActions {
         }
         if (collectedSigCount < threshold) {
           throw new InvalidParameterError13(
-            ErrorCode15.InsufficientSignatures,
+            ErrorCode14.InsufficientSignatures,
             "Signatures are not sufficient to execute the operation",
             "Signatures are not sufficient to execute the operation",
             { threshold, collectedSigCount, chainId },
@@ -16023,7 +16278,7 @@ var FunWallet = class extends FirstClassActions {
         }
       } else {
         throw new InvalidParameterError13(
-          ErrorCode15.InsufficientSignatures,
+          ErrorCode14.InsufficientSignatures,
           "Signatures are not sufficient to execute the operation",
           "Signatures are not sufficient to execute the operation",
           { threshold, chainId, skipDBAction: finalTxOptions.skipDBAction },
@@ -16039,11 +16294,16 @@ var FunWallet = class extends FirstClassActions {
           opId: finalOperation.opId,
           chainId,
           executedBy: await auth.getAddress(),
-          entryPointAddress: await chain.getAddress("entryPointAddress"),
+          entryPointAddress: await chain.getAddress(
+            "entryPointAddress",
+            txOptions
+          ),
           signature: finalOperation.userOp.signature,
           groupInfo: this.userInfo?.get(finalOperation.groupId)?.groupInfo
         },
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions.logger,
+        signal: txOptions.signal
       });
     } else {
       receipt = await executeOp({
@@ -16051,18 +16311,25 @@ var FunWallet = class extends FirstClassActions {
           opId: finalOperation.opId,
           chainId,
           executedBy: await auth.getAddress(),
-          entryPointAddress: await chain.getAddress("entryPointAddress"),
+          entryPointAddress: await chain.getAddress(
+            "entryPointAddress",
+            txOptions
+          ),
           signature: finalOperation.userOp.signature,
           userOp: finalOperation.userOp
         },
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions.logger,
+        signal: txOptions.signal
       });
     }
     receipt = await getFullReceipt({
       opId: finalOperation.opId,
       chainId,
       userOpHash: receipt.userOpHash,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions.logger,
+      signal: txOptions.signal
     });
     if (isWalletInitOp(finalOperation.userOp) && finalTxOptions.skipDBAction !== true) {
       await addUserToWallet({
@@ -16071,7 +16338,9 @@ var FunWallet = class extends FirstClassActions {
         walletAddr: await this.getAddress(finalTxOptions),
         userIds: Array.from(this.userInfo.keys()),
         walletUniqueId: this.walletUniqueId,
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: finalTxOptions.logger,
+        signal: finalTxOptions.signal
       });
       if (finalTxOptions?.gasSponsor?.sponsorAddress) {
         const paymasterType = getPaymasterType(finalTxOptions);
@@ -16090,7 +16359,9 @@ var FunWallet = class extends FirstClassActions {
           },
           paymasterType,
           sponsorAddress: finalTxOptions.gasSponsor.sponsorAddress,
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: finalTxOptions.logger,
+          signal: finalTxOptions.signal
         });
       }
     }
@@ -16107,14 +16378,19 @@ var FunWallet = class extends FirstClassActions {
   async scheduleOperation(auth, operation, txOptions = globalThis.globalEnvOption) {
     const finalTxOptions = parseOptions(txOptions);
     const finalOperation = Operation.convertTypeToObject(operation);
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
-    const chainId = await chain.getChainId();
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
+    const chainId = await chain.getChainId(txOptions);
     if (finalTxOptions.skipDBAction !== true) {
       if (isGroupOperation(finalOperation)) {
         const groups = await getGroups({
           groupIds: [finalOperation.groupId],
           chainId,
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions.logger,
+          signal: txOptions.signal
         });
         if (groups && groups.length > 0) {
           this.userInfo?.set(finalOperation.groupId, {
@@ -16133,7 +16409,8 @@ var FunWallet = class extends FirstClassActions {
         finalOperation.userOp.signature = await auth.signOp(
           finalOperation,
           chain,
-          isGroupOperation(finalOperation)
+          isGroupOperation(finalOperation),
+          txOptions
         );
       }
     } else {
@@ -16141,7 +16418,9 @@ var FunWallet = class extends FirstClassActions {
         const storedOps = await getOps({
           opIds: [finalOperation.opId],
           chainId,
-          apiKey: globalThis.globalEnvOption.apiKey
+          apiKey: globalThis.globalEnvOption.apiKey,
+          logger: txOptions.logger,
+          signal: txOptions.signal
         });
         let collectedSigCount;
         if (isSignatureMissing(await auth.getUserId(), storedOps[0]?.signatures)) {
@@ -16150,7 +16429,8 @@ var FunWallet = class extends FirstClassActions {
             finalOperation.userOp.signature = await auth.signOp(
               finalOperation,
               chain,
-              isGroupOperation(finalOperation)
+              isGroupOperation(finalOperation),
+              txOptions
             );
           }
         } else {
@@ -16158,7 +16438,7 @@ var FunWallet = class extends FirstClassActions {
         }
         if (collectedSigCount < threshold) {
           throw new InvalidParameterError13(
-            ErrorCode15.InsufficientSignatures,
+            ErrorCode14.InsufficientSignatures,
             "Signatures are not sufficient to execute the operation",
             "Signatures are not sufficient to execute the operation",
             { threshold, collectedSigCount, chainId },
@@ -16168,7 +16448,7 @@ var FunWallet = class extends FirstClassActions {
         }
       } else {
         throw new InvalidParameterError13(
-          ErrorCode15.InsufficientSignatures,
+          ErrorCode14.InsufficientSignatures,
           "Signatures are not sufficient to execute the operation",
           "Signatures are not sufficient to execute the operation",
           { threshold, chainId, skipDBAction: finalTxOptions.skipDBAction },
@@ -16183,11 +16463,16 @@ var FunWallet = class extends FirstClassActions {
           opId: finalOperation.opId,
           chainId,
           scheduledBy: await auth.getAddress(),
-          entryPointAddress: await chain.getAddress("entryPointAddress"),
+          entryPointAddress: await chain.getAddress(
+            "entryPointAddress",
+            txOptions
+          ),
           signature: finalOperation.userOp.signature,
           groupInfo: this.userInfo?.get(finalOperation.groupId)?.groupInfo
         },
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions.logger,
+        signal: txOptions.signal
       });
     } else {
       await scheduleOp({
@@ -16195,16 +16480,21 @@ var FunWallet = class extends FirstClassActions {
           opId: finalOperation.opId,
           chainId,
           scheduledBy: await auth.getAddress(),
-          entryPointAddress: await chain.getAddress("entryPointAddress"),
+          entryPointAddress: await chain.getAddress(
+            "entryPointAddress",
+            txOptions
+          ),
           signature: finalOperation.userOp.signature,
           userOp: finalOperation.userOp
         },
-        apiKey: globalThis.globalEnvOption.apiKey
+        apiKey: globalThis.globalEnvOption.apiKey,
+        logger: txOptions.logger,
+        signal: txOptions.signal
       });
     }
     if (!finalOperation.opId) {
-      throw new InternalFailureError5(
-        ErrorCode15.ServerFailure,
+      throw new InternalFailureError4(
+        ErrorCode14.ServerFailure,
         "Operation id is required",
         "",
         finalOperation,
@@ -16222,11 +16512,16 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<void>} A promise that resolves after the operation is removed.
    */
   async removeOperation(_, operationId, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     await deleteOp({
       opId: operationId,
-      chainId: await chain.getChainId(),
-      apiKey: globalThis.globalEnvOption.apiKey
+      chainId: await chain.getChainId(txOptions),
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions?.logger,
+      signal: txOptions?.signal
     });
   }
   /**
@@ -16254,7 +16549,9 @@ var FunWallet = class extends FirstClassActions {
     rejectOperation.opType = OperationType.REJECTION;
     rejectOperation.opId = await createOp({
       op: rejectOperation,
-      apiKey: globalThis.globalEnvOption.apiKey
+      apiKey: globalThis.globalEnvOption.apiKey,
+      logger: txOptions.logger,
+      signal: txOptions.signal
     });
     return rejectOperation;
   }
@@ -16267,7 +16564,10 @@ var FunWallet = class extends FirstClassActions {
    * @returns {Promise<Operation>} The updated operation with gas estimation details.
    */
   async estimateOperation(auth, userId, operation, txOptions = globalThis.globalEnvOption) {
-    const chain = await Chain.getChain({ chainIdentifier: txOptions.chain });
+    const chain = await Chain.getChain(
+      { chainIdentifier: txOptions.chain },
+      txOptions
+    );
     const estimateGasSignature = await auth.getEstimateGasSignature(
       userId,
       operation
@@ -16279,17 +16579,20 @@ var FunWallet = class extends FirstClassActions {
       // ...res,
       paymasterAndData
     };
-    const { maxFeePerGas, maxPriorityFeePerGas } = await chain.getFeeData();
+    const { maxFeePerGas, maxPriorityFeePerGas } = await chain.getFeeData(txOptions);
     operation.userOp.maxFeePerGas = maxFeePerGas;
     operation.userOp.maxPriorityFeePerGas = maxPriorityFeePerGas;
     return operation;
   }
-  async getThisInitCode(chain) {
+  async getThisInitCode(chain, options) {
     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",
+      options
+    );
+    const factoryAddress = await chain.getAddress("factoryAddress", options);
+    const rbac = await chain.getAddress("rbacAddress", options);
+    const userAuth = await chain.getAddress("userAuthAddress", options);
     const loginData = {
       salt: this.walletUniqueId
     };
@@ -16351,7 +16654,7 @@ var FunWallet = class extends FirstClassActions {
       }
       if (!options.fee.token) {
         throw new InvalidParameterError13(
-          ErrorCode15.MissingParameter,
+          ErrorCode14.MissingParameter,
           "EnvOption.fee.token or EnvOption.gasSponsor.token is required",
           "EnvOption.fee.token or EnvOption.gasSponsor.token is required",
           { options },
@@ -16361,7 +16664,7 @@ var FunWallet = class extends FirstClassActions {
       }
       if (!options.fee.recipient) {
         throw new InvalidParameterError13(
-          ErrorCode15.MissingParameter,
+          ErrorCode14.MissingParameter,
           "EnvOption.fee.recipient is required",
           "EnvOption.fee.recipient is required",
           { options },
@@ -16369,11 +16672,14 @@ var FunWallet = class extends FirstClassActions {
           "https://docs.fun.xyz/how-to-guides/execute-transactions#execute-transactions"
         );
       }
-      const chain = await Chain.getChain({ chainIdentifier: options.chain });
+      const chain = await Chain.getChain(
+        { chainIdentifier: options.chain },
+        options
+      );
       const token = new Token(options.fee.token, chain);
       if (options.fee.gasPercent && !token.isNative) {
         throw new InvalidParameterError13(
-          ErrorCode15.InvalidParameterCombination,
+          ErrorCode14.InvalidParameterCombination,
           "GasPercent is only valid for native tokens",
           "GasPercent is only valid for native tokens",
           { options },
@@ -16384,11 +16690,11 @@ var FunWallet = class extends FirstClassActions {
       if (token.isNative) {
         options.fee.token = AddressZero;
       } else {
-        options.fee.token = await token.getAddress();
+        options.fee.token = await token.getAddress(options);
       }
       if (options.fee.amount) {
         options.fee.amount = Number(
-          await token.getDecimalAmount(options.fee.amount)
+          await token.getDecimalAmount(options.fee.amount, options)
         );
       } else if (options.fee.gasPercent) {
         const feedata2 = [options.fee.token, options.fee.recipient, 1];
@@ -16402,13 +16708,13 @@ var FunWallet = class extends FirstClassActions {
           { to: params.to, value: params.value, data: estimateGasCalldata },
           { ...options, fee: void 0 }
         );
-        const gasUsed = await operation.getMaxTxCost();
+        const gasUsed = operation.getMaxTxCost();
         options.fee.amount = Math.ceil(
           Number(gasUsed) * options.fee.gasPercent / 100
         );
       } else {
         throw new InvalidParameterError13(
-          ErrorCode15.MissingParameter,
+          ErrorCode14.MissingParameter,
           "EnvOption.fee.amount or EnvOption.fee.gasPercent is required",
           "EnvOption.fee.amount or EnvOption.fee.gasPercent is required",
           { options },
@@ -16517,7 +16823,6 @@ export {
   erc721TransferTransactionParams,
   finishUnstakeTransactionParams,
   fundWallet,
-  gasCalculation,
   gasSpecificChain,
   generatePrivateKey,
   generateRandomBytes32,
@@ -16557,11 +16862,6 @@ export {
   removeOwnerTxParams,
   requestUnstakeTransactionParams,
   roundToNearestBottomTenth,
-  sendDeleteRequest,
-  sendGetRequest,
-  sendPostRequest,
-  sendPutRequest,
-  sendRequest,
   stakeTransactionParams,
   stringify,
   toBytes32Arr,