@lifi/sdk-provider-solana 4.0.0-beta.5 → 4.0.0-beta.6

package/dist/cjs/actions/getSolanaBalance.js

@@ -29,18 +29,38 @@ const getSolanaBalanceDefault = async (client, _chainId, tokens, walletAddress)
 		}).send()), { id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}` })
 	]);
 	const blockNumber = slot.status === "fulfilled" ? BigInt(slot.value) : 0n;
-	const solBalance = balance.status === "fulfilled" ? BigInt(balance.value.value) : 0n;
-	const walletTokenAmounts = [...tokenAccountsByOwner.status === "fulfilled" ? tokenAccountsByOwner.value.value : [], ...token2022AccountsByOwner.status === "fulfilled" ? token2022AccountsByOwner.value.value : []].reduce((tokenAmounts, value) => {
+	const nativeBalanceOk = balance.status === "fulfilled";
+	const solBalance = nativeBalanceOk ? BigInt(balance.value.value) : 0n;
+	const tokenProgramOk = tokenAccountsByOwner.status === "fulfilled";
+	const token2022ProgramOk = token2022AccountsByOwner.status === "fulfilled";
+	const walletTokenAmounts = [...tokenProgramOk ? tokenAccountsByOwner.value.value : [], ...token2022ProgramOk ? token2022AccountsByOwner.value.value : []].reduce((tokenAmounts, value) => {
 		const tokenAccount = value.account.data.parsed.info;
 		const amount = BigInt(tokenAccount.tokenAmount.amount);
 		if (amount > 0n) tokenAmounts[tokenAccount.mint] = amount;
 		return tokenAmounts;
 	}, {});
-	walletTokenAmounts[SolSystemProgram] = solBalance;
+	const splZeroIsKnown = tokenProgramOk && token2022ProgramOk;
 	return tokens.map((token) => {
-		if (walletTokenAmounts[token.address]) return {
+		if (token.address === SolSystemProgram) {
+			if (!nativeBalanceOk) return {
+				...token,
+				blockNumber
+			};
+			return {
+				...token,
+				amount: solBalance,
+				blockNumber
+			};
+		}
+		const found = walletTokenAmounts[token.address];
+		if (found !== void 0) return {
 			...token,
-			amount: walletTokenAmounts[token.address],
+			amount: found,
+			blockNumber
+		};
+		if (splZeroIsKnown) return {
+			...token,
+			amount: 0n,
 			blockNumber
 		};
 		return {

package/dist/cjs/actions/getSolanaBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSolanaBalance.js","names":["callSolanaRpcsWithRetry"],"sources":["../../../src/actions/getSolanaBalance.ts"],"sourcesContent":["import type { SDKClient } from '@lifi/sdk'\nimport {\n  type ChainId,\n  type Token,\n  type TokenAmount,\n  withDedupe,\n} from '@lifi/sdk'\nimport { address, type JsonParsedTokenAccount } from '@solana/kit'\n\nimport { callSolanaRpcsWithRetry } from '../rpc/utils.js'\n\nconst SolSystemProgram = '11111111111111111111111111111111'\nconst TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'\nconst Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'\n\nexport const getSolanaBalance = async (\n  client: SDKClient,\n  walletAddress: string,\n  tokens: Token[]\n): Promise<TokenAmount[]> => {\n  if (tokens.length === 0) {\n    return []\n  }\n  const { chainId } = tokens[0]\n  for (const token of tokens) {\n    if (token.chainId !== chainId) {\n      console.warn('Requested tokens have to be on the same chain.')\n    }\n  }\n\n  return getSolanaBalanceDefault(client, chainId, tokens, walletAddress)\n}\n\nconst getSolanaBalanceDefault = async (\n  client: SDKClient,\n  _chainId: ChainId,\n  tokens: Token[],\n  walletAddress: string\n): Promise<TokenAmount[]> => {\n  // Convert addresses to Solana Kit's address type\n  const accountAddress = address(walletAddress)\n  const tokenProgramAddress = address(TokenProgramId)\n  const token2022ProgramAddress = address(Token2022ProgramId)\n\n  // Use Solana Kit's RPC API with the retry wrapper\n  const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] =\n    await Promise.allSettled([\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getSlot({ commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getSlot` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getBalance(accountAddress, { commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getBalance` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: tokenProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${TokenProgramId}`,\n        }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: token2022ProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}`,\n        }\n      ),\n    ])\n  const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n\n  const solBalance =\n    balance.status === 'fulfilled' ? BigInt(balance.value.value) : 0n\n\n  const walletTokenAmounts = [\n    ...(tokenAccountsByOwner.status === 'fulfilled'\n      ? tokenAccountsByOwner.value.value\n      : []),\n    ...(token2022AccountsByOwner.status === 'fulfilled'\n      ? token2022AccountsByOwner.value.value\n      : []),\n  ].reduce(\n    (tokenAmounts: Record<string, bigint>, value) => {\n      const tokenAccount: JsonParsedTokenAccount =\n        value.account.data.parsed.info\n      const amount = BigInt(tokenAccount.tokenAmount.amount)\n      if (amount > 0n) {\n        tokenAmounts[tokenAccount.mint] = amount\n      }\n      return tokenAmounts\n    },\n    {} as Record<string, bigint>\n  )\n\n  walletTokenAmounts[SolSystemProgram] = solBalance\n  const tokenAmounts: TokenAmount[] = tokens.map((token) => {\n    if (walletTokenAmounts[token.address]) {\n      return {\n        ...token,\n        amount: walletTokenAmounts[token.address],\n        blockNumber,\n      }\n    }\n    return {\n      ...token,\n      blockNumber,\n    }\n  })\n  return tokenAmounts\n}\n"],"mappings":";;;;;AAWA,MAAM,mBAAmB;AACzB,MAAM,iBAAiB;AACvB,MAAM,qBAAqB;AAE3B,MAAa,mBAAmB,OAC9B,QACA,eACA,WAC2B;AAC3B,KAAI,OAAO,WAAW,EACpB,QAAO,EAAE;CAEX,MAAM,EAAE,YAAY,OAAO;AAC3B,MAAK,MAAM,SAAS,OAClB,KAAI,MAAM,YAAY,QACpB,SAAQ,KAAK,iDAAiD;AAIlE,QAAO,wBAAwB,QAAQ,SAAS,QAAQ,cAAc;;AAGxE,MAAM,0BAA0B,OAC9B,QACA,UACA,QACA,kBAC2B;CAE3B,MAAM,kBAAA,GAAA,YAAA,SAAyB,cAAc;CAC7C,MAAM,uBAAA,GAAA,YAAA,SAA8B,eAAe;CACnD,MAAM,2BAAA,GAAA,YAAA,SAAkC,mBAAmB;CAG3D,MAAM,CAAC,MAAM,SAAS,sBAAsB,4BAC1C,MAAM,QAAQ,WAAW;kCAGnBA,kBAAAA,wBAAwB,SAAS,QAC/B,IAAI,QAAQ,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CAChD,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,WAAW,CAClD;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IAAI,WAAW,gBAAgB,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CACnE,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,cAAc,CACrD;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,qBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,kBAChE,CACF;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,yBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,sBAChE,CACF;EACF,CAAC;CACJ,MAAM,cAAc,KAAK,WAAW,cAAc,OAAO,KAAK,MAAM,GAAG;CACvE,MAAM,aACJ,QAAQ,WAAW,cAAc,OAAO,QAAQ,MAAM,MAAM,GAAG;CAEjE,MAAM,qBAAqB,CACzB,GAAI,qBAAqB,WAAW,cAChC,qBAAqB,MAAM,QAC3B,EAAE,EACN,GAAI,yBAAyB,WAAW,cACpC,yBAAyB,MAAM,QAC/B,EAAE,CACP,CAAC,QACC,cAAsC,UAAU;EAC/C,MAAM,eACJ,MAAM,QAAQ,KAAK,OAAO;EAC5B,MAAM,SAAS,OAAO,aAAa,YAAY,OAAO;AACtD,MAAI,SAAS,GACX,cAAa,aAAa,QAAQ;AAEpC,SAAO;IAET,EAAE,CACH;AAED,oBAAmB,oBAAoB;AAcvC,QAboC,OAAO,KAAK,UAAU;AACxD,MAAI,mBAAmB,MAAM,SAC3B,QAAO;GACL,GAAG;GACH,QAAQ,mBAAmB,MAAM;GACjC;GACD;AAEH,SAAO;GACL,GAAG;GACH;GACD;GACD"}
+{"version":3,"file":"getSolanaBalance.js","names":["callSolanaRpcsWithRetry"],"sources":["../../../src/actions/getSolanaBalance.ts"],"sourcesContent":["import type { SDKClient } from '@lifi/sdk'\nimport {\n  type ChainId,\n  type Token,\n  type TokenAmount,\n  withDedupe,\n} from '@lifi/sdk'\nimport { address, type JsonParsedTokenAccount } from '@solana/kit'\n\nimport { callSolanaRpcsWithRetry } from '../rpc/utils.js'\n\nconst SolSystemProgram = '11111111111111111111111111111111'\nconst TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'\nconst Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'\n\nexport const getSolanaBalance = async (\n  client: SDKClient,\n  walletAddress: string,\n  tokens: Token[]\n): Promise<TokenAmount[]> => {\n  if (tokens.length === 0) {\n    return []\n  }\n  const { chainId } = tokens[0]\n  for (const token of tokens) {\n    if (token.chainId !== chainId) {\n      console.warn('Requested tokens have to be on the same chain.')\n    }\n  }\n\n  return getSolanaBalanceDefault(client, chainId, tokens, walletAddress)\n}\n\nconst getSolanaBalanceDefault = async (\n  client: SDKClient,\n  _chainId: ChainId,\n  tokens: Token[],\n  walletAddress: string\n): Promise<TokenAmount[]> => {\n  // Convert addresses to Solana Kit's address type\n  const accountAddress = address(walletAddress)\n  const tokenProgramAddress = address(TokenProgramId)\n  const token2022ProgramAddress = address(Token2022ProgramId)\n\n  // Use Solana Kit's RPC API with the retry wrapper\n  const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] =\n    await Promise.allSettled([\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getSlot({ commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getSlot` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getBalance(accountAddress, { commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getBalance` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: tokenProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${TokenProgramId}`,\n        }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: token2022ProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}`,\n        }\n      ),\n    ])\n  const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n\n  const nativeBalanceOk = balance.status === 'fulfilled'\n  const solBalance = nativeBalanceOk ? BigInt(balance.value.value) : 0n\n  const tokenProgramOk = tokenAccountsByOwner.status === 'fulfilled'\n  const token2022ProgramOk = token2022AccountsByOwner.status === 'fulfilled'\n\n  const walletTokenAmounts = [\n    ...(tokenProgramOk ? tokenAccountsByOwner.value.value : []),\n    ...(token2022ProgramOk ? token2022AccountsByOwner.value.value : []),\n  ].reduce(\n    (tokenAmounts: Record<string, bigint>, value) => {\n      const tokenAccount: JsonParsedTokenAccount =\n        value.account.data.parsed.info\n      const amount = BigInt(tokenAccount.tokenAmount.amount)\n      if (amount > 0n) {\n        tokenAmounts[tokenAccount.mint] = amount\n      }\n      return tokenAmounts\n    },\n    {} as Record<string, bigint>\n  )\n\n  // We can only confidently report 0n for an SPL mint when both Token and\n  // Token2022 program queries succeeded — otherwise the mint may live in the\n  // program whose query failed (e.g. PYUSD on Token2022).\n  const splZeroIsKnown = tokenProgramOk && token2022ProgramOk\n\n  const tokenAmounts: TokenAmount[] = tokens.map((token) => {\n    const isNative = token.address === SolSystemProgram\n    if (isNative) {\n      if (!nativeBalanceOk) {\n        return { ...token, blockNumber }\n      }\n      return { ...token, amount: solBalance, blockNumber }\n    }\n    const found = walletTokenAmounts[token.address]\n    if (found !== undefined) {\n      return { ...token, amount: found, blockNumber }\n    }\n    if (splZeroIsKnown) {\n      return { ...token, amount: 0n, blockNumber }\n    }\n    return { ...token, blockNumber }\n  })\n  return tokenAmounts\n}\n"],"mappings":";;;;;AAWA,MAAM,mBAAmB;AACzB,MAAM,iBAAiB;AACvB,MAAM,qBAAqB;AAE3B,MAAa,mBAAmB,OAC9B,QACA,eACA,WAC2B;AAC3B,KAAI,OAAO,WAAW,EACpB,QAAO,EAAE;CAEX,MAAM,EAAE,YAAY,OAAO;AAC3B,MAAK,MAAM,SAAS,OAClB,KAAI,MAAM,YAAY,QACpB,SAAQ,KAAK,iDAAiD;AAIlE,QAAO,wBAAwB,QAAQ,SAAS,QAAQ,cAAc;;AAGxE,MAAM,0BAA0B,OAC9B,QACA,UACA,QACA,kBAC2B;CAE3B,MAAM,kBAAA,GAAA,YAAA,SAAyB,cAAc;CAC7C,MAAM,uBAAA,GAAA,YAAA,SAA8B,eAAe;CACnD,MAAM,2BAAA,GAAA,YAAA,SAAkC,mBAAmB;CAG3D,MAAM,CAAC,MAAM,SAAS,sBAAsB,4BAC1C,MAAM,QAAQ,WAAW;kCAGnBA,kBAAAA,wBAAwB,SAAS,QAC/B,IAAI,QAAQ,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CAChD,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,WAAW,CAClD;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IAAI,WAAW,gBAAgB,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CACnE,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,cAAc,CACrD;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,qBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,kBAChE,CACF;kCAGGA,kBAAAA,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,yBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,sBAChE,CACF;EACF,CAAC;CACJ,MAAM,cAAc,KAAK,WAAW,cAAc,OAAO,KAAK,MAAM,GAAG;CACvE,MAAM,kBAAkB,QAAQ,WAAW;CAC3C,MAAM,aAAa,kBAAkB,OAAO,QAAQ,MAAM,MAAM,GAAG;CACnE,MAAM,iBAAiB,qBAAqB,WAAW;CACvD,MAAM,qBAAqB,yBAAyB,WAAW;CAE/D,MAAM,qBAAqB,CACzB,GAAI,iBAAiB,qBAAqB,MAAM,QAAQ,EAAE,EAC1D,GAAI,qBAAqB,yBAAyB,MAAM,QAAQ,EAAE,CACnE,CAAC,QACC,cAAsC,UAAU;EAC/C,MAAM,eACJ,MAAM,QAAQ,KAAK,OAAO;EAC5B,MAAM,SAAS,OAAO,aAAa,YAAY,OAAO;AACtD,MAAI,SAAS,GACX,cAAa,aAAa,QAAQ;AAEpC,SAAO;IAET,EAAE,CACH;CAKD,MAAM,iBAAiB,kBAAkB;AAmBzC,QAjBoC,OAAO,KAAK,UAAU;AAExD,MADiB,MAAM,YAAY,kBACrB;AACZ,OAAI,CAAC,gBACH,QAAO;IAAE,GAAG;IAAO;IAAa;AAElC,UAAO;IAAE,GAAG;IAAO,QAAQ;IAAY;IAAa;;EAEtD,MAAM,QAAQ,mBAAmB,MAAM;AACvC,MAAI,UAAU,KAAA,EACZ,QAAO;GAAE,GAAG;GAAO,QAAQ;GAAO;GAAa;AAEjD,MAAI,eACF,QAAO;GAAE,GAAG;GAAO,QAAQ;GAAI;GAAa;AAE9C,SAAO;GAAE,GAAG;GAAO;GAAa;GAChC"}

package/dist/cjs/core/tasks/SolanaSignAndExecuteTask.js

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_utils_base64ToUint8Array = require("../../utils/base64ToUint8Array.js");
 const require_utils_getWalletFeature = require("../../utils/getWalletFeature.js");
-const require_utils_withTimeout = require("../../utils/withTimeout.js");
 let _lifi_sdk = require("@lifi/sdk");
 let _solana_kit = require("@solana/kit");
 let _solana_wallet_standard_features = require("@solana/wallet-standard-features");
@@ -13,7 +12,7 @@ var SolanaSignAndExecuteTask = class extends _lifi_sdk.BaseStepExecutionTask {
 		if (!action) throw new _lifi_sdk.TransactionError(_lifi_sdk.LiFiErrorCode.TransactionUnprepared, "Unable to prepare transaction. Action not found.");
 		const transactionRequestData = await (0, _lifi_sdk.getTransactionRequestData)(step, executionOptions);
 		const transactionBytesArray = (Array.isArray(transactionRequestData) ? transactionRequestData : [transactionRequestData]).map((data) => require_utils_base64ToUint8Array.base64ToUint8Array(data));
-		const signedTransactionOutputs = await require_utils_withTimeout.withTimeout(async () => {
+		const signedTransactionOutputs = await (0, _lifi_sdk.withTimeout)(async () => {
 			const { signTransaction } = require_utils_getWalletFeature.getWalletFeature(wallet, _solana_wallet_standard_features.SolanaSignTransaction);
 			return signTransaction(...transactionBytesArray.map((transaction) => ({
 				account: walletAccount,

package/dist/cjs/core/tasks/SolanaSignAndExecuteTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolanaSignAndExecuteTask.js","names":["BaseStepExecutionTask","TransactionError","LiFiErrorCode","base64ToUint8Array","withTimeout","getWalletFeature","SolanaSignTransaction"],"sources":["../../../../src/core/tasks/SolanaSignAndExecuteTask.ts"],"sourcesContent":["import {\n  BaseStepExecutionTask,\n  getTransactionRequestData,\n  LiFiErrorCode,\n  type TaskResult,\n  TransactionError,\n} from '@lifi/sdk'\nimport { getTransactionCodec } from '@solana/kit'\nimport { SolanaSignTransaction } from '@solana/wallet-standard-features'\nimport type { SolanaStepExecutorContext } from '../../types.js'\nimport { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'\nimport { getWalletFeature } from '../../utils/getWalletFeature.js'\nimport { withTimeout } from '../../utils/withTimeout.js'\n\nexport class SolanaSignAndExecuteTask extends BaseStepExecutionTask {\n  async run(context: SolanaStepExecutorContext): Promise<TaskResult> {\n    const {\n      step,\n      wallet,\n      walletAccount,\n      statusManager,\n      executionOptions,\n      isBridgeExecution,\n    } = context\n\n    const action = statusManager.findAction(\n      step,\n      isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'\n    )\n    if (!action) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'Unable to prepare transaction. Action not found.'\n      )\n    }\n\n    const transactionRequestData = await getTransactionRequestData(\n      step,\n      executionOptions\n    )\n\n    // Handle both single transaction (string) and multiple transactions (array)\n    const transactionDataArray = Array.isArray(transactionRequestData)\n      ? transactionRequestData\n      : [transactionRequestData]\n\n    const transactionBytesArray = transactionDataArray.map((data) =>\n      base64ToUint8Array(data)\n    )\n\n    const signedTransactionOutputs = await withTimeout(\n      async () => {\n        const { signTransaction } = getWalletFeature(\n          wallet,\n          SolanaSignTransaction\n        )\n        // Spread the inputs to sign all transactions at once\n        return signTransaction(\n          ...transactionBytesArray.map((transaction) => ({\n            account: walletAccount,\n            transaction,\n          }))\n        )\n      },\n      {\n        // https://solana.com/docs/advanced/confirmation#transaction-expiration\n        // Use 2 minutes to account for fluctuations\n        timeout: 120_000,\n        errorInstance: new TransactionError(\n          LiFiErrorCode.TransactionExpired,\n          'Transaction has expired: blockhash is no longer recent enough.'\n        ),\n      }\n    )\n\n    if (signedTransactionOutputs.length === 0) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'No signed transaction returned from signer.'\n      )\n    }\n\n    statusManager.updateAction(step, action.type, 'PENDING', {\n      signedAt: Date.now(),\n    })\n\n    const transactionCodec = getTransactionCodec()\n\n    // Decode all signed transactions\n    const signedTransactions = signedTransactionOutputs.map((output) =>\n      transactionCodec.decode(output.signedTransaction)\n    )\n\n    return {\n      status: 'COMPLETED',\n      context: { signedTransactions },\n    }\n  }\n}\n"],"mappings":";;;;;;;;AAcA,IAAa,2BAAb,cAA8CA,UAAAA,sBAAsB;CAClE,MAAM,IAAI,SAAyD;EACjE,MAAM,EACJ,MACA,QACA,eACA,eACA,kBACA,sBACE;EAEJ,MAAM,SAAS,cAAc,WAC3B,MACA,oBAAoB,gBAAgB,OACrC;AACD,MAAI,CAAC,OACH,OAAM,IAAIC,UAAAA,iBACRC,UAAAA,cAAc,uBACd,mDACD;EAGH,MAAM,yBAAyB,OAAA,GAAA,UAAA,2BAC7B,MACA,iBACD;EAOD,MAAM,yBAJuB,MAAM,QAAQ,uBAAuB,GAC9D,yBACA,CAAC,uBAAuB,EAEuB,KAAK,SACtDC,iCAAAA,mBAAmB,KAAK,CACzB;EAED,MAAM,2BAA2B,MAAMC,0BAAAA,YACrC,YAAY;GACV,MAAM,EAAE,oBAAoBC,+BAAAA,iBAC1B,QACAC,iCAAAA,sBACD;AAED,UAAO,gBACL,GAAG,sBAAsB,KAAK,iBAAiB;IAC7C,SAAS;IACT;IACD,EAAE,CACJ;KAEH;GAGE,SAAS;GACT,eAAe,IAAIL,UAAAA,iBACjBC,UAAAA,cAAc,oBACd,iEACD;GACF,CACF;AAED,MAAI,yBAAyB,WAAW,EACtC,OAAM,IAAID,UAAAA,iBACRC,UAAAA,cAAc,uBACd,8CACD;AAGH,gBAAc,aAAa,MAAM,OAAO,MAAM,WAAW,EACvD,UAAU,KAAK,KAAK,EACrB,CAAC;EAEF,MAAM,oBAAA,GAAA,YAAA,sBAAwC;AAO9C,SAAO;GACL,QAAQ;GACR,SAAS,EAAE,oBANc,yBAAyB,KAAK,WACvD,iBAAiB,OAAO,OAAO,kBAAkB,CAClD,EAIgC;GAChC"}
+{"version":3,"file":"SolanaSignAndExecuteTask.js","names":["BaseStepExecutionTask","TransactionError","LiFiErrorCode","base64ToUint8Array","getWalletFeature","SolanaSignTransaction"],"sources":["../../../../src/core/tasks/SolanaSignAndExecuteTask.ts"],"sourcesContent":["import {\n  BaseStepExecutionTask,\n  getTransactionRequestData,\n  LiFiErrorCode,\n  type TaskResult,\n  TransactionError,\n  withTimeout,\n} from '@lifi/sdk'\nimport { getTransactionCodec } from '@solana/kit'\nimport { SolanaSignTransaction } from '@solana/wallet-standard-features'\nimport type { SolanaStepExecutorContext } from '../../types.js'\nimport { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'\nimport { getWalletFeature } from '../../utils/getWalletFeature.js'\n\nexport class SolanaSignAndExecuteTask extends BaseStepExecutionTask {\n  async run(context: SolanaStepExecutorContext): Promise<TaskResult> {\n    const {\n      step,\n      wallet,\n      walletAccount,\n      statusManager,\n      executionOptions,\n      isBridgeExecution,\n    } = context\n\n    const action = statusManager.findAction(\n      step,\n      isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'\n    )\n    if (!action) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'Unable to prepare transaction. Action not found.'\n      )\n    }\n\n    const transactionRequestData = await getTransactionRequestData(\n      step,\n      executionOptions\n    )\n\n    // Handle both single transaction (string) and multiple transactions (array)\n    const transactionDataArray = Array.isArray(transactionRequestData)\n      ? transactionRequestData\n      : [transactionRequestData]\n\n    const transactionBytesArray = transactionDataArray.map((data) =>\n      base64ToUint8Array(data)\n    )\n\n    const signedTransactionOutputs = await withTimeout(\n      async () => {\n        const { signTransaction } = getWalletFeature(\n          wallet,\n          SolanaSignTransaction\n        )\n        // Spread the inputs to sign all transactions at once\n        return signTransaction(\n          ...transactionBytesArray.map((transaction) => ({\n            account: walletAccount,\n            transaction,\n          }))\n        )\n      },\n      {\n        // https://solana.com/docs/advanced/confirmation#transaction-expiration\n        // Use 2 minutes to account for fluctuations\n        timeout: 120_000,\n        errorInstance: new TransactionError(\n          LiFiErrorCode.TransactionExpired,\n          'Transaction has expired: blockhash is no longer recent enough.'\n        ),\n      }\n    )\n\n    if (signedTransactionOutputs.length === 0) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'No signed transaction returned from signer.'\n      )\n    }\n\n    statusManager.updateAction(step, action.type, 'PENDING', {\n      signedAt: Date.now(),\n    })\n\n    const transactionCodec = getTransactionCodec()\n\n    // Decode all signed transactions\n    const signedTransactions = signedTransactionOutputs.map((output) =>\n      transactionCodec.decode(output.signedTransaction)\n    )\n\n    return {\n      status: 'COMPLETED',\n      context: { signedTransactions },\n    }\n  }\n}\n"],"mappings":";;;;;;;AAcA,IAAa,2BAAb,cAA8CA,UAAAA,sBAAsB;CAClE,MAAM,IAAI,SAAyD;EACjE,MAAM,EACJ,MACA,QACA,eACA,eACA,kBACA,sBACE;EAEJ,MAAM,SAAS,cAAc,WAC3B,MACA,oBAAoB,gBAAgB,OACrC;AACD,MAAI,CAAC,OACH,OAAM,IAAIC,UAAAA,iBACRC,UAAAA,cAAc,uBACd,mDACD;EAGH,MAAM,yBAAyB,OAAA,GAAA,UAAA,2BAC7B,MACA,iBACD;EAOD,MAAM,yBAJuB,MAAM,QAAQ,uBAAuB,GAC9D,yBACA,CAAC,uBAAuB,EAEuB,KAAK,SACtDC,iCAAAA,mBAAmB,KAAK,CACzB;EAED,MAAM,2BAA2B,OAAA,GAAA,UAAA,aAC/B,YAAY;GACV,MAAM,EAAE,oBAAoBC,+BAAAA,iBAC1B,QACAC,iCAAAA,sBACD;AAED,UAAO,gBACL,GAAG,sBAAsB,KAAK,iBAAiB;IAC7C,SAAS;IACT;IACD,EAAE,CACJ;KAEH;GAGE,SAAS;GACT,eAAe,IAAIJ,UAAAA,iBACjBC,UAAAA,cAAc,oBACd,iEACD;GACF,CACF;AAED,MAAI,yBAAyB,WAAW,EACtC,OAAM,IAAID,UAAAA,iBACRC,UAAAA,cAAc,uBACd,8CACD;AAGH,gBAAc,aAAa,MAAM,OAAO,MAAM,WAAW,EACvD,UAAU,KAAK,KAAK,EACrB,CAAC;EAEF,MAAM,oBAAA,GAAA,YAAA,sBAAwC;AAO9C,SAAO;GACL,QAAQ;GACR,SAAS,EAAE,oBANc,yBAAyB,KAAK,WACvD,iBAAiB,OAAO,OAAO,kBAAkB,CAClD,EAIgC;GAChC"}

package/dist/cjs/version.d.ts

@@ -1,6 +1,6 @@
 //#region src/version.d.ts
 declare const name = "@lifi/sdk-provider-solana";
-declare const version = "4.0.0-beta.5";
+declare const version = "4.0.0-beta.6";
 //#endregion
 export { name, version };
 //# sourceMappingURL=version.d.ts.map

package/dist/cjs/version.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/version.ts
 const name = "@lifi/sdk-provider-solana";
-const version = "4.0.0-beta.5";
+const version = "4.0.0-beta.6";
 //#endregion
 exports.name = name;
 exports.version = version;

package/dist/cjs/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","names":[],"sources":["../../src/version.ts"],"sourcesContent":["export const name = '@lifi/sdk-provider-solana'\nexport const version = '4.0.0-beta.5'\n"],"mappings":";;AAAA,MAAa,OAAO;AACpB,MAAa,UAAU"}
+{"version":3,"file":"version.js","names":[],"sources":["../../src/version.ts"],"sourcesContent":["export const name = '@lifi/sdk-provider-solana'\nexport const version = '4.0.0-beta.6'\n"],"mappings":";;AAAA,MAAa,OAAO;AACpB,MAAa,UAAU"}

package/dist/esm/actions/getSolanaBalance.js

@@ -28,18 +28,38 @@ const getSolanaBalanceDefault = async (client, _chainId, tokens, walletAddress)
 		}).send()), { id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}` })
 	]);
 	const blockNumber = slot.status === "fulfilled" ? BigInt(slot.value) : 0n;
