impermax-sdk 2.1.58 → 2.1.60

package/lib/index.d.ts

@@ -5,7 +5,7 @@ import * as onchain from './onchain';
 import { CLAIM_AGGREGATOR } from './config/contracts/claim-aggregators';
 import { IMPERMAX_CHEF } from './config/contracts/impermax-chef';
 import { IMX } from './config/contracts/imxes';
-import { IMPERMAX_FACTORY, getNetworkFactories } from './config/contracts/impermax-factories';
+import { IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress } from './config/contracts/impermax-factories';
 import { MERKLE_DISTRIBUTOR_ETH, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2 } from './config/contracts/merkle-distributors';
 import { MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2 } from './config/endpoints/merkle-distributors';
 import { ROUTER } from './config/contracts/routers';
@@ -36,4 +36,5 @@ import OffchainVault, { OffchainLendingVault, OffchainLeveragedVault, OffchainHe
 import { SortDirection, VaultListOrderBy, VaultListParams, LendingPoolListParams, LendingPoolListOrderBy } from "./offchain/offchainMultichain";
 import { VaultRisk } from "./offchain/vault/offchainVault";
 import { LendingPoolVersion } from "./offchain/lendingPool/offchainLendingPool";
-export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableConfig, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PermitType, Permits, Permit, Borrowable };
+import { PositionType, AccountPosition } from "./offchain/account/offchainMultichainAccount";
+export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableConfig, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable };

package/lib/index.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsPoolToken = exports.OnchainInteractionsLendingPool = exports.OnchainInteractions = exports.OnchainImpermaxFactory = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountPoolToken = exports.OnchainAccountLendingPool = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainPoolToken = exports.OnchainLendingPool = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainPoolToken = exports.OffchainLendingPool = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
-exports.WhitelistState = exports.ProposalState = exports.Amms = exports.PoolTokenType = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.LENDING_VAULT_WATCHER = exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = void 0;
-exports.Borrowable = exports.PermitType = exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = void 0;
+exports.ProposalState = exports.Amms = exports.PoolTokenType = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.LENDING_VAULT_WATCHER = exports.getFactoryByAddress = exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = void 0;
+exports.Borrowable = exports.PermitType = exports.PositionType = exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.WhitelistState = void 0;
 const offchain_1 = __importStar(require("./offchain"));
 exports.Offchain = offchain_1.default;
 Object.defineProperty(exports, "OffchainAccount", { enumerable: true, get: function () { return offchain_1.OffchainAccount; } });
