@gearbox-protocol/sdk 3.0.0-next.259 → 3.0.0-next.260

package/lib/core/assets.d.ts

@@ -25,9 +25,14 @@ export declare class AssetUtils {
     static memoWrap: (unwrappedAddress: Address, wrappedAddress: Address, prices: Record<Address, bigint>, tokensList: Record<Address, TokenData>) => (assets: Array<Asset>) => WrapResult;
     /**
      * Sums the the second assets list into the first assets list
-     * Balances cant be negative; Creates new assets.
+     * Balances cant be negative; creates new assets.
      */
     static sumAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A | B>;
+    /**
+     * Sums the the second assets list into the first assets list
+     * Balances cant be negative; doesn't create new assets.
+     */
+    static addBalances<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A | B>;
     /**
      * Subtracts the the second assets list from the first assets list
      * Balances cant be negative; doesn't create new assets.

package/lib/core/assets.js

@@ -65,7 +65,7 @@ class AssetUtils {
     };
     /**
      * Sums the the second assets list into the first assets list
-     * Balances cant be negative; Creates new assets.
+     * Balances cant be negative; creates new assets.
      */
     static sumAssets(a, b) {
         const aRecord = AssetUtils.constructAssetRecord(a);
@@ -82,6 +82,19 @@ class AssetUtils {
         }, aRecord);
         return Object.values(resRecord);
     }
+    /**
+     * Sums the the second assets list into the first assets list
+     * Balances cant be negative; doesn't create new assets.
+     */
+    static addBalances(a, b) {
+        const bRecord = AssetUtils.constructAssetRecord(b);
+        return a.map(asset => {
+            const bAsset = bRecord[asset.token];
+            const { balance: bAmount = 0n } = bAsset || {};
+            const amountSum = (0, math_1.nonNegativeBn)(asset.balance) + (0, math_1.nonNegativeBn)(bAmount);
+            return { ...asset, balance: (0, math_1.nonNegativeBn)(amountSum) };
+        });
+    }
     /**
      * Subtracts the the second assets list from the first assets list
      * Balances cant be negative; doesn't create new assets.

package/lib/gearboxRewards/apy.d.ts

@@ -1,4 +1,4 @@
-import { SupportedToken } from "@gearbox-protocol/sdk-gov";
+import { PartialRecord, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { Address } from "viem";
 import { Asset } from "../core/assets";
 import { PoolData } from "../core/pool";
@@ -19,8 +19,9 @@ interface CalculateV3PoolLmAPYProps {
 }
 export interface ExtraRewardApy {
     token: Address;
-    rewardInfo: FarmInfo;
+    balance: bigint | null;
     apy: number;
+    rewardInfo: FarmInfo;
 }
 interface GetPoolExtraAPY_V3Props {
     stakedDieselToken: Address | undefined;
@@ -35,7 +36,7 @@ interface GetPoolExtraAPY_V3Props {
 interface GetCAExtraAPYProps {
     assets: Array<Asset>;
     supply: Record<Address, bigint> | Record<Address, Asset>;
-    rewardInfo: Record<Address, Array<FarmInfo>>;
+    rewardInfo: PartialRecord<SupportedToken, Array<FarmInfo>>;
     currentTimestamp: number;
     prices: Record<Address, bigint>;
     tokensList: Record<Address, TokenData>;

package/lib/gearboxRewards/apy.js

@@ -43,7 +43,12 @@ class GearboxRewardsApy {
                 decimals: rewardDecimals,
             },
         }) / Number(sdk_gov_1.PERCENTAGE_FACTOR);
-        return { token: stakedDieselToken, rewardInfo: rewardPoolsInfo, apy: r };
+        return {
+            token: stakedDieselToken,
+            balance: null,
+            apy: r,
+            rewardInfo: rewardPoolsInfo,
+        };
     }
     static calculateAPY_V3({ info, supply, reward, currentTimestamp, }) {
         const finished = info.finished <= currentTimestamp;
@@ -64,12 +69,13 @@ class GearboxRewardsApy {
     static getCAExtraAPY_V3({ rewardInfo, assets, ...restProps }) {
         const extra = assets.reduce((acc, asset) => {
             const { token } = asset;
-            const info = rewardInfo[token];
+            const { symbol } = restProps.tokensList[token] || {};
+            const info = rewardInfo[symbol || ""];
             if (!info)
                 return acc;
             const extra = info.map(inf => this.getCASingleExtraAPY_V3({
                 ...restProps,
-                token,
+                asset,
                 rewardInfo: inf,
             }));
             acc.push(...extra);
@@ -77,7 +83,8 @@ class GearboxRewardsApy {
         }, []);
         return extra;
     }
-    static getCASingleExtraAPY_V3({ token, prices, rewardInfo, supply, tokensList, currentTokenData, currentTimestamp, }) {
+    static getCASingleExtraAPY_V3({ asset, prices, rewardInfo, supply, tokensList, currentTokenData, currentTimestamp, }) {
+        const { token, balance } = asset;
         const safeSupply = supply[token] ?? 0n;
         const { decimals: tokenDecimals = 18 } = tokensList[token] || {};
         const tokenPrice = prices[token] ?? 0n;
@@ -97,7 +104,7 @@ class GearboxRewardsApy {
                 decimals: rewardDecimals,
             },
         }) / Number(sdk_gov_1.PERCENTAGE_FACTOR);
-        return { token: token, rewardInfo: rewardInfo, apy: r };
+        return { token, balance, rewardInfo, apy: r };
     }
 }
 exports.GearboxRewardsApy = GearboxRewardsApy;

package/package.json

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