@strkfarm/sdk 2.0.0-staging.49 → 2.0.0-staging.50

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "2.0.0-staging.49",
+    "version": "2.0.0-staging.50",
     "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/strategies/yoloVault.ts

@@ -31,7 +31,6 @@ import { Web3Number } from "@/dataTypes";
 import { DualActionAmount } from "./base-strategy";
 import { PricerBase } from "@/modules/pricerBase";
 import { Call, Contract } from "starknet";
-import YoloVaultAbi from "@/data/yoloVault.abi.json";
 import ERC4626Abi from "@/data/erc4626.abi.json";
 import { Global } from "@/global";
 import { ERC20 } from "@/modules";
@@ -112,7 +111,8 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
   readonly address: ContractAddr;
   readonly metadata: IStrategyMetadata<YoloVaultSettings>;
   readonly pricer: PricerBase;
-  readonly contract: Contract;
+  /** Resolves to a `Contract` built from `provider.getClassAt` at the vault address (no checked-in vault ABI). */
+  readonly contract: Promise<Contract>;
   readonly primaryToken : TokenInfo;
   readonly secondaryToken : TokenInfo;
   readonly erc4626: YoloErc4626RuntimeConfig;
@@ -129,11 +129,16 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
     this.address = metadata.address;
     this.pricer = pricer;
     this.metadata = metadata;
-    this.contract = new Contract({
-      abi: YoloVaultAbi,
-      address: this.address.address,
-      providerOrAccount: this.config.provider,
-    });
+    this.contract = this.config.provider
+      .getClassAt(this.address.address)
+      .then(
+        (cls) =>
+          new Contract({
+            abi: cls.abi,
+            address: this.address.address,
+            providerOrAccount: this.config.provider,
+          }),
+      );
 
     if (metadata.depositTokens.length < 1) {
       throw new Error("Deposit tokens are not fully defined in metadata");
@@ -149,13 +154,15 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
     };
   }
 
-  private tokenForPrimaryPricing(): TokenInfo {
+  /** Underlying (or base token) used for pricing / swap sell leg when base is ERC-4626. */
+  tokenForPrimaryPricing(): TokenInfo {
     return this.erc4626.isBaseERC4626 && this.erc4626.baseUnderlying
       ? this.erc4626.baseUnderlying
       : this.primaryToken;
   }
 
-  private tokenForSecondaryPricing(): TokenInfo {
+  /** Underlying (or second token) for price ratios when second leg is ERC-4626 (e.g. STRK for xSTRK). */
+  tokenForSecondaryPricing(): TokenInfo {
     return this.erc4626.isSecondERC4626 && this.erc4626.secondUnderlying
       ? this.erc4626.secondUnderlying
       : this.secondaryToken;
@@ -203,7 +210,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
     secondaryTokenBalance: Web3Number;
     claimableSecondaryTokens: Web3Number; 
   }> {
-    const userInfo = await this.contract.call("get_user_info", [user.address], {
+    const userInfo = await (await this.contract).call("get_user_info", [user.address], {
       blockIdentifier,
     });
     const {
@@ -488,6 +495,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
     receiver: ContractAddr,
   ): Promise<Call[]> {
     try{
+      const vault = await this.contract;
       if (this.erc4626.isBaseERC4626) {
         if (!this.erc4626.baseUnderlying) {
           throw new Error("baseUnderlying missing for ERC-4626 base YOLO vault");
@@ -497,7 +505,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
           this.address.address,
           amountInfo.amount,
         );
-        const depositCall = this.contract.populate("deposit_combined", [
+        const depositCall = vault.populate("deposit_combined", [
           uint256.bnToUint256(amountInfo.amount.toWei()),
           receiver.address,
         ]);
@@ -505,7 +513,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
       }
       const primaryToken = amountInfo.tokenInfo;
       const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
-      const depositCall = this.contract.populate("deposit", [
+      const depositCall = vault.populate("deposit", [
           uint256.bnToUint256(amountInfo.amount.toWei()),
           receiver.address,
         ]);
@@ -517,7 +525,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
   }
 
   async getVaultStatus(): Promise<YoloVaultStatus> {
-    const vaultStatus = await this.contract.call("get_vault_status", []);
+    const vaultStatus = await (await this.contract).call("get_vault_status", []);
     return vaultStatus as YoloVaultStatus;
   }
 
@@ -596,7 +604,8 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
     }
     const requiredShares =  userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
     const redeemFn = this.erc4626.isBaseERC4626 ? "redeem_combined" : "redeem";
-    let withdrawCall = this.contract.populate(redeemFn, [
+    const vault = await this.contract;
+    let withdrawCall = vault.populate(redeemFn, [
       uint256.bnToUint256(requiredShares.toString()),
       receiver.address,
     ]);
@@ -612,7 +621,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
   }
 
   async getSwapAmounts(spendUnits: Web3Number): Promise<{ grossSpend: Web3Number; netSpend: Web3Number; isReadyForNextSwap: boolean }> {
-    const swapAmounts: any = await this.contract.call("get_swap_amounts", [spendUnits.toUint256()]);
+    const swapAmounts: any = await (await this.contract).call("get_swap_amounts", [spendUnits.toUint256()]);
     console.log("swapAmounts", swapAmounts);
     return {
       grossSpend: Web3Number.fromWei(swapAmounts[0].toString(), this.primaryToken.decimals),
@@ -622,7 +631,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
   }
 
   getSettings = async (): Promise<YoloSettings> => {
-    const settings = await this.contract.call("get_settings", []);
+    const settings = await (await this.contract).call("get_settings", []);
     return settings as YoloSettings;
   };