@ape.swap/bonds-sdk 4.0.0-test.2 → 4.0.0-test.3

package/dist/main.js

@@ -69452,27 +69452,58 @@ const zapInputTokens = {
     ],
 };
 
+function usePreTGEList() {
+    var _a, _b;
+    const SDKConfig = useSDKConfig();
+    const realTime = (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.realTimeApi;
+    const apiUrl = (_b = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _b === void 0 ? void 0 : _b.apiV2;
+    return useQuery({
+        queryKey: [QUERY_KEYS.PRE_TGE_LIST],
+        queryFn: () => getPreTGEList(realTime, apiUrl),
+        staleTime: Infinity,
+        refetchInterval: 300000, // 5 min
+        refetchOnWindowFocus: false,
+    });
+}
+const getPreTGEList = (apiRealTimeURL, apiUrl) => __awaiter$9(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield axios.get(`${apiRealTimeURL}/utils/pre-tge-bonds`);
+        return response.data;
+    }
+    catch (e) {
+        reportError$1({
+            apiUrl,
+            error: e,
+            extraInfo: { type: 'getPreTGEList', e },
+        });
+        return [];
+    }
+});
+
 function useTokenList() {
     const { data: bondList } = useBondsList();
+    const { data: preTGEList } = usePreTGEList();
     const SDKConfig = useSDKConfig();
     const chains = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.chains;
     const apiUrl = useURLByEnvironment('apiV2');
     return useQuery({
-        queryKey: [QUERY_KEYS.TOKEN_LIST],
-        queryFn: () => getTokenList(chains, apiUrl, bondList),
+        queryKey: [QUERY_KEYS.TOKEN_LIST, bondList === null || bondList === void 0 ? void 0 : bondList.length, preTGEList === null || preTGEList === void 0 ? void 0 : preTGEList.length],
+        queryFn: () => getTokenList(chains, apiUrl, bondList, preTGEList),
         refetchOnMount: false,
         refetchOnWindowFocus: false,
-        enabled: !!SDKConfig.chains && SDKConfig.chains.length > 0 && !!bondList,
+        enabled: !!bondList && !!preTGEList,
     });
 }
