@ape.swap/bonds-sdk 1.0.356 → 1.0.357

package/dist/components/BondModal/BondModal.js

@@ -62,10 +62,9 @@ import { TooltipText } from '../../enum/tooltips';
 import { formatNumberSI } from '../../utils/formatNumber';
 import { ethers } from 'ethers';
 import { adjustDecimals } from "../../utils/convertToTokenValue";
+import { BondAbi } from '../../enum/abis';
 import TokenImage from '../uikit-sdk/TokenImage';
 import '../../scss/BondModal.scss';
-import BOND_ABI from '../../config/abi/bond.json';
-import ERC_20_ABI from '../../config/abi/bond.json';
 var BondModal = function (_a) {
     var isOpen = _a.isOpen, onClose = _a.onClose, bondAddress = _a.bondAddress;
     if (!isOpen)
@@ -116,8 +115,6 @@ var BondModal = function (_a) {
         setSelectedBond(bond);
         navigate("/bondsingle/".concat(bond.billAddress));
     };
-    //Note to Gordon: Can we put all this in a helper file or something so the code in here is less?
-    /////////////////////
     function formatNumber(input) {
         var number = new BigNumber(input);
         if (number.isNaN())
@@ -169,9 +166,6 @@ var BondModal = function (_a) {
         var getPremium = premium(bond);
         return parseFloat(getPremium) < 0 ? 'premium-negative' : 'premium-positive';
     };
-    ////////////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////////////////////
     var handleBuy = function () { return __awaiter(void 0, void 0, void 0, function () {
         var provider, signer, bondContract, maxPrice, amount, tx, error_1;
         return __generator(this, function (_a) {
@@ -185,7 +179,7 @@ var BondModal = function (_a) {
                     }
                     provider = new ethers.providers.Web3Provider(window.ethereum);
                     signer = provider.getSigner();
-                    bondContract = new ethers.Contract(bondAddress !== null && bondAddress !== void 0 ? bondAddress : "", BOND_ABI, signer);
+                    bondContract = new ethers.Contract(bondAddress !== null && bondAddress !== void 0 ? bondAddress : "", BondAbi, signer);
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 4, , 5]);
@@ -208,12 +202,10 @@ var BondModal = function (_a) {
             }
         });
     }); };
