@gearbox-protocol/sdk 3.0.0-next.168 → 3.0.0-next.169

package/lib/apy/curveAPY.d.ts

@@ -55,9 +55,6 @@ export type CurveAPYResult = PartialRecord<CurveAPYTokens, CurveAPY>;
 export declare function getCurveAPY(network: NetworkType): Promise<{
     curveAPY: CurveAPYResult;
     gearAPY: CurveAPY;
-} | {
-    curveAPY?: undefined;
-    gearAPY?: undefined;
 }>;
 export declare function getCurveGearPool(): Promise<CurvePoolData | undefined>;
 export {};

package/lib/apy/curveAPY.js

@@ -24,54 +24,48 @@ const getFactoryTriCryptoURL = (n) => `https://api.curve.fi/api/getPools/${CURVE
 const getFactoryCrvUsdURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/factory-crvusd`;
 const getFactoryStableNgURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/factory-stable-ng`;
 async function getCurveAPY(network) {
-    try {
-        const currentTokens = sdk_gov_1.tokenDataByNetwork[network];
-        const { mainnetVolumes, mainnetFactoryPools, volumes, pools } = await getCurvePools(network);
-        const volumeByAddress = Object.fromEntries(volumes.data.data.pools.map(v => [v.address.toLowerCase(), v]));
-        const poolDataByAddress = Object.fromEntries(pools
-            .map(poolCategory => {
-            const { poolData = [] } = poolCategory?.data?.data || {};
-            return poolData.map((p) => [
-                p.lpTokenAddress.toLowerCase(),
-                p,
-            ]);
-        })
-            .flat(1));
-        const curveAPY = sdk_gov_1.TypedObjectUtils.entries(sdk_gov_1.curveTokens).reduce((acc, [curveSymbol]) => {
-            const address = (currentTokens?.[curveSymbol] || "").toLowerCase();
-            const pool = poolDataByAddress[address];
-            const volume = volumeByAddress[(pool?.address || "").toLowerCase()];
-            const baseAPY = volume?.latestDailyApyPcent || 0;
-            const maxCrv = Math.max(...(pool?.gaugeCrvApy || []), 0);
-            const extraRewards = (pool?.gaugeRewards || []).map(({ apy = 0, symbol }) => [
-                symbol.toLowerCase(),
-                curveAPYToBn(apy),
-            ]);
-            acc[curveSymbol] = {
-                base: curveAPYToBn(baseAPY),
-                crv: curveAPYToBn(maxCrv),
-                gauge: extraRewards,
-            };
-            return acc;
-        }, {});
-        const poolFactoryByAddress = Object.fromEntries((mainnetFactoryPools?.data?.data?.poolData || []).map((p) => [p.lpTokenAddress.toLowerCase(), p]));
-        const mainnetVolumeByAddress = Object.fromEntries(mainnetVolumes.data.data.pools.map(v => [v.address.toLowerCase(), v]));
-        const gearPool = poolFactoryByAddress[GEAR_POOL];
-        const gearVolume = mainnetVolumeByAddress[(gearPool?.address || "").toLowerCase()];
-        const gearAPY = {
-            base: curveAPYToBn(gearVolume?.latestDailyApyPcent || 0),
-            crv: curveAPYToBn(Math.max(...(gearPool?.gaugeCrvApy || []), 0)),
-            gauge: (gearPool?.gaugeRewards || []).map(({ apy = 0, symbol }) => [
-                symbol.toLowerCase(),
-                curveAPYToBn(apy),
-            ]),
+    const currentTokens = sdk_gov_1.tokenDataByNetwork[network];
+    const { mainnetVolumes, mainnetFactoryPools, volumes, pools } = await getCurvePools(network);
+    const volumeByAddress = Object.fromEntries(volumes.data.data.pools.map(v => [v.address.toLowerCase(), v]));
+    const poolDataByAddress = Object.fromEntries(pools
+        .map(poolCategory => {
+        const { poolData = [] } = poolCategory?.data?.data || {};
+        return poolData.map((p) => [
+            p.lpTokenAddress.toLowerCase(),
+            p,
+        ]);
+    })
+        .flat(1));
+    const curveAPY = sdk_gov_1.TypedObjectUtils.entries(sdk_gov_1.curveTokens).reduce((acc, [curveSymbol]) => {
+        const address = (currentTokens?.[curveSymbol] || "").toLowerCase();
+        const pool = poolDataByAddress[address];
+        const volume = volumeByAddress[(pool?.address || "").toLowerCase()];
+        const baseAPY = volume?.latestDailyApyPcent || 0;
+        const maxCrv = Math.max(...(pool?.gaugeCrvApy || []), 0);
+        const extraRewards = (pool?.gaugeRewards || []).map(({ apy = 0, symbol }) => [
+            symbol.toLowerCase(),
+            curveAPYToBn(apy),
+        ]);
+        acc[curveSymbol] = {
+            base: curveAPYToBn(baseAPY),
+            crv: curveAPYToBn(maxCrv),
+            gauge: extraRewards,
         };
-        return { curveAPY, gearAPY };
-    }
-    catch (e) {
-        console.error(e);
-        return {};
-    }
+        return acc;
+    }, {});
+    const poolFactoryByAddress = Object.fromEntries((mainnetFactoryPools?.data?.data?.poolData || []).map((p) => [p.lpTokenAddress.toLowerCase(), p]));
+    const mainnetVolumeByAddress = Object.fromEntries(mainnetVolumes.data.data.pools.map(v => [v.address.toLowerCase(), v]));
+    const gearPool = poolFactoryByAddress[GEAR_POOL];
+    const gearVolume = mainnetVolumeByAddress[(gearPool?.address || "").toLowerCase()];
+    const gearAPY = {
+        base: curveAPYToBn(gearVolume?.latestDailyApyPcent || 0),
+        crv: curveAPYToBn(Math.max(...(gearPool?.gaugeCrvApy || []), 0)),
+        gauge: (gearPool?.gaugeRewards || []).map(({ apy = 0, symbol }) => [
+            symbol.toLowerCase(),
+            curveAPYToBn(apy),
+        ]),
+    };
+    return { curveAPY, gearAPY };
 }
 exports.getCurveAPY = getCurveAPY;
 async function getCurvePools(network) {

package/lib/apy/defiLamaAPY.js

@@ -8,26 +8,20 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
 const LAMA_URL = "https://charts-server.fly.dev/api/defillama?ids=";
 async function getDefiLamaAPY(networkType) {
-    try {
-        const currentNormal = NORMAL_TO_LAMA[networkType];
-        const idList = Object.values(currentNormal);
-        if (idList.length === 0)
-            return {};
-        const res = await axios_1.default.get(`${LAMA_URL}${idList.join(",")}`);
-        const itemsRecord = res.data.data.reduce((acc, item) => {
-            acc[item.pool] = item;
-            return acc;
-        }, {});
-        const allAPY = sdk_gov_1.TypedObjectUtils.fromEntries(sdk_gov_1.TypedObjectUtils.entries(currentNormal).map(([symbol, pool]) => {
-            const { apy = 0 } = itemsRecord[pool] || {};
-            return [symbol, Math.round(apy * Number(sdk_gov_1.PERCENTAGE_FACTOR))];
-        }));
-        return allAPY;
-    }
-    catch (e) {
-        console.error(e);
+    const currentNormal = NORMAL_TO_LAMA[networkType];
+    const idList = Object.values(currentNormal);
+    if (idList.length === 0)
         return {};
-    }
+    const res = await axios_1.default.get(`${LAMA_URL}${idList.join(",")}`);
+    const itemsRecord = res.data.data.reduce((acc, item) => {
+        acc[item.pool] = item;
+        return acc;
+    }, {});
+    const allAPY = sdk_gov_1.TypedObjectUtils.fromEntries(sdk_gov_1.TypedObjectUtils.entries(currentNormal).map(([symbol, pool]) => {
+        const { apy = 0 } = itemsRecord[pool] || {};
+        return [symbol, Math.round(apy * Number(sdk_gov_1.PERCENTAGE_FACTOR))];
+    }));
+    return allAPY;
 }
 exports.getDefiLamaAPY = getDefiLamaAPY;
 const NORMAL_TO_LAMA = {

package/lib/apy/lidoAPY.js

@@ -8,18 +8,12 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
 const LIDO_URL = "https://eth-api.lido.fi/v1/protocol/steth/apr/sma";
 async function getLidoAPY() {
-    try {
-        const res = await axios_1.default.get(LIDO_URL);
-        const { smaApr = 0 } = res?.data?.data || {};
-        const r = Math.round(smaApr * Number(sdk_gov_1.PERCENTAGE_FACTOR));
-        return {
-            STETH: r,
-            wstETH: r,
-        };
-    }
-    catch (e) {
-        console.error(e);
-        return {};
-    }
+    const res = await axios_1.default.get(LIDO_URL);
+    const { smaApr = 0 } = res?.data?.data || {};
+    const r = Math.round(smaApr * Number(sdk_gov_1.PERCENTAGE_FACTOR));
+    return {
+        STETH: r,
+        wstETH: r,
+    };
 }
 exports.getLidoAPY = getLidoAPY;

package/lib/gearboxRewards/api.js

@@ -101,12 +101,15 @@ class GearboxRewardsApi {
         if (!airdropDistributorAddress)
             return { rewards: [], totalAvailable: 0n };
         const distributor = types_1.IAirdropDistributor__factory.connect(airdropDistributorAddress, provider);
-        const [claimed, merkleData] = await Promise.all([
+        const [claimedResp, merkleDataResp] = await Promise.all([
             this.getClaimed({ distributor, account }),
             this.getMerkle(provider, airdropDistributorAddress, network, account),
         ]);
-        const amountOnContract = this.getAmountOnContract({ account, merkleData });
-        const diff = amountOnContract - claimed;
+        const amountOnContract = this.getAmountOnContract({
+            account,
+            merkleData: merkleDataResp,
+        });
+        const diff = amountOnContract - claimedResp;
         const availableToClaimV2 = math_1.BigIntMath.max(0n, diff);
         const rewards = [
             {
@@ -207,14 +210,8 @@ class GearboxRewardsApi {
         const root = await distributor.merkleRoot();
         const path = `${network}_${root.slice(2)}/${account.slice(2, 4)}`;
         const url = `https://am.gearbox.finance/${path.toLowerCase()}.json`;
