@gearbox-protocol/sdk 1.15.23 → 1.15.25

package/lib/core/strategy.d.ts

@@ -9,10 +9,6 @@ export interface StrategyPayload {
     leveragableCollateral: Array<string>;
     baseAssets: Array<string>;
 }
-interface PoolStats {
-    borrowRate: number;
-}
-declare type PoolList = Record<string, PoolStats>;
 interface LiquidationPriceProps {
     prices: Record<string, BigNumber>;
     liquidationThresholds: Record<string, BigNumber>;
@@ -31,7 +27,7 @@ export declare class Strategy {
     baseAssets: Array<string>;
     constructor(payload: StrategyPayload);
     static maxLeverage(lpToken: string, cms: Array<PartialCM>): number;
-    maxAPY(maxLeverage: number, poolApy: PoolList): number;
+    maxAPY(baseAPY: number, maxLeverage: number, borrowAPY: number): number;
     overallAPY(apy: number, leverage: number, depositCollateral: string, borrowAPY: number): number;
     liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, lpAmount, lpToken, }: LiquidationPriceProps): BigNumber;
     protected farmLev(leverage: number, depositCollateral: string): number;

package/lib/core/strategy.js

@@ -26,9 +26,10 @@ var Strategy = /** @class */ (function () {
         var maxLeverage = ONE.mul(constants_1.LEVERAGE_DECIMALS).div(ONE.sub(maxThreshold));
         return maxLeverage.sub(constants_1.LEVERAGE_DECIMALS).toNumber();
     };
-    Strategy.prototype.maxAPY = function (maxLeverage, poolApy) {
-        var minApy = minBorrowApy(poolApy);
-        return roi(this.apy || 0, maxLeverage, maxLeverage - constants_1.LEVERAGE_DECIMALS, minApy);
+    Strategy.prototype.maxAPY = function (baseAPY, maxLeverage, borrowAPY) {
+        return (baseAPY +
+            ((baseAPY - borrowAPY) * (maxLeverage - constants_1.LEVERAGE_DECIMALS)) /
+                constants_1.LEVERAGE_DECIMALS);
     };
     Strategy.prototype.overallAPY = function (apy, leverage, depositCollateral, borrowAPY) {
         var farmLev = this.farmLev(leverage, depositCollateral);
@@ -73,10 +74,6 @@ exports.Strategy = Strategy;
 function roi(apy, farmLev, debtLev, borrowAPY) {
     return (apy * farmLev - borrowAPY * debtLev) / constants_1.LEVERAGE_DECIMALS;
 }
-function minBorrowApy(poolApy) {
-    var apys = Object.values(poolApy).sort(function (a, b) { return a.borrowRate - b.borrowRate; });
-    return apys.length > 0 ? apys[0].borrowRate : 0;
-}
 function maxLeverageThreshold(lpToken, cms) {
     var lpTokenLC = lpToken.toLowerCase();
     var ltByCM = cms.map(function (cm) {

package/lib/core/strategy.spec.js

@@ -24,7 +24,7 @@ var lidoPayload = {
 var lidoStrategy = new strategy_1.Strategy(lidoPayload);
 var pools = {
     "0x1": {
-        borrowRate: 7712,
+        borrowRate: 27543,
     },
     "0x2": {
         borrowRate: 5736,
@@ -42,8 +42,8 @@ var liquidationThresholds = (_b = {},
     _b);
 describe("Strategy test", function () {
     it("maxAPY calculation is correct", function () {
-        var result = lidoStrategy.maxAPY(10 * constants_1.LEVERAGE_DECIMALS, pools);
-        (0, chai_1.expect)(result).to.be.eq(332716);
+        var result = lidoStrategy.maxAPY(53203, 10 * constants_1.LEVERAGE_DECIMALS, pools["0x1"].borrowRate);
+        (0, chai_1.expect)(result).to.be.eq(284143);
     });
     it("overallAPY calculation is correct", function () {
         var result = lidoStrategy.overallAPY(lidoStrategy.apy || 0, 10 * constants_1.LEVERAGE_DECIMALS, token_1.tokenDataByNetwork.Mainnet.WETH, pools["0x2"].borrowRate);

package/lib/core/transactions.d.ts

@@ -2,7 +2,7 @@ import { BigNumber } from "ethers";
 import { SupportedContract } from "../contracts/contracts";
 import { EVMTx, EVMTxProps } from "./eventOrTx";
 export interface TxSerialized {
-    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward";
+    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT";
     content: string;
 }
 export declare class TxSerializer {
@@ -121,6 +121,12 @@ export declare class TxClaimReward extends EVMTx {
     toString(): string;
     serialize(): TxSerialized;
 }
+declare type TxClaimNFTProps = EVMTxProps;
+export declare class TxClaimNFT extends EVMTx {
+    constructor(opts: TxClaimNFTProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
 interface RepayAccountProps extends EVMTxProps {
     creditManager: string;
 }

package/lib/core/transactions.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxClaimReward = exports.TxOpenMultitokenAccount = exports.TxOpenAccount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
+exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxClaimNFT = exports.TxClaimReward = exports.TxOpenMultitokenAccount = exports.TxOpenAccount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
 var ethers_1 = require("ethers");
 var contracts_1 = require("../contracts/contracts");
 var contractsRegister_1 = require("../contracts/contractsRegister");
@@ -55,6 +55,8 @@ var TxSerializer = /** @class */ (function () {
                     return new TxOpenMultitokenAccount(params);
                 case "TxClaimReward":
                     return new TxClaimReward(params);
+                case "TxClaimNFT":
+                    return new TxClaimNFT(params);
                 default:
                     throw new Error("Unknown transaction for parsing: ".concat(e.type));
             }
@@ -299,6 +301,28 @@ var TxClaimReward = /** @class */ (function (_super) {
     return TxClaimReward;
 }(eventOrTx_1.EVMTx));
 exports.TxClaimReward = TxClaimReward;
+var TxClaimNFT = /** @class */ (function (_super) {
+    __extends(TxClaimNFT, _super);
+    function TxClaimNFT(opts) {
+        return _super.call(this, {
+            block: opts.block,
+            txHash: opts.txHash,
+            txStatus: opts.txStatus,
+            timestamp: opts.timestamp,
+        }) || this;
+    }
+    TxClaimNFT.prototype.toString = function () {
+        return "NFT claimed";
+    };
+    TxClaimNFT.prototype.serialize = function () {
+        return {
+            type: "TxClaimNFT",
+            content: JSON.stringify(this),
+        };
+    };
+    return TxClaimNFT;
+}(eventOrTx_1.EVMTx));
+exports.TxClaimNFT = TxClaimNFT;
 var TxRepayAccount = /** @class */ (function (_super) {
     __extends(TxRepayAccount, _super);
     function TxRepayAccount(opts) {

package/package.json

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