-	const solBalance = balance.status === "fulfilled" ? BigInt(balance.value.value) : 0n;
-	const walletTokenAmounts = [...tokenAccountsByOwner.status === "fulfilled" ? tokenAccountsByOwner.value.value : [], ...token2022AccountsByOwner.status === "fulfilled" ? token2022AccountsByOwner.value.value : []].reduce((tokenAmounts, value) => {
+	const nativeBalanceOk = balance.status === "fulfilled";
+	const solBalance = nativeBalanceOk ? BigInt(balance.value.value) : 0n;
+	const tokenProgramOk = tokenAccountsByOwner.status === "fulfilled";
+	const token2022ProgramOk = token2022AccountsByOwner.status === "fulfilled";
+	const walletTokenAmounts = [...tokenProgramOk ? tokenAccountsByOwner.value.value : [], ...token2022ProgramOk ? token2022AccountsByOwner.value.value : []].reduce((tokenAmounts, value) => {
 		const tokenAccount = value.account.data.parsed.info;
 		const amount = BigInt(tokenAccount.tokenAmount.amount);
 		if (amount > 0n) tokenAmounts[tokenAccount.mint] = amount;
 		return tokenAmounts;
 	}, {});
-	walletTokenAmounts[SolSystemProgram] = solBalance;
+	const splZeroIsKnown = tokenProgramOk && token2022ProgramOk;
 	return tokens.map((token) => {
-		if (walletTokenAmounts[token.address]) return {
+		if (token.address === SolSystemProgram) {
+			if (!nativeBalanceOk) return {
+				...token,
+				blockNumber
+			};
+			return {
+				...token,
+				amount: solBalance,
+				blockNumber
+			};
+		}
+		const found = walletTokenAmounts[token.address];
+		if (found !== void 0) return {
 			...token,
-			amount: walletTokenAmounts[token.address],
+			amount: found,
+			blockNumber
+		};
+		if (splZeroIsKnown) return {
+			...token,
+			amount: 0n,
 			blockNumber
 		};
 		return {

package/dist/esm/actions/getSolanaBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSolanaBalance.js","names":[],"sources":["../../../src/actions/getSolanaBalance.ts"],"sourcesContent":["import type { SDKClient } from '@lifi/sdk'\nimport {\n  type ChainId,\n  type Token,\n  type TokenAmount,\n  withDedupe,\n} from '@lifi/sdk'\nimport { address, type JsonParsedTokenAccount } from '@solana/kit'\n\nimport { callSolanaRpcsWithRetry } from '../rpc/utils.js'\n\nconst SolSystemProgram = '11111111111111111111111111111111'\nconst TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'\nconst Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'\n\nexport const getSolanaBalance = async (\n  client: SDKClient,\n  walletAddress: string,\n  tokens: Token[]\n): Promise<TokenAmount[]> => {\n  if (tokens.length === 0) {\n    return []\n  }\n  const { chainId } = tokens[0]\n  for (const token of tokens) {\n    if (token.chainId !== chainId) {\n      console.warn('Requested tokens have to be on the same chain.')\n    }\n  }\n\n  return getSolanaBalanceDefault(client, chainId, tokens, walletAddress)\n}\n\nconst getSolanaBalanceDefault = async (\n  client: SDKClient,\n  _chainId: ChainId,\n  tokens: Token[],\n  walletAddress: string\n): Promise<TokenAmount[]> => {\n  // Convert addresses to Solana Kit's address type\n  const accountAddress = address(walletAddress)\n  const tokenProgramAddress = address(TokenProgramId)\n  const token2022ProgramAddress = address(Token2022ProgramId)\n\n  // Use Solana Kit's RPC API with the retry wrapper\n  const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] =\n    await Promise.allSettled([\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getSlot({ commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getSlot` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getBalance(accountAddress, { commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getBalance` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: tokenProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${TokenProgramId}`,\n        }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: token2022ProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}`,\n        }\n      ),\n    ])\n  const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n\n  const solBalance =\n    balance.status === 'fulfilled' ? BigInt(balance.value.value) : 0n\n\n  const walletTokenAmounts = [\n    ...(tokenAccountsByOwner.status === 'fulfilled'\n      ? tokenAccountsByOwner.value.value\n      : []),\n    ...(token2022AccountsByOwner.status === 'fulfilled'\n      ? token2022AccountsByOwner.value.value\n      : []),\n  ].reduce(\n    (tokenAmounts: Record<string, bigint>, value) => {\n      const tokenAccount: JsonParsedTokenAccount =\n        value.account.data.parsed.info\n      const amount = BigInt(tokenAccount.tokenAmount.amount)\n      if (amount > 0n) {\n        tokenAmounts[tokenAccount.mint] = amount\n      }\n      return tokenAmounts\n    },\n    {} as Record<string, bigint>\n  )\n\n  walletTokenAmounts[SolSystemProgram] = solBalance\n  const tokenAmounts: TokenAmount[] = tokens.map((token) => {\n    if (walletTokenAmounts[token.address]) {\n      return {\n        ...token,\n        amount: walletTokenAmounts[token.address],\n        blockNumber,\n      }\n    }\n    return {\n      ...token,\n      blockNumber,\n    }\n  })\n  return tokenAmounts\n}\n"],"mappings":";;;;AAWA,MAAM,mBAAmB;AACzB,MAAM,iBAAiB;AACvB,MAAM,qBAAqB;AAE3B,MAAa,mBAAmB,OAC9B,QACA,eACA,WAC2B;AAC3B,KAAI,OAAO,WAAW,EACpB,QAAO,EAAE;CAEX,MAAM,EAAE,YAAY,OAAO;AAC3B,MAAK,MAAM,SAAS,OAClB,KAAI,MAAM,YAAY,QACpB,SAAQ,KAAK,iDAAiD;AAIlE,QAAO,wBAAwB,QAAQ,SAAS,QAAQ,cAAc;;AAGxE,MAAM,0BAA0B,OAC9B,QACA,UACA,QACA,kBAC2B;CAE3B,MAAM,iBAAiB,QAAQ,cAAc;CAC7C,MAAM,sBAAsB,QAAQ,eAAe;CACnD,MAAM,0BAA0B,QAAQ,mBAAmB;CAG3D,MAAM,CAAC,MAAM,SAAS,sBAAsB,4BAC1C,MAAM,QAAQ,WAAW;EACvB,iBAEI,wBAAwB,SAAS,QAC/B,IAAI,QAAQ,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CAChD,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,WAAW,CAClD;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IAAI,WAAW,gBAAgB,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CACnE,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,cAAc,CACrD;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,qBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,kBAChE,CACF;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,yBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,sBAChE,CACF;EACF,CAAC;CACJ,MAAM,cAAc,KAAK,WAAW,cAAc,OAAO,KAAK,MAAM,GAAG;CACvE,MAAM,aACJ,QAAQ,WAAW,cAAc,OAAO,QAAQ,MAAM,MAAM,GAAG;CAEjE,MAAM,qBAAqB,CACzB,GAAI,qBAAqB,WAAW,cAChC,qBAAqB,MAAM,QAC3B,EAAE,EACN,GAAI,yBAAyB,WAAW,cACpC,yBAAyB,MAAM,QAC/B,EAAE,CACP,CAAC,QACC,cAAsC,UAAU;EAC/C,MAAM,eACJ,MAAM,QAAQ,KAAK,OAAO;EAC5B,MAAM,SAAS,OAAO,aAAa,YAAY,OAAO;AACtD,MAAI,SAAS,GACX,cAAa,aAAa,QAAQ;AAEpC,SAAO;IAET,EAAE,CACH;AAED,oBAAmB,oBAAoB;AAcvC,QAboC,OAAO,KAAK,UAAU;AACxD,MAAI,mBAAmB,MAAM,SAC3B,QAAO;GACL,GAAG;GACH,QAAQ,mBAAmB,MAAM;GACjC;GACD;AAEH,SAAO;GACL,GAAG;GACH;GACD;GACD"}
+{"version":3,"file":"getSolanaBalance.js","names":[],"sources":["../../../src/actions/getSolanaBalance.ts"],"sourcesContent":["import type { SDKClient } from '@lifi/sdk'\nimport {\n  type ChainId,\n  type Token,\n  type TokenAmount,\n  withDedupe,\n} from '@lifi/sdk'\nimport { address, type JsonParsedTokenAccount } from '@solana/kit'\n\nimport { callSolanaRpcsWithRetry } from '../rpc/utils.js'\n\nconst SolSystemProgram = '11111111111111111111111111111111'\nconst TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'\nconst Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'\n\nexport const getSolanaBalance = async (\n  client: SDKClient,\n  walletAddress: string,\n  tokens: Token[]\n): Promise<TokenAmount[]> => {\n  if (tokens.length === 0) {\n    return []\n  }\n  const { chainId } = tokens[0]\n  for (const token of tokens) {\n    if (token.chainId !== chainId) {\n      console.warn('Requested tokens have to be on the same chain.')\n    }\n  }\n\n  return getSolanaBalanceDefault(client, chainId, tokens, walletAddress)\n}\n\nconst getSolanaBalanceDefault = async (\n  client: SDKClient,\n  _chainId: ChainId,\n  tokens: Token[],\n  walletAddress: string\n): Promise<TokenAmount[]> => {\n  // Convert addresses to Solana Kit's address type\n  const accountAddress = address(walletAddress)\n  const tokenProgramAddress = address(TokenProgramId)\n  const token2022ProgramAddress = address(Token2022ProgramId)\n\n  // Use Solana Kit's RPC API with the retry wrapper\n  const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] =\n    await Promise.allSettled([\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getSlot({ commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getSlot` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc.getBalance(accountAddress, { commitment: 'confirmed' }).send()\n          ),\n        { id: `${getSolanaBalanceDefault.name}.getBalance` }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: tokenProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${TokenProgramId}`,\n        }\n      ),\n      withDedupe(\n        () =>\n          callSolanaRpcsWithRetry(client, (rpc) =>\n            rpc\n              .getTokenAccountsByOwner(\n                accountAddress,\n                {\n                  programId: token2022ProgramAddress,\n                },\n                {\n                  commitment: 'confirmed',\n                  encoding: 'jsonParsed',\n                }\n              )\n              .send()\n          ),\n        {\n          id: `${getSolanaBalanceDefault.name}.getTokenAccountsByOwner.${Token2022ProgramId}`,\n        }\n      ),\n    ])\n  const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n\n  const nativeBalanceOk = balance.status === 'fulfilled'\n  const solBalance = nativeBalanceOk ? BigInt(balance.value.value) : 0n\n  const tokenProgramOk = tokenAccountsByOwner.status === 'fulfilled'\n  const token2022ProgramOk = token2022AccountsByOwner.status === 'fulfilled'\n\n  const walletTokenAmounts = [\n    ...(tokenProgramOk ? tokenAccountsByOwner.value.value : []),\n    ...(token2022ProgramOk ? token2022AccountsByOwner.value.value : []),\n  ].reduce(\n    (tokenAmounts: Record<string, bigint>, value) => {\n      const tokenAccount: JsonParsedTokenAccount =\n        value.account.data.parsed.info\n      const amount = BigInt(tokenAccount.tokenAmount.amount)\n      if (amount > 0n) {\n        tokenAmounts[tokenAccount.mint] = amount\n      }\n      return tokenAmounts\n    },\n    {} as Record<string, bigint>\n  )\n\n  // We can only confidently report 0n for an SPL mint when both Token and\n  // Token2022 program queries succeeded — otherwise the mint may live in the\n  // program whose query failed (e.g. PYUSD on Token2022).\n  const splZeroIsKnown = tokenProgramOk && token2022ProgramOk\n\n  const tokenAmounts: TokenAmount[] = tokens.map((token) => {\n    const isNative = token.address === SolSystemProgram\n    if (isNative) {\n      if (!nativeBalanceOk) {\n        return { ...token, blockNumber }\n      }\n      return { ...token, amount: solBalance, blockNumber }\n    }\n    const found = walletTokenAmounts[token.address]\n    if (found !== undefined) {\n      return { ...token, amount: found, blockNumber }\n    }\n    if (splZeroIsKnown) {\n      return { ...token, amount: 0n, blockNumber }\n    }\n    return { ...token, blockNumber }\n  })\n  return tokenAmounts\n}\n"],"mappings":";;;;AAWA,MAAM,mBAAmB;AACzB,MAAM,iBAAiB;AACvB,MAAM,qBAAqB;AAE3B,MAAa,mBAAmB,OAC9B,QACA,eACA,WAC2B;AAC3B,KAAI,OAAO,WAAW,EACpB,QAAO,EAAE;CAEX,MAAM,EAAE,YAAY,OAAO;AAC3B,MAAK,MAAM,SAAS,OAClB,KAAI,MAAM,YAAY,QACpB,SAAQ,KAAK,iDAAiD;AAIlE,QAAO,wBAAwB,QAAQ,SAAS,QAAQ,cAAc;;AAGxE,MAAM,0BAA0B,OAC9B,QACA,UACA,QACA,kBAC2B;CAE3B,MAAM,iBAAiB,QAAQ,cAAc;CAC7C,MAAM,sBAAsB,QAAQ,eAAe;CACnD,MAAM,0BAA0B,QAAQ,mBAAmB;CAG3D,MAAM,CAAC,MAAM,SAAS,sBAAsB,4BAC1C,MAAM,QAAQ,WAAW;EACvB,iBAEI,wBAAwB,SAAS,QAC/B,IAAI,QAAQ,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CAChD,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,WAAW,CAClD;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IAAI,WAAW,gBAAgB,EAAE,YAAY,aAAa,CAAC,CAAC,MAAM,CACnE,EACH,EAAE,IAAI,GAAG,wBAAwB,KAAK,cAAc,CACrD;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,qBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,kBAChE,CACF;EACD,iBAEI,wBAAwB,SAAS,QAC/B,IACG,wBACC,gBACA,EACE,WAAW,yBACZ,EACD;GACE,YAAY;GACZ,UAAU;GACX,CACF,CACA,MAAM,CACV,EACH,EACE,IAAI,GAAG,wBAAwB,KAAK,2BAA2B,sBAChE,CACF;EACF,CAAC;CACJ,MAAM,cAAc,KAAK,WAAW,cAAc,OAAO,KAAK,MAAM,GAAG;CACvE,MAAM,kBAAkB,QAAQ,WAAW;CAC3C,MAAM,aAAa,kBAAkB,OAAO,QAAQ,MAAM,MAAM,GAAG;CACnE,MAAM,iBAAiB,qBAAqB,WAAW;CACvD,MAAM,qBAAqB,yBAAyB,WAAW;CAE/D,MAAM,qBAAqB,CACzB,GAAI,iBAAiB,qBAAqB,MAAM,QAAQ,EAAE,EAC1D,GAAI,qBAAqB,yBAAyB,MAAM,QAAQ,EAAE,CACnE,CAAC,QACC,cAAsC,UAAU;EAC/C,MAAM,eACJ,MAAM,QAAQ,KAAK,OAAO;EAC5B,MAAM,SAAS,OAAO,aAAa,YAAY,OAAO;AACtD,MAAI,SAAS,GACX,cAAa,aAAa,QAAQ;AAEpC,SAAO;IAET,EAAE,CACH;CAKD,MAAM,iBAAiB,kBAAkB;AAmBzC,QAjBoC,OAAO,KAAK,UAAU;AAExD,MADiB,MAAM,YAAY,kBACrB;AACZ,OAAI,CAAC,gBACH,QAAO;IAAE,GAAG;IAAO;IAAa;AAElC,UAAO;IAAE,GAAG;IAAO,QAAQ;IAAY;IAAa;;EAEtD,MAAM,QAAQ,mBAAmB,MAAM;AACvC,MAAI,UAAU,KAAA,EACZ,QAAO;GAAE,GAAG;GAAO,QAAQ;GAAO;GAAa;AAEjD,MAAI,eACF,QAAO;GAAE,GAAG;GAAO,QAAQ;GAAI;GAAa;AAE9C,SAAO;GAAE,GAAG;GAAO;GAAa;GAChC"}

package/dist/esm/core/tasks/SolanaSignAndExecuteTask.js

@@ -1,7 +1,6 @@
 import { base64ToUint8Array } from "../../utils/base64ToUint8Array.js";
 import { getWalletFeature } from "../../utils/getWalletFeature.js";
-import { withTimeout } from "../../utils/withTimeout.js";
-import { BaseStepExecutionTask, LiFiErrorCode, TransactionError, getTransactionRequestData } from "@lifi/sdk";
+import { BaseStepExecutionTask, LiFiErrorCode, TransactionError, getTransactionRequestData, withTimeout } from "@lifi/sdk";
 import { getTransactionCodec } from "@solana/kit";
 import { SolanaSignTransaction } from "@solana/wallet-standard-features";
 //#region src/core/tasks/SolanaSignAndExecuteTask.ts

package/dist/esm/core/tasks/SolanaSignAndExecuteTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolanaSignAndExecuteTask.js","names":[],"sources":["../../../../src/core/tasks/SolanaSignAndExecuteTask.ts"],"sourcesContent":["import {\n  BaseStepExecutionTask,\n  getTransactionRequestData,\n  LiFiErrorCode,\n  type TaskResult,\n  TransactionError,\n} from '@lifi/sdk'\nimport { getTransactionCodec } from '@solana/kit'\nimport { SolanaSignTransaction } from '@solana/wallet-standard-features'\nimport type { SolanaStepExecutorContext } from '../../types.js'\nimport { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'\nimport { getWalletFeature } from '../../utils/getWalletFeature.js'\nimport { withTimeout } from '../../utils/withTimeout.js'\n\nexport class SolanaSignAndExecuteTask extends BaseStepExecutionTask {\n  async run(context: SolanaStepExecutorContext): Promise<TaskResult> {\n    const {\n      step,\n      wallet,\n      walletAccount,\n      statusManager,\n      executionOptions,\n      isBridgeExecution,\n    } = context\n\n    const action = statusManager.findAction(\n      step,\n      isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'\n    )\n    if (!action) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'Unable to prepare transaction. Action not found.'\n      )\n    }\n\n    const transactionRequestData = await getTransactionRequestData(\n      step,\n      executionOptions\n    )\n\n    // Handle both single transaction (string) and multiple transactions (array)\n    const transactionDataArray = Array.isArray(transactionRequestData)\n      ? transactionRequestData\n      : [transactionRequestData]\n\n    const transactionBytesArray = transactionDataArray.map((data) =>\n      base64ToUint8Array(data)\n    )\n\n    const signedTransactionOutputs = await withTimeout(\n      async () => {\n        const { signTransaction } = getWalletFeature(\n          wallet,\n          SolanaSignTransaction\n        )\n        // Spread the inputs to sign all transactions at once\n        return signTransaction(\n          ...transactionBytesArray.map((transaction) => ({\n            account: walletAccount,\n            transaction,\n          }))\n        )\n      },\n      {\n        // https://solana.com/docs/advanced/confirmation#transaction-expiration\n        // Use 2 minutes to account for fluctuations\n        timeout: 120_000,\n        errorInstance: new TransactionError(\n          LiFiErrorCode.TransactionExpired,\n          'Transaction has expired: blockhash is no longer recent enough.'\n        ),\n      }\n    )\n\n    if (signedTransactionOutputs.length === 0) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'No signed transaction returned from signer.'\n      )\n    }\n\n    statusManager.updateAction(step, action.type, 'PENDING', {\n      signedAt: Date.now(),\n    })\n\n    const transactionCodec = getTransactionCodec()\n\n    // Decode all signed transactions\n    const signedTransactions = signedTransactionOutputs.map((output) =>\n      transactionCodec.decode(output.signedTransaction)\n    )\n\n    return {\n      status: 'COMPLETED',\n      context: { signedTransactions },\n    }\n  }\n}\n"],"mappings":";;;;;;;AAcA,IAAa,2BAAb,cAA8C,sBAAsB;CAClE,MAAM,IAAI,SAAyD;EACjE,MAAM,EACJ,MACA,QACA,eACA,eACA,kBACA,sBACE;EAEJ,MAAM,SAAS,cAAc,WAC3B,MACA,oBAAoB,gBAAgB,OACrC;AACD,MAAI,CAAC,OACH,OAAM,IAAI,iBACR,cAAc,uBACd,mDACD;EAGH,MAAM,yBAAyB,MAAM,0BACnC,MACA,iBACD;EAOD,MAAM,yBAJuB,MAAM,QAAQ,uBAAuB,GAC9D,yBACA,CAAC,uBAAuB,EAEuB,KAAK,SACtD,mBAAmB,KAAK,CACzB;EAED,MAAM,2BAA2B,MAAM,YACrC,YAAY;GACV,MAAM,EAAE,oBAAoB,iBAC1B,QACA,sBACD;AAED,UAAO,gBACL,GAAG,sBAAsB,KAAK,iBAAiB;IAC7C,SAAS;IACT;IACD,EAAE,CACJ;KAEH;GAGE,SAAS;GACT,eAAe,IAAI,iBACjB,cAAc,oBACd,iEACD;GACF,CACF;AAED,MAAI,yBAAyB,WAAW,EACtC,OAAM,IAAI,iBACR,cAAc,uBACd,8CACD;AAGH,gBAAc,aAAa,MAAM,OAAO,MAAM,WAAW,EACvD,UAAU,KAAK,KAAK,EACrB,CAAC;EAEF,MAAM,mBAAmB,qBAAqB;AAO9C,SAAO;GACL,QAAQ;GACR,SAAS,EAAE,oBANc,yBAAyB,KAAK,WACvD,iBAAiB,OAAO,OAAO,kBAAkB,CAClD,EAIgC;GAChC"}
+{"version":3,"file":"SolanaSignAndExecuteTask.js","names":[],"sources":["../../../../src/core/tasks/SolanaSignAndExecuteTask.ts"],"sourcesContent":["import {\n  BaseStepExecutionTask,\n  getTransactionRequestData,\n  LiFiErrorCode,\n  type TaskResult,\n  TransactionError,\n  withTimeout,\n} from '@lifi/sdk'\nimport { getTransactionCodec } from '@solana/kit'\nimport { SolanaSignTransaction } from '@solana/wallet-standard-features'\nimport type { SolanaStepExecutorContext } from '../../types.js'\nimport { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'\nimport { getWalletFeature } from '../../utils/getWalletFeature.js'\n\nexport class SolanaSignAndExecuteTask extends BaseStepExecutionTask {\n  async run(context: SolanaStepExecutorContext): Promise<TaskResult> {\n    const {\n      step,\n      wallet,\n      walletAccount,\n      statusManager,\n      executionOptions,\n      isBridgeExecution,\n    } = context\n\n    const action = statusManager.findAction(\n      step,\n      isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'\n    )\n    if (!action) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'Unable to prepare transaction. Action not found.'\n      )\n    }\n\n    const transactionRequestData = await getTransactionRequestData(\n      step,\n      executionOptions\n    )\n\n    // Handle both single transaction (string) and multiple transactions (array)\n    const transactionDataArray = Array.isArray(transactionRequestData)\n      ? transactionRequestData\n      : [transactionRequestData]\n\n    const transactionBytesArray = transactionDataArray.map((data) =>\n      base64ToUint8Array(data)\n    )\n\n    const signedTransactionOutputs = await withTimeout(\n      async () => {\n        const { signTransaction } = getWalletFeature(\n          wallet,\n          SolanaSignTransaction\n        )\n        // Spread the inputs to sign all transactions at once\n        return signTransaction(\n          ...transactionBytesArray.map((transaction) => ({\n            account: walletAccount,\n            transaction,\n          }))\n        )\n      },\n      {\n        // https://solana.com/docs/advanced/confirmation#transaction-expiration\n        // Use 2 minutes to account for fluctuations\n        timeout: 120_000,\n        errorInstance: new TransactionError(\n          LiFiErrorCode.TransactionExpired,\n          'Transaction has expired: blockhash is no longer recent enough.'\n        ),\n      }\n    )\n\n    if (signedTransactionOutputs.length === 0) {\n      throw new TransactionError(\n        LiFiErrorCode.TransactionUnprepared,\n        'No signed transaction returned from signer.'\n      )\n    }\n\n    statusManager.updateAction(step, action.type, 'PENDING', {\n      signedAt: Date.now(),\n    })\n\n    const transactionCodec = getTransactionCodec()\n\n    // Decode all signed transactions\n    const signedTransactions = signedTransactionOutputs.map((output) =>\n      transactionCodec.decode(output.signedTransaction)\n    )\n\n    return {\n      status: 'COMPLETED',\n      context: { signedTransactions },\n    }\n  }\n}\n"],"mappings":";;;;;;AAcA,IAAa,2BAAb,cAA8C,sBAAsB;CAClE,MAAM,IAAI,SAAyD;EACjE,MAAM,EACJ,MACA,QACA,eACA,eACA,kBACA,sBACE;EAEJ,MAAM,SAAS,cAAc,WAC3B,MACA,oBAAoB,gBAAgB,OACrC;AACD,MAAI,CAAC,OACH,OAAM,IAAI,iBACR,cAAc,uBACd,mDACD;EAGH,MAAM,yBAAyB,MAAM,0BACnC,MACA,iBACD;EAOD,MAAM,yBAJuB,MAAM,QAAQ,uBAAuB,GAC9D,yBACA,CAAC,uBAAuB,EAEuB,KAAK,SACtD,mBAAmB,KAAK,CACzB;EAED,MAAM,2BAA2B,MAAM,YACrC,YAAY;GACV,MAAM,EAAE,oBAAoB,iBAC1B,QACA,sBACD;AAED,UAAO,gBACL,GAAG,sBAAsB,KAAK,iBAAiB;IAC7C,SAAS;IACT;IACD,EAAE,CACJ;KAEH;GAGE,SAAS;GACT,eAAe,IAAI,iBACjB,cAAc,oBACd,iEACD;GACF,CACF;AAED,MAAI,yBAAyB,WAAW,EACtC,OAAM,IAAI,iBACR,cAAc,uBACd,8CACD;AAGH,gBAAc,aAAa,MAAM,OAAO,MAAM,WAAW,EACvD,UAAU,KAAK,KAAK,EACrB,CAAC;EAEF,MAAM,mBAAmB,qBAAqB;AAO9C,SAAO;GACL,QAAQ;GACR,SAAS,EAAE,oBANc,yBAAyB,KAAK,WACvD,iBAAiB,OAAO,OAAO,kBAAkB,CAClD,EAIgC;GAChC"}

package/dist/esm/version.d.ts

@@ -1,6 +1,6 @@
 //#region src/version.d.ts
 declare const name = "@lifi/sdk-provider-solana";
-declare const version = "4.0.0-beta.5";
+declare const version = "4.0.0-beta.6";
 //#endregion
 export { name, version };
 //# sourceMappingURL=version.d.ts.map

package/dist/esm/version.js

@@ -1,6 +1,6 @@
 //#region src/version.ts
 const name = "@lifi/sdk-provider-solana";
-const version = "4.0.0-beta.5";
+const version = "4.0.0-beta.6";
 //#endregion
 export { name, version };
 

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","names":[],"sources":["../../src/version.ts"],"sourcesContent":["export const name = '@lifi/sdk-provider-solana'\nexport const version = '4.0.0-beta.5'\n"],"mappings":";AAAA,MAAa,OAAO;AACpB,MAAa,UAAU"}
+{"version":3,"file":"version.js","names":[],"sources":["../../src/version.ts"],"sourcesContent":["export const name = '@lifi/sdk-provider-solana'\nexport const version = '4.0.0-beta.6'\n"],"mappings":";AAAA,MAAa,OAAO;AACpB,MAAa,UAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/sdk-provider-solana",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "LI.FI Solana SDK Provider for Any-to-Any Cross-Chain-Swap",
   "homepage": "https://github.com/lifinance/sdk",
   "bugs": {
@@ -28,10 +28,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@solana/kit": "^6.7.0",
+    "@solana/kit": "^6.8.0",
     "@solana/wallet-standard-features": "^1.3.0",
     "@wallet-standard/base": "^1.1.0",
-    "@lifi/sdk": "4.0.0-beta.5"
+    "@lifi/sdk": "4.0.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/actions/getSolanaBalance.ts

@@ -101,16 +101,14 @@ const getSolanaBalanceDefault = async (
       ),
     ])
   const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n
-  const solBalance =
-    balance.status === 'fulfilled' ? BigInt(balance.value.value) : 0n
+  const nativeBalanceOk = balance.status === 'fulfilled'
+  const solBalance = nativeBalanceOk ? BigInt(balance.value.value) : 0n
+  const tokenProgramOk = tokenAccountsByOwner.status === 'fulfilled'
+  const token2022ProgramOk = token2022AccountsByOwner.status === 'fulfilled'
 
   const walletTokenAmounts = [
-    ...(tokenAccountsByOwner.status === 'fulfilled'
-      ? tokenAccountsByOwner.value.value
-      : []),
-    ...(token2022AccountsByOwner.status === 'fulfilled'
-      ? token2022AccountsByOwner.value.value
-      : []),
+    ...(tokenProgramOk ? tokenAccountsByOwner.value.value : []),
+    ...(token2022ProgramOk ? token2022AccountsByOwner.value.value : []),
   ].reduce(
     (tokenAmounts: Record<string, bigint>, value) => {
       const tokenAccount: JsonParsedTokenAccount =
@@ -124,19 +122,27 @@ const getSolanaBalanceDefault = async (
     {} as Record<string, bigint>
   )
 
-  walletTokenAmounts[SolSystemProgram] = solBalance
+  // We can only confidently report 0n for an SPL mint when both Token and
+  // Token2022 program queries succeeded — otherwise the mint may live in the
+  // program whose query failed (e.g. PYUSD on Token2022).
+  const splZeroIsKnown = tokenProgramOk && token2022ProgramOk
+
   const tokenAmounts: TokenAmount[] = tokens.map((token) => {
-    if (walletTokenAmounts[token.address]) {
-      return {
-        ...token,
-        amount: walletTokenAmounts[token.address],
-        blockNumber,
+    const isNative = token.address === SolSystemProgram
+    if (isNative) {
+      if (!nativeBalanceOk) {
+        return { ...token, blockNumber }
       }
+      return { ...token, amount: solBalance, blockNumber }
+    }
+    const found = walletTokenAmounts[token.address]
+    if (found !== undefined) {
+      return { ...token, amount: found, blockNumber }
     }
-    return {
-      ...token,
-      blockNumber,
+    if (splZeroIsKnown) {
+      return { ...token, amount: 0n, blockNumber }
     }
+    return { ...token, blockNumber }
   })
   return tokenAmounts
 }

package/src/core/tasks/SolanaSignAndExecuteTask.ts

@@ -4,13 +4,13 @@ import {
   LiFiErrorCode,
   type TaskResult,
   TransactionError,
+  withTimeout,
 } from '@lifi/sdk'
 import { getTransactionCodec } from '@solana/kit'
 import { SolanaSignTransaction } from '@solana/wallet-standard-features'
 import type { SolanaStepExecutorContext } from '../../types.js'
 import { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'
 import { getWalletFeature } from '../../utils/getWalletFeature.js'
-import { withTimeout } from '../../utils/withTimeout.js'
 
 export class SolanaSignAndExecuteTask extends BaseStepExecutionTask {
   async run(context: SolanaStepExecutorContext): Promise<TaskResult> {

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk-provider-solana'
-export const version = '4.0.0-beta.5'
+export const version = '4.0.0-beta.6'

package/dist/cjs/utils/withTimeout.d.ts

@@ -1,26 +0,0 @@
-//#region src/utils/withTimeout.d.ts
-/**
-* Wraps a function in a timeout.
-* Based on viem's withTimeout implementation.
-* @param fn - The function to wrap.
-* @param timeout - The timeout in milliseconds.
-* @param errorInstance - The error instance to throw when the timeout is reached.
-* @param signal - Whether or not the timeout should use an abort signal.
-* @returns The result of the function.
-*/
-declare function withTimeout<T>(fn: ({
-  signal
-}: {
-  signal: AbortController["signal"] | null;
-}) => Promise<T>, {
-  errorInstance,
-  timeout,
-  signal
-}: {
-  errorInstance?: Error | undefined;
-  timeout: number;
-  signal?: boolean | undefined;
-}): Promise<T>;
-//#endregion
-export { withTimeout };
-//# sourceMappingURL=withTimeout.d.ts.map

package/dist/cjs/utils/withTimeout.js

@@ -1,35 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/utils/withTimeout.ts
-/**
-* Wraps a function in a timeout.
-* Based on viem's withTimeout implementation.
-* @param fn - The function to wrap.
-* @param timeout - The timeout in milliseconds.
-* @param errorInstance - The error instance to throw when the timeout is reached.
-* @param signal - Whether or not the timeout should use an abort signal.
-* @returns The result of the function.
-*/
-function withTimeout(fn, { errorInstance = /* @__PURE__ */ new Error("timed out"), timeout, signal }) {
-	return new Promise((resolve, reject) => {
-		(async () => {
-			let timeoutId;
-			try {
-				const controller = new AbortController();
-				if (timeout > 0) timeoutId = setTimeout(() => {
-					if (signal) controller.abort();
-					else reject(errorInstance);
-				}, timeout);
-				resolve(await fn({ signal: controller?.signal || null }));
-			} catch (err) {
-				if (err?.name === "AbortError") reject(errorInstance);
-				reject(err);
-			} finally {
-				clearTimeout(timeoutId);
-			}
-		})();
-	});
-}
-//#endregion
-exports.withTimeout = withTimeout;
-
-//# sourceMappingURL=withTimeout.js.map

package/dist/cjs/utils/withTimeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"withTimeout.js","names":[],"sources":["../../../src/utils/withTimeout.ts"],"sourcesContent":["/**\n * Wraps a function in a timeout.\n * Based on viem's withTimeout implementation.\n * @param fn - The function to wrap.\n * @param timeout - The timeout in milliseconds.\n * @param errorInstance - The error instance to throw when the timeout is reached.\n * @param signal - Whether or not the timeout should use an abort signal.\n * @returns The result of the function.\n */\nexport function withTimeout<T>(\n  fn: ({ signal }: { signal: AbortController['signal'] | null }) => Promise<T>,\n  {\n    errorInstance = new Error('timed out'),\n    timeout,\n    signal,\n  }: {\n    // The error instance to throw when the timeout is reached.\n    errorInstance?: Error | undefined\n    // The timeout (in ms).\n    timeout: number\n    // Whether or not the timeout should use an abort signal.\n    signal?: boolean | undefined\n  }\n): Promise<T> {\n  return new Promise((resolve, reject) => {\n    ;(async () => {\n      let timeoutId!: NodeJS.Timeout\n      try {\n        const controller = new AbortController()\n        if (timeout > 0) {\n          timeoutId = setTimeout(() => {\n            if (signal) {\n              controller.abort()\n            } else {\n              reject(errorInstance)\n            }\n          }, timeout) as NodeJS.Timeout // need to cast because bun globals.d.ts overrides @types/node\n        }\n        resolve(await fn({ signal: controller?.signal || null }))\n      } catch (err) {\n        if ((err as Error)?.name === 'AbortError') {\n          reject(errorInstance)\n        }\n        reject(err)\n      } finally {\n        clearTimeout(timeoutId)\n      }\n    })()\n  })\n}\n"],"mappings":";;;;;;;;;;;AASA,SAAgB,YACd,IACA,EACE,gCAAgB,IAAI,MAAM,YAAY,EACtC,SACA,UASU;AACZ,QAAO,IAAI,SAAS,SAAS,WAAW;AACrC,GAAC,YAAY;GACZ,IAAI;AACJ,OAAI;IACF,MAAM,aAAa,IAAI,iBAAiB;AACxC,QAAI,UAAU,EACZ,aAAY,iBAAiB;AAC3B,SAAI,OACF,YAAW,OAAO;SAElB,QAAO,cAAc;OAEtB,QAAQ;AAEb,YAAQ,MAAM,GAAG,EAAE,QAAQ,YAAY,UAAU,MAAM,CAAC,CAAC;YAClD,KAAK;AACZ,QAAK,KAAe,SAAS,aAC3B,QAAO,cAAc;AAEvB,WAAO,IAAI;aACH;AACR,iBAAa,UAAU;;MAEvB;GACJ"}

package/dist/esm/utils/withTimeout.d.ts

@@ -1,26 +0,0 @@
-//#region src/utils/withTimeout.d.ts
-/**
-* Wraps a function in a timeout.
-* Based on viem's withTimeout implementation.
-* @param fn - The function to wrap.
-* @param timeout - The timeout in milliseconds.
-* @param errorInstance - The error instance to throw when the timeout is reached.
-* @param signal - Whether or not the timeout should use an abort signal.
-* @returns The result of the function.
-*/
-declare function withTimeout<T>(fn: ({
-  signal
-}: {
-  signal: AbortController["signal"] | null;
-}) => Promise<T>, {
-  errorInstance,
-  timeout,
-  signal
-}: {
-  errorInstance?: Error | undefined;
-  timeout: number;
-  signal?: boolean | undefined;
-}): Promise<T>;
-//#endregion
-export { withTimeout };
-//# sourceMappingURL=withTimeout.d.ts.map

package/dist/esm/utils/withTimeout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"withTimeout.d.ts","names":[],"sources":["../../../src/utils/withTimeout.ts"],"mappings":";;AASA;;;;;;;;iBAAgB,WAAA,GAAA,CACd,EAAA;EAAO;AAAA;EAAY,MAAA,EAAQ,eAAA;AAAA,MAAuC,OAAA,CAAQ,CAAA;EAExE,aAAA;EACA,OAAA;EACA;AAAA;EAGA,aAAA,GAAgB,KAAA;EAEhB,OAAA;EAEA,MAAA;AAAA,IAED,OAAA,CAAQ,CAAA"}

package/dist/esm/utils/withTimeout.js

@@ -1,34 +0,0 @@
-//#region src/utils/withTimeout.ts
-/**
-* Wraps a function in a timeout.
-* Based on viem's withTimeout implementation.
-* @param fn - The function to wrap.
-* @param timeout - The timeout in milliseconds.
-* @param errorInstance - The error instance to throw when the timeout is reached.
-* @param signal - Whether or not the timeout should use an abort signal.
-* @returns The result of the function.
-*/
-function withTimeout(fn, { errorInstance = /* @__PURE__ */ new Error("timed out"), timeout, signal }) {
-	return new Promise((resolve, reject) => {
-		(async () => {
-			let timeoutId;
-			try {
-				const controller = new AbortController();
-				if (timeout > 0) timeoutId = setTimeout(() => {
-					if (signal) controller.abort();
-					else reject(errorInstance);
-				}, timeout);
-				resolve(await fn({ signal: controller?.signal || null }));
-			} catch (err) {
-				if (err?.name === "AbortError") reject(errorInstance);
-				reject(err);
-			} finally {
-				clearTimeout(timeoutId);
-			}
-		})();
-	});
-}
-//#endregion
-export { withTimeout };
-
-//# sourceMappingURL=withTimeout.js.map

package/dist/esm/utils/withTimeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"withTimeout.js","names":[],"sources":["../../../src/utils/withTimeout.ts"],"sourcesContent":["/**\n * Wraps a function in a timeout.\n * Based on viem's withTimeout implementation.\n * @param fn - The function to wrap.\n * @param timeout - The timeout in milliseconds.\n * @param errorInstance - The error instance to throw when the timeout is reached.\n * @param signal - Whether or not the timeout should use an abort signal.\n * @returns The result of the function.\n */\nexport function withTimeout<T>(\n  fn: ({ signal }: { signal: AbortController['signal'] | null }) => Promise<T>,\n  {\n    errorInstance = new Error('timed out'),\n    timeout,\n    signal,\n  }: {\n    // The error instance to throw when the timeout is reached.\n    errorInstance?: Error | undefined\n    // The timeout (in ms).\n    timeout: number\n    // Whether or not the timeout should use an abort signal.\n    signal?: boolean | undefined\n  }\n): Promise<T> {\n  return new Promise((resolve, reject) => {\n    ;(async () => {\n      let timeoutId!: NodeJS.Timeout\n      try {\n        const controller = new AbortController()\n        if (timeout > 0) {\n          timeoutId = setTimeout(() => {\n            if (signal) {\n              controller.abort()\n            } else {\n              reject(errorInstance)\n            }\n          }, timeout) as NodeJS.Timeout // need to cast because bun globals.d.ts overrides @types/node\n        }\n        resolve(await fn({ signal: controller?.signal || null }))\n      } catch (err) {\n        if ((err as Error)?.name === 'AbortError') {\n          reject(errorInstance)\n        }\n        reject(err)\n      } finally {\n        clearTimeout(timeoutId)\n      }\n    })()\n  })\n}\n"],"mappings":";;;;;;;;;;AASA,SAAgB,YACd,IACA,EACE,gCAAgB,IAAI,MAAM,YAAY,EACtC,SACA,UASU;AACZ,QAAO,IAAI,SAAS,SAAS,WAAW;AACrC,GAAC,YAAY;GACZ,IAAI;AACJ,OAAI;IACF,MAAM,aAAa,IAAI,iBAAiB;AACxC,QAAI,UAAU,EACZ,aAAY,iBAAiB;AAC3B,SAAI,OACF,YAAW,OAAO;SAElB,QAAO,cAAc;OAEtB,QAAQ;AAEb,YAAQ,MAAM,GAAG,EAAE,QAAQ,YAAY,UAAU,MAAM,CAAC,CAAC;YAClD,KAAK;AACZ,QAAK,KAAe,SAAS,aAC3B,QAAO,cAAc;AAEvB,WAAO,IAAI;aACH;AACR,iBAAa,UAAU;;MAEvB;GACJ"}

package/src/utils/withTimeout.ts

@@ -1,50 +0,0 @@
-/**
- * Wraps a function in a timeout.
- * Based on viem's withTimeout implementation.
- * @param fn - The function to wrap.
- * @param timeout - The timeout in milliseconds.
- * @param errorInstance - The error instance to throw when the timeout is reached.
- * @param signal - Whether or not the timeout should use an abort signal.
- * @returns The result of the function.
- */
-export function withTimeout<T>(
-  fn: ({ signal }: { signal: AbortController['signal'] | null }) => Promise<T>,
-  {
-    errorInstance = new Error('timed out'),
-    timeout,
-    signal,
-  }: {
-    // The error instance to throw when the timeout is reached.
-    errorInstance?: Error | undefined
-    // The timeout (in ms).
-    timeout: number
-    // Whether or not the timeout should use an abort signal.
-    signal?: boolean | undefined
-  }
-): Promise<T> {
-  return new Promise((resolve, reject) => {
-    ;(async () => {
-      let timeoutId!: NodeJS.Timeout
-      try {
-        const controller = new AbortController()
-        if (timeout > 0) {
-          timeoutId = setTimeout(() => {
-            if (signal) {
-              controller.abort()
-            } else {
-              reject(errorInstance)
-            }
-          }, timeout) as NodeJS.Timeout // need to cast because bun globals.d.ts overrides @types/node
-        }
-        resolve(await fn({ signal: controller?.signal || null }))
-      } catch (err) {
-        if ((err as Error)?.name === 'AbortError') {
-          reject(errorInstance)
-        }
-        reject(err)
-      } finally {
-        clearTimeout(timeoutId)
-      }
-    })()
-  })
-}