@strkfarm/sdk 1.0.63 → 1.1.1

package/src/strategies/ekubo-cl-vault.tsx

@@ -113,17 +113,17 @@ export class EkuboCLVault extends BaseStrategy<
     this.metadata = metadata;
     this.address = metadata.address;
 
-    this.contract = new Contract(
-      CLVaultAbi,
-      this.address.address,
-      this.config.provider
-    );
+    this.contract = new Contract({
+      abi: CLVaultAbi,
+      address: this.address.address,
+      providerOrAccount: this.config.provider
+    });
     if (this.metadata.additionalInfo.lstContract) {
-      this.lstContract = new Contract(
-        ERC4626Abi,
-        this.metadata.additionalInfo.lstContract.address,
-        this.config.provider
-      );
+      this.lstContract = new Contract({
+        abi: ERC4626Abi,
+        address: this.metadata.additionalInfo.lstContract.address,
+        providerOrAccount: this.config.provider
+      });
     } else {
       this.lstContract = null;
     }
@@ -131,18 +131,18 @@ export class EkuboCLVault extends BaseStrategy<
     // ekubo positions contract
     const EKUBO_POSITION =
       "0x02e0af29598b407c8716b17f6d2795eca1b471413fa03fb145a5e33722184067";
-    this.ekuboPositionsContract = new Contract(
-      EkuboPositionsAbi,
-      EKUBO_POSITION,
-      this.config.provider
-    );
+    this.ekuboPositionsContract = new Contract({
+      abi: EkuboPositionsAbi,
+      address: EKUBO_POSITION,
+      providerOrAccount: this.config.provider
+    });
     const EKUBO_MATH =
       "0x04a72e9e166f6c0e9d800af4dc40f6b6fb4404b735d3f528d9250808b2481995";
-    this.ekuboMathContract = new Contract(
-      EkuboMathAbi,
-      EKUBO_MATH,
-      this.config.provider
-    );
+    this.ekuboMathContract = new Contract({
+      abi: EkuboMathAbi,
+      address: EKUBO_MATH,
+      providerOrAccount: this.config.provider
+    });
 
     this.avnu = new AvnuWrapper();
   }
@@ -207,16 +207,16 @@ export class EkuboCLVault extends BaseStrategy<
     const updateAmountInfo = await this.getMinDepositAmounts(amountInfo);
     // Technically its not erc4626 abi, but we just need approve call
     // so, its ok to use it
