@ape.swap/bonds-sdk 6.2.1 → 6.2.3

package/dist/state/balance/useCurrencyBalanceAptos.js

@@ -1,6 +1,6 @@
-import BigNumber from 'bignumber.js';
 import { ChainId } from '@ape.swap/apeswap-lists';
 import { getAptosClient } from '../../utils/aptosHelpers.js';
+import { formatUnits } from '../../utils/fixedPoint.js';
 
 // Aptos balance reads — mirrors useCurrencyBalanceSolana.ts
 const APTOS_KEY = ChainId.APTOS;
@@ -15,7 +15,7 @@ const getTokenBalanceAptos = async (currency, account) => {
         const aptos = getAptosClient();
         if (currency === 'NATIVE') {
             const amount = await aptos.getAccountAPTAmount({ accountAddress: account });
-            return new BigNumber(String(amount)).div(new BigNumber(10).pow(8)).toString();
+            return formatUnits(String(amount), 8);
         }
         const tokenAddress = currency.address[APTOS_KEY];
         if (!tokenAddress)
@@ -28,7 +28,7 @@ const getTokenBalanceAptos = async (currency, account) => {
                 : { faMetadataAddress: tokenAddress }),
         });
         const decimals = currency.decimals?.[APTOS_KEY] ?? 8;
