impermax-sdk 2.1.57 → 2.1.59

package/lib/offchain/offchainAPRHelper.js

@@ -53,6 +53,7 @@ class OffchainAPRHelper {
         this.blacklistedProjects = new Set([
             "extra-finance",
             "beefy",
+            "impermax-finance"
         ]);
         this.offchainMultichain = offchainMultichain;
     }

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlp.d.ts

@@ -1,7 +1,9 @@
 import OnchainAccountLendingPoolV3 from "../onchainAccountLendingPoolV3";
+import { OnchainAccountCollateralV3 } from "../index";
 export default abstract class OnchainAccountNftlp {
-    protected readonly lendingPool: OnchainAccountLendingPoolV3;
+    protected readonly collateral: OnchainAccountCollateralV3;
     protected cache: {};
-    constructor(lendingPool: OnchainAccountLendingPoolV3);
+    constructor(collateral: OnchainAccountCollateralV3);
+    getLendingPool: () => OnchainAccountLendingPoolV3;
     cleanCache(): void;
 }

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlp.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class OnchainAccountNftlp {
-    constructor(lendingPool) {
+    constructor(collateral) {
         this.cache = {};
-        this.lendingPool = lendingPool;
+        this.getLendingPool = () => this.collateral.getLendingPool();
+        this.collateral = collateral;
     }
     cleanCache() {
         this.cache = {};

package/lib/onchain/account/lendingPool/onchainAccountCollateralV3.d.ts

@@ -3,13 +3,16 @@ import OnchainAccountCollateral from "./onchainAccountCollateral";
 import { OnchainCollateralV3 } from "../../impermaxFactory/lendingPool";
 import OnchainAccountLendingPoolV3 from "./onchainAccountLendingPoolV3";
 import { OnchainInteractionsCollateralV3 } from "../../interactions/lendingPool";
+import OnchainAccountNftlp from "./nftlp";
 export default class OnchainAccountCollateralV3 extends OnchainAccountCollateral {
     protected readonly lendingPool: OnchainAccountLendingPoolV3;
     protected readonly collateral: OnchainCollateralV3;
+    protected readonly nftlp: OnchainAccountNftlp;
     protected collateralCache: {};
     constructor(lendingPool: OnchainAccountLendingPoolV3);
     getLendingPool: () => OnchainAccountLendingPoolV3;
     getCollateral: () => OnchainCollateralV3;
+    getNftlp: () => OnchainAccountNftlp;
     getAccount: () => import("..").default;
     getInteractionsCollateral(): OnchainInteractionsCollateralV3;
     getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;

package/lib/onchain/account/lendingPool/onchainAccountCollateralV3.js

@@ -19,9 +19,11 @@ class OnchainAccountCollateralV3 extends onchainAccountCollateral_1.default {
         this.collateralCache = {};
         this.getLendingPool = () => this.lendingPool;
         this.getCollateral = () => this.collateral;
+        this.getNftlp = () => this.nftlp;
         this.getAccount = () => this.lendingPool.getAccount();
         this.lendingPool = lendingPool;
         this.collateral = lendingPool.getLendingPool().getCollateral();
+        this.nftlp = lendingPool.getLendingPool().getNftlp().getNewAccountNftlpObject(this);
     }
     getInteractionsCollateral() {
         return this.lendingPool.getInteractionsLendingPool().getCollateral();

package/lib/onchain/account/lendingPool/onchainAccountLendingPoolV3.d.ts

@@ -13,7 +13,6 @@ export default class OnchainAccountLendingPoolV3 extends OnchainAccountLendingPo
         [Borrowable.A]: OnchainAccountBorrowableV3;
         [Borrowable.B]: OnchainAccountBorrowableV3;
     };
-    protected readonly nftlp: OnchainAccountNftlp;
     constructor(account: OnchainAccount, lendingPool: OnchainLendingPoolV3);
     protected getNewCollateralObject(): OnchainAccountCollateralV3;
     protected getNewBorrowableObject(borrowable: Borrowable): OnchainAccountBorrowableV3;

package/lib/onchain/account/lendingPool/onchainAccountLendingPoolV3.js

@@ -16,8 +16,7 @@ class OnchainAccountLendingPoolV3 extends onchainAccountLendingPool_1.default {
         this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
         this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
         this.getCollateral = () => this.collateral;
-        this.getNftlp = () => this.nftlp;
-        this.nftlp = lendingPool.getNftlp().getNewAccountNftlpObject(this);
+        this.getNftlp = () => this.collateral.getNftlp();
     }
     getNewCollateralObject() {
         return new onchainAccountCollateralV3_1.default(this);

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlp.d.ts

@@ -1,22 +1,28 @@
 import OnchainLendingPoolV3 from "../onchainLendingPoolV3";
 import { Contract } from "../../../onchainTypes";
-import { OnchainAccountLendingPoolV3 } from "../../../account/lendingPool";
+import { OnchainAccountCollateralV3 } from "../../../account/lendingPool";
 import OnchainAccountNftlp from "../../../account/lendingPool/nftlp";
-import { OnchainInteractionsLendingPoolV3 } from "../../../interactions/lendingPool";
+import { OnchainInteractionsCollateralV3 } from "../../../interactions/lendingPool";
 import OnchainInteractionsNftlp from "../../../interactions/lendingPool/nftlp";
+import OnchainCollateralV3 from "../onchainCollateralV3";
 export default abstract class OnchainNftlp {
-    protected readonly lendingPool: OnchainLendingPoolV3;
+    protected readonly collateral: OnchainCollateralV3;
     protected cache: {
         nftlp?: Contract;
+        marketPrice?: Promise<number>;
+        oraclePrice?: Promise<number>;
     };
-    abstract getNewAccountNftlpObject(accountLendingPool: OnchainAccountLendingPoolV3): OnchainAccountNftlp;
-    abstract getNewInteractionsNftlpObject(accountLendingPool: OnchainInteractionsLendingPoolV3): OnchainInteractionsNftlp;
-    constructor(lendingPool: OnchainLendingPoolV3);
+    abstract getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): OnchainAccountNftlp;
+    abstract getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlp;
+    constructor(collateral: OnchainCollateralV3);
     cleanCache(): void;
+    getLendingPool: () => OnchainLendingPoolV3;
     protected getContractHelper: () => import("../../..").OnchainContractsHelper;
     getNftlpAddress: () => string;
     protected abstract initializeNftlp(): Contract;
     getNftlp(): any;
-    abstract getMarketPrice(): Promise<number>;
-    abstract getOraclePrice(): Promise<number>;
+    protected abstract initializeMarketPrice(): Promise<number>;
+    getMarketPrice(): Promise<number>;
+    protected abstract initializeOraclePrice(): Promise<number>;
+    getOraclePrice(): Promise<number>;
 }

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlp.js

@@ -1,11 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 class OnchainNftlp {
-    constructor(lendingPool) {
+    constructor(collateral) {
         this.cache = {};
-        this.getContractHelper = () => this.lendingPool.getImpermaxFactory().getOnchain().getContractHelper();
-        this.getNftlpAddress = () => this.lendingPool.getId();
-        this.lendingPool = lendingPool;
+        this.getLendingPool = () => this.collateral.getLendingPool();
+        this.getContractHelper = () => this.getLendingPool().getImpermaxFactory().getOnchain().getContractHelper();
+        this.getNftlpAddress = () => this.getLendingPool().getId();
+        this.collateral = collateral;
     }
     cleanCache() {
         this.cache = {};
@@ -15,5 +25,19 @@ class OnchainNftlp {
             this.cache.nftlp = this.initializeNftlp();
         return this.cache.nftlp;
     }
+    getMarketPrice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.cache.marketPrice)
+                this.cache.marketPrice = this.initializeMarketPrice();
+            return this.cache.marketPrice;
+        });
+    }
+    getOraclePrice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.cache.oraclePrice)
+                this.cache.oraclePrice = this.initializeOraclePrice();
+            return this.cache.oraclePrice;
+        });
+    }
 }
 exports.default = OnchainNftlp;

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.d.ts

