@strkfarm/sdk 1.1.70 → 1.1.72

package/dist/index.mjs

@@ -96,7 +96,7 @@ var Web3Number = class _Web3Number2 extends _Web3Number {
   [util.inspect.custom](depth, opts) {
     return this.toString();
   }
-  [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions, inspect) {
+  [Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions, inspect) {
     return this.toString();
   }
   inspect(depth, opts) {
@@ -158,8 +158,8 @@ var logger = winston.createLogger({
     // Add timestamp to log messages
     format.printf(({ timestamp, level, message, ...meta }) => {
       let msg = `${timestamp} ${level}: ${message}`;
-      if (meta && meta[/* @__PURE__ */ Symbol.for("splat")]) {
-        for (const arg of meta[/* @__PURE__ */ Symbol.for("splat")]) {
+      if (meta && meta[Symbol.for("splat")]) {
+        for (const arg of meta[Symbol.for("splat")]) {
           if (arg instanceof Error) {
             msg += `
 ${arg.stack}`;
@@ -4099,26 +4099,27 @@ var STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
 var EkuboHarvests = class _EkuboHarvests extends Harvests {
   async getHarvests(addr) {
     logger.verbose(`${_EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
-    const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
+    const EKUBO_API = `https://prod-api.ekubo.org/claims/${addr.address}`;
     const resultEkubo = await fetch(EKUBO_API);
-    const items = await resultEkubo.json();
-    logger.verbose(`${_EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
+    const data = await resultEkubo.json();
+    const claims = data.claims || [];
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => claims length: ${claims.length}`);
     const rewards = [];
-    for (let i = 0; i < items.length; ++i) {
-      const info = items[i];
-      assert(info.token == STRK, "expected strk token only");
+    for (let i = 0; i < claims.length; ++i) {
+      const claimData = claims[i];
+      assert(claimData.key.token == STRK, "expected strk token only");
       rewards.push({
-        rewardsContract: ContractAddr.from(info.contract_address),
+        rewardsContract: ContractAddr.from(claimData.dropAddress),
         token: ContractAddr.from(STRK),
-        startDate: new Date(info.start_date),
-        endDate: new Date(info.end_date),
+        startDate: /* @__PURE__ */ new Date(0),
+        endDate: /* @__PURE__ */ new Date(0),
         claim: {
-          id: info.claim.id,
-          amount: Web3Number.fromWei(info.claim.amount, 18),
-          claimee: ContractAddr.from(info.claim.claimee)
+          id: claimData.claim.index,
+          amount: Web3Number.fromWei(claimData.claim.amount, 18),
+          claimee: ContractAddr.from(claimData.claim.account)
         },
-        actualReward: Web3Number.fromWei(info.claim.amount, 18),
-        proof: info.proof
+        actualReward: Web3Number.fromWei(claimData.claim.amount, 18),
+        proof: claimData.proof
       });
     }
     return rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
@@ -15772,7 +15773,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<number>} The weighted average APY across all pools
    */
   async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5, timeperiod = "24h") {
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e" || this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
     if (!isUSDCQouteToken) {
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
     } else {
@@ -26976,7 +26977,8 @@ function getVesuMultiplyParams(isIncrease, params) {
 var VesuPools = {
   Genesis: ContractAddr.from("0x4dc4f0ca6ea4961e4c8373265bfd5317678f4fe374d76f3fd7135f57763bf28"),
   Re7xSTRK: ContractAddr.from("0x052fb52363939c3aa848f8f4ac28f0a51379f8d1b971d8444de25fbd77d8f161"),
-  Re7xBTC: ContractAddr.from("0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf")
+  Re7xBTC: ContractAddr.from("0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf"),
+  Prime: ContractAddr.from("0x451fe483d5921a2919ddd81d0de6696669bccdacd859f72a4fba7656b97c3b5")
 };
 var extensionMap = {};
 extensionMap[VesuPools.Re7xSTRK.address] = ContractAddr.from("0x04e06e04b8d624d039aa1c3ca8e0aa9e21dc1ccba1d88d0d650837159e0ee054");
@@ -27303,14 +27305,15 @@ var VesuAdapter = class _VesuAdapter extends BaseAdapter {
     const assetConfig = isV2 ? _assetConfig : _assetConfig["0"];
     const timeDelta = assetConfig.last_updated;
     const lastFullUtilizationRate = assetConfig.last_full_utilization_rate;
-    const currentDebt = new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals);
+    const debtSharePrice = Web3Number.fromWei(assetConfig.last_rate_accumulator, 18);
+    const currentDebt = new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals).multipliedBy(debtSharePrice);
     const totalSupply = currentDebt.plus(Web3Number.fromWei(assetConfig.reserve, asset.decimals));
     const ratePerSecond = BigInt(Math.round(maxBorrowAPY / 365 / 24 / 60 / 60 * Number(SCALE)));
     const maxUtilisation = this.getMaxUtilizationGivenRatePerSecond(interestRateConfig, ratePerSecond, timeDelta, lastFullUtilizationRate);
     logger.verbose(`${asset.symbol}::VesuAdapter::getMaxBorrowableByInterestRate maxUtilisation: ${Number(maxUtilisation) / 1e18}, totalSupply: ${totalSupply.toString()}`);
     const maxDebtToHave = totalSupply.multipliedBy(Number(maxUtilisation) / 1e18);
     logger.verbose(`${asset.symbol}::VesuAdapter::getMaxBorrowableByInterestRate currentDebt: ${currentDebt.toString()}, maxDebtToHave: ${maxDebtToHave.toString()}`);
-    return maxDebtToHave.minus(currentDebt);
+    return { maxDebtToHave: maxDebtToHave.minus(currentDebt), currentDebt, totalSupply };
   }
   async getLTVConfig(config, blockNumber = "latest") {
     const CACHE_KEY = `ltv_config_${blockNumber}`;
@@ -30812,14 +30815,14 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     }
   }
   asset() {
-    return this.getVesuSameTokenAdapter().config.collateral;
+    return this.getVesuSameTokenAdapter(this.metadata.additionalInfo.defaultPoolId).config.collateral;
   }
   getTag() {
     return `${_UniversalLstMultiplierStrategy.name}:${this.metadata.name}`;
   }
   // Vesu adapter with LST and base token match
-  getVesuSameTokenAdapter() {
-    const baseAdapter = this.getAdapter(getVesuLegId("vesu_leg1" /* VESU_LEG1 */, this.metadata.additionalInfo.underlyingToken.symbol));
+  getVesuSameTokenAdapter(poolId) {
+    const baseAdapter = this.getAdapter(getVesuLegId("vesu_leg1" /* VESU_LEG1 */, this.metadata.additionalInfo.underlyingToken.symbol, poolId.toString()));
     baseAdapter.networkConfig = this.config;
     baseAdapter.pricer = this.pricer;
     return baseAdapter;
@@ -30828,18 +30831,20 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   // todo support lending assets of underlying as well (like if xSTRK looping is not viable, simply supply STRK)
   getVesuAdapters() {
     const adapters = [];
-    const baseAdapter = this.getVesuSameTokenAdapter();
-    for (const asset of this.metadata.additionalInfo.borrowable_assets) {
-      const vesuAdapter1 = new VesuAdapter({
-        poolId: baseAdapter.config.poolId,
-        collateral: this.asset(),
-        debt: asset,
-        vaultAllocator: this.metadata.additionalInfo.vaultAllocator,
-        id: ""
-      });
-      vesuAdapter1.pricer = this.pricer;
-      vesuAdapter1.networkConfig = this.config;
-      adapters.push(vesuAdapter1);
+    for (const poolId of [this.metadata.additionalInfo.defaultPoolId, ...this.metadata.additionalInfo.altSupportedPoolIds]) {
+      const baseAdapter = this.getVesuSameTokenAdapter(poolId);
+      for (const asset of this.metadata.additionalInfo.borrowable_assets) {
+        const vesuAdapter1 = new VesuAdapter({
+          poolId: baseAdapter.config.poolId,
+          collateral: this.asset(),
+          debt: asset,
+          vaultAllocator: this.metadata.additionalInfo.vaultAllocator,
+          id: ""
+        });
+        vesuAdapter1.pricer = this.pricer;
+        vesuAdapter1.networkConfig = this.config;
+        adapters.push(vesuAdapter1);
+      }
     }
     return adapters;
   }
@@ -30960,7 +30965,8 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       const debtAmountInLST = debtAmount.abs().dividedBy(lstDEXPrice);
       const calls = await this.getVesuMultiplyCall({
         isDeposit: false,
-        leg1DepositAmount: debtAmountInLST
+        leg1DepositAmount: debtAmountInLST,
+        poolId: vesuAdapter.config.poolId
       });
       assert(calls.length == 1, `Expected 1 call for unwind, got ${calls.length}`);
       return calls[0];
@@ -30971,7 +30977,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const manageCall0 = manage0Info.callConstructor({
       amount: newDepositAmount
     });
-    const STEP1 = getVesuLegId("vesu_leg1" /* VESU_LEG1 */, vesuAdapter.config.debt.symbol);
+    const STEP1 = getVesuLegId("vesu_leg1" /* VESU_LEG1 */, vesuAdapter.config.debt.symbol, vesuAdapter.config.poolId.toString());
     const manage1Info = this.getProofs(STEP1);
     const manageCall1 = manage1Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
       collateralAmount: newDepositAmount,
@@ -31026,7 +31032,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
         const manageCall4 = manage4Info.callConstructor({
           amount: minAmount
         });
-        const STEP5 = getVesuLegId("vesu_leg1" /* VESU_LEG1 */, vesuAdapter.config.debt.symbol);
+        const STEP5 = getVesuLegId("vesu_leg1" /* VESU_LEG1 */, vesuAdapter.config.debt.symbol, vesuAdapter.config.poolId.toString());
         const manage5Info = this.getProofs(STEP5);
         const manageCall5 = manage5Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
           collateralAmount: minAmount,
@@ -31126,7 +31132,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
    */
   async getVesuMultiplyCall(params) {
     const maxEkuboPriceImpact = params.maxEkuboPriceImpact || 0.01;
-    const vesuAdapter1 = this.getVesuSameTokenAdapter();
+    const vesuAdapter1 = this.getVesuSameTokenAdapter(params.poolId);
     const legLTV = await vesuAdapter1.getLTVConfig(this.config);
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall legLTV: ${legLTV}`);
     if (!params.isDeposit) {
@@ -31165,11 +31171,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       debtAmount,
       lstDexPriceInUnderlying: dexPrice,
       isIncrease: debtAmount.greaterThan(0),
-      maxEkuboPriceImpact
+      maxEkuboPriceImpact,
+      poolId: params.poolId
     });
   }
   getLSTUnderlyingTokenInfo() {
-    const vesuAdapter1 = this.getVesuSameTokenAdapter();
+    const vesuAdapter1 = this.getVesuSameTokenAdapter(this.metadata.additionalInfo.defaultPoolId);
     return vesuAdapter1.config.debt;
   }
   async getMaxBorrowableAmount(params = { isAPYComputation: false }) {
@@ -31177,7 +31184,9 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     let netMaxBorrowableAmount = Web3Number.fromWei("0", this.getLSTUnderlyingTokenInfo().decimals);
     const maxBorrowables = [];
     for (const vesuAdapter of vesuAdapters) {
-      maxBorrowables.push(await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation));
+      const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
+      const ltv = await vesuAdapter.getLTVConfig(this.config);
+      maxBorrowables.push({ ...output, ltv });
     }
     maxBorrowables.sort((a, b) => b.amount.toNumber() - a.amount.toNumber());
     netMaxBorrowableAmount = maxBorrowables.reduce((acc, curr) => acc.plus(curr.amount), Web3Number.fromWei("0", this.getLSTUnderlyingTokenInfo().decimals));
@@ -31203,9 +31212,13 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async getMaxBorrowableAmountByVesuAdapter(vesuAdapter, isAPYComputation) {
     const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
     const maxInterestRate = lstAPY * 0.8;
-    const maxBorrowableAmount = await vesuAdapter.getMaxBorrowableByInterestRate(this.config, vesuAdapter.config.debt, maxInterestRate);
+    const { maxDebtToHave: maxBorrowableAmount, currentDebt } = await vesuAdapter.getMaxBorrowableByInterestRate(this.config, vesuAdapter.config.debt, maxInterestRate);
     const debtCap = await vesuAdapter.getDebtCap(this.config);
-    const maxBorrowable = maxBorrowableAmount.minimum(debtCap).multipliedBy(0.999);
+    if (currentDebt.gte(debtCap)) {
+      return { amount: Web3Number.fromWei("0", vesuAdapter.config.debt.decimals), dexSwappableAmount: Web3Number.fromWei("0", vesuAdapter.config.debt.decimals), maxBorrowableAmount: Web3Number.fromWei("0", vesuAdapter.config.debt.decimals), borrowableAsset: vesuAdapter.config.debt };
+    }
+    const availableToBorrow = debtCap.minus(currentDebt);
+    const maxBorrowable = maxBorrowableAmount.minimum(availableToBorrow).multipliedBy(0.999);
     if (vesuAdapter.config.debt.address.eq(this.getLSTUnderlyingTokenInfo().address) || isAPYComputation) {
       return { amount: maxBorrowable, dexSwappableAmount: maxBorrowable, maxBorrowableAmount: maxBorrowable, borrowableAsset: vesuAdapter.config.debt };
     }
@@ -31227,7 +31240,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
    */
   async getLSTAPR(_address) {
     try {
-      const vesuAdapter1 = this.getVesuSameTokenAdapter();
+      const vesuAdapter1 = this.getVesuSameTokenAdapter(this.metadata.additionalInfo.defaultPoolId);
       const apr = await LSTAPRService.getLSTAPR(vesuAdapter1.config.debt.address);
       if (!apr) {
         throw new Error("Failed to get LST APR");
@@ -31260,29 +31273,21 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   }
   async maxNewDeposits(params = { isAPYComputation: false }) {
     const maxBorrowableAmounts = await this.getMaxBorrowableAmount(params);
+    let numerator = 0;
     let ltv = void 0;
     for (let adapter of this.getVesuAdapters()) {
-      const maxBorrowableAmount = maxBorrowableAmounts.maxBorrowables.find((b) => b.borrowableAsset.address.eq(adapter.config.debt.address))?.amount;
-      if (!maxBorrowableAmount) {
+      const maxBorrowableAmountInfo = maxBorrowableAmounts.maxBorrowables.find((b) => b.borrowableAsset.address.eq(adapter.config.debt.address));
+      if (!maxBorrowableAmountInfo || !maxBorrowableAmountInfo?.amount) {
         throw new Error(`Max borrowable amount not found for adapter: ${adapter.config.debt.symbol}`);
       }
-      const maxLTV = await adapter.getLTVConfig(this.config);
-      if (!ltv) {
-        ltv = maxLTV;
-      } else if (ltv != maxLTV) {
-        throw new Error(`LTV mismatch for adapter: ${adapter.config.debt.symbol}`);
-      }
-    }
-    if (!ltv) {
-      throw new Error("LTV not found");
+      numerator += this.metadata.additionalInfo.targetHealthFactor * maxBorrowableAmountInfo.amount.toNumber() / maxBorrowableAmountInfo.ltv;
     }
-    const numerator = this.metadata.additionalInfo.targetHealthFactor * maxBorrowableAmounts.netMaxBorrowableAmount.toNumber() / ltv;
     return numerator - maxBorrowableAmounts.netMaxBorrowableAmount.toNumber();
   }
   // todo revisit cases where 0th adapters is used
   async getUnusedBalanceAPY() {
     const unusedBalance = await this.getUnusedBalance();
-    const vesuAdapter = this.getVesuSameTokenAdapter();
+    const vesuAdapter = this.getVesuSameTokenAdapter(this.metadata.additionalInfo.defaultPoolId);
     const underlying = vesuAdapter.config.debt;
     const lstAPY = await this.getLSTAPR(underlying.address);
     return {
@@ -31291,7 +31296,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     };
   }
   async getLSTExchangeRate() {
-    const vesuAdapter1 = this.getVesuSameTokenAdapter();
+    const vesuAdapter1 = this.getVesuSameTokenAdapter(this.metadata.additionalInfo.defaultPoolId);
     const lstTokenInfo = vesuAdapter1.config.collateral;
     const lstABI = new Contract10({
       abi: erc4626_abi_default,
@@ -31310,7 +31315,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async getModifyLeverCall(params) {
     logger.verbose(`${this.getTag()}::getModifyLeverCall marginAmount: ${params.marginAmount}, debtAmount: ${params.debtAmount}, lstDexPriceInUnderlying: ${params.lstDexPriceInUnderlying}, isIncrease: ${params.isIncrease}`);
     assert(!params.marginAmount.isZero() || !params.debtAmount.isZero(), "Deposit/debt must be non-0");
-    const vesuAdapter1 = this.getVesuSameTokenAdapter();
+    const vesuAdapter1 = this.getVesuSameTokenAdapter(params.poolId);
     const lstTokenInfo = this.asset();
     const lstUnderlyingTokenInfo = vesuAdapter1.config.debt;
     const maxAmounts = lstTokenInfo.symbol == "xSTRK" ? 5e5 : 0.5;
@@ -31320,7 +31325,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const proofsIDs = [];
     const manageCalls = [];
     if (params.marginAmount.greaterThan(0)) {
-      const STEP1_ID = "multiple_approve" /* MULTIPLE_APPROVE */;
+      const STEP1_ID = getVesuGenericLegId(params.poolId.toString(), "multiple_approve" /* MULTIPLE_APPROVE */);
       const manage1Info = this.getProofs(STEP1_ID);
       const depositAmount = params.marginAmount;
       const manageCall1 = manage1Info.callConstructor({
@@ -31353,12 +31358,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005);
     logger.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
     maxUsedCollateral = maxUsedCollateralInLST;
-    const STEP2_ID = "switch_delegation_on" /* SWITCH_DELEGATION_ON */;
+    const STEP2_ID = getVesuGenericLegId(params.poolId.toString(), "switch_delegation_on" /* SWITCH_DELEGATION_ON */);
     const manage2Info = this.getProofs(STEP2_ID);
     const manageCall2 = manage2Info.callConstructor({
       delegation: true
     });
-    const STEP3_ID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, vesuAdapter1.config.debt.symbol);
+    const STEP3_ID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, vesuAdapter1.config.debt.symbol, vesuAdapter1.config.poolId.toString());
     const manage3Info = this.getProofs(STEP3_ID);
     const multiplyParams = params.isIncrease ? {
       isIncrease: true,
@@ -31385,7 +31390,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       }
     };
     const manageCall3 = manage3Info.callConstructor(multiplyParams);
-    const STEP4_ID = "switch_delegation_off" /* SWITCH_DELEGATION_OFF */;
+    const STEP4_ID = getVesuGenericLegId(params.poolId.toString(), "switch_delegation_off" /* SWITCH_DELEGATION_OFF */);
     const manage4Info = this.getProofs(STEP4_ID);
     const manageCall4 = manage4Info.callConstructor({
       delegation: false
@@ -31445,20 +31450,46 @@ function getDescription2(tokenSymbol, underlyingSymbol) {
 function getAvnuManageIDs(baseID, debtTokenSymbol) {
   return `${baseID}_${debtTokenSymbol.toLowerCase()}`;
 }
-function getVesuLegId(baseID, debtTokenSymbol) {
-  return `${baseID}_${debtTokenSymbol.toLowerCase()}`;
+function getVesuGenericLegId(poolId, action) {
+  return `${action}_${poolId.slice(-4).toLowerCase()}`;
 }
-function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
-  vaultSettings.leafAdapters = [];
+function getVesuLegId(baseID, debtTokenSymbol, poolId) {
+  return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
+}
+function addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter) {
   const lstToken = Global.getDefaultTokens().find((token) => token.symbol === lstSymbol);
   const underlyingToken = Global.getDefaultTokens().find((token) => token.symbol === underlyingSymbol);
   const vesuAdapterLST = new VesuAdapter({
-    poolId: pool1,
+    poolId,
     collateral: lstToken,
     debt: underlyingToken,
     vaultAllocator: vaultSettings.vaultAllocator,
-    id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, underlyingToken.symbol)
+    id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, underlyingToken.symbol, poolId.toString())
   });
+  vaultSettings.adapters.push(...[{
+    id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, underlyingToken.symbol, poolId.toString()),
+    adapter: vesuAdapterLST
+  }]);
+  const { isV2, addr: _ } = getVesuSingletonAddress(poolId);
+  const VESU_MULTIPLY = isV2 ? vesuAdapterLST.VESU_MULTIPLY : vesuAdapterLST.VESU_MULTIPLY_V1;
+  const leafIdApprove = getVesuGenericLegId(poolId.toString(), "multiple_approve" /* MULTIPLE_APPROVE */);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, VESU_MULTIPLY, leafIdApprove).bind(commonAdapter));
+  const leafIdDelegationOn = getVesuGenericLegId(poolId.toString(), "switch_delegation_on" /* SWITCH_DELEGATION_ON */);
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOn).bind(vesuAdapterLST));
+  const leafIdDelegationOff = getVesuGenericLegId(poolId.toString(), "switch_delegation_off" /* SWITCH_DELEGATION_OFF */);
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff).bind(vesuAdapterLST));
+  const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, underlyingToken.symbol, poolId.toString());
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
+  return vesuAdapterLST;
+}
+function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, defaultPoolId, altSupportedPoolIds = []) {
+  vaultSettings.leafAdapters = [];
+  const pool1 = vaultSettings.defaultPoolId;
+  if (!pool1.eq(defaultPoolId)) {
+    throw new Error(`Dont include default pool id in supported pool ids`);
+  }
+  const lstToken = Global.getDefaultTokens().find((token) => token.symbol === lstSymbol);
+  const underlyingToken = Global.getDefaultTokens().find((token) => token.symbol === underlyingSymbol);
   const commonAdapter = new CommonAdapter({
     manager: vaultSettings.manager,
     asset: lstToken.address,
@@ -31467,17 +31498,11 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
     vaultAllocator: vaultSettings.vaultAllocator
   });
   vaultSettings.adapters.push(...[{
-    id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, underlyingToken.symbol),
-    adapter: vesuAdapterLST
-  }, {
     id: "common_adapter" /* COMMON */,
     adapter: commonAdapter
   }]);
-  const { isV2, addr: poolAddr } = getVesuSingletonAddress(pool1);
-  const VESU_MULTIPLY = isV2 ? vesuAdapterLST.VESU_MULTIPLY : vesuAdapterLST.VESU_MULTIPLY_V1;
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, VESU_MULTIPLY, "multiple_approve" /* MULTIPLE_APPROVE */).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter("switch_delegation_on" /* SWITCH_DELEGATION_ON */).bind(vesuAdapterLST));
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter("switch_delegation_off" /* SWITCH_DELEGATION_OFF */).bind(vesuAdapterLST));
+  const vesuAdapterLST = addVesuLeaves(defaultPoolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter);
+  altSupportedPoolIds.map((poolId) => addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter));
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, AVNU_EXCHANGE, "avnu_mul_approve_withdr" /* AVNU_MULTIPLY_APPROVE_WITHDRAW */).bind(commonAdapter));
   for (let borrowableAsset of vaultSettings.borrowable_assets) {
     const debtAsset = borrowableAsset;
@@ -31492,12 +31517,14 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
       collateral: lstToken,
       debt: debtAsset,
       vaultAllocator: vaultSettings.vaultAllocator,
-      id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, debtAsset.symbol)
+      id: getVesuLegId("vesu_leg1" /* VESU_LEG1 */, debtAsset.symbol, pool1.toString())
     });
+    const { isV2, addr: poolAddr } = getVesuSingletonAddress(pool1);
     vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
     vaultSettings.leafAdapters.push(vesuAdapter.getModifyPosition.bind(vesuAdapter));
-    const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, debtAsset.symbol);
-    vaultSettings.leafAdapters.push(vesuAdapter.getMultiplyAdapter(multiplID).bind(vesuAdapter));
+    if (borrowableAsset.address.eq(underlyingToken.address)) {
+      continue;
+    }
   }
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, vaultSettings.vaultAddress, "approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */).bind(commonAdapter));
   vaultSettings.leafAdapters.push(commonAdapter.getBringLiquidityAdapter("bring_liquidity" /* BRING_LIQUIDITY */).bind(commonAdapter));
@@ -31577,7 +31604,9 @@ var hyperxSTRK = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: Global.getDefaultTokens().filter((token) => token.symbol === "STRK"),
-  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK")
+  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK"),
+  defaultPoolId: VesuPools.Re7xSTRK,
+  altSupportedPoolIds: [VesuPools.Prime]
 };
 var hyperxWBTC = {
   vaultAddress: ContractAddr.from("0x2da9d0f96a46b453f55604313785dc866424240b1c6811d13bef594343db818"),
@@ -31590,7 +31619,9 @@ var hyperxWBTC = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: borrowableAssets.map((asset) => Global.getDefaultTokens().find((token) => token.symbol === asset)),
-  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "WBTC")
+  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "WBTC"),
+  defaultPoolId: VesuPools.Re7xBTC,
+  altSupportedPoolIds: []
 };
 var hyperxtBTC = {
   vaultAddress: ContractAddr.from("0x47d5f68477e5637ce0e56436c6b5eee5a354e6828995dae106b11a48679328"),
@@ -31603,7 +31634,9 @@ var hyperxtBTC = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: Global.getDefaultTokens().filter((token) => token.symbol === "tBTC" || token.symbol === "WBTC"),
-  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "tBTC")
+  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "tBTC"),
+  defaultPoolId: VesuPools.Re7xBTC,
+  altSupportedPoolIds: []
 };
 var hyperxsBTC = {
   vaultAddress: ContractAddr.from("0x437ef1e7d0f100b2e070b7a65cafec0b2be31b0290776da8b4112f5473d8d9"),
@@ -31616,7 +31649,9 @@ var hyperxsBTC = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: Global.getDefaultTokens().filter((token) => token.symbol === "solvBTC"),
-  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "solvBTC")
+  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "solvBTC"),
+  defaultPoolId: VesuPools.Re7xBTC,
+  altSupportedPoolIds: []
 };
 var hyperxLBTC = {
   vaultAddress: ContractAddr.from("0x64cf24d4883fe569926419a0569ab34497c6956a1a308fa883257f7486d7030"),
@@ -31629,7 +31664,9 @@ var hyperxLBTC = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: Global.getDefaultTokens().filter((token) => token.symbol === "LBTC"),
-  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "LBTC")
+  underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "LBTC"),
+  defaultPoolId: VesuPools.Re7xBTC,
+  altSupportedPoolIds: []
 };
 function getInvestmentSteps(lstSymbol, underlyingSymbol) {
   return [
@@ -31648,7 +31685,7 @@ function getStrategySettings(lstSymbol, underlyingSymbol, addresses, isPreview =
     launchBlock: 0,
     type: "Other",
     depositTokens: [Global.getDefaultTokens().find((token) => token.symbol === lstSymbol)],
-    additionalInfo: getLooperSettings2(lstSymbol, underlyingSymbol, addresses, lstSymbol === "xSTRK" ? VesuPools.Re7xSTRK : VesuPools.Re7xBTC),
+    additionalInfo: getLooperSettings2(lstSymbol, underlyingSymbol, addresses, addresses.defaultPoolId, lstSymbol === "xSTRK" ? [VesuPools.Prime] : []),
     risk: {
       riskFactor: _riskFactor4,
       netRisk: _riskFactor4.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor4.reduce((acc, curr) => acc + curr.weight, 0),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "1.1.70",
+    "version": "1.1.72",
     "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
     "typings": "dist/index.d.ts",
     "types": "dist/index.d.ts",

package/src/modules/harvests.ts

@@ -68,26 +68,27 @@ const STRK = '0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d'
 export class EkuboHarvests extends Harvests {
     async getHarvests(addr: ContractAddr) {
         logger.verbose(`${EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
-        const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`
+        const EKUBO_API = `https://prod-api.ekubo.org/claims/${addr.address}`
         const resultEkubo = await fetch(EKUBO_API);
-        const items = (await resultEkubo.json());
-        logger.verbose(`${EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
+        const data = (await resultEkubo.json());
+        const claims = data.claims || [];
+        logger.verbose(`${EkuboHarvests.name}: getHarvests => claims length: ${claims.length}`);
         const rewards: HarvestInfo[] = [];
-        for (let i=0; i<items.length; ++i) {
-            const info = items[i];
-            assert(info.token == STRK, 'expected strk token only')
+        for (let i=0; i<claims.length; ++i) {
+            const claimData = claims[i];
+            assert(claimData.key.token == STRK, 'expected strk token only')
             rewards.push({
-                rewardsContract: ContractAddr.from(info.contract_address),
+                rewardsContract: ContractAddr.from(claimData.dropAddress),
                 token: ContractAddr.from(STRK),
-                startDate: new Date(info.start_date),
-                endDate: new Date(info.end_date),
+                startDate: new Date(0),
+                endDate: new Date(0),
                 claim: {
-                    id: info.claim.id,
-                    amount: Web3Number.fromWei(info.claim.amount, 18),
-                    claimee: ContractAddr.from(info.claim.claimee)
+                    id: claimData.claim.index,
+                    amount: Web3Number.fromWei(claimData.claim.amount, 18),
+                    claimee: ContractAddr.from(claimData.claim.account)
                 },
-                actualReward: Web3Number.fromWei(info.claim.amount, 18),
-                proof: info.proof
+                actualReward: Web3Number.fromWei(claimData.claim.amount, 18),
+                proof: claimData.proof
             });
         }
         return rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());

package/src/strategies/ekubo-cl-vault.tsx

@@ -505,7 +505,7 @@ export class EkuboCLVault extends BaseStrategy<
     timeperiod: '24h' | '7d' | '30d' | '3m' = '24h' // temp thing for fee based APY
   ): Promise<number> {
     // ! switch to USDC later
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e" || this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
     if (!isUSDCQouteToken) {
       // good for LSTs and stables
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);

package/src/strategies/universal-adapters/vesu-adapter.ts

@@ -232,7 +232,8 @@ function getVesuMultiplyParams(isIncrease: boolean, params: IncreaseLeverParams
 export const VesuPools = {
   Genesis: ContractAddr.from('0x4dc4f0ca6ea4961e4c8373265bfd5317678f4fe374d76f3fd7135f57763bf28'),
   Re7xSTRK: ContractAddr.from('0x052fb52363939c3aa848f8f4ac28f0a51379f8d1b971d8444de25fbd77d8f161'),
-  Re7xBTC: ContractAddr.from('0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf')
+  Re7xBTC: ContractAddr.from('0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf'),
+  Prime: ContractAddr.from('0x451fe483d5921a2919ddd81d0de6696669bccdacd859f72a4fba7656b97c3b5'),
 }
 
 export const extensionMap: {[key: string]: ContractAddr} = {};
@@ -587,7 +588,8 @@ export class VesuAdapter extends BaseAdapter {
     const assetConfig = isV2 ? _assetConfig : _assetConfig['0'];
     const timeDelta = assetConfig.last_updated;
     const lastFullUtilizationRate = assetConfig.last_full_utilization_rate;
-    const currentDebt = new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals);
+    const debtSharePrice = Web3Number.fromWei(assetConfig.last_rate_accumulator, 18);
+    const currentDebt = (new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals)).multipliedBy(debtSharePrice);
     const totalSupply = currentDebt.plus(Web3Number.fromWei(assetConfig.reserve, asset.decimals));
 
     const ratePerSecond = BigInt(Math.round(maxBorrowAPY / 365 / 24 / 60 / 60 * Number(SCALE)));
@@ -596,7 +598,7 @@ export class VesuAdapter extends BaseAdapter {
    
     const maxDebtToHave = totalSupply.multipliedBy(Number(maxUtilisation) / 1e18);
     logger.verbose(`${asset.symbol}::VesuAdapter::getMaxBorrowableByInterestRate currentDebt: ${currentDebt.toString()}, maxDebtToHave: ${maxDebtToHave.toString()}`);
-    return maxDebtToHave.minus(currentDebt);
+    return {maxDebtToHave: maxDebtToHave.minus(currentDebt), currentDebt: currentDebt, totalSupply: totalSupply};
   }
 
   async getLTVConfig(config: IConfig, blockNumber: BlockIdentifier = 'latest') {