@gearbox-protocol/sdk 3.0.0-next.99 → 3.0.0-prevfour.10

package/lib/core/endpoint.js

@@ -1,20 +1,118 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChartsApi = exports.GEARBOX_RPC_CHAIN_ID = void 0;
+exports.URLApi = exports.GearboxBackendApi = exports.TESTNET_CHAINS = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-exports.GEARBOX_RPC_CHAIN_ID = 7878;
+exports.TESTNET_CHAINS = {
+    Mainnet: 7878,
+    Optimism: 7879,
+    Arbitrum: 7880,
+    Base: 7881,
+};
 const CHARTS_BACKEND_ADDRESSES = {
-    [sdk_gov_1.CHAINS.Mainnet]: "https://mainnet.gearbox.foundation",
-    [sdk_gov_1.CHAINS.Local]: "https://mainnet.gearbox.foundation",
-    [exports.GEARBOX_RPC_CHAIN_ID]: "https://testnet.gearbox.foundation",
+    [sdk_gov_1.CHAINS.Mainnet]: "https://charts-server.fly.dev",
+    [sdk_gov_1.CHAINS.Arbitrum]: "https://charts-server.fly.dev",
+    [sdk_gov_1.CHAINS.Optimism]: "https://charts-server.fly.dev",
+    [sdk_gov_1.CHAINS.Base]: "https://charts-server.fly.dev",
+    [sdk_gov_1.CHAINS.Local]: "https://charts-server.fly.dev",
+    [exports.TESTNET_CHAINS.Mainnet]: "https://testnet.gearbox.foundation",
+    [exports.TESTNET_CHAINS.Arbitrum]: "https://arbtest.gearbox.foundation",
+    [exports.TESTNET_CHAINS.Optimism]: "https://opttest.gearbox.foundation",
+    // !& Base
+};
+const LAMA_URL = "https://charts-server.fly.dev/api/defillama?ids=";
+const STATIC_TOKEN = "https://static.gearbox.fi/tokens/";
+const LEADERBOARD_APIS = {
+    [sdk_gov_1.CHAINS.Mainnet]: "https://gpointbot.fly.dev",
+    [sdk_gov_1.CHAINS.Optimism]: "https://gpointbot.fly.dev",
+    [sdk_gov_1.CHAINS.Arbitrum]: "https://gpointbot.fly.dev",
+    [sdk_gov_1.CHAINS.Local]: "https://gpointbot.fly.dev",
+    [exports.TESTNET_CHAINS.Mainnet]: "https://testnet.gearbox.foundation/gpointbot",
+    [exports.TESTNET_CHAINS.Optimism]: "https://testnet.gearbox.foundation/gpointbot",
+    [exports.TESTNET_CHAINS.Arbitrum]: "https://testnet.gearbox.foundation/gpointbot",
+};
+const TRADING_GRAPHS_API = {
+    [sdk_gov_1.CHAINS.Mainnet]: "https://trading-price.fly.dev/api/tradingview",
+    [sdk_gov_1.CHAINS.Optimism]: "https://trading-price.fly.dev/api/tradingview",
+    [sdk_gov_1.CHAINS.Arbitrum]: "https://trading-price.fly.dev/api/tradingview",
+    [sdk_gov_1.CHAINS.Local]: "https://trading-price.fly.dev/api/tradingview",
+    [exports.TESTNET_CHAINS.Mainnet]: "https://testnet.gearbox.foundation/api/tradingview",
+    [exports.TESTNET_CHAINS.Optimism]: "https://testnet.gearbox.foundation/api/tradingview",
+    [exports.TESTNET_CHAINS.Arbitrum]: "https://testnet.gearbox.foundation/api/tradingview",
+};
+const TRADING_PRICES_API_WS = {
+    [sdk_gov_1.CHAINS.Mainnet]: "wss://trading-price.fly.dev/api/tradingview/ws",
+    [sdk_gov_1.CHAINS.Optimism]: "wss://trading-price.fly.dev/api/tradingview/ws",
+    [sdk_gov_1.CHAINS.Arbitrum]: "wss://trading-price.fly.dev/api/tradingview/ws",
+    [sdk_gov_1.CHAINS.Local]: "wss://trading-price.fly.dev/api/tradingview/ws",
+    [exports.TESTNET_CHAINS.Mainnet]: "wss://testnet.gearbox.foundation/api/tradingview/ws",
+    [exports.TESTNET_CHAINS.Optimism]: "wss://testnet.gearbox.foundation/api/tradingview/ws",
+    [exports.TESTNET_CHAINS.Arbitrum]: "wss://testnet.gearbox.foundation/api/tradingview/ws",
 };