-    //You approve the token, not the contract (this code will have to be updated for zap)
     var handleApprove = function () { return __awaiter(void 0, void 0, void 0, function () {
         var provider, signer, bondContract, amount, tx, error_2;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     console.log('handle approve clicked');
                     if (!window.ethereum) {
@@ -221,25 +213,24 @@ var BondModal = function (_a) {
                         alert('No Ethereum provider found');
                         return [2 /*return*/];
                     }
-                    console.log(selectedBond === null || selectedBond === void 0 ? void 0 : selectedBond.principalToken);
                     provider = new ethers.providers.Web3Provider(window.ethereum);
                     signer = provider.getSigner();
-                    bondContract = new ethers.Contract((_a = selectedBond === null || selectedBond === void 0 ? void 0 : selectedBond.principalToken) !== null && _a !== void 0 ? _a : "", ERC_20_ABI, signer);
-                    _b.label = 1;
+                    bondContract = new ethers.Contract(bondAddress !== null && bondAddress !== void 0 ? bondAddress : "", BondAbi, signer);
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 4, , 5]);
+                    _a.trys.push([1, 4, , 5]);
                     amount = adjustDecimals(inputValue);
-                    return [4 /*yield*/, bondContract.approve(bondAddress, amount)];
+                    return [4 /*yield*/, bondContract.approve(amount, account)];
                 case 2:
-                    tx = _b.sent();
+                    tx = _a.sent();
                     return [4 /*yield*/, tx.wait()];
                 case 3:
-                    _b.sent();
+                    _a.sent();
                     setApprovalStatus(true);
                     alert('Approve Successful');
                     return [3 /*break*/, 5];
                 case 4:
-                    error_2 = _b.sent();
+                    error_2 = _a.sent();
                     console.error('Approval error', error_2);
                     alert('Approval Failed');
                     return [3 /*break*/, 5];

package/dist/components/YourBonds/YourBonds.js

@@ -69,6 +69,7 @@ import { formatNumberSI } from '../../utils/formatNumber';
 import useCurrentTime from '../../hooks/useTimer';
 import { getPendingVesting } from '../../hooks/usePendingVesting';
 import axios from 'axios';
+import { fetchUserOwnedBillNftData } from './fetchBillsUser';
 var YourBonds = function (_a) {
     var connectionString = _a.connectionString;
     var _b = useWeb3React(), account = _b.account, isActive = _b.isActive;
@@ -160,26 +161,16 @@ var YourBonds = function (_a) {
         setIsModalOpen(true);
         navigate("/YourBonds/?bondAddress=".concat(bond.billAddress, "&bondChain=").concat(bond.chainId), { replace: true });
     };
-    // const usePollUserBills = () => {
-    //     const { slowRefresh } = useRefresh()
-    //     // const dispatch = useAppDispatch()
-    //     const { account, isActive } = useWeb3React();
-    //     useEffect(() => {
-    //       if (account) {
-    //         MAINNET_CHAINS.map((chain) => fetchUserOwnedBillsDataAsync(chain as number, account))
-    //       }
-    //     }, [account, slowRefresh])
-    // }
     var currentTime = useCurrentTime() / 1000;
     var vestingTimeRemaining = function (userBill) {
         return getTimePeriods(parseInt(userBill.lastBlockTimestamp) + parseInt(userBill.vesting) - currentTime, true);
     };
     var fetchUserOwnedBillsDataAsync = function (chainId, account) { return __awaiter(void 0, void 0, void 0, function () {
-        var bonds, userOwnedBills_1, mapUserOwnedBills_1, userOwnedBillsData_1, error_2;
+        var bonds, userOwnedBills_1, mapUserOwnedBills_1, userOwnedBillsData_1, ownedBillsData, userBillNftData_1, combinedData, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
+                    _a.trys.push([0, 3, , 4]);
                     bonds = bondData.filter(function (bond) {
                         return bond.billVersion !== BillVersion.FixedPrice &&
                             (bond === null || bond === void 0 ? void 0 : bond.chainId) === chainId &&
@@ -196,41 +187,43 @@ var YourBonds = function (_a) {
                         index: bill.index,
                         userOwnedBills: mapUserOwnedBills_1[i],
                     }); });
-                    return [2 /*return*/, Promise.resolve(userOwnedBillsData_1)];
+                    ownedBillsData = mapUserOwnedBills_1.flatMap(function (bs) {
+                        return bs.map(function (b) {
+                            return { id: b.id, billNftAddress: b.billNftAddress, contractAddress: b.address };
+                        });
+                    });
+                    return [4 /*yield*/, fetchUserOwnedBillNftData(ownedBillsData, chainId, bonds)
+                        // Merge userBillNftData into userOwnedBillsData
+                    ];
                 case 2:
+                    userBillNftData_1 = _a.sent();
+                    combinedData = userOwnedBillsData_1.map(function (data) {
+                        var enrichedUserBills = data.userOwnedBills.map(function (bill) {
+                            var nftData = userBillNftData_1.find(function (nft) { return nft.id === parseInt(bill.id); });
+                            return __assign(__assign({}, bill), (nftData ? { nftData: nftData } : {}));
+                        });
+                        return __assign(__assign({}, data), { 
+                            // userOwnedBills: enrichedUserBills
+                            nftData: enrichedUserBills });
+                    });
+                    // console.log("userBillNftData");
+                    // console.log(userBillNftData);
+                    // console.log("userBillNftData");
+                    // console.log("userOwnedBillsData");
+                    // console.log(userOwnedBillsData);
+                    // console.log("userOwnedBillsData");
+                    console.log("combinedData");
+                    console.log(combinedData);
+                    console.log("combinedData");
+                    return [2 /*return*/, Promise.resolve(combinedData)];
+                case 3:
                     error_2 = _a.sent();
                     console.error('Error fetching user owned bills data:', error_2);
                     return [2 /*return*/, Promise.reject(error_2)];
-                case 3: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     }); };
-    var _g = useState([]), userOwnedBillsData = _g[0], setUserOwnedBillsData = _g[1];
-    useEffect(function () {
-        var fetchData = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var results, error_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!account) return [3 /*break*/, 4];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, Promise.all(MAINNET_CHAINS.map(function (chain) { return fetchUserOwnedBillsDataAsync(chain, account); }))];
-                    case 2:
-                        results = _a.sent();
-                        setUserOwnedBillsData(results);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_3 = _a.sent();
-                        console.error('Error fetching user owned bills data:', error_3);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        }); };
-        fetchData();
-    }, [account]);
     var fetchUserOwnedBills = function (chainId, account, bonds) { return __awaiter(void 0, void 0, void 0, function () {
         var billIdCalls, billIds, billsPendingRewardCall, billDataCalls, billVersions, billData, pendingRewardsCall, result, i, billDataPos, data;
         var _a, _b, _c, _d, _e;
@@ -307,6 +300,32 @@ var YourBonds = function (_a) {
             }
         });
     }); };
