@strkfarm/sdk 2.0.0-dev.5 → 2.0.0-dev.6

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

@@ -1,4 +1,9 @@
-import { BaseAdapter, DepositParams, WithdrawParams, BaseAdapterConfig } from "./baseAdapter";
+import {
+  BaseAdapter,
+  DepositParams,
+  WithdrawParams,
+  BaseAdapterConfig,
+} from "./baseAdapter";
 import { Protocols } from "@/interfaces";
 import { SupportedPosition } from "./baseAdapter";
 import { PositionAPY, APYType, PositionAmount } from "./baseAdapter";
@@ -11,7 +16,12 @@ import { StandardMerkleTree } from "@/utils";
 import { hash, uint256 } from "starknet";
 import { Global } from "@/global";
 import { AdapterLeafType, GenerateCallFn } from "./baseAdapter";
-import { AVNU_LEGACY_SANITIZER, EXTENDED_SANITIZER, SIMPLE_SANITIZER, toBigInt } from "./adapter-utils";
+import {
+  AVNU_LEGACY_SANITIZER,
+  EXTENDED_SANITIZER,
+  SIMPLE_SANITIZER,
+  toBigInt,
+} from "./adapter-utils";
 import ExtendedWrapper, {
   AssetOperationStatus,
   AssetOperationType,
@@ -61,12 +71,15 @@ export class ExtendedAdapter extends BaseAdapter<
   ): Promise<PositionAPY> {
     /** Considering supportedPosiiton.isDebt as side parameter to get the funding rates */
     const side = supportedPosition.isDebt ? "LONG" : "SHORT";
-    const fundingRates = await this.client.getFundingRates(this.config.extendedMarketName, side);
+    const fundingRates = await this.client.getFundingRates(
+      this.config.extendedMarketName,
+      side
+    );
     if (fundingRates.status !== "OK") {
       logger.error("error getting funding rates", fundingRates);
       return { apy: 0, type: APYType.BASE };
     }
-    const fundingRate:FundingRate = fundingRates.data[0];
+    const fundingRate: FundingRate = fundingRates.data[0];
     const apy = Number(fundingRate.f) * 365 * 24;
     return { apy: apy, type: APYType.BASE };
   }
