impermax-sdk 2.1.449 → 2.1.451

package/lib/config/subgraphs.js

@@ -114,7 +114,7 @@ exports.IMPERMAX_SUBGRAPH_URL = {
         ],
         [types_1.Factory.V3]: [
             "https://base-factory-v3-production.up.railway.app/",
-            "https://gateway.thegraph.com/api/e9bbf185bbf657f7ea313387cdf0e5ce/deployments/id/QmXJ2ZJChdQadtVnviZgf2NsWkQHo7UvpR8BnmPZd5q1eG"
+            "https://gateway.thegraph.com/api/e9bbf185bbf657f7ea313387cdf0e5ce/deployments/id/QmNfoQmpxoKWxE4mqMiAJhchwyQGwLpBCTKwZ2oYtFP24V"
         ],
     },
     [types_1.Networks.Scroll]: {
@@ -164,7 +164,7 @@ exports.IMPERMAX_SUBGRAPH_URL = {
     [types_1.Networks.Unichain]: {
         [types_1.Factory.V3]: [
             'https://unichain-factoryv3-production.up.railway.app/',
-            'https://gateway.thegraph.com/api/e9bbf185bbf657f7ea313387cdf0e5ce/deployments/id/QmepRQA4dcnHnfBET4AEY4sJxRYc5x8hpKHjMTegP6z6rE'
+            'https://gateway.thegraph.com/api/e9bbf185bbf657f7ea313387cdf0e5ce/deployments/id/QmQCqDoFncFWGqadCZqFmkvPQ5TbH49vPvVcSzwaCmqCha'
         ]
     },
 };

package/lib/index.d.ts

@@ -45,7 +45,7 @@ import OnchainAccountLendingPoolV2 from './onchain/account/lendingPool/onchainAc
 import { decimalToBalance } from './utils/ether-utils';
 import OffchainAccountLendingPoolV3 from "./offchain/account/lendingPool/offchainAccountLendingPoolV3";
 import OffchainAccountNftlpUniswapV3 from './offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3';
-import OffchainAccountNftlpAerodromeV3 from './offchain/account/lendingPool/nftlp/offchainAccountNftlpAerodromeV3';
+import OffchainAccountNftlpAeroCL from './offchain/account/lendingPool/nftlp/offchainAccountNftlpAeroCL';
 import { MAX_TICK, MIN_TICK, formatPriceSqrtX96, clTickToPrice } from "./utils/nftlpMath/CLGeneral";
 import GenericCLPosition from './utils/position/cl';
 import UniswapV2Position from './utils/position/uniswapV2';
@@ -58,7 +58,7 @@ import OffchainBorrowableV2 from './offchain/lendingPool/offchainBorrowableV2';
 import OffchainCollateralV2 from './offchain/lendingPool/offchainCollateralV2';
 import OffchainBorrowableV3 from './offchain/lendingPool/offchainBorrowableV3';
 import OffchainLendingPoolV3 from './offchain/lendingPool/offchainLendingPoolV3';
-import OffchainNftlp, { OffchainNftlpUniswapV3, OffchainNftlpAerodromeV3 } from './offchain/lendingPool/nftlp';
+import OffchainNftlp, { OffchainNftlpUniswapV3, OffchainNftlpAeroCL } from './offchain/lendingPool/nftlp';
 import OffchainCollateralV3 from './offchain/lendingPool/offchainCollateralV3';
 import OffchainAccountLendingPoolV2 from './offchain/account/lendingPool/offchainAccountLendingPoolV2';
 import OffchainAccountBorrowableV2 from './offchain/account/lendingPool/offchainAccountBorrowableV2';
@@ -77,4 +77,4 @@ import OffchainAccountStakingModule from './offchain/account/staking';
 import OnchainStakingModule from './onchain';
 import OnchainInteractionsStakingModule from './onchain/interactions/onchainInteractionsStakingModule';
 import OnchainAccountStakingModule from './onchain/account/onchainAccountStakingModule';
-export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, OffchainAccountNftlpAerodromeV3, OffchainNftlpAerodromeV3, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XIbexData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, 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, XIBEX_SUBGRAPH_URL, Networks, Factory, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, clTickToPrice, isV3Factory, GenericCLPosition, UniswapV2Position, Position, BorrowableEntity, BorrowablePosition, LendingVaultEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams, AccountMarketData, OffchainStakingModule, IBEX, XIBEX, OffchainAccountStakingModule, OnchainStakingModule, OnchainInteractionsStakingModule, OnchainAccountStakingModule };
+export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, OffchainAccountNftlpAeroCL, OffchainNftlpAeroCL, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XIbexData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, 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, XIBEX_SUBGRAPH_URL, Networks, Factory, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, clTickToPrice, isV3Factory, GenericCLPosition, UniswapV2Position, Position, BorrowableEntity, BorrowablePosition, LendingVaultEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams, AccountMarketData, OffchainStakingModule, IBEX, XIBEX, OffchainAccountStakingModule, OnchainStakingModule, OnchainInteractionsStakingModule, OnchainAccountStakingModule };

package/lib/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnchainPoolToken = exports.OnchainImpermaxFactoryV3 = exports.OnchainImpermaxFactoryV2 = exports.OnchainImpermaxFactory = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainNftlpAerodromeV3 = exports.OffchainAccountNftlpAerodromeV3 = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountNftlpUniswapV3 = exports.OffchainAccountNftlp = exports.OffchainAccountBorrowableV3 = exports.OffchainAccountCollateralV3 = exports.OffchainAccountLendingPoolV3 = exports.OffchainAccountBorrowableV2 = exports.OffchainAccountCollateralV2 = exports.OffchainAccountLendingPoolV2 = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountLendingPool = exports.OffchainAccountPoolToken = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainNftlpUniswapV3 = exports.OffchainNftlp = exports.OffchainBorrowableV3 = exports.OffchainCollateralV3 = exports.OffchainLendingPoolV3 = exports.OffchainBorrowableV2 = exports.OffchainCollateralV2 = exports.OffchainLendingPoolV2 = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainLendingPool = exports.OffchainPoolToken = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
+exports.OnchainPoolToken = exports.OnchainImpermaxFactoryV3 = exports.OnchainImpermaxFactoryV2 = exports.OnchainImpermaxFactory = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainNftlpAeroCL = exports.OffchainAccountNftlpAeroCL = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountNftlpUniswapV3 = exports.OffchainAccountNftlp = exports.OffchainAccountBorrowableV3 = exports.OffchainAccountCollateralV3 = exports.OffchainAccountLendingPoolV3 = exports.OffchainAccountBorrowableV2 = exports.OffchainAccountCollateralV2 = exports.OffchainAccountLendingPoolV2 = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountLendingPool = exports.OffchainAccountPoolToken = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainNftlpUniswapV3 = exports.OffchainNftlp = exports.OffchainBorrowableV3 = exports.OffchainCollateralV3 = exports.OffchainLendingPoolV3 = exports.OffchainBorrowableV2 = exports.OffchainCollateralV2 = exports.OffchainLendingPoolV2 = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainLendingPool = exports.OffchainPoolToken = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
 exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsNftlpUniswapV3 = exports.OnchainInteractionsNftlp = exports.OnchainInteractionsBorrowableV3 = exports.OnchainInteractionsCollateralV3 = exports.OnchainInteractionsLendingPoolV3 = exports.OnchainInteractionsBorrowableV2 = exports.OnchainInteractionsCollateralV2 = exports.OnchainInteractionsLendingPoolV2 = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsLendingPool = exports.OnchainInteractionsPoolToken = exports.OnchainInteractions = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountNftlpUniswapV3 = exports.OnchainAccountNftlp = exports.OnchainAccountCollateralV3 = exports.OnchainAccountBorrowableV3 = exports.OnchainAccountLendingPoolV3 = exports.OnchainAccountCollateralV2 = exports.OnchainAccountBorrowableV2 = exports.OnchainAccountLendingPoolV2 = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountLendingPool = exports.OnchainAccountPoolToken = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainNftlpUniswapV3 = exports.OnchainNftlp = exports.OnchainCollateralV3 = exports.OnchainBorrowableV3 = exports.OnchainLendingPoolV3 = exports.OnchainCollateralV2 = exports.OnchainBorrowableV2 = exports.OnchainLendingPoolV2 = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainLendingPool = void 0;
 exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.WhitelistState = exports.ProposalState = exports.Amms = exports.PoolTokenType = exports.Extension = exports.Factory = exports.Networks = exports.XIBEX_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 = void 0;
 exports.OnchainAccountStakingModule = exports.OnchainInteractionsStakingModule = exports.OnchainStakingModule = exports.OffchainAccountStakingModule = exports.XIBEX = exports.IBEX = exports.OffchainStakingModule = exports.LendingVaultEntity = exports.BorrowablePosition = exports.BorrowableEntity = exports.UniswapV2Position = exports.GenericCLPosition = exports.isV3Factory = exports.clTickToPrice = exports.formatPriceSqrtX96 = exports.MIN_TICK = exports.MAX_TICK = exports.decimalToBalance = exports.Borrowable = exports.PermitType = exports.PositionType = void 0;