@@ -1,9 +1,9 @@
 import OnchainNftlp from "./onchainNftlp";
 import { Contract } from "../../../onchainTypes";
-import { OnchainAccountLendingPoolV3 } from "../../../account/lendingPool";
+import { OnchainAccountCollateralV3 } from "../../../account/lendingPool";
 import { OnchainAccountNftlpUniswapV3 } from "../../../account/lendingPool/nftlp";
 import { OnchainInteractionsNftlpUniswapV3 } from "../../../interactions/lendingPool/nftlp";
-import { OnchainInteractionsLendingPoolV3 } from "../../../interactions/lendingPool";
+import { OnchainInteractionsCollateralV3 } from "../../../interactions/lendingPool";
 export default class OnchainNftlpUniswapV3 extends OnchainNftlp {
     protected cache: {
         nftlp?: Contract;
@@ -13,12 +13,11 @@ export default class OnchainNftlpUniswapV3 extends OnchainNftlp {
         marketPrice?: Promise<number>;
         oraclePrice?: Promise<number>;
     };
-    getNewAccountNftlpObject(accountNftlp: OnchainAccountLendingPoolV3): OnchainAccountNftlpUniswapV3;
-    getNewInteractionsNftlpObject(interactionsNftlp: OnchainInteractionsLendingPoolV3): OnchainInteractionsNftlpUniswapV3;
-    initializeNftlp(): any;
-    initializeUniswapV3Pool(fee: number): Promise<Contract | null>;
+    getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): OnchainAccountNftlpUniswapV3;
+    getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlpUniswapV3;
+    protected initializeNftlp(): any;
+    protected initializeUniswapV3Pool(fee: number): Promise<Contract | null>;
     getUniswapV3Pool(fee: number): Promise<any>;
-    getMarketPrice(): Promise<number>;
-    private initializeOraclePrice;
-    getOraclePrice(): Promise<number>;
+    protected initializeMarketPrice(): Promise<number>;
+    protected initializeOraclePrice(): Promise<number>;
 }

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.js

