@strkfarm/sdk 1.1.78 → 1.1.80

package/dist/index.browser.global.js

@@ -95057,7 +95057,11 @@ spurious results.`);
       const lstPrice = baseAssetPrice.price * lstExRate;
       for (let i = 0; i < maxBorrowableAmounts.maxBorrowables.length; i++) {
         const maxBorrowable = maxBorrowableAmounts.maxBorrowables[i];
-        const vesuAdapter = allVesuAdapters.find((adapter2) => adapter2.config.debt.address.eq(maxBorrowable.borrowableAsset.address));
+        const vesuAdapter = allVesuAdapters.find((adapter2) => {
+          const isDebtTokenMatch = adapter2.config.debt.address.eq(maxBorrowable.borrowableAsset.address);
+          const isPoolIdMatch = adapter2.config.poolId.eq(maxBorrowable.poolId);
+          return isDebtTokenMatch && isPoolIdMatch;
+        });
         if (!vesuAdapter) {
           throw new Error(`${this.getTag()}::getAvnuSwapMultiplyCall: vesuAdapter not found for borrowable asset: ${maxBorrowable.borrowableAsset.symbol}`);
         }
@@ -95148,7 +95152,7 @@ spurious results.`);
         return calls[0];
       }
       console.log(`debtAmount`, debtAmount.toWei(), params.leg1DepositAmount.toWei());
-      const STEP0 = "approve_token1" /* APPROVE_TOKEN1 */;
+      const STEP0 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
       const manage0Info = this.getProofs(STEP0);
       const manageCall0 = manage0Info.callConstructor({
         amount: newDepositAmount
@@ -95203,7 +95207,7 @@ spurious results.`);
         logger2.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF: ${newHF}`);
         if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
           logger2.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
-          const STEP4 = "approve_token1" /* APPROVE_TOKEN1 */;
+          const STEP4 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
           const manage4Info = this.getProofs(STEP4);
           const manageCall4 = manage4Info.callConstructor({
             amount: minAmount
@@ -95362,7 +95366,7 @@ spurious results.`);
       for (const vesuAdapter of vesuAdapters) {
         const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
         const ltv = await vesuAdapter.getLTVConfig(this.config);
-        maxBorrowables.push({ ...output, ltv });
+        maxBorrowables.push({ ...output, ltv, poolId: vesuAdapter.config.poolId });
       }
       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));
@@ -95632,6 +95636,9 @@ spurious results.`);
   function getVesuLegId(baseID, debtTokenSymbol, poolId) {
     return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
   }
+  function getApproveLegId(tokenSymbol, spender) {
+    return `appr_${tokenSymbol.toLowerCase()}_${spender.toString().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);
@@ -95656,7 +95663,8 @@ spurious results.`);
     vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff, VESU_MULTIPLY).bind(vesuAdapterLST));
     const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, underlyingToken.symbol, poolId.toString());
     vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
-    vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
+    const approveLegId = getApproveLegId(lstToken.symbol, poolAddr);
+    vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, approveLegId).bind(commonAdapter));
     vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
     return vesuAdapterLST;
   }
@@ -95769,13 +95777,13 @@ spurious results.`);
     targetHealthFactor: 1.1,
     minHealthFactor: 1.05,
     borrowable_assets: [
-      ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7xSTRK })),
+      // ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
       ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Prime })),
       ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7STRK }))
       // v2, new alt for Re7xSTRK
     ],
     underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK"),
-    defaultPoolId: VesuPools.Re7xSTRK
+    defaultPoolId: VesuPools.Re7STRK
   };
   var hyperxWBTC = {
     vaultAddress: ContractAddr.from("0x2da9d0f96a46b453f55604313785dc866424240b1c6811d13bef594343db818"),

package/dist/index.browser.mjs

@@ -31035,7 +31035,11 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const lstPrice = baseAssetPrice.price * lstExRate;
     for (let i = 0; i < maxBorrowableAmounts.maxBorrowables.length; i++) {
       const maxBorrowable = maxBorrowableAmounts.maxBorrowables[i];
-      const vesuAdapter = allVesuAdapters.find((adapter) => adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address));
+      const vesuAdapter = allVesuAdapters.find((adapter) => {
+        const isDebtTokenMatch = adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address);
+        const isPoolIdMatch = adapter.config.poolId.eq(maxBorrowable.poolId);
+        return isDebtTokenMatch && isPoolIdMatch;
+      });
       if (!vesuAdapter) {
         throw new Error(`${this.getTag()}::getAvnuSwapMultiplyCall: vesuAdapter not found for borrowable asset: ${maxBorrowable.borrowableAsset.symbol}`);
       }
@@ -31126,7 +31130,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       return calls[0];
     }
     console.log(`debtAmount`, debtAmount.toWei(), params.leg1DepositAmount.toWei());
-    const STEP0 = "approve_token1" /* APPROVE_TOKEN1 */;
+    const STEP0 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
     const manage0Info = this.getProofs(STEP0);
     const manageCall0 = manage0Info.callConstructor({
       amount: newDepositAmount
@@ -31181,7 +31185,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF: ${newHF}`);
       if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
         logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