@@ -217,8 +217,8 @@ const offchainAccountLendingPoolV3_1 = __importDefault(require("./offchain/accou
 exports.OffchainAccountLendingPoolV3 = offchainAccountLendingPoolV3_1.default;
 const offchainAccountNftlpUniswapV3_1 = __importDefault(require("./offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3"));
 exports.OffchainAccountNftlpUniswapV3 = offchainAccountNftlpUniswapV3_1.default;
-const offchainAccountNftlpAerodromeV3_1 = __importDefault(require("./offchain/account/lendingPool/nftlp/offchainAccountNftlpAerodromeV3"));
-exports.OffchainAccountNftlpAerodromeV3 = offchainAccountNftlpAerodromeV3_1.default;
+const offchainAccountNftlpAeroCL_1 = __importDefault(require("./offchain/account/lendingPool/nftlp/offchainAccountNftlpAeroCL"));
+exports.OffchainAccountNftlpAeroCL = offchainAccountNftlpAeroCL_1.default;
 const CLGeneral_1 = require("./utils/nftlpMath/CLGeneral");
 Object.defineProperty(exports, "MAX_TICK", { enumerable: true, get: function () { return CLGeneral_1.MAX_TICK; } });
 Object.defineProperty(exports, "MIN_TICK", { enumerable: true, get: function () { return CLGeneral_1.MIN_TICK; } });
@@ -247,7 +247,7 @@ exports.OffchainLendingPoolV3 = offchainLendingPoolV3_1.default;
 const nftlp_2 = __importStar(require("./offchain/lendingPool/nftlp"));
 exports.OffchainNftlp = nftlp_2.default;
 Object.defineProperty(exports, "OffchainNftlpUniswapV3", { enumerable: true, get: function () { return nftlp_2.OffchainNftlpUniswapV3; } });
-Object.defineProperty(exports, "OffchainNftlpAerodromeV3", { enumerable: true, get: function () { return nftlp_2.OffchainNftlpAerodromeV3; } });
+Object.defineProperty(exports, "OffchainNftlpAeroCL", { enumerable: true, get: function () { return nftlp_2.OffchainNftlpAeroCL; } });
 const offchainCollateralV3_1 = __importDefault(require("./offchain/lendingPool/offchainCollateralV3"));
 exports.OffchainCollateralV3 = offchainCollateralV3_1.default;
 const offchainAccountLendingPoolV2_1 = __importDefault(require("./offchain/account/lendingPool/offchainAccountLendingPoolV2"));

package/lib/offchain/account/lendingPool/nftlp/{offchainAccountNftlpAerodromeV3.d.ts → offchainAccountNftlpAeroCL.d.ts}

@@ -16,10 +16,10 @@ interface PositionData {
         };
     };
 }
-export type AerodromeV3PositionData = NftlpPosition & {
+export type AeroCLPositionData = NftlpPosition & {
     nftlp: PositionData;
 };
-export default class OffchainAccountNftlpAerodromeV3 extends OffchainAccountNftlp {
+export default class OffchainAccountNftlpAeroCL extends OffchainAccountNftlp {
     protected cache: {
         positionsData?: {
             [keys in number]: Promise<PositionData>;
@@ -32,7 +32,7 @@ export default class OffchainAccountNftlpAerodromeV3 extends OffchainAccountNftl
         };
     };
     getNftlp: () => any;
-    getTokenPositions(): Promise<Record<string, AerodromeV3PositionData>>;
+    getTokenPositions(): Promise<Record<string, AeroCLPositionData>>;
     getPositionData(tokenId: number): Promise<PositionData>;
     getFee(tokenId: number): Promise<number>;
     getTickLower(tokenId: number): Promise<number>;

package/lib/offchain/account/lendingPool/nftlp/{offchainAccountNftlpAerodromeV3.js → offchainAccountNftlpAeroCL.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const offchainAccountNftlp_1 = __importDefault(require("./offchainAccountNftlp"));
 const CLGeneral_1 = require("../../../../utils/nftlpMath/CLGeneral");
 const cl_1 = __importDefault(require("../../../../utils/position/cl"));
-class OffchainAccountNftlpAerodromeV3 extends offchainAccountNftlp_1.default {
+class OffchainAccountNftlpAeroCL extends offchainAccountNftlp_1.default {
     constructor() {
         super(...arguments);
         this.cache = {};
@@ -109,4 +109,4 @@ class OffchainAccountNftlpAerodromeV3 extends offchainAccountNftlp_1.default {
         return storedTotalRewardEarned + newlyEarnedReward;
     }
 }
-exports.default = OffchainAccountNftlpAerodromeV3;
+exports.default = OffchainAccountNftlpAeroCL;

package/lib/offchain/lendingPool/nftlp/index.d.ts

@@ -1,5 +1,5 @@
 import OffchainNftlp from './offchainNftlp';
 import OffchainNftlpUniswapV3 from './offchainNftlpUniswapV3';
-import OffchainNftlpAerodromeV3 from './offchainNftlpAerodromeV3';
-export { OffchainNftlp, OffchainNftlpUniswapV3, OffchainNftlpAerodromeV3 };
+import OffchainNftlpAeroCL from './offchainNftlpAeroCL';
+export { OffchainNftlp, OffchainNftlpUniswapV3, OffchainNftlpAeroCL };
 export default OffchainNftlp;

package/lib/offchain/lendingPool/nftlp/index.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OffchainNftlpAerodromeV3 = exports.OffchainNftlpUniswapV3 = exports.OffchainNftlp = void 0;
+exports.OffchainNftlpAeroCL = exports.OffchainNftlpUniswapV3 = exports.OffchainNftlp = void 0;
 const offchainNftlp_1 = __importDefault(require("./offchainNftlp"));
 exports.OffchainNftlp = offchainNftlp_1.default;
 const offchainNftlpUniswapV3_1 = __importDefault(require("./offchainNftlpUniswapV3"));
 exports.OffchainNftlpUniswapV3 = offchainNftlpUniswapV3_1.default;
-const offchainNftlpAerodromeV3_1 = __importDefault(require("./offchainNftlpAerodromeV3"));
-exports.OffchainNftlpAerodromeV3 = offchainNftlpAerodromeV3_1.default;
+const offchainNftlpAeroCL_1 = __importDefault(require("./offchainNftlpAeroCL"));
+exports.OffchainNftlpAeroCL = offchainNftlpAeroCL_1.default;
 exports.default = offchainNftlp_1.default;

package/lib/offchain/lendingPool/nftlp/offchainNftlpAeroCL.d.ts

@@ -0,0 +1,12 @@
+import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
+import OffchainAccountNftlpAeroCL from "../../account/lendingPool/nftlp/offchainAccountNftlpAeroCL";
+import { Extension } from "../../../config/types";
+import OffchainNftlpGenericCL from "./offchainNftlpGenericCL";
+export default class OffchainNftlpAeroCL extends OffchainNftlpGenericCL {
+    getExtension(): Extension;
+    getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpAeroCL;
+    protected tickSpacings: () => number[];
+    initializeFullRangeRateAccurate(tickSpacing: number): Promise<number>;
+    getRewardsToken(): Promise<string | undefined>;
+    getRewardsTokenPrice(): Promise<number>;
+}

package/lib/offchain/lendingPool/nftlp/offchainNftlpAeroCL.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const offchainAccountNftlpAeroCL_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpAeroCL"));
+const types_1 = require("../../../config/types");
+const offchainNftlpGenericCL_1 = __importDefault(require("./offchainNftlpGenericCL"));
+const aeroCLGeneral_1 = require("../../../utils/nftlpMath/aeroCLGeneral");
+const Q128 = 2 ** 128;
+const Q256 = BigInt(2) ** BigInt(256);
+const AERO_POOL_CONFIGS = [
+    { tickSpacing: 1, fee: 100 / 10000 },
+    { tickSpacing: 50, fee: 500 / 10000 },
+    { tickSpacing: 100, fee: 500 / 10000 },
+    { tickSpacing: 200, fee: 3000 / 10000 },
+    { tickSpacing: 2000, fee: 10000 / 10000 },
+];
+class OffchainNftlpAeroCL extends offchainNftlpGenericCL_1.default {
+    constructor() {
+        super(...arguments);
+        this.tickSpacings = () => aeroCLGeneral_1.AERO_TICK_SPACINGS;
+    }
+    getExtension() {
+        return types_1.Extension.AeroCL;
+    }
+    getNewAccountNftlpObject(accountCollateral) {
+        return new offchainAccountNftlpAeroCL_1.default(accountCollateral);
+    }
+    // TODO
+    /*public async getFullRangeRateAndTvl(tickSpacing: number): Promise<{
+      fullRangeRate: number,
+      tvlUsd: number,
+    }> {
+      const zero = { fullRangeRate: 0, tvlUsd: 0 };
+      return zero;
+      // TODO
+    }*/
+    async initializeFullRangeRateAccurate(tickSpacing) {
+        return 0;
+        // TODO
+    }
+    async getRewardsToken() {
+        return undefined;
+        // TODO
+        //const nftlpData = await this.getNftlpData()  as NftlpGenericCLData;
+        //return nftlpData.factory?.rewardsToken?.id
+    }
+    async getRewardsTokenPrice() {
+        const rewardsToken = await this.getRewardsToken();
+        if (!rewardsToken)
+            return 0;
+        const offchain = this.getLendingPool().getOffchain();
+        return offchain.getPriceHelper().getTokenPrice(offchain.network, rewardsToken);
+    }
+}
+exports.default = OffchainNftlpAeroCL;

package/lib/offchain/lendingPool/nftlp/offchainNftlpGenericCL.d.ts

@@ -0,0 +1,35 @@
+import OffchainNftlp from "./offchainNftlp";
+import { Address } from "../../../config/types";
+export default abstract class OffchainNftlpGenericCL extends OffchainNftlp {
+    protected cache: {
+        marketPrice?: Promise<number>;
+        oraclePrice?: Promise<number>;
+        clPools?: {
+            [key in number]: Promise<{
+                address?: Address;
+                liquidity: number;
+            }>;
+        };
+        fullRangeRateAccurate?: {
+            [key in number]: Promise<number>;
+        };
+    };
+    protected abstract tickSpacings(): Array<number>;
+    private priceAdjustment;
+    tickToPrice(tick: number): Promise<number>;
+    protected initializeMarketPrice(): Promise<number>;
+    protected initializeGenericCLPool(tickSpacing: number): Promise<{
+        address?: Address;
+        liquidity: number;
+    }>;
+    getGenericCLPool(tickSpacing: number): Promise<{
+        address?: Address;
+        liquidity: number;
+    }>;
+    getGlobalTvl(tickSpacing: number): Promise<number>;
+    abstract initializeFullRangeRateAccurate(tickSpacing: number): Promise<number>;
+    getFullRangeRateAccurate(tickSpacing: number): Promise<number>;
+    getFullRangeRate(tickSpacing: number): Promise<number>;
+    getBestFullRangeRate(): Promise<number>;
+    getTotalAPR(): Promise<number>;
+}

package/lib/offchain/lendingPool/nftlp/offchainNftlpGenericCL.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const offchainNftlp_1 = __importDefault(require("./offchainNftlp"));
+const CLGeneral_1 = require("../../../utils/nftlpMath/CLGeneral");
+const utils_1 = require("../../../utils");
+class OffchainNftlpGenericCL extends offchainNftlp_1.default {
+    constructor() {
+        super(...arguments);
+        this.cache = {};
+    }
+    async priceAdjustment() {
+        const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
+        const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
+        return (0, CLGeneral_1.clPriceAdjustment)(decimalsA, decimalsB);
+    }
+    async tickToPrice(tick) {
+        const priceAdjustment = await this.priceAdjustment();
+        return (0, CLGeneral_1.clTickToPrice)(tick, priceAdjustment);
+    }
+    async initializeMarketPrice() {
+        const lendingPool = this.getLendingPool();
+        const [priceA, priceB] = await Promise.all([
+            lendingPool.getBorrowableA().getTokenPriceAccurate(),
+            lendingPool.getBorrowableB().getTokenPriceAccurate()
+        ]);
+        if (!priceA || !priceB) {
+            console.warn("Can't calculate price for", await this.getLendingPool().getBorrowableA().getSymbol(), await this.getLendingPool().getBorrowableB().getSymbol());
+            return NaN;
+        }
+        return priceA / priceB;
+    }
+    // get basic UniswapV3Pool info given the tickSpacing
+    // used for calculating the apr
+    async initializeGenericCLPool(tickSpacing) {
+        const nftlpUniswapV3Data = await this.getNftlpData();
+        const pools = nftlpUniswapV3Data.uniswapV3Pools;
+        for (let pool of pools) {
+            if (parseInt(pool.tickSpacing) == tickSpacing) {
+                const liquidity = parseInt(pool.liquidity);
+                const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
+                const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
+                return {
+                    address: pool.uniswapV3PoolId,
+                    liquidity: (0, CLGeneral_1.formatCLLiquidity)(liquidity, decimalsA, decimalsB),
+                };
+            }
+        }
+        return {
+            address: undefined,
+            liquidity: 0,
+        };
+    }
+    async getGenericCLPool(tickSpacing) {
+        if (!this.cache.clPools)
+            this.cache.clPools = {};
+        if (!this.cache.clPools[tickSpacing])
+            this.cache.clPools[tickSpacing] = this.initializeGenericCLPool(tickSpacing);
+        return this.cache.clPools[tickSpacing];
+    }
+    /*
+     * TVL AND APR
+     */
+    // TODO is getFullRangeRateAndTvl still needed?
+    /*public abstract getFullRangeRateAndTvl(tickSpacing: number): Promise<{
+      fullRangeRate: number,
+      tvlUsd: number,
+    }>;
+    public async getFullRangeRateDefillama(tickSpacing: number) {
+      return (await this.getFullRangeRateAndTvl(tickSpacing)).fullRangeRate;
+    }
+    public async getGlobalTvlDefillama(tickSpacing: number) {
+      return (await this.getFullRangeRateAndTvl(tickSpacing)).tvlUsd;
+    }
+  
+    // calculate apr based on the weighted avg of all the available fees
+    public async getWeightedAvgFullRangeRate() {
+      let totalTvl = 0;
+      let totalCompoundedRate = 0;
+      for (const tickSpacing of this.tickSpacings()) {
+        const { fullRangeRate, tvlUsd } = await this.getFullRangeRateAndTvl(tickSpacing);
+        totalTvl += tvlUsd;
+        totalCompoundedRate += fullRangeRate * tvlUsd;
+      }
+      return totalTvl > 0 ? totalCompoundedRate / totalTvl : 0;
+    }*/
+    async getGlobalTvl(tickSpacing) {
+        const nftlpUniswapV3Data = await this.getNftlpData();
+        const pools = nftlpUniswapV3Data.uniswapV3Pools;
+        for (let pool of pools) {
+            if (parseInt(pool.tickSpacing) == tickSpacing) {
+                const reserve0 = parseFloat(pool.reserve0);
+                const reserve1 = parseFloat(pool.reserve1);
+                const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
+                const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
+                return reserve0 * priceA + reserve1 * priceB;
+            }
+        }
+        return 0;
+    }
+    async getFullRangeRateAccurate(tickSpacing) {
+        if (!this.cache.fullRangeRateAccurate)
+            this.cache.fullRangeRateAccurate = {};
+        if (!this.cache.fullRangeRateAccurate[tickSpacing])
+            this.cache.fullRangeRateAccurate[tickSpacing] = this.initializeFullRangeRateAccurate(tickSpacing);
+        return this.cache.fullRangeRateAccurate[tickSpacing];
+    }
+    async getFullRangeRate(tickSpacing) {
+        return await this.getFullRangeRateAccurate(tickSpacing);
+    }
+    async getBestFullRangeRate() {
+        let bestRate = 0;
+        for (const tickSpacing of this.tickSpacings()) {
+            const rate = await this.getFullRangeRateAccurate(tickSpacing);
+            bestRate = Math.max(bestRate, rate);
+        }
+        return bestRate;
+    }
+    // calculate the pair APR assuming a +-8% price range
+    async getTotalAPR() {
+        const fullRangeAPR = await this.getBestFullRangeRate() * utils_1.SECONDS_IN_YEAR;
+        const isStable = await this.getLendingPool().isStablePair();
+        const adjustment = isStable ? 1.0005 : 1.08;
+        return fullRangeAPR * (0, CLGeneral_1.clConcentrationFactor)(1 / adjustment, adjustment);
+    }
+}
+exports.default = OffchainNftlpGenericCL;

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.d.ts

@@ -1,45 +1,10 @@
-import OffchainNftlp from "./offchainNftlp";
 import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
 import OffchainAccountNftlpUniswapV3 from "../../account/lendingPool/nftlp/offchainAccountNftlpUniswapV3";
-import { Address, Extension } from "../../../config/types";
-export default class OffchainNftlpUniswapV3 extends OffchainNftlp {
-    protected cache: {
-        marketPrice?: Promise<number>;
-        oraclePrice?: Promise<number>;
-        uniswapV3Pools?: {
-            [key in number]: Promise<{
-                address?: Address;
-                liquidity: number;
-            }>;
-        };
-        fullRangeRateAccurate?: {
-            [key in number]: Promise<number>;
-        };
-    };
+import { Extension } from "../../../config/types";
+import OffchainNftlpGenericCL from "./offchainNftlpGenericCL";
+export default class OffchainNftlpUniswapV3 extends OffchainNftlpGenericCL {
     getExtension(): Extension;
     getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpUniswapV3;
-    private priceAdjustment;
-    tickToPrice(tick: number): Promise<number>;
-    protected initializeMarketPrice(): Promise<number>;
-    protected initializeUniswapV3Pool(fee: number): Promise<{
-        address?: Address;
-        liquidity: number;
-    }>;
-    getUniswapV3Pool(fee: number): Promise<{
-        address?: Address;
-        liquidity: number;
-    }>;
-    getFullRangeRateAndTvl(fee: number): Promise<{
-        fullRangeRate: number;
-        tvlUsd: number;
-    }>;
-    getFullRangeRateDefillama(fee: number): Promise<number>;
-    getGlobalTvlDefillama(fee: number): Promise<number>;
-    getGlobalTvl(fee: number): Promise<number>;
-    initializeFullRangeRateAccurate(fee: number): Promise<number>;
-    getFullRangeRateAccurate(fee: number): Promise<number>;
-    getFullRangeRate(fee: number): Promise<number>;
-    getWeightedAvgFullRangeRate(): Promise<number>;
-    getBestFullRangeRate(): Promise<number>;
-    getTotalAPR(): Promise<number>;
+    protected tickSpacings: () => number[];
+    initializeFullRangeRateAccurate(tickSpacing: number): Promise<number>;
 }

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.js

@@ -3,19 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// offchainNftlpUniswapV3.ts
-const offchainNftlp_1 = __importDefault(require("./offchainNftlp"));
 const offchainAccountNftlpUniswapV3_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpUniswapV3"));
-const CLGeneral_1 = require("../../../utils/nftlpMath/CLGeneral");
 const types_1 = require("../../../config/types");
-const utils_1 = require("../../../utils");
 const uniswapV3General_1 = require("../../../utils/nftlpMath/uniswapV3General");
+const offchainNftlpGenericCL_1 = __importDefault(require("./offchainNftlpGenericCL"));
 const Q128 = 2 ** 128;
 const Q256 = BigInt(2) ** BigInt(256);
-class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
+class OffchainNftlpUniswapV3 extends offchainNftlpGenericCL_1.default {
     constructor() {
         super(...arguments);
-        this.cache = {};
+        this.tickSpacings = () => uniswapV3General_1.UNIV3_TICK_SPACINGS;
     }
     getExtension() {
         return types_1.Extension.UniswapV3;
@@ -23,117 +20,59 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
     getNewAccountNftlpObject(accountCollateral) {
         return new offchainAccountNftlpUniswapV3_1.default(accountCollateral);
     }
-    async priceAdjustment() {
-        const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
-        const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
-        return (0, CLGeneral_1.clPriceAdjustment)(decimalsA, decimalsB);
-    }
-    async tickToPrice(tick) {
-        const priceAdjustment = await this.priceAdjustment();
-        return (0, CLGeneral_1.clTickToPrice)(tick, priceAdjustment);
-    }
-    async initializeMarketPrice() {
-        const lendingPool = this.getLendingPool();
-        const [priceA, priceB] = await Promise.all([
-            lendingPool.getBorrowableA().getTokenPriceAccurate(),
-            lendingPool.getBorrowableB().getTokenPriceAccurate()
-        ]);
-        if (!priceA || !priceB) {
-            console.warn("Can't calculate price for", await this.getLendingPool().getBorrowableA().getSymbol(), await this.getLendingPool().getBorrowableB().getSymbol());
-            return NaN;
-        }
-        return priceA / priceB;
-    }
-    // get basic UniswapV3Pool info given a fee
-    // used for calculating the apr
-    async initializeUniswapV3Pool(fee) {
-        const feeRaw = fee * 1000000;
-        const nftlpUniswapV3Data = await this.getNftlpData();
-        const pools = nftlpUniswapV3Data.uniswapV3Pools;
-        for (let pool of pools) {
-            if (parseInt(pool.fee) == feeRaw) {
-                const liquidity = parseInt(pool.liquidity);
-                const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
-                const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
-                return {
-                    address: pool.uniswapV3PoolId,
-                    liquidity: (0, CLGeneral_1.formatCLLiquidity)(liquidity, decimalsA, decimalsB),
-                };
-            }
-        }
-        return {
-            address: undefined,
-            liquidity: 0,
-        };
-    }
-    async getUniswapV3Pool(fee) {
-        if (!this.cache.uniswapV3Pools)
-            this.cache.uniswapV3Pools = {};
-        if (!this.cache.uniswapV3Pools[fee])
-            this.cache.uniswapV3Pools[fee] = this.initializeUniswapV3Pool(fee);
-        return this.cache.uniswapV3Pools[fee];
-    }
+    /*
+     * TVL AND APR
+     */
     // thorugh the fullRangeRate we can calculate the rate of all ranges
     // this is the fastest way to get the APR but returns a more volatile result
-    async getFullRangeRateAndTvl(fee) {
-        const zero = { fullRangeRate: 0, tvlUsd: 0 };
-        // get a pool or return 0
-        const pool = await this.getUniswapV3Pool(fee);
-        if (!pool.address)
-            return zero;
-        // use llama API to get the APR based on last 7 days fees
-        // the APR is calculated as: total reward / tvl
-        const offchain = this.getLendingPool().getOffchain();
-        const { apyBase, volumeUsd1d, volumeUsd7d, tvlUsd, } = await offchain.getAPRHelper().getLlamaYieldsUniswapV3(pool.address, offchain.network);
-        if (tvlUsd === 0)
-            return zero;
-        //const llamaApyBase = apyBase / 100;
-        //const apr1dFees = volumeUsd1d * fee * 365 / tvlUsd;
-        const apr7dFees = volumeUsd7d * fee / 7 * 365 / tvlUsd;
-        // convert llama apy to rate
-        const avgRate = apr7dFees / utils_1.SECONDS_IN_YEAR;
-        // calculate the usd price of 1 unit of formatted liquidity
-        const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
-        const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
-        const baseLiquidityPrice = Math.sqrt(priceA * priceB) * 2;
-        // baseLiqudiityUsd -> how much the liquidity would be worth if it wasn't concentrated
-        const baseLiquidityUsd = pool.liquidity * baseLiquidityPrice;
-        if (baseLiquidityUsd === 0)
-            return zero;
-        const avgConcentrationFactor = baseLiquidityUsd / tvlUsd;
-        const fullRangeRate = avgRate / avgConcentrationFactor;
-        return { fullRangeRate, tvlUsd };
-    }
-    async getFullRangeRateDefillama(fee) {
-        return (await this.getFullRangeRateAndTvl(fee)).fullRangeRate;
-    }
-    async getGlobalTvlDefillama(fee) {
-        return (await this.getFullRangeRateAndTvl(fee)).tvlUsd;
-    }
-    async getGlobalTvl(fee) {
-        const feeRaw = fee * 1000000;
-        const nftlpUniswapV3Data = await this.getNftlpData();
-        const pools = nftlpUniswapV3Data.uniswapV3Pools;
-        for (let pool of pools) {
-            if (parseInt(pool.fee) == feeRaw) {
-                const reserve0 = parseFloat(pool.reserve0);
-                const reserve1 = parseFloat(pool.reserve1);
-                const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
-                const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
-                return reserve0 * priceA + reserve1 * priceB;
-            }
-        }
-        return 0;
-        return this.getGlobalTvlDefillama(fee);
-    }
+    /*public async getFullRangeRateAndTvl(tickSpacing: number): Promise<{
+      fullRangeRate: number,
+      tvlUsd: number,
+    }> {
+      const zero = { fullRangeRate: 0, tvlUsd: 0 };
+  
+      // get a pool or return 0
+      const pool = await this.getGenericCLPool(tickSpacing);
+      if (!pool.address) return zero;
+  
+      // use llama API to get the APR based on last 7 days fees
+      // the APR is calculated as: total reward / tvl
+      const offchain = this.getLendingPool().getOffchain();
+      const {
+        apyBase,
+        volumeUsd1d,
+        volumeUsd7d,
+        tvlUsd,
+      } = await offchain.getAPRHelper().getLlamaYieldsUniswapV3(pool.address, offchain.network);
+      if (tvlUsd === 0) return zero;
+      //const llamaApyBase = apyBase / 100;
+      //const apr1dFees = volumeUsd1d * fee * 365 / tvlUsd;
+      const apr7dFees = volumeUsd7d * uniV3TickSpacingToFee(tickSpacing) / 1e6 / 7 * 365 / tvlUsd;
+  
+      // convert llama apy to rate
+      const avgRate = apr7dFees / SECONDS_IN_YEAR;
+  
+      // calculate the usd price of 1 unit of formatted liquidity
+      const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
+      const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
+      const baseLiquidityPrice = Math.sqrt(priceA * priceB) * 2;
+  
+      // baseLiqudiityUsd -> how much the liquidity would be worth if it wasn't concentrated
+      const baseLiquidityUsd = pool.liquidity * baseLiquidityPrice;
+      if (baseLiquidityUsd === 0) return zero;
+  
+      const avgConcentrationFactor = baseLiquidityUsd / tvlUsd;
+      const fullRangeRate = avgRate / avgConcentrationFactor;
+      return { fullRangeRate, tvlUsd };
+    }*/
     // The more accurate way to get the apr is to calculate the delta between the current feeGrowthGlobal
     // and a feeGrowthGlobal at a previous point in time,
     // but this currently requires a separate call for each fee tier
-    async initializeFullRangeRateAccurate(fee) {
+    async initializeFullRangeRateAccurate(tickSpacing) {
         // To calculate the apr, we compare the current feeGrowthGlobal with the feeGrowthGlobal of 7 days ago.
         // If less than 7 days of data are available, then we use the oldest feeGrowthGlobal available
         const OLDEST_USABLE_DATA = 7 * 24 * 60 * 60;
-        const { address } = await this.getUniswapV3Pool(fee);
+        const { address } = await this.getGenericCLPool(tickSpacing);
         if (!address)
             return 0;
         let feeGrowthData = [];
@@ -174,41 +113,5 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         // which essentially is the full range rewardRate
         return Math.sqrt(rewardRate0 * rewardRate1);
     }
-    async getFullRangeRateAccurate(fee) {
-        if (!this.cache.fullRangeRateAccurate)
-            this.cache.fullRangeRateAccurate = {};
-        if (!this.cache.fullRangeRateAccurate[fee])
-            this.cache.fullRangeRateAccurate[fee] = this.initializeFullRangeRateAccurate(fee);
-        return this.cache.fullRangeRateAccurate[fee];
-    }
-    async getFullRangeRate(fee) {
-        return await this.getFullRangeRateAccurate(fee);
-    }
-    // calculate apr based on the weighted avg of all the available fees
-    async getWeightedAvgFullRangeRate() {
-        let totalTvl = 0;
-        let totalCompoundedRate = 0;
-        for (const tickSpacing of uniswapV3General_1.UNIV3_TICK_SPACINGS) {
-            const { fullRangeRate, tvlUsd } = await this.getFullRangeRateAndTvl(tickSpacing);
-            totalTvl += tvlUsd;
-            totalCompoundedRate += fullRangeRate * tvlUsd;
-        }
-        return totalTvl > 0 ? totalCompoundedRate / totalTvl : 0;
-    }
-    async getBestFullRangeRate() {
-        let bestRate = 0;
-        for (const tickSpacing of uniswapV3General_1.UNIV3_TICK_SPACINGS) {
-            const rate = await this.getFullRangeRateAccurate(tickSpacing);
-            bestRate = Math.max(bestRate, rate);
-        }
-        return bestRate;
-    }
-    // calculate the pair APR assuming a +-8% price range
-    async getTotalAPR() {
-        const fullRangeAPR = await this.getBestFullRangeRate() * utils_1.SECONDS_IN_YEAR;
-        const isStable = await this.getLendingPool().isStablePair();
-        const adjustment = isStable ? 1.0005 : 1.08;
-        return fullRangeAPR * (0, CLGeneral_1.clConcentrationFactor)(1 / adjustment, adjustment);
-    }
 }
 exports.default = OffchainNftlpUniswapV3;

package/lib/offchain/lendingPool/offchainCollateralV3.js

@@ -14,7 +14,7 @@ class OffchainCollateralV3 extends offchainCollateral_1.default {
             case types_1.Extension.UniswapV3:
                 return new offchainNftlpUniswapV3_1.default(this);
             case types_1.Extension.AeroCL:
-                return new nftlp_1.OffchainNftlpAerodromeV3(this);
+                return new nftlp_1.OffchainNftlpAeroCL(this);
             case types_1.Extension.UniswapV2:
                 throw new Error(`NFTLP UniswapV2 not yet implemented`);
             case types_1.Extension.AerodromeV2:

package/lib/offchain/offchainTypes.d.ts

@@ -137,19 +137,20 @@ export interface NftlpFactory {
     allNftlpsLength: string;
     oracle: Address;
 }
-export interface UniswapV3PoolData {
+export interface GenericCLPoolData {
     liquidity: string;
+    tickSpacing: string;
     fee: string;
     reserve0: string;
     reserve1: string;
     uniswapV3PoolId: Address;
 }
-export interface NftlpUniswapV3Data {
+export interface NftlpGenericCLData {
     dex: Extension;
     id: Address;
     dexFactory: Address;
     factory: NftlpFactory;
-    uniswapV3Pools: UniswapV3PoolData[];
+    uniswapV3Pools: GenericCLPoolData[];
 }
 export interface NftlpUniswapV2Data {
     dex: Extension;
@@ -157,24 +158,7 @@ export interface NftlpUniswapV2Data {
     factory: NftlpFactory;
     dexFactory: Address;
 }
-export interface AerodromeV3PoolData {
-    liquidity: string;
-    tickSpacing: string;
-    fee: string;
-    reserve0: string;
-    reserve1: string;
-    aerodromeV3PoolId: Address;
-}
-export interface NftlpAerodromeV3Data {
-    dex: Extension;
-    id: Address;
-    dexFactory: Address;
-    factory: NftlpFactory & {
-        rewardsToken: TokenData;
-    };
-    aerodromeV3Pools: AerodromeV3PoolData[];
-}
-export type NftlpData = NftlpUniswapV3Data | NftlpUniswapV2Data | NftlpAerodromeV3Data;
+export type NftlpData = NftlpGenericCLData | NftlpUniswapV2Data;
 export interface NftlpPosition {
     id: string;
     tokenId: string;

package/lib/offchain/queries/apis/ponder/index.d.ts

@@ -18,7 +18,7 @@ export declare class PonderQueryBuilder implements IQueryBuilder {
     nftlpsQuery(extension: Extension, network: Networks): DocumentNode;
     nftlpPositionQuery(extension: Extension, positionIds: string[]): DocumentNode;
     private nftlpUniswapV3PositionsQuery;
-    private nftlpAerodromeV3PositionsQuery;
+    private nftlpAeroCLPositionsQuery;
     borrowersListQuery(factory: Factory): DocumentNode;
     borrowersListQueryV2(): DocumentNode;
     borrowersListQueryV3(): DocumentNode;

package/lib/offchain/queries/apis/ponder/index.js

@@ -416,7 +416,7 @@ class PonderQueryBuilder {
      *   NFTLP
      *-----------------------------*/
     nftlpsQuery(extension, network) {
-        if (extension === types_1.Extension.UniswapV3) {
+        if (extension === types_1.Extension.UniswapV3 || extension === types_1.Extension.AeroCL) {
             return (0, graphql_tag_1.default) `{
         nftlps(limit: 1000) {
           items {
@@ -428,6 +428,7 @@ class PonderQueryBuilder {
             uniswapV3Pools {
               items {
                 liquidity
+                tickSpacing
                 fee
                 uniswapV3PoolId
                 reserve0
@@ -444,35 +445,6 @@ class PonderQueryBuilder {
         if (extension === types_1.Extension.UniswapV2) {
             // TODO
         }
-        if (extension === types_1.Extension.AeroCL) {
-            return (0, graphql_tag_1.default) `{
-        nftlps(limit: 1000) {
-          items {
-            id
-            dexFactory
-            factory {
-              oracle
-              rewardsToken {
-                id
-              }
-            }
-            aerodromeV3Pools {
-              items {
-                liquidity
-                tickSpacing
-                fee
-                aerodromeV3PoolId
-                reserve0
-                reserve1
-              }
-            }
-          }
-        }
-        _meta {
-          status
-        }
-      }`;
-        }
         console.warn(`nftlpsQuery not implemented for extension: ${extension}`);
         return (0, graphql_tag_1.default) `{}`;
     }
@@ -480,7 +452,7 @@ class PonderQueryBuilder {
         if (extension === types_1.Extension.UniswapV3)
             return this.nftlpUniswapV3PositionsQuery(positionIds);
         if (extension === types_1.Extension.AeroCL)
-            return this.nftlpAerodromeV3PositionsQuery(positionIds);
+            return this.nftlpAeroCLPositionsQuery(positionIds);
         return (0, graphql_tag_1.default) `{}`;
     }
     nftlpUniswapV3PositionsQuery(positionIds) {
@@ -489,7 +461,6 @@ class PonderQueryBuilder {
       nftlpPositions(where: { id_in: [${ids}] }, limit: 1000) {
         items {
           liquidity
-          fee
           nftlpId
           tickLower
           tickUpper
@@ -506,6 +477,10 @@ class PonderQueryBuilder {
               id
             }
           }
+          uniswapV3Pool {
+            fee
+            tickSpacing
+          }
         }
       }
       _meta {
@@ -513,7 +488,7 @@ class PonderQueryBuilder {
       }
     }`;
     }
-    nftlpAerodromeV3PositionsQuery(positionIds) {
+    nftlpAeroCLPositionsQuery(positionIds) {
         const ids = positionIds.map(id => `"${id}"`).join(', ');
         return (0, graphql_tag_1.default) `{
       nftlpPositions(where: { id_in: [${ids}] }, limit: 1000) {
@@ -529,9 +504,12 @@ class PonderQueryBuilder {
           nftlp {
             factory {
               id
+              rewardsToken {
+                id
+              }
             }
           }
-          aerodromeV3Pool {
+          uniswapV3Pool {
             fee
             tickSpacing
             gauge {

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

@@ -59,7 +59,6 @@ class OnchainAccountNftlpGenericCL extends onchainAccountNftlp_1.default {
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
             borrowableX: await this.getNftlp().getLendingPool().getBorrowableA().createBorrowableObject(lockStateChange),
             borrowableY: await this.getNftlp().getLendingPool().getBorrowableB().createBorrowableObject(lockStateChange),
-            // todo getFullRangeRate should take tickSpacing as argument
             fullRangeRate: await (await this.getNftlp().getOffchainNftlp()).getFullRangeRate(await this.getTickSpacing(tokenId)),
             lockStateChange,
         });

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

@@ -12,7 +12,7 @@ class OnchainNftlpAeroCL extends onchainNftlpGenericCL_1.default {
     constructor() {
         super(...arguments);
         // TODO uncomment
-        //public getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool() as OffchainLendingPoolV3).getNftlp() as OffchainNftlpAerodromeV3;
+        //public getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool() as OffchainLendingPoolV3).getNftlp() as OffchainNftlpAeroCL;
         this.tickSpacings = () => aeroCLGeneral_1.AERO_TICK_SPACINGS;
     }
     getExtension() {

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

@@ -1,6 +1,6 @@
 import OnchainNftlp from "./onchainNftlp";
 import { Contract } from "../../../onchainTypes";
-import { OffchainNftlpUniswapV3 } from "../../../../offchain/lendingPool/nftlp";
+import OffchainNftlpGenericCL from "../../../../offchain/lendingPool/nftlp/offchainNftlpGenericCL";
 export default abstract class OnchainNftlpGenericCL extends OnchainNftlp {
     protected cache: {
         nftlp?: Contract;
@@ -10,7 +10,7 @@ export default abstract class OnchainNftlpGenericCL extends OnchainNftlp {
         marketPrice?: Promise<number>;
         oraclePrice?: Promise<number>;
     };
-    getOffchainNftlp: () => Promise<OffchainNftlpUniswapV3>;
+    getOffchainNftlp: () => Promise<OffchainNftlpGenericCL>;
     protected abstract tickSpacings(): Array<number>;
     protected initializeNftlp(): any;
     protected abstract initializeCLPool(tickSpacing: number): Promise<Contract | null>;

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

@@ -9,7 +9,6 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
     constructor() {
         super(...arguments);
         this.cache = {};
-        // TODO CHANGE THIS TYPE TO OffchainNftlpGenericCL
         this.getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool()).getNftlp();
     }
     initializeNftlp() {

package/package.json

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

package/lib/offchain/lendingPool/nftlp/offchainNftlpAerodromeV3.d.ts

@@ -1,47 +0,0 @@
-import OffchainNftlp from "./offchainNftlp";
-import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
-import OffchainAccountNftlpAerodromeV3 from "../../account/lendingPool/nftlp/offchainAccountNftlpAerodromeV3";
-import { Address, Extension } from "../../../config/types";
-export default class OffchainNftlpAerodromeV3 extends OffchainNftlp {
-    protected cache: {
-        marketPrice?: Promise<number>;
-        oraclePrice?: Promise<number>;
-        aerodromeV3Pools?: {
-            [key in number]: Promise<{
-                address?: Address;
-                liquidity: number;
-            }>;
-        };
-        fullRangeRateAccurate?: {
-            [key in number]: Promise<number>;
-        };
-    };
-    getExtension(): Extension;
-    getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpAerodromeV3;
-    private priceAdjustment;
-    tickToPrice(tick: number): Promise<number>;
-    protected initializeMarketPrice(): Promise<number>;
-    protected initializeAerodromeV3Pool(fee: number): Promise<{
-        address?: Address;
-        liquidity: number;
-    }>;
-    getAerodromeV3Pool(fee: number): Promise<{
-        address?: Address;
-        liquidity: number;
-    }>;
-    getFullRangeRateAndTvl(fee: number): Promise<{
-        fullRangeRate: number;
-        tvlUsd: number;
-    }>;
-    getFullRangeRateDefillama(fee: number): Promise<number>;
-    getGlobalTvlDefillama(fee: number): Promise<number>;
-    getGlobalTvl(fee: number): Promise<number>;
-    initializeFullRangeRateAccurate(fee: number): Promise<number>;
-    getFullRangeRateAccurate(fee: number): Promise<number>;
-    getFullRangeRate(fee: number): Promise<number>;
-    getWeightedAvgFullRangeRate(): Promise<number>;
-    getBestFullRangeRate(): Promise<number>;
-    getTotalAPR(): Promise<number>;
-    getRewardsToken(): Promise<string | undefined>;
-    getRewardsTokenPrice(): Promise<number>;
-}

package/lib/offchain/lendingPool/nftlp/offchainNftlpAerodromeV3.js

@@ -1,231 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// offchainNftlpAerodromeV3.ts
-const offchainNftlp_1 = __importDefault(require("./offchainNftlp"));
-const offchainAccountNftlpAerodromeV3_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpAerodromeV3"));
-const CLGeneral_1 = require("../../../utils/nftlpMath/CLGeneral");
-const types_1 = require("../../../config/types");
-const utils_1 = require("../../../utils");
-const Q128 = 2 ** 128;
-const Q256 = BigInt(2) ** BigInt(256);
-const AERO_POOL_CONFIGS = [
-    { tickSpacing: 1, fee: 100 / 10000 },
-    { tickSpacing: 50, fee: 500 / 10000 },
-    { tickSpacing: 100, fee: 500 / 10000 },
-    { tickSpacing: 200, fee: 3000 / 10000 },
-    { tickSpacing: 2000, fee: 10000 / 10000 },
-];
-class OffchainNftlpAerodromeV3 extends offchainNftlp_1.default {
-    constructor() {
-        super(...arguments);
-        this.cache = {};
-    }
-    getExtension() {
-        return types_1.Extension.AeroCL;
-    }
-    getNewAccountNftlpObject(accountCollateral) {
-        return new offchainAccountNftlpAerodromeV3_1.default(accountCollateral);
-    }
-    async priceAdjustment() {
-        const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
-        const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
-        return (0, CLGeneral_1.clPriceAdjustment)(decimalsA, decimalsB);
-    }
-    async tickToPrice(tick) {
-        const priceAdjustment = await this.priceAdjustment();
-        return (0, CLGeneral_1.clTickToPrice)(tick, priceAdjustment);
-    }
-    async initializeMarketPrice() {
-        const lendingPool = this.getLendingPool();
-        const [priceA, priceB] = await Promise.all([
-            lendingPool.getBorrowableA().getTokenPriceAccurate(),
-            lendingPool.getBorrowableB().getTokenPriceAccurate()
-        ]);
-        if (!priceA || !priceB) {
-            console.warn("Can't calculate price for", await this.getLendingPool().getBorrowableA().getSymbol(), await this.getLendingPool().getBorrowableB().getSymbol());
-            return NaN;
-        }
-        return priceA / priceB;
-    }
-    // get basic AerodromeV3Pool info given a fee
-    // used for calculating the apr
-    async initializeAerodromeV3Pool(fee) {
-        const feeRaw = fee * 1000000;
-        const nftlpAerodromeV3Data = await this.getNftlpData();
-        const pools = nftlpAerodromeV3Data.aerodromeV3Pools;
-        for (let pool of pools) {
-            if (parseInt(pool.fee) == feeRaw) {
-                const liquidity = parseInt(pool.liquidity);
-                const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
-                const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
-                return {
-                    address: pool.aerodromeV3PoolId,
-                    liquidity: (0, CLGeneral_1.formatCLLiquidity)(liquidity, decimalsA, decimalsB),
-                };
-            }
-        }
-        return {
-            address: undefined,
-            liquidity: 0,
-        };
-    }
-    async getAerodromeV3Pool(fee) {
-        if (!this.cache.aerodromeV3Pools)
-            this.cache.aerodromeV3Pools = {};
-        if (!this.cache.aerodromeV3Pools[fee])
-            this.cache.aerodromeV3Pools[fee] = this.initializeAerodromeV3Pool(fee);
-        return this.cache.aerodromeV3Pools[fee];
-    }
-    // thorugh the fullRangeRate we can calculate the rate of all ranges
-    // this is the fastest way to get the APR but returns a more volatile result
-    async getFullRangeRateAndTvl(fee) {
-        const zero = { fullRangeRate: 0, tvlUsd: 0 };
-        // get a pool or return 0
-        const pool = await this.getAerodromeV3Pool(fee);
-        if (!pool.address)
-            return zero;
-        // use llama API to get the APR based on last 7 days fees
-        // the APR is calculated as: total reward / tvl
-        const offchain = this.getLendingPool().getOffchain();
-        const { apyBase, volumeUsd1d, volumeUsd7d, tvlUsd, } = await offchain.getAPRHelper().getLlamaYieldsUniswapV3(pool.address, offchain.network);
-        if (tvlUsd === 0)
-            return zero;
-        //const llamaApyBase = apyBase / 100;
-        //const apr1dFees = volumeUsd1d * fee * 365 / tvlUsd;
-        const apr7dFees = volumeUsd7d * fee / 7 * 365 / tvlUsd;
-        // convert llama apy to rate
-        const avgRate = apr7dFees / utils_1.SECONDS_IN_YEAR;
-        // calculate the usd price of 1 unit of formatted liquidity
-        const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
-        const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
-        const baseLiquidityPrice = Math.sqrt(priceA * priceB) * 2;
-        // baseLiqudiityUsd -> how much the liquidity would be worth if it wasn't concentrated
-        const baseLiquidityUsd = pool.liquidity * baseLiquidityPrice;
-        if (baseLiquidityUsd === 0)
-            return zero;
-        const avgConcentrationFactor = baseLiquidityUsd / tvlUsd;
-        const fullRangeRate = avgRate / avgConcentrationFactor;
-        return { fullRangeRate, tvlUsd };
-    }
-    async getFullRangeRateDefillama(fee) {
-        return (await this.getFullRangeRateAndTvl(fee)).fullRangeRate;
-    }
-    async getGlobalTvlDefillama(fee) {
-        return (await this.getFullRangeRateAndTvl(fee)).tvlUsd;
-    }
-    async getGlobalTvl(fee) {
-        const feeRaw = fee * 1000000;
-        const nftlpAerodromeV3Data = await this.getNftlpData();
-        const pools = nftlpAerodromeV3Data.aerodromeV3Pools;
-        for (let pool of pools) {
-            if (parseInt(pool.fee) == feeRaw) {
-                const reserve0 = parseFloat(pool.reserve0);
-                const reserve1 = parseFloat(pool.reserve1);
-                const priceA = await this.getLendingPool().getBorrowableA().getTokenPriceFast();
-                const priceB = await this.getLendingPool().getBorrowableB().getTokenPriceFast();
-                return reserve0 * priceA + reserve1 * priceB;
-            }
-        }
-        return 0;
-        return this.getGlobalTvlDefillama(fee);
-    }
-    // The more accurate way to get the apr is to calculate the delta between the current feeGrowthGlobal
-    // and a feeGrowthGlobal at a previous point in time,
-    // but this currently requires a separate call for each fee tier
-    async initializeFullRangeRateAccurate(fee) {
-        // To calculate the apr, we compare the current feeGrowthGlobal with the feeGrowthGlobal of 7 days ago.
-        // If less than 7 days of data are available, then we use the oldest feeGrowthGlobal available
-        const OLDEST_USABLE_DATA = 7 * 24 * 60 * 60;
-        const { address } = await this.getAerodromeV3Pool(fee);
-        if (!address)
-            return 0;
-        let feeGrowthData = [];
-        try {
-            feeGrowthData = await this.getLendingPool().getOffchain().getAerodromeV3Charts(address.toLowerCase());
-        }
-        catch (err) { }
-        if (!feeGrowthData || feeGrowthData.length < 2) {
-            console.log(`No historic fee growth data available for aerodromeV3 pool: ${address}`);
-            return 0;
-        }
-        // the endpoint returns an array ordered from most recent to least recent
-        const mostRecentTimestamp = feeGrowthData[0].timestamp;
-        const currentFeeGrowthGlobal0X128 = BigInt(feeGrowthData[0].feeGrowthGlobal0X128);
-        const currentFeeGrowthGlobal1X128 = BigInt(feeGrowthData[0].feeGrowthGlobal1X128);
-        let leastRecentTimestamp;
-        let pastFeeGrowthGlobal0X128;
-        let pastFeeGrowthGlobal1X128;
-        for (const data of feeGrowthData) {
-            if (mostRecentTimestamp - data.timestamp > OLDEST_USABLE_DATA)
-                break;
-            leastRecentTimestamp = data.timestamp;
-            pastFeeGrowthGlobal0X128 = BigInt(data.feeGrowthGlobal0X128);
-            pastFeeGrowthGlobal1X128 = BigInt(data.feeGrowthGlobal1X128);
-        }
-        const deltaTime = mostRecentTimestamp - leastRecentTimestamp;
-        let delta0 = currentFeeGrowthGlobal0X128 - pastFeeGrowthGlobal0X128;
-        let delta1 = currentFeeGrowthGlobal1X128 - pastFeeGrowthGlobal1X128;
-        if (delta0 < 0)
-            delta0 += Q256;
-        if (delta1 < 0)
-            delta1 += Q256;
-        // how much reward we would earn every second for each unit of liquidity
-        const rewardRate0 = Number(delta0) / Q128 / deltaTime;
-        const rewardRate1 = Number(delta1) / Q128 / deltaTime;
-        // liquidity is calculated as: sqrt(amount0 * amount1)
-        // using rewardRate as amount0 and amount1 we obtain: liquidityPerSecondPerUnitOfLiquidity
-        // which essentially is the full range rewardRate
-        return Math.sqrt(rewardRate0 * rewardRate1);
-    }
-    async getFullRangeRateAccurate(fee) {
-        if (!this.cache.fullRangeRateAccurate)
-            this.cache.fullRangeRateAccurate = {};
-        if (!this.cache.fullRangeRateAccurate[fee])
-            this.cache.fullRangeRateAccurate[fee] = this.initializeFullRangeRateAccurate(fee);
-        return this.cache.fullRangeRateAccurate[fee];
-    }
-    async getFullRangeRate(fee) {
-        return await this.getFullRangeRateAccurate(fee);
-    }
-    // calculate apr based on the weighted avg of all the available fees
-    async getWeightedAvgFullRangeRate() {
-        let totalTvl = 0;
-        let totalCompoundedRate = 0;
-        for (const poolConfig of AERO_POOL_CONFIGS) {
-            const { fullRangeRate, tvlUsd } = await this.getFullRangeRateAndTvl(poolConfig.fee);
-            totalTvl += tvlUsd;
-            totalCompoundedRate += fullRangeRate * tvlUsd;
-        }
-        return totalTvl > 0 ? totalCompoundedRate / totalTvl : 0;
-    }
-    async getBestFullRangeRate() {
-        let bestRate = 0;
-        for (const poolConfig of AERO_POOL_CONFIGS) {
-            const rate = await this.getFullRangeRateAccurate(poolConfig.fee);
-            bestRate = Math.max(bestRate, rate);
-        }
-        return bestRate;
-    }
-    // calculate the pair APR assuming a +-8% price range for volatile, 0.05% for stable
-    async getTotalAPR() {
-        const fullRangeAPR = await this.getBestFullRangeRate() * utils_1.SECONDS_IN_YEAR;
-        const isStable = await this.getLendingPool().isStablePair();
-        const adjustment = isStable ? 1.0005 : 1.08;
-        return fullRangeAPR * (0, CLGeneral_1.clConcentrationFactor)(1 / adjustment, adjustment);
-    }
-    async getRewardsToken() {
-        const nftlpData = await this.getNftlpData();
-        return nftlpData.factory?.rewardsToken?.id;
-    }
-    async getRewardsTokenPrice() {
-        const rewardsToken = await this.getRewardsToken();
-        if (!rewardsToken)
-            return 0;
-        const offchain = this.getLendingPool().getOffchain();
-        return offchain.getPriceHelper().getTokenPrice(offchain.network, rewardsToken);
-    }
-}
-exports.default = OffchainNftlpAerodromeV3;