-const getTokenList = (chains, apiUrl, bondList) => __awaiter$9(void 0, void 0, void 0, function* () {
+const getTokenList = (chains, apiUrl, bondList, preTGEList) => __awaiter$9(void 0, void 0, void 0, function* () {
+    console.time('tokenList');
+    const mergedList = [...bondList, ...preTGEList];
     const tokenList = chains.reduce((acc, chain2) => {
         var _a;
         const chain = chain2;
         if (!acc[chain]) {
             acc[chain] = {};
         }
-        bondList === null || bondList === void 0 ? void 0 : bondList.forEach((bond) => {
+        mergedList === null || mergedList === void 0 ? void 0 : mergedList.forEach((bond) => {
             var _a, _b, _c, _d;
             if (bond.chainId !== chain)
                 return;
@@ -69497,6 +69528,7 @@ const getTokenList = (chains, apiUrl, bondList) => __awaiter$9(void 0, void 0, v
         });
         return acc;
     }, {});
+    console.timeEnd('tokenList');
     return tokenList;
 });
 
@@ -69506,19 +69538,20 @@ function useTokenPrices() {
     const SDKConfig = useSDKConfig();
     const apiUrl = (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.apiV2;
     return useQuery({
-        queryKey: [QUERY_KEYS.TOKEN_PRICES],
+        queryKey: [QUERY_KEYS.TOKEN_PRICES, Object.keys(tokenList || {}).length],
         queryFn: () => getTokenPrices(SDKConfig.chains, apiUrl, tokenList),
         refetchInterval: 60000, // 60 sec
         refetchOnMount: false,
         refetchOnWindowFocus: false,
-        enabled: !!SDKConfig.chains && SDKConfig.chains.length > 0 && !!tokenList,
+        enabled: !!tokenList,
     });
 }
 const getTokenPrices = (chains, apiUrl, tokenList) => __awaiter$9(void 0, void 0, void 0, function* () {
+    console.time('PriceGetter');
+    console.log('PriceGetter starts');
     try {
         const promises = chains.map((chain) => __awaiter$9(void 0, void 0, void 0, function* () {
             try {
-                // Directly return the result of fetching prices, or handle any exceptions here
                 return yield getAllTokenPrices(+chain, tokenList[chain], apiUrl);
             }
             catch (error) {
@@ -69532,13 +69565,15 @@ const getTokenPrices = (chains, apiUrl, tokenList) => __awaiter$9(void 0, void 0
             }
         }));
         const responses = yield Promise.allSettled(promises);
-        // Reduce fullfilled responses into a single Array
-        return responses.reduce((acc, result) => {
+        // Combine the filtering and mapping into a single loop, avoiding dual mapping
+        const flattenedPrices = responses.reduce((acc, result) => {
             if (result.status === 'fulfilled' && result.value) {
                 acc.push(...result.value);
             }
             return acc;
         }, []);
+        console.timeEnd('PriceGetter');
+        return flattenedPrices;
     }
     catch (error) {
         reportError$1({
@@ -69653,7 +69688,7 @@ const getPriceGetterV3Call = (chain, token) => {
     const priceGetterAddress = PRICE_GETTER_ADDRESSES[chain];
     const wrapper = token.liquidityWrapper;
     if (!factory) {
-        console.log(`No default dex factory found for retrieving price for protocol ${protocol}. Please contact support.`);
+        // console.log(`No default dex factory found for retrieving price for protocol ${protocol}. Please contact support.`)
         return;
     }
     const params = [address, protocol, factory];
@@ -79133,34 +79168,6 @@ var launchBondsABI_V2_2_0 = [
 	}
 ];
 
-function usePreTGEList() {
-    var _a, _b;
-    const SDKConfig = useSDKConfig();
-    const realTime = (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.realTimeApi;
-    const apiUrl = (_b = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _b === void 0 ? void 0 : _b.apiV2;
-    return useQuery({
-        queryKey: [QUERY_KEYS.PRE_TGE_LIST],
-        queryFn: () => getPreTGEList(realTime, apiUrl),
-        staleTime: Infinity,
-        refetchInterval: 300000, // 5 min
-        refetchOnWindowFocus: false,
-    });
-}
-const getPreTGEList = (apiRealTimeURL, apiUrl) => __awaiter$9(void 0, void 0, void 0, function* () {
-    try {
-        const response = yield axios.get(`${apiRealTimeURL}/utils/pre-tge-bonds`);
-        return response.data;
-    }
-    catch (e) {
-        reportError$1({
-            apiUrl,
-            error: e,
-            extraInfo: { type: 'getPreTGEList', e },
-        });
-        return [];
-    }
-});
-
 function usePreTGEUserBonds() {
     var _a;
     const { data: preTGEList } = usePreTGEList();
@@ -82912,31 +82919,31 @@ function useBondsData() {
     const apiUrl = useURLByEnvironment('apiV2');
     const realTimeApiURL = useURLByEnvironment('realTimeApi');
     return useQuery({
-        queryKey: [QUERY_KEYS.BONDS_DATA, tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices.length, bondList === null || bondList === void 0 ? void 0 : bondList.length, preTGEList === null || preTGEList === void 0 ? void 0 : preTGEList.length],
+        queryKey: [QUERY_KEYS.BONDS_DATA, bondList === null || bondList === void 0 ? void 0 : bondList.length, preTGEList === null || preTGEList === void 0 ? void 0 : preTGEList.length],
         queryFn: () => getBondsData(chains, bondList, preTGEList, realTimeApiURL, apiUrl, tokenPrices),
         refetchInterval: 20000, // i.e. 20 sec
         refetchOnWindowFocus: false,
         retry: 0,
         initialData: [],
-        enabled: !!tokenPrices && !!bondList && !!preTGEList,
+        enabled: !!bondList && !!preTGEList,
     });
 }
 //TODO: move this function to utils once SOLANA code is merged
 const getBondsData = (chains, bondList, preTGEList, realTimeApiURL, apiUrl, tokenPrices) => __awaiter$9(void 0, void 0, void 0, function* () {
     var _a;
-    console.log('Started');
+    console.log('BondsData Starts');
     try {
-        console.time('Calculate BondsData');
+        console.time('BondsData');
         const solanaBondList = (_a = bondList === null || bondList === void 0 ? void 0 : bondList.filter((bill) => !bill.soldOut && bill.chainId === types$1.ChainId.SOL)) !== null && _a !== void 0 ? _a : [];
         const [solBonds, evmResponse] = yield Promise.all([
             yield fetchBills(types$1.ChainId.SOL, solanaBondList, apiUrl, tokenPrices),
             yield axios.get(`${realTimeApiURL}/bonds`),
         ]);
-        console.timeEnd('Calculate BondsData');
+        console.timeEnd('BondsData');
         return [...solBonds, ...evmResponse.data.bonds];
     }
     catch (_b) {
-        console.time('Fallback BondsData'); // Start debug timer
+        console.time('Fallback BondsData');
         const billData = [];
         if (tokenPrices && bondList) {
             yield Promise.all([
@@ -82965,6 +82972,8 @@ const getBondsData = (chains, bondList, preTGEList, realTimeApiURL, apiUrl, toke
 });
 const fetchBills = (chainId, bills, apiUrl, tokenPrices) => __awaiter$9(void 0, void 0, void 0, function* () {
     var _a, _b;
+    if (!tokenPrices)
+        return [];
     try {
         if (chainId === types$1.ChainId.SOL) {
             const solanaCalls = [];
@@ -86778,7 +86787,7 @@ const BannerTestnet = ({ chainId }) => {
 const BondRowsWithTitle = ({ chain, bonds, showHotBonds }) => {
     const key = chain;
     const [isOpen, setIsOpen] = useState(true);
-    return (jsx$2(Flex$1, { className: "bondrowswithtitle", children: jsxs(AnimatePresence, { initial: false, children: [jsx$2(Flex$1, { onClick: () => setIsOpen(!isOpen), sx: { cursor: 'pointer' }, children: jsx$2(ChainTitle, { chain: chain, pt: '5px', hideTitles: bonds.length <= 0, isOpen: isOpen }) }), bonds.length > 0 && isOpen && (jsxs(motion.div, { initial: { height: 0, overflow: 'hidden' }, animate: { height: 'fit-content', overflow: 'hidden', transitionEnd: { overflow: 'visible' } }, exit: { height: 0, overflow: 'hidden' }, sx: {
+    return (jsx$2(Flex$1, { className: "bondrowswithtitle", children: jsxs(AnimatePresence, { initial: false, children: [jsx$2(Flex$1, { onClick: () => setIsOpen(!isOpen), sx: { cursor: 'pointer' }, children: jsx$2(ChainTitle, { chain: chain, pt: '5px', hideTitles: bonds.length <= 0 && chain !== types$1.ChainId.SOL, isOpen: isOpen }) }), bonds.length > 0 && isOpen && (jsxs(motion.div, { initial: { height: 0, overflow: 'hidden' }, animate: { height: 'fit-content', overflow: 'hidden', transitionEnd: { overflow: 'visible' } }, exit: { height: 0, overflow: 'hidden' }, sx: {
                         position: 'relative',
                         overflow: 'hidden',
                         width: '100%',
@@ -86808,19 +86817,25 @@ const BondRowsWithTitle = ({ chain, bonds, showHotBonds }) => {
                                 const remainingTokensString = getRemainingTokensString(bond);
                                 return (jsx$2(BondRow, { bondAddress: bondAddress, bondChain: bond.chainId, payoutToken: bond.earnToken, billType: bond.billType, tag: (_w = bond.tags) === null || _w === void 0 ? void 0 : _w[0], trueBondPrices: bond.trueBondPrices, minTier: bond === null || bond === void 0 ? void 0 : bond.minTier, vestingTermString: getVestingTermsString(bond), vestingCliffString: getVestingTermsTooltipString(bond), percentageAvailable: remainingPercentage(bond), remainingTokensString: remainingTokensString, projectURL: bond.projectLink, twitterURL: bond.twitter, auditURL: bond.audit }, `${bondAddress}-${bond.chainId}-${index}`));
                             }
-                        }), showHotBonds && (jsx$2(SwiperProvider, { children: jsx$2(HotBondCards, {}) }))] }, key))] }) }, key));
+                        }), showHotBonds && (jsx$2(SwiperProvider, { children: jsx$2(HotBondCards, {}) }))] }, key)), bonds.length <= 0 && chain === types$1.ChainId.SOL && (jsx$2(Flex$1, { sx: { width: '100%', flexDirection: 'column' }, className: "bonds-card-container", children: Array.from({ length: 3 }).map((_, index) => {
+                        return (jsx$2(Skeleton, { animation: "waves", sx: {
+                                width: '100%',
+                                height: '70px',
+                                borderRadius: 'normal',
+                                mb: '5px',
+                            } }, `sol-shadow-${index}`));
+                    }) }, key))] }) }, key));
 };
 
 const BondRowsByChain = ({ bonds, hideTitles }) => {
     var _a;
     const SDKConfig = useSDKConfig();
     const validatedChains = (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.chains) === null || _a === void 0 ? void 0 : _a.filter((chain) => MAINNET_CHAINS.includes(chain));
-    // Group the bonds data by chainId using reduce
     const groupedBonds = bonds.reduce((acc, bond) => {
-        const { chainId } = bond; // Extract chainId from the bond
+        const { chainId } = bond;
         if (!acc[chainId])
-            acc[chainId] = []; // Initialize the array if it doesn't exist
-        acc[chainId].push(bond); // Push the bond to its corresponding chainId group
+            acc[chainId] = [];
+        acc[chainId].push(bond);
         return acc;
     }, {});
     return (jsx$2(Flex$1, { className: "bondrowsbychain", children: validatedChains === null || validatedChains === void 0 ? void 0 : validatedChains.map((chain) => {
@@ -87023,32 +87038,32 @@ const BuyAgainRow = () => {
 };
 
 const LoadingSkeleton = () => {
-    return (jsxs(Flex$1, { sx: { width: '100%', flexDirection: 'column', mt: '35px' }, children: [Array.from({ length: 8 }).map((_, index) => (jsx$2(Skeleton, { animation: "waves", sx: {
+    return (jsxs(Flex$1, { sx: { width: '100%', flexDirection: 'column', mt: '35px' }, children: [Array.from({ length: 6 }).map((_, index) => (jsx$2(Skeleton, { animation: "waves", sx: {
                     width: '100%',
                     height: '70px',
                     borderRadius: 'normal',
                     mb: '5px',
-                } }, index))), jsx$2(Flex$1, { sx: { width: '100%', gap: '15px', mt: '25px' }, children: Array.from({ length: 3 }).map((_, index) => (jsx$2(Skeleton, { animation: "waves", sx: {
+                } }, `row-shadow-${index}`))), jsx$2(Flex$1, { sx: { width: '100%', gap: '15px', mt: '25px' }, children: Array.from({ length: 3 }).map((_, index) => (jsx$2(Skeleton, { animation: "waves", sx: {
                         width: '100%',
                         height: '125px',
                         borderRadius: 'normal',
                         mb: '5px',
-                    } }, index))) })] }));
+                    } }, `hot-card-shadow${index}`))) })] }));
 };
 
 const Bonds = () => {
     // Fetch data
     useHotBonds();
     const { favTokens } = useFavoriteTokens();
-    const { data: bondData } = useBondsData();
+    const { data: bondData, refetch } = useBondsData();
     const { data: allBonds } = useBondsList();
     const { data: allPreBonds } = usePreTGEList();
     const { data: chainFilterOption, setChainFilterOption } = useChainFilterOption();
     const { data: tokenPrices } = useTokenPrices();
-    // const btc = tokenPrices?.find(
-    //   (token) => token?.address?.toLowerCase() === '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599'.toLowerCase(),
+    // const rtc = tokenPrices?.find(
+    //   (token) => token?.address?.toLowerCase() === '0x188b8e23CefFCA7a58e8C64C2a7A9771Ab3596A7'.toLowerCase(),
     // )
-    // console.log('btc: ', btc)
+    // console.log('rtc: ', rtc)
     const SDKConfig = useSDKConfig();
     useEffect(() => {
         const hash = window.location.hash;
@@ -87133,6 +87148,13 @@ const Bonds = () => {
     const handleChangeFilterOption = useCallback((newOption) => {
         setFilterOption(newOption);
     }, []);
+    useEffect(() => {
+        if (tokenPrices && (tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices.length) > 0) {
+            console.log('Refetching bonds');
+            refetch();
+        }
+        /* eslint-disable react-hooks/exhaustive-deps */
+    }, [tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices.length, refetch]);
     return (jsxs(Flex$1, { className: "bonds-container", children: [jsx$2(CheckUrl, {}), jsx$2(BondsMenu, { searchQuery: searchQuery, setSearchQuery: setSearchQuery, setChainFilterOption: setChainFilterOption, chainFilterOption: chainFilterOption !== null && chainFilterOption !== void 0 ? chainFilterOption : ['All Chains'], filterOptions: filterOptions, filterOption: filterOption, setFilterOption: handleChangeFilterOption, onSort: handleSortOptions }), SDKConfig.useHotBonds && !SDKConfig.bondPartner && jsx$2(BuyAgainRow, {}), (billsToRender === null || billsToRender === void 0 ? void 0 : billsToRender.length) > 0 ? (jsx$2(BondRowsByChain, { bonds: billsToRender, hideTitles: searchQuery !== '' })) : searchQuery ? (jsx$2(PlaceholderMonkey, { text: 'No results' })) : filterOption === 'FAVORITES' ? (jsxs(Flex$1, { sx: {
                     width: '100%',
                     height: '300px',

package/dist/state/tokenList/useTokenList.d.ts

@@ -1,3 +1,4 @@
 import { ChainId, Token } from '@ape.swap/apeswap-lists';
 import { UseQueryResult } from '@tanstack/react-query';
-export default function useTokenList(): UseQueryResult<Record<ChainId, Record<string, Token>>>;
+export type TokenList = Record<ChainId, Record<string, Token>>;
+export default function useTokenList(): UseQueryResult<TokenList>;

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ape Bond SDK",
   "author": "Ape Bond",
   "license": "MIT",
-  "version": "4.0.0-test.2",
+  "version": "4.0.0-test.3",
   "module": "dist/main.js",
   "type": "module",
   "types": "dist/main.d.ts",