@@ -26,11 +26,11 @@ class OnchainNftlpUniswapV3 extends onchainNftlp_1.default {
         super(...arguments);
         this.cache = {};
     }
-    getNewAccountNftlpObject(accountNftlp) {
-        return new nftlp_1.OnchainAccountNftlpUniswapV3(accountNftlp);
+    getNewAccountNftlpObject(accountCollateral) {
+        return new nftlp_1.OnchainAccountNftlpUniswapV3(accountCollateral);
     }
-    getNewInteractionsNftlpObject(interactionsNftlp) {
-        return new nftlp_2.OnchainInteractionsNftlpUniswapV3(interactionsNftlp);
+    getNewInteractionsNftlpObject(interactionsCollateral) {
+        return new nftlp_2.OnchainInteractionsNftlpUniswapV3(interactionsCollateral);
     }
     initializeNftlp() {
         return this.getContractHelper().newNftlpUniV3(this.getNftlpAddress());
@@ -56,7 +56,7 @@ class OnchainNftlpUniswapV3 extends onchainNftlp_1.default {
             return this.cache.uniswapV3Pools[fee];
         });
     }
-    getMarketPrice() {
+    initializeMarketPrice() {
         return __awaiter(this, void 0, void 0, function* () {
             let priceCumulative = 0;
             let liquidityCumulative = 0;
@@ -72,19 +72,11 @@ class OnchainNftlpUniswapV3 extends onchainNftlp_1.default {
             return priceCumulative / liquidityCumulative;
         });
     }
-    ;
     initializeOraclePrice() {
         return __awaiter(this, void 0, void 0, function* () {
             const nftlp = yield this.getNftlp();
             return Math.pow((nftlp.methods.oraclePriceSqrtX96().call() / Math.pow(2, 96)), 2);
         });
     }
-    getOraclePrice() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.cache.oraclePrice)
-                this.cache.oraclePrice = this.initializeOraclePrice();
-            return this.cache.oraclePrice;
-        });
-    }
 }
 exports.default = OnchainNftlpUniswapV3;

