@strkfarm/sdk 1.1.74 → 1.1.76

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "1.1.74",
+    "version": "1.1.76",
     "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/dataTypes/_bignumber.ts

@@ -1,5 +1,6 @@
 import { logger } from "@/utils/logger";
 import BigNumber from "bignumber.js";
+import { uint256 } from "starknet";
 
 export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
   decimals: number;
@@ -107,6 +108,10 @@ export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
       sign: sign,
     }
   }
+
+  toUint256() {
+    return uint256.bnToUint256(this.toWei());
+  }
 }
 
 BigNumber.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });

package/src/strategies/sensei.ts

@@ -144,23 +144,42 @@ export class SenseiVault extends BaseStrategy<
       throw new Error('No positions found');
     }
 
-    const collateralXSTRK = Web3Number.fromWei(
+    let collateralXSTRK = Web3Number.fromWei(
       data.data[0].collateral.value,
       data.data[0].collateral.decimals,
     );
-    const collateralUSDValue = Web3Number.fromWei(
+    let collateralUSDValue = Web3Number.fromWei(
       data.data[0].collateral.usdPrice.value,
       data.data[0].collateral.usdPrice.decimals,
     );
-    const debtSTRK = Web3Number.fromWei(
+    let debtSTRK = Web3Number.fromWei(
       data.data[0].debt.value,
       data.data[0].debt.decimals,
     );
-    const debtUSDValue = Web3Number.fromWei(
+    let debtUSDValue = Web3Number.fromWei(
       data.data[0].debt.usdPrice.value,
       data.data[0].debt.usdPrice.decimals,
     );
 
+    if (data.data[1]) {
+      collateralXSTRK = collateralXSTRK.plus(Web3Number.fromWei(
+        data.data[1].collateral.value,
+        data.data[1].collateral.decimals,
+      ));
+      collateralUSDValue = collateralUSDValue.plus(Web3Number.fromWei(
+        data.data[1].collateral.usdPrice.value,
+        data.data[1].collateral.usdPrice.decimals,
+      ));
+      debtSTRK = debtSTRK.plus(Web3Number.fromWei(
+        data.data[1].debt.value,
+        data.data[1].debt.decimals,
+      ));
+      debtUSDValue = debtUSDValue.plus(Web3Number.fromWei(
+        data.data[1].debt.usdPrice.value,
+        data.data[1].debt.usdPrice.decimals,
+      ));
+    }
+
     const xSTRKPrice = await this.getSecondaryTokenPriceRelativeToMain();
     const collateralInSTRK =
       Number(collateralXSTRK.toFixed(6)) * xSTRKPrice;

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

@@ -234,6 +234,25 @@ export const VesuPools = {
   Re7xSTRK: ContractAddr.from('0x052fb52363939c3aa848f8f4ac28f0a51379f8d1b971d8444de25fbd77d8f161'),
   Re7xBTC: ContractAddr.from('0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf'),
   Prime: ContractAddr.from('0x451fe483d5921a2919ddd81d0de6696669bccdacd859f72a4fba7656b97c3b5'),
+  Re7STRK: ContractAddr.from('0x01fcdacc1d8184eca7b472b5acbaf1500cec9d5683ca95fede8128b46c8f9cc2'),
+}
+
+export const VesuPoolMetadata = {
+  [VesuPools.Genesis.address]: {
+    name: 'Genesis',
+  },
+  [VesuPools.Re7xSTRK.address]: {
+    name: 'Re7 xSTRK',
+  },
+  [VesuPools.Re7xBTC.address]: {
+    name: 'Re7 xBTC',
+  },
+  [VesuPools.Prime.address]: {
+    name: 'Prime',
+  },
+  [VesuPools.Re7STRK.address]: {
+    name: 'Re7 STRK',
+  },
 }
 
 export const extensionMap: {[key: string]: ContractAddr} = {};
@@ -418,14 +437,14 @@ export class VesuAdapter extends BaseAdapter {
     }
   }
 
-  getVesuModifyDelegationAdapter = (id: string): LeafAdapterFn<VesuModifyDelegationCallParams> => {
+  getVesuModifyDelegationAdapter = (id: string, delegatee: ContractAddr): LeafAdapterFn<VesuModifyDelegationCallParams> => {
     return () => {
       const { addr: VESU_SINGLETON, isV2 } = getVesuSingletonAddress(this.config.poolId);
       const packedArguments: bigint[] = isV2 ? [
-        toBigInt(this.VESU_MULTIPLY.toString()), // v2
+        toBigInt(delegatee.toString()), // v2
       ] : [
         this.config.poolId.toBigInt(),
-        toBigInt(this.VESU_MULTIPLY_V1.toString()), // v1
+        toBigInt(delegatee.toString()), // v1
       ];
       const output = this.constructSimpleLeafData({
         id: id,
@@ -434,29 +453,31 @@ export class VesuAdapter extends BaseAdapter {
         packedArguments
       }, isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER_VESU_V1_DELEGATIONS);
 
-      return { leaf: output, callConstructor: this.getVesuModifyDelegationCall.bind(this) };
+      return { leaf: output, callConstructor: this.getVesuModifyDelegationCall(delegatee).bind(this) };
     }
   }
 
-  getVesuModifyDelegationCall = (params: VesuModifyDelegationCallParams): ManageCall => {
-    const VESU_SINGLETON = getVesuSingletonAddress(this.config.poolId).addr;
-    const { contract, isV2 } = this.getVesuSingletonContract(getMainnetConfig(), this.config.poolId);
-    const call = contract.populate('modify_delegation', isV2 ? {
-      delegatee: this.VESU_MULTIPLY.toBigInt(),
-      delegation: params.delegation,
-    } : {
-      pool_id: this.config.poolId.toBigInt(),
-      delegatee: this.VESU_MULTIPLY_V1.toBigInt(),
-      delegation: params.delegation,
-    });
-    return {
-      sanitizer: isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER_VESU_V1_DELEGATIONS,
-      call: {
-        contractAddress: VESU_SINGLETON,
-        selector: hash.getSelectorFromName('modify_delegation'),
-        calldata: [
-          ...call.calldata as bigint[]
-        ]
+  getVesuModifyDelegationCall = (delegatee: ContractAddr) => {
+    return (params: VesuModifyDelegationCallParams) => {
+      const VESU_SINGLETON = getVesuSingletonAddress(this.config.poolId).addr;
+      const { contract, isV2 } = this.getVesuSingletonContract(getMainnetConfig(), this.config.poolId);
+      const call = contract.populate('modify_delegation', isV2 ? {
+        delegatee: delegatee.toBigInt(),
+        delegation: params.delegation,
+      } : {
+        pool_id: this.config.poolId.toBigInt(),
+        delegatee: delegatee.toBigInt(),
+        delegation: params.delegation,
+      });
+      return {
+        sanitizer: isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER_VESU_V1_DELEGATIONS,
+        call: {
+          contractAddress: VESU_SINGLETON,
+          selector: hash.getSelectorFromName('modify_delegation'),
+          calldata: [
+            ...call.calldata as bigint[]
+          ]
+        }
       }
     }
   }
@@ -654,12 +675,12 @@ export class VesuAdapter extends BaseAdapter {
       amount: collateralAmount,
       token: this.config.collateral,
       usdValue: collateralAmount.multipliedBy(token1Price.price).toNumber(),
-      remarks: "Collateral"
+      remarks: `Collateral - ${VesuPoolMetadata[this.config.poolId.address].name} pool`
     }, {
       amount: debtAmount,
       token: this.config.debt,
       usdValue: debtAmount.multipliedBy(token2Price.price).toNumber(),
-      remarks: "Debt"
+      remarks: `Debt - ${VesuPoolMetadata[this.config.poolId.address].name} pool`
     }];
     this.setCache(CACHE_KEY, value, 60000); // ttl: 1min
     return value;

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;
   }
@@ -760,7 +759,7 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
     const STEP2_ID = getVesuGenericLegId(params.poolId.toString(), LST_MULTIPLIER_MANAGE_IDS.SWITCH_DELEGATION_ON);
     const manage2Info = this.getProofs<VesuModifyDelegationCallParams>(STEP2_ID);
     const manageCall2 = manage2Info.callConstructor({
-      delegation: true
+      delegation: true,
     });
 
     // deposit and borrow or repay and withdraw
@@ -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;
@@ -916,14 +915,18 @@ function addVesuLeaves(
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, VESU_MULTIPLY, leafIdApprove).bind(commonAdapter));
   
   const leafIdDelegationOn = getVesuGenericLegId(poolId.toString(), LST_MULTIPLIER_MANAGE_IDS.SWITCH_DELEGATION_ON);
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOn).bind(vesuAdapterLST));
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOn, VESU_MULTIPLY).bind(vesuAdapterLST));
   
   const leafIdDelegationOff = getVesuGenericLegId(poolId.toString(), LST_MULTIPLIER_MANAGE_IDS.SWITCH_DELEGATION_OFF);
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff).bind(vesuAdapterLST));
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter(leafIdDelegationOff, VESU_MULTIPLY).bind(vesuAdapterLST));
 
   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,13 @@ 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 })),
+    ...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,
-  altSupportedPoolIds: [VesuPools.Prime],
 }
 
 const hyperxWBTC: HyperLSTStrategySettings = {
@@ -1099,10 +1087,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],
 }
 
 const hyperxtBTC: HyperLSTStrategySettings = {
@@ -1115,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: [],
 }
 
 const hyperxsBTC: HyperLSTStrategySettings = {
@@ -1131,10 +1124,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 = {
@@ -1147,10 +1141,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) {
@@ -1171,7 +1166,7 @@ function getStrategySettings(lstSymbol: string, underlyingSymbol: string, addres
     launchBlock: 0,
     type: 'Other',
     depositTokens: [Global.getDefaultTokens().find(token => token.symbol === lstSymbol)!],
-    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, addresses, addresses.defaultPoolId, lstSymbol === 'xSTRK' ? [VesuPools.Prime] : []),
+    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, addresses, addresses.defaultPoolId),
     risk: {
       riskFactor: _riskFactor,
       netRisk: