@ape.swap/bonds-sdk 2.6.11 → 2.6.12

package/dist/main.js

@@ -71525,7 +71525,7 @@ const fetchUserOwnedBillsDataAsync = (chainId, account, bondData, tokenPrices) =
 });
 /* MODIFIED FUNCTION FROM FRONTEND SPECIFICALLY FOR THE SDK */
 const fetchUserOwnedBills = (chainId, account, bonds, tokenPrices) => __awaiter$9(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     // Maps all the bills in the list repo to make a call to each of them to get Bills Id, meaning purchased bill ids
     const billIdCalls = bonds.map((b) => {
         var _a;
@@ -71536,10 +71536,8 @@ const fetchUserOwnedBills = (chainId, account, bonds, tokenPrices) => __awaiter$
         });
     });
     const billIds = yield multicall(chainId, BOND_ABI, billIdCalls, true, 15);
-    const billsPendingRewardCall = [];
     const billDataCalls = [];
     const billVersions = [];
-    const billNFTCalls = [];
     billIds.forEach((idArray, index) => idArray[0].forEach((id) => id.gt(0) &&
         (billDataCalls.push({
             address: bonds[index].contractAddress[bonds[index].chainId],
@@ -71547,13 +71545,7 @@ const fetchUserOwnedBills = (chainId, account, bonds, tokenPrices) => __awaiter$
             params: [id],
             bond: bonds[index],
         }),
-            billDataCalls.push({ address: bonds[index].contractAddress[bonds[index].chainId], name: 'billNft' }),
-            billNFTCalls.push({
-                address: bonds[index].billNnftAddress[bonds[index].chainId],
-                name: 'vestedPayout',
-                params: [id],
-            }),
-            billsPendingRewardCall.push({
+            billDataCalls.push({
                 address: bonds[index].contractAddress[bonds[index].chainId],
                 name: bonds[index].billVersion !== types.BillVersion.V1 ? 'claimablePayout' : 'pendingPayoutFor',
                 params: [id],
@@ -71561,43 +71553,44 @@ const fetchUserOwnedBills = (chainId, account, bonds, tokenPrices) => __awaiter$
             }),
             billVersions.push(bonds[index].billVersion))));
     const billData = yield multicall(chainId, BOND_ABI, billDataCalls, true, 150);
-    const pendingRewardsCall = yield multicall(chainId, BOND_ABI, billsPendingRewardCall);
     const result = [];
-    for (let i = 0; i < billsPendingRewardCall.length; i++) {
-        const billDataPos = i === 0 ? 0 : i * 2;
-        let bond = billsPendingRewardCall[i].bond;
-        bond = Object.assign(Object.assign({}, bond), { payoutTokenPrice: (_a = tokenPrices.find((tokenPrice) => {
-                var _a, _b, _c, _d;
-                return ((_a = tokenPrice.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_d = (_c = (_b = bond === null || bond === void 0 ? void 0 : bond.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bond.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase()) &&
-                    tokenPrice.chainId === bond.chainId;
-            })) === null || _a === void 0 ? void 0 : _a.price, principalTokenPrice: (_b = tokenPrices.find((tokenPrice) => {
-                var _a, _b, _c, _d;
-                return ((_a = tokenPrice.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_d = (_c = (_b = bond === null || bond === void 0 ? void 0 : bond.lpToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bond.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase()) &&
-                    tokenPrice.chainId === bond.chainId;
-            })) === null || _b === void 0 ? void 0 : _b.price });
+    for (let i = 0; i < billVersions.length; i++) {
+        const billPos = i === 0 ? 0 : i * 2;
+        let bond = billDataCalls[billPos].bond;
+        // const principalTokenPrice = tokenPrices.find(
+        //   (tokenPrice) =>
+        //     tokenPrice.address?.toLowerCase() === bond?.lpToken?.address?.[bond.chainId]?.toLowerCase() &&
+        //     tokenPrice.chainId === bond.chainId,
+        // )?.price
+        const payoutTokenPrice = (_a = tokenPrices.find((tokenPrice) => {
+            var _a, _b, _c, _d;
+            return ((_a = tokenPrice.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_d = (_c = (_b = bond === null || bond === void 0 ? void 0 : bond.earnToken) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c[bond.chainId]) === null || _d === void 0 ? void 0 : _d.toLowerCase()) &&
+                tokenPrice.chainId === bond.chainId;
+        })) === null || _a === void 0 ? void 0 : _a.price;
+        bond = Object.assign(Object.assign({}, bond), { payoutTokenPrice: payoutTokenPrice });
         const data = billVersions[i] !== types.BillVersion.V1
             ? {
-                address: billsPendingRewardCall[i].address,
-                id: billsPendingRewardCall[i].params[0].toString(),
-                payout: new BigNumber$1((_c = billData[billDataPos][0]) === null || _c === void 0 ? void 0 : _c.payout.toString())
-                    .minus((_d = billData[billDataPos][0]) === null || _d === void 0 ? void 0 : _d.payoutClaimed.toString())
+                address: billDataCalls[billPos].address,
+                id: billDataCalls[billPos].params[0].toString(),
+                payout: new BigNumber$1((_b = billData[billPos][0]) === null || _b === void 0 ? void 0 : _b.payout.toString())
+                    .minus((_c = billData[billPos][0]) === null || _c === void 0 ? void 0 : _c.payoutClaimed.toString())
                     .toString(),
-                billNftAddress: billData[billDataPos + 1][0].toString(),
-                vesting: (_e = billData[billDataPos][0]) === null || _e === void 0 ? void 0 : _e.vesting.toString(),
-                lastBlockTimestamp: (_f = billData[billDataPos][0]) === null || _f === void 0 ? void 0 : _f.lastClaimTimestamp.toString(),
-                truePricePaid: (_g = billData[billDataPos][0]) === null || _g === void 0 ? void 0 : _g.truePricePaid.toString(),
-                pendingRewards: pendingRewardsCall[i][0].toString(),
+                billNftAddress: bond.billNnftAddress[bond.chainId],
+                vesting: (_d = billData[billPos][0]) === null || _d === void 0 ? void 0 : _d.vesting.toString(),
+                lastBlockTimestamp: (_e = billData[billPos][0]) === null || _e === void 0 ? void 0 : _e.lastClaimTimestamp.toString(),
+                truePricePaid: (_f = billData[billPos][0]) === null || _f === void 0 ? void 0 : _f.truePricePaid.toString(),
+                pendingRewards: billData[billPos + 1][0].toString(),
                 bond,
             }
             : {
-                address: billsPendingRewardCall[i].address,
-                id: billsPendingRewardCall[i].params[0].toString(),
-                payout: billData[billDataPos][0].toString(),
-                billNftAddress: billData[billDataPos + 1][0].toString(),
-                vesting: billData[billDataPos][1].toString(),
-                lastBlockTimestamp: billData[billDataPos][2].toString(),
-                truePricePaid: billData[billDataPos][3].toString(),
-                pendingRewards: pendingRewardsCall[i][0].toString(),
+                address: billDataCalls[billPos].address,
+                id: billDataCalls[billPos].params[0].toString(),
+                payout: billData[billPos][0].toString(),
+                billNftAddress: bond.billNnftAddress[bond.chainId],
+                vesting: billData[billPos][1].toString(),
+                lastBlockTimestamp: billData[billPos][2].toString(),
+                truePricePaid: billData[billPos][3].toString(),
+                pendingRewards: billData[billPos + 1][0].toString(),
                 bond,
             };
         result.push(data);

package/package.json

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