@gearbox-protocol/sdk 3.0.0-next.116 → 3.0.0-next.117

package/lib/apy/yearnAPY.js

@@ -7,18 +7,17 @@ exports.getYearnAPY = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
 const getUrl = (chainId) => `https://ydaemon.yearn.finance/vaults/all?chainids=${chainId}&limit=2500`;
-const transformSymbol = (s) => s.replaceAll("_", "-").toLowerCase();
 async function getYearnAPY(network) {
     try {
         const chainId = sdk_gov_1.CHAINS[network];
         const { data } = await axios_1.default.get(getUrl(chainId));
-        const dataBySymbol = data.reduce((acc, d) => {
-            acc[d.symbol.toLowerCase()] = d;
+        const dataByAddress = data.reduce((acc, d) => {
+            acc[d.address.toLowerCase()] = d;
             return acc;
         }, {});
         const yearnAPY = sdk_gov_1.TypedObjectUtils.entries(sdk_gov_1.yearnTokens).reduce((acc, [yearnSymbol]) => {
-            const symbol = transformSymbol(yearnSymbol);
-            const data = dataBySymbol[symbol];
+            const address = (sdk_gov_1.tokenDataByNetwork[network]?.[yearnSymbol] || "").toLowerCase();
+            const data = dataByAddress[address];
             const { apr: apy } = data || {};
             const { netAPR } = apy || {};
             const netApy = netAPR || 0;

package/lib/core/creditAccount.d.ts

@@ -107,6 +107,7 @@ export declare class CreditAccountData {
     constructor(payload: CreditAccountDataPayload);
     setDeleteInProgress(d: boolean): void;
     static sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;
+    static sortAssets(balances: Array<Asset>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Asset[];
     static tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
     static amountAbcComparator(t1: bigint, t2: bigint): 1 | -1;
     isForbidden(token: string): boolean;

package/lib/core/creditAccount.js

@@ -118,6 +118,24 @@ class CreditAccountData {
             return CreditAccountData.amountAbcComparator(totalPrice1, totalPrice2);
         });
     }
+    static sortAssets(balances, prices, tokens) {
+        return balances.sort(({ token: addr1, balance: amount1 }, { token: addr2, balance: amount2 }) => {
+            const addr1Lc = addr1.toLowerCase();
+            const addr2Lc = addr2.toLowerCase();
+            const token1 = tokens[addr1Lc];
+            const token2 = tokens[addr2Lc];
+            const price1 = prices[addr1Lc] || sdk_gov_1.PRICE_DECIMALS;
+            const price2 = prices[addr2Lc] || sdk_gov_1.PRICE_DECIMALS;
+            const totalPrice1 = price_1.PriceUtils.calcTotalPrice(price1, amount1, token1?.decimals);
+            const totalPrice2 = price_1.PriceUtils.calcTotalPrice(price2, amount2, token2?.decimals);
+            if (totalPrice1 === totalPrice2) {
+                return amount1 === amount2
+                    ? CreditAccountData.tokensAbcComparator(token1, token2)
+                    : CreditAccountData.amountAbcComparator(amount1, amount2);
+            }
+            return CreditAccountData.amountAbcComparator(totalPrice1, totalPrice2);
+        });
+    }
     static tokensAbcComparator(t1, t2) {
         const { symbol: symbol1 = "" } = t1 || {};
         const { symbol: symbol2 = "" } = t2 || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.116",
+  "version": "3.0.0-next.117",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",