package/lib/onchain/impermaxFactory/lendingPool/onchainCollateralV3.d.ts

@@ -1,11 +1,14 @@
 import OffchainCollateral from '../../../offchain/lendingPool/offchainCollateral';
 import OnchainCollateral from "./onchainCollateral";
 import OnchainLendingPoolV3 from "./onchainLendingPoolV3";
+import OnchainNftlp from "./nftlp";
 export default class OnchainCollateralV3 extends OnchainCollateral {
     protected readonly lendingPool: OnchainLendingPoolV3;
+    protected readonly nftlp: OnchainNftlp;
     protected collateralCache: {};
     constructor(lendingPool: OnchainLendingPoolV3);
     getLendingPool: () => OnchainLendingPoolV3;
+    getNftlp: () => OnchainNftlp;
     cleanCache(): void;
     private getContractHelper;
     getCollateralAddress: () => Promise<string>;

package/lib/onchain/impermaxFactory/lendingPool/onchainCollateralV3.js

@@ -13,15 +13,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const onchainCollateral_1 = __importDefault(require("./onchainCollateral"));
+const nftlp_1 = require("./nftlp");
 class OnchainCollateralV3 extends onchainCollateral_1.default {
     constructor(lendingPool) {
         super();
         this.collateralCache = {};
         this.getLendingPool = () => this.lendingPool;
+        this.getNftlp = () => this.nftlp;
         // shortcuts
         this.getContractHelper = () => this.lendingPool.getImpermaxFactory().getOnchain().getContractHelper();
         this.getCollateralAddress = () => __awaiter(this, void 0, void 0, function* () { return this.lendingPool.getCollateralAddress(); });
         this.lendingPool = lendingPool;
+        // TODO use the offchain object to get the type of nftlp
+        this.nftlp = new nftlp_1.OnchainNftlpUniswapV3(this);
     }
     cleanCache() {
         this.collateralCache = {};

package/lib/onchain/impermaxFactory/lendingPool/onchainLendingPoolV3.d.ts

@@ -17,7 +17,6 @@ export default class OnchainLendingPoolV3 extends OnchainLendingPool {
         [Borrowable.A]: OnchainBorrowableV3;
         [Borrowable.B]: OnchainBorrowableV3;
     };
-    protected readonly nftlp: OnchainNftlp;
     protected cache: {
         lendingPoolAddresses?: Promise<{
             collateral: Address;

package/lib/onchain/impermaxFactory/lendingPool/onchainLendingPoolV3.js

@@ -9,7 +9,6 @@ const lendingPool_1 = require("../../account/lendingPool");
 const onchainCollateralV3_1 = __importDefault(require("./onchainCollateralV3"));
 const onchainBorrowableV3_1 = __importDefault(require("./onchainBorrowableV3"));
 const lendingPool_2 = require("../../interactions/lendingPool");
-const nftlp_1 = require("./nftlp");
 class OnchainLendingPoolV3 extends onchainLendingPool_1.default {
     constructor(impermaxFactory, id) {
         super(impermaxFactory, id);
@@ -19,9 +18,7 @@ class OnchainLendingPoolV3 extends onchainLendingPool_1.default {
         this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
         this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
         this.getCollateral = () => this.collateral;
-        this.getNftlp = () => this.nftlp;
-        // TODO use the offchain object to get the type of nftlp
-        this.nftlp = new nftlp_1.OnchainNftlpUniswapV3(this);
+        this.getNftlp = () => this.collateral.getNftlp();
     }
     getNewCollateralObject() {
         return new onchainCollateralV3_1.default(this);

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlp.d.ts

@@ -1,7 +1,9 @@
 import OnchainInteractionsLendingPoolV3 from "../onchainInteractionsLendingPoolV3";
+import { OnchainInteractionsCollateralV3 } from "../index";
 export default abstract class OnchainInteractionsNftlp {
-    protected readonly lendingPool: OnchainInteractionsLendingPoolV3;
+    protected readonly collateral: OnchainInteractionsCollateralV3;
     protected cache: {};
-    constructor(lendingPool: OnchainInteractionsLendingPoolV3);
+    constructor(collateral: OnchainInteractionsCollateralV3);
+    getLendingPool: () => OnchainInteractionsLendingPoolV3;
     cleanCache(): void;
 }

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlp.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class OnchainInteractionsNftlp {
-    constructor(lendingPool) {
+    constructor(collateral) {
         this.cache = {};
-        this.lendingPool = lendingPool;
+        this.getLendingPool = () => this.collateral.getLendingPool();
+        this.collateral = collateral;
     }
     cleanCache() {
         this.cache = {};

package/lib/onchain/interactions/lendingPool/onchainInteractionsCollateralV3.d.ts

@@ -2,12 +2,15 @@ import OnchainInteractionsCollateral from "./onchainInteractionsCollateral";
 import { OnchainCollateralV3 } from "../../impermaxFactory/lendingPool";
 import { OnchainAccountCollateralV3 } from "../../account/lendingPool";
 import OnchainInteractionsLendingPoolV3 from "./onchainInteractionsLendingPoolV3";
+import OnchainInteractionsNftlp from "./nftlp";
 export default class OnchainInteractionsCollateralV3 extends OnchainInteractionsCollateral {
     protected readonly lendingPool: OnchainInteractionsLendingPoolV3;
     protected readonly collateral: OnchainCollateralV3;
+    protected readonly nftlp: OnchainInteractionsNftlp;
     constructor(interactionsLendingPool: OnchainInteractionsLendingPoolV3);
     getLendingPool: () => OnchainInteractionsLendingPoolV3;
     getCollateral: () => OnchainCollateralV3;
+    getNftlp: () => OnchainInteractionsNftlp;
     getInteractions: () => import("..").default;
     getAccountCollateral(): OnchainAccountCollateralV3;
 }

package/lib/onchain/interactions/lendingPool/onchainInteractionsCollateralV3.js

@@ -9,9 +9,11 @@ class OnchainInteractionsCollateralV3 extends onchainInteractionsCollateral_1.de
         super();
         this.getLendingPool = () => this.lendingPool;
         this.getCollateral = () => this.collateral;
+        this.getNftlp = () => this.nftlp;
         this.getInteractions = () => this.lendingPool.getInteractions();
         this.lendingPool = interactionsLendingPool;
         this.collateral = interactionsLendingPool.getLendingPool().getCollateral();
+        this.nftlp = interactionsLendingPool.getLendingPool().getNftlp().getNewInteractionsNftlpObject(this);
     }
     getAccountCollateral() {
         return this.lendingPool.getAccountLendingPool().getCollateral();

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV3.d.ts

@@ -13,7 +13,6 @@ export default class OnchainInteractionsLendingPoolV3 extends OnchainInteraction
         [Borrowable.A]: OnchainInteractionsBorrowableV3;
         [Borrowable.B]: OnchainInteractionsBorrowableV3;
     };
-    protected readonly nftlp: OnchainInteractionsNftlp;
     constructor(interactions: OnchainInteractions, lendingPool: OnchainLendingPoolV3);
     protected getNewCollateralObject(): OnchainInteractionsCollateralV3;
     protected getNewBorrowableObject(borrowable: Borrowable): OnchainInteractionsBorrowableV3;

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV3.js

@@ -16,8 +16,7 @@ class OnchainInteractionsLendingPoolV3 extends onchainInteractionsLendingPool_1.
         this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
         this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
         this.getCollateral = () => this.collateral;
-        this.getNftlp = () => this.nftlp;
-        this.nftlp = lendingPool.getNftlp().getNewInteractionsNftlpObject(this);
+        this.getNftlp = () => this.collateral.getNftlp();
     }
     getNewCollateralObject() {
         return new onchainInteractionsCollateralV3_1.default(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "2.1.57",
+  "version": "2.1.59",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",