@strkfarm/sdk 2.0.0-dev.2 → 2.0.0-dev.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.2",
+  "version": "2.0.0-dev.21",
   "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/modules/ExtendedWrapperSDk/types.ts

@@ -237,7 +237,7 @@ export interface Market {
 
 // Asset operation types
 export interface AssetOperation {
-  id: number;
+  id: string;
   type: AssetOperationType;
   status: AssetOperationStatus;
   amount: string;

package/src/modules/ExtendedWrapperSDk/wrapper.ts

@@ -76,8 +76,33 @@ export class ExtendedWrapper {
             }`
           );
         }
-
-        const data = await response.json();
+        
+        const text = await response.text();
+
+        // Replace large integers (greater than MAX_SAFE_INTEGER) with quoted strings
+        // This regex finds numbers that are likely to be large integers in the "data" field
+        const MAX_SAFE_INTEGER_STR = '9007199254740991';
+        const largeIntegerRegex = /"data"\s*:\s*(\d{16,})/g;
+      
+        const modifiedText = text.replace(largeIntegerRegex, (match, largeInt) => {
+          // Compare as strings to avoid precision loss
+          if (largeInt.length > MAX_SAFE_INTEGER_STR.length || 
+              (largeInt.length === MAX_SAFE_INTEGER_STR.length && largeInt > MAX_SAFE_INTEGER_STR)) {
+            // Replace the number with a quoted string to preserve precision
+            return `"data":"${largeInt}"`;
+          }
+          return match; // Keep original if it's a safe integer
+        });
+        
+        const data = JSON.parse(modifiedText);
+        
+        if (data && typeof data.data === 'string' && /^\d+$/.test(data.data)) {
+          const numValue = Number(data.data);
+          if (Number.isSafeInteger(numValue)) {
+            data.data = numValue;
+          }
+        }
+        
         return data;
       } catch (error) {
         lastError = error as Error;
@@ -159,11 +184,12 @@ export class ExtendedWrapper {
 
   /**
    * Initiate a withdrawal from Extended Exchange
+   * Returns data as number | string to preserve precision for large integers
    */
   async withdraw(
     request: WithdrawRequest
-  ): Promise<ExtendedApiResponse<number>> {
-    return this.makeRequest<number>("/api/v1/withdraw", {
+  ): Promise<ExtendedApiResponse<number | string>> {
+    return this.makeRequest<number | string>("/api/v1/withdraw", {
       method: "POST",
       body: JSON.stringify(request),
     });
@@ -369,8 +395,9 @@ export class ExtendedWrapper {
 
   /**
    * Withdraw USDC (convenience method)
+   * Returns data as number | string to preserve precision for large integers
    */
-  async withdrawUSDC(amount: string): Promise<ExtendedApiResponse<number>> {
+  async withdrawUSDC(amount: string): Promise<ExtendedApiResponse<number | string>> {
     return this.withdraw({ amount, asset: "USDC" });
   }
 
@@ -381,15 +408,19 @@ export class ExtendedWrapper {
    */
   async getFundingRates(
     marketName: string,
-    side: string
+    side: string,
+    startTime: number,
+    endTime?: number,
+     // in epoch  milliseconds
   ): Promise<ExtendedApiResponse<FundingRate[]>> {
+    const endTimeParam = endTime !== undefined ? `&end_time=${endTime}` : '';
+    const startTimeParam = startTime !== undefined ? `&start_time=${startTime}` : '';
     return this.makeRequest<FundingRate[]>(
       `/api/v1/markets/funding-rates?market_name=${encodeURIComponent(
         marketName
-      )}&side=${encodeURIComponent(side)}`
+      )}&side=${encodeURIComponent(side)}${startTimeParam}${endTimeParam}`
     );
   }
-
 }
 
 export default ExtendedWrapper;

package/src/modules/ekubo-quoter.ts