@@ -55,6 +55,7 @@ Object.defineProperty(exports, "IMX", { enumerable: true, get: function () { ret
 const impermax_factories_1 = require("./config/contracts/impermax-factories");
 Object.defineProperty(exports, "IMPERMAX_FACTORY", { enumerable: true, get: function () { return impermax_factories_1.IMPERMAX_FACTORY; } });
 Object.defineProperty(exports, "getNetworkFactories", { enumerable: true, get: function () { return impermax_factories_1.getNetworkFactories; } });
+Object.defineProperty(exports, "getFactoryByAddress", { enumerable: true, get: function () { return impermax_factories_1.getFactoryByAddress; } });
 const merkle_distributors_1 = require("./config/contracts/merkle-distributors");
 Object.defineProperty(exports, "MERKLE_DISTRIBUTOR_ETH", { enumerable: true, get: function () { return merkle_distributors_1.MERKLE_DISTRIBUTOR_ETH; } });
 Object.defineProperty(exports, "MERKLE_DISTRIBUTOR_IBEX", { enumerable: true, get: function () { return merkle_distributors_1.MERKLE_DISTRIBUTOR_IBEX; } });
@@ -170,3 +171,5 @@ const offchainVault_1 = require("./offchain/vault/offchainVault");
 Object.defineProperty(exports, "VaultRisk", { enumerable: true, get: function () { return offchainVault_1.VaultRisk; } });
 const offchainLendingPool_1 = require("./offchain/lendingPool/offchainLendingPool");
 Object.defineProperty(exports, "LendingPoolVersion", { enumerable: true, get: function () { return offchainLendingPool_1.LendingPoolVersion; } });
+const offchainMultichainAccount_1 = require("./offchain/account/offchainMultichainAccount");
+Object.defineProperty(exports, "PositionType", { enumerable: true, get: function () { return offchainMultichainAccount_1.PositionType; } });

package/lib/offchain/account/offchainMultichainAccount.d.ts

@@ -1,4 +1,4 @@
-import { Address, Networks } from "../../config/types";
+import { Address, Factory, Networks } from "../../config/types";
 import OffchainAccountLendingPool from "./lendingPool";
 import OffchainAccountVault from "./vault";
 import OffchainMultichain from "../offchainMultichain";
@@ -21,6 +21,20 @@ export declare enum VaultPositionsOrderBy {
 export interface VaultPositionsParams {
     networks?: Array<Networks>;
 }
+export declare enum PositionType {
+    MARKET = "Market",
+    VAULT = "Vault",
+    OTHER = "Other"
+}
+export type AccountPosition = {
+    id: Address;
+    network: Networks;
+    value: number;
+    type: PositionType;
+    name: string;
+    percentage: number;
+    factory: Factory | undefined;
+};
 export default class OffchainMultichainAccount {
     readonly offchainMultichain: OffchainMultichain;
     readonly accountAddress: Address;
@@ -33,5 +47,7 @@ export default class OffchainMultichainAccount {
     getVaultPositions(params?: VaultPositionsParams, orderBy?: VaultPositionsOrderBy): Promise<Array<OffchainAccountVault>>;
     getTotalBalanceUSD(): Promise<number>;
     getVaultsBalanceUSD(): Promise<number>;
+    getSupplyBalanceUSD(): Promise<number>;
+    getTopPositions(limit?: number): Promise<Array<AccountPosition>>;
     getNetAPR(): Promise<number>;
 }

package/lib/offchain/account/offchainMultichainAccount.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultPositionsOrderBy = exports.SupplyPositionsOrderBy = exports.LeveragedPositionsOrderBy = void 0;
+exports.PositionType = exports.VaultPositionsOrderBy = exports.SupplyPositionsOrderBy = exports.LeveragedPositionsOrderBy = void 0;
 const types_1 = require("../../config/types");
 var LeveragedPositionsOrderBy;
 (function (LeveragedPositionsOrderBy) {
@@ -23,6 +23,13 @@ var VaultPositionsOrderBy;
 (function (VaultPositionsOrderBy) {
     VaultPositionsOrderBy[VaultPositionsOrderBy["TVL"] = 0] = "TVL";
 })(VaultPositionsOrderBy = exports.VaultPositionsOrderBy || (exports.VaultPositionsOrderBy = {}));
+var PositionType;
+(function (PositionType) {
+    PositionType["MARKET"] = "Market";
+    PositionType["VAULT"] = "Vault";
+    PositionType["OTHER"] = "Other";
+})(PositionType = exports.PositionType || (exports.PositionType = {}));
+// TODO: Collateral positions
 class OffchainMultichainAccount {
     constructor(offchainMultichain, account) {
         this.getOffchainMultichain = () => this.offchainMultichain;
@@ -94,8 +101,11 @@ class OffchainMultichainAccount {
     // Account stats
     getTotalBalanceUSD() {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO: Markets
-            return this.getVaultsBalanceUSD();
+            const [vaultBalanceUSD, supplyBalanceUSD] = yield Promise.all([
+                this.getVaultsBalanceUSD(),
+                this.getSupplyBalanceUSD(),
+            ]);
+            return vaultBalanceUSD + supplyBalanceUSD;
         });
     }
     getVaultsBalanceUSD() {
@@ -105,6 +115,87 @@ class OffchainMultichainAccount {
             return depositedValue.reduce((acc, val) => acc + val, 0);
         });
     }
+    getSupplyBalanceUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const supplyPositions = yield this.getSupplyPositions();
+            const suppliedValue = yield Promise.all(supplyPositions.map((pool) => __awaiter(this, void 0, void 0, function* () {
+                const [valueA, valueB] = yield Promise.all([
+                    pool.getBorrowableA().getValue(),
+                    pool.getBorrowableB().getValue(),
+                ]);
+                return valueA + valueB;
+            })));
+            return suppliedValue.reduce((acc, val) => acc + val, 0);
+        });
+    }
+    // Gets the top positions for a user
+    getTopPositions(limit = 10) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [supplyPositions, vaultPositions] = yield Promise.all([
+                this.getSupplyPositions(),
+                this.getVaultPositions(),
+            ]);
+            // Lending Market positions
+            const supplyValues = yield Promise.all(supplyPositions.map((pool) => __awaiter(this, void 0, void 0, function* () {
+                const [valueA, valueB, symbolA, symbolB, network, data, factory] = yield Promise.all([
+                    pool.getBorrowableA().getValue(),
+                    pool.getBorrowableB().getValue(),
+                    pool.getBorrowableA().getPoolToken().getSymbol(),
+                    pool.getBorrowableB().getPoolToken().getSymbol(),
+                    pool.getLendingPool().getOffchain().network,
+                    pool.getLendingPool().getLendingPoolData(),
+                    pool.getLendingPool().getFactory()
+                ]);
+                const totalValue = valueA + valueB;
+                return {
+                    name: `${symbolA}/${symbolB}`,
+                    value: totalValue,
+                    type: PositionType.MARKET,
+                    network: network,
+                    id: data.id,
+                    factory: factory
+                };
+            })));
+            // Vault positions
+            const vaultValues = yield Promise.all(vaultPositions.map((vault) => __awaiter(this, void 0, void 0, function* () {
+                const [value, symbol, network, data] = yield Promise.all([
+                    vault.getValue(),
+                    vault.getPoolToken().getSymbol(),
+                    vault.getPoolToken().getOffchain().network,
+                    vault.getPoolToken().getPoolTokenData()
+                ]);
+                return {
+                    name: symbol,
+                    value: value,
+                    type: PositionType.VAULT,
+                    network: network,
+                    id: data.id,
+                    factory: undefined
+                };
+            })));
+            const allPositions = [...supplyValues, ...vaultValues].sort((a, b) => b.value - a.value);
+            const totalValue = allPositions.reduce((sum, pos) => sum + pos.value, 0);
+            if (allPositions.length <= limit || limit <= 1) {
+                return allPositions.map((pos) => (Object.assign(Object.assign({}, pos), { percentage: (pos.value / totalValue) * 100 })));
+            }
+            // Top N-1 positions and calculate "Other" 
+            const topNMinusOne = allPositions.slice(0, limit - 1);
+            const remainingPositions = allPositions.slice(limit - 1);
+            const remainingValue = remainingPositions.reduce((sum, pos) => sum + pos.value, 0);
+            const result = [
+                ...topNMinusOne,
+                {
+                    name: "Other",
+                    value: remainingValue,
+                    type: PositionType.OTHER,
+                    network: types_1.Networks.Mainnet,
+                    id: "",
+                    factory: undefined
+                },
+            ].map((pos) => (Object.assign(Object.assign({}, pos), { percentage: (pos.value / totalValue) * 100 })));
+            return result;
+        });
+    }
     getNetAPR() {
         return __awaiter(this, void 0, void 0, function* () {
             return 1;

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.58",
+  "version": "2.1.60",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",