@ape.swap/bonds-sdk 4.2.2-test.0 → 4.2.3-test.0

package/dist/main.js

@@ -63031,6 +63031,7 @@ const HELIUS_SOL_RPC_ENDPOINTS = [
     'https://mainnet.helius-rpc.com/?api-key=c097651d-ae13-4ab4-ae4c-fef7e48d4561', // n0mbr3al3at0r10@gmail.com
     'https://mainnet.helius-rpc.com/?api-key=a5c4ea36-fa6b-4bcc-a7a4-e10012b9ea7e', // RandomApe personal mail
 ];
+// export const HELIUS_SOL_RPC_ENDPOINTS = ['https://devnet.helius-rpc.com/?api-key=095f6fc7-1be0-4d94-a737-4a5ee0d82ea5'] //devnet
 // Function to get a random Helius SOL RPC endpoint
 const getRandomHeliusRPC = () => {
     const randomIndex = Math.floor(Math.random() * HELIUS_SOL_RPC_ENDPOINTS.length);
@@ -63123,7 +63124,7 @@ const stagingUrls = {
 };
 const useSDKConfig = (config) => {
     const urls = process.env.NODE_ENV === 'production' ? defaultUrls : stagingUrls;
-    const initialData = Object.assign(Object.assign({ referenceId: '', chains: [], hotBondChains: [main.ChainId.BSC, main.ChainId.MATIC], useHotBonds: true, connector: 'default', useTiers: false, useTGEBonds: false, showLowValueBonds: false, bondPartner: undefined, namingPreference: 'Bonus', useCardsView: false, blockSales: false }, config), { urls: Object.assign(Object.assign({}, urls), config === null || config === void 0 ? void 0 : config.urls), highestCompatibleVersion: '2.2.0' });
+    const initialData = Object.assign(Object.assign({ referenceId: '', chains: [], hotBondChains: [main.ChainId.BSC, main.ChainId.MATIC], useHotBonds: true, connector: 'default', useTiers: false, useTGEBonds: false, showLowValueBonds: false, bondPartner: undefined, namingPreference: 'Bonus', useCardsView: false, blockSales: false, customBranch: '' }, config), { urls: Object.assign(Object.assign({}, urls), config === null || config === void 0 ? void 0 : config.urls), highestCompatibleVersion: '2.2.0' });
     const { data } = useQuery({
         queryKey: [QUERY_KEYS.SDK_CONFIG],
         queryFn: () => {
@@ -63139,7 +63140,7 @@ const useURLByEnvironment = (key) => {
     return (_a = config === null || config === void 0 ? void 0 : config.urls) === null || _a === void 0 ? void 0 : _a[key];
 };
 
-function reportError$1(_a) {
+function reportError(_a) {
     return __awaiter$9(this, arguments, void 0, function* ({ apiUrl, error, extraInfo = {}, chainId, account, rpc, }) {
         const isClient = typeof window !== 'undefined';
         const url = isClient ? window.location.href : null;
@@ -63241,7 +63242,7 @@ const fetchUserPoints = (account, useTiers, apiUrl) => __awaiter$9(void 0, void
         }
         catch (e) {
             console.error(e);
-            reportError$1({
+            reportError({
                 apiUrl,
                 error: e,
                 extraInfo: { type: 'fetchUserPoints', e },
@@ -63614,23 +63615,25 @@ const getBonusColor = (premiumString) => {
 };
 
 function useBondsList() {
-    const realTime = useURLByEnvironment('realTimeApi');
-    const apiUrl = useURLByEnvironment('apiV2');
+    const queryClient = useQueryClient();
     return useQuery({
         queryKey: [QUERY_KEYS.BONDS_LIST],
-        queryFn: () => getBondsList(realTime, apiUrl),
+        queryFn: () => getBondsList(queryClient),
         staleTime: Infinity,
         refetchInterval: 300000, // 5 min
         refetchOnWindowFocus: false,
     });
 }
-const getBondsList = (realTimeapiURL, apiUrl) => __awaiter$9(void 0, void 0, void 0, function* () {
+const getBondsList = (queryClient) => __awaiter$9(void 0, void 0, void 0, function* () {
+    const { urls, customBranch } = queryClient === null || queryClient === void 0 ? void 0 : queryClient.getQueryData([QUERY_KEYS.SDK_CONFIG]);
+    const realTimeApiURL = urls['realTimeApi'];
+    const apiUrl = urls['apiV2'];
     try {
-        const response = yield axios.get(`${realTimeapiURL}/utils/bonds`);
+        const response = yield axios.get(`${realTimeApiURL}/utils/bonds${customBranch ? `?branch=${customBranch}` : ''}`);
         return response.data;
     }
     catch (e) {
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getBondsList', e },
@@ -64818,7 +64821,7 @@ const getTokenPrices = (priceApi, apiv2) => __awaiter$9(void 0, void 0, void 0,
         return response.data;
     }
     catch (error) {
-        reportError$1({
+        reportError({
             apiUrl: apiv2,
             error,
             extraInfo: { type: 'getTokenPrices', error },
@@ -65132,6 +65135,7 @@ function fetchUserOwnedSolanaBonds(user, bondData, tokenPrices) {
                             totalPayout: bondAccount.payout.toString(),
                             truePricePaid: bondAccount.truePricePaid.toString(),
                             lastBlockTimestamp: bondAccount.lastClaimTimestamp.toString(),
+                            vestingStartTimestamp: bondAccount.vestingStartTimestamp.toString(),
                             pendingRewards,
                             billNftAddress: collection,
                             payoutClaimed: bondAccount.payoutClaimed.toString(),
@@ -65220,7 +65224,6 @@ const useSOLAccount = () => {
     return Object.assign(Object.assign({}, account), { publicKey: solAddress ? solPublicKey : account.publicKey });
 };
 
-// import dummyJson from './dummy.json'
 function useUserBonds() {
     var _a, _b;
     // First fetch the full list of bonds
@@ -65325,7 +65328,7 @@ const getUserBonds = (account, solanaAccount, bondList, queryClient) => __awaite
     }
     catch (e) {
         console.error(e);
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getUserBonds', bondList, chains, e },
@@ -65991,7 +65994,7 @@ const ClaimAllModal = () => {
         catch (error) {
             console.error('Claim All failed:', error);
             addToastError(error.message);
-            reportError$1({
+            reportError({
                 apiUrl: (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.apiV2,
                 error,
                 extraInfo: { type: 'claimAll', bondsOfSelectedChain, error },
@@ -69937,7 +69940,7 @@ const TransferAction$1 = ({ userBill, toAddress, disabled, }) => {
             console.error('Transfer failed:', error);
             setLoadingTx(false);
             addToastError(error.shortMessage);
-            reportError$1({
+            reportError({
                 apiUrl: (_d = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _d === void 0 ? void 0 : _d.apiV2,
                 error,
                 extraInfo: { type: 'transfer', userBill, error },
@@ -70089,7 +70092,7 @@ const getPreTGEList = (apiRealTimeURL, apiUrl) => __awaiter$9(void 0, void 0, vo
         return response.data;
     }
     catch (e) {
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getPreTGEList', e },
@@ -75241,7 +75244,7 @@ const fetchBondsDataPreTGE = (chain, tokenPrices, preTGEBonds, apiUrl) => __awai
         const chunkSize = vals.length / preTGEBonds.length;
         const chunkedBills = lodashExports.chunk(vals, chunkSize);
         const returnedBills = chunkedBills === null || chunkedBills === void 0 ? void 0 : chunkedBills.map((chunk, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const bondConfig = preTGEBonds === null || preTGEBonds === void 0 ? void 0 : preTGEBonds.find((bill) => (bill === null || bill === void 0 ? void 0 : bill.index) === preTGEBondsIds[index]);
             const [trueBillPrice, terms, totalPrincipalBilled, finalized, minPoints, maxPoints, startVestingTimestamp] = chunk;
             const [, , vestingTerm, , , initialRelease, totalRaise, maxTotalPayout] = terms;
@@ -75251,12 +75254,12 @@ const fetchBondsDataPreTGE = (chain, tokenPrices, preTGEBonds, apiUrl) => __awai
                 return ((_a = tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.tokenAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ===
                     ((_d = (_c = (_b = bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.lpToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase());
             })) === null || _e === void 0 ? void 0 : _e.price) !== null && _f !== void 0 ? _f : 0;
-            const earnTokenPrice = (_h = (_g = tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices[bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.chainId]) === null || _g === void 0 ? void 0 : _g.find((tokenPrice) => {
+            const earnTokenPrice = (_j = (_h = (_g = tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices[bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.chainId]) === null || _g === void 0 ? void 0 : _g.find((tokenPrice) => {
                 var _a, _b, _c, _d;
                 return ((_a = tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.tokenAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ===
                     ((_d = (_c = (_b = bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bondConfig === null || bondConfig === void 0 ? void 0 : bondConfig.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase());
-            })) === null || _h === void 0 ? void 0 : _h.price;
-            const principalTokenPrice = (_j = lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString()) !== null && _j !== void 0 ? _j : '0';
+            })) === null || _h === void 0 ? void 0 : _h.price) !== null && _j !== void 0 ? _j : 0;
+            const principalTokenPrice = (_k = lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString()) !== null && _k !== void 0 ? _k : '0';
             const payoutTokenPrice = earnTokenPrice ? earnTokenPrice === null || earnTokenPrice === void 0 ? void 0 : earnTokenPrice.toString() : initPrice === null || initPrice === void 0 ? void 0 : initPrice.toString();
             const bonus = Math.round((bondConfig.tgePrice / initPrice) * 100 - 100);
             const data = Object.assign(Object.assign({}, bondConfig), { initialRelease: initialRelease / 10000, vestingTerm: vestingTerm === null || vestingTerm === void 0 ? void 0 : vestingTerm.toNumber(), trueBondPrices: [
@@ -75267,7 +75270,7 @@ const fetchBondsDataPreTGE = (chain, tokenPrices, preTGEBonds, apiUrl) => __awai
                         bonusWithFee: bonus, // placeholder, wont be used
                     },
                 ], maxTotalPayout: maxTotalPayout === null || maxTotalPayout === void 0 ? void 0 : maxTotalPayout.toString(), totalPrincipalBilled: totalPrincipalBilled === null || totalPrincipalBilled === void 0 ? void 0 : totalPrincipalBilled.toString(), payoutTokenPrice,
-                principalTokenPrice, totalRaise: totalRaise === null || totalRaise === void 0 ? void 0 : totalRaise.toString(), finalized: finalized[0], minPoints: minPoints.toString(), maxPoints: maxPoints.toString(), startVestingTimestamp: startVestingTimestamp === null || startVestingTimestamp === void 0 ? void 0 : startVestingTimestamp.toString(), initTime: { [bondConfig.chainId]: terms.startTime.toNumber() }, finishTime: terms.endTime.toNumber(), initPrice, soldOut: finalized[0] || ((_k = terms.endTime.toNumber()) !== null && _k !== void 0 ? _k : 0) < Date.now() / 1000 || bondConfig.soldOut });
+                principalTokenPrice, totalRaise: totalRaise === null || totalRaise === void 0 ? void 0 : totalRaise.toString(), finalized: finalized[0], minPoints: minPoints.toString(), maxPoints: maxPoints.toString(), startVestingTimestamp: startVestingTimestamp === null || startVestingTimestamp === void 0 ? void 0 : startVestingTimestamp.toString(), initTime: { [bondConfig.chainId]: terms.startTime.toNumber() }, finishTime: terms.endTime.toNumber(), initPrice, soldOut: finalized[0] || ((_l = terms.endTime.toNumber()) !== null && _l !== void 0 ? _l : 0) < Date.now() / 1000 || bondConfig.soldOut });
             return data;
         });
         data.push(returnedBills);
@@ -75275,7 +75278,7 @@ const fetchBondsDataPreTGE = (chain, tokenPrices, preTGEBonds, apiUrl) => __awai
     }
     catch (e) {
         console.error(e);
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getLaunchBondsPublicData', preTGEBonds, chain, e },
@@ -75393,7 +75396,7 @@ const fetchBondsData = (chainId, bills, apiUrl, tokenPrices) => __awaiter$9(void
     }
     catch (e) {
         console.error(e);
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getBondsData', e },
@@ -75403,7 +75406,7 @@ const fetchBondsData = (chainId, bills, apiUrl, tokenPrices) => __awaiter$9(void
 });
 const cleanBillsData = (billIds, chunkedBills, chainId, bills, tokenPrices) => __awaiter$9(void 0, void 0, void 0, function* () {
     const data = yield Promise.all(chunkedBills === null || chunkedBills === void 0 ? void 0 : chunkedBills.map((chunk, index) => __awaiter$9(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const bill = bills === null || bills === void 0 ? void 0 : bills.find((bill) => (bill === null || bill === void 0 ? void 0 : bill.index) === billIds[index]);
         const lpPrice = (_b = (_a = tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices.find((tokenPrice) => {
             var _a, _b, _c, _d;
@@ -75454,7 +75457,7 @@ const cleanBillsData = (billIds, chunkedBills, chainId, bills, tokenPrices) => _
             ];
         }
         const cleanedData = Object.assign(Object.assign({}, bill), { feeInPayout,
-            feeInPrincipal, showcaseTokenName: (_l = (_k = (_j = bill === null || bill === void 0 ? void 0 : bill.showcaseToken) === null || _j === void 0 ? void 0 : _j.symbol) !== null && _k !== void 0 ? _k : bill === null || bill === void 0 ? void 0 : bill.earnToken.symbol) !== null && _l !== void 0 ? _l : '', trueBondPrices, principalTokenPrice: (_m = lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString()) !== null && _m !== void 0 ? _m : '0', payoutTokenPrice: (_o = earnTokenPrice === null || earnTokenPrice === void 0 ? void 0 : earnTokenPrice.toString()) !== null && _o !== void 0 ? _o : '0', tokensRemaining: treasuryBalance
+            feeInPrincipal, showcaseTokenName: (_l = (_k = (_j = bill === null || bill === void 0 ? void 0 : bill.showcaseToken) === null || _j === void 0 ? void 0 : _j.symbol) !== null && _k !== void 0 ? _k : bill === null || bill === void 0 ? void 0 : bill.earnToken.symbol) !== null && _l !== void 0 ? _l : '', trueBondPrices, principalTokenPrice: lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString(), payoutTokenPrice: earnTokenPrice === null || earnTokenPrice === void 0 ? void 0 : earnTokenPrice.toString(), tokensRemaining: treasuryBalance
                 ? Math.min(treasuryBalance, tokensRemaining).toString()
                 : tokensRemaining.toString(), maxTotalPayout: maxTotalPayout === null || maxTotalPayout === void 0 ? void 0 : maxTotalPayout.toString(), maxPayout: maxPayout === null || maxPayout === void 0 ? void 0 : maxPayout.toString(), totalPayoutGiven: totalPayoutGiven === null || totalPayoutGiven === void 0 ? void 0 : totalPayoutGiven.toString(), vestingTerm: typeof vestingTerm === 'number' ? vestingTerm : vestingTerm.toNumber() });
         return cleanedData;
@@ -75520,7 +75523,7 @@ const calculateBondsData = (queryClient) => __awaiter$9(void 0, void 0, void 0,
             yield fetchBondsData(main.ChainId.SOL, reducedBonds[main.ChainId.SOL], apiUrl, tokenPrices === null || tokenPrices === void 0 ? void 0 : tokenPrices[main.ChainId.SOL]),
             yield axios.get(`${realTimeApiURL}/bonds`),
         ]);
-        return [...solBonds, ...evmResponse.data.bonds];
+        return [...solBonds, ...evmResponse.data.bonds].filter((bond) => chains.includes(bond.chainId));
     }
     catch (_a) {
         // If realtime fails, we trigger the fallback strategy on the client
@@ -75621,7 +75624,7 @@ const Actions = ({ userBill }) => {
             console.error('Claim Failed:', error);
             setLoadingTx(false);
             addToastError(error.message);
-            reportError$1({
+            reportError({
                 apiUrl: (_g = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _g === void 0 ? void 0 : _g.apiV2,
                 error,
                 extraInfo: { type: 'redeem', userBill, error },
@@ -75717,7 +75720,10 @@ const ActionsSolana = ({ userBill }) => {
         return userPayoutAta;
     });
     const handleClaim = () => __awaiter$9(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        // Early return guard - prevent double execution
+        if (loadingTx || !accountSolana || !userBill)
+            return;
         try {
             setLoadingTx(true);
             const earnTokenAddress = (_c = (_b = (_a = userBill === null || userBill === void 0 ? void 0 : userBill.bond) === null || _a === void 0 ? void 0 : _a.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[(_d = userBill === null || userBill === void 0 ? void 0 : userBill.bond) === null || _d === void 0 ? void 0 : _d.chainId];
@@ -75726,6 +75732,7 @@ const ActionsSolana = ({ userBill }) => {
                 return;
             const payoutMint = new PublicKey(earnTokenAddress);
             const bondIssuancePda = new PublicKey(contractAddress);
+            const bondPricingPda = derivePda('bond_pricing', bondIssuancePda, PROGRAM_ID);
             const nftMint = new PublicKey(userBill.asset);
             const [bondTermPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond_term'), bondIssuancePda.toBuffer()], PROGRAM_ID);
             const [bondPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond'), bondIssuancePda.toBuffer(), nftMint.toBuffer()], PROGRAM_ID);
@@ -75742,6 +75749,7 @@ const ActionsSolana = ({ userBill }) => {
                 { pubkey: bondPda, isSigner: false, isWritable: true },
                 { pubkey: bondTermPda, isSigner: false, isWritable: false },
                 { pubkey: bondIssuancePda, isSigner: false, isWritable: false },
+                { pubkey: bondPricingPda, isSigner: false, isWritable: true },
                 { pubkey: accountSolana, isSigner: true, isWritable: true }, // user
                 { pubkey: nftMint, isSigner: false, isWritable: true },
                 { pubkey: userPayoutAta, isSigner: false, isWritable: true },
@@ -75760,14 +75768,17 @@ const ActionsSolana = ({ userBill }) => {
             // Build Transaction
             const transaction = new Transaction().add(instruction);
             transaction.feePayer = accountSolana;
-            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash('confirmed');
+            // Get fresh blockhash right before signing
+            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash('finalized');
             transaction.recentBlockhash = blockhash;
             if (!signTransaction)
                 return;
             const signedTx = yield signTransaction(transaction);
+            // Send with better error handling
             const txHash = yield connection.sendRawTransaction(signedTx.serialize(), {
                 skipPreflight: false,
-                preflightCommitment: 'confirmed',
+                preflightCommitment: 'finalized',
+                maxRetries: 0, // Don't auto-retry to avoid duplicates
             });
             yield connection.confirmTransaction({
                 signature: txHash,
@@ -75780,13 +75791,18 @@ const ActionsSolana = ({ userBill }) => {
                 refetch();
                 addToastSuccess(txHash, main.ChainId.SOL);
             }
-            setLoadingTx(false);
         }
         catch (error) {
             console.error('Claim failed:', error);
-            addToastError((_k = error === null || error === void 0 ? void 0 : error.message) !== null && _k !== void 0 ? _k : 'Unknown error');
+            // Better error messaging for duplicate transactions
+            if ((_k = error === null || error === void 0 ? void 0 : error.message) === null || _k === void 0 ? void 0 : _k.includes('already been processed')) {
+                addToastError('Transaction already processed. Please wait and try again.');
+            }
+            else {
+                addToastError((_l = error === null || error === void 0 ? void 0 : error.message) !== null && _l !== void 0 ? _l : 'Unknown error');
+            }
             reportError({
-                apiUrl: (_l = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _l === void 0 ? void 0 : _l.apiV2,
+                apiUrl: (_m = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _m === void 0 ? void 0 : _m.apiV2,
                 error,
                 extraInfo: { type: 'claim', userBill, error },
             });
@@ -75797,7 +75813,8 @@ const ActionsSolana = ({ userBill }) => {
     });
     return (jsxs(Fragment$1, { children: [jsx$2(Button, { variant: "secondary", disabled: claimable(userBill) === 0 || loadingTx || !userBill || isPendingCliff, load: loadingTx, onClick: (event) => {
                     event.stopPropagation();
-                    handleClaim();
+                    if (!loadingTx)
+                        handleClaim();
                 }, sx: { fontSize: '14px', width: '100%' }, children: isPendingCliff
                     ? `Claimable in ${cliffCountdown.days !== 0 ? `${cliffCountdown.days} days` : cliffCountdown.hours !== 0 ? `${cliffCountdown.hours} hours` : `${cliffCountdown.minutes} mins`}`
                     : 'Claim' }), jsx$2(Button, { sx: { fontSize: '14px', width: '100%' }, onClick: () => canPurchaseAgain
@@ -76047,7 +76064,7 @@ const UserBondRow = ({ bill }) => {
             setLoadingTx(false);
             console.error('Claim failed:', error);
             addToastError(error.message);
-            reportError$1({
+            reportError({
                 apiUrl: (_g = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _g === void 0 ? void 0 : _g.apiV2,
                 error,
                 extraInfo: { type: 'claim', bill, error },
@@ -76113,9 +76130,9 @@ const UserBondRowSolana = ({ bill }) => {
     const earnTokenPrice = parseFloat((_b = (_a = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _a === void 0 ? void 0 : _a.payoutTokenPrice) !== null && _b !== void 0 ? _b : '0');
     const vestingCliff = (_c = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _c === void 0 ? void 0 : _c.vestingCliff;
     const currentTime = Math.round(new Date().getTime() / 1000);
-    const lastBlockTimestamp = parseInt((_d = bill === null || bill === void 0 ? void 0 : bill.lastBlockTimestamp) !== null && _d !== void 0 ? _d : '0');
-    const isPendingCliff = vestingCliff ? currentTime - lastBlockTimestamp < vestingCliff : false;
-    const cliffCountdown = getTimePeriods(lastBlockTimestamp + (vestingCliff !== null && vestingCliff !== void 0 ? vestingCliff : 0) - currentTime, true);
+    const vestingStartTimestamp = parseInt((_d = bill === null || bill === void 0 ? void 0 : bill.vestingStartTimestamp) !== null && _d !== void 0 ? _d : '0');
+    const isPendingCliff = vestingCliff ? currentTime - vestingStartTimestamp < vestingCliff : false;
+    const cliffCountdown = getTimePeriods(vestingStartTimestamp + (vestingCliff !== null && vestingCliff !== void 0 ? vestingCliff : 0) - currentTime, true);
     const [onOpenPurchasedBond] = useModal(jsx$2(YourBondsModal, { userBill: bill }));
     const ensureUserPayoutAtaExists = (_a) => __awaiter$9(void 0, [_a], void 0, function* ({ connection, payer, payoutMint, user, }) {
         const userPayoutAta = yield getAssociatedTokenAddress(payoutMint, user);
@@ -76147,7 +76164,10 @@ const UserBondRowSolana = ({ bill }) => {
         return userPayoutAta;
     });
     const handleClaim = () => __awaiter$9(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        // Early return guard - prevent double execution
+        if (loadingTx || !accountSolana)
+            return;
         try {
             setLoadingTx(true);
             const earnTokenAddress = (_c = (_b = (_a = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _a === void 0 ? void 0 : _a.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[(_d = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _d === void 0 ? void 0 : _d.chainId];
@@ -76156,6 +76176,7 @@ const UserBondRowSolana = ({ bill }) => {
                 return;
             const payoutMint = new PublicKey(earnTokenAddress);
             const bondIssuancePda = new PublicKey(contractAddress);
+            const bondPricingPda = derivePda('bond_pricing', bondIssuancePda, PROGRAM_ID);
             const nftMint = new PublicKey(bill.asset);
             const [bondTermPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond_term'), bondIssuancePda.toBuffer()], PROGRAM_ID);
             const [bondPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond'), bondIssuancePda.toBuffer(), nftMint.toBuffer()], PROGRAM_ID);
@@ -76172,6 +76193,7 @@ const UserBondRowSolana = ({ bill }) => {
                 { pubkey: bondPda, isSigner: false, isWritable: true },
                 { pubkey: bondTermPda, isSigner: false, isWritable: false },
                 { pubkey: bondIssuancePda, isSigner: false, isWritable: false },
+                { pubkey: bondPricingPda, isSigner: false, isWritable: true },
                 { pubkey: accountSolana, isSigner: true, isWritable: true }, // user
                 { pubkey: nftMint, isSigner: false, isWritable: true },
                 { pubkey: userPayoutAta, isSigner: false, isWritable: true },
@@ -76190,14 +76212,17 @@ const UserBondRowSolana = ({ bill }) => {
             // Build Transaction
             const transaction = new Transaction().add(instruction);
             transaction.feePayer = accountSolana;
-            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash('confirmed');
+            // Get fresh blockhash right before signing
+            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash('finalized');
             transaction.recentBlockhash = blockhash;
             if (!signTransaction)
                 return;
             const signedTx = yield signTransaction(transaction);
+            // Send with better error handling
             const txHash = yield connection.sendRawTransaction(signedTx.serialize(), {
                 skipPreflight: false,
-                preflightCommitment: 'confirmed',
+                preflightCommitment: 'finalized',
+                maxRetries: 0, // Don't auto-retry to avoid duplicates
             });
             yield connection.confirmTransaction({
                 signature: txHash,
@@ -76210,13 +76235,18 @@ const UserBondRowSolana = ({ bill }) => {
                 refetch();
                 addToastSuccess(txHash, main.ChainId.SOL);
             }
-            setLoadingTx(false);
         }
         catch (error) {
             console.error('Claim failed:', error);
-            addToastError((_k = error === null || error === void 0 ? void 0 : error.message) !== null && _k !== void 0 ? _k : 'Unknown error');
+            // Better error messaging for duplicate transactions
+            if ((_k = error === null || error === void 0 ? void 0 : error.message) === null || _k === void 0 ? void 0 : _k.includes('already been processed')) {
+                addToastError('Transaction already processed. Please wait and try again.');
+            }
+            else {
+                addToastError((_l = error === null || error === void 0 ? void 0 : error.message) !== null && _l !== void 0 ? _l : 'Unknown error');
+            }
             reportError({
-                apiUrl: (_l = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _l === void 0 ? void 0 : _l.apiV2,
+                apiUrl: (_m = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _m === void 0 ? void 0 : _m.apiV2,
                 error,
                 extraInfo: { type: 'claim', bill, error },
             });
@@ -76240,7 +76270,8 @@ const UserBondRowSolana = ({ bill }) => {
                                 setVisible(true);
                             }, fullWidth: true, children: ["Connect to ", NETWORK_LABEL[(_p = bill === null || bill === void 0 ? void 0 : bill.bond) === null || _p === void 0 ? void 0 : _p.chainId]] })) : (jsx$2(Button, { className: "button", disabled: claimable(bill) === 0 || loadingTx || isPendingCliff, load: loadingTx, onClick: (event) => {
                                 event.stopPropagation();
-                                handleClaim();
+                                if (!loadingTx)
+                                    handleClaim();
                             }, fullWidth: true, children: isPendingCliff
                                 ? `Claimable in ${cliffCountdown.days !== 0 ? `${cliffCountdown.days} days` : cliffCountdown.hours !== 0 ? `${cliffCountdown.hours} hours` : `${cliffCountdown.minutes} mins`}`
                                 : 'Claim' })) })] })] }));
@@ -76357,7 +76388,7 @@ const fetchPreTGEUserBonds = (chains, tokenPrices, preTGEList, account, apiUrl)
             }
             catch (e) {
                 console.error(e);
-                reportError$1({
+                reportError({
                     apiUrl,
                     error: e,
                     extraInfo: { type: 'fetchPreTGEUserBonds', bond, e },
@@ -76371,7 +76402,7 @@ const fetchPreTGEUserBonds = (chains, tokenPrices, preTGEList, account, apiUrl)
     }
     catch (e) {
         console.log(e);
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'fetchPreTGEUserBonds', e },
@@ -76413,7 +76444,7 @@ const PreTgeActions = ({ userBond }) => {
             .catch((e) => {
             var _a;
             console.error(e.message);
-            reportError$1({
+            reportError({
                 apiUrl: (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.apiV2,
                 error: e.message,
                 extraInfo: { type: 'redeemLaunchBond', error: e.message },
@@ -76444,7 +76475,7 @@ const PreTgeActions = ({ userBond }) => {
             .catch((e) => {
             var _a;
             console.error(e.message);
-            reportError$1({
+            reportError({
                 apiUrl: (_a = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _a === void 0 ? void 0 : _a.apiV2,
                 error: e.message,
                 extraInfo: { type: 'claimLaunchBond', error: e.message },
@@ -76856,7 +76887,7 @@ const getTokensBalance = (account, tokens, chainId, apiUrl) => __awaiter$9(void
         return [...balancesToken, ...balancesNative];
     }
     catch (e) {
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getTokensBalance', tokens, e },
@@ -78030,7 +78061,7 @@ const useApproval = (amount, currency, spender, account, chainId) => {
             setConfirmingTxOnWallet(false);
             console.error('Approval failed:', error);
             addToastError((error === null || error === void 0 ? void 0 : error.shortMessage) || (error === null || error === void 0 ? void 0 : error.details) || (error === null || error === void 0 ? void 0 : error.message));
-            reportError$1({
+            reportError({
                 apiUrl,
                 error,
                 extraInfo: { type: 'approval', tokenAddress: tokenAddress, spenderAddress: spender, error },
@@ -78349,7 +78380,7 @@ const ZapModal = ({ onDismiss, outputToken, account, chainId }) => {
                 console.error(e);
                 setPendingTx(false);
                 addToastError(e === null || e === void 0 ? void 0 : e.shortMessage);
-                reportError$1({
+                reportError({
                     apiUrl: (_c = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _c === void 0 ? void 0 : _c.apiV2,
                     error: e,
                     extraInfo: { type: 'zap-lp', zapData, e },
@@ -78955,7 +78986,7 @@ const getTierProofSig = (apiAddress, account, bondAddress, chainId) => __awaiter
         return response.data.tierProofSignature;
     }
     catch (e) {
-        reportError$1({
+        reportError({
             apiUrl: apiAddress,
             error: e,
             extraInfo: { type: 'getTierProofSig', bondAddress, e },
@@ -79364,7 +79395,7 @@ const BuyComponent = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond,
         }
         catch (error) {
             console.error('Buy error', error);
-            reportError$1({
+            reportError({
                 apiUrl: (_h = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _h === void 0 ? void 0 : _h.apiV2,
                 error,
                 extraInfo: { type: 'buyBond', bondData, error },
@@ -79428,7 +79459,7 @@ const BuyComponent = ({ onDismiss, bondAddress, bondChain, handlePurchasedBond,
             catch (e) {
                 console.log(e);
                 addToastError(e.shortMessage);
-                reportError$1({
+                reportError({
                     apiUrl: (_l = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _l === void 0 ? void 0 : _l.apiV2,
                     error: e,
                     extraInfo: { type: 'zapBuyBond', bondData, zapData, e },
@@ -79752,7 +79783,7 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
         catch (error) {
             console.error('Error during bond purchase:', error);
             addToastError((error === null || error === void 0 ? void 0 : error.message) || 'Unknown error');
-            reportError$1({
+            reportError({
                 apiUrl: (_j = SDKConfig === null || SDKConfig === void 0 ? void 0 : SDKConfig.urls) === null || _j === void 0 ? void 0 : _j.apiV2,
                 error: error.message,
                 extraInfo: { type: 'solanaBuyBond', error: error.message },
@@ -85553,7 +85584,7 @@ const getHotBondsContracts = (apiUrl) => __awaiter$9(void 0, void 0, void 0, fun
         return response.data.map((bond) => bond.BondAddress.toLowerCase());
     }
     catch (e) {
-        reportError$1({
+        reportError({
             apiUrl,
             error: e,
             extraInfo: { type: 'getHotBondsContracts', e },

package/dist/state/bonds/useBondsList.d.ts

@@ -1,4 +1,4 @@
-import { UseQueryResult } from '@tanstack/react-query';
+import { QueryClient, UseQueryResult } from '@tanstack/react-query';
 import { BillsConfig } from '@ape.swap/apeswap-lists';
 export default function useBondsList(): UseQueryResult<BillsConfig[]>;
-export declare const getBondsList: (realTimeapiURL: string, apiUrl: string) => Promise<BillsConfig[]>;
+export declare const getBondsList: (queryClient: QueryClient) => Promise<BillsConfig[]>;

package/dist/state/useSDKConfig.d.ts

@@ -14,6 +14,7 @@ export interface SDKPropsDTO {
     theme?: any;
     highestCompatibleVersion?: string;
     blockSales?: boolean;
+    customBranch?: string;
 }
 export interface SDKProps {
     referenceId: string;
@@ -33,6 +34,7 @@ export interface SDKProps {
     solAddress?: string;
     useCardsView?: boolean;
     blockSales?: boolean;
+    customBranch?: string;
 }
 export declare const useSDKConfig: (config?: SDKPropsDTO) => SDKProps;
 export type URLKeys = 'apiV2' | 'realTimeApi' | 'mainUrl' | 'priceApi';

package/dist/types/yourbonds.d.ts

@@ -13,6 +13,7 @@ export interface UserBill {
     totalPayout?: string;
     truePricePaid: string;
     lastBlockTimestamp: string;
+    vestingStartTimestamp?: string;
     pendingRewards: string;
     billNftAddress: string;
     payoutClaimed: string;

package/package.json

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