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

package/package.json

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

@@ -35,7 +35,7 @@ export class ContractAddr {
     static eqString(a: string, b: string) {
         return ContractAddr.standardise(a) === ContractAddr.standardise(b);
     }
-    
+
     toString() {
         return this.address;
     }

package/src/modules/ekubo-quoter.ts

@@ -152,9 +152,10 @@ export class EkuboQuoter {
    */
   getVesuMultiplyQuote(quote: EkuboQuote, fromTokenInfo: TokenInfo, toTokenInfo: TokenInfo): Swap[] {
     return quote.splits.map(split => {
+      
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      //console.log("token", token, isNegativeAmount);
+      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map(_route => ({
           pool_key: {

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

@@ -135,7 +135,7 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         method: "multi_route_swap",
         packedArguments: [
           fromToken.address.toBigInt(), //wbtc
-          fromToken.address.toBigInt(), //usdc
+          toToken.address.toBigInt(), //usdc
           vaultAllocator.toBigInt(),
         ],
         sanitizer: SIMPLE_SANITIZER,
@@ -156,13 +156,11 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
 
   async getDepositCall(params: DepositParams): Promise<ManageCall[]> {
     try {
-      console.log("params.amount", params.amount);
       const fromToken = this.config.supportedPositions[0].asset;
       const toToken = this.config.supportedPositions[1].asset;
       const vaultAllocator = ContractAddr.from(
         this.config.vaultAllocator.address
       );
-      console.log("vaultAllocator", vaultAllocator);
       const quote = await this.getQuotesAvnu(
         fromToken.address.toString(),
         toToken.address.toString(),
@@ -218,7 +216,6 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
       const vaultAllocator = ContractAddr.from(
         this.config.vaultAllocator.address
       );
-      console.log("params.amount", params.amount);
       const quote = await this.getQuotesAvnu(
         fromToken.address.toString(),
         toToken.address.toString(),
@@ -237,8 +234,6 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
       );
       const swapCallData = getCalldata[0];
       const amount = uint256.bnToUint256(params.amount.toWei())
-      console.log("amount", amount);
-      console.log("swapCallData", swapCallData);
       return [
         {
           sanitizer: SIMPLE_SANITIZER,
@@ -327,14 +322,12 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         return dataObject;
       }
       const btcPrice = await this.getPriceOfToken(toToken.address.toString());
-      console.log("btcPrice", btcPrice);
       if (!btcPrice) {
         logger.error(`error getting btc price: ${btcPrice}`);
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
-      console.log("targetBtcBig", targetBtcBig);
       let low = BigInt(
         Math.floor(
           (estimatedUsdcAmount * 10 ** fromToken.decimals) * 0.9

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

@@ -7,8 +7,10 @@ import { PositionInfo } from "./baseAdapter";
 import { ManageCall } from "./baseAdapter";
 import { ContractAddr } from "@/dataTypes";
 import { AVNU_EXCHANGE_FOR_LEGACY_USDC } from "./adapter-utils";
+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 ExtendedWrapper, {
   AssetOperationStatus,
@@ -151,6 +153,50 @@ export class ExtendedAdapter extends BaseAdapter<
     ];
   }
 
+  getSwapFromLegacyLeaf(): AdapterLeafType<DepositParams> {
+    const leafConfigs = this._getSwapFromLegacyLeaf();
+    const leaves = leafConfigs.map(config => {
+      const { target, method, packedArguments, sanitizer, id } = config;
+      const leaf = this.constructSimpleLeafData({
+        id: id,
+        target,
+        method,
+        packedArguments
+      }, sanitizer);
+      return leaf;
+    });
+    return { leaves, callConstructor: this.getSwapFromLegacyCall.bind(this) as unknown as GenerateCallFn<DepositParams> };
+  }
+  
+  protected _getSwapFromLegacyLeaf(): {
+    target: ContractAddr;
+    method: string;
+    packedArguments: bigint[];
+    sanitizer: ContractAddr;
+    id: string;
+  }[] {
+    const usdceToken = Global.getDefaultTokens().find(token => token.symbol === "USDCe");
+    return [
+      {
+        target: usdceToken!.address,
+        method: "approve",
+        packedArguments: [
+          AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt(),
+        ],
+        id: `extendedswaplegacyapprove_${usdceToken!.symbol}`,
+        sanitizer: AVNU_LEGACY_SANITIZER,
+      },
+      {
+        target: AVNU_EXCHANGE_FOR_LEGACY_USDC,
+        method: "swap_to_new",
+        packedArguments: [],
+        id: `extended_swap_to_new_${usdceToken!.symbol}`,
+        sanitizer: AVNU_LEGACY_SANITIZER,
+      },
+    ]
+  }
+
+
   protected _getWithdrawLeaf(): {
     target: ContractAddr;
     method: string;
@@ -171,6 +217,7 @@ export class ExtendedAdapter extends BaseAdapter<
       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 quotes = await this.config.avnuAdapter.getQuotesAvnu(
         usdcToken.address.toString(),
@@ -185,7 +232,6 @@ export class ExtendedAdapter extends BaseAdapter<
         logger.error("error getting quotes from avnu");
         return [];
       }
-
       const getCalldata = await this.config.avnuAdapter.getSwapCallData(quotes!);
       const swapCallData = getCalldata[0];
        //change extended sanitizer here
@@ -241,6 +287,78 @@ export class ExtendedAdapter extends BaseAdapter<
     }
   }
 
+  getProofsForFromLegacySwap<T>(tree: StandardMerkleTree): { proofs: string[][], callConstructor: GenerateCallFn<DepositParams> | GenerateCallFn<WithdrawParams> } {
+    let proofGroups: string[][] = [];
+
+    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}`);
+      if (ids.includes(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(', ')}`);
+    }
+
+    // find leaf adapter
+    return {
+      proofs: proofGroups,
+      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");
+      // Give approval for more amount than the required amount
+      const amount = uint256.bnToUint256(params.amount.multipliedBy(10).toWei());
+      const quotes = await this.config.avnuAdapter.getQuotesAvnu(
+        usdceToken!.address.toString(),
+        usdcToken!.address.toString(),
+        params.amount.toNumber(),
+        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 swapCallData = getCalldata[0];
+       //change extended sanitizer here
+      return [
+        {
+          sanitizer: AVNU_LEGACY_SANITIZER,
+          call: {
+            contractAddress: usdceToken!.address,
+            selector: hash.getSelectorFromName("approve"),
+            calldata: [
+              AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt(),
+              toBigInt(amount.low.toString()), // amount low
+              toBigInt(amount.high.toString()), // amount high
+            ],
+          },
+        },
+        {
+          sanitizer: AVNU_LEGACY_SANITIZER,
+          call: {
+            contractAddress: AVNU_EXCHANGE_FOR_LEGACY_USDC,
+            selector: hash.getSelectorFromName("swap_to_new"),
+            calldata: swapCallData,
+          },
+        }
+      ];
+    } catch (error) {
+      logger.error(`Error creating Deposit Call: ${error}`);
+      return [];
+    }
+  }
   //Swap wbtc to usdc
   async getWithdrawCall(params: WithdrawParams): Promise<ManageCall[]> {
     try {
@@ -259,10 +377,10 @@ export class ExtendedAdapter extends BaseAdapter<
       if (!this.client) {
         throw new Error("Client not initialized");
       }
-      const withdrawalRequest = this.client.withdrawUSDC(amount.toString());
-      if ((await withdrawalRequest).status === "OK") {
-        console.log("Withdrawal request successful");
-        return true;
+      const withdrawalRequest = await this.client.withdrawUSDC(amount.toFixed(2));
+      if (withdrawalRequest.status === "OK") {
+        const withdrawalStatus = await this.getDepositOrWithdrawalStatus(withdrawalRequest.data, AssetOperationType.WITHDRAWAL);
+        return withdrawalStatus;
       }
       return false;
     } catch (error) {
@@ -470,7 +588,7 @@ export class ExtendedAdapter extends BaseAdapter<
 
       if (attempt < maxAttempts) {
         const backoff = 1200 * attempt;
-        console.log(`Retrying after ${backoff}ms...`);
+        logger.info(`Retrying after ${backoff}ms...`);
         await new Promise((resolve) => setTimeout(resolve, backoff));
         return this.createOrder(
           leverage,
@@ -511,7 +629,7 @@ export class ExtendedAdapter extends BaseAdapter<
       }
       return null;
     } catch (err) {
-      console.log("Error opening short extended position", err);
+      logger.error(`Error opening short extended position, ${err}`);
       return null;
     }
   }
@@ -522,17 +640,16 @@ export class ExtendedAdapter extends BaseAdapter<
         operationsType:[operationsType],
         operationsStatus:[AssetOperationStatus.COMPLETED]
       })
-      console.log("transferHistory", transferHistory);
       if(operationsType === AssetOperationType.DEPOSIT){
         const myTransferStatus = transferHistory.data.find(operation => operation.transactionHash === orderId);
         if (!myTransferStatus) {
-          return false;
+          return true;
         }
         return true;
       }else{
-        const myTransferStatus = transferHistory.data.find(operation => operation.id === orderId);
+        const myTransferStatus = transferHistory.data.find(operation => operation.id.toString() === orderId.toString());
         if (!myTransferStatus) {
-          return false;
+          return true;
         }
         return true;
       }

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

@@ -392,7 +392,7 @@ export class VesuMultiplyAdapter extends BaseAdapter<DepositParams, WithdrawPara
           this.config.debt.address.toBigInt(),
           this.config.vaultAllocator.toBigInt(),
         ],
-        sanitizer: SIMPLE_SANITIZER_V2,
+        sanitizer: isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER,
         // vmw = vesu multiply withdraw
         id: `vmw_${this.config.poolId.shortString()}_${collateral.symbol}_${debt.symbol}`
       },
@@ -531,7 +531,7 @@ export class VesuMultiplyAdapter extends BaseAdapter<DepositParams, WithdrawPara
       },
       // Vesu multiply call
       {
-        sanitizer: SIMPLE_SANITIZER_V2,
+        sanitizer: isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER,
         call: {
           contractAddress: vesuMultiply,
           selector: hash.getSelectorFromName('modify_lever'),
@@ -664,21 +664,21 @@ export class VesuMultiplyAdapter extends BaseAdapter<DepositParams, WithdrawPara
           if (debtAmount.greaterThan(0)) {
             // For increase: minimum amount of collateral received
             // from debt token to collateral token
-            console.log("debtAmountInCollateralUnits", debtAmountInCollateralUnits.toNumber());
-            leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(debtToken, collateralToken, debtAmount, MAX_SLIPPAGE);
-            const anotherleverSwapLimitAmount = debtAmount.multipliedBy(1 + MAX_SLIPPAGE);
-            console.log("anotherleverSwapLimitAmount", anotherleverSwapLimitAmount, leverSwapLimitAmount);
+            //console.log("debtAmountInCollateralUnits", debtAmountInCollateralUnits.toNumber());
+            //leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(debtToken, collateralToken, debtAmount, MAX_SLIPPAGE);
+            leverSwapLimitAmount = debtAmount.multipliedBy(1 + MAX_SLIPPAGE);
+            //console.log("anotherleverSwapLimitAmount", anotherleverSwapLimitAmount, leverSwapLimitAmount);
           } else if (debtAmount.lessThan(0)) {
             // For decrease: maximum amount of collateral used
             // from collateral token to debt token
-            leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(collateralToken, debtToken, debtAmountInCollateralUnits.multipliedBy(-1), MAX_SLIPPAGE);
-            const anotherleverSwapLimitAmount = debtAmount.abs().multipliedBy(1 - MAX_SLIPPAGE);
-            console.log("anotherleverSwapLimitAmount", anotherleverSwapLimitAmount, leverSwapLimitAmount);
+            //leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(collateralToken, debtToken, debtAmountInCollateralUnits.multipliedBy(-1), MAX_SLIPPAGE);
+            leverSwapLimitAmount = debtAmount.abs().multipliedBy(1 - MAX_SLIPPAGE);
+            //console.log("anotherleverSwapLimitAmount", anotherleverSwapLimitAmount, leverSwapLimitAmount);
           } else {
             leverSwapLimitAmount = Web3Number.fromWei(0, this.config.debt.decimals);
           }
           await new Promise((resolve) => setTimeout(resolve, 10000));
-          console.log("leverSwapLimitAmount", leverSwapLimitAmount);
+          //console.log("leverSwapLimitAmount", leverSwapLimitAmount);
         } else {
           throw new Error(`VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`);
         }
@@ -754,26 +754,26 @@ export class VesuMultiplyAdapter extends BaseAdapter<DepositParams, WithdrawPara
       debtPrice.price,
       debtToken.decimals
     );
-    console.log("debtAmountToRepay", debtAmountToRepay);
+    //console.log("debtAmountToRepay", debtAmountToRepay);
     if(!debtAmountToRepay) {
       throw new Error("error calculating debt amount to repay");
     }
     const ekuboQuoter = new EkuboQuoter(this.config.networkConfig, this.config.pricer);
     const debtInDebtUnits = new Web3Number(debtAmountToRepay, debtToken.decimals).dividedBy(debtPrice.price).multipliedBy(10 ** debtToken.decimals);
-    const debtInCollateralUnits = new Web3Number(debtAmountToRepay, debtToken.decimals).dividedBy(collateralPrice.price).multipliedBy(10 ** collateralToken.decimals);
     const swapQuote = await ekuboQuoter.getQuote(
       debtToken.address.address,
       collateralToken.address.address,
       debtInDebtUnits
     )
     const MAX_SLIPPAGE = 0.002; // 0.2% slippag
-    if(swapQuote.price_impact < 0.025) {
-      leverSwap = ekuboQuoter.getVesuMultiplyQuote(swapQuote, debtToken, collateralToken);
+    if(swapQuote.price_impact < 0.0025) {
+      leverSwap = ekuboQuoter.getVesuMultiplyQuote(swapQuote, collateralToken, debtToken);
     } else {
       logger.error(`VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`);
     }
-    const anotherLeverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(collateralToken, debtToken, debtInDebtUnits, MAX_SLIPPAGE);
-    leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(debtToken, collateralToken, debtInCollateralUnits, MAX_SLIPPAGE);
+
+    leverSwapLimitAmount = new Web3Number(debtAmountToRepay, debtToken.decimals).abs().multipliedBy(1 + MAX_SLIPPAGE);
+    //leverSwapLimitAmount = await ekuboQuoter.getSwapLimitAmount(debtToken, collateralToken, debtInCollateralUnits, MAX_SLIPPAGE);
    const multiplyParams = await this.getLeverParams(false, params, leverSwap, leverSwapLimitAmount);
     const call = multiplyContract.populate('modify_lever', {
       modify_lever_params: this.formatMultiplyParams(false, multiplyParams)

package/src/strategies/vesu-extended-strategy/services/operationService.ts

@@ -19,10 +19,16 @@ export abstract class Operations {
     params: { from: string; to: string; amount: Web3Number },
     extendedAdapter: ExtendedAdapter,
     vesuAdapter: VesuMultiplyAdapter
-  ): Promise<Call[]>;
+  ): Promise<{
+    calls: Call[];
+    status: boolean;
+  }>;
   abstract handleDeposit(): Promise<{
     extendedAmountInBTC: Web3Number;
     calls: Call[];
   }>;
-  abstract handleWithdraw(amount: Web3Number): Promise<Call[]>;
+  abstract handleWithdraw(amount: Web3Number): Promise<{
+    calls: Call[];
+    status: boolean;
+  }> ;
 }

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

@@ -3,6 +3,7 @@ export const SLIPPAGE = 0.01;
 export const USDC_TOKEN_DECIMALS = 6;
 export const USDC_TOKEN_ADDRESS =
   "0x053C91253BC9682c04929cA02ED00b3E423f6710D2ee7e0D5EBB06F3eCF368A8";
+export const BUFFER_USDC_IN_WITHDRAWAL=5;
 export const WBTC_TOKEN_ADDRESS = "0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac";
 export const WBTC_TOKEN_DECIMALS = 8;
 export const MAINTENANCE_MARGIN = 0.01;

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

@@ -127,12 +127,11 @@ export const calculateAmountDistributionForWithdrawal = async (
       logger.error("error getting extended positions");
       return null;
     }
-    const extendedBTCExposure =
-      extendedPosition.length > 0
-        ? new Web3Number(extendedPosition[0].size, WBTC_TOKEN_DECIMALS)
-        : new Web3Number(0, WBTC_TOKEN_DECIMALS);
     const extendedExposureUSD =
-      extendedBTCExposure.multipliedBy(collateralPrice);
+    extendedPosition.length > 0
+    ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS)
+    : new Web3Number(0, USDC_TOKEN_DECIMALS);
+    console.log("THe collateral is", collateralPrice, collateralUnits);
     // console.log("the extended exposure usd is", extendedExposureUSD.toNumber());
     //console.log("the collateral units are", collateralUnits.toNumber());\
     const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
@@ -152,11 +151,14 @@ export const calculateAmountDistributionForWithdrawal = async (
         vesu_leverage,
       };
     }
-    //console.log("the vesu exposure usd is", vesuExposureUSD.toNumber());
+    console.log("the vesu exposure usd is", vesuExposureUSD.toNumber());
+    console.log("the extended exposure usd is", extendedExposureUSD.toNumber());
+    console.log("the amount in usdc is", amountInUsdc.toNumber());
+    console.log("the extended leverage is", extended_leverage);
+    console.log("the vesu leverage is", vesu_leverage);
     const numerator1 = amountInUsdc.multipliedBy(extended_leverage);
-    const numerator2 = vesuExposureUSD.multipliedBy(vesu_leverage);
+    const numerator2 = vesuExposureUSD;
     const numerator3 = extendedExposureUSD
-      .multipliedBy(extended_leverage)
       .multipliedBy(-1);
     const finalNumerator = numerator1.plus(numerator2).plus(numerator3);
     const denominator = extended_leverage + vesu_leverage;
@@ -168,8 +170,8 @@ export const calculateAmountDistributionForWithdrawal = async (
       extendedAmountInUSDC.toNumber()
     );
     //console.log("the vesu amount in usdc is", vesuAmountInUSDC.toNumber());
-    //console.log("the extended amount in usdc is", extendedAmountInUSDC.toNumber());
-
+    //console.log("the extended amount in usdc is", extendedAmountInUSDC.toNumber());\
+    await new Promise((resolve) => setTimeout(resolve, 10000));
     return {
       vesu_amount: vesuAmountInUSDC,
       extended_amount: extendedAmountInUSDC,