@@ -70,21 +70,14 @@ export class EkuboQuoter {
   async getDexPrice(baseToken: TokenInfo, quoteToken: TokenInfo, amount: Web3Number) {
     const lstTokenInfo = baseToken;
     const lstUnderlyingTokenInfo = quoteToken;
-    console.log("lstTokenInfo", lstTokenInfo);
-    console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-    console.log("amount", amount);
     const quote = await this.getQuote(
       lstTokenInfo.address.address,
       lstUnderlyingTokenInfo.address.address,
       amount
     );
-    console.log("quote", quote);
     // in Underlying
     const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-    console.log("outputAmount", outputAmount);
-    console.log("amount", amount);
     const price = outputAmount.toNumber() / amount.toNumber();
-    console.log("price", price);
     logger.verbose(`${EkuboQuoter.name}:: LST Dex Price: ${price}`);
     return price;
   }
@@ -105,7 +98,6 @@ export class EkuboQuoter {
   // debt collateral 
   async getSwapLimitAmount(fromToken: TokenInfo, toToken: TokenInfo, amount: Web3Number, max_slippage: number = 0.002): Promise<Web3Number> {
     const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-    console.log("isExactAmountIn", isExactAmountIn);
     logger.verbose(`${EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
     const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
     console.log("isYieldToken", isYieldToken);
@@ -114,13 +106,10 @@ export class EkuboQuoter {
     // wbtc
     const baseToken = isExactAmountIn ? toToken : fromToken; // fromToken -> wbtc, 
     const quoteToken = isExactAmountIn ? fromToken : toToken; // toToken -> usdc, 
-    console.log("baseToken", baseToken);
-    console.log("quoteToken", quoteToken);
     // need dex price of from token in toToken
     // from baseToken to underlying token
     // for withdraw, usdc to btc with amount negative
     const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-    console.log("dexPrice", dexPrice);
     const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
     console.log("trueExchangeRate", trueExchangeRate);
     if (isExactAmountIn) {
@@ -155,7 +144,6 @@ export class EkuboQuoter {
       
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map(_route => ({
           pool_key: {

package/src/strategies/index.ts

@@ -8,4 +8,5 @@ export * from './universal-strategy';
 export * from './universal-lst-muliplier-strategy';
 export * from './vesu-extended-strategy/vesu-extended-strategy';
 export * from './vesu-extended-strategy/utils/config.runtime';
-export * from './vesu-extended-strategy/utils/helper';
+export * from './vesu-extended-strategy/utils/helper';
+export * from './vesu-extended-strategy/types/transaction-metadata';

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

@@ -4,7 +4,7 @@ import {
   WithdrawParams,
   BaseAdapterConfig,
 } from "./baseAdapter";
-import { SIMPLE_SANITIZER_V2, toBigInt } from "./adapter-utils";
+import { toBigInt } from "./adapter-utils";
 import { Protocols } from "@/interfaces";
 import { MAX_DELAY } from "../vesu-extended-strategy/utils/constants";
 import { SupportedPosition } from "./baseAdapter";
@@ -13,20 +13,21 @@ import { Web3Number } from "@/dataTypes";
 import { PositionInfo } from "./baseAdapter";
 import { ManageCall } from "./baseAdapter";
 import { ContractAddr } from "@/dataTypes";
-import { TokenInfo } from "@/interfaces";
 import { AVNU_EXCHANGE } from "./adapter-utils";
 import { MAX_RETRIES } from "../vesu-extended-strategy/utils/constants";
 import { Quote } from "@avnu/avnu-sdk";
 import { hash, uint256 } from "starknet";
 import { AvnuWrapper } from "@/modules/avnu";
 import axios from "axios";
-import { AVNU_MIDDLEWARE, SIMPLE_SANITIZER } from "./adapter-utils";
+import {SIMPLE_SANITIZER } from "./adapter-utils";
 import { returnFormattedAmount } from "../vesu-extended-strategy/utils/helper";
 import { logger } from "@/utils";
 export interface AvnuAdapterConfig extends BaseAdapterConfig {
   baseUrl: string;
   avnuContract: ContractAddr; //0x04270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f
   slippage: number;
+  minimumExtendedPriceDifferenceForSwapOpen: number;
+  maximumExtendedPriceDifferenceForSwapClosing: number;
 }
 
 export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
@@ -48,7 +49,7 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
   protected async getPosition(
     supportedPosition: SupportedPosition
   ): Promise<PositionAmount> {
-    return Promise.resolve({ amount: new Web3Number(0, 0), remarks: "" });
+    return Promise.resolve({ amount: new Web3Number(0, 0), remarks: "Avnu Positions" });
   }
 
   async maxDeposit(amount?: Web3Number): Promise<PositionInfo> {
@@ -156,8 +157,8 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
 
   async getDepositCall(params: DepositParams): Promise<ManageCall[]> {
     try {
-      const fromToken = this.config.supportedPositions[0].asset;
-      const toToken = this.config.supportedPositions[1].asset;
+      const fromToken = this.config.supportedPositions[0].asset; //usdc
+      const toToken = this.config.supportedPositions[1].asset; //wbtc
       const vaultAllocator = ContractAddr.from(
         this.config.vaultAllocator.address
       );
@@ -169,15 +170,18 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         toToken.decimals,
         true
       )
+      //console.log(`${AvnuAdapter.name}::getDepositCall quote: ${JSON.stringify(quote)}`);
       if (!quote) {
         logger.error("error getting quote from avnu");
         return [];
       }
+
       const getCalldata = await this.avnuWrapper.getSwapCallData(
         quote,
         vaultAllocator.address
       );
       const swapCallData = getCalldata[0];
+      
       // const approveCallData = getCalldata[0];
       const amount = uint256.bnToUint256(quote.sellAmountInUsd*10**7)
       return [
@@ -300,11 +304,11 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
     toTokenDecimals: number,
     usdcToBtc: boolean,
     maxIterations: number = 5,
-    tolerance: number = 10000
+    tolerance: number = 5000
   ): Promise<Quote | null>{
     try {
-      const fromToken = this.config.supportedPositions[0].asset;
-      const toToken = this.config.supportedPositions[1].asset;
+      const fromToken = this.config.supportedPositions[0].asset; //usdc
+      const toToken = this.config.supportedPositions[1].asset; //wbtc
       if(!usdcToBtc) {
         const sellAmount = returnFormattedAmount(amount, toTokenDecimals);
         const params: Record<string, any> = {
@@ -327,7 +331,9 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
       let low = BigInt(
         Math.floor(
           (estimatedUsdcAmount * 10 ** fromToken.decimals) * 0.9
@@ -381,6 +387,8 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         return null;
       }
       const dataObject: Quote = finalQuote.data[0];
+      const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
       return dataObject;
     } catch (err) {
       logger.error(`No quotes available for this swap: ${err}`);