@strkfarm/sdk 2.0.0-dev.28 → 2.0.0-dev.29

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

@@ -2,8 +2,10 @@ import { Web3Number } from "@/dataTypes";
 import { ExtendedAdapter } from "@/strategies/universal-adapters/extended-adapter";
 import { VesuMultiplyAdapter } from "../../universal-adapters/vesu-multiply-adapter";
 import { CycleType, TransactionResult } from "../types/transaction-metadata";
-import { UsdcToUsdceAdapter } from "@/strategies/universal-adapters/usdc<>usdce-adapter";
-import { AssetMovementPlan } from "../vesu-extended-strategy";
+
+/** Planned asset routing between protocols (concrete `Operations` subclasses define shape). */
+export interface AssetMovementPlan {}
+
 export abstract class Operations {
 
   abstract computeAssetMovements(
@@ -38,7 +40,6 @@ export abstract class Operations {
     params: { from: string; to: string; amount: Web3Number, cycleType: CycleType },
     extendedAdapter: ExtendedAdapter,
     vesuAdapter: VesuMultiplyAdapter,
-    usdcToUsdceAdapter: UsdcToUsdceAdapter,
   ): Promise<TransactionResult>;
   /**
    * Handle deposit operation.

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

@@ -63,7 +63,6 @@ import { ExtendedAdapter } from "../universal-adapters/extended-adapter";
 import { SVKStrategy } from "../svk-strategy";
 import { AvnuAdapter } from "../universal-adapters/avnu-adapter";
 import { SingleTokenInfo } from "../base-strategy";
-import { UsdcToUsdceAdapter } from "../universal-adapters/usdc<>usdce-adapter";
 import { VesuConfig } from "./utils/config.runtime";
 
 export interface VesuExtendedStrategySettings extends UniversalStrategySettings {
@@ -82,7 +81,6 @@ export class VesuExtendedMultiplierStrategy<
 > extends SVKStrategy<S> {
   public wbtcToken: TokenInfo;
   public usdcToken: TokenInfo;
-  public usdceToken: TokenInfo;
   public readonly stateManager: ExtendedSVKVesuStateManager;
 
   constructor(
@@ -104,10 +102,6 @@ export class VesuExtendedMultiplierStrategy<
     // todo check if this can be generalized
     this.wbtcToken = Global.getDefaultTokens().find((token) => token.symbol === "WBTC")!;
     this.usdcToken = this.metadata.additionalInfo.borrowable_assets[0]!;
-    this.usdceToken = Global.getDefaultTokens().find(
-      (token) => token.symbol === "USDC.e",
-    )!;
-
     this.stateManager = this._initializeStateManager();
   }
 
@@ -136,8 +130,8 @@ export class VesuExtendedMultiplierStrategy<
       extendedAdapter: extendedAdapterEntry.adapter as ExtendedAdapter,
       vaultAllocator: this.metadata.additionalInfo.vaultAllocator,
       walletAddress: this.metadata.additionalInfo.walletAddress,
-      assetToken: Global.getDefaultTokens().find((token) => token.symbol === 'USDC')!, // ! TODO change to asset() latest
-      usdceToken: this.usdceToken,
+      assetToken: this.asset(),
+      usdcToken: this.usdcToken,
       collateralToken: this.wbtcToken,
       limitBalanceBufferFactor: LIMIT_BALANCE,
     };
@@ -177,7 +171,7 @@ export class VesuExtendedMultiplierStrategy<
     return { collateralPrice, debtPrice };
   }
 
-  async getVesuAdapter(): Promise<VesuMultiplyAdapter> {
+  async getVesuMultiplyAdapter(): Promise<VesuMultiplyAdapter> {
     const vesuAdapter = this.metadata.additionalInfo.adapters.find(
       (adapter) => adapter.adapter.name === VesuMultiplyAdapter.name,
     );
@@ -201,16 +195,16 @@ export class VesuExtendedMultiplierStrategy<
     return vesuModifyPositionAdapter.adapter as VesuModifyPositionAdapter;
   }
 
-  async getUsdceTransferAdapter(): Promise<TokenTransferAdapter> {
-    const usdceTransferAdapter = this.metadata.additionalInfo.adapters.find(
+  async getUsdcTransferAdapter(): Promise<TokenTransferAdapter> {
+    const usdcTransferAdapter = this.metadata.additionalInfo.adapters.find(
       (adapter) => adapter.adapter.name === TokenTransferAdapter.name,
     );
-    if (!usdceTransferAdapter) {
+    if (!usdcTransferAdapter) {
       throw new Error(
-        `${this.getTag()} Usdce transfer adapter not configured in metadata.`
+        `${this.getTag()} Usdc transfer adapter not configured in metadata.`
       );
     }
-    return usdceTransferAdapter.adapter as TokenTransferAdapter;
+    return usdcTransferAdapter.adapter as TokenTransferAdapter;
   }
 
   async getAvnuAdapter(): Promise<AvnuAdapter> {
@@ -242,18 +236,6 @@ export class VesuExtendedMultiplierStrategy<
     return extendedAdapter.adapter as ExtendedAdapter;
   }
 
-  async getUsdcToUsdceAdapter(): Promise<UsdcToUsdceAdapter> {
-    const usdcToUsdceAdapter = this.metadata.additionalInfo.adapters.find(
-      (adapter) => adapter.adapter.name === UsdcToUsdceAdapter.name,
-    );
-    if (!usdcToUsdceAdapter) {
-      throw new Error(
-        `${this.getTag()} UsdcToUsdce adapter not configured in metadata.`
-      );
-    }
-    return usdcToUsdceAdapter.adapter as UsdcToUsdceAdapter;
-  }
-
   /**
    * Creates an ExecutionService wired to this strategy's adapters and config.
    * Use with `stateManager.solve()` to get a SolveResult, then pass it to
@@ -269,36 +251,32 @@ export class VesuExtendedMultiplierStrategy<
     maxPriceDivergenceBps?: number;
   }): Promise<ExecutionService> {
     const [
-      vesuAdapter,
+      vesuMultiplyAdapter,
       vesuModifyPositionAdapter,
-      usdceTransferAdapter,
       extendedAdapter,
       avnuAdapter,
-      usdcToUsdceAdapter,
+      usdcTransferAdapter,
     ] =
       await Promise.all([
-        this.getVesuAdapter(),
+        this.getVesuMultiplyAdapter(),
         this.getVesuModifyPositionAdapter(),
-        this.getUsdceTransferAdapter(),
         this.getExtendedAdapter(),
         this.getAvnuAdapter(),
-        this.getUsdcToUsdceAdapter(),
+        this.getUsdcTransferAdapter(),
       ]);
 
     const executionConfig: ExecutionConfig = {
       networkConfig: this.config,
       pricer: this.pricer,
-      vesuAdapter,
+      vesuMultiplyAdapter,
       vesuModifyPositionAdapter,
       extendedAdapter,
       avnuAdapter,
-      usdcToUsdceAdapter,
+      usdcTransferAdapter,
       vaultAllocator: this.metadata.additionalInfo.vaultAllocator,
       walletAddress: this.metadata.additionalInfo.walletAddress,
-      usdceTransferAdapter,
       wbtcToken: this.wbtcToken,
       usdcToken: this.usdcToken,
-      usdceToken: this.usdceToken,
       getMerkleTree: () => this.getMerkleTree(),
       getManageCall: (proofs, manageCalls) => this.getManageCall(proofs, manageCalls),
       getBringLiquidityCall: (params) => this.getBringLiquidityCall(params),
@@ -325,9 +303,7 @@ export class VesuExtendedMultiplierStrategy<
     for (let adapter of this.metadata.additionalInfo.adapters) {
       let positions = await adapter.adapter.getPositions();
       if (positions && positions.length > 0) {
-        const filteredPositions = positions.filter((position) => {
-          return position.tokenInfo.address !== this.usdceToken.address;
-        });
+        const filteredPositions = positions;
         allPositions.push(...filteredPositions);
       }
     }
@@ -539,7 +515,7 @@ export class VesuExtendedMultiplierStrategy<
   }
 
   /**
-   * Fetches the operator wallet's current holdings for USDC.e, USDC, and WBTC,
+   * Fetches the operator wallet's current holdings for USDC and WBTC,
    * returning each token's balance and USD value.
    */
   async getWalletHoldings(): Promise<
@@ -549,33 +525,19 @@ export class VesuExtendedMultiplierStrategy<
       usdValue: number;
     }[]
   > {
-    if (!this.usdceToken || !this.wbtcToken || !this.usdcToken) {
+    if (!this.wbtcToken || !this.usdcToken) {
       return [];
     }
     const walletAddress = this.metadata.additionalInfo.walletAddress;
-    const usdceWalletBalance = await new ERC20(this.config).balanceOf(
-      this.usdceToken.address,
-      walletAddress,
-      this.usdceToken.decimals,
-    );
     const usdcWalletBalance = await new ERC20(this.config).balanceOf(
       this.usdcToken.address,
       walletAddress,
       this.usdcToken.decimals,
     );
-    const price = await this.pricer.getPrice(this.usdceToken.symbol);
-    const wbtcPrice = await this.pricer.getPrice(this.wbtcToken.symbol);
-    const usdceUsdValue =
-      Number(usdceWalletBalance.toFixed(this.usdceToken.decimals)) *
-      price.price;
+    const price = await this.pricer.getPrice(this.usdcToken.symbol);
     const usdcUsdValue =
       Number(usdcWalletBalance.toFixed(this.usdcToken.decimals)) * price.price;
     return [
-      {
-        tokenInfo: this.usdceToken,
-        amount: usdceWalletBalance,
-        usdValue: usdceUsdValue,
-      },
       {
         tokenInfo: this.usdcToken,
         amount: usdcWalletBalance,
@@ -586,7 +548,7 @@ export class VesuExtendedMultiplierStrategy<
 }
 
 /**
- * Configures all adapters (Vesu, Extended, Avnu, UsdcToUsdce, TokenTransfer)
+ * Configures all adapters (Vesu, Extended, Avnu, TokenTransfer)
  * and registers their leaf adapters on the vault settings. This is the central
  * wiring function that connects the strategy to its underlying protocol adapters.
  */
@@ -612,9 +574,6 @@ function getLooperSettings(
   const usdcToken = Global.getDefaultTokens().find(
     (token) => token.symbol === underlyingSymbol,
   )!;
-  const usdceToken = Global.getDefaultTokens().find(
-    (token) => token.symbol === "USDC.e",
-  )!;
 
   const baseAdapterConfig: BaseAdapterConfig = {
     baseToken: wbtcToken,
@@ -640,18 +599,10 @@ function getLooperSettings(
       maximumExtendedPriceDifferenceForSwapClosing,
   });
 
-  const usdcToUsdceAdapter = new UsdcToUsdceAdapter({
-    ...baseAdapterConfig,
-    supportedPositions: [
-      { asset: usdcToken, isDebt: true },
-      { asset: usdceToken, isDebt: false },
-    ],
-  });
-
   const extendedAdapter = new ExtendedAdapter({
     ...baseAdapterConfig,
     supportedPositions: [
-      { asset: usdceToken, isDebt: false },
+      { asset: usdcToken, isDebt: false },
     ],
     vaultIdExtended: vaultIdExtended,
     extendedContract: EXTENDED_CONTRACT,
@@ -699,10 +650,10 @@ function getLooperSettings(
   });
 
   // Transfers USDC between the vault allocator (fromAddress) and the operator wallet (toAddress)
-  const usdceTransferAdapter = new TokenTransferAdapter({
+  const usdcTransferAdapter = new TokenTransferAdapter({
     ...baseAdapterConfig,
-    baseToken: usdceToken,
-    supportedPositions: [{ asset: usdceToken, isDebt: false }],
+    baseToken: usdcToken,
+    supportedPositions: [{ asset: usdcToken, isDebt: false }],
     fromAddress: vaultSettings.vaultAllocator,
     toAddress: ContractAddr.from(vaultSettings.walletAddress),
   });
@@ -718,13 +669,8 @@ function getLooperSettings(
   });
 
   vaultSettings.adapters.push({
-    id: `${usdceTransferAdapter.name}_${usdceToken.symbol}`,
-    adapter: usdceTransferAdapter,
-  });
-
-  vaultSettings.adapters.push({
-    id: `${usdcToUsdceAdapter.name}_${usdceToken.symbol}_${usdcToken.symbol}`,
-    adapter: usdcToUsdceAdapter,
+    id: `${usdcTransferAdapter.name}_${usdcToken.symbol}`,
+    adapter: usdcTransferAdapter,
   });
 
   vaultSettings.adapters.push({
@@ -750,12 +696,10 @@ function getLooperSettings(
   vaultSettings.leafAdapters.push(() => vesuModifyPositionAdapter.getDepositLeaf());
   vaultSettings.leafAdapters.push(() => vesuModifyPositionAdapter.getWithdrawLeaf());
   vaultSettings.leafAdapters.push(() => extendedAdapter.getDepositLeaf());
-  vaultSettings.leafAdapters.push(() => usdcToUsdceAdapter.getDepositLeaf());
-  vaultSettings.leafAdapters.push(() => usdcToUsdceAdapter.getWithdrawLeaf());
   vaultSettings.leafAdapters.push(() => avnuAdapter.getDepositLeaf());
   vaultSettings.leafAdapters.push(() => avnuAdapter.getWithdrawLeaf());
-  vaultSettings.leafAdapters.push(() => usdceTransferAdapter.getDepositLeaf());
-  vaultSettings.leafAdapters.push(() => usdceTransferAdapter.getWithdrawLeaf());
+  vaultSettings.leafAdapters.push(() => usdcTransferAdapter.getDepositLeaf());
+  vaultSettings.leafAdapters.push(() => usdcTransferAdapter.getWithdrawLeaf());
   vaultSettings.leafAdapters.push(
     commonAdapter
       .getApproveAdapter(

package/src/utils/index.ts

@@ -2,6 +2,7 @@ export * from '@/utils/logger';
 export * from './oz-merkle';
 export * from "./strategy-utils";
 export * from "./starknet-call-parser";
+export * from "./health-factor-math";
 
 // Utility type to make all optional properties required
 export type RequiredFields<T> = {