@ape.swap/bonds-sdk 3.0.67 → 3.0.68

package/dist/main.js

@@ -76226,6 +76226,233 @@ var BOND_2_4_0 = [
 	}
 ];
 
+var ERC_20_ABI = [
+	{
+		constant: true,
+		inputs: [
+		],
+		name: "name",
+		outputs: [
+			{
+				name: "",
+				type: "string"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		constant: false,
+		inputs: [
+			{
+				name: "_spender",
+				type: "address"
+			},
+			{
+				name: "_value",
+				type: "uint256"
+			}
+		],
+		name: "approve",
+		outputs: [
+			{
+				name: "",
+				type: "bool"
+			}
+		],
+		payable: false,
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		constant: true,
+		inputs: [
+		],
+		name: "totalSupply",
+		outputs: [
+			{
+				name: "",
+				type: "uint256"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		constant: false,
+		inputs: [
+			{
+				name: "_from",
+				type: "address"
+			},
+			{
+				name: "_to",
+				type: "address"
+			},
+			{
+				name: "_value",
+				type: "uint256"
+			}
+		],
+		name: "transferFrom",
+		outputs: [
+			{
+				name: "",
+				type: "bool"
+			}
+		],
+		payable: false,
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		constant: true,
+		inputs: [
+		],
+		name: "decimals",
+		outputs: [
+			{
+				name: "",
+				type: "uint8"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		constant: true,
+		inputs: [
+			{
+				name: "_owner",
+				type: "address"
+			}
+		],
+		name: "balanceOf",
+		outputs: [
+			{
+				name: "balance",
+				type: "uint256"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		constant: true,
+		inputs: [
+		],
+		name: "symbol",
+		outputs: [
+			{
+				name: "",
+				type: "string"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		constant: false,
+		inputs: [
+			{
+				name: "_to",
+				type: "address"
+			},
+			{
+				name: "_value",
+				type: "uint256"
+			}
+		],
+		name: "transfer",
+		outputs: [
+			{
+				name: "",
+				type: "bool"
+			}
+		],
+		payable: false,
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		constant: true,
+		inputs: [
+			{
+				name: "_owner",
+				type: "address"
+			},
+			{
+				name: "_spender",
+				type: "address"
+			}
+		],
+		name: "allowance",
+		outputs: [
+			{
+				name: "",
+				type: "uint256"
+			}
+		],
+		payable: false,
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		payable: true,
+		stateMutability: "payable",
+		type: "fallback"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				name: "owner",
+				type: "address"
+			},
+			{
+				indexed: true,
+				name: "spender",
+				type: "address"
+			},
+			{
+				indexed: false,
+				name: "value",
+				type: "uint256"
+			}
+		],
+		name: "Approval",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				name: "from",
+				type: "address"
+			},
+			{
+				indexed: true,
+				name: "to",
+				type: "address"
+			},
+			{
+				indexed: false,
+				name: "value",
+				type: "uint256"
+			}
+		],
+		name: "Transfer",
+		type: "event"
+	}
+];
+
 function useBondsData() {
     const { data: tokenPrices } = useTokenPrices();
     const { data: bondList } = useBondsList();
@@ -76275,7 +76502,7 @@ const getBondsData = (chains, realTimeApiURL, tokenPrices, bondList, apiUrl) =>
 const fetchBills = (chainId, tokenPrices, bills) => __awaiter$9(void 0, void 0, void 0, function* () {
     const billIds = [];
     const billCalls = bills.flatMap((bill) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         billIds.push(bill.index);
         return [
             // Get bill price with LP fees
@@ -76298,11 +76525,36 @@ const fetchBills = (chainId, tokenPrices, bills) => __awaiter$9(void 0, void 0,
                 address: (_d = bill.contractAddress[bill.chainId]) !== null && _d !== void 0 ? _d : '',
                 name: bill.billVersion !== types.BillVersion.V1 ? 'getMaxTotalPayout' : 'maxTotalPayout',
             },
+            {
+                address: (_e = bill.contractAddress[bill.chainId]) !== null && _e !== void 0 ? _e : '',
+                name: 'customTreasury',
+            },
         ];
     });
     const vals = yield multicall(chainId, BOND_2_4_0, billCalls);
-    const chunkSize = (vals === null || vals === void 0 ? void 0 : vals.length) / (bills === null || bills === void 0 ? void 0 : bills.length);
-    const chunkedBills = lodashExports.chunk(vals, chunkSize);
+    // Prepare an additional multicall for `customTreasury` token balance
+    const treasuryAddresses = vals
+        .filter((_, i) => i % 5 === 4)
+        .map((customTreasury) => customTreasury[0]); // Extract `customTreasury` from chunks
+    const treasuryBalanceCalls = treasuryAddresses.map((treasuryAddress, i) => {
+        var _a, _b, _c, _d;
+        return ({
+            address: (_d = (_c = (_b = (_a = bills === null || bills === void 0 ? void 0 : bills[i]) === null || _a === void 0 ? void 0 : _a.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[chainId]) !== null && _d !== void 0 ? _d : '', // Use the earnToken's address as currency
+            name: 'balanceOf',
+            params: [treasuryAddress], // Fetch balance for the custom treasury
+        });
+    });
+    const treasuryBalances = yield multicall(chainId, ERC_20_ABI, treasuryBalanceCalls);
+    console.log(vals);
+    const updatedVals = vals.reduce((acc, val, index) => {
+        acc.push(val);
+        if ((index + 1) % 5 === 0) {
+            acc.push(treasuryBalances[(index + 1) / 5 - 1]); // Append the treasury balance after every set of bill values
+        }
+        return acc;
+    }, []);
+    const chunkSize = (updatedVals === null || updatedVals === void 0 ? void 0 : updatedVals.length) / (bills === null || bills === void 0 ? void 0 : bills.length);
+    const chunkedBills = lodashExports.chunk(updatedVals, chunkSize);
     return cleanBillsData(billIds, chunkedBills, tokenPrices, chainId, bills);
 });
 const cleanBillsData = (billIds, chunkedBills, tokenPrices, chainId, bills) => {
@@ -76319,12 +76571,13 @@ const cleanBillsData = (billIds, chunkedBills, tokenPrices, chainId, bills) => {
             return ((_a = tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_d = (_c = (_b = bill === null || bill === void 0 ? void 0 : bill.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bill === null || bill === void 0 ? void 0 : bill.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase()) &&
                 (tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.chainId) === chainId;
         })) === null || _c === void 0 ? void 0 : _c.price) !== null && _d !== void 0 ? _d : 0;
-        const [trueBillPrice, totalPayoutGiven, terms, maxTotalPayout] = chunk;
+        const [trueBillPrice, totalPayoutGiven, terms, maxTotalPayout, , customTreasuryBalance] = chunk;
         const [, vestingTerm, , maxPayout] = terms;
         const tokensRemaining = new BigNumber$1(maxTotalPayout !== null && maxTotalPayout !== void 0 ? maxTotalPayout : '0')
             .minus(new BigNumber$1(totalPayoutGiven))
             .div(new BigNumber$1(10).pow((_e = bill === null || bill === void 0 ? void 0 : bill.earnToken.decimals[bill === null || bill === void 0 ? void 0 : bill.chainId]) !== null && _e !== void 0 ? _e : 18))
-            .toString();
+            .toNumber();
+        const treasuryBalance = getBalanceNumber(customTreasuryBalance);
         const bonus = getRawBonus(trueBillPrice, lpPrice, earnTokenPrice);
         const bonusWithFee = getBonusWithFee((_f = bill === null || bill === void 0 ? void 0 : bill.feeInPayout) !== null && _f !== void 0 ? _f : 0, trueBillPrice, lpPrice, earnTokenPrice);
         let trueBondPrices = [];
@@ -76351,7 +76604,7 @@ const cleanBillsData = (billIds, chunkedBills, tokenPrices, chainId, bills) => {
         }
         //I've added a ts ignore here due to some props marked as optional in the list repo which are actually not optional
         //@ts-ignore
-        const cleanedData = Object.assign(Object.assign({}, bill), { type: (_g = bill === null || bill === void 0 ? void 0 : bill.billType) !== null && _g !== void 0 ? _g : '', billAddress: (_h = bill === null || bill === void 0 ? void 0 : bill.contractAddress[bill === null || bill === void 0 ? void 0 : bill.chainId]) !== null && _h !== void 0 ? _h : '', billNftAddress: (_j = bill === null || bill === void 0 ? void 0 : bill.billNnftAddress[bill === null || bill === void 0 ? void 0 : bill.chainId]) !== null && _j !== void 0 ? _j : '', showcaseTokenName: (_m = (_l = (_k = bill === null || bill === void 0 ? void 0 : bill.showcaseToken) === null || _k === void 0 ? void 0 : _k.symbol) !== null && _l !== void 0 ? _l : bill === null || bill === void 0 ? void 0 : bill.earnToken.symbol) !== null && _m !== void 0 ? _m : '', trueBondPrices, principalTokenPrice: (_o = lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString()) !== null && _o !== void 0 ? _o : '0', payoutTokenPrice: (_p = earnTokenPrice === null || earnTokenPrice === void 0 ? void 0 : earnTokenPrice.toString()) !== null && _p !== void 0 ? _p : '0', tokensRemaining, 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: vestingTerm.toNumber() });
+        const cleanedData = Object.assign(Object.assign({}, bill), { type: (_g = bill === null || bill === void 0 ? void 0 : bill.billType) !== null && _g !== void 0 ? _g : '', billAddress: (_h = bill === null || bill === void 0 ? void 0 : bill.contractAddress[bill === null || bill === void 0 ? void 0 : bill.chainId]) !== null && _h !== void 0 ? _h : '', billNftAddress: (_j = bill === null || bill === void 0 ? void 0 : bill.billNnftAddress[bill === null || bill === void 0 ? void 0 : bill.chainId]) !== null && _j !== void 0 ? _j : '', showcaseTokenName: (_m = (_l = (_k = bill === null || bill === void 0 ? void 0 : bill.showcaseToken) === null || _k === void 0 ? void 0 : _k.symbol) !== null && _l !== void 0 ? _l : bill === null || bill === void 0 ? void 0 : bill.earnToken.symbol) !== null && _m !== void 0 ? _m : '', trueBondPrices, principalTokenPrice: (_o = lpPrice === null || lpPrice === void 0 ? void 0 : lpPrice.toString()) !== null && _o !== void 0 ? _o : '0', payoutTokenPrice: (_p = earnTokenPrice === null || earnTokenPrice === void 0 ? void 0 : earnTokenPrice.toString()) !== null && _p !== void 0 ? _p : '0', tokensRemaining: Math.min(treasuryBalance, 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: vestingTerm.toNumber() });
         return cleanedData;
     });
     return data;
@@ -76493,233 +76746,6 @@ const TokenRow = ({ token, chainId, handleTokenSelect, tokenBalance, }) => {
     return (jsxs(Flex, { sx: { p: '8px', justifyContent: 'space-between', cursor: 'pointer', '&:hover': { background: 'white4' } }, onClick: () => handleTokenSelect(tokenAddress !== null && tokenAddress !== void 0 ? tokenAddress : ''), children: [jsxs(Flex, { children: [lodashExports.isArray(splited) ? (jsx$2(TokenImage, { symbol: splited[0], symbol2: splited[1], size: 28, chain: chainId })) : (jsx$2(TokenImage, { symbol: getSymbol(token, chainId), size: 28, chain: chainId })), jsx$2(Flex, { sx: { mx: '8px', lineHeight: '28px', fontSize: '14px' }, children: symbol })] }), address && (jsx$2(Flex, { sx: { fontSize: '14px' }, children: tokenBalance === '0' ? ('0') : !tokenBalance ? (jsx$2(Spinner, { size: 15 })) : (jsx$2(Fragment$1, { children: (_b = new BigNumber$1(tokenBalance !== null && tokenBalance !== void 0 ? tokenBalance : '0')) === null || _b === void 0 ? void 0 : _b.toPrecision(5) })) }))] }));
 };
 
-var ERC_20_ABI = [
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "name",
-		outputs: [
-			{
-				name: "",
-				type: "string"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				name: "_spender",
-				type: "address"
-			},
-			{
-				name: "_value",
-				type: "uint256"
-			}
-		],
-		name: "approve",
-		outputs: [
-			{
-				name: "",
-				type: "bool"
-			}
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "totalSupply",
-		outputs: [
-			{
-				name: "",
-				type: "uint256"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				name: "_from",
-				type: "address"
-			},
-			{
-				name: "_to",
-				type: "address"
-			},
-			{
-				name: "_value",
-				type: "uint256"
-			}
-		],
-		name: "transferFrom",
-		outputs: [
-			{
-				name: "",
-				type: "bool"
-			}
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "decimals",
-		outputs: [
-			{
-				name: "",
-				type: "uint8"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-			{
-				name: "_owner",
-				type: "address"
-			}
-		],
-		name: "balanceOf",
-		outputs: [
-			{
-				name: "balance",
-				type: "uint256"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "symbol",
-		outputs: [
-			{
-				name: "",
-				type: "string"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				name: "_to",
-				type: "address"
-			},
-			{
-				name: "_value",
-				type: "uint256"
-			}
-		],
-		name: "transfer",
-		outputs: [
-			{
-				name: "",
-				type: "bool"
-			}
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-			{
-				name: "_owner",
-				type: "address"
-			},
-			{
-				name: "_spender",
-				type: "address"
-			}
-		],
-		name: "allowance",
-		outputs: [
-			{
-				name: "",
-				type: "uint256"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		payable: true,
-		stateMutability: "payable",
-		type: "fallback"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				name: "owner",
-				type: "address"
-			},
-			{
-				indexed: true,
-				name: "spender",
-				type: "address"
-			},
-			{
-				indexed: false,
-				name: "value",
-				type: "uint256"
-			}
-		],
-		name: "Approval",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				name: "from",
-				type: "address"
-			},
-			{
-				indexed: true,
-				name: "to",
-				type: "address"
-			},
-			{
-				indexed: false,
-				name: "value",
-				type: "uint256"
-			}
-		],
-		name: "Transfer",
-		type: "event"
-	}
-];
-
 function useUserTokensBalance(tokens, chainId) {
     const keys = tokens.map((token) => (token === 'NATIVE' ? 'NATIVE' : token.address[chainId]));
     const { address: account } = useAccount();

package/package.json

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