-        const STEP4 = "approve_token1" /* APPROVE_TOKEN1 */;
+        const STEP4 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
         const manage4Info = this.getProofs(STEP4);
         const manageCall4 = manage4Info.callConstructor({
           amount: minAmount
@@ -31340,7 +31344,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     for (const vesuAdapter of vesuAdapters) {
       const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
       const ltv = await vesuAdapter.getLTVConfig(this.config);
-      maxBorrowables.push({ ...output, ltv });
+      maxBorrowables.push({ ...output, ltv, poolId: vesuAdapter.config.poolId });
     }
     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));
@@ -31610,6 +31614,9 @@ function getVesuGenericLegId(poolId, action) {
 function getVesuLegId(baseID, debtTokenSymbol, poolId) {
   return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
 }
+function getApproveLegId(tokenSymbol, spender) {
+  return `appr_${tokenSymbol.toLowerCase()}_${spender.toString().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);
@@ -31634,7 +31641,8 @@ function addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commo
   vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff, VESU_MULTIPLY).bind(vesuAdapterLST));
   const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, underlyingToken.symbol, poolId.toString());
   vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
+  const approveLegId = getApproveLegId(lstToken.symbol, poolAddr);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, approveLegId).bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
   return vesuAdapterLST;
 }
@@ -31747,13 +31755,13 @@ var hyperxSTRK = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: [
-    ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7xSTRK })),
+    // ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Prime })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7STRK }))
     // v2, new alt for Re7xSTRK
   ],
   underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK"),
-  defaultPoolId: VesuPools.Re7xSTRK
+  defaultPoolId: VesuPools.Re7STRK
 };
 var hyperxWBTC = {
   vaultAddress: ContractAddr.from("0x2da9d0f96a46b453f55604313785dc866424240b1c6811d13bef594343db818"),

package/dist/index.d.ts

@@ -1522,6 +1522,7 @@ declare class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTS
             maxBorrowableAmount: Web3Number;
             borrowableAsset: TokenInfo;
             ltv: number;
+            poolId: ContractAddr;
         }[];
     }>;
     getMaxSwappableWithMaxSlippage(fromToken: TokenInfo, toToken: TokenInfo, maxSlippage: number, maxAmount: Web3Number): Promise<Web3Number>;

package/dist/index.js

@@ -31036,7 +31036,11 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const lstPrice = baseAssetPrice.price * lstExRate;
     for (let i = 0; i < maxBorrowableAmounts.maxBorrowables.length; i++) {
       const maxBorrowable = maxBorrowableAmounts.maxBorrowables[i];
-      const vesuAdapter = allVesuAdapters.find((adapter) => adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address));
+      const vesuAdapter = allVesuAdapters.find((adapter) => {
+        const isDebtTokenMatch = adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address);
+        const isPoolIdMatch = adapter.config.poolId.eq(maxBorrowable.poolId);
+        return isDebtTokenMatch && isPoolIdMatch;
+      });
       if (!vesuAdapter) {
         throw new Error(`${this.getTag()}::getAvnuSwapMultiplyCall: vesuAdapter not found for borrowable asset: ${maxBorrowable.borrowableAsset.symbol}`);
       }
@@ -31127,7 +31131,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       return calls[0];
     }
     console.log(`debtAmount`, debtAmount.toWei(), params.leg1DepositAmount.toWei());
-    const STEP0 = "approve_token1" /* APPROVE_TOKEN1 */;
+    const STEP0 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
     const manage0Info = this.getProofs(STEP0);
     const manageCall0 = manage0Info.callConstructor({
       amount: newDepositAmount
@@ -31182,7 +31186,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF: ${newHF}`);
       if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
         logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
-        const STEP4 = "approve_token1" /* APPROVE_TOKEN1 */;
+        const STEP4 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
         const manage4Info = this.getProofs(STEP4);
         const manageCall4 = manage4Info.callConstructor({
           amount: minAmount
@@ -31341,7 +31345,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     for (const vesuAdapter of vesuAdapters) {
       const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
       const ltv = await vesuAdapter.getLTVConfig(this.config);
-      maxBorrowables.push({ ...output, ltv });
+      maxBorrowables.push({ ...output, ltv, poolId: vesuAdapter.config.poolId });
     }
     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));
@@ -31611,6 +31615,9 @@ function getVesuGenericLegId(poolId, action) {
 function getVesuLegId(baseID, debtTokenSymbol, poolId) {
   return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
 }
+function getApproveLegId(tokenSymbol, spender) {
+  return `appr_${tokenSymbol.toLowerCase()}_${spender.toString().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);
@@ -31635,7 +31642,8 @@ function addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commo
   vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff, VESU_MULTIPLY).bind(vesuAdapterLST));
   const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, underlyingToken.symbol, poolId.toString());
   vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
+  const approveLegId = getApproveLegId(lstToken.symbol, poolAddr);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, approveLegId).bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
   return vesuAdapterLST;
 }
@@ -31748,13 +31756,13 @@ var hyperxSTRK = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: [
-    ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7xSTRK })),
+    // ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Prime })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7STRK }))
     // v2, new alt for Re7xSTRK
   ],
   underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK"),
-  defaultPoolId: VesuPools.Re7xSTRK
+  defaultPoolId: VesuPools.Re7STRK
 };
 var hyperxWBTC = {
   vaultAddress: ContractAddr.from("0x2da9d0f96a46b453f55604313785dc866424240b1c6811d13bef594343db818"),

package/dist/index.mjs

@@ -30933,7 +30933,11 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const lstPrice = baseAssetPrice.price * lstExRate;
     for (let i = 0; i < maxBorrowableAmounts.maxBorrowables.length; i++) {
       const maxBorrowable = maxBorrowableAmounts.maxBorrowables[i];
-      const vesuAdapter = allVesuAdapters.find((adapter) => adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address));
+      const vesuAdapter = allVesuAdapters.find((adapter) => {
+        const isDebtTokenMatch = adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address);
+        const isPoolIdMatch = adapter.config.poolId.eq(maxBorrowable.poolId);
+        return isDebtTokenMatch && isPoolIdMatch;
+      });
       if (!vesuAdapter) {
         throw new Error(`${this.getTag()}::getAvnuSwapMultiplyCall: vesuAdapter not found for borrowable asset: ${maxBorrowable.borrowableAsset.symbol}`);
       }
@@ -31024,7 +31028,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       return calls[0];
     }
     console.log(`debtAmount`, debtAmount.toWei(), params.leg1DepositAmount.toWei());
-    const STEP0 = "approve_token1" /* APPROVE_TOKEN1 */;
+    const STEP0 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
     const manage0Info = this.getProofs(STEP0);
     const manageCall0 = manage0Info.callConstructor({
       amount: newDepositAmount
@@ -31079,7 +31083,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
       logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF: ${newHF}`);
       if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
         logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
-        const STEP4 = "approve_token1" /* APPROVE_TOKEN1 */;
+        const STEP4 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
         const manage4Info = this.getProofs(STEP4);
         const manageCall4 = manage4Info.callConstructor({
           amount: minAmount
@@ -31238,7 +31242,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     for (const vesuAdapter of vesuAdapters) {
       const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
       const ltv = await vesuAdapter.getLTVConfig(this.config);
-      maxBorrowables.push({ ...output, ltv });
+      maxBorrowables.push({ ...output, ltv, poolId: vesuAdapter.config.poolId });
     }
     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));
@@ -31508,6 +31512,9 @@ function getVesuGenericLegId(poolId, action) {
 function getVesuLegId(baseID, debtTokenSymbol, poolId) {
   return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
 }
+function getApproveLegId(tokenSymbol, spender) {
+  return `appr_${tokenSymbol.toLowerCase()}_${spender.toString().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);
@@ -31532,7 +31539,8 @@ function addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commo
   vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff, VESU_MULTIPLY).bind(vesuAdapterLST));
   const multiplID = getVesuLegId("multiply_vesu" /* MULTIPLY_VESU */, underlyingToken.symbol, poolId.toString());
   vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
+  const approveLegId = getApproveLegId(lstToken.symbol, poolAddr);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, approveLegId).bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
   return vesuAdapterLST;
 }
@@ -31645,13 +31653,13 @@ var hyperxSTRK = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: [
-    ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7xSTRK })),
+    // ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Prime })),
     ...Global.getDefaultTokens().filter((token) => token.symbol === "STRK").map((token) => ({ token, poolId: VesuPools.Re7STRK }))
     // v2, new alt for Re7xSTRK
   ],
   underlyingToken: Global.getDefaultTokens().find((token) => token.symbol === "STRK"),
-  defaultPoolId: VesuPools.Re7xSTRK
+  defaultPoolId: VesuPools.Re7STRK
 };
 var hyperxWBTC = {
   vaultAddress: ContractAddr.from("0x2da9d0f96a46b453f55604313785dc866424240b1c6811d13bef594343db818"),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "1.1.78",
+    "version": "1.1.80",
     "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/strategies/universal-lst-muliplier-strategy.tsx

@@ -117,7 +117,11 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
     const lstPrice = baseAssetPrice.price * lstExRate;
     for (let i = 0; i < maxBorrowableAmounts.maxBorrowables.length; i++) {
       const maxBorrowable = maxBorrowableAmounts.maxBorrowables[i];
-      const vesuAdapter = allVesuAdapters.find(adapter => adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address));
+      const vesuAdapter = allVesuAdapters.find(adapter => {
+        const isDebtTokenMatch = adapter.config.debt.address.eq(maxBorrowable.borrowableAsset.address);
+        const isPoolIdMatch = adapter.config.poolId.eq(maxBorrowable.poolId);
+        return isDebtTokenMatch && isPoolIdMatch;
+      });
       if (!vesuAdapter) {
         throw new Error(`${this.getTag()}::getAvnuSwapMultiplyCall: vesuAdapter not found for borrowable asset: ${maxBorrowable.borrowableAsset.symbol}`);
       }
@@ -233,7 +237,7 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
       return calls[0];
     }
     console.log(`debtAmount`, debtAmount.toWei(), params.leg1DepositAmount.toWei());
-    const STEP0 = UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1;
+    const STEP0 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
     const manage0Info = this.getProofs<ApproveCallParams>(STEP0);
     const manageCall0 = manage0Info.callConstructor({
       amount: newDepositAmount
@@ -298,7 +302,7 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
       if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
         logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
         // approve and add collateral on vesu (modify position)
-        const STEP4 = UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1;
+        const STEP4 = getApproveLegId(vesuAdapter.config.collateral.symbol, vesuAdapter.config.poolId);
         const manage4Info = this.getProofs<ApproveCallParams>(STEP4);
         const manageCall4 = manage4Info.callConstructor({
           amount: minAmount
@@ -526,11 +530,11 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
   async getMaxBorrowableAmount(params: { isAPYComputation: boolean } = { isAPYComputation: false }) {
     const vesuAdapters = this.getVesuAdapters();
     let netMaxBorrowableAmount = Web3Number.fromWei("0", this.getLSTUnderlyingTokenInfo().decimals);
-    const maxBorrowables: {amount: Web3Number, dexSwappableAmount: Web3Number, maxBorrowableAmount: Web3Number, borrowableAsset: TokenInfo, ltv: number}[] = [];
+    const maxBorrowables: {amount: Web3Number, dexSwappableAmount: Web3Number, maxBorrowableAmount: Web3Number, borrowableAsset: TokenInfo, ltv: number, poolId: ContractAddr}[] = [];
     for (const vesuAdapter of vesuAdapters) {
       const output = await this.getMaxBorrowableAmountByVesuAdapter(vesuAdapter, params.isAPYComputation);
       const ltv = await vesuAdapter.getLTVConfig(this.config);
-      maxBorrowables.push({...output, ltv});
+      maxBorrowables.push({...output, ltv, poolId: vesuAdapter.config.poolId});
     }
     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));
@@ -880,6 +884,10 @@ function getVesuLegId(baseID: string, debtTokenSymbol: string, poolId: string) {
   return `${baseID}_${debtTokenSymbol.toLowerCase()}_${poolId.slice(-4).toLowerCase()}`;
 }
 
+function getApproveLegId(tokenSymbol: string, spender: ContractAddr) {
+  return `appr_${tokenSymbol.toLowerCase()}_${spender.toString().slice(-4).toLowerCase()}`;
+}
+
 function addVesuLeaves(
   poolId: ContractAddr,
   lstSymbol: string,
@@ -924,7 +932,8 @@ function addVesuLeaves(
   vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter(multiplID).bind(vesuAdapterLST));
  
   // direct modify position stuff
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1).bind(commonAdapter));
+  const approveLegId = getApproveLegId(lstToken.symbol, poolAddr);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, approveLegId).bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
 
   return vesuAdapterLST;
@@ -1069,12 +1078,12 @@ const hyperxSTRK: HyperLSTStrategySettings = {
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
   borrowable_assets: [
-    ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
+    // ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7xSTRK })),
     ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Prime })),
     ...Global.getDefaultTokens().filter(token => token.symbol === 'STRK').map(token => ({ token, poolId: VesuPools.Re7STRK })), // v2, new alt for Re7xSTRK
   ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'STRK')!,
-  defaultPoolId: VesuPools.Re7xSTRK,
+  defaultPoolId: VesuPools.Re7STRK,
 }
 
 const hyperxWBTC: HyperLSTStrategySettings = {