-class ChartsApi {
-    static getUrl = (url, chainId, options, priceSource) => [
-        CHARTS_BACKEND_ADDRESSES[chainId],
-        "api",
-        ...(priceSource ? [priceSource] : []),
-        this.getRelativeUrl(url, options),
-    ].join("/");
+const TRADING_SESSIONS_API_WS = {
+    [sdk_gov_1.CHAINS.Mainnet]: "wss://gearbox-ws.fly.dev/ws",
+    [sdk_gov_1.CHAINS.Optimism]: "wss://optimism.gearbox.foundation/gearbox-ws/ws",
+    [sdk_gov_1.CHAINS.Arbitrum]: "wss://arbitrum.gearbox.foundation/gearbox-ws/ws",
+    [sdk_gov_1.CHAINS.Local]: "wss://gearbox-ws.fly.dev/ws",
+    [exports.TESTNET_CHAINS.Mainnet]: "wss://testnet.gearbox.foundation/gearbox-ws/ws",
+    [exports.TESTNET_CHAINS.Optimism]: "wss://opttest.gearbox.foundation/gearbox-ws/ws",
+    [exports.TESTNET_CHAINS.Arbitrum]: "wss://arbtest.gearbox.foundation/gearbox-ws/ws",
+};
+const TRADING_SESSIONS_API = {
+    [sdk_gov_1.CHAINS.Mainnet]: "https://gearbox-ws.fly.dev",
+    [sdk_gov_1.CHAINS.Optimism]: "https://optimism.gearbox.foundation/gearbox-ws",
+    [sdk_gov_1.CHAINS.Arbitrum]: "https://arbitrum.gearbox.foundation/gearbox-ws",
+    [sdk_gov_1.CHAINS.Local]: "https://gearbox-ws.fly.dev",
+    [exports.TESTNET_CHAINS.Mainnet]: "https://testnet.gearbox.foundation/gearbox-ws",
+    [exports.TESTNET_CHAINS.Optimism]: "https://opttest.gearbox.foundation/gearbox-ws",
+    [exports.TESTNET_CHAINS.Arbitrum]: "https://arbtest.gearbox.foundation/gearbox-ws",
+};
+const REFERRAL_API = "https://referral-gen.fly.dev/generate";
+class GearboxBackendApi {
+    static getChartsUrl = (url, chainId, options = { params: {} }, priceSource) => {
+        const domain = CHARTS_BACKEND_ADDRESSES[chainId];
+        const priceSourceArr = priceSource ? [priceSource] : [];
+        const isMain = (0, sdk_gov_1.isSupportedNetwork)(chainId);
+        const isLocal = sdk_gov_1.CHAINS.Local === chainId;
+        const relativePath = URLApi.getRelativeUrl(url, isMain
+            ? {
+                ...options,
+                params: { ...options.params, chainId: isLocal ? 1 : chainId },
+            }
+            : options);
+        return [domain, "api", ...priceSourceArr, relativePath].join("/");
+    };
+    static getLlamaAPYUrl = (idList) => {
+        return `${LAMA_URL}${idList.join(",")}`;
+    };
+    static getStaticTokenUrl = () => STATIC_TOKEN;
+    static getRewardsMerkleUrl = (network, root, account) => {
+        const path = `${network}_${root.slice(2)}/${account.slice(2, 4)}`;
+        const url = `https://am.gearbox.finance/${path.toLowerCase()}.json`;
+        return url;
+    };
+    static getNFTMerkleUrl = (network, root) => {
+        const url = `https://dm.gearbox.finance/${network.toLowerCase()}_${root}.json`;
+        return url;
+    };
+    static getLeaderboardUrl = (url, chainId) => {
+        return `${LEADERBOARD_APIS[chainId]}${url}`;
+    };
+    static getTradingGraphsUrl = (url, chainId) => {
+        return `${TRADING_GRAPHS_API[chainId]}${url}`;
+    };
+    static getTradingPricesWSUrl = (url, chainId) => {
+        return `${TRADING_PRICES_API_WS[chainId]}${url}`;
+    };
+    static getTradingSessionsWSUrl = (url, chainId) => {
+        return `${TRADING_SESSIONS_API_WS[chainId]}${url}`;
+    };
+    static getTradingSessionsUrl = (url, chainId) => {
+        return `${TRADING_SESSIONS_API[chainId]}${url}`;
+    };
+    static getReferralUrl = () => REFERRAL_API;
+}
+exports.GearboxBackendApi = GearboxBackendApi;
+class URLApi {
     static getRelativeUrl = (url, options) => {
         const { params = {} } = options || {};
         const paramsString = Object.entries(params)
@@ -23,4 +121,4 @@ class ChartsApi {
         return [url, ...(paramsString ? [paramsString] : [])].join("?");
     };
 }
-exports.ChartsApi = ChartsApi;
+exports.URLApi = URLApi;

package/lib/core/eventOrTx.d.ts

@@ -1,3 +1,4 @@
+import { Address } from "viem";
 import { TokenData } from "../tokens/tokenData";
 import type { TxSerialized } from "./transactions";
 export interface Display {
@@ -6,13 +7,13 @@ export interface Display {
 export type TxStatus = "pending" | "success" | "reverted";
 export interface EventOrTxProps {
     block: number;
-    txHash: string;
+    txHash: Address;
     txStatus: TxStatus;
     timestamp: number;
 }
 export declare abstract class EventOrTx implements Display {
     block: number;
-    readonly txHash: string;
+    readonly txHash: Address;
     readonly timestamp: number;
     protected _txStatus: TxStatus;
     constructor({ block, txHash, txStatus, timestamp }: EventOrTxProps);
@@ -28,12 +29,10 @@ export declare abstract class EVMEvent extends EventOrTx {
     logId?: number;
     constructor(opts: EVMEventProps);
 }
-type OptionalFields = "block" | "txStatus";
-export type EVMTxProps = Omit<EventOrTxProps, OptionalFields> & Partial<Pick<EventOrTxProps, OptionalFields>>;
+export type EVMTxProps = Omit<EventOrTxProps, "block" | "txStatus"> & Partial<Pick<EventOrTxProps, "block" | "txStatus">>;
 export declare abstract class EVMTx extends EventOrTx {
     constructor({ txHash, block, txStatus, timestamp, }: EVMTxProps);
     abstract serialize(): TxSerialized;
     revert(block: number): void;
     success(block: number): void;
 }
-export {};

package/lib/core/pool.d.ts

@@ -1,29 +1,39 @@
-import { providers, Signer } from "ethers";
-import { CreditManagerDebtParams, QuotaInfo } from "../payload/creditManager";
-import { ChartsPoolDataPayload, LinearModel, PoolDataPayload, PoolZapper, UserPoolPayload } from "../payload/pool";
-import { IPoolService, IPoolV3 } from "../types";
+import { Address, PublicClient } from "viem";
+import { ChartsPoolDataPayload, LinearModel, PoolDataExtraPayload, PoolDataPayload, UserPoolPayload } from "../payload/pool";
 export type PoolType = "universal" | "trade" | "farm";
 export declare class PoolData {
-    readonly address: string;
+    readonly address: Address;
     readonly type: PoolType;
-    readonly underlyingToken: string;
-    readonly dieselToken: string;
-    readonly stakedDieselToken: Array<string>;
+    readonly underlyingToken: Address;
+    readonly dieselToken: Address;
+    readonly stakedDieselToken: Array<Address>;
+    readonly stakedDieselToken_old: Array<Address>;
     readonly isPaused: boolean;
     readonly version: number;
-    readonly poolQuotaKeeper: string;
-    readonly gauge: string;
+    readonly poolQuotaKeeper: Address;
+    readonly gauge: Address;
     readonly name: string;
     readonly symbol: string;
     readonly expectedLiquidity: bigint;
     readonly expectedLiquidityLimit: bigint;
     readonly availableLiquidity: bigint;
     readonly baseInterestIndex: bigint;
+    readonly utilization: number;
     readonly totalBorrowed: bigint;
     readonly totalDebtLimit: bigint;
-    readonly creditManagerDebtParams: Record<string, CreditManagerDebtParams>;
-    readonly quotas: Record<string, QuotaInfo>;
-    readonly zappers: Record<string, Record<string, PoolZapper>>;
+    readonly quotas: Record<Address, {
+        token: Address;
+        rate: bigint;
+        quotaIncreaseFee: bigint;
+        totalQuoted: bigint;
+        limit: bigint;
+        isActive: boolean;
+    }>;
+    readonly zappers: Record<Address, Record<Address, {
+        zapper: Address;
+        tokenIn: Address;
+        tokenOut: Address;
+    }>>;
     readonly totalAssets: bigint;
     readonly totalSupply: bigint;
     readonly supplyAPY7D: number | undefined;
@@ -34,21 +44,20 @@ export declare class PoolData {
     readonly dieselRateRay: bigint;
     readonly withdrawFee: number;
     readonly lastBaseInterestUpdate: bigint;
-    constructor(payload: PoolDataPayload);
-    getPoolContractV1(signer: Signer): IPoolService;
-    getPoolContractV3(signer: Signer): IPoolV3;
-    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
+    constructor(payload: PoolDataPayload, extra: PoolDataExtraPayload);
+    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<bigint>;
     static getPoolType(name: string): PoolType;
+    static calculateUtilization(expected: bigint, available: bigint): number;
 }
 interface CalculateBorrowRateProps {
-    provider: providers.Provider;
+    provider: PublicClient;
     expectedLiquidity: bigint;
     availableLiquidity: bigint;
 }
 export declare class ChartsPoolData {
-    readonly address: string;
-    readonly underlyingToken: string;
-    readonly dieselToken: string;
+    readonly address: Address;
+    readonly underlyingToken: Address;
+    readonly dieselToken: Address;
     readonly type: PoolType;
     readonly version: number;
     readonly name: string;
@@ -66,6 +75,10 @@ export declare class ChartsPoolData {
     readonly borrowAPY: number;
     readonly borrowAPYRay: bigint;
     readonly lmAPY: number;
+    readonly lmRewardAll: Array<{
+        apy: number;
+        token: Address;
+    }>;
     readonly availableLiquidity: bigint;
     readonly availableLiquidityChange: number;
     readonly availableLiquidityInUSD: number;
@@ -101,18 +114,25 @@ export declare class ChartsPoolData {
 }
 export declare class UserPoolData {
     readonly id: string;
-    readonly address: string;
-    readonly dieselToken: string;
-    readonly underlyingToken: string;
+    readonly address: Address;
+    readonly dieselToken: Address;
+    readonly underlyingToken: Address;
     readonly depositAPY: number;
     readonly depositAPYRay: bigint;
-    readonly lmAPY: number;
+    readonly lmRewardAll: Array<{
+        apy: number;
+        token: Address;
+    }>;
     readonly providedLiquidity: bigint;
     readonly providedLiquidityInUSD: number;
     readonly dieselBalance: bigint;
     readonly dieselBalanceInUSD: number;
-    readonly lmRewards: bigint;
-    readonly lmRewardsInUSD: number;
+    readonly userRewards: Array<{
+        token: Address;
+        pool: Address;
+        lmRewards: bigint;
+        lmRewardsInUSD: number;
+    }>;
     readonly pnlInNativeToken: number;
     readonly pnlInUSD: number;
     readonly addedLiq: number;

package/lib/core/pool.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserPoolData = exports.ChartsPoolData = exports.PoolData = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const viem_1 = require("viem");
 const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
 class PoolData {
@@ -10,6 +11,7 @@ class PoolData {
     underlyingToken;
     dieselToken;
     stakedDieselToken;
+    stakedDieselToken_old;
     isPaused;
     version;
     poolQuotaKeeper;
@@ -21,9 +23,9 @@ class PoolData {
     expectedLiquidityLimit;
     availableLiquidity;
     baseInterestIndex;
+    utilization;
     totalBorrowed;
     totalDebtLimit;
-    creditManagerDebtParams;
     quotas;
     zappers;
     totalAssets;
@@ -36,94 +38,83 @@ class PoolData {
     dieselRateRay;
     withdrawFee;
     lastBaseInterestUpdate;
-    constructor(payload) {
+    constructor(payload, extra) {
         this.address = payload.addr.toLowerCase();
         this.type = PoolData.getPoolType(payload.name || "");
         this.underlyingToken = payload.underlying.toLowerCase();
         this.dieselToken = payload.dieselToken.toLowerCase();
-        this.stakedDieselToken = (payload.stakedDieselToken || []).map(t => t.toLowerCase());
+        this.stakedDieselToken = (extra.stakedDieselToken || []).map(t => t.toLowerCase());
+        this.stakedDieselToken_old = (extra.stakedDieselToken_old || []).map(t => t.toLowerCase());
         this.isPaused = payload.isPaused;
-        this.version = payload.version.toNumber();
+        this.version = Number(payload.version);
         this.poolQuotaKeeper = payload.poolQuotaKeeper.toLowerCase();
         this.gauge = payload.gauge.toLowerCase();
         this.name = payload.name;
         this.symbol = payload.symbol;
-        this.expectedLiquidity = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity);
-        this.availableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity);
+        const expected = payload.expectedLiquidity;
+        const available = payload.availableLiquidity;
+        this.expectedLiquidity = expected;
+        this.availableLiquidity = available;
         this.expectedLiquidityLimit =
             this.expectedLiquidity + this.availableLiquidity;
-        this.baseInterestIndex = (0, sdk_gov_1.toBigInt)(payload.baseInterestIndex);
-        this.totalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowed);
-        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit);
-        this.creditManagerDebtParams = Object.fromEntries(payload.creditManagerDebtParams.map(p => {
-            const creditManager = p.creditManager.toLowerCase();
-            return [
-                creditManager,
-                {
-                    creditManager,
-                    borrowed: (0, sdk_gov_1.toBigInt)(p.borrowed),
-                    limit: (0, sdk_gov_1.toBigInt)(p.limit),
-                    availableToBorrow: (0, sdk_gov_1.toBigInt)(p.availableToBorrow),
-                },
-            ];
-        }));
-        this.quotas = Object.fromEntries(payload.quotas.map(q => {
+        this.baseInterestIndex = payload.baseInterestIndex;
+        this.utilization = PoolData.calculateUtilization(expected, available);
+        this.totalBorrowed = payload.totalBorrowed;
+        this.totalDebtLimit = payload.totalDebtLimit;
+        this.quotas = payload.quotas.reduce((acc, q) => {
             const token = q.token.toLowerCase();
-            return [
+            acc[token] = {
                 token,
-                {
-                    token,
-                    rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
-                    quotaIncreaseFee: q.quotaIncreaseFee,
-                    totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
-                    limit: (0, sdk_gov_1.toBigInt)(q.limit),
-                    isActive: q.isActive,
-                },
-            ];
-        }));
+                rate: (0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS,
+                quotaIncreaseFee: (0, sdk_gov_1.toBigInt)(q.quotaIncreaseFee),
+                totalQuoted: q.totalQuoted,
+                limit: q.limit,
+                isActive: q.isActive,
+            };
+            return acc;
+        }, {});
         this.zappers = payload.zappers.reduce((acc, z) => {
             const tokenIn = z.tokenIn.toLowerCase();
             const tokenOut = z.tokenOut.toLowerCase();
+            const zapper = z.zapper.toLowerCase();
             const old = acc[tokenIn] || {};
             return {
                 ...acc,
                 [tokenIn]: {
                     ...old,
-                    [tokenOut]: { tokenIn, tokenOut, zapper: z.zapper.toLowerCase() },
+                    [tokenOut]: { tokenIn, tokenOut, zapper },
                 },
             };
         }, {});
-        this.totalAssets = (0, sdk_gov_1.toBigInt)(payload.totalAssets);
-        this.totalSupply = (0, sdk_gov_1.toBigInt)(payload.totalSupply);
-        this.depositAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.supplyRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.borrowAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseInterestRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.supplyAPY7D = payload.supplyAPY7D;
+        this.totalAssets = payload.totalAssets;
+        this.totalSupply = payload.totalSupply;
+        this.depositAPY = (0, formatter_1.rayToNumber)(payload.supplyRate * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.borrowAPY = (0, formatter_1.rayToNumber)(payload.baseInterestRate * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.supplyAPY7D = extra.supplyAPY7D;
         this.interestModel = {
             interestModel: payload.lirm.interestModel.toLowerCase(),
-            U_1: payload.lirm.U_1,
-            U_2: payload.lirm.U_2,
-            R_base: payload.lirm.R_base,
-            R_slope1: payload.lirm.R_slope1,
-            R_slope2: payload.lirm.R_slope2,
-            R_slope3: payload.lirm.R_slope3,
-            version: payload?.lirm?.version?.toNumber(),
+            U_1: (0, sdk_gov_1.toBigInt)(payload.lirm.U_1),
+            U_2: (0, sdk_gov_1.toBigInt)(payload.lirm.U_2),
+            R_base: (0, sdk_gov_1.toBigInt)(payload.lirm.R_base),
+            R_slope1: (0, sdk_gov_1.toBigInt)(payload.lirm.R_slope1),
+            R_slope2: (0, sdk_gov_1.toBigInt)(payload.lirm.R_slope2),
+            R_slope3: (0, sdk_gov_1.toBigInt)(payload.lirm.R_slope3),
+            version: Number(payload?.lirm?.version),
             isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
         };
         this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY);
-        this.dieselRateRay = (0, sdk_gov_1.toBigInt)(payload.dieselRate_RAY);
-        this.lastBaseInterestUpdate = (0, sdk_gov_1.toBigInt)(payload.lastBaseInterestUpdate);
+        this.dieselRateRay = payload.dieselRate_RAY;
+        this.lastBaseInterestUpdate = payload.lastBaseInterestUpdate;
         this.withdrawFee =
-            Number((0, sdk_gov_1.toBigInt)(payload.withdrawFee)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-    }
-    getPoolContractV1(signer) {
-        return types_1.IPoolService__factory.connect(this.address, signer);
-    }
-    getPoolContractV3(signer) {
-        return types_1.IPoolV3__factory.connect(this.address, signer);
+            Number(payload.withdrawFee) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
     }
     async calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }) {
-        const model = types_1.IInterestRateModel__factory.connect(this.interestModel.interestModel, provider);
-        return model.calcBorrowRate(expectedLiquidity, availableLiquidity);
+        const model = (0, viem_1.getContract)({
+            address: this.interestModel.interestModel,
+            abi: types_1.iInterestRateModelAbi,
+            client: provider,
+        });
+        return model.read.calcBorrowRate([expectedLiquidity, availableLiquidity]);
     }
     static getPoolType(name) {
         const [identity = ""] = name.split(" ") || [];
@@ -134,6 +125,14 @@ class PoolData {
             return "trade";
         return "universal";
     }
+    static calculateUtilization(expected, available) {
+        if (expected === 0n)
+            return 0;
+        const borrowed = expected - available;
+        const u = Number((borrowed * sdk_gov_1.PERCENTAGE_FACTOR) / expected) /
+            Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        return Math.max(0, u);
+    }
 }
 exports.PoolData = PoolData;
 class ChartsPoolData {
@@ -157,6 +156,7 @@ class ChartsPoolData {
     borrowAPY;
     borrowAPYRay;
     lmAPY;
+    lmRewardAll;
     availableLiquidity;
     availableLiquidityChange;
     availableLiquidityInUSD;
@@ -197,12 +197,6 @@ class ChartsPoolData {
         this.name = payload.name || "";
         this.earned7D = payload.earned7D || 0;
         this.earned7DInUSD = payload.earned7DInUSD || 0;
-        const expected = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity || 0);
-        this.utilization =
-            expected > 0
-                ? Number(((0, sdk_gov_1.toBigInt)(payload.totalBorrowed || 0) * sdk_gov_1.PERCENTAGE_FACTOR) /
-                    expected) / Number(sdk_gov_1.PERCENTAGE_DECIMALS)
-                : 0;
         this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY || 0);
         this.dieselRateRay = (0, sdk_gov_1.toBigInt)(payload.dieselRate_RAY || 0);
         this.depositAPY =
@@ -212,11 +206,18 @@ class ChartsPoolData {
             (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.borrowAPYRay = (0, sdk_gov_1.toBigInt)(payload.borrowAPY_RAY || 0);
         this.lmAPY = (payload.lmAPY || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.availableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity || 0);
+        this.lmRewardAll = (payload.lmRewardAll || []).map(r => ({
+            apy: (r.apy || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS),
+            token: (r.token || "").toLowerCase(),
+        }));
+        const expected = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity || 0);
+        const available = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity || 0);
+        this.availableLiquidity = available;
         this.oldAvailableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidityOld || 0);
         this.availableLiquidityChange =
             (payload.availableLiquidity10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
+        this.utilization = PoolData.calculateUtilization(expected, available);
         this.caLockedValue = payload.caLockedValue || 0;
         this.oldCALockedValue = payload.caLockedValueOld || 0;
         this.caLockedValueChange =
@@ -267,13 +268,12 @@ class UserPoolData {
     underlyingToken;
     depositAPY;
     depositAPYRay;
-    lmAPY;
+    lmRewardAll;
     providedLiquidity;
     providedLiquidityInUSD;
     dieselBalance;
     dieselBalanceInUSD;
-    lmRewards;
-    lmRewardsInUSD;
+    userRewards;
     pnlInNativeToken;
     pnlInUSD;
     addedLiq;
@@ -282,19 +282,26 @@ class UserPoolData {
     removedLiq;
     constructor(payload) {
         this.id = (payload.pool || "").toLowerCase();
-        this.address = payload.pool || "";
+        this.address = (payload.pool || "").toLowerCase();
         this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
         this.dieselToken = (payload.dieselToken || "").toLowerCase();
         this.depositAPY =
             (0, formatter_1.rayToNumber)(payload.depositAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.depositAPYRay = (0, sdk_gov_1.toBigInt)(payload.depositAPY_RAY || 0);
-        this.lmAPY = (payload.lmAPY || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS || 0);
+        this.lmRewardAll = (payload.lmRewardAll || []).map(r => ({
+            apy: (r.apy || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS),
+            token: (r.token || "").toLowerCase(),
+        }));
         this.providedLiquidity = (0, sdk_gov_1.toBigInt)(payload.liqValue || 0);
         this.providedLiquidityInUSD = payload.liqValueInUSD;
         this.dieselBalance = (0, sdk_gov_1.toBigInt)(payload.dieselBalanceBI || 0);
         this.dieselBalanceInUSD = payload.dieselBalance;
-        this.lmRewards = (0, sdk_gov_1.toBigInt)(payload.lmRewards || 0);
-        this.lmRewardsInUSD = payload.lmRewardsInUSD;
+        this.userRewards = (payload.userRewards || []).map(r => ({
+            token: (r.rewardToken || "").toLowerCase(),
+            pool: (r.pool || "").toLowerCase(),
+            lmRewards: (0, sdk_gov_1.toBigInt)(r.lmRewards || 0),
+            lmRewardsInUSD: r.lmRewardsInUSD,
+        }));
         this.pnlInNativeToken = payload.liqPnlInNativeToken;
         this.pnlInUSD = payload.liqPnlInUSD;
         this.addedLiq = payload.addedLiq;

package/lib/core/protocols.d.ts

@@ -0,0 +1,9 @@
+import { Protocols } from "@gearbox-protocol/sdk-gov";
+interface ProtocolData {
+    name: string;
+    icon: string;
+}
+export type ExtendedProtocols = keyof typeof Protocols | "Stakewise" | "Etherfi" | "Rocketpool" | "Renzo" | "Coinbase" | "Kelp" | "Swell" | "Puffer" | "Mellow" | "Lombard";
+export declare const isExtendedProtocol: (t: unknown) => t is ExtendedProtocols;
+export declare function getProtocolData(t: string): ProtocolData;
+export {};