@@ -118,14 +131,14 @@ export class ExtendedAdapter extends BaseAdapter<
     sanitizer: ContractAddr;
     id: string;
   }[] {
-    const usdceToken = Global.getDefaultTokens().find(token => token.symbol === "USDCe");
+    const usdceToken = Global.getDefaultTokens().find(
+      (token) => token.symbol === "USDCe"
+    );
     return [
       {
         target: this.config.supportedPositions[0].asset.address,
         method: "approve",
-        packedArguments: [
-          AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt(),
-        ],
+        packedArguments: [AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()],
         id: `extended_approve_${this.config.supportedPositions[0].asset.symbol}`,
         sanitizer: AVNU_LEGACY_SANITIZER,
       },
@@ -155,19 +168,27 @@ export class ExtendedAdapter extends BaseAdapter<
 
   getSwapFromLegacyLeaf(): AdapterLeafType<DepositParams> {
     const leafConfigs = this._getSwapFromLegacyLeaf();
-    const leaves = leafConfigs.map(config => {
+    const leaves = leafConfigs.map((config) => {
       const { target, method, packedArguments, sanitizer, id } = config;
-      const leaf = this.constructSimpleLeafData({
-        id: id,
-        target,
-        method,
-        packedArguments
-      }, sanitizer);
+      const leaf = this.constructSimpleLeafData(
+        {
+          id: id,
+          target,
+          method,
+          packedArguments,
+        },
+        sanitizer
+      );
       return leaf;
     });
-    return { leaves, callConstructor: this.getSwapFromLegacyCall.bind(this) as unknown as GenerateCallFn<DepositParams> };
+    return {
+      leaves,
+      callConstructor: this.getSwapFromLegacyCall.bind(
+        this
+      ) as unknown as GenerateCallFn<DepositParams>,
+    };
   }
-  
+
   protected _getSwapFromLegacyLeaf(): {
     target: ContractAddr;
     method: string;
@@ -175,14 +196,14 @@ export class ExtendedAdapter extends BaseAdapter<
     sanitizer: ContractAddr;
     id: string;
   }[] {
-    const usdceToken = Global.getDefaultTokens().find(token => token.symbol === "USDCe");
+    const usdceToken = Global.getDefaultTokens().find(
+      (token) => token.symbol === "USDCe"
+    );
     return [
       {
         target: usdceToken!.address,
         method: "approve",
-        packedArguments: [
-          AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt(),
-        ],
+        packedArguments: [AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()],
         id: `extendedswaplegacyapprove_${usdceToken!.symbol}`,
         sanitizer: AVNU_LEGACY_SANITIZER,
       },
@@ -193,10 +214,9 @@ export class ExtendedAdapter extends BaseAdapter<
         id: `extended_swap_to_new_${usdceToken!.symbol}`,
         sanitizer: AVNU_LEGACY_SANITIZER,
       },
-    ]
+    ];
   }
 
-
   protected _getWithdrawLeaf(): {
     target: ContractAddr;
     method: string;
@@ -213,12 +233,14 @@ export class ExtendedAdapter extends BaseAdapter<
   async getDepositCall(params: DepositParams): Promise<ManageCall[]> {
     try {
       const usdcToken = this.config.supportedPositions[0].asset;
-      const usdceToken = Global.getDefaultTokens().find(token => token.symbol === "USDCe");
-      const salt = Math.floor(
-        Math.random() * 10 ** usdcToken.decimals
+      const usdceToken = Global.getDefaultTokens().find(
+        (token) => token.symbol === "USDCe"
       );
+      const salt = Math.floor(Math.random() * 10 ** usdcToken.decimals);
       // Give approval for more amount than the required amount
-      const amount = uint256.bnToUint256(params.amount.multipliedBy(10).toWei());
+      const amount = uint256.bnToUint256(
+        params.amount.multipliedBy(10).toWei()
+      );
       const quotes = await this.config.avnuAdapter.getQuotesAvnu(
         usdcToken.address.toString(),
         usdceToken!.address.toString(),
@@ -226,15 +248,17 @@ export class ExtendedAdapter extends BaseAdapter<
         this.config.avnuAdapter.config.vaultAllocator.address.toString(),
         usdceToken!.decimals,
         false
-      )
+      );
 
       if (!quotes) {
         logger.error("error getting quotes from avnu");
         return [];
       }
-      const getCalldata = await this.config.avnuAdapter.getSwapCallData(quotes!);
+      const getCalldata = await this.config.avnuAdapter.getSwapCallData(
+        quotes!
+      );
       const swapCallData = getCalldata[0];
-       //change extended sanitizer here
+      //change extended sanitizer here
       return [
         {
           sanitizer: AVNU_LEGACY_SANITIZER,
@@ -287,35 +311,44 @@ export class ExtendedAdapter extends BaseAdapter<
     }
   }
 
-  getProofsForFromLegacySwap<T>(tree: StandardMerkleTree): { proofs: string[][], callConstructor: GenerateCallFn<DepositParams> | GenerateCallFn<WithdrawParams> } {
+  getProofsForFromLegacySwap<T>(tree: StandardMerkleTree): {
+    proofs: string[][];
+    callConstructor:
+      | GenerateCallFn<DepositParams>
+      | GenerateCallFn<WithdrawParams>;
+  } {
     let proofGroups: string[][] = [];
 
-    const ids = this.getSwapFromLegacyLeaf().leaves.map(l => l.readableId) 
+    const ids = this.getSwapFromLegacyLeaf().leaves.map((l) => l.readableId);
     // console.log(`${this.name}::getProofs ids: ${ids}`);
     for (const [i, v] of tree.entries()) {
-   //   console.log(`${this.name}::getProofs v: ${v.readableId}`);
+      //   console.log(`${this.name}::getProofs v: ${v.readableId}`);
       if (ids.includes(v.readableId)) {
-     //console.log(`${this.name}::getProofs found id: ${v.readableId}`);
+        //console.log(`${this.name}::getProofs found id: ${v.readableId}`);
         proofGroups.push(tree.getProof(i));
       }
     }
     if (proofGroups.length != ids.length) {
-      throw new Error(`Not all proofs found for IDs: ${ids.join(', ')}`);
+      throw new Error(`Not all proofs found for IDs: ${ids.join(", ")}`);
     }
 
     // find leaf adapter
     return {
       proofs: proofGroups,
-      callConstructor: this.getSwapFromLegacyCall.bind(this)
-      };
-    }
+      callConstructor: this.getSwapFromLegacyCall.bind(this),
+    };
+  }
 
   async getSwapFromLegacyCall(params: DepositParams): Promise<ManageCall[]> {
     try {
       const usdcToken = this.config.supportedPositions[0].asset;
-      const usdceToken = Global.getDefaultTokens().find(token => token.symbol === "USDCe");
+      const usdceToken = Global.getDefaultTokens().find(
+        (token) => token.symbol === "USDCe"
+      );
       // Give approval for more amount than the required amount
-      const amount = uint256.bnToUint256(params.amount.multipliedBy(10).toWei());
+      const amount = uint256.bnToUint256(
+        params.amount.multipliedBy(10).toWei()
+      );
       const quotes = await this.config.avnuAdapter.getQuotesAvnu(
         usdceToken!.address.toString(),
         usdcToken!.address.toString(),
@@ -323,15 +356,17 @@ export class ExtendedAdapter extends BaseAdapter<
         this.config.avnuAdapter.config.vaultAllocator.address.toString(),
         usdcToken!.decimals,
         false
-      )
+      );
 
       if (!quotes) {
         logger.error("error getting quotes from avnu");
         return [];
       }
-      const getCalldata = await this.config.avnuAdapter.getSwapCallData(quotes!);
+      const getCalldata = await this.config.avnuAdapter.getSwapCallData(
+        quotes!
+      );
       const swapCallData = getCalldata[0];
-       //change extended sanitizer here
+      //change extended sanitizer here
       return [
         {
           sanitizer: AVNU_LEGACY_SANITIZER,
@@ -352,7 +387,7 @@ export class ExtendedAdapter extends BaseAdapter<
             selector: hash.getSelectorFromName("swap_to_new"),
             calldata: swapCallData,
           },
-        }
+        },
       ];
     } catch (error) {
       logger.error(`Error creating Deposit Call: ${error}`);
@@ -377,9 +412,14 @@ export class ExtendedAdapter extends BaseAdapter<
       if (!this.client) {
         throw new Error("Client not initialized");
       }
-      const withdrawalRequest = await this.client.withdrawUSDC(amount.toFixed(2));
+      const withdrawalRequest = await this.client.withdrawUSDC(
+        amount.toFixed(2)
+      );
       if (withdrawalRequest.status === "OK") {
-        const withdrawalStatus = await this.getDepositOrWithdrawalStatus(withdrawalRequest.data, AssetOperationType.WITHDRAWAL);
+        const withdrawalStatus = await this.getDepositOrWithdrawalStatus(
+          withdrawalRequest.data,
+          AssetOperationType.WITHDRAWAL
+        );
         return withdrawalStatus;
       }
       return false;
@@ -461,21 +501,46 @@ export class ExtendedAdapter extends BaseAdapter<
       logger.error("error initializing client");
       return null;
     }
-    await new Promise((resolve) => setTimeout(resolve, 5000));
-    const orderhistory = await this.getOrderHistory(marketName);
+    let orderhistory = await this.getOrderHistory(marketName);
 
     if (!orderhistory || orderhistory.length === 0) {
-      logger.error(`error getting order: ${orderId}`);
-      return null;
+      logger.error(`error getting order history: ${orderId}`);
+    } else {
+      const order = orderhistory
+        .slice(0, 5)
+        .find((order) => order.id.toString() === orderId);
+      if (order) {
+        return order;
+      }
     }
-    const order = orderhistory
-      .slice(0, 3)
-      .find((order) => order.id.toString() === orderId);
-    if (!order) {
-      logger.error(`error getting order: ${order}`);
-      return null;
+
+    // Retry logic: 3 more attempts with 3 second delay each
+    for (let attempt = 1; attempt <= 3; attempt++) {
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+      orderhistory = await this.getOrderHistory(marketName);
+
+      if (!orderhistory || orderhistory.length === 0) {
+        logger.error(
+          `error getting order history on retry ${attempt}: ${orderId}`
+        );
+        continue;
+      }
+
+      const order = orderhistory
+        .slice(0, 5)
+        .find((order) => order.id.toString() === orderId);
+
+      if (order) {
+        return order;
+      }
+
+      logger.error(
+        `order not found in top 5 entries on retry ${attempt}: ${orderId}`
+      );
     }
-    return order;
+
+    logger.error(`error getting order after all retries: ${orderId}`);
+    return null;
   }
 
   async fetchOrderBookBTCUSDC(): Promise<{
@@ -543,10 +608,10 @@ export class ExtendedAdapter extends BaseAdapter<
       }
       const { ask, bid } = await this.fetchOrderBookBTCUSDC();
       const spread = ask.minus(bid);
-      let price = ask
-        .plus(bid)
-        .div(2)
-      side === OrderSide.SELL ? price = price.minus(spread.times(0.2 * attempt)) : price = price.plus(spread.times(0.2 * attempt));
+      let price = ask.plus(bid).div(2);
+      side === OrderSide.SELL
+        ? (price = price.minus(spread.times(0.2 * attempt)))
+        : (price = price.plus(spread.times(0.2 * attempt)));
       const amount_in_token = (btcAmount * parseInt(leverage)).toFixed(
         this.config.extendedPrecision
       ); // gives the amount of wbtc
@@ -562,7 +627,10 @@ export class ExtendedAdapter extends BaseAdapter<
         return null;
       }
       await new Promise((resolve) => setTimeout(resolve, 5000));
-      const openOrder = await this.getOrderStatus(result.position_id, this.config.extendedMarketName);
+      const openOrder = await this.getOrderStatus(
+        result.position_id,
+        this.config.extendedMarketName
+      );
       if (!openOrder || openOrder.status !== OrderStatus.FILLED) {
         if (attempt >= maxAttempts) {
           logger.error("Max retries reached — could not verify open position");
@@ -585,7 +653,9 @@ export class ExtendedAdapter extends BaseAdapter<
         };
       }
     } catch (err: any) {
-      logger.error(`createShortOrder failed on attempt ${attempt}: ${err.message}`);
+      logger.error(
+        `createShortOrder failed on attempt ${attempt}: ${err.message}`
+      );
 
       if (attempt < maxAttempts) {
         const backoff = 1200 * attempt;
@@ -635,26 +705,33 @@ export class ExtendedAdapter extends BaseAdapter<
     }
   }
 
