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

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/ekubo-cl-vault.tsx

@@ -302,7 +302,10 @@ export class EkuboCLVault extends BaseStrategy<
     return [this.contract.populate("handle_fees", [])];
   }
 
-  async getFeeHistory(timePeriod: '24h' | '7d' | '30d' | '3m' = '24h'): Promise<{
+  async getFeeHistory(
+    timePeriod: '24h' | '7d' | '30d' | '3m' | '6m' = '24h',
+    range?: { startTimestamp?: number; endTimestamp?: number }
+  ): Promise<{
     summary: DualTokenInfo,
     history: FeeHistory[]
   }> {
@@ -311,8 +314,15 @@ export class EkuboCLVault extends BaseStrategy<
         query ContractFeeEarnings(
           $timeframe: String!
           $contract: String!
+          $startTimestamp: Float
+          $endTimestamp: Float
         ) {
-          contractFeeEarnings(timeframe: $timeframe, contract: $contract) {
+          contractFeeEarnings(
+            timeframe: $timeframe
+            contract: $contract
+            startTimestamp: $startTimestamp
+            endTimestamp: $endTimestamp
+          ) {
             contract
             dailyEarnings {
               date
@@ -325,7 +335,9 @@ export class EkuboCLVault extends BaseStrategy<
       `,
       variables: {
         timeframe: timePeriod,
-        contract: this.address.address
+        contract: this.address.address,
+        startTimestamp: range?.startTimestamp,
+        endTimestamp: range?.endTimestamp
       },
       fetchPolicy: 'no-cache',
     });

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

@@ -437,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,
@@ -453,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[]
+          ]
+        }
       }
     }
   }

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

@@ -759,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
@@ -915,10 +915,10 @@ 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));
@@ -1071,6 +1071,7 @@ const hyperxSTRK: HyperLSTStrategySettings = {
   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,