@strkfarm/sdk 2.0.0-staging.15 → 2.0.0-staging.18

package/src/strategies/universal-lst-muliplier-strategy.tsx

@@ -15,10 +15,9 @@ import { HealthFactorMath } from "@/utils/health-factor-math";
 import { findMaxInputWithSlippage } from "@/utils/math-utils";
 
 export interface HyperLSTStrategySettings extends UniversalStrategySettings {
-  borrowable_assets: TokenInfo[];
+  borrowable_assets: { token: TokenInfo, poolId: ContractAddr }[];
   underlyingToken: TokenInfo;
   defaultPoolId: ContractAddr;
-  altSupportedPoolIds: ContractAddr[];
 }
 
 export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTStrategySettings> {
@@ -58,20 +57,20 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
   // todo support lending assets of underlying as well (like if xSTRK looping is not viable, simply supply STRK)
   getVesuAdapters() {
     const adapters: VesuAdapter[] = [];
-    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);
-      }
+    for (const borrowableInfo of this.metadata.additionalInfo.borrowable_assets) {
+      // do not add adapter if the pool id does not match
+      const asset = borrowableInfo.token;
+      const poolId = borrowableInfo.poolId;
+      const vesuAdapter1 = new VesuAdapter({
+        poolId: 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;
   }
@@ -907,7 +906,7 @@ function addVesuLeaves(
   }]);
 
   // avnu multiply
-  const { isV2, addr: _ } = getVesuSingletonAddress(poolId);
+  const { isV2, addr: poolAddr } = getVesuSingletonAddress(poolId);
 
   // vesu multiply looping
   const VESU_MULTIPLY = isV2 ? vesuAdapterLST.VESU_MULTIPLY : vesuAdapterLST.VESU_MULTIPLY_V1;
@@ -924,6 +923,10 @@ function addVesuLeaves(
   const multiplID = getVesuLegId(LST_MULTIPLIER_MANAGE_IDS.MULTIPLY_VESU, underlyingToken.symbol, poolId.toString());
   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));
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
+
   return vesuAdapterLST;
 }
 
@@ -931,8 +934,7 @@ function getLooperSettings(
   lstSymbol: string,
   underlyingSymbol: string,
   vaultSettings: HyperLSTStrategySettings,
-  defaultPoolId: ContractAddr,
-  altSupportedPoolIds: ContractAddr[] = []
+  defaultPoolId: ContractAddr
 ) {
   vaultSettings.leafAdapters = [];
   const pool1 = vaultSettings.defaultPoolId;
@@ -957,15 +959,15 @@ function getLooperSettings(
     adapter: commonAdapter
   }]);
 
-  // add vesu leaves for default pool id
-  const vesuAdapterLST = addVesuLeaves(defaultPoolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter);
-
-  // add vesu leaves for alt supported pool ids
-  altSupportedPoolIds.map(poolId => addVesuLeaves(poolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter));
+  // add vesu leaves for all supported pool ids
+  vaultSettings.borrowable_assets.map(borrowableAsset => addVesuLeaves(borrowableAsset.poolId, lstSymbol, underlyingSymbol, vaultSettings, commonAdapter));
   
   // approve lst once to avnu
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, AVNU_EXCHANGE, LST_MULTIPLIER_MANAGE_IDS.AVNU_MULTIPLY_APPROVE_WITHDRAW).bind(commonAdapter));
-  for (let borrowableAsset of vaultSettings.borrowable_assets) {
+ 
+  const uniqueBorrowableAssets = [...new Set(vaultSettings.borrowable_assets.map(borrowableAsset => borrowableAsset.token.symbol))];
+  for (let borrowableAssetSymbol of uniqueBorrowableAssets) {
+    const borrowableAsset = Global.getDefaultTokens().find(token => token.symbol === borrowableAssetSymbol)!;
     // in-efficient avnu swap looping (but good with endur integration)
     const debtAsset = borrowableAsset;
     const approve_debt_token_id = getAvnuManageIDs(LST_MULTIPLIER_MANAGE_IDS.AVNU_MULTIPLY_APPROVE_DEPOSIT, debtAsset.symbol);
@@ -974,23 +976,6 @@ function getLooperSettings(
     vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(debtAsset.address, AVNU_EXCHANGE, approve_debt_token_id).bind(commonAdapter));
     vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(debtAsset.address, lstToken.address, swap_debt_token_id, false).bind(commonAdapter));
     vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(lstToken.address, debtAsset.address, swap_lst_token_id, false).bind(commonAdapter));
-
-    // approve LST to add collateral
-    const vesuAdapter = new VesuAdapter({
-      poolId: pool1,
-      collateral: lstToken,
-      debt: debtAsset,
-      vaultAllocator: vaultSettings.vaultAllocator,
-      id: getVesuLegId(UNIVERSAL_MANAGE_IDS.VESU_LEG1, debtAsset.symbol, pool1.toString())
-    });
-    const { isV2, addr:poolAddr } = getVesuSingletonAddress(pool1);
-    vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1).bind(commonAdapter));
-    vaultSettings.leafAdapters.push(vesuAdapter.getModifyPosition.bind(vesuAdapter));
-
-    // Vesu multiply
-    if (borrowableAsset.address.eq(underlyingToken.address)) {
-      continue; // already added in addVesuLeaves
-    }
   }
 
   
@@ -998,8 +983,8 @@ function getLooperSettings(
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, vaultSettings.vaultAddress, UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY).bind(commonAdapter));
   vaultSettings.leafAdapters.push(commonAdapter.getBringLiquidityAdapter(UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY).bind(commonAdapter));
   
-  // claim rewards
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getDefispringRewardsAdapter(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS).bind(vesuAdapterLST));
+  // claim rewards (defi spring ended)
+  // vaultSettings.leafAdapters.push(vesuAdapterLST.getDefispringRewardsAdapter(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS).bind(vesuAdapterLST));
 
   // avnu swap for claims rewards
   const STRKToken = Global.getDefaultTokens().find(token => token.symbol === 'STRK')!;
@@ -1069,7 +1054,7 @@ const _riskFactor: RiskFactor[] = [
   {type: RiskType.DEPEG_RISK, value: DepegRiskLevel.GENERALLY_STABLE, weight: 25, reason: "Generally stable pegged assets" },
 ];
 
-const borrowableAssets = [
+const btcBorrowableAssets = [
   'WBTC', 'tBTC', 'LBTC', 'solvBTC'
 ]
 
@@ -1083,10 +1068,12 @@ const hyperxSTRK: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'STRK'),
+  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.Prime })),
+  ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'STRK')!,
   defaultPoolId: VesuPools.Re7xSTRK,
-  altSupportedPoolIds: [VesuPools.Prime],
 }
 
 const hyperxWBTC: HyperLSTStrategySettings = {
@@ -1099,10 +1086,14 @@ const hyperxWBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: borrowableAssets.map(asset => Global.getDefaultTokens().find(token => token.symbol === asset)!),
+  borrowable_assets: [
+    // allow all BTC flavours borrowing on Re7xBTC pool
+    ...btcBorrowableAssets.map(asset => Global.getDefaultTokens().find(token => token.symbol === asset)!).map(token => ({ token, poolId: VesuPools.Re7xBTC })),
+    // allow only WBTC borrowing on Prime pool
+    ...Global.getDefaultTokens().filter(token => token.symbol === 'WBTC').map(token => ({ token, poolId: VesuPools.Prime })),
+  ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
   defaultPoolId: VesuPools.Re7xBTC,
-  altSupportedPoolIds: [VesuPools.Prime],
   redemptionRouter: ContractAddr.from('0x6ea649f402898f69baf775c1afdd08522c071c640b9c4460192070ec2b96417')
 }
 
@@ -1116,10 +1107,11 @@ const hyperxtBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'tBTC' || token.symbol === 'WBTC'),
+  borrowable_assets: [
+    ...Global.getDefaultTokens().filter(token => token.symbol === 'tBTC' || token.symbol === 'WBTC').map(token => ({ token, poolId: VesuPools.Re7xBTC })),
+  ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'tBTC')!,
   defaultPoolId: VesuPools.Re7xBTC,
-  altSupportedPoolIds: [],
   redemptionRouter: ContractAddr.from('0x3de9c409d1e357e25778fb7a3e2e2393666956846a5c2caa607296fa8e76b5d')
 }
 
@@ -1133,10 +1125,11 @@ const hyperxsBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'solvBTC'),
+  borrowable_assets: [
+    ...Global.getDefaultTokens().filter(token => token.symbol === 'solvBTC').map(token => ({ token, poolId: VesuPools.Re7xBTC })),
+  ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'solvBTC')!,
   defaultPoolId: VesuPools.Re7xBTC,
-  altSupportedPoolIds: [],
 }
 
 const hyperxLBTC: HyperLSTStrategySettings = {
@@ -1149,10 +1142,11 @@ const hyperxLBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'LBTC'),
+  borrowable_assets: [
+    ...Global.getDefaultTokens().filter(token => token.symbol === 'LBTC').map(token => ({ token, poolId: VesuPools.Re7xBTC })),
+  ],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'LBTC')!,
   defaultPoolId: VesuPools.Re7xBTC,
-  altSupportedPoolIds: [],
 }
 
 function getInvestmentSteps(lstSymbol: string, underlyingSymbol: string) {
@@ -1249,7 +1243,7 @@ const HYPER_LST_SECURITY = {
 const HYPER_LST_REDEMPTION_INFO: RedemptionInfo = {
     instantWithdrawalVault: InstantWithdrawalVault.NO,
     redemptionsInfo: [{
-        title: "Usual time",
+        title: "Typical Duration",
         description: "1-2 hours"
     }],
     alerts: [{
@@ -1262,14 +1256,14 @@ const HYPER_LST_REDEMPTION_INFO: RedemptionInfo = {
 function getStrategySettings(
     lstSymbol: string,
     underlyingSymbol: string,
-    addresses: HyperLSTStrategySettings,
+    settings: HyperLSTStrategySettings,
     isPreview: boolean = false
 ): IStrategyMetadata<HyperLSTStrategySettings> {
     return {
         id: `hyper_${lstSymbol.toLowerCase()}`,
         name: `Hyper ${lstSymbol}`,
         description: getDescription(lstSymbol, underlyingSymbol),
-        address: addresses.vaultAddress,
+        address: settings.vaultAddress,
         launchBlock: 0,
         type: "Other",
         vaultType: {
@@ -1284,8 +1278,8 @@ function getStrategySettings(
         additionalInfo: getLooperSettings(
             lstSymbol,
             underlyingSymbol,
-            addresses,
-            lstSymbol === "xSTRK" ? VesuPools.Re7xSTRK : VesuPools.Re7xBTC
+            settings,
+            lstSymbol === "xSTRK" ? VesuPools.Re7xSTRK : VesuPools.Re7xBTC,
         ),
         risk: {
             riskFactor: _riskFactor,
@@ -1303,7 +1297,7 @@ function getStrategySettings(
             logo: "https://assets.troves.fi/integrations/unwraplabs/white.png"
         },
         settings: createHyperLSTSettings(lstSymbol, underlyingSymbol),
-        contractDetails: getContractDetails(addresses),
+        contractDetails: getContractDetails(settings),
         faqs: getFAQs(lstSymbol, underlyingSymbol),
         investmentSteps: getInvestmentSteps(lstSymbol, underlyingSymbol),
         isPreview: isPreview,
@@ -1312,6 +1306,8 @@ function getStrategySettings(
         tags: lstSymbol.includes('BTC') ? [StrategyTag.BTC, StrategyTag.LEVERED] : [StrategyTag.LEVERED],
         security: HYPER_LST_SECURITY,
         redemptionInfo: HYPER_LST_REDEMPTION_INFO,
+        usualTimeToEarnings: "2 weeks",
+        usualTimeToEarningsDescription: "Strategy returns depend on LST price on DEXes. Even though the true price of LST on Endur increases continuously, the DEX price may lag sometimes, and historically is seen to rebase at least once every 2 hours. This is when you realise your earnings.",
         points: [{
           multiplier: 4,
           logo: 'https://endur.fi/favicon.ico',

package/src/strategies/universal-strategy.tsx

@@ -1288,7 +1288,7 @@ const EVERGREEN_SECURITY = {
 const EVERGREEN_REDEMPTION_INFO: RedemptionInfo = {
   instantWithdrawalVault: InstantWithdrawalVault.NO,
   redemptionsInfo: [{
-      title: "Usual time",
+      title: "Typical Duration",
       description: "1-2 hours"
   }],
   alerts: [{
@@ -1342,7 +1342,9 @@ const createUniversalStrategy = (params: {
     investmentSteps: investmentSteps,
     tags: params.tags,
     security: EVERGREEN_SECURITY,
-    redemptionInfo: EVERGREEN_REDEMPTION_INFO
+    redemptionInfo: EVERGREEN_REDEMPTION_INFO,
+    usualTimeToEarnings: null,
+    usualTimeToEarningsDescription: null,
 });
 
 export const UniversalStrategies: IStrategyMetadata<UniversalStrategySettings>[] =

package/src/strategies/vesu-rebalance.tsx

@@ -1078,6 +1078,8 @@ const createVesuRebalanceStrategy = (
     tags: [],
     security: VESU_SECURITY,
     redemptionInfo: VESU_REDEMPTION_INFO,
+    usualTimeToEarnings: null,
+    usualTimeToEarningsDescription: null,
 });
 
 // Shared security & redemption metadata for all Vesu strategies