+    var _g = useState([]), userOwnedBillsData = _g[0], setUserOwnedBillsData = _g[1];
+    useEffect(function () {
+        var fetchData = function () { return __awaiter(void 0, void 0, void 0, function () {
+            var results, error_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!account) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, Promise.all(MAINNET_CHAINS.map(function (chain) { return fetchUserOwnedBillsDataAsync(chain, account); }))];
+                    case 2:
+                        results = _a.sent();
+                        setUserOwnedBillsData(results);
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_3 = _a.sent();
+                        console.error('Error fetching user owned bills data:', error_3);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); };
+        fetchData();
+    }, [account]);
     var chainId = useWeb3React().chainId;
     var totalPending = function (userBill) {
         var _a, _b, _c, _d;
@@ -334,10 +353,9 @@ var YourBonds = function (_a) {
                             }
                             return totalPending(b) - totalPending(a);
                         });
-                        console.log(sortedBills);
                         return sortedBills.map(function (bill) {
-                            var _a, _b;
-                            return (_jsxs(Flex, __assign({ className: "container bondrow-container", onClick: function () { return rowClick(bill.bond); } }, { children: [_jsx(Flex, __assign({ className: "column column-tokens" }, { children: _jsx(Flex, __assign({ className: "column column-tokeninfoname" }, { children: _jsx(TokenInfoAndName, { bill: bill.bond, vestEnds: "Ends in ".concat(getPendingVesting(bill.lastBlockTimestamp, bill.vesting)) }) })) })), _jsxs(Flex, __assign({ className: "column column-bondinfo" }, { children: [_jsxs(Flex, __assign({ className: "column column-claimable" }, { children: [formatNumberSI(parseFloat(claimable(bill).toFixed(3)), 0), "($".concat((claimable(bill) * ((_a = parseFloat(earnTokenPrice(bill.bond))) !== null && _a !== void 0 ? _a : 0)).toFixed(2), ")")] })), _jsxs(Flex, __assign({ className: "column column-pending" }, { children: [formatNumberSI(parseFloat(totalPending(bill).toFixed(0)), 0), "($".concat((totalPending(bill) * ((_b = parseFloat(earnTokenPrice(bill.bond))) !== null && _b !== void 0 ? _b : 0)).toFixed(2), ")")] })), _jsx(Flex, __assign({ className: "column column-term" }, { children: "".concat(vestingTimeRemaining(bill).days, "d, ").concat(vestingTimeRemaining(bill).hours, "h, ").concat(vestingTimeRemaining(bill).minutes, "m") })), _jsx(Flex, __assign({ className: "column column-claimall" }, { children: _jsx(Flex, __assign({ className: "column-claimall button" }, { children: _jsx(Button, __assign({ disabled: !account, sx: {
+                            var _a, _b, _c, _d;
+                            return (_jsxs(Flex, __assign({ className: "container bondrow-container", onClick: function () { return rowClick(bill.bond); } }, { children: [_jsx(Flex, __assign({ className: "column column-tokens" }, { children: _jsxs(Flex, __assign({ className: "column column-tokeninfoname" }, { children: [_jsx(TokenInfoAndName, { bill: bill.bond, vestEnds: "Ends in ".concat(getPendingVesting(bill.lastBlockTimestamp, bill.vesting)) }), (_a = bill.nftData) === null || _a === void 0 ? void 0 : _a.data.image.toString(), (_b = bill.nftData) === null || _b === void 0 ? void 0 : _b.data.attributes.toString()] })) })), _jsxs(Flex, __assign({ className: "column column-bondinfo" }, { children: [_jsxs(Flex, __assign({ className: "column column-claimable" }, { children: [formatNumberSI(parseFloat(claimable(bill).toFixed(3)), 0), "($".concat((claimable(bill) * ((_c = parseFloat(earnTokenPrice(bill.bond))) !== null && _c !== void 0 ? _c : 0)).toFixed(2), ")")] })), _jsxs(Flex, __assign({ className: "column column-pending" }, { children: [formatNumberSI(parseFloat(totalPending(bill).toFixed(0)), 0), "($".concat((totalPending(bill) * ((_d = parseFloat(earnTokenPrice(bill.bond))) !== null && _d !== void 0 ? _d : 0)).toFixed(2), ")")] })), _jsx(Flex, __assign({ className: "column column-term" }, { children: "".concat(vestingTimeRemaining(bill).days, "d, ").concat(vestingTimeRemaining(bill).hours, "h, ").concat(vestingTimeRemaining(bill).minutes, "m") })), _jsx(Flex, __assign({ className: "column column-claimall" }, { children: _jsx(Flex, __assign({ className: "column-claimall button" }, { children: _jsx(Button, __assign({ disabled: !account, sx: {
                                                             height: ['36px', '36px', '36px', '26px'],
                                                             lineHeight: '12px',
                                                             fontSize: '14px',

package/dist/components/YourBonds/fetchBillsUser.d.ts

@@ -1,5 +1,5 @@
-import { ChainId } from '@ape.swap/apeswap-lists';
-import { Bills, CleanedBondsState, UserBill } from '../../types/bonds';
+import { BondsDataResponse, CleanedBondsState, UserBill } from '../../types/bonds';
+import { ChainId } from '../../enum/apeswaplists';
 /**
  * Fetches user-owned bill NFT data for a given set of owned bills data, chain ID, and bills.
  * @param ownedBillsData An array of objects containing the ID, bill NFT address, and contract address of the owned bills.
@@ -11,5 +11,5 @@ export declare const fetchUserOwnedBillNftData: (ownedBillsData: {
     id: string;
     billNftAddress: string;
     contractAddress: string;
-}[], chainId: ChainId, bills: (CleanedBondsState | Bills)[]) => Promise<any[]>;
+}[], chainId: ChainId, bills: BondsDataResponse[]) => Promise<any[]>;
 export declare const fetchUserOwnedBills: (chainId: ChainId, account: string, bills: CleanedBondsState[]) => Promise<UserBill[]>;

package/dist/components/YourBonds/fetchBillsUser.js

@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import billAbi from '../../config/abi/bond.json';
 import BigNumber from 'bignumber.js';
 import { getBillNftBatchData } from './getBillNftData';
-import { BillVersion } from '@ape.swap/apeswap-lists';
 import multicall from '../../utils/multicall';
+import { BillVersion } from '../../enum/apeswaplists';
 /**
  * Fetches user-owned bill NFT data for a given set of owned bills data, chain ID, and bills.
  * @param ownedBillsData An array of objects containing the ID, bill NFT address, and contract address of the owned bills.
@@ -55,10 +55,10 @@ export var fetchUserOwnedBillNftData = function (ownedBillsData, chainId, bills)
                 billsFetched = [];
                 // Loop through each owned bill and check if it exists in the bills array
                 ownedBillsData === null || ownedBillsData === void 0 ? void 0 : ownedBillsData.forEach(function (_a) {
-                    var _b, _c;
                     var id = _a.id, billNftAddress = _a.billNftAddress, contractAddress = _a.contractAddress;
-                    var bill = (_c = (_b = bills
-                        .find(function (b) { return b.contractAddress[chainId] === contractAddress; })) === null || _b === void 0 ? void 0 : _b.userOwnedBillsNftData) === null || _c === void 0 ? void 0 : _c.find(function (u) { return +u.tokenId === +id; });
+                    var bill = bills
+                        .find(function (b) { return b.billAddress[chainId] === contractAddress; });
+                    // ?.userOwnedBillsNftData?.find((u) => +u.tokenId === +id)
                     // If the bill exists in the bills array, add it to the billsFetched array
                     if (bill) {
                         billsFetched.push({ id: id, data: bill });

package/dist/config/abi/erc20.json

@@ -0,0 +1,117 @@
+[
+    {
+        "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"
+    }
+]