-  async getDepositOrWithdrawalStatus(orderId: number | string, operationsType: AssetOperationType): Promise<boolean> {
-    try{
+  async getDepositOrWithdrawalStatus(
+    orderId: number | string,
+    operationsType: AssetOperationType
+  ): Promise<boolean> {
+    try {
       let transferHistory = await this.client.getAssetOperations({
-        operationsType:[operationsType],
-        operationsStatus:[AssetOperationStatus.COMPLETED]
-      })
-      if(operationsType === AssetOperationType.DEPOSIT){
-        const myTransferStatus = transferHistory.data.find(operation => operation.transactionHash === orderId);
+        operationsType: [operationsType],
+        operationsStatus: [AssetOperationStatus.COMPLETED],
+      });
+      if (operationsType === AssetOperationType.DEPOSIT) {
+        const myTransferStatus = transferHistory.data.find(
+          (operation) => operation.transactionHash === orderId
+        );
         if (!myTransferStatus) {
           return true;
         }
         return true;
-      }else{
-        const myTransferStatus = transferHistory.data.find(operation => operation.id.toString() === orderId.toString());
+      } else {
+        const myTransferStatus = transferHistory.data.find(
+          (operation) => operation.id.toString() === orderId.toString()
+        );
         if (!myTransferStatus) {
           return true;
         }
         return true;
       }
-    }catch(err){
+    } catch (err) {
       logger.error(`error getting deposit or withdrawal status: ${err}`);
       return false;
     }

package/src/strategies/vesu-extended-strategy/utils/helper.ts

@@ -66,12 +66,10 @@ export const calculateAmountDistribution = async (
         vesu_leverage: 0,
       };
     }
-    const extendedBTCExposure =
+    const extendedExposureUSD =
       extendedPosition.length > 0
-        ? new Web3Number(extendedPosition[0].size, WBTC_TOKEN_DECIMALS)
+        ? new Web3Number(extendedPosition[0].value, WBTC_TOKEN_DECIMALS)
         : new Web3Number(0, WBTC_TOKEN_DECIMALS);
-    const extendedExposureUSD =
-      extendedBTCExposure.multipliedBy(collateralPrice);
     const vesuBTCExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     const numerator1 = vesu_leverage * amount + vesuBTCExposureUSD.toNumber();
     const numerator2 = extendedExposureUSD.toNumber();

package/src/strategies/vesu-extended-strategy/vesu-extended-strategy.tsx

@@ -238,8 +238,8 @@ export class VesuExtendedMultiplierStrategy<
       const balance = await this.getUnusedBalance();
       const usdcBalanceOnExtended = await extendedAdapter.getExtendedDepositAmount();
       /** The LIMIT_BALANCE is the bffer amount to keep in the investing Cycle */
-      const amountToInvest = balance.amount.plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).minus(LIMIT_BALANCE);
-
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).minus(LIMIT_BALANCE);
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldInvest amountToInvest: ${amountToInvest.toNumber()}`);
       if (amountToInvest.lessThan(0)) {
         return {
           shouldInvest: false,
@@ -301,6 +301,7 @@ export class VesuExtendedMultiplierStrategy<
           vesuLeverage: 0,
         };
       }
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldInvest vesu_amount: ${vesu_amount.toNumber()}, extended_amount: ${extended_amount.toNumber()}`);
       return {
         shouldInvest: true,
         vesuAmount: vesu_amount,
@@ -384,16 +385,16 @@ export class VesuExtendedMultiplierStrategy<
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForTrade
+        extendedHoldings.availableForWithdrawal
       );
-      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
         //move assets to extended
         try {
           const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended),
+              amount: extendedAmount.minus(usdcAmountOnExtended),
             },
             extendedAdapter,
             vesuAdapter
@@ -659,7 +660,7 @@ export class VesuExtendedMultiplierStrategy<
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForTrade,
+        extendedHoldings.availableForWithdrawal,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -719,7 +720,7 @@ export class VesuExtendedMultiplierStrategy<
       return {
         extendedAmountInBTC: new Web3Number(0, 0),
         calls: [],
-      };;
+      };
     }
   }