-        try {
-            const result = await axios_1.default.get(url);
-            return result.data;
-        }
-        catch (error) {
-            console.error("core/gearboxRewards/lmRewards/getMerkle", error);
-            return undefined;
-        }
+        const result = await axios_1.default.get(url);
+        return result.data;
     }
     static async getClaimed({ distributor, account, }) {
         const claimedRewardsResponse = await distributor.queryFilter(distributor.filters.Claimed(account, undefined, false));

package/lib/gearboxRewards/extraAPY.d.ts

@@ -22,9 +22,7 @@ interface PoolPointsInfo {
     name: string;
 }
 export declare class GearboxRewardsExtraApy {
-    static getTotalTokensOnProtocol({ currentTokenData, chainId, tokensList, network, }: GetTotalTokensOnProtocolProps): Promise<{
-        [k: string]: Asset;
-    }>;
+    static getTotalTokensOnProtocol({ currentTokenData, chainId, tokensList, network, }: GetTotalTokensOnProtocolProps): Promise<[SupportedToken, PromiseSettledResult<Asset>][]>;
     private static getTokenTotal;
     static getPointsByPool({ totalTokenBalances, pools, tokensList, currentTokenData, network, }: GetPointsByPoolProps): {
         [k: string]: Asset[];

package/lib/gearboxRewards/extraAPY.js

@@ -56,25 +56,22 @@ const REWARD_PERIOD = 30 * 24 * 60 * 60;
 class GearboxRewardsExtraApy {
     static async getTotalTokensOnProtocol({ currentTokenData, chainId, tokensList, network, }) {
         const currTokens = TOKENS[network];
-        const res = await Promise.all(currTokens.map(s => this.getTokenTotal(currentTokenData[s], chainId, tokensList)));
-        return Object.fromEntries(res.filter(r => r).map(r => [r.token, r]));
+        const res = await Promise.allSettled(currTokens.map(s => this.getTokenTotal(currentTokenData[s], chainId, tokensList)));
+        return res.map((r, i) => [
+            currTokens[i],
+            r,
+        ]);
     }
     static async getTokenTotal(token, chainId, tokensList) {
-        try {
-            const url = endpoint_1.ChartsApi.getUrl("getBalanceAt", chainId, {
-                params: {
-                    asset: token,
-                },
-            });
-            const result = await axios_1.default.get(url);
-            const balance = result.data.result.reduce((sum, r) => r.effective_balance + sum, 0);
-            const { decimals = 18 } = tokensList[token] || {};
-            return { token, balance: (0, formatter_1.toBN)(String(balance), decimals) };
-        }
-        catch (error) {
-            console.error("core/apy/extraAPYApi/getTokenTotal", error);
-            return undefined;
-        }
+        const url = endpoint_1.ChartsApi.getUrl("getBalanceAt", chainId, {
+            params: {
+                asset: token,
+            },
+        });
+        const result = await axios_1.default.get(url);
+        const balance = result.data.result.reduce((sum, r) => r.effective_balance + sum, 0);
+        const { decimals = 18 } = tokensList[token] || {};
+        return { token, balance: (0, formatter_1.toBN)(String(balance), decimals) };
     }
     static getPointsByPool({ totalTokenBalances, pools, tokensList, currentTokenData, network, }) {
         const r = Object.fromEntries(pools.map(p => {

package/package.json

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