-    const token0Contract = new Contract(
-      ERC4626Abi,
-      amountInfo.token0.tokenInfo.address.address,
-      this.config.provider
-    );
-    const token1Contract = new Contract(
-      ERC4626Abi,
-      amountInfo.token1.tokenInfo.address.address,
-      this.config.provider
-    );
+    const token0Contract = new Contract({
+      abi: ERC4626Abi,
+      address: amountInfo.token0.tokenInfo.address.address,
+      providerOrAccount: this.config.provider
+    });
+    const token1Contract = new Contract({
+      abi: ERC4626Abi,
+      address: amountInfo.token1.tokenInfo.address.address,
+      providerOrAccount: this.config.provider
+    });
     const call1 = token0Contract.populate("approve", [
       this.address.address,
       uint256.bnToUint256(updateAmountInfo.token0.amount.toWei()),
@@ -286,7 +286,7 @@ export class EkuboCLVault extends BaseStrategy<
    * @returns {Promise<number>} The weighted average APY across all pools
    */
   async netAPY(
-    blockIdentifier: BlockIdentifier = "pending",
+    blockIdentifier: BlockIdentifier = "latest",
     sinceBlocks = 20000
   ): Promise<number> {
     // no special provisions required to account for defi spring rewards
@@ -376,7 +376,7 @@ export class EkuboCLVault extends BaseStrategy<
 
   async balanceOf(
     user: ContractAddr,
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<Web3Number> {
     let bal = await this.contract.call("balance_of", [user.address], {
       blockIdentifier,
@@ -386,7 +386,7 @@ export class EkuboCLVault extends BaseStrategy<
 
   async getUserTVL(
     user: ContractAddr,
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<DualTokenInfo> {
     let bal = await this.balanceOf(user, blockIdentifier);
     const assets: any = await this.contract.call(
@@ -428,7 +428,7 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  async _getTVL(blockIdentifier: BlockIdentifier = "pending") {
+  async _getTVL(blockIdentifier: BlockIdentifier = "latest") {
     const result = await this.contract.call("total_liquidity", [], {
       blockIdentifier,
     });
@@ -443,7 +443,7 @@ export class EkuboCLVault extends BaseStrategy<
   }
 
   async totalSupply(
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<Web3Number> {
     const res = await this.contract.call("total_supply", [], {
       blockIdentifier,
@@ -464,7 +464,7 @@ export class EkuboCLVault extends BaseStrategy<
   }
 
   async getTVL(
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<DualTokenInfo> {
     const { amount0, amount1 } = await this._getTVL(blockIdentifier);
     const poolKey = await this.getPoolKey(blockIdentifier);
@@ -561,14 +561,14 @@ export class EkuboCLVault extends BaseStrategy<
     throw new Error("No true price available");
   }
 
-  async getCurrentPrice(blockIdentifier: BlockIdentifier = "pending") {
+  async getCurrentPrice(blockIdentifier: BlockIdentifier = "latest") {
     const poolKey = await this.getPoolKey(blockIdentifier);
     return this._getCurrentPrice(poolKey, blockIdentifier);
   }
 
   async _getCurrentPrice(
     poolKey: EkuboPoolKey,
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ) {
     const priceInfo: any = await this.ekuboPositionsContract.call(
       "get_pool_price",
@@ -606,7 +606,7 @@ export class EkuboCLVault extends BaseStrategy<
   }
 
   async getCurrentBounds(
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<EkuboBounds> {
     const result: any = await this.contract.call("get_position_key", [], {
       blockIdentifier,
@@ -632,7 +632,7 @@ export class EkuboCLVault extends BaseStrategy<
   }
 
   async getPoolKey(
-    blockIdentifier: BlockIdentifier = "pending"
+    blockIdentifier: BlockIdentifier = "latest"
   ): Promise<EkuboPoolKey> {
     if (this.poolKey) {
       return this.poolKey;
@@ -1345,7 +1345,7 @@ export class EkuboCLVault extends BaseStrategy<
   async getLiquidityToAmounts(
     liquidity: Web3Number,
     bounds: EkuboBounds,
-    blockIdentifier: BlockIdentifier = "pending",
+    blockIdentifier: BlockIdentifier = "latest",
     _poolKey: EkuboPoolKey | null = null,
     _currentPrice: {
       price: number;

package/src/strategies/sensei.ts

@@ -30,7 +30,7 @@ export class SenseiVault extends BaseStrategy<
     this.address = metadata.address;
     this.pricer = pricer;
     this.metadata = metadata;
-    this.contract = new Contract(SenseiABI, this.address.address, this.config.provider);
+    this.contract = new Contract({abi: SenseiABI, address: this.address.address, providerOrAccount: this.config.provider});
 
     if (metadata.depositTokens.length === 0) {
       throw new Error("Deposit tokens are not defined in metadata");
@@ -90,11 +90,11 @@ export class SenseiVault extends BaseStrategy<
   }   
 
   async depositCall(amountInfo: SingleActionAmount, receiver: ContractAddr): Promise<Call[]> {
-    const mainTokenContract = new Contract(
-      ERC20ABI,
-      this.metadata.depositTokens[0].address.address,
-      this.config.provider,
-    );  
+    const mainTokenContract = new Contract({
+      abi: ERC20ABI,
+      address: this.metadata.depositTokens[0].address.address,
+      providerOrAccount: this.config.provider,
+    });
     const call1 = mainTokenContract.populate('approve', [
       this.address.address,
       uint256.bnToUint256(amountInfo.amount.toWei()),

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

@@ -139,7 +139,7 @@ export class VesuAdapter extends BaseAdapter {
       }
     };
     logger.verbose(`VesuAdapter::ConstructingModify::Debt::${JSON.stringify(_debt)}`)
-    const singletonContract = new Contract(VesuSingletonAbi, this.VESU_SINGLETON.toString(), new RpcProvider({nodeUrl: ''}));
+    const singletonContract = new Contract({abi: VesuSingletonAbi, address: this.VESU_SINGLETON.toString(), providerOrAccount: new RpcProvider({nodeUrl: ''})});
     const call = singletonContract.populate('modify_position', {
       params: {
         pool_id: this.config.poolId.toBigInt(),
@@ -217,7 +217,7 @@ export class VesuAdapter extends BaseAdapter {
   }
 
   getVesuSingletonContract(config: IConfig) {
-    return new Contract(VesuSingletonAbi, this.VESU_SINGLETON.address, config.provider);
+    return new Contract({abi: VesuSingletonAbi, address: this.VESU_SINGLETON.address, providerOrAccount: config.provider});
   }
 
   async getLTVConfig(config: IConfig) {

package/src/strategies/universal-strategy.tsx

@@ -63,16 +63,16 @@ export class UniversalStrategy<
       this.metadata = metadata;
       this.address = metadata.address;
   
-      this.contract = new Contract(
-        UniversalVaultAbi,
-        this.address.address,
-        this.config.provider
-      );
-      this.managerContract = new Contract(
-        ManagerAbi,
-        this.metadata.additionalInfo.manager.address,
-        this.config.provider
-      );
+      this.contract = new Contract({
+        abi: UniversalVaultAbi,
+        address: this.address.address,
+        providerOrAccount: this.config.provider
+      });
+      this.managerContract = new Contract({
+        abi: ManagerAbi,
+        address: this.metadata.additionalInfo.manager.address,
+        providerOrAccount: this.config.provider
+      });
   }
 
   getMerkleTree() {
@@ -132,11 +132,11 @@ export class UniversalStrategy<
       amountInfo.tokenInfo.address.eq(this.asset().address),
       "Deposit token mismatch"
     );
-    const assetContract = new Contract(
-      UniversalVaultAbi,
-      this.asset().address.address,
-      this.config.provider
-    );
+    const assetContract = new Contract({
+      abi: UniversalVaultAbi,
+      address: this.asset().address.address,
+      providerOrAccount: this.config.provider
+    });
     const call1 = assetContract.populate("approve", [
       this.address.address,
       uint256.bnToUint256(amountInfo.amount.toWei())

package/src/strategies/vesu-rebalance.tsx

@@ -103,11 +103,11 @@ export class VesuRebalance extends BaseStrategy<
     this.metadata = metadata;
     this.address = metadata.address;
 
-    this.contract = new Contract(
-      VesuRebalanceAbi,
-      this.address.address,
-      this.config.provider
-    );
+    this.contract = new Contract({
+      abi: VesuRebalanceAbi,
+      address: this.address.address,
+      providerOrAccount: this.config.provider
+    });
   }
 
   /**
@@ -123,11 +123,11 @@ export class VesuRebalance extends BaseStrategy<
       amountInfo.tokenInfo.address.eq(this.asset().address),
       "Deposit token mismatch"
     );
-    const assetContract = new Contract(
-      VesuRebalanceAbi,
-      this.asset().address.address,
-      this.config.provider
-    );
+    const assetContract = new Contract({
+      abi: VesuRebalanceAbi,
+      address: this.asset().address.address,
+      providerOrAccount: this.config.provider
+    });
     const call1 = assetContract.populate("approve", [
       this.address.address,
       uint256.bnToUint256(amountInfo.amount.toWei())
@@ -284,11 +284,11 @@ export class VesuRebalance extends BaseStrategy<
         `Asset ${this.asset().address.toString()} not found in pool ${p.pool_id.address.toString()}`
       );
     }
-    let vTokenContract = new Contract(
-      VesuRebalanceAbi,
-      p.v_token.address,
-      this.config.provider
-    );
+    let vTokenContract = new Contract({
+      abi: VesuRebalanceAbi,
+      address: p.v_token.address,
+      providerOrAccount: this.config.provider
+    });
     const bal = await vTokenContract.balanceOf(this.address.address);
     const assets = await vTokenContract.convert_to_assets(
       uint256.bnToUint256(bal.toString())

package/src/utils/store.ts

@@ -96,7 +96,7 @@ export class Store {
         logger.warn(`⚠️=========================================⚠️`);
     }
 
-    getAccount(accountKey: string, txVersion: "0x2" | "0x3" = constants.TRANSACTION_VERSION.V2) {
+    getAccount(accountKey: string, txVersion: undefined | "0x3") {
         const accounts = this.loadAccounts();
         logger.verbose(`nAccounts loaded for network: ${Object.keys(accounts).length}`);
         const data = accounts[accountKey];
@@ -105,7 +105,14 @@ export class Store {
         }
         logger.verbose(`Account loaded: ${accountKey} from network: ${this.config.network}`);
         logger.verbose(`Address: ${data.address}`);
-        const acc = new Account(<any>this.config.provider, data.address, data.pk, undefined, txVersion);
+
+        const acc = new Account({
+            provider: <any>this.config.provider,
+            address: data.address,
+            signer: data.pk,
+            cairoVersion: undefined,
+            transactionVersion: txVersion
+        });
         return acc;
     }