@gearbox-protocol/sdk 3.0.0-next.127 → 3.0.0-next.129

package/lib/apy/convexAPY.js

@@ -168,7 +168,7 @@ function calculateConvexAPY(props) {
         return finished ? 0n : extraAPY;
     });
     const extraAPYTotal = extraAPRs.reduce((acc, apy) => acc + apy, 0n);
-    const baseApy = props.curveAPY?.[crvToken].base || 0;
+    const baseApy = props.curveAPY?.[crvToken]?.base || 0;
     const apyTotal = crvAPY + cvxAPY + extraAPYTotal;
     const apyTotalInPercent = apyTotal * sdk_gov_1.PERCENTAGE_DECIMALS * sdk_gov_1.PERCENTAGE_FACTOR;
     const r = baseApy + Math.round(Number((apyTotalInPercent * 10n) / sdk_gov_1.WAD) / 10);

package/lib/apy/curveAPY.d.ts

@@ -1,3 +1,4 @@
+import { NetworkType, PartialRecord } from "@gearbox-protocol/sdk-gov";
 import { CurveLPToken } from "@gearbox-protocol/sdk-gov/lib/tokens/curveLP";
 import { GearboxToken } from "@gearbox-protocol/sdk-gov/lib/tokens/gear";
 interface CurvePoolData {
@@ -50,7 +51,13 @@ interface CurveAPY {
     crv: number;
     gauge: Array<[string, number]>;
 }
-export type CurveAPYResult = Record<CurveAPYTokens, CurveAPY>;
-export declare function getCurveAPY(): Promise<CurveAPYResult>;
+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

@@ -6,76 +6,66 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurveGearPool = exports.getCurveAPY = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
-const APY_DICTIONARY = {
-    "3Crv": "0",
-    FRAX3CRV: "34",
-    gusd3CRV: "19",
-    LUSD3CRV: "33",
-    crvPlain3andSUSD: "15",
-    steCRV: "14",
-    crvFRAX: "44",
-    GEAR: "factory-crypto-192",
-    OHMFRAXBP: "factory-crypto-158",
-    MIM_3LP3CRV: "40",
-    crvCRVETH: "crypto-3",
-    crvCVXETH: "crypto-4",
-    crvUSDTWBTCWETH: "factory-tricrypto-1",
-    LDOETH: "factory-crypto-204",
-    crvUSDUSDC: "factory-crvusd-0",
-    crvUSDUSDT: "factory-crvusd-1",
-    crvUSDFRAX: "factory-crvusd-4",
-    crvUSDETHCRV: "factory-tricrypto-4",
-    rETH_f: "factory-crypto-210",
-    wstETHCRV: "unknown",
-    "2CRV": "unknown",
-    "3c-crvUSD": "unknown",
-    crvUSDC: "unknown",
-    crvUSDT: "unknown",
-    crvUSDC_e: "unknown",
-    "3CRV": "unknown", // 0xEfDE221f306152971D8e9f181bFe998447975810
+const GEAR_POOL = "0x5Be6C45e2d074fAa20700C49aDA3E88a1cc0025d".toLowerCase();
+const CURVE_CHAINS = {
+    Arbitrum: "arbitrum",
+    Mainnet: "ethereum",
+    Optimism: "optimism",
 };
-// const CRYPTO = "https://api.curve.fi/api/getPools/ethereum/crypto";
-// const FACTORY = "https://api.curve.fi/api/getPools/ethereum/factory";
-const CURVE_APY_URL = "https://www.convexfinance.com/api/curve-apys";
-const CURVE_MAIN_URL = "https://api.curve.fi/api/getPools/ethereum/main";
-const CURVE_FACTORY_CRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/factory-crypto";
-const CURVE_CRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/crypto";
-const CURVE_FACTORY_TRICRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/factory-tricrypto";
-const CURVE_FACTORY_CRVUSD_URL = "https://api.curve.fi/api/getPools/ethereum/factory-crvusd";
-async function getCurveAPY() {
+// const CRYPTO = "https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/crypto";
+// const FACTORY = "https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/factory";
+// const CURVE_APY_URL = "https://www.convexfinance.com/api/curve-apys";
+const getVolumesURL = (n) => `https://api.curve.fi/api/getVolumes/${CURVE_CHAINS[n]}`;
+const getMainURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/main`;
+const getFactoryCryptoURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/factory-crypto`;
+const getCryptoURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/crypto`;
+const getFactoryTriCryptoURL = (n) => `https://api.curve.fi/api/getPools/${CURVE_CHAINS[n]}/factory-tricrypto`;
+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 [{ data: apyData }, ...restData] = await Promise.all([
-            axios_1.default.get(CURVE_APY_URL),
-            axios_1.default.get(CURVE_MAIN_URL),
-            axios_1.default.get(CURVE_FACTORY_CRYPTO_URL),
-            axios_1.default.get(CURVE_CRYPTO_URL),
-            axios_1.default.get(CURVE_FACTORY_TRICRYPTO_URL),
-            axios_1.default.get(CURVE_FACTORY_CRVUSD_URL),
-        ]);
-        const { apys } = apyData || {};
-        const poolDataByID = Object.fromEntries(restData
-            .map(resp => {
-            const { poolData = [] } = resp?.data?.data || {};
-            return poolData.map(p => [p.id, p]);
+        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(APY_DICTIONARY).reduce((acc, [curveSymbol, poolId]) => {
-            const { baseApy, crvApy } = apys[poolId] || {};
-            const pool = poolDataByID[poolId];
-            const { gaugeRewards = [] } = pool || {};
-            const extraRewards = gaugeRewards.map(({ apy = 0, symbol }) => [
+        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),
             ]);
-            const maxCrv = pool?.gaugeCrvApy?.length > 0 ? Math.max(...pool.gaugeCrvApy) : crvApy;
             acc[curveSymbol] = {
-                base: curveAPYToBn(baseApy || 0),
-                crv: curveAPYToBn(maxCrv || 0),
+                base: curveAPYToBn(baseAPY),
+                crv: curveAPYToBn(maxCrv),
                 gauge: extraRewards,
             };
             return acc;
         }, {});
-        return curveAPY;
+        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 };
     }
     catch (e) {
         console.error(e);
@@ -83,20 +73,66 @@ async function getCurveAPY() {
     }
 }
 exports.getCurveAPY = getCurveAPY;
+async function getCurvePools(network) {
+    switch (network) {
+        case "Mainnet": {
+            const [volumes, mainnetFactoryPools, ...pools] = await Promise.all([
+                axios_1.default.get(getVolumesURL(network)),
+                axios_1.default.get(getFactoryCryptoURL(network)),
+                axios_1.default.get(getMainURL(network)),
+                axios_1.default.get(getCryptoURL(network)),
+                axios_1.default.get(getFactoryTriCryptoURL(network)),
+                axios_1.default.get(getFactoryCrvUsdURL(network)),
+            ]);
+            return {
+                mainnetVolumes: volumes,
+                mainnetFactoryPools,
+                volumes,
+                pools: [mainnetFactoryPools, ...pools],
+            };
+        }
+        case "Arbitrum": {
+            const [mainnetVolumes, mainnetFactoryPools, volumes, ...pools] = await Promise.all([
+                axios_1.default.get(getVolumesURL("Mainnet")),
+                axios_1.default.get(getFactoryCryptoURL("Mainnet")),
+                axios_1.default.get(getVolumesURL(network)),
+                axios_1.default.get(getMainURL(network)),
+                axios_1.default.get(getFactoryStableNgURL(network)),
+            ]);
+            return {
+                mainnetVolumes,
+                mainnetFactoryPools,
+                volumes,
+                pools,
+            };
+        }
+        case "Optimism": {
+            const [mainnetVolumes, mainnetFactoryPools, volumes, ...pools] = await Promise.all([
+                axios_1.default.get(getVolumesURL("Mainnet")),
+                axios_1.default.get(getFactoryCryptoURL("Mainnet")),
+                axios_1.default.get(getVolumesURL(network)),
+                axios_1.default.get(getMainURL(network)),
+                axios_1.default.get(getFactoryStableNgURL(network)),
+            ]);
+            return {
+                mainnetVolumes,
+                mainnetFactoryPools,
+                volumes,
+                pools,
+            };
+        }
+        default:
+            throw new Error("Unknown network");
+    }
+}
 function curveAPYToBn(baseApy) {
     return Math.round(baseApy * Number(sdk_gov_1.PERCENTAGE_FACTOR));
 }
 async function getCurveGearPool() {
-    const data = await Promise.all([
-        axios_1.default.get(CURVE_FACTORY_CRYPTO_URL),
-    ]);
-    const poolDataByID = Object.fromEntries(data
-        .map(resp => {
-        const { poolData = [] } = resp?.data?.data || {};
-        return poolData.map(p => [p.id, p]);
-    })
-        .flat(1));
-    const gearPool = poolDataByID[APY_DICTIONARY.GEAR];
+    const resp = await axios_1.default.get(getFactoryCryptoURL("Mainnet"));
+    const { poolData = [] } = resp?.data?.data || {};
+    const poolDataByAddress = Object.fromEntries(poolData.map(p => [p.lpTokenAddress.toLowerCase(), p]));
+    const gearPool = poolDataByAddress[GEAR_POOL];
     return gearPool;
 }
 exports.getCurveGearPool = getCurveGearPool;

package/lib/apy/defiLamaAPY.js

@@ -10,7 +10,10 @@ const LAMA_URL = "https://charts-server.fly.dev/api/defillama?ids=";
 async function getDefiLamaAPY(networkType) {
     try {
         const currentNormal = NORMAL_TO_LAMA[networkType];
-        const res = await axios_1.default.get(`${LAMA_URL}${Object.values(currentNormal).join(",")}`);
+        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;
@@ -34,7 +37,7 @@ const NORMAL_TO_LAMA = {
         osETH: "4d01599c-69ae-41a3-bae1-5fab896f04c8",
         auraB_rETH_STABLE_vault: "a4b5b995-99e7-4b8f-916d-8940b5627d70",
     },
-    Optimism: { rETH: "d4b3c522-6127-4b89-bedf-83641cdcd2eb" },
+    Optimism: {},
     Arbitrum: {},
 };
 // const CONVEX_TO_LAMA: Record<

package/lib/apy/yearnAPY.d.ts

@@ -1,3 +1,3 @@
-import { NetworkType, YearnLPToken } from "@gearbox-protocol/sdk-gov";
-export type YearnAPYResult = Record<YearnLPToken, number>;
+import { NetworkType, PartialRecord, YearnLPToken } from "@gearbox-protocol/sdk-gov";
+export type YearnAPYResult = PartialRecord<YearnLPToken, number>;
 export declare function getYearnAPY(network: NetworkType): Promise<YearnAPYResult>;

package/lib/apy/yearnAPY.js

@@ -10,13 +10,14 @@ const getUrl = (chainId) => `https://ydaemon.yearn.finance/vaults/all?chainids=$
 async function getYearnAPY(network) {
     try {
         const chainId = sdk_gov_1.CHAINS[network];
+        const currentTokens = sdk_gov_1.tokenDataByNetwork[network];
         const { data } = await axios_1.default.get(getUrl(chainId));
         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 address = (sdk_gov_1.tokenDataByNetwork[network]?.[yearnSymbol] || "").toLowerCase();
+            const address = (currentTokens?.[yearnSymbol] || "").toLowerCase();
             const data = dataByAddress[address];
             const { apr: apy } = data || {};
             const { netAPR } = apy || {};

package/lib/core/creditAccount.d.ts

@@ -40,6 +40,7 @@ export interface CalcQuotaUpdateProps {
     initialQuotas: Record<string, Pick<CaTokenBalance, "quota">>;
     liquidationThresholds: Record<string, bigint>;
     assetsAfterUpdate: Record<string, AssetWithAmountInTarget>;
+    maxDebt: bigint;
     allowedToSpend: Record<string, {}>;
     allowedToObtain: Record<string, {}>;
     quotaReserve: bigint;
@@ -120,7 +121,8 @@ export declare class CreditAccountData {
     static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, }: CalcHealthFactorProps): number;
     static calcRecommendedQuota({ amount, debt, lt, quotaReserve, }: CalcRecommendedQuotaProps): bigint;
     static calcDefaultQuota({ amount, lt, quotaReserve }: CalcDefaultQuotaProps): bigint;
-    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, liquidationThresholds, allowedToSpend, allowedToObtain, quotaReserve, }: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    static calcQuotaUpdate(props: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    private static getSingleQuotaChange;
     static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
     static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }: CalcRelativeBaseBorrowRateProps): bigint;
     static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;

package/lib/core/creditAccount.js

@@ -239,56 +239,81 @@ class CreditAccountData {
             sdk_gov_1.PERCENTAGE_FACTOR;
         return recommendedQuota;
     }
-    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, liquidationThresholds, allowedToSpend, allowedToObtain, quotaReserve, }) {
-        const r = Object.values(quotas).reduce((acc, cmQuota) => {
+    static calcQuotaUpdate(props) {
+        const { quotas, initialQuotas, maxDebt, allowedToSpend, allowedToObtain } = props;
+        const quotaDecrease = Object.keys(allowedToSpend).reduce((acc, token) => {
+            const ch = CreditAccountData.getSingleQuotaChange(token, 0n, props);
+            if (ch)
+                acc[ch.token] = ch;
+            return acc;
+        }, {});
+        const quotaCap = maxDebt * 2n;
+        const quotaBought = Object.values(initialQuotas).reduce((sum, q) => sum + (q?.quota || 0n), 0n);
+        const quotaReduced = Object.values(quotaDecrease).reduce((sum, q) => sum + (q.balance || 0n), 0n);
+        const maxQuotaIncrease = math_1.BigIntMath.max(quotaCap - (quotaBought + quotaReduced), 0n);
+        const quotaIncrease = Object.keys(allowedToObtain).reduce((acc, token) => {
+            const ch = CreditAccountData.getSingleQuotaChange(token, maxQuotaIncrease, props);
+            if (ch)
+                acc[ch.token] = ch;
+            return acc;
+        }, {});
+        const quotaChange = {
+            ...quotaDecrease,
+            ...quotaIncrease,
+        };
+        const desiredQuota = Object.values(quotas).reduce((acc, cmQuota) => {
             const { token, isActive } = cmQuota;
             const { quota: initialQuota = 0n } = initialQuotas[token] || {};
             if (!isActive) {
-                acc.desiredQuota[token] = {
+                acc[token] = {
                     balance: initialQuota,
                     token,
                 };
-                return acc;
-            }
-            // min(debt,assetAmountInUnderlying*LT)*(1+buffer)
-            const after = assetsAfterUpdate[token];
-            const { amountInTarget = 0n } = after || {};
-            const lt = liquidationThresholds[token] || 0n;
-            const desiredQuota = this.calcDefaultQuota({
-                lt,
-                quotaReserve,
-                amount: amountInTarget,
-            });
-            const quotaChange = desiredQuota - initialQuota;
-            const correctIncrease = after && allowedToObtain[token] && quotaChange > 0;
-            const correctDecrease = after && allowedToSpend[token] && quotaChange < 0;
-            if (correctIncrease || correctDecrease) {
-                acc.desiredQuota[token] = {
-                    balance: desiredQuota,
-                    token,
-                };
             }
             else {
-                acc.desiredQuota[token] = {
-                    balance: initialQuota,
+                const change = quotaChange[token]?.balance || 0n;
+                const quotaAfter = initialQuota + change;
+                acc[token] = {
+                    balance: quotaAfter,
                     token,
                 };
             }
-            if (correctIncrease) {
-                acc.quotaIncrease.push({
-                    balance: quotaChange,
-                    token,
-                });
-            }
-            if (correctDecrease) {
-                acc.quotaDecrease.push({
-                    balance: quotaChange,
-                    token,
-                });
-            }
             return acc;
-        }, { desiredQuota: {}, quotaIncrease: [], quotaDecrease: [] });
-        return r;
+        }, {});
+        return {
+            desiredQuota,
+            quotaDecrease: Object.values(quotaDecrease),
+            quotaIncrease: Object.values(quotaIncrease),
+        };
+    }
+    static getSingleQuotaChange(token, maxQuotaIncrease, props) {
+        const { isActive = false } = props.quotas[token] || {};
+        const { quota: initialQuota = 0n } = props.initialQuotas[token] || {};
+        if (!isActive) {
+            return undefined;
+        }
+        // min(debt,assetAmountInUnderlying*LT)*(1+buffer)
+        const assetAfter = props.assetsAfterUpdate[token];
+        const { amountInTarget = 0n } = assetAfter || {};
+        const lt = props.liquidationThresholds[token] || 0n;
+        const defaultQuota = this.calcDefaultQuota({
+            lt,
+            quotaReserve: props.quotaReserve,
+            amount: amountInTarget,
+        });
+        const unsafeQuotaChange = defaultQuota - initialQuota;
+        const quotaChange = unsafeQuotaChange > 0
+            ? math_1.BigIntMath.min(maxQuotaIncrease, unsafeQuotaChange)
+            : unsafeQuotaChange;
+        const correctIncrease = assetAfter && props.allowedToObtain[token] && quotaChange > 0;
+        const correctDecrease = assetAfter && props.allowedToSpend[token] && quotaChange < 0;
+        if (correctIncrease || correctDecrease) {
+            return {
+                balance: quotaChange,
+                token,
+            };
+        }
+        return undefined;
     }
     static calcQuotaBorrowRate({ quotas, quotaRates }) {
         const totalRateBalance = Object.values(quotas).reduce((acc, { token, balance }) => {

package/lib/core/creditAccount.spec.js

@@ -422,9 +422,11 @@ const DEFAULT_LT = {
     [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: sdk_gov_1.PERCENTAGE_FACTOR,
     [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: sdk_gov_1.PERCENTAGE_FACTOR,
 };
+const HUGE_MAX_DEBT = 20n;
 describe("CreditAccount calcQuotaUpdate test", () => {
     it("open account should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: {},
@@ -475,6 +477,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("add collateral should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -515,6 +518,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("add collateral should add additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -555,6 +559,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("add collateral shouldn't add additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -590,6 +595,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("swap should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -635,8 +641,9 @@ describe("CreditAccount calcQuotaUpdate test", () => {
             },
         });
     });
-    it("swap should add additional quota", () => {
+    it("swap should buy additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -687,8 +694,9 @@ describe("CreditAccount calcQuotaUpdate test", () => {
             },
         });
     });
-    it("swap shouldn't add additional quota", () => {
+    it("swap shouldn't buy additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -734,6 +742,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("shouldn't change quota if disallowed", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
@@ -772,6 +781,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("shouldn't change quota if it is disabled", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
@@ -827,6 +837,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("swap shouldn't buy quota if no lt", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: {
@@ -874,6 +885,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("swap should buy quota with respect to lt", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: {
@@ -927,6 +939,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
     });
     it("swap shouldn't buy quota with respect to lt", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
             quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: {
@@ -973,6 +986,175 @@ describe("CreditAccount calcQuotaUpdate test", () => {
             },
         });
     });
+    it("swap should buy additional quota after limit was increased", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 10n,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 10n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: -10n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 20n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap should buy additional quota with respect to debt limit", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 9n,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 8n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: -10n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 18n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap shouldn't buy additional quota if debt limit more then current quota", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 5n,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: -10n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 10n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
 });
 describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
     it("should calculate quota rate (same amounts, different rates)", () => {

package/lib/core/endpoint.d.ts

@@ -1,6 +1,7 @@
 export declare const TESTNET_CHAINS: {
     readonly Mainnet: 7878;
     readonly Optimism: 7879;
+    readonly Arbitrum: 7880;
 };
 type ChartsPriceSource = "chainlink" | "spot";
 interface Options {

package/lib/core/endpoint.js

@@ -5,6 +5,7 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 exports.TESTNET_CHAINS = {
     Mainnet: 7878,
     Optimism: 7879,
+    Arbitrum: 7880,
 };
 const CHARTS_BACKEND_ADDRESSES = {
     [sdk_gov_1.CHAINS.Mainnet]: "https://charts-server.fly.dev",
@@ -12,6 +13,7 @@ const CHARTS_BACKEND_ADDRESSES = {
     [exports.TESTNET_CHAINS.Mainnet]: "https://testnet.gearbox.foundation",
     // !& test server for optimism
     [exports.TESTNET_CHAINS.Optimism]: "https://testnet.gearbox.foundation",
+    [exports.TESTNET_CHAINS.Arbitrum]: "https://testnet.gearbox.foundation",
 };
 class ChartsApi {
     static getUrl = (url, chainId, options, priceSource) => [

package/lib/core/rewardConvex.js

@@ -10,8 +10,6 @@ const types_1 = require("../types");
 class RewardConvex {
     static poolInterface = types_1.IBaseRewardPool__factory.createInterface();
     static async findRewards(ca, cm, network, provider) {
-        if (network !== "Mainnet")
-            return [];
         const { auraCalls, auraDistribution, convexCalls, convexDistribution } = RewardConvex.prepareMultiCalls(ca.addr, cm, network);
         const auraTotal = auraCalls.flat(1);
         const convexTotal = convexCalls.flat(1);

package/package.json

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