-        return new BigNumber(String(amount)).div(new BigNumber(10).pow(decimals)).toString();
+        return formatUnits(String(amount), decimals);
     }
     catch {
         return '0';
@@ -45,7 +45,7 @@ const getTokensBalanceAptos = async (account, tokens) => {
         if (token === 'NATIVE') {
             try {
                 const amount = await aptos.getAccountAPTAmount({ accountAddress: account });
-                return { address, balance: new BigNumber(String(amount)).div(new BigNumber(10).pow(8)).toString() };
+                return { address, balance: formatUnits(String(amount), 8) };
             }
             catch {
                 return { address, balance: '0' };
@@ -62,7 +62,7 @@ const getTokensBalanceAptos = async (account, tokens) => {
             const decimals = token.decimals?.[APTOS_KEY] ?? 8;
             return {
                 address,
-                balance: new BigNumber(String(amount)).div(new BigNumber(10).pow(decimals)).toString(),
+                balance: formatUnits(String(amount), decimals),
             };
         }
         catch {

package/dist/state/balance/useCurrencyBalanceAptos.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCurrencyBalanceAptos.js","sources":["../../../src/state/balance/useCurrencyBalanceAptos.ts"],"sourcesContent":["// Aptos balance reads — mirrors useCurrencyBalanceSolana.ts\n\nimport BigNumber from 'bignumber.js'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport { getAptosClient } from '../../utils/aptosHelpers'\n\nconst APTOS_KEY = ChainId.APTOS\n\n/**\n * Single-token balance read for Aptos.\n * Used by `useCurrencyBalance` when `chainId === ChainId.APTOS`.\n */\nexport const getTokenBalanceAptos = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  try {\n    const aptos = getAptosClient()\n    if (currency === 'NATIVE') {\n      const amount = await aptos.getAccountAPTAmount({ accountAddress: account })\n      return new BigNumber(String(amount)).div(new BigNumber(10).pow(8)).toString()\n    }\n    const tokenAddress = currency.address[APTOS_KEY]\n    if (!tokenAddress) return '0'\n    const isCoinType = tokenAddress.includes('::')\n    const amount = await aptos.getAccountCoinAmount({\n      accountAddress: account,\n      ...(isCoinType\n        ? { coinType: tokenAddress as `${string}::${string}::${string}` }\n        : { faMetadataAddress: tokenAddress }),\n    })\n    const decimals = currency.decimals?.[APTOS_KEY] ?? 8\n    return new BigNumber(String(amount)).div(new BigNumber(10).pow(decimals)).toString()\n  } catch {\n    return '0'\n  }\n}\n\n/**\n * Multi-token balance read for Aptos.\n * Used by `useUserTokensBalance` when `chainId === ChainId.APTOS`.\n */\nexport const getTokensBalanceAptos = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n): Promise<{ address: string; balance: string }[]> => {\n  const aptos = getAptosClient()\n  return await Promise.all(\n    tokens.map(async (token) => {\n      const address = token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[APTOS_KEY] as string)\n      if (token === 'NATIVE') {\n        try {\n          const amount = await aptos.getAccountAPTAmount({ accountAddress: account })\n          return { address, balance: new BigNumber(String(amount)).div(new BigNumber(10).pow(8)).toString() }\n        } catch {\n          return { address, balance: '0' }\n        }\n      }\n      try {\n        // FA tokens use faMetadataAddress; legacy coins use coinType.\n        // Detect by checking if address looks like a coin type (contains ::).\n        const isCoinType = address.includes('::')\n        const amount = await aptos.getAccountCoinAmount({\n          accountAddress: account,\n          ...(isCoinType ? { coinType: address as `${string}::${string}::${string}` } : { faMetadataAddress: address }),\n        })\n        const decimals = (token as Token).decimals?.[APTOS_KEY] ?? 8\n        return {\n          address,\n          balance: new BigNumber(String(amount)).div(new BigNumber(10).pow(decimals)).toString(),\n        }\n      } catch {\n        return { address, balance: '0' }\n      }\n    }),\n  )\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useCurrencyBalanceAptos.js","sources":["../../../src/state/balance/useCurrencyBalanceAptos.ts"],"sourcesContent":["// Aptos balance reads — mirrors useCurrencyBalanceSolana.ts\n\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport { getAptosClient } from '../../utils/aptosHelpers'\nimport { formatUnits } from '../../utils/fixedPoint'\n\nconst APTOS_KEY = ChainId.APTOS\n\n/**\n * Single-token balance read for Aptos.\n * Used by `useCurrencyBalance` when `chainId === ChainId.APTOS`.\n */\nexport const getTokenBalanceAptos = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  try {\n    const aptos = getAptosClient()\n    if (currency === 'NATIVE') {\n      const amount = await aptos.getAccountAPTAmount({ accountAddress: account })\n      return formatUnits(String(amount), 8)\n    }\n    const tokenAddress = currency.address[APTOS_KEY]\n    if (!tokenAddress) return '0'\n    const isCoinType = tokenAddress.includes('::')\n    const amount = await aptos.getAccountCoinAmount({\n      accountAddress: account,\n      ...(isCoinType\n        ? { coinType: tokenAddress as `${string}::${string}::${string}` }\n        : { faMetadataAddress: tokenAddress }),\n    })\n    const decimals = currency.decimals?.[APTOS_KEY] ?? 8\n    return formatUnits(String(amount), decimals)\n  } catch {\n    return '0'\n  }\n}\n\n/**\n * Multi-token balance read for Aptos.\n * Used by `useUserTokensBalance` when `chainId === ChainId.APTOS`.\n */\nexport const getTokensBalanceAptos = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n): Promise<{ address: string; balance: string }[]> => {\n  const aptos = getAptosClient()\n  return await Promise.all(\n    tokens.map(async (token) => {\n      const address = token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[APTOS_KEY] as string)\n      if (token === 'NATIVE') {\n        try {\n          const amount = await aptos.getAccountAPTAmount({ accountAddress: account })\n          return { address, balance: formatUnits(String(amount), 8) }\n        } catch {\n          return { address, balance: '0' }\n        }\n      }\n      try {\n        // FA tokens use faMetadataAddress; legacy coins use coinType.\n        // Detect by checking if address looks like a coin type (contains ::).\n        const isCoinType = address.includes('::')\n        const amount = await aptos.getAccountCoinAmount({\n          accountAddress: account,\n          ...(isCoinType ? { coinType: address as `${string}::${string}::${string}` } : { faMetadataAddress: address }),\n        })\n        const decimals = (token as Token).decimals?.[APTOS_KEY] ?? 8\n        return {\n          address,\n          balance: formatUnits(String(amount), decimals),\n        }\n      } catch {\n        return { address, balance: '0' }\n      }\n    }),\n  )\n}\n"],"names":[],"mappings":";;;;AAAA;AAMA,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK;AAE/B;;;AAGG;AACI,MAAM,oBAAoB,GAAG,OAClC,QAAiC,EACjC,OAAsB,KACI;AAC1B,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,IAAI;AAEtC,IAAA,IAAI;AACF,QAAA,MAAM,KAAK,GAAG,cAAc,EAAE;AAC9B,QAAA,IAAI,QAAQ,KAAK,QAAQ,EAAE;AACzB,YAAA,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;YAC3E,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvC;QACA,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;AAChD,QAAA,IAAI,CAAC,YAAY;AAAE,YAAA,OAAO,GAAG;QAC7B,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC9C,QAAA,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC;AAC9C,YAAA,cAAc,EAAE,OAAO;AACvB,YAAA,IAAI;AACF,kBAAE,EAAE,QAAQ,EAAE,YAAiD;AAC/D,kBAAE,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;AACzC,SAAA,CAAC;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC;QACpD,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAC9C;AAAE,IAAA,MAAM;AACN,QAAA,OAAO,GAAG;IACZ;AACF;AAEA;;;AAGG;AACI,MAAM,qBAAqB,GAAG,OACnC,OAAe,EACf,MAA4B,KACuB;AACnD,IAAA,MAAM,KAAK,GAAG,cAAc,EAAE;AAC9B,IAAA,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,GAAG,CAAC,OAAO,KAAK,KAAI;AACzB,QAAA,MAAM,OAAO,GAAG,KAAK,KAAK,QAAQ,GAAG,QAAQ,GAAK,KAAe,CAAC,OAAO,CAAC,SAAS,CAAY;AAC/F,QAAA,IAAI,KAAK,KAAK,QAAQ,EAAE;AACtB,YAAA,IAAI;AACF,gBAAA,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;AAC3E,gBAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE;YAC7D;AAAE,YAAA,MAAM;AACN,gBAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE;YAClC;QACF;AACA,QAAA,IAAI;;;YAGF,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;AACzC,YAAA,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC;AAC9C,gBAAA,cAAc,EAAE,OAAO;AACvB,gBAAA,IAAI,UAAU,GAAG,EAAE,QAAQ,EAAE,OAA4C,EAAE,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;AAC9G,aAAA,CAAC;YACF,MAAM,QAAQ,GAAI,KAAe,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC;YAC5D,OAAO;gBACL,OAAO;gBACP,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;aAC/C;QACH;AAAE,QAAA,MAAM;AACN,YAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE;QAClC;IACF,CAAC,CAAC,CACH;AACH;;;;"}

package/dist/state/balance/useCurrencyBalanceSolana.d.ts

@@ -1,4 +1,2 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { Token } from '@ape.swap/apeswap-lists';
-export default function useCurrencyBalanceSolana(currency: 'NATIVE' | Token | null, account: string | null): UseQueryResult<string | null>;
 export declare const getTokenBalanceSolana: (currency: "NATIVE" | Token | null, account: string | null) => Promise<string | null>;

package/dist/state/balance/useCurrencyBalanceSolana.js

@@ -1,8 +1,7 @@
-import '@tanstack/react-query';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { getAssociatedTokenAddress, getAccount } from '@solana/spl-token';
 import { ChainId } from '@ape.swap/apeswap-lists';
-import BigNumber from 'bignumber.js';
+import { formatUnits } from '../../utils/fixedPoint.js';
 import { getRPC } from '../../config/constants/networks.js';
 import { getTokenProgramForMint } from '../../utils/solanaAtaHelper.js';
 
@@ -15,8 +14,7 @@ const getTokenBalanceSolana = async (currency, account) => {
     try {
         if (currency === 'NATIVE') {
             const lamports = await connection.getBalance(userPubkey);
-            const sol = new BigNumber(lamports).dividedBy(1e9);
-            return sol.toString();
+            return formatUnits(lamports, 9);
         }
         else {
             const mint = new PublicKey(currency?.address?.[ChainId.SOL]);
@@ -26,8 +24,7 @@ const getTokenBalanceSolana = async (currency, account) => {
             if (!ata)
                 return '0';
             const tokenAccount = await getAccount(connection, ata, undefined, tokenProgram);
-            const amount = new BigNumber(tokenAccount.amount.toString()).dividedBy(new BigNumber(10).pow(currency?.decimals?.[ChainId.SOL]));
-            return amount.toString();
+            return formatUnits(tokenAccount.amount.toString(), currency?.decimals?.[ChainId.SOL]);
         }
     }
     catch {

package/dist/state/balance/useCurrencyBalanceSolana.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCurrencyBalanceSolana.js","sources":["../../../src/state/balance/useCurrencyBalanceSolana.ts"],"sourcesContent":["import { useQuery, UseQueryResult } from '@tanstack/react-query'\nimport { QUERY_KEYS } from '../../config/constants/queryKeys'\n\nimport { Connection, PublicKey } from '@solana/web3.js'\nimport { getAccount } from '@solana/spl-token'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport BigNumber from 'bignumber.js'\nimport { getRPC } from '../../config/constants/networks'\nimport { getTokenProgramForMint } from '../../utils/solanaAtaHelper'\nimport { getAssociatedTokenAddress } from '@solana/spl-token'\n\nexport default function useCurrencyBalanceSolana(\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): UseQueryResult<string | null> {\n  return useQuery({\n    queryKey: [QUERY_KEYS.CURRENCY_BALANCE, account ?? '', currency === 'NATIVE' ? currency : currency?.symbol],\n    queryFn: () => getTokenBalanceSolana(currency, account),\n    refetchInterval: 10000,\n    refetchOnWindowFocus: false,\n    retry: 1,\n  })\n}\n\n// Use devnet or your custom cluster URL\nexport const getTokenBalanceSolana = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  const connection = new Connection(getRPC(ChainId.SOL), 'confirmed')\n  const userPubkey = new PublicKey(account)\n\n  try {\n    if (currency === 'NATIVE') {\n      const lamports = await connection.getBalance(userPubkey)\n      const sol = new BigNumber(lamports).dividedBy(1e9)\n      return sol.toString()\n    } else {\n      const mint = new PublicKey(currency?.address?.[ChainId.SOL] as string)\n      // Detect token program to get correct ATA (supports Token-2022)\n      const tokenProgram = await getTokenProgramForMint(connection, mint)\n      const ata = await getAssociatedTokenAddress(mint, userPubkey, true, tokenProgram)\n      if (!ata) return '0'\n      const tokenAccount = await getAccount(connection, ata, undefined, tokenProgram)\n      const amount = new BigNumber(tokenAccount.amount.toString()).dividedBy(\n        new BigNumber(10).pow(currency?.decimals?.[ChainId.SOL] as number),\n      )\n      return amount.toString()\n    }\n  } catch {\n    // If account doesn't exist (e.g. never received that token)\n    return '0'\n  }\n}\n"],"names":[],"mappings":";;;;;;;;AAwBA;AACO,MAAM,qBAAqB,GAAG,OACnC,QAAiC,EACjC,OAAsB,KACI;AAC1B,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,IAAI;AAEtC,IAAA,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;AACnE,IAAA,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC;AAEzC,IAAA,IAAI;AACF,QAAA,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC;AACxD,YAAA,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC;AAClD,YAAA,OAAO,GAAG,CAAC,QAAQ,EAAE;QACvB;aAAO;AACL,YAAA,MAAM,IAAI,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAW,CAAC;;YAEtE,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC;AACnE,YAAA,MAAM,GAAG,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC;AACjF,YAAA,IAAI,CAAC,GAAG;AAAE,gBAAA,OAAO,GAAG;AACpB,YAAA,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC;AAC/E,YAAA,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CACpE,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAW,CAAC,CACnE;AACD,YAAA,OAAO,MAAM,CAAC,QAAQ,EAAE;QAC1B;IACF;AAAE,IAAA,MAAM;;AAEN,QAAA,OAAO,GAAG;IACZ;AACF;;;;"}
+{"version":3,"file":"useCurrencyBalanceSolana.js","sources":["../../../src/state/balance/useCurrencyBalanceSolana.ts"],"sourcesContent":["import { Connection, PublicKey } from '@solana/web3.js'\nimport { getAccount } from '@solana/spl-token'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport { formatUnits } from '../../utils/fixedPoint'\nimport { getRPC } from '../../config/constants/networks'\nimport { getTokenProgramForMint } from '../../utils/solanaAtaHelper'\nimport { getAssociatedTokenAddress } from '@solana/spl-token'\n\n// Use devnet or your custom cluster URL\nexport const getTokenBalanceSolana = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  const connection = new Connection(getRPC(ChainId.SOL), 'confirmed')\n  const userPubkey = new PublicKey(account)\n\n  try {\n    if (currency === 'NATIVE') {\n      const lamports = await connection.getBalance(userPubkey)\n      return formatUnits(lamports, 9)\n    } else {\n      const mint = new PublicKey(currency?.address?.[ChainId.SOL] as string)\n      // Detect token program to get correct ATA (supports Token-2022)\n      const tokenProgram = await getTokenProgramForMint(connection, mint)\n      const ata = await getAssociatedTokenAddress(mint, userPubkey, true, tokenProgram)\n      if (!ata) return '0'\n      const tokenAccount = await getAccount(connection, ata, undefined, tokenProgram)\n      return formatUnits(tokenAccount.amount.toString(), currency?.decimals?.[ChainId.SOL] as number)\n    }\n  } catch {\n    // If account doesn't exist (e.g. never received that token)\n    return '0'\n  }\n}\n"],"names":[],"mappings":";;;;;;;AAQA;AACO,MAAM,qBAAqB,GAAG,OACnC,QAAiC,EACjC,OAAsB,KACI;AAC1B,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,IAAI;AAEtC,IAAA,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;AACnE,IAAA,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC;AAEzC,IAAA,IAAI;AACF,QAAA,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC;AACxD,YAAA,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC;aAAO;AACL,YAAA,MAAM,IAAI,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAW,CAAC;;YAEtE,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC;AACnE,YAAA,MAAM,GAAG,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC;AACjF,YAAA,IAAI,CAAC,GAAG;AAAE,gBAAA,OAAO,GAAG;AACpB,YAAA,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC;AAC/E,YAAA,OAAO,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAW,CAAC;QACjG;IACF;AAAE,IAAA,MAAM;;AAEN,QAAA,OAAO,GAAG;IACZ;AACF;;;;"}

package/dist/state/balance/useCurrencyBalanceSui.js

@@ -1,6 +1,6 @@
-import BigNumber from 'bignumber.js';
 import { ChainId } from '@ape.swap/apeswap-lists';
 import { getSuiClient } from '../../utils/suiHelpers.js';
+import { formatUnits } from '../../utils/fixedPoint.js';
 
 // Sui balance reads — mirrors useCurrencyBalanceAptos.ts
 const SUI_KEY = ChainId.SUI;
@@ -20,7 +20,7 @@ const getTokenBalanceSui = async (currency, account) => {
     try {
         const client = getSuiClient();
         const result = await client.getBalance({ owner: account, coinType });
-        return new BigNumber(result.totalBalance).div(new BigNumber(10).pow(decimals)).toString();
+        return formatUnits(result.totalBalance, decimals);
     }
     catch {
         return '0';

package/dist/state/balance/useCurrencyBalanceSui.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCurrencyBalanceSui.js","sources":["../../../src/state/balance/useCurrencyBalanceSui.ts"],"sourcesContent":["// Sui balance reads — mirrors useCurrencyBalanceAptos.ts\n\nimport BigNumber from 'bignumber.js'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport { getSuiClient } from '../../utils/suiHelpers'\n\nconst SUI_KEY = ChainId.SUI\nconst SUI_NATIVE_COIN_TYPE = '0x2::sui::SUI'\nconst SUI_NATIVE_DECIMALS = 9\n\n/**\n * Single-token balance read for Sui.\n * Used by `useCurrencyBalance` when `chainId === ChainId.SUI`.\n */\nexport const getTokenBalanceSui = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  const coinType = currency === 'NATIVE' ? SUI_NATIVE_COIN_TYPE : currency.address[SUI_KEY]\n  if (!coinType) return '0'\n\n  const decimals = currency === 'NATIVE' ? SUI_NATIVE_DECIMALS : (currency.decimals?.[SUI_KEY] ?? 9)\n\n  try {\n    const client = getSuiClient()\n    const result = await client.getBalance({ owner: account, coinType })\n    return new BigNumber(result.totalBalance).div(new BigNumber(10).pow(decimals)).toString()\n  } catch {\n    return '0'\n  }\n}\n\n/**\n * Multi-token balance read for Sui.\n * Used by `useUserTokensBalance` when `chainId === ChainId.SUI`.\n */\nexport const getTokensBalanceSui = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n): Promise<{ address: string; balance: string }[]> => {\n  return Promise.all(\n    tokens.map(async (token) => {\n      const address = token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[SUI_KEY] as string)\n      const balance = await getTokenBalanceSui(token, account)\n      return { address, balance: balance ?? '0' }\n    }),\n  )\n}\n"],"names":[],"mappings":";;;;AAAA;AAMA,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG;AAC3B,MAAM,oBAAoB,GAAG,eAAe;AAC5C,MAAM,mBAAmB,GAAG,CAAC;AAE7B;;;AAGG;AACI,MAAM,kBAAkB,GAAG,OAChC,QAAiC,EACjC,OAAsB,KACI;AAC1B,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,IAAI;AAEtC,IAAA,MAAM,QAAQ,GAAG,QAAQ,KAAK,QAAQ,GAAG,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;AACzF,IAAA,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,GAAG;IAEzB,MAAM,QAAQ,GAAG,QAAQ,KAAK,QAAQ,GAAG,mBAAmB,IAAI,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAElG,IAAA,IAAI;AACF,QAAA,MAAM,MAAM,GAAG,YAAY,EAAE;AAC7B,QAAA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACpE,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3F;AAAE,IAAA,MAAM;AACN,QAAA,OAAO,GAAG;IACZ;AACF;AAEA;;;AAGG;AACI,MAAM,mBAAmB,GAAG,OACjC,OAAe,EACf,MAA4B,KACuB;AACnD,IAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,GAAG,CAAC,OAAO,KAAK,KAAI;AACzB,QAAA,MAAM,OAAO,GAAG,KAAK,KAAK,QAAQ,GAAG,QAAQ,GAAK,KAAe,CAAC,OAAO,CAAC,OAAO,CAAY;QAC7F,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC;QACxD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE;IAC7C,CAAC,CAAC,CACH;AACH;;;;"}
+{"version":3,"file":"useCurrencyBalanceSui.js","sources":["../../../src/state/balance/useCurrencyBalanceSui.ts"],"sourcesContent":["// Sui balance reads — mirrors useCurrencyBalanceAptos.ts\n\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport { getSuiClient } from '../../utils/suiHelpers'\nimport { formatUnits } from '../../utils/fixedPoint'\n\nconst SUI_KEY = ChainId.SUI\nconst SUI_NATIVE_COIN_TYPE = '0x2::sui::SUI'\nconst SUI_NATIVE_DECIMALS = 9\n\n/**\n * Single-token balance read for Sui.\n * Used by `useCurrencyBalance` when `chainId === ChainId.SUI`.\n */\nexport const getTokenBalanceSui = async (\n  currency: 'NATIVE' | Token | null,\n  account: string | null,\n): Promise<string | null> => {\n  if (!account || !currency) return null\n\n  const coinType = currency === 'NATIVE' ? SUI_NATIVE_COIN_TYPE : currency.address[SUI_KEY]\n  if (!coinType) return '0'\n\n  const decimals = currency === 'NATIVE' ? SUI_NATIVE_DECIMALS : (currency.decimals?.[SUI_KEY] ?? 9)\n\n  try {\n    const client = getSuiClient()\n    const result = await client.getBalance({ owner: account, coinType })\n    return formatUnits(result.totalBalance, decimals)\n  } catch {\n    return '0'\n  }\n}\n\n/**\n * Multi-token balance read for Sui.\n * Used by `useUserTokensBalance` when `chainId === ChainId.SUI`.\n */\nexport const getTokensBalanceSui = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n): Promise<{ address: string; balance: string }[]> => {\n  return Promise.all(\n    tokens.map(async (token) => {\n      const address = token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[SUI_KEY] as string)\n      const balance = await getTokenBalanceSui(token, account)\n      return { address, balance: balance ?? '0' }\n    }),\n  )\n}\n"],"names":[],"mappings":";;;;AAAA;AAMA,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG;AAC3B,MAAM,oBAAoB,GAAG,eAAe;AAC5C,MAAM,mBAAmB,GAAG,CAAC;AAE7B;;;AAGG;AACI,MAAM,kBAAkB,GAAG,OAChC,QAAiC,EACjC,OAAsB,KACI;AAC1B,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,IAAI;AAEtC,IAAA,MAAM,QAAQ,GAAG,QAAQ,KAAK,QAAQ,GAAG,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;AACzF,IAAA,IAAI,CAAC,QAAQ;AAAE,QAAA,OAAO,GAAG;IAEzB,MAAM,QAAQ,GAAG,QAAQ,KAAK,QAAQ,GAAG,mBAAmB,IAAI,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAElG,IAAA,IAAI;AACF,QAAA,MAAM,MAAM,GAAG,YAAY,EAAE;AAC7B,QAAA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACpE,OAAO,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;IACnD;AAAE,IAAA,MAAM;AACN,QAAA,OAAO,GAAG;IACZ;AACF;AAEA;;;AAGG;AACI,MAAM,mBAAmB,GAAG,OACjC,OAAe,EACf,MAA4B,KACuB;AACnD,IAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,GAAG,CAAC,OAAO,KAAK,KAAI;AACzB,QAAA,MAAM,OAAO,GAAG,KAAK,KAAK,QAAQ,GAAG,QAAQ,GAAK,KAAe,CAAC,OAAO,CAAC,OAAO,CAAY;QAC7F,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC;QACxD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE;IAC7C,CAAC,CAAC,CACH;AACH;;;;"}

package/dist/state/balance/useUserTokensBalance.js

@@ -5,7 +5,7 @@ import erc20ABI from '../../config/abi/erc20.json.js';
 import { ChainId } from '@ape.swap/apeswap-lists';
 import multicall from '../../utils/multicall.js';
 import { MULTICALL_V2 } from '../../config/constants/addresses.js';
-import BigNumber from 'bignumber.js';
+import { formatUnits } from '../../utils/fixedPoint.js';
 import { reportError } from '../../utils/reportError.js';
 import { useURLByEnvironment } from '../useSDKConfig.js';
 import useEVMAccount from '../../hooks/accounts/useEVMAccount.js';
@@ -74,15 +74,13 @@ const getTokensBalance = async (account, tokens, chainId, apiUrl) => {
                     token?.address?.[chainId]?.toLowerCase() === callsToken[i].address.toLowerCase());
                 return {
                     address: token?.address[chainId],
-                    balance: new BigNumber(balance)
-                        .div(new BigNumber(10).pow(token.decimals[chainId]))
-                        .toString(),
+                    balance: formatUnits(balance, token.decimals[chainId]),
                 };
             });
             const balancesNative = dataNative.map((balance) => {
                 return {
                     address: 'NATIVE',
-                    balance: new BigNumber(balance).div(new BigNumber(10).pow(18)).toString(),
+                    balance: formatUnits(balance, 18),
                 };
             });
             return [...balancesToken, ...balancesNative];

package/dist/state/balance/useUserTokensBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUserTokensBalance.js","sources":["../../../src/state/balance/useUserTokensBalance.ts"],"sourcesContent":["import { useQuery, UseQueryResult } from '@tanstack/react-query'\nimport { QUERY_KEYS } from '../../config/constants/queryKeys'\nimport multicallV2Abi from '../../config/abi/multicallv2.json'\nimport erc20ABI from '../../config/abi/erc20.json'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport multicall, { Call } from '../../utils/multicall'\nimport { MULTICALL_V2 } from '../../config/constants/addresses'\nimport BigNumber from 'bignumber.js'\nimport { reportError } from '../../utils/reportError'\nimport { useURLByEnvironment } from '../useSDKConfig'\nimport useEVMAccount from '../../hooks/accounts/useEVMAccount'\nimport { getTokenBalanceSolana } from './useCurrencyBalanceSolana'\nimport useSOLAccount from '../../hooks/accounts/useSOLAccount'\nimport useAPTAccount from '../../hooks/accounts/useAPTAccount'\nimport useSUIAccount from '../../hooks/accounts/useSUIAccount'\nimport { getTokensBalanceAptos } from './useCurrencyBalanceAptos'\nimport { getTokensBalanceSui } from './useCurrencyBalanceSui'\n\nexport default function useUserTokensBalance(\n  tokens: ('NATIVE' | Token)[],\n  chainId: number,\n): UseQueryResult<{ address: string; balance: string }[]> {\n  const keys = tokens.map((token) => (token === 'NATIVE' ? 'NATIVE' : token.address[chainId as ChainId]))\n  const { address: account } = useEVMAccount()\n  const { publicKey: accountSolana } = useSOLAccount()\n  const { address: aptosAccount } = useAPTAccount()\n  const { address: suiAccount } = useSUIAccount()\n  const accountToUse =\n    chainId === ChainId.SOL\n      ? accountSolana?.toString()\n      : chainId === ChainId.APTOS\n        ? aptosAccount\n        : chainId === ChainId.SUI\n          ? suiAccount\n          : account\n  const apiUrl = useURLByEnvironment('apiV2')\n  return useQuery({\n    queryKey: [`${QUERY_KEYS.USER_TOKENS_BALANCES}-${keys}-${accountToUse}`],\n    queryFn: () => getTokensBalance(accountToUse!, tokens, chainId, apiUrl),\n    staleTime: 45000,\n    refetchOnWindowFocus: false,\n    enabled: !!accountToUse,\n  })\n}\n\nexport const getTokensBalance = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n  chainId: number,\n  apiUrl?: string,\n): Promise<{ address: string; balance: string }[]> => {\n  try {\n    if (chainId === ChainId.APTOS) {\n      return getTokensBalanceAptos(account, tokens)\n    }\n\n    if (chainId === ChainId.SUI) {\n      return getTokensBalanceSui(account, tokens)\n    }\n\n    if (chainId !== ChainId.SOL) {\n      const callsToken: Call[] = tokens\n        .filter((token) => token !== 'NATIVE')\n        .map((token) => {\n          return {\n            address: token?.address?.[chainId as ChainId] ?? '',\n            name: 'balanceOf',\n            params: [account],\n          }\n        })\n      const callNative: Call[] = tokens\n        .filter((token) => token === 'NATIVE')\n        .map(() => {\n          return {\n            address: MULTICALL_V2[chainId]!,\n            name: 'getEthBalance',\n            params: [account],\n          }\n        })\n      const [dataToken, dataNative] = await Promise.all([\n        multicall(chainId, erc20ABI, callsToken),\n        multicall(chainId, multicallV2Abi, callNative),\n      ])\n\n      const balancesToken = dataToken.map((balance: any, i: number) => {\n        const token = tokens.find(\n          (token) =>\n            token !== 'NATIVE' &&\n            (token as Token)?.address?.[chainId as ChainId]?.toLowerCase() === callsToken[i].address.toLowerCase(),\n        )\n        return {\n          address: (token as Token)?.address[chainId as ChainId],\n          balance: new BigNumber(balance)\n            .div(new BigNumber(10).pow((token as Token).decimals![chainId as ChainId]!))\n            .toString(),\n        }\n      })\n      const balancesNative = dataNative.map((balance: any) => {\n        return {\n          address: 'NATIVE',\n          balance: new BigNumber(balance).div(new BigNumber(10).pow(18)).toString(),\n        }\n      })\n      return [...balancesToken, ...balancesNative]\n    } else {\n      return await Promise.all(\n        tokens.map(async (token) => {\n          const balance = await getTokenBalanceSolana(token, account)\n          return {\n            address: token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[ChainId.SOL] as string),\n            balance: balance || '0',\n          }\n        }),\n      )\n    }\n  } catch (e) {\n    reportError({\n      apiUrl,\n      error: e,\n      extraInfo: { type: 'getTokensBalance', tokens, e },\n      account,\n      chainId,\n    })\n    return []\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useUserTokensBalance.js","sources":["../../../src/state/balance/useUserTokensBalance.ts"],"sourcesContent":["import { useQuery, UseQueryResult } from '@tanstack/react-query'\nimport { QUERY_KEYS } from '../../config/constants/queryKeys'\nimport multicallV2Abi from '../../config/abi/multicallv2.json'\nimport erc20ABI from '../../config/abi/erc20.json'\nimport { ChainId, Token } from '@ape.swap/apeswap-lists'\nimport multicall, { Call } from '../../utils/multicall'\nimport { MULTICALL_V2 } from '../../config/constants/addresses'\nimport { formatUnits } from '../../utils/fixedPoint'\nimport { reportError } from '../../utils/reportError'\nimport { useURLByEnvironment } from '../useSDKConfig'\nimport useEVMAccount from '../../hooks/accounts/useEVMAccount'\nimport { getTokenBalanceSolana } from './useCurrencyBalanceSolana'\nimport useSOLAccount from '../../hooks/accounts/useSOLAccount'\nimport useAPTAccount from '../../hooks/accounts/useAPTAccount'\nimport useSUIAccount from '../../hooks/accounts/useSUIAccount'\nimport { getTokensBalanceAptos } from './useCurrencyBalanceAptos'\nimport { getTokensBalanceSui } from './useCurrencyBalanceSui'\n\nexport default function useUserTokensBalance(\n  tokens: ('NATIVE' | Token)[],\n  chainId: number,\n): UseQueryResult<{ address: string; balance: string }[]> {\n  const keys = tokens.map((token) => (token === 'NATIVE' ? 'NATIVE' : token.address[chainId as ChainId]))\n  const { address: account } = useEVMAccount()\n  const { publicKey: accountSolana } = useSOLAccount()\n  const { address: aptosAccount } = useAPTAccount()\n  const { address: suiAccount } = useSUIAccount()\n  const accountToUse =\n    chainId === ChainId.SOL\n      ? accountSolana?.toString()\n      : chainId === ChainId.APTOS\n        ? aptosAccount\n        : chainId === ChainId.SUI\n          ? suiAccount\n          : account\n  const apiUrl = useURLByEnvironment('apiV2')\n  return useQuery({\n    queryKey: [`${QUERY_KEYS.USER_TOKENS_BALANCES}-${keys}-${accountToUse}`],\n    queryFn: () => getTokensBalance(accountToUse!, tokens, chainId, apiUrl),\n    staleTime: 45000,\n    refetchOnWindowFocus: false,\n    enabled: !!accountToUse,\n  })\n}\n\nexport const getTokensBalance = async (\n  account: string,\n  tokens: ('NATIVE' | Token)[],\n  chainId: number,\n  apiUrl?: string,\n): Promise<{ address: string; balance: string }[]> => {\n  try {\n    if (chainId === ChainId.APTOS) {\n      return getTokensBalanceAptos(account, tokens)\n    }\n\n    if (chainId === ChainId.SUI) {\n      return getTokensBalanceSui(account, tokens)\n    }\n\n    if (chainId !== ChainId.SOL) {\n      const callsToken: Call[] = tokens\n        .filter((token) => token !== 'NATIVE')\n        .map((token) => {\n          return {\n            address: token?.address?.[chainId as ChainId] ?? '',\n            name: 'balanceOf',\n            params: [account],\n          }\n        })\n      const callNative: Call[] = tokens\n        .filter((token) => token === 'NATIVE')\n        .map(() => {\n          return {\n            address: MULTICALL_V2[chainId]!,\n            name: 'getEthBalance',\n            params: [account],\n          }\n        })\n      const [dataToken, dataNative] = await Promise.all([\n        multicall(chainId, erc20ABI, callsToken),\n        multicall(chainId, multicallV2Abi, callNative),\n      ])\n\n      const balancesToken = dataToken.map((balance: any, i: number) => {\n        const token = tokens.find(\n          (token) =>\n            token !== 'NATIVE' &&\n            (token as Token)?.address?.[chainId as ChainId]?.toLowerCase() === callsToken[i].address.toLowerCase(),\n        )\n        return {\n          address: (token as Token)?.address[chainId as ChainId],\n          balance: formatUnits(balance, (token as Token).decimals![chainId as ChainId]!),\n        }\n      })\n      const balancesNative = dataNative.map((balance: any) => {\n        return {\n          address: 'NATIVE',\n          balance: formatUnits(balance, 18),\n        }\n      })\n      return [...balancesToken, ...balancesNative]\n    } else {\n      return await Promise.all(\n        tokens.map(async (token) => {\n          const balance = await getTokenBalanceSolana(token, account)\n          return {\n            address: token === 'NATIVE' ? 'NATIVE' : ((token as Token).address[ChainId.SOL] as string),\n            balance: balance || '0',\n          }\n        }),\n      )\n    }\n  } catch (e) {\n    reportError({\n      apiUrl,\n      error: e,\n      extraInfo: { type: 'getTokensBalance', tokens, e },\n      account,\n      chainId,\n    })\n    return []\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/state/bondApiStats/useGetBondApiStats.d.ts

@@ -21,5 +21,4 @@ export interface BondApiStats {
     valueRemaining: number;
     Sales: Sales[];
 }
-export declare const getBondApiStats: (contractAddress?: string) => Promise<BondApiStats>;
 export default function useGetBondApiStats(contractAddress?: string): import("@tanstack/react-query").UseQueryResult<BondApiStats, Error>;

package/dist/state/bondApiStats/useGetBondApiStats.js

@@ -17,5 +17,5 @@ function useGetBondApiStats(contractAddress) {
     });
 }
 
-export { useGetBondApiStats as default, getBondApiStats };
+export { useGetBondApiStats as default };
 //# sourceMappingURL=useGetBondApiStats.js.map

package/dist/state/bondApiStats/useGetBondApiStats.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetBondApiStats.js","sources":["../../../src/state/bondApiStats/useGetBondApiStats.ts"],"sourcesContent":["import { useQuery } from '@tanstack/react-query'\nimport axios from 'axios'\nimport { QUERY_KEYS } from '../../config/constants/queryKeys'\n\nexport interface Sales {\n  billNftId: number\n  chainId: number\n  contractAddress: string\n  createdAddressOwner: string\n  createdAt: number\n  deposit: number\n  dollarValue: number\n  lp: string\n  payout: number\n  payoutToken: string\n  payoutTokenPrice: number\n  referenceId: string\n  transactionHash: string\n  vestingTime: number\n}\n\nexport interface BondApiStats {\n  ROE: string\n  percentageSold: number\n  totalDollarValue: number\n  valueRemaining: number\n  Sales: Sales[]\n}\n\nexport const getBondApiStats = async (contractAddress?: string): Promise<BondApiStats> => {\n  const { data } = await axios.get(`https://api.ape.bond/collector/salesInfo/bond/${contractAddress}/0`)\n  return data\n}\n\nexport default function useGetBondApiStats(contractAddress?: string) {\n  return useQuery({\n    queryKey: [`${QUERY_KEYS.BOND_API_STATS}-${contractAddress}`],\n    queryFn: () => getBondApiStats(contractAddress),\n    refetchInterval: 300000,\n    refetchOnWindowFocus: false,\n    refetchOnMount: false,\n    retry: 1,\n  })\n}\n"],"names":[],"mappings":";;;;MA6Ba,eAAe,GAAG,OAAO,eAAwB,KAA2B;AACvF,IAAA,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA,8CAAA,EAAiD,eAAe,CAAA,EAAA,CAAI,CAAC;AACtG,IAAA,OAAO,IAAI;AACb;AAEc,SAAU,kBAAkB,CAAC,eAAwB,EAAA;AACjE,IAAA,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,CAAA,EAAG,UAAU,CAAC,cAAc,CAAA,CAAA,EAAI,eAAe,CAAA,CAAE,CAAC;AAC7D,QAAA,OAAO,EAAE,MAAM,eAAe,CAAC,eAAe,CAAC;AAC/C,QAAA,eAAe,EAAE,MAAM;AACvB,QAAA,oBAAoB,EAAE,KAAK;AAC3B,QAAA,cAAc,EAAE,KAAK;AACrB,QAAA,KAAK,EAAE,CAAC;AACT,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"useGetBondApiStats.js","sources":["../../../src/state/bondApiStats/useGetBondApiStats.ts"],"sourcesContent":["import { useQuery } from '@tanstack/react-query'\nimport axios from 'axios'\nimport { QUERY_KEYS } from '../../config/constants/queryKeys'\n\nexport interface Sales {\n  billNftId: number\n  chainId: number\n  contractAddress: string\n  createdAddressOwner: string\n  createdAt: number\n  deposit: number\n  dollarValue: number\n  lp: string\n  payout: number\n  payoutToken: string\n  payoutTokenPrice: number\n  referenceId: string\n  transactionHash: string\n  vestingTime: number\n}\n\nexport interface BondApiStats {\n  ROE: string\n  percentageSold: number\n  totalDollarValue: number\n  valueRemaining: number\n  Sales: Sales[]\n}\n\nconst getBondApiStats = async (contractAddress?: string): Promise<BondApiStats> => {\n  const { data } = await axios.get(`https://api.ape.bond/collector/salesInfo/bond/${contractAddress}/0`)\n  return data\n}\n\nexport default function useGetBondApiStats(contractAddress?: string) {\n  return useQuery({\n    queryKey: [`${QUERY_KEYS.BOND_API_STATS}-${contractAddress}`],\n    queryFn: () => getBondApiStats(contractAddress),\n    refetchInterval: 300000,\n    refetchOnWindowFocus: false,\n    refetchOnMount: false,\n    retry: 1,\n  })\n}\n"],"names":[],"mappings":";;;;AA6BA,MAAM,eAAe,GAAG,OAAO,eAAwB,KAA2B;AAChF,IAAA,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA,8CAAA,EAAiD,eAAe,CAAA,EAAA,CAAI,CAAC;AACtG,IAAA,OAAO,IAAI;AACb,CAAC;AAEa,SAAU,kBAAkB,CAAC,eAAwB,EAAA;AACjE,IAAA,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,CAAA,EAAG,UAAU,CAAC,cAAc,CAAA,CAAA,EAAI,eAAe,CAAA,CAAE,CAAC;AAC7D,QAAA,OAAO,EAAE,MAAM,eAAe,CAAC,eAAe,CAAC;AAC/C,QAAA,eAAe,EAAE,MAAM;AACvB,QAAA,oBAAoB,EAAE,KAAK;AAC3B,QAAA,cAAc,EAAE,KAAK;AACrB,QAAA,KAAK,EAAE,CAAC;AACT,KAAA,CAAC;AACJ;;;;"}

package/dist/state/bonds/fetchBondsData/cleanBillsData.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { getBalanceNumber } from '../../../utils/getBalanceNumber.js';
 import { calculateTrueBondPrice } from '../../../utils/calculateSolanaTrueBillPrice.js';
 import { TIER_MAPPING } from '../../tiers/useTierPoints.js';
-import BigNumber from 'bignumber.js';
+import { formatUnits, mulDivRound, parseUnits } from '../../../utils/fixedPoint.js';
 import { PRICE_API_URL } from '../../../config/constants/variables.js';
 
 const cleanBillsData = async (billIds, chunkedBills, chainId, bills, tokenPrices) => {
@@ -43,11 +43,10 @@ const cleanBillsData = async (billIds, chunkedBills, chainId, bills, tokenPrices
         const feeInPrincipal = Number(feeInPrincipalRaw / 10000);
         const tierBoostRate = bill.tierBoostRate === undefined ? 1 : bill.tierBoostRate;
         const [, vestingTerm, , maxPayout] = terms;
-        const tokensRemaining = new BigNumber(maxTotalPayout ?? '0')
-            .minus(new BigNumber(totalPayoutGiven))
-            .div(new BigNumber(10).pow(bill?.earnToken.decimals[bill?.chainId] ?? 18))
-            .toNumber();
-        const treasuryBalance = getBalanceNumber(customTreasuryBalance, bill?.earnToken?.decimals?.[bill?.chainId] ?? 18);
+        const tokensRemaining = Number(formatUnits(BigInt(maxTotalPayout ?? '0') - BigInt(totalPayoutGiven), bill?.earnToken.decimals[bill?.chainId] ?? 18));
+        const treasuryBalance = customTreasuryBalance
+            ? getBalanceNumber(customTreasuryBalance, bill?.earnToken?.decimals?.[bill?.chainId] ?? 18)
+            : null;
         if (chainId === ChainId.SOL) {
             const principalDecimals = bill?.lpToken.decimals[ChainId.SOL];
             const payoutDecimals = bill?.earnToken.decimals[ChainId.SOL];
@@ -94,9 +93,7 @@ const cleanBillsData = async (billIds, chunkedBills, chainId, bills, tokenPrices
             trueBondPrices,
             principalTokenPrice: lpPrice?.toString(),
             payoutTokenPrice: earnTokenPrice?.toString(),
-            tokensRemaining: treasuryBalance
-                ? Math.min(treasuryBalance, tokensRemaining).toString()
-                : tokensRemaining.toString(),
+            tokensRemaining: treasuryBalance !== null ? Math.min(treasuryBalance, tokensRemaining).toString() : tokensRemaining.toString(),
             maxTotalPayout: maxTotalPayout?.toString(),
             maxPayout: maxPayout?.toString(),
             totalPayoutGiven: totalPayoutGiven?.toString(),
@@ -107,12 +104,18 @@ const cleanBillsData = async (billIds, chunkedBills, chainId, bills, tokenPrices
     }));
     return data;
 };
+// Scale used to carry percentage ratios (tier boost, reverse fee) into integer math
+// alongside the wei-scale `trueBillPrice`, so the huge integer never round-trips through
+// a JS float before the final getBalanceNumber() conversion.
+const RATIO_SCALE = 1000000000000n; // 1e12
+const scaleRatio = (ratio) => parseUnits(ratio.toString(), 12);
 const getBonusWithFee = (feeInPayout, tierBoostRate, trueBillPrice, lpPrice, earnTokenPrice) => {
     const fee = feeInPayout ?? 0;
-    const reverseFee = new BigNumber(fee / 100 / (1 - fee / 100));
-    const trueBondPrice = new BigNumber(trueBillPrice)
-        .times((100 + tierBoostRate) / 100)
-        .plus(new BigNumber(trueBillPrice).times(reverseFee));
+    const reverseFee = fee / 100 / (1 - fee / 100);
+    const trueBillPriceBig = BigInt(trueBillPrice);
+    const tierAdjusted = mulDivRound(trueBillPriceBig, scaleRatio((100 + tierBoostRate) / 100), RATIO_SCALE);
+    const feeAdjusted = mulDivRound(trueBillPriceBig, scaleRatio(reverseFee), RATIO_SCALE);
+    const trueBondPrice = tierAdjusted + feeAdjusted;
     const priceUSDMinusFee = getBalanceNumber(trueBondPrice) * lpPrice;
     const bonusWithoutFee = ((earnTokenPrice - priceUSDMinusFee) / earnTokenPrice) * 100;
     const validatedBonus = bonusWithoutFee > 0 ? (bonusWithoutFee / (100 - bonusWithoutFee)) * 100 : 0;

package/dist/state/bonds/fetchBondsData/cleanBillsData.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanBillsData.js","sources":["../../../../src/state/bonds/fetchBondsData/cleanBillsData.ts"],"sourcesContent":["import { BillsConfig, BillVersion, ChainId } from '@ape.swap/apeswap-lists'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport { BondsData, TrueBondPrices } from '../../../types/bonds'\nimport axios from 'axios'\nimport { getBalanceNumber } from '../../../utils/getBalanceNumber'\nimport { calculateTrueBondPrice } from '../../../utils/calculateSolanaTrueBillPrice'\nimport { TIER_MAPPING } from '../../tiers/useTierPoints'\nimport BigNumber from 'bignumber.js'\nimport { PRICE_API_URL } from '../../../config/constants/variables'\n\nexport const cleanBillsData = async (\n  billIds: number[],\n  chunkedBills: any[],\n  chainId: ChainId,\n  bills: BillsConfig[],\n  tokenPrices?: TokenPrices[],\n): Promise<BondsData[]> => {\n  const data: BondsData[] = await Promise.all(\n    chunkedBills?.map(async (chunk, index) => {\n      const bill = bills?.find((bill) => bill?.index === billIds[index]) as BillsConfig\n\n      let principalTokenPrice = tokenPrices?.find(\n        (tokenPrice) =>\n          tokenPrice?.tokenAddress?.toLowerCase() === bill?.lpToken?.address?.[bill?.chainId]?.toLowerCase() &&\n          tokenPrice?.chainId === chainId,\n      )\n\n      if (principalTokenPrice === undefined || !!principalTokenPrice.error) {\n        try {\n          // Missing token price, therefor make a single call to api to fetch it\n          const res = await axios.get(\n            `${PRICE_API_URL}/realtime/price?token=${bill?.lpToken?.address?.[bill?.chainId]}&chain=${bill?.chainId}`,\n          )\n          console.log('Individual call for: ', bill.lpToken.symbol, '. Price: ', res.data.price)\n          principalTokenPrice = res.data\n        } catch {\n          console.error('Failed to fetch price for: ', bill.lpToken.symbol)\n        }\n      }\n\n      let payoutTokenPrice = tokenPrices?.find(\n        (tokenPrice) =>\n          tokenPrice?.tokenAddress?.toLowerCase() === bill?.earnToken?.address?.[bill?.chainId]?.toLowerCase() &&\n          tokenPrice?.chainId === chainId,\n      )\n\n      if (payoutTokenPrice === undefined || !!payoutTokenPrice.error) {\n        try {\n          // Missing token price, therefor make a single call to api to fetch it\n          const res = await axios.get(\n            `${PRICE_API_URL}/realtime/price?token=${bill?.earnToken?.address?.[bill?.chainId]}&chain=${bill?.chainId}`,\n          )\n          console.log('Individual call for: ', bill.earnToken.symbol, '. Price: ', res.data.price)\n          payoutTokenPrice = res.data\n        } catch {\n          console.error('Failed to fetch price for: ', bill.earnToken.symbol)\n        }\n      }\n      const lpPrice = principalTokenPrice?.price ?? 0\n      const earnTokenPrice = payoutTokenPrice?.price ?? 0\n\n      const [\n        trueBillPriceFromChunk,\n        totalPayoutGiven,\n        terms,\n        maxTotalPayout,\n        feeInPayoutRaw,\n        feeInPrincipalRaw,\n        paused,\n        ,\n        customTreasuryBalance,\n        bondPricing,\n        bondTerms,\n      ] = chunk\n      let trueBillPrice = trueBillPriceFromChunk\n\n      const feeInPayout = Number(feeInPayoutRaw / 10000)\n      const feeInPrincipal = Number(feeInPrincipalRaw / 10000)\n      const tierBoostRate = bill.tierBoostRate === undefined ? 1 : bill.tierBoostRate\n      const [, vestingTerm, , maxPayout] = terms\n      const tokensRemaining = new BigNumber(maxTotalPayout ?? '0')\n        .minus(new BigNumber(totalPayoutGiven))\n        .div(new BigNumber(10).pow(bill?.earnToken.decimals[bill?.chainId] ?? 18))\n        .toNumber()\n      const treasuryBalance = getBalanceNumber(customTreasuryBalance, bill?.earnToken?.decimals?.[bill?.chainId] ?? 18)\n\n      if (chainId === ChainId.SOL) {\n        const principalDecimals = bill?.lpToken.decimals[ChainId.SOL] as number\n        const payoutDecimals = bill?.earnToken.decimals[ChainId.SOL] as number\n        const timeStamp = Math.floor(Date.now() / 1000)\n        trueBillPrice = calculateTrueBondPrice(\n          bondPricing,\n          bondTerms,\n          timeStamp,\n          principalDecimals,\n          payoutDecimals,\n          feeInPrincipal,\n        )\n      }\n\n      let trueBondPrices: TrueBondPrices[] = []\n      if (bill?.billVersion === BillVersion.V4) {\n        trueBondPrices = trueBillPrice[0].map((data: any) => {\n          return {\n            points: data?.points?.toString(),\n            trueBondPrice: data?.trueBondPrice.toString(),\n            discount: getRawDiscount(data?.trueBondPrice.toString(), lpPrice, earnTokenPrice),\n            bonus: getRawBonus(data?.trueBondPrice.toString(), lpPrice, earnTokenPrice),\n            discountWithFee: getDiscountWithFee(\n              feeInPayout,\n              tierBoostRate,\n              data?.trueBondPrice.toString(),\n              lpPrice,\n              earnTokenPrice,\n            ),\n            bonusWithFee: getBonusWithFee(\n              feeInPayout,\n              tierBoostRate,\n              data?.trueBondPrice.toString(),\n              lpPrice,\n              earnTokenPrice,\n            ),\n            boost: TIER_MAPPING[data?.points?.toString() as keyof typeof TIER_MAPPING],\n          }\n        })\n      } else {\n        const bonus = getRawBonus(trueBillPrice, lpPrice, earnTokenPrice)\n        const bonusWithFee = getBonusWithFee(feeInPayout, tierBoostRate, trueBillPrice, lpPrice, earnTokenPrice)\n        const discount = getRawDiscount(trueBillPrice, lpPrice, earnTokenPrice)\n        const discountWithFee = getDiscountWithFee(feeInPayout, tierBoostRate, trueBillPrice, lpPrice, earnTokenPrice)\n        trueBondPrices = [\n          {\n            points: '0',\n            boost: 0,\n            trueBondPrice: trueBillPrice.toString(),\n            bonus,\n            bonusWithFee,\n            discount,\n            discountWithFee,\n          },\n        ]\n      }\n      const cleanedData: BondsData = {\n        ...bill,\n        soldOut: paused[0] ? true : bill.soldOut,\n        feeInPayout,\n        feeInPrincipal,\n        showcaseTokenName: bill?.showcaseToken?.symbol ?? bill?.earnToken.symbol ?? '',\n        trueBondPrices,\n        principalTokenPrice: lpPrice?.toString(),\n        payoutTokenPrice: earnTokenPrice?.toString(),\n        tokensRemaining: treasuryBalance\n          ? Math.min(treasuryBalance, tokensRemaining).toString()\n          : tokensRemaining.toString(),\n        maxTotalPayout: maxTotalPayout?.toString(),\n        maxPayout: maxPayout?.toString(),\n        totalPayoutGiven: totalPayoutGiven?.toString(),\n        vestingTerm: typeof vestingTerm === 'number' ? vestingTerm : parseInt(vestingTerm),\n        tierBoostRate: bill.tierBoostRate === undefined ? 1 : bill.tierBoostRate,\n      }\n      return cleanedData\n    }),\n  )\n  return data\n}\n\nconst getBonusWithFee = (\n  feeInPayout: number,\n  tierBoostRate: number,\n  trueBillPrice: string,\n  lpPrice: number,\n  earnTokenPrice: number,\n) => {\n  const fee = feeInPayout ?? 0\n  const reverseFee = new BigNumber(fee / 100 / (1 - fee / 100))\n  const trueBondPrice = new BigNumber(trueBillPrice)\n    .times((100 + tierBoostRate) / 100)\n    .plus(new BigNumber(trueBillPrice).times(reverseFee))\n  const priceUSDMinusFee = getBalanceNumber(trueBondPrice) * lpPrice\n  const bonusWithoutFee = ((earnTokenPrice - priceUSDMinusFee) / earnTokenPrice) * 100\n  const validatedBonus = bonusWithoutFee > 0 ? (bonusWithoutFee / (100 - bonusWithoutFee)) * 100 : 0\n  return validatedBonus\n}\n\nconst getRawBonus = (trueBillPrice: any, lpPrice: number, earnTokenPrice: number) => {\n  const priceUsd = getBalanceNumber(trueBillPrice.toString()) * lpPrice\n  const discount: number = ((earnTokenPrice - priceUsd) / earnTokenPrice) * 100\n  return discount > 0 ? (discount / (100 - discount)) * 100 : 0\n}\n\nconst getRawDiscount = (trueBillPrice: any, lpPrice: number, earnTokenPrice: number) => {\n  const trueBondPrice = getBalanceNumber(trueBillPrice.toString())\n\n  return ((earnTokenPrice - lpPrice * trueBondPrice) / earnTokenPrice) * 100\n}\n\nconst getDiscountWithFee = (\n  feeInPayout: number,\n  tierBoostRate: number,\n  trueBillPrice: any,\n  lpPrice: number,\n  earnTokenPrice: number,\n) => {\n  const trueBondPrice = getBalanceNumber(trueBillPrice.toString())\n  const trueBondPriceWithFee = trueBondPrice * (1 / ((100 - (feeInPayout ?? 0)) / 100))\n  const discount = ((earnTokenPrice - lpPrice * trueBondPriceWithFee) / earnTokenPrice) * 100\n  const discountToReturn = 100 - ((100 - discount) / (100 - tierBoostRate)) * 100\n  return discountToReturn\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"cleanBillsData.js","sources":["../../../../src/state/bonds/fetchBondsData/cleanBillsData.ts"],"sourcesContent":["import { BillsConfig, BillVersion, ChainId } from '@ape.swap/apeswap-lists'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport { BondsData, TrueBondPrices } from '../../../types/bonds'\nimport axios from 'axios'\nimport { getBalanceNumber } from '../../../utils/getBalanceNumber'\nimport { calculateTrueBondPrice } from '../../../utils/calculateSolanaTrueBillPrice'\nimport { TIER_MAPPING } from '../../tiers/useTierPoints'\nimport { formatUnits, mulDivRound, parseUnits } from '../../../utils/fixedPoint'\nimport { PRICE_API_URL } from '../../../config/constants/variables'\n\nexport const cleanBillsData = async (\n  billIds: number[],\n  chunkedBills: any[],\n  chainId: ChainId,\n  bills: BillsConfig[],\n  tokenPrices?: TokenPrices[],\n): Promise<BondsData[]> => {\n  const data: BondsData[] = await Promise.all(\n    chunkedBills?.map(async (chunk, index) => {\n      const bill = bills?.find((bill) => bill?.index === billIds[index]) as BillsConfig\n\n      let principalTokenPrice = tokenPrices?.find(\n        (tokenPrice) =>\n          tokenPrice?.tokenAddress?.toLowerCase() === bill?.lpToken?.address?.[bill?.chainId]?.toLowerCase() &&\n          tokenPrice?.chainId === chainId,\n      )\n\n      if (principalTokenPrice === undefined || !!principalTokenPrice.error) {\n        try {\n          // Missing token price, therefor make a single call to api to fetch it\n          const res = await axios.get(\n            `${PRICE_API_URL}/realtime/price?token=${bill?.lpToken?.address?.[bill?.chainId]}&chain=${bill?.chainId}`,\n          )\n          console.log('Individual call for: ', bill.lpToken.symbol, '. Price: ', res.data.price)\n          principalTokenPrice = res.data\n        } catch {\n          console.error('Failed to fetch price for: ', bill.lpToken.symbol)\n        }\n      }\n\n      let payoutTokenPrice = tokenPrices?.find(\n        (tokenPrice) =>\n          tokenPrice?.tokenAddress?.toLowerCase() === bill?.earnToken?.address?.[bill?.chainId]?.toLowerCase() &&\n          tokenPrice?.chainId === chainId,\n      )\n\n      if (payoutTokenPrice === undefined || !!payoutTokenPrice.error) {\n        try {\n          // Missing token price, therefor make a single call to api to fetch it\n          const res = await axios.get(\n            `${PRICE_API_URL}/realtime/price?token=${bill?.earnToken?.address?.[bill?.chainId]}&chain=${bill?.chainId}`,\n          )\n          console.log('Individual call for: ', bill.earnToken.symbol, '. Price: ', res.data.price)\n          payoutTokenPrice = res.data\n        } catch {\n          console.error('Failed to fetch price for: ', bill.earnToken.symbol)\n        }\n      }\n      const lpPrice = principalTokenPrice?.price ?? 0\n      const earnTokenPrice = payoutTokenPrice?.price ?? 0\n\n      const [\n        trueBillPriceFromChunk,\n        totalPayoutGiven,\n        terms,\n        maxTotalPayout,\n        feeInPayoutRaw,\n        feeInPrincipalRaw,\n        paused,\n        ,\n        customTreasuryBalance,\n        bondPricing,\n        bondTerms,\n      ] = chunk\n      let trueBillPrice = trueBillPriceFromChunk\n\n      const feeInPayout = Number(feeInPayoutRaw / 10000)\n      const feeInPrincipal = Number(feeInPrincipalRaw / 10000)\n      const tierBoostRate = bill.tierBoostRate === undefined ? 1 : bill.tierBoostRate\n      const [, vestingTerm, , maxPayout] = terms\n      const tokensRemaining = Number(\n        formatUnits(\n          BigInt(maxTotalPayout ?? '0') - BigInt(totalPayoutGiven),\n          bill?.earnToken.decimals[bill?.chainId] ?? 18,\n        ),\n      )\n      const treasuryBalance = customTreasuryBalance\n        ? getBalanceNumber(customTreasuryBalance, bill?.earnToken?.decimals?.[bill?.chainId] ?? 18)\n        : null\n\n      if (chainId === ChainId.SOL) {\n        const principalDecimals = bill?.lpToken.decimals[ChainId.SOL] as number\n        const payoutDecimals = bill?.earnToken.decimals[ChainId.SOL] as number\n        const timeStamp = Math.floor(Date.now() / 1000)\n        trueBillPrice = calculateTrueBondPrice(\n          bondPricing,\n          bondTerms,\n          timeStamp,\n          principalDecimals,\n          payoutDecimals,\n          feeInPrincipal,\n        )\n      }\n\n      let trueBondPrices: TrueBondPrices[] = []\n      if (bill?.billVersion === BillVersion.V4) {\n        trueBondPrices = trueBillPrice[0].map((data: any) => {\n          return {\n            points: data?.points?.toString(),\n            trueBondPrice: data?.trueBondPrice.toString(),\n            discount: getRawDiscount(data?.trueBondPrice.toString(), lpPrice, earnTokenPrice),\n            bonus: getRawBonus(data?.trueBondPrice.toString(), lpPrice, earnTokenPrice),\n            discountWithFee: getDiscountWithFee(\n              feeInPayout,\n              tierBoostRate,\n              data?.trueBondPrice.toString(),\n              lpPrice,\n              earnTokenPrice,\n            ),\n            bonusWithFee: getBonusWithFee(\n              feeInPayout,\n              tierBoostRate,\n              data?.trueBondPrice.toString(),\n              lpPrice,\n              earnTokenPrice,\n            ),\n            boost: TIER_MAPPING[data?.points?.toString() as keyof typeof TIER_MAPPING],\n          }\n        })\n      } else {\n        const bonus = getRawBonus(trueBillPrice, lpPrice, earnTokenPrice)\n        const bonusWithFee = getBonusWithFee(feeInPayout, tierBoostRate, trueBillPrice, lpPrice, earnTokenPrice)\n        const discount = getRawDiscount(trueBillPrice, lpPrice, earnTokenPrice)\n        const discountWithFee = getDiscountWithFee(feeInPayout, tierBoostRate, trueBillPrice, lpPrice, earnTokenPrice)\n        trueBondPrices = [\n          {\n            points: '0',\n            boost: 0,\n            trueBondPrice: trueBillPrice.toString(),\n            bonus,\n            bonusWithFee,\n            discount,\n            discountWithFee,\n          },\n        ]\n      }\n      const cleanedData: BondsData = {\n        ...bill,\n        soldOut: paused[0] ? true : bill.soldOut,\n        feeInPayout,\n        feeInPrincipal,\n        showcaseTokenName: bill?.showcaseToken?.symbol ?? bill?.earnToken.symbol ?? '',\n        trueBondPrices,\n        principalTokenPrice: lpPrice?.toString(),\n        payoutTokenPrice: earnTokenPrice?.toString(),\n        tokensRemaining:\n          treasuryBalance !== null ? Math.min(treasuryBalance, tokensRemaining).toString() : tokensRemaining.toString(),\n        maxTotalPayout: maxTotalPayout?.toString(),\n        maxPayout: maxPayout?.toString(),\n        totalPayoutGiven: totalPayoutGiven?.toString(),\n        vestingTerm: typeof vestingTerm === 'number' ? vestingTerm : parseInt(vestingTerm),\n        tierBoostRate: bill.tierBoostRate === undefined ? 1 : bill.tierBoostRate,\n      }\n      return cleanedData\n    }),\n  )\n  return data\n}\n\n// Scale used to carry percentage ratios (tier boost, reverse fee) into integer math\n// alongside the wei-scale `trueBillPrice`, so the huge integer never round-trips through\n// a JS float before the final getBalanceNumber() conversion.\nconst RATIO_SCALE = 1_000_000_000_000n // 1e12\nconst scaleRatio = (ratio: number): bigint => parseUnits(ratio.toString(), 12)\n\nconst getBonusWithFee = (\n  feeInPayout: number,\n  tierBoostRate: number,\n  trueBillPrice: string,\n  lpPrice: number,\n  earnTokenPrice: number,\n) => {\n  const fee = feeInPayout ?? 0\n  const reverseFee = fee / 100 / (1 - fee / 100)\n  const trueBillPriceBig = BigInt(trueBillPrice)\n  const tierAdjusted = mulDivRound(trueBillPriceBig, scaleRatio((100 + tierBoostRate) / 100), RATIO_SCALE)\n  const feeAdjusted = mulDivRound(trueBillPriceBig, scaleRatio(reverseFee), RATIO_SCALE)\n  const trueBondPrice = tierAdjusted + feeAdjusted\n  const priceUSDMinusFee = getBalanceNumber(trueBondPrice) * lpPrice\n  const bonusWithoutFee = ((earnTokenPrice - priceUSDMinusFee) / earnTokenPrice) * 100\n  const validatedBonus = bonusWithoutFee > 0 ? (bonusWithoutFee / (100 - bonusWithoutFee)) * 100 : 0\n  return validatedBonus\n}\n\nconst getRawBonus = (trueBillPrice: any, lpPrice: number, earnTokenPrice: number) => {\n  const priceUsd = getBalanceNumber(trueBillPrice.toString()) * lpPrice\n  const discount: number = ((earnTokenPrice - priceUsd) / earnTokenPrice) * 100\n  return discount > 0 ? (discount / (100 - discount)) * 100 : 0\n}\n\nconst getRawDiscount = (trueBillPrice: any, lpPrice: number, earnTokenPrice: number) => {\n  const trueBondPrice = getBalanceNumber(trueBillPrice.toString())\n\n  return ((earnTokenPrice - lpPrice * trueBondPrice) / earnTokenPrice) * 100\n}\n\nconst getDiscountWithFee = (\n  feeInPayout: number,\n  tierBoostRate: number,\n  trueBillPrice: any,\n  lpPrice: number,\n  earnTokenPrice: number,\n) => {\n  const trueBondPrice = getBalanceNumber(trueBillPrice.toString())\n  const trueBondPriceWithFee = trueBondPrice * (1 / ((100 - (feeInPayout ?? 0)) / 100))\n  const discount = ((earnTokenPrice - lpPrice * trueBondPriceWithFee) / earnTokenPrice) * 100\n  const discountToReturn = 100 - ((100 - discount) / (100 - tierBoostRate)) * 100\n  return discountToReturn\n}\n"],"names":[],"mappings":"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"}

package/dist/state/bonds/fetchBondsData/fetchBondsDataAptos.d.ts

@@ -9,4 +9,4 @@ import { TokenPrices } from '../../tokenPrices/useTokenPrices';
  * scaled by PRICE_DECIMALS = 1e8; the SDK stores `trueBondPrice` scaled by
  * 1e18 (legacy EVM format) → multiply by 1e10.
  */
-export declare const fetchBondsDataAptos: (aptosConfigs?: BillsConfig[], aptosPrices?: TokenPrices[]) => Promise<BondsData[]>;
+export declare const fetchBondsDataAptos: (bonds?: BillsConfig[], aptosPrices?: TokenPrices[]) => Promise<BondsData[]>;

package/dist/state/bonds/fetchBondsData/fetchBondsDataAptos.js

@@ -1,6 +1,6 @@
-import BigNumber from 'bignumber.js';
 import { ChainId } from '@ape.swap/apeswap-lists';
 import { readAptosMarketInfo } from '../../../utils/aptosHelpers.js';
+import { formatUnits } from '../../../utils/fixedPoint.js';
 import axios from 'axios';
 import { PRICE_API_URL } from '../../../config/constants/variables.js';
 
@@ -20,7 +20,8 @@ const APTOS_KEY = ChainId.APTOS;
  * scaled by PRICE_DECIMALS = 1e8; the SDK stores `trueBondPrice` scaled by
  * 1e18 (legacy EVM format) → multiply by 1e10.
  */
-const fetchBondsDataAptos = async (aptosConfigs, aptosPrices) => {
+const fetchBondsDataAptos = async (bonds, aptosPrices) => {
+    const aptosConfigs = bonds?.filter((b) => !b.soldOut);
     if (!aptosConfigs || aptosConfigs?.length === 0)
         return [];
     const enriched = await Promise.all(aptosConfigs.map(async (bond) => {
@@ -67,10 +68,7 @@ const fetchBondsDataAptos = async (aptosConfigs, aptosPrices) => {
             const discountWithFee = payoutPrice > 0 ? ((payoutPrice - principalPrice * trueBondPriceWithFee) / payoutPrice) * 100 : 0;
             const bonusWithFee = discountWithFee > 0 && discountWithFee < 100 ? (discountWithFee / (100 - discountWithFee)) * 100 : 0;
             const payoutDecimals = bond.earnToken.decimals[APTOS_KEY] ?? 8;
-            const tokensRemaining = new BigNumber(info[23])
-                .minus(new BigNumber(info[5]))
-                .div(new BigNumber(10).pow(payoutDecimals))
-                .toString();
+            const tokensRemaining = formatUnits(BigInt(info[23]) - BigInt(info[5]), payoutDecimals);
             return {
                 ...bond,
                 soldOut: info[2] || info[3] ? true : bond.soldOut,

package/dist/state/bonds/fetchBondsData/fetchBondsDataAptos.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchBondsDataAptos.js","sources":["../../../../src/state/bonds/fetchBondsData/fetchBondsDataAptos.ts"],"sourcesContent":["// =============================================================================\n// Aptos bond enrichment — builds BondsData[] from BillsConfig[] + prices\n// =============================================================================\n//\n// On-chain first: reads bond::market_info via view function for each config\n// and projects the tuple onto BondsData. No backend dependency (realtime-api\n// does not support Aptos).\n\nimport BigNumber from 'bignumber.js'\nimport { BillsConfig, ChainId } from '@ape.swap/apeswap-lists'\nimport { BondsData } from '../../../types/bonds'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport { readAptosMarketInfo } from '../../../utils/aptosHelpers'\nimport axios from 'axios'\nimport { PRICE_API_URL } from '../../../config/constants/variables'\n\nconst APTOS_KEY = ChainId.APTOS\n\n/**\n * Enrich Aptos bond configs into full BondsData objects.\n *\n * Calls `bond::market_info(market)` for each config and projects the tuple\n * onto BondsData. Scale conversion: contract returns `true_bill_price` as u64\n * scaled by PRICE_DECIMALS = 1e8; the SDK stores `trueBondPrice` scaled by\n * 1e18 (legacy EVM format) → multiply by 1e10.\n */\nexport const fetchBondsDataAptos = async (\n  aptosConfigs?: BillsConfig[],\n  aptosPrices?: TokenPrices[],\n): Promise<BondsData[]> => {\n  if (!aptosConfigs || aptosConfigs?.length === 0) return []\n\n  const enriched = await Promise.all(\n    aptosConfigs.map(async (bond): Promise<BondsData | null> => {\n      const marketAddr = bond.contractAddress[APTOS_KEY]\n      if (!marketAddr) return null\n      try {\n        // Firstly we fetch prices\n        let principalPrice = aptosPrices?.find((t) => t.tokenAddress.toLowerCase() === principalAddr)?.price!\n        if (principalPrice === undefined) {\n          try {\n            const res = await axios.get(\n              `${PRICE_API_URL}/realtime/price?token=${bond?.lpToken?.address?.[bond?.chainId]}&chain=${bond?.chainId}`,\n            )\n            principalPrice = res.data.price ?? 0\n          } catch {\n            principalPrice = 0\n          }\n        }\n\n        let payoutPrice = aptosPrices?.find((t) => t.tokenAddress.toLowerCase() === payoutAddr)?.price!\n        if (payoutPrice === undefined) {\n          try {\n            // Missing token price, therefor make a single call to api to fetch it\n            const res = await axios.get(\n              `${PRICE_API_URL}/realtime/price?token=${bond?.earnToken?.address?.[bond?.chainId]}&chain=${bond?.chainId}`,\n            )\n            payoutPrice = res.data.price ?? 0\n          } catch {\n            payoutPrice = 0\n          }\n        }\n\n        const info = await readAptosMarketInfo(marketAddr)\n        const principalAddr = bond.lpToken.address[APTOS_KEY]?.toLowerCase()\n        const payoutAddr = bond.earnToken.address[APTOS_KEY]?.toLowerCase()\n\n        // Convert on-chain u64 (scaled 1e8) to the SDK's legacy 1e18 scale\n        const trueBillPriceU64 = info[17]\n        const trueBondPriceScaled = (BigInt(trueBillPriceU64) * 10n ** 10n).toString()\n        const trueBondPriceHuman = Number(trueBillPriceU64) / 1e8\n\n        // Same formula as getRawDiscount / getRawBonus in state/bonds/utils.ts\n        const discount = payoutPrice > 0 ? ((payoutPrice - principalPrice * trueBondPriceHuman) / payoutPrice) * 100 : 0\n        const bonus = discount > 0 && discount < 100 ? (discount / (100 - discount)) * 100 : 0\n\n        // Fees: u64 in PERCENTAGE_BASE (1e6) → divide by 10_000 for human %\n        const feeInPayout = Number(info[14]) / 10_000\n        const feeInPrincipal = Number(info[13]) / 10_000\n        const trueBondPriceWithFee =\n          feeInPayout < 100 ? trueBondPriceHuman * (1 / ((100 - feeInPayout) / 100)) : trueBondPriceHuman\n        const discountWithFee =\n          payoutPrice > 0 ? ((payoutPrice - principalPrice * trueBondPriceWithFee) / payoutPrice) * 100 : 0\n        const bonusWithFee =\n          discountWithFee > 0 && discountWithFee < 100 ? (discountWithFee / (100 - discountWithFee)) * 100 : 0\n\n        const payoutDecimals = bond.earnToken.decimals[APTOS_KEY] ?? 8\n        const tokensRemaining = new BigNumber(info[23])\n          .minus(new BigNumber(info[5]))\n          .div(new BigNumber(10).pow(payoutDecimals))\n          .toString()\n\n        return {\n          ...bond,\n          soldOut: info[2] || info[3] ? true : bond.soldOut,\n          maxTotalPayout: String(info[23]),\n          totalPayoutGiven: String(info[5]),\n          maxPayout: String(info[21]),\n          tokensRemaining,\n          showcaseTokenName: bond.earnToken.symbol,\n          vestingTerm: Number(info[19]),\n          feeInPayout,\n          feeInPrincipal,\n          trueBondPrices: [\n            {\n              trueBondPrice: trueBondPriceScaled,\n              points: '0',\n              discount,\n              discountWithFee,\n              bonus,\n              bonusWithFee,\n              boost: 0,\n            },\n          ],\n          principalTokenPrice: principalPrice.toString(),\n          payoutTokenPrice: payoutPrice.toString(),\n        }\n      } catch (e) {\n        console.warn(`[Aptos] Failed to read market_info for ${marketAddr}`, e)\n        // Hide the bond from the list when on-chain data is unavailable —\n        // showing a card with all zeros is confusing for users.\n        return null\n      }\n    }),\n  )\n  return enriched.filter((b): b is BondsData => b !== null)\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetchBondsDataAptos.js","sources":["../../../../src/state/bonds/fetchBondsData/fetchBondsDataAptos.ts"],"sourcesContent":["// =============================================================================\n// Aptos bond enrichment — builds BondsData[] from BillsConfig[] + prices\n// =============================================================================\n//\n// On-chain first: reads bond::market_info via view function for each config\n// and projects the tuple onto BondsData. No backend dependency (realtime-api\n// does not support Aptos).\n\nimport { BillsConfig, ChainId } from '@ape.swap/apeswap-lists'\nimport { BondsData } from '../../../types/bonds'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport { readAptosMarketInfo } from '../../../utils/aptosHelpers'\nimport { formatUnits } from '../../../utils/fixedPoint'\nimport axios from 'axios'\nimport { PRICE_API_URL } from '../../../config/constants/variables'\n\nconst APTOS_KEY = ChainId.APTOS\n\n/**\n * Enrich Aptos bond configs into full BondsData objects.\n *\n * Calls `bond::market_info(market)` for each config and projects the tuple\n * onto BondsData. Scale conversion: contract returns `true_bill_price` as u64\n * scaled by PRICE_DECIMALS = 1e8; the SDK stores `trueBondPrice` scaled by\n * 1e18 (legacy EVM format) → multiply by 1e10.\n */\nexport const fetchBondsDataAptos = async (bonds?: BillsConfig[], aptosPrices?: TokenPrices[]): Promise<BondsData[]> => {\n  const aptosConfigs = bonds?.filter((b) => !b.soldOut)\n  if (!aptosConfigs || aptosConfigs?.length === 0) return []\n\n  const enriched = await Promise.all(\n    aptosConfigs.map(async (bond): Promise<BondsData | null> => {\n      const marketAddr = bond.contractAddress[APTOS_KEY]\n      if (!marketAddr) return null\n      try {\n        // Firstly we fetch prices\n        let principalPrice = aptosPrices?.find((t) => t.tokenAddress.toLowerCase() === principalAddr)?.price!\n        if (principalPrice === undefined) {\n          try {\n            const res = await axios.get(\n              `${PRICE_API_URL}/realtime/price?token=${bond?.lpToken?.address?.[bond?.chainId]}&chain=${bond?.chainId}`,\n            )\n            principalPrice = res.data.price ?? 0\n          } catch {\n            principalPrice = 0\n          }\n        }\n\n        let payoutPrice = aptosPrices?.find((t) => t.tokenAddress.toLowerCase() === payoutAddr)?.price!\n        if (payoutPrice === undefined) {\n          try {\n            // Missing token price, therefor make a single call to api to fetch it\n            const res = await axios.get(\n              `${PRICE_API_URL}/realtime/price?token=${bond?.earnToken?.address?.[bond?.chainId]}&chain=${bond?.chainId}`,\n            )\n            payoutPrice = res.data.price ?? 0\n          } catch {\n            payoutPrice = 0\n          }\n        }\n\n        const info = await readAptosMarketInfo(marketAddr)\n        const principalAddr = bond.lpToken.address[APTOS_KEY]?.toLowerCase()\n        const payoutAddr = bond.earnToken.address[APTOS_KEY]?.toLowerCase()\n\n        // Convert on-chain u64 (scaled 1e8) to the SDK's legacy 1e18 scale\n        const trueBillPriceU64 = info[17]\n        const trueBondPriceScaled = (BigInt(trueBillPriceU64) * 10n ** 10n).toString()\n        const trueBondPriceHuman = Number(trueBillPriceU64) / 1e8\n\n        // Same formula as getRawDiscount / getRawBonus in state/bonds/utils.ts\n        const discount = payoutPrice > 0 ? ((payoutPrice - principalPrice * trueBondPriceHuman) / payoutPrice) * 100 : 0\n        const bonus = discount > 0 && discount < 100 ? (discount / (100 - discount)) * 100 : 0\n\n        // Fees: u64 in PERCENTAGE_BASE (1e6) → divide by 10_000 for human %\n        const feeInPayout = Number(info[14]) / 10_000\n        const feeInPrincipal = Number(info[13]) / 10_000\n        const trueBondPriceWithFee =\n          feeInPayout < 100 ? trueBondPriceHuman * (1 / ((100 - feeInPayout) / 100)) : trueBondPriceHuman\n        const discountWithFee =\n          payoutPrice > 0 ? ((payoutPrice - principalPrice * trueBondPriceWithFee) / payoutPrice) * 100 : 0\n        const bonusWithFee =\n          discountWithFee > 0 && discountWithFee < 100 ? (discountWithFee / (100 - discountWithFee)) * 100 : 0\n\n        const payoutDecimals = bond.earnToken.decimals[APTOS_KEY] ?? 8\n        const tokensRemaining = formatUnits(BigInt(info[23]) - BigInt(info[5]), payoutDecimals)\n\n        return {\n          ...bond,\n          soldOut: info[2] || info[3] ? true : bond.soldOut,\n          maxTotalPayout: String(info[23]),\n          totalPayoutGiven: String(info[5]),\n          maxPayout: String(info[21]),\n          tokensRemaining,\n          showcaseTokenName: bond.earnToken.symbol,\n          vestingTerm: Number(info[19]),\n          feeInPayout,\n          feeInPrincipal,\n          trueBondPrices: [\n            {\n              trueBondPrice: trueBondPriceScaled,\n              points: '0',\n              discount,\n              discountWithFee,\n              bonus,\n              bonusWithFee,\n              boost: 0,\n            },\n          ],\n          principalTokenPrice: principalPrice.toString(),\n          payoutTokenPrice: payoutPrice.toString(),\n        }\n      } catch (e) {\n        console.warn(`[Aptos] Failed to read market_info for ${marketAddr}`, e)\n        // Hide the bond from the list when on-chain data is unavailable —\n        // showing a card with all zeros is confusing for users.\n        return null\n      }\n    }),\n  )\n  return enriched.filter((b): b is BondsData => b !== null)\n}\n"],"names":[],"mappings":"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"}

package/dist/state/bonds/fetchBondsData/fetchBondsDataEVM.d.ts

@@ -1,3 +1,3 @@
 import { BillsConfig } from '@ape.swap/apeswap-lists';
 import { TokenPrices } from '../../tokenPrices/useTokenPrices';
-export declare const fetchBondsDataEVM: (chainId: number, bills: BillsConfig[], apiUrl: string, tokenPrices?: TokenPrices[]) => Promise<import("../../../types/bonds").BondsData[]>;
+export declare const fetchBondsDataEVM: (chainId: number, bonds: BillsConfig[], apiUrl: string, tokenPrices?: TokenPrices[]) => Promise<import("../../../types/bonds").BondsData[]>;

package/dist/state/bonds/fetchBondsData/fetchBondsDataEVM.js

@@ -5,8 +5,9 @@ import erc20ABI from '../../../config/abi/erc20.json.js';
 import chunk from 'lodash-es/chunk.js';
 import { cleanBillsData } from './cleanBillsData.js';
 
-const fetchBondsDataEVM = async (chainId, bills, apiUrl, tokenPrices) => {
+const fetchBondsDataEVM = async (chainId, bonds, apiUrl, tokenPrices) => {
     try {
+        const bills = bonds.filter((b) => !b.soldOut);
         const billIds = [];
         const billCalls = bills.flatMap((bill) => {
             billIds.push(bill.index);
@@ -64,11 +65,11 @@ const fetchBondsDataEVM = async (chainId, bills, apiUrl, tokenPrices) => {
             acc.push(val);
             if ((index + 1) % appendIndex === 0) {
                 const pos = (index + 1) / appendIndex;
-                acc.push(treasuryBalances[pos - 1]);
+                // balanceOf has a single output, so multicall wraps it as [balance] — unwrap it
+                acc.push(treasuryBalances[pos - 1][0]);
             }
             return acc;
         }, []);
-        //
         const chunkSize = updatedVals?.length / bills?.length;
         const chunkedBills = chunk(updatedVals, chunkSize);
         return await cleanBillsData(billIds, chunkedBills, chainId, bills, tokenPrices);

package/dist/state/bonds/fetchBondsData/fetchBondsDataEVM.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchBondsDataEVM.js","sources":["../../../../src/state/bonds/fetchBondsData/fetchBondsDataEVM.ts"],"sourcesContent":["import { BillsConfig, BillVersion, ChainId } from '@ape.swap/apeswap-lists'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport multicall from '../../../utils/multicall'\nimport BOND_2_4_0 from '../../../config/abi/BOND_2_4_0.json'\nimport ERC20ABI from '../../../config/abi/erc20.json'\nimport chunk from 'lodash-es/chunk.js'\nimport { cleanBillsData } from './cleanBillsData'\n\nexport const fetchBondsDataEVM = async (\n  chainId: number,\n  bills: BillsConfig[],\n  apiUrl: string,\n  tokenPrices?: TokenPrices[],\n) => {\n  try {\n    const billIds: number[] = []\n    const billCalls = bills.flatMap((bill) => {\n      billIds.push(bill.index)\n      return [\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: bill.billVersion === BillVersion.V4 ? 'trueBondPrices' : 'trueBillPrice()',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'totalPayoutGiven',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'terms',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: bill.billVersion !== BillVersion.V1 ? 'getMaxTotalPayout' : 'maxTotalPayout',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'feeInPayout',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'feeInPrincipal',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'paused',\n        },\n        // keep custom treasury at the very last position\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'customTreasury',\n        },\n      ]\n    })\n    const vals = await multicall(chainId, BOND_2_4_0, billCalls)\n\n    // The following lines basically grab the values from customTreasury returned from bills contract and then,\n    // appends the treasury contract's balance to the chunk that will be passed to cleanBillsData\n\n    // appendIndex value assumes customTreasury will be at the end of the billCalls array\n    const appendIndex = billCalls.length / bills.length\n    const treasuryAddresses = vals\n      .filter((_: any, i: number) => (i % appendIndex) + 1 === appendIndex)\n      .map((customTreasury: string[]) => customTreasury[0])\n    const treasuryBalanceCalls = treasuryAddresses.map((treasuryAddress: string, i: number) => ({\n      address: bills?.[i]?.earnToken?.address?.[chainId as ChainId] ?? '',\n      name: 'balanceOf',\n      params: [treasuryAddress],\n    }))\n    const treasuryBalances = await multicall(chainId, ERC20ABI, treasuryBalanceCalls)\n    const updatedVals = vals.reduce((acc: any, val: any, index: number) => {\n      acc.push(val)\n      if ((index + 1) % appendIndex === 0) {\n        const pos = (index + 1) / appendIndex\n        acc.push(treasuryBalances[pos - 1])\n      }\n      return acc\n    }, [])\n\n    //\n    const chunkSize = updatedVals?.length / bills?.length\n    const chunkedBills = chunk(updatedVals, chunkSize)\n\n    return await cleanBillsData(billIds, chunkedBills, chainId, bills, tokenPrices)\n  } catch (e) {\n    console.error(e)\n    reportError({\n      apiUrl,\n      error: e,\n      extraInfo: { type: 'getBondsData', e },\n    })\n    return []\n  }\n}\n"],"names":["BOND_2_4_0","ERC20ABI"],"mappings":";;;;;;;AAQO,MAAM,iBAAiB,GAAG,OAC/B,OAAe,EACf,KAAoB,EACpB,MAAc,EACd,WAA2B,KACzB;AACF,IAAA,IAAI;QACF,MAAM,OAAO,GAAa,EAAE;QAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;AACvC,YAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YACxB,OAAO;AACL,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,EAAE,GAAG,gBAAgB,GAAG,iBAAiB;AACjF,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,kBAAkB;AACzB,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,OAAO;AACd,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,EAAE,GAAG,mBAAmB,GAAG,gBAAgB;AACnF,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,aAAa;AACpB,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,gBAAgB;AACvB,iBAAA;AACD,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,QAAQ;AACf,iBAAA;;AAED,gBAAA;oBACE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AACjD,oBAAA,IAAI,EAAE,gBAAgB;AACvB,iBAAA;aACF;AACH,QAAA,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAEA,QAAU,EAAE,SAAS,CAAC;;;;QAM5D,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;QACnD,MAAM,iBAAiB,GAAG;AACvB,aAAA,MAAM,CAAC,CAAC,CAAM,EAAE,CAAS,KAAK,CAAC,CAAC,GAAG,WAAW,IAAI,CAAC,KAAK,WAAW;aACnE,GAAG,CAAC,CAAC,cAAwB,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC;AACvD,QAAA,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,eAAuB,EAAE,CAAS,MAAM;AAC1F,YAAA,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,GAAG,OAAkB,CAAC,IAAI,EAAE;AACnE,YAAA,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,CAAC,eAAe,CAAC;AAC1B,SAAA,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,OAAO,EAAEC,QAAQ,EAAE,oBAAoB,CAAC;AACjF,QAAA,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAQ,EAAE,KAAa,KAAI;AACpE,YAAA,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;YACb,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,WAAW,KAAK,CAAC,EAAE;gBACnC,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,WAAW;gBACrC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACrC;AACA,YAAA,OAAO,GAAG;QACZ,CAAC,EAAE,EAAE,CAAC;;QAGN,MAAM,SAAS,GAAG,WAAW,EAAE,MAAM,GAAG,KAAK,EAAE,MAAM;QACrD,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC;AAElD,QAAA,OAAO,MAAM,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC;IACjF;IAAE,OAAO,CAAC,EAAE;AACV,QAAA,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAChB,QAAA,WAAW,CAAC;YACV,MAAM;AACN,YAAA,KAAK,EAAE,CAAC;AACR,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE;AACvC,SAAA,CAAC;AACF,QAAA,OAAO,EAAE;IACX;AACF;;;;"}
+{"version":3,"file":"fetchBondsDataEVM.js","sources":["../../../../src/state/bonds/fetchBondsData/fetchBondsDataEVM.ts"],"sourcesContent":["import { BillsConfig, BillVersion, ChainId } from '@ape.swap/apeswap-lists'\nimport { TokenPrices } from '../../tokenPrices/useTokenPrices'\nimport multicall from '../../../utils/multicall'\nimport BOND_2_4_0 from '../../../config/abi/BOND_2_4_0.json'\nimport ERC20ABI from '../../../config/abi/erc20.json'\nimport chunk from 'lodash-es/chunk.js'\nimport { cleanBillsData } from './cleanBillsData'\n\nexport const fetchBondsDataEVM = async (\n  chainId: number,\n  bonds: BillsConfig[],\n  apiUrl: string,\n  tokenPrices?: TokenPrices[],\n) => {\n  try {\n    const bills = bonds.filter((b) => !b.soldOut)\n    const billIds: number[] = []\n    const billCalls = bills.flatMap((bill) => {\n      billIds.push(bill.index)\n      return [\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: bill.billVersion === BillVersion.V4 ? 'trueBondPrices' : 'trueBillPrice()',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'totalPayoutGiven',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'terms',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: bill.billVersion !== BillVersion.V1 ? 'getMaxTotalPayout' : 'maxTotalPayout',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'feeInPayout',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'feeInPrincipal',\n        },\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'paused',\n        },\n        // keep custom treasury at the very last position\n        {\n          address: bill.contractAddress[bill.chainId] ?? '',\n          name: 'customTreasury',\n        },\n      ]\n    })\n    const vals = await multicall(chainId, BOND_2_4_0, billCalls)\n\n    // The following lines basically grab the values from customTreasury returned from bills contract and then,\n    // appends the treasury contract's balance to the chunk that will be passed to cleanBillsData\n\n    // appendIndex value assumes customTreasury will be at the end of the billCalls array\n    const appendIndex = billCalls.length / bills.length\n    const treasuryAddresses = vals\n      .filter((_: any, i: number) => (i % appendIndex) + 1 === appendIndex)\n      .map((customTreasury: string[]) => customTreasury[0])\n    const treasuryBalanceCalls = treasuryAddresses.map((treasuryAddress: string, i: number) => ({\n      address: bills?.[i]?.earnToken?.address?.[chainId as ChainId] ?? '',\n      name: 'balanceOf',\n      params: [treasuryAddress],\n    }))\n    const treasuryBalances = await multicall(chainId, ERC20ABI, treasuryBalanceCalls)\n    const updatedVals = vals.reduce((acc: any, val: any, index: number) => {\n      acc.push(val)\n      if ((index + 1) % appendIndex === 0) {\n        const pos = (index + 1) / appendIndex\n        // balanceOf has a single output, so multicall wraps it as [balance] — unwrap it\n        acc.push(treasuryBalances[pos - 1][0])\n      }\n      return acc\n    }, [])\n\n    const chunkSize = updatedVals?.length / bills?.length\n    const chunkedBills = chunk(updatedVals, chunkSize)\n\n    return await cleanBillsData(billIds, chunkedBills, chainId, bills, tokenPrices)\n  } catch (e) {\n    console.error(e)\n    reportError({\n      apiUrl,\n      error: e,\n      extraInfo: { type: 'getBondsData', e },\n    })\n    return []\n  }\n}\n"],"names":["BOND_2_4_0","ERC20ABI"],"mappings":"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"}

package/dist/state/bonds/fetchBondsData/fetchBondsDataSOL.d.ts

@@ -1,3 +1,3 @@
 import { BillsConfig } from '@ape.swap/apeswap-lists';
 import { TokenPrices } from '../../tokenPrices/useTokenPrices';
-export declare const fetchBondsDataSOL: (bills: BillsConfig[], apiUrl: string, tokenPrices?: TokenPrices[]) => Promise<import("../../../types/bonds").BondsData[]>;
+export declare const fetchBondsDataSOL: (bonds: BillsConfig[], apiUrl: string, tokenPrices?: TokenPrices[]) => Promise<import("../../../types/bonds").BondsData[]>;

package/dist/state/bonds/fetchBondsData/fetchBondsDataSOL.js

@@ -5,9 +5,8 @@ import { derivePda } from '../../../utils/derivePda.js';
 import { PROGRAM_ID } from '../../../constants/solanaConstants.js';
 import { cleanBillsData } from './cleanBillsData.js';
 
-const fetchBondsDataSOL = async (bills, apiUrl, tokenPrices) => {
-    if (!tokenPrices)
-        return [];
+const fetchBondsDataSOL = async (bonds, apiUrl, tokenPrices) => {
+    const bills = bonds.filter((b) => !b.soldOut);
     try {
         const solanaCalls = [];
         const solanaBillIds = [];