@strkfarm/sdk 1.0.24 → 1.0.26

package/dist/index.browser.global.js

@@ -38661,6 +38661,45 @@ var strkfarm_risk_engine = (() => {
       }).filter((p) => p !== null);
       return pools;
     }
+    async getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI) {
+      const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num_exports.getDecimalString(p.pool_id.address.toString()));
+      const _pool = pools.find((d) => {
+        logger.verbose(`pool check: ${d.id == num_exports.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num_exports.getDecimalString(p.pool_id.address.toString())}`);
+        return d.id == num_exports.getDecimalString(p.pool_id.address.toString());
+      });
+      logger.verbose(`pool: ${JSON.stringify(_pool)}`);
+      logger.verbose(typeof _pool);
+      logger.verbose(`name: ${_pool?.name}`);
+      if (!_pool) {
+        throw new Error(`Pool ${p.pool_id.address.toString()} not found`);
+      }
+      const assetInfo = _pool?.assets.find((d) => this.asset().address.eqString(d.address));
+      let vTokenContract = new Contract(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
+      const bal = await vTokenContract.balanceOf(this.address.address);
+      const assets = await vTokenContract.convert_to_assets(uint256_exports.bnToUint256(bal.toString()));
+      const item = {
+        pool_id: p.pool_id,
+        pool_name: _pool?.name,
+        max_weight: p.max_weight,
+        current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
+        v_token: p.v_token,
+        amount: Web3Number.fromWei(assets.toString(), this.decimals()),
+        usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
+        APY: isErrorPoolsAPI || !assetInfo ? {
+          baseApy: 0,
+          defiSpringApy: 0,
+          netApy: 0
+        } : {
+          baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
+          defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
+          netApy: 0
+        },
+        currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
+        maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
+      };
+      item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
+      return item;
+    }
     /**
      * Retrieves the list of allowed pools and their detailed information from multiple sources:
      * 1. Contract's allowed pools
@@ -38699,40 +38738,7 @@ var strkfarm_risk_engine = (() => {
         isErrorPoolsAPI = true;
       }
       const totalAssets = (await this.getTVL()).amount;
-      const info = allowedPools.map(async (p) => {
-        const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num_exports.getDecimalString(p.pool_id.address.toString()));
-        const pool = pools.find((d) => {
-          logger.verbose(`pool check: ${d.id == num_exports.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num_exports.getDecimalString(p.pool_id.address.toString())}`);
-          return d.id == num_exports.getDecimalString(p.pool_id.address.toString());
-        });
-        logger.verbose(`pool: ${JSON.stringify(pool)}`);
-        const assetInfo = pool?.assets.find((d) => this.asset().address.eqString(d.address));
-        let vTokenContract = new Contract(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
-        const bal = await vTokenContract.balanceOf(this.address.address);
-        const assets = await vTokenContract.convert_to_assets(uint256_exports.bnToUint256(bal.toString()));
-        const item = {
-          pool_id: p.pool_id,
-          pool_name: pool.name,
-          max_weight: p.max_weight,
-          current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
-          v_token: p.v_token,
-          amount: Web3Number.fromWei(assets.toString(), this.decimals()),
-          usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
-          APY: isErrorPoolsAPI || !assetInfo ? {
-            baseApy: 0,
-            defiSpringApy: 0,
-            netApy: 0
-          } : {
-            baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
-            defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
-            netApy: 0
-          },
-          currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
-          maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
-        };
-        item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
-        return item;
-      });
+      const info = allowedPools.map((p) => this.getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI));
       const data = await Promise.all(info);
       return {
         data,

package/dist/index.browser.mjs

@@ -3673,6 +3673,45 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     }).filter((p) => p !== null);
     return pools;
   }
+  async getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI) {
+    const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num2.getDecimalString(p.pool_id.address.toString()));
+    const _pool = pools.find((d) => {
+      logger.verbose(`pool check: ${d.id == num2.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num2.getDecimalString(p.pool_id.address.toString())}`);
+      return d.id == num2.getDecimalString(p.pool_id.address.toString());
+    });
+    logger.verbose(`pool: ${JSON.stringify(_pool)}`);
+    logger.verbose(typeof _pool);
+    logger.verbose(`name: ${_pool?.name}`);
+    if (!_pool) {
+      throw new Error(`Pool ${p.pool_id.address.toString()} not found`);
+    }
+    const assetInfo = _pool?.assets.find((d) => this.asset().address.eqString(d.address));
+    let vTokenContract = new Contract4(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
+    const bal = await vTokenContract.balanceOf(this.address.address);
+    const assets = await vTokenContract.convert_to_assets(uint2563.bnToUint256(bal.toString()));
+    const item = {
+      pool_id: p.pool_id,
+      pool_name: _pool?.name,
+      max_weight: p.max_weight,
+      current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
+      v_token: p.v_token,
+      amount: Web3Number.fromWei(assets.toString(), this.decimals()),
+      usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
+      APY: isErrorPoolsAPI || !assetInfo ? {
+        baseApy: 0,
+        defiSpringApy: 0,
+        netApy: 0
+      } : {
+        baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
+        defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
+        netApy: 0
+      },
+      currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
+      maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
+    };
+    item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
+    return item;
+  }
   /**
    * Retrieves the list of allowed pools and their detailed information from multiple sources:
    * 1. Contract's allowed pools
@@ -3711,40 +3750,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       isErrorPoolsAPI = true;
     }
     const totalAssets = (await this.getTVL()).amount;
-    const info = allowedPools.map(async (p) => {
-      const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num2.getDecimalString(p.pool_id.address.toString()));
-      const pool = pools.find((d) => {
-        logger.verbose(`pool check: ${d.id == num2.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num2.getDecimalString(p.pool_id.address.toString())}`);
-        return d.id == num2.getDecimalString(p.pool_id.address.toString());
-      });
-      logger.verbose(`pool: ${JSON.stringify(pool)}`);
-      const assetInfo = pool?.assets.find((d) => this.asset().address.eqString(d.address));
-      let vTokenContract = new Contract4(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
-      const bal = await vTokenContract.balanceOf(this.address.address);
-      const assets = await vTokenContract.convert_to_assets(uint2563.bnToUint256(bal.toString()));
-      const item = {
-        pool_id: p.pool_id,
-        pool_name: pool.name,
-        max_weight: p.max_weight,
-        current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
-        v_token: p.v_token,
-        amount: Web3Number.fromWei(assets.toString(), this.decimals()),
-        usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
-        APY: isErrorPoolsAPI || !assetInfo ? {
-          baseApy: 0,
-          defiSpringApy: 0,
-          netApy: 0
-        } : {
-          baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
-          defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
-          netApy: 0
-        },
-        currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
-        maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
-      };
-      item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
-      return item;
-    });
+    const info = allowedPools.map((p) => this.getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI));
     const data = await Promise.all(info);
     return {
       data,

package/dist/index.d.ts

@@ -395,6 +395,11 @@ declare class BaseStrategy<TVLInfo, ActionInfo> {
     withdrawCall(amountInfo: ActionInfo, receiver: ContractAddr, owner: ContractAddr): Call[];
 }
 
+interface PoolProps {
+    pool_id: ContractAddr;
+    max_weight: number;
+    v_token: ContractAddr;
+}
 interface Change {
     pool_id: ContractAddr;
     changeAmt: Web3Number;
@@ -488,6 +493,22 @@ declare class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAm
         usdValue: number;
     }>;
     static getAllPossibleVerifiedPools(asset: ContractAddr): Promise<any>;
+    getPoolInfo(p: PoolProps, pools: any[], vesuPositions: any[], totalAssets: Web3Number, isErrorPositionsAPI: boolean, isErrorPoolsAPI: boolean): Promise<{
+        pool_id: ContractAddr;
+        pool_name: any;
+        max_weight: number;
+        current_weight: number;
+        v_token: ContractAddr;
+        amount: Web3Number;
+        usdValue: Web3Number;
+        APY: {
+            baseApy: number;
+            defiSpringApy: number;
+            netApy: number;
+        };
+        currentUtilization: number;
+        maxUtilization: number;
+    }>;
     /**
      * Retrieves the list of allowed pools and their detailed information from multiple sources:
      * 1. Contract's allowed pools

package/dist/index.js

@@ -3761,6 +3761,45 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     }).filter((p) => p !== null);
     return pools;
   }
+  async getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI) {
+    const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === import_starknet7.num.getDecimalString(p.pool_id.address.toString()));
+    const _pool = pools.find((d) => {
+      logger.verbose(`pool check: ${d.id == import_starknet7.num.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${import_starknet7.num.getDecimalString(p.pool_id.address.toString())}`);
+      return d.id == import_starknet7.num.getDecimalString(p.pool_id.address.toString());
+    });
+    logger.verbose(`pool: ${JSON.stringify(_pool)}`);
+    logger.verbose(typeof _pool);
+    logger.verbose(`name: ${_pool?.name}`);
+    if (!_pool) {
+      throw new Error(`Pool ${p.pool_id.address.toString()} not found`);
+    }
+    const assetInfo = _pool?.assets.find((d) => this.asset().address.eqString(d.address));
+    let vTokenContract = new import_starknet7.Contract(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
+    const bal = await vTokenContract.balanceOf(this.address.address);
+    const assets = await vTokenContract.convert_to_assets(import_starknet7.uint256.bnToUint256(bal.toString()));
+    const item = {
+      pool_id: p.pool_id,
+      pool_name: _pool?.name,
+      max_weight: p.max_weight,
+      current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
+      v_token: p.v_token,
+      amount: Web3Number.fromWei(assets.toString(), this.decimals()),
+      usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
+      APY: isErrorPoolsAPI || !assetInfo ? {
+        baseApy: 0,
+        defiSpringApy: 0,
+        netApy: 0
+      } : {
+        baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
+        defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
+        netApy: 0
+      },
+      currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
+      maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
+    };
+    item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
+    return item;
+  }
   /**
    * Retrieves the list of allowed pools and their detailed information from multiple sources:
    * 1. Contract's allowed pools
@@ -3799,40 +3838,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       isErrorPoolsAPI = true;
     }
     const totalAssets = (await this.getTVL()).amount;
-    const info = allowedPools.map(async (p) => {
-      const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === import_starknet7.num.getDecimalString(p.pool_id.address.toString()));
-      const pool = pools.find((d) => {
-        logger.verbose(`pool check: ${d.id == import_starknet7.num.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${import_starknet7.num.getDecimalString(p.pool_id.address.toString())}`);
-        return d.id == import_starknet7.num.getDecimalString(p.pool_id.address.toString());
-      });
-      logger.verbose(`pool: ${JSON.stringify(pool)}`);
-      const assetInfo = pool?.assets.find((d) => this.asset().address.eqString(d.address));
-      let vTokenContract = new import_starknet7.Contract(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
-      const bal = await vTokenContract.balanceOf(this.address.address);
-      const assets = await vTokenContract.convert_to_assets(import_starknet7.uint256.bnToUint256(bal.toString()));
-      const item = {
-        pool_id: p.pool_id,
-        pool_name: pool.name,
-        max_weight: p.max_weight,
-        current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
-        v_token: p.v_token,
-        amount: Web3Number.fromWei(assets.toString(), this.decimals()),
-        usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
-        APY: isErrorPoolsAPI || !assetInfo ? {
-          baseApy: 0,
-          defiSpringApy: 0,
-          netApy: 0
-        } : {
-          baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
-          defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
-          netApy: 0
-        },
-        currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
-        maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
-      };
-      item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
-      return item;
-    });
+    const info = allowedPools.map((p) => this.getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI));
     const data = await Promise.all(info);
     return {
       data,

package/dist/index.mjs

@@ -3693,6 +3693,45 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     }).filter((p) => p !== null);
     return pools;
   }
+  async getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI) {
+    const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num2.getDecimalString(p.pool_id.address.toString()));
+    const _pool = pools.find((d) => {
+      logger.verbose(`pool check: ${d.id == num2.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num2.getDecimalString(p.pool_id.address.toString())}`);
+      return d.id == num2.getDecimalString(p.pool_id.address.toString());
+    });
+    logger.verbose(`pool: ${JSON.stringify(_pool)}`);
+    logger.verbose(typeof _pool);
+    logger.verbose(`name: ${_pool?.name}`);
+    if (!_pool) {
+      throw new Error(`Pool ${p.pool_id.address.toString()} not found`);
+    }
+    const assetInfo = _pool?.assets.find((d) => this.asset().address.eqString(d.address));
+    let vTokenContract = new Contract4(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
+    const bal = await vTokenContract.balanceOf(this.address.address);
+    const assets = await vTokenContract.convert_to_assets(uint2563.bnToUint256(bal.toString()));
+    const item = {
+      pool_id: p.pool_id,
+      pool_name: _pool?.name,
+      max_weight: p.max_weight,
+      current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
+      v_token: p.v_token,
+      amount: Web3Number.fromWei(assets.toString(), this.decimals()),
+      usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
+      APY: isErrorPoolsAPI || !assetInfo ? {
+        baseApy: 0,
+        defiSpringApy: 0,
+        netApy: 0
+      } : {
+        baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
+        defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
+        netApy: 0
+      },
+      currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
+      maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
+    };
+    item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
+    return item;
+  }
   /**
    * Retrieves the list of allowed pools and their detailed information from multiple sources:
    * 1. Contract's allowed pools
@@ -3731,40 +3770,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       isErrorPoolsAPI = true;
     }
     const totalAssets = (await this.getTVL()).amount;
-    const info = allowedPools.map(async (p) => {
-      const vesuPosition = vesuPositions.find((d) => d.pool.id.toString() === num2.getDecimalString(p.pool_id.address.toString()));
-      const pool = pools.find((d) => {
-        logger.verbose(`pool check: ${d.id == num2.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num2.getDecimalString(p.pool_id.address.toString())}`);
-        return d.id == num2.getDecimalString(p.pool_id.address.toString());
-      });
-      logger.verbose(`pool: ${JSON.stringify(pool)}`);
-      const assetInfo = pool?.assets.find((d) => this.asset().address.eqString(d.address));
-      let vTokenContract = new Contract4(vesu_rebalance_abi_default, p.v_token.address, this.config.provider);
-      const bal = await vTokenContract.balanceOf(this.address.address);
-      const assets = await vTokenContract.convert_to_assets(uint2563.bnToUint256(bal.toString()));
-      const item = {
-        pool_id: p.pool_id,
-        pool_name: pool.name,
-        max_weight: p.max_weight,
-        current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
-        v_token: p.v_token,
-        amount: Web3Number.fromWei(assets.toString(), this.decimals()),
-        usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
-        APY: isErrorPoolsAPI || !assetInfo ? {
-          baseApy: 0,
-          defiSpringApy: 0,
-          netApy: 0
-        } : {
-          baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
-          defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
-          netApy: 0
-        },
-        currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
-        maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6))
-      };
-      item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
-      return item;
-    });
+    const info = allowedPools.map((p) => this.getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI));
     const data = await Promise.all(info);
     return {
       data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "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/vesu-rebalance.ts

@@ -172,6 +172,53 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
         return pools;
     }
 
+    async getPoolInfo(
+        p: PoolProps,
+        pools: any[],
+        vesuPositions: any[],
+        totalAssets: Web3Number,
+        isErrorPositionsAPI: boolean,
+        isErrorPoolsAPI: boolean,
+    ) {
+        const vesuPosition = vesuPositions.find((d: any) => d.pool.id.toString() === num.getDecimalString(p.pool_id.address.toString()));
+        const _pool = pools.find((d: any) => {
+            logger.verbose(`pool check: ${d.id == num.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num.getDecimalString(p.pool_id.address.toString())}`);
+            return d.id == num.getDecimalString(p.pool_id.address.toString());
+        });
+        logger.verbose(`pool: ${JSON.stringify(_pool)}`);
+        logger.verbose(typeof _pool);
+        logger.verbose(`name: ${_pool?.name}`);
+        if (!_pool) {
+            throw new Error(`Pool ${p.pool_id.address.toString()} not found`);
+        }
+        const assetInfo = _pool?.assets.find((d: any) => this.asset().address.eqString(d.address));
+        let vTokenContract = new Contract(VesuRebalanceAbi, p.v_token.address, this.config.provider);
+        const bal = await vTokenContract.balanceOf(this.address.address);
+        const assets = await vTokenContract.convert_to_assets(uint256.bnToUint256(bal.toString()));
+        const item = {
+            pool_id: p.pool_id,
+            pool_name: _pool?.name,
+            max_weight: p.max_weight,
+            current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
+            v_token: p.v_token,
+            amount: Web3Number.fromWei(assets.toString(), this.decimals()),
+            usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
+            APY: isErrorPoolsAPI || !assetInfo ? {
+                baseApy: 0,
+                defiSpringApy: 0,
+                netApy: 0,
+            } : {
+                baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
+                defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
+                netApy: 0,
+            },
+            currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
+            maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6)),
+        }
+        item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
+        return item;
+    }
+
     /**
      * Retrieves the list of allowed pools and their detailed information from multiple sources:
      * 1. Contract's allowed pools
@@ -262,40 +309,7 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
 
         const totalAssets = (await this.getTVL()).amount;
 
-        const info = allowedPools.map(async (p) => {
-            const vesuPosition = vesuPositions.find((d: any) => d.pool.id.toString() === num.getDecimalString(p.pool_id.address.toString()));
-            const pool = pools.find((d: any) => {
-                logger.verbose(`pool check: ${d.id == num.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num.getDecimalString(p.pool_id.address.toString())}`);
-                return d.id == num.getDecimalString(p.pool_id.address.toString());
-            });
-            logger.verbose(`pool: ${JSON.stringify(pool)}`);
-            const assetInfo = pool?.assets.find((d: any) => this.asset().address.eqString(d.address));
-            let vTokenContract = new Contract(VesuRebalanceAbi, p.v_token.address, this.config.provider);
-            const bal = await vTokenContract.balanceOf(this.address.address);
-            const assets = await vTokenContract.convert_to_assets(uint256.bnToUint256(bal.toString()));
-            const item = {
-                pool_id: p.pool_id,
-                pool_name: pool.name,
-                max_weight: p.max_weight,
-                current_weight: isErrorPositionsAPI || !vesuPosition ? 0 : Number(Web3Number.fromWei(vesuPosition.collateral.value, this.decimals()).dividedBy(totalAssets.toString()).toFixed(6)),
-                v_token: p.v_token,
-                amount: Web3Number.fromWei(assets.toString(), this.decimals()),
-                usdValue: isErrorPositionsAPI || !vesuPosition ? Web3Number.fromWei("0", this.decimals()) : Web3Number.fromWei(vesuPosition.collateral.usdPrice.value, vesuPosition.collateral.usdPrice.decimals),
-                APY: isErrorPoolsAPI || !assetInfo ? {
-                    baseApy: 0,
-                    defiSpringApy: 0,
-                    netApy: 0,
-                } : {
-                    baseApy: Number(Web3Number.fromWei(assetInfo.stats.supplyApy.value, assetInfo.stats.supplyApy.decimals).toFixed(6)),
-                    defiSpringApy: Number(Web3Number.fromWei(assetInfo.stats.defiSpringSupplyApr.value, assetInfo.stats.defiSpringSupplyApr.decimals).toFixed(6)),
-                    netApy: 0,
-                },
-                currentUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.stats.currentUtilization.value, assetInfo.stats.currentUtilization.decimals).toFixed(6)),
-                maxUtilization: isErrorPoolsAPI || !assetInfo ? 0 : Number(Web3Number.fromWei(assetInfo.config.maxUtilization.value, assetInfo.config.maxUtilization.decimals).toFixed(6)),
-            }
-            item.APY.netApy = item.APY.baseApy + item.APY.defiSpringApy;
-            return item;
-        });
+        const info = allowedPools.map(p => this.getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI));
         const data = await Promise.all(info);
         return {
             data,