@strkfarm/sdk 1.0.22 → 1.0.23

package/dist/cli.js

@@ -101,26 +101,26 @@ var _Web3Number = class extends import_bignumber.default {
     return this.mul(10 ** this.decimals).toFixed(0);
   }
   multipliedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.mul(_value).toString(), this.decimals);
   }
   dividedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.div(_value).toString(), this.decimals);
   }
   plus(value) {
-    const _value = Number(value).toFixed(13);
+    const _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.add(_value).toString(), this.decimals);
   }
   minus(n, base) {
-    const _value = Number(n).toFixed(13);
+    const _value = Number(n).toFixed(this.maxToFixedDecimals());
     return this.construct(super.minus(_value, base).toString(), this.decimals);
   }
   construct(value, decimals) {
     return new this.constructor(value, decimals);
   }
-  toString(base) {
-    return super.toString(base);
+  toString(decimals = this.maxToFixedDecimals()) {
+    return super.toFixed(decimals);
   }
   toJSON() {
     return this.toString();
@@ -128,6 +128,9 @@ var _Web3Number = class extends import_bignumber.default {
   valueOf() {
     return this.toString();
   }
+  maxToFixedDecimals() {
+    return Math.min(this.decimals, 13);
+  }
 };
 import_bignumber.default.config({ DECIMAL_PLACES: 18 });
 _Web3Number.config({ DECIMAL_PLACES: 18 });

package/dist/cli.mjs

@@ -78,26 +78,26 @@ var _Web3Number = class extends BigNumber {
     return this.mul(10 ** this.decimals).toFixed(0);
   }
   multipliedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.mul(_value).toString(), this.decimals);
   }
   dividedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.div(_value).toString(), this.decimals);
   }
   plus(value) {
-    const _value = Number(value).toFixed(13);
+    const _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.add(_value).toString(), this.decimals);
   }
   minus(n, base) {
-    const _value = Number(n).toFixed(13);
+    const _value = Number(n).toFixed(this.maxToFixedDecimals());
     return this.construct(super.minus(_value, base).toString(), this.decimals);
   }
   construct(value, decimals) {
     return new this.constructor(value, decimals);
   }
-  toString(base) {
-    return super.toString(base);
+  toString(decimals = this.maxToFixedDecimals()) {
+    return super.toFixed(decimals);
   }
   toJSON() {
     return this.toString();
@@ -105,6 +105,9 @@ var _Web3Number = class extends BigNumber {
   valueOf() {
     return this.toString();
   }
+  maxToFixedDecimals() {
+    return Math.min(this.decimals, 13);
+  }
 };
 BigNumber.config({ DECIMAL_PLACES: 18 });
 _Web3Number.config({ DECIMAL_PLACES: 18 });

package/dist/index.browser.global.js

@@ -18507,26 +18507,26 @@ var strkfarm_risk_engine = (() => {
       return this.mul(10 ** this.decimals).toFixed(0);
     }
     multipliedBy(value) {
-      let _value = Number(value).toFixed(13);
+      let _value = Number(value).toFixed(this.maxToFixedDecimals());
       return this.construct(this.mul(_value).toString(), this.decimals);
     }
     dividedBy(value) {
-      let _value = Number(value).toFixed(13);
+      let _value = Number(value).toFixed(this.maxToFixedDecimals());
       return this.construct(this.div(_value).toString(), this.decimals);
     }
     plus(value) {
-      const _value = Number(value).toFixed(13);
+      const _value = Number(value).toFixed(this.maxToFixedDecimals());
       return this.construct(this.add(_value).toString(), this.decimals);
     }
     minus(n, base2) {
-      const _value = Number(n).toFixed(13);
+      const _value = Number(n).toFixed(this.maxToFixedDecimals());
       return this.construct(super.minus(_value, base2).toString(), this.decimals);
     }
     construct(value, decimals) {
       return new this.constructor(value, decimals);
     }
-    toString(base2) {
-      return super.toString(base2);
+    toString(decimals = this.maxToFixedDecimals()) {
+      return super.toFixed(decimals);
     }
     toJSON() {
       return this.toString();
@@ -18534,6 +18534,9 @@ var strkfarm_risk_engine = (() => {
     valueOf() {
       return this.toString();
     }
+    maxToFixedDecimals() {
+      return Math.min(this.decimals, 13);
+    }
   };
   import_bignumber.default.config({ DECIMAL_PLACES: 18 });
   _Web3Number.config({ DECIMAL_PLACES: 18 });
@@ -38698,7 +38701,9 @@ var strkfarm_risk_engine = (() => {
       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) => d.id == num_exports.getDecimalString(p.pool_id.address));
+        const pool = pools.find((d) => {
+          return d.id == num_exports.getDecimalString(p.pool_id.address.toString());
+        });
         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);
@@ -38746,11 +38751,13 @@ var strkfarm_risk_engine = (() => {
      * Calculates the weighted average APY across all pools based on USD value.
      * @returns {Promise<number>} The weighted average APY across all pools
      */
-    netAPYGivenPools(pools) {
-      const weightedApy = pools.reduce((acc, curr) => {
+    async netAPYGivenPools(pools) {
+      const weightedApyNumerator = pools.reduce((acc, curr) => {
         const weight = curr.current_weight;
-        return acc + curr.APY.netApy * weight;
+        return acc + curr.APY.netApy * Number(curr.amount.toString());
       }, 0);
+      const totalAssets = (await this.getTVL()).amount;
+      const weightedApy = weightedApyNumerator / Number(totalAssets.toString());
       return weightedApy * (1 - this.metadata.additionalInfo.feeBps / 1e4);
     }
     /**
@@ -38779,14 +38786,21 @@ var strkfarm_risk_engine = (() => {
         finalPools: []
       };
       const sumPools = pools.reduce((acc, curr) => acc.plus(curr.amount.toString()), Web3Number.fromWei("0", this.decimals()));
-      assert3(sumPools.lte(totalAssets), "Sum of pools.amount must be less than or equal to totalAssets");
+      logger.verbose(`Sum of pools: ${sumPools.toString()}`);
+      logger.verbose(`Total assets: ${totalAssets.toString()}`);
+      assert3(sumPools.lte(totalAssets.multipliedBy(1.00001).toString()), "Sum of pools.amount must be less than or equal to totalAssets");
       const sortedPools = [...pools].sort((a, b) => b.APY.netApy - a.APY.netApy);
       const targetAmounts = {};
       let remainingAssets = totalAssets;
+      logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
       let isAnyPoolOverMaxWeight = false;
       for (const pool of sortedPools) {
-        const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.9);
+        const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.98);
         const targetAmount = remainingAssets.gte(maxAmount) ? maxAmount : remainingAssets;
+        logger.verbose(`Target amount: ${targetAmount.toString()}`);
+        logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
+        logger.verbose(`Max amount: ${maxAmount.toString()}`);
+        logger.verbose(`pool.max_weight: ${pool.max_weight}`);
         targetAmounts[pool.pool_id.address.toString()] = targetAmount;
         remainingAssets = remainingAssets.minus(targetAmount.toString());
         if (pool.current_weight > pool.max_weight) {
@@ -38804,11 +38818,15 @@ var strkfarm_risk_engine = (() => {
           isDeposit: change.gt(0)
         };
       });
+      logger.verbose(`Changes: ${JSON.stringify(changes)}`);
       const sumChanges = changes.reduce((sum, c) => sum.plus(c.changeAmt.toString()), Web3Number.fromWei("0", this.decimals()));
       const sumFinal = changes.reduce((sum, c) => sum.plus(c.finalAmt.toString()), Web3Number.fromWei("0", this.decimals()));
       const hasChanges = changes.some((c) => !c.changeAmt.eq(0));
       if (!sumChanges.eq(0)) throw new Error("Sum of changes must be zero");
-      if (!sumFinal.eq(totalAssets)) throw new Error("Sum of final amounts must equal total assets");
+      logger.verbose(`Sum of changes: ${sumChanges.toString()}`);
+      logger.verbose(`Sum of final: ${sumFinal.toString()}`);
+      logger.verbose(`Total assets: ${totalAssets.toString()}`);
+      if (!sumFinal.eq(totalAssets.toString())) throw new Error("Sum of final amounts must equal total assets");
       if (!hasChanges) throw new Error("No changes required");
       const finalPools = pools.map((p) => {
         const target = targetAmounts[p.pool_id.address.toString()] || Web3Number.fromWei("0", this.decimals());
@@ -38832,13 +38850,12 @@ var strkfarm_risk_engine = (() => {
     async getRebalanceCall(pools, isOverWeightAdjustment) {
       const actions = [];
       pools.sort((a, b) => b.isDeposit ? -1 : 1);
-      console.log("pools", pools);
       pools.forEach((p) => {
         if (p.changeAmt.eq(0)) return null;
         actions.push({
           pool_id: p.pool_id.address,
           feature: new CairoCustomEnum(p.isDeposit ? { DEPOSIT: {} } : { WITHDRAW: {} }),
-          token: this.asset().address,
+          token: this.asset().address.address,
           amount: uint256_exports.bnToUint256(p.changeAmt.multipliedBy(p.isDeposit ? 1 : -1).toWei())
         });
       });
@@ -38849,7 +38866,7 @@ var strkfarm_risk_engine = (() => {
       return this.contract.populate("rebalance", [actions]);
     }
     async getInvestmentFlows(pools) {
-      const netYield = this.netAPYGivenPools(pools);
+      const netYield = await this.netAPYGivenPools(pools);
       const baseFlow = {
         title: "Your Deposit",
         subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],

package/dist/index.browser.mjs

@@ -15,26 +15,26 @@ var _Web3Number = class extends BigNumber {
     return this.mul(10 ** this.decimals).toFixed(0);
   }
   multipliedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.mul(_value).toString(), this.decimals);
   }
   dividedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.div(_value).toString(), this.decimals);
   }
   plus(value) {
-    const _value = Number(value).toFixed(13);
+    const _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.add(_value).toString(), this.decimals);
   }
   minus(n, base) {
-    const _value = Number(n).toFixed(13);
+    const _value = Number(n).toFixed(this.maxToFixedDecimals());
     return this.construct(super.minus(_value, base).toString(), this.decimals);
   }
   construct(value, decimals) {
     return new this.constructor(value, decimals);
   }
-  toString(base) {
-    return super.toString(base);
+  toString(decimals = this.maxToFixedDecimals()) {
+    return super.toFixed(decimals);
   }
   toJSON() {
     return this.toString();
@@ -42,6 +42,9 @@ var _Web3Number = class extends BigNumber {
   valueOf() {
     return this.toString();
   }
+  maxToFixedDecimals() {
+    return Math.min(this.decimals, 13);
+  }
 };
 BigNumber.config({ DECIMAL_PLACES: 18 });
 _Web3Number.config({ DECIMAL_PLACES: 18 });
@@ -3710,7 +3713,9 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     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) => d.id == num2.getDecimalString(p.pool_id.address));
+      const pool = pools.find((d) => {
+        return d.id == num2.getDecimalString(p.pool_id.address.toString());
+      });
       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);
@@ -3758,11 +3763,13 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
    * Calculates the weighted average APY across all pools based on USD value.
    * @returns {Promise<number>} The weighted average APY across all pools
    */
-  netAPYGivenPools(pools) {
-    const weightedApy = pools.reduce((acc, curr) => {
+  async netAPYGivenPools(pools) {
+    const weightedApyNumerator = pools.reduce((acc, curr) => {
       const weight = curr.current_weight;
-      return acc + curr.APY.netApy * weight;
+      return acc + curr.APY.netApy * Number(curr.amount.toString());
     }, 0);
+    const totalAssets = (await this.getTVL()).amount;
+    const weightedApy = weightedApyNumerator / Number(totalAssets.toString());
     return weightedApy * (1 - this.metadata.additionalInfo.feeBps / 1e4);
   }
   /**
@@ -3791,14 +3798,21 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       finalPools: []
     };
     const sumPools = pools.reduce((acc, curr) => acc.plus(curr.amount.toString()), Web3Number.fromWei("0", this.decimals()));
-    assert(sumPools.lte(totalAssets), "Sum of pools.amount must be less than or equal to totalAssets");
+    logger.verbose(`Sum of pools: ${sumPools.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    assert(sumPools.lte(totalAssets.multipliedBy(1.00001).toString()), "Sum of pools.amount must be less than or equal to totalAssets");
     const sortedPools = [...pools].sort((a, b) => b.APY.netApy - a.APY.netApy);
     const targetAmounts = {};
     let remainingAssets = totalAssets;
+    logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
     let isAnyPoolOverMaxWeight = false;
     for (const pool of sortedPools) {
-      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.9);
+      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.98);
       const targetAmount = remainingAssets.gte(maxAmount) ? maxAmount : remainingAssets;
+      logger.verbose(`Target amount: ${targetAmount.toString()}`);
+      logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
+      logger.verbose(`Max amount: ${maxAmount.toString()}`);
+      logger.verbose(`pool.max_weight: ${pool.max_weight}`);
       targetAmounts[pool.pool_id.address.toString()] = targetAmount;
       remainingAssets = remainingAssets.minus(targetAmount.toString());
       if (pool.current_weight > pool.max_weight) {
@@ -3816,11 +3830,15 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
         isDeposit: change.gt(0)
       };
     });
+    logger.verbose(`Changes: ${JSON.stringify(changes)}`);
     const sumChanges = changes.reduce((sum, c) => sum.plus(c.changeAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const sumFinal = changes.reduce((sum, c) => sum.plus(c.finalAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const hasChanges = changes.some((c) => !c.changeAmt.eq(0));
     if (!sumChanges.eq(0)) throw new Error("Sum of changes must be zero");
-    if (!sumFinal.eq(totalAssets)) throw new Error("Sum of final amounts must equal total assets");
+    logger.verbose(`Sum of changes: ${sumChanges.toString()}`);
+    logger.verbose(`Sum of final: ${sumFinal.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    if (!sumFinal.eq(totalAssets.toString())) throw new Error("Sum of final amounts must equal total assets");
     if (!hasChanges) throw new Error("No changes required");
     const finalPools = pools.map((p) => {
       const target = targetAmounts[p.pool_id.address.toString()] || Web3Number.fromWei("0", this.decimals());
@@ -3844,13 +3862,12 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
   async getRebalanceCall(pools, isOverWeightAdjustment) {
     const actions = [];
     pools.sort((a, b) => b.isDeposit ? -1 : 1);
-    console.log("pools", pools);
     pools.forEach((p) => {
       if (p.changeAmt.eq(0)) return null;
       actions.push({
         pool_id: p.pool_id.address,
         feature: new CairoCustomEnum(p.isDeposit ? { DEPOSIT: {} } : { WITHDRAW: {} }),
-        token: this.asset().address,
+        token: this.asset().address.address,
         amount: uint2563.bnToUint256(p.changeAmt.multipliedBy(p.isDeposit ? 1 : -1).toWei())
       });
     });
@@ -3861,7 +3878,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     return this.contract.populate("rebalance", [actions]);
   }
   async getInvestmentFlows(pools) {
-    const netYield = this.netAPYGivenPools(pools);
+    const netYield = await this.netAPYGivenPools(pools);
     const baseFlow = {
       title: "Your Deposit",
       subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],

package/dist/index.d.ts

@@ -14,9 +14,10 @@ declare class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
     plus(value: string | number | T): T;
     minus(n: number | string | T, base?: number): T;
     protected construct(value: string | number, decimals: number): T;
-    toString(base?: number | undefined): string;
+    toString(decimals?: number | undefined): string;
     toJSON(): string;
     valueOf(): string;
+    private maxToFixedDecimals;
 }
 
 declare class Web3Number extends _Web3Number<Web3Number> {
@@ -530,7 +531,7 @@ declare class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAm
      * Calculates the weighted average APY across all pools based on USD value.
      * @returns {Promise<number>} The weighted average APY across all pools
      */
-    netAPYGivenPools(pools: PoolInfoFull[]): number;
+    netAPYGivenPools(pools: PoolInfoFull[]): Promise<number>;
     /**
      * Calculates optimal position changes to maximize APY while respecting max weights.
      * The algorithm:

package/dist/index.js

@@ -86,26 +86,26 @@ var _Web3Number = class extends import_bignumber.default {
     return this.mul(10 ** this.decimals).toFixed(0);
   }
   multipliedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.mul(_value).toString(), this.decimals);
   }
   dividedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.div(_value).toString(), this.decimals);
   }
   plus(value) {
-    const _value = Number(value).toFixed(13);
+    const _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.add(_value).toString(), this.decimals);
   }
   minus(n, base) {
-    const _value = Number(n).toFixed(13);
+    const _value = Number(n).toFixed(this.maxToFixedDecimals());
     return this.construct(super.minus(_value, base).toString(), this.decimals);
   }
   construct(value, decimals) {
     return new this.constructor(value, decimals);
   }
-  toString(base) {
-    return super.toString(base);
+  toString(decimals = this.maxToFixedDecimals()) {
+    return super.toFixed(decimals);
   }
   toJSON() {
     return this.toString();
@@ -113,6 +113,9 @@ var _Web3Number = class extends import_bignumber.default {
   valueOf() {
     return this.toString();
   }
+  maxToFixedDecimals() {
+    return Math.min(this.decimals, 13);
+  }
 };
 import_bignumber.default.config({ DECIMAL_PLACES: 18 });
 _Web3Number.config({ DECIMAL_PLACES: 18 });
@@ -3798,7 +3801,9 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     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) => d.id == import_starknet7.num.getDecimalString(p.pool_id.address));
+      const pool = pools.find((d) => {
+        return d.id == import_starknet7.num.getDecimalString(p.pool_id.address.toString());
+      });
       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);
@@ -3846,11 +3851,13 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
    * Calculates the weighted average APY across all pools based on USD value.
    * @returns {Promise<number>} The weighted average APY across all pools
    */
-  netAPYGivenPools(pools) {
-    const weightedApy = pools.reduce((acc, curr) => {
+  async netAPYGivenPools(pools) {
+    const weightedApyNumerator = pools.reduce((acc, curr) => {
       const weight = curr.current_weight;
-      return acc + curr.APY.netApy * weight;
+      return acc + curr.APY.netApy * Number(curr.amount.toString());
     }, 0);
+    const totalAssets = (await this.getTVL()).amount;
+    const weightedApy = weightedApyNumerator / Number(totalAssets.toString());
     return weightedApy * (1 - this.metadata.additionalInfo.feeBps / 1e4);
   }
   /**
@@ -3879,14 +3886,21 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       finalPools: []
     };
     const sumPools = pools.reduce((acc, curr) => acc.plus(curr.amount.toString()), Web3Number.fromWei("0", this.decimals()));
-    assert(sumPools.lte(totalAssets), "Sum of pools.amount must be less than or equal to totalAssets");
+    logger.verbose(`Sum of pools: ${sumPools.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    assert(sumPools.lte(totalAssets.multipliedBy(1.00001).toString()), "Sum of pools.amount must be less than or equal to totalAssets");
     const sortedPools = [...pools].sort((a, b) => b.APY.netApy - a.APY.netApy);
     const targetAmounts = {};
     let remainingAssets = totalAssets;
+    logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
     let isAnyPoolOverMaxWeight = false;
     for (const pool of sortedPools) {
-      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.9);
+      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.98);
       const targetAmount = remainingAssets.gte(maxAmount) ? maxAmount : remainingAssets;
+      logger.verbose(`Target amount: ${targetAmount.toString()}`);
+      logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
+      logger.verbose(`Max amount: ${maxAmount.toString()}`);
+      logger.verbose(`pool.max_weight: ${pool.max_weight}`);
       targetAmounts[pool.pool_id.address.toString()] = targetAmount;
       remainingAssets = remainingAssets.minus(targetAmount.toString());
       if (pool.current_weight > pool.max_weight) {
@@ -3904,11 +3918,15 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
         isDeposit: change.gt(0)
       };
     });
+    logger.verbose(`Changes: ${JSON.stringify(changes)}`);
     const sumChanges = changes.reduce((sum, c) => sum.plus(c.changeAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const sumFinal = changes.reduce((sum, c) => sum.plus(c.finalAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const hasChanges = changes.some((c) => !c.changeAmt.eq(0));
     if (!sumChanges.eq(0)) throw new Error("Sum of changes must be zero");
-    if (!sumFinal.eq(totalAssets)) throw new Error("Sum of final amounts must equal total assets");
+    logger.verbose(`Sum of changes: ${sumChanges.toString()}`);
+    logger.verbose(`Sum of final: ${sumFinal.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    if (!sumFinal.eq(totalAssets.toString())) throw new Error("Sum of final amounts must equal total assets");
     if (!hasChanges) throw new Error("No changes required");
     const finalPools = pools.map((p) => {
       const target = targetAmounts[p.pool_id.address.toString()] || Web3Number.fromWei("0", this.decimals());
@@ -3932,13 +3950,12 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
   async getRebalanceCall(pools, isOverWeightAdjustment) {
     const actions = [];
     pools.sort((a, b) => b.isDeposit ? -1 : 1);
-    console.log("pools", pools);
     pools.forEach((p) => {
       if (p.changeAmt.eq(0)) return null;
       actions.push({
         pool_id: p.pool_id.address,
         feature: new import_starknet7.CairoCustomEnum(p.isDeposit ? { DEPOSIT: {} } : { WITHDRAW: {} }),
-        token: this.asset().address,
+        token: this.asset().address.address,
         amount: import_starknet7.uint256.bnToUint256(p.changeAmt.multipliedBy(p.isDeposit ? 1 : -1).toWei())
       });
     });
@@ -3949,7 +3966,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     return this.contract.populate("rebalance", [actions]);
   }
   async getInvestmentFlows(pools) {
-    const netYield = this.netAPYGivenPools(pools);
+    const netYield = await this.netAPYGivenPools(pools);
     const baseFlow = {
       title: "Your Deposit",
       subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],

package/dist/index.mjs

@@ -18,26 +18,26 @@ var _Web3Number = class extends BigNumber {
     return this.mul(10 ** this.decimals).toFixed(0);
   }
   multipliedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.mul(_value).toString(), this.decimals);
   }
   dividedBy(value) {
-    let _value = Number(value).toFixed(13);
+    let _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.div(_value).toString(), this.decimals);
   }
   plus(value) {
-    const _value = Number(value).toFixed(13);
+    const _value = Number(value).toFixed(this.maxToFixedDecimals());
     return this.construct(this.add(_value).toString(), this.decimals);
   }
   minus(n, base) {
-    const _value = Number(n).toFixed(13);
+    const _value = Number(n).toFixed(this.maxToFixedDecimals());
     return this.construct(super.minus(_value, base).toString(), this.decimals);
   }
   construct(value, decimals) {
     return new this.constructor(value, decimals);
   }
-  toString(base) {
-    return super.toString(base);
+  toString(decimals = this.maxToFixedDecimals()) {
+    return super.toFixed(decimals);
   }
   toJSON() {
     return this.toString();
@@ -45,6 +45,9 @@ var _Web3Number = class extends BigNumber {
   valueOf() {
     return this.toString();
   }
+  maxToFixedDecimals() {
+    return Math.min(this.decimals, 13);
+  }
 };
 BigNumber.config({ DECIMAL_PLACES: 18 });
 _Web3Number.config({ DECIMAL_PLACES: 18 });
@@ -3730,7 +3733,9 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     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) => d.id == num2.getDecimalString(p.pool_id.address));
+      const pool = pools.find((d) => {
+        return d.id == num2.getDecimalString(p.pool_id.address.toString());
+      });
       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);
@@ -3778,11 +3783,13 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
    * Calculates the weighted average APY across all pools based on USD value.
    * @returns {Promise<number>} The weighted average APY across all pools
    */
-  netAPYGivenPools(pools) {
-    const weightedApy = pools.reduce((acc, curr) => {
+  async netAPYGivenPools(pools) {
+    const weightedApyNumerator = pools.reduce((acc, curr) => {
       const weight = curr.current_weight;
-      return acc + curr.APY.netApy * weight;
+      return acc + curr.APY.netApy * Number(curr.amount.toString());
     }, 0);
+    const totalAssets = (await this.getTVL()).amount;
+    const weightedApy = weightedApyNumerator / Number(totalAssets.toString());
     return weightedApy * (1 - this.metadata.additionalInfo.feeBps / 1e4);
   }
   /**
@@ -3811,14 +3818,21 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
       finalPools: []
     };
     const sumPools = pools.reduce((acc, curr) => acc.plus(curr.amount.toString()), Web3Number.fromWei("0", this.decimals()));
-    assert(sumPools.lte(totalAssets), "Sum of pools.amount must be less than or equal to totalAssets");
+    logger.verbose(`Sum of pools: ${sumPools.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    assert(sumPools.lte(totalAssets.multipliedBy(1.00001).toString()), "Sum of pools.amount must be less than or equal to totalAssets");
     const sortedPools = [...pools].sort((a, b) => b.APY.netApy - a.APY.netApy);
     const targetAmounts = {};
     let remainingAssets = totalAssets;
+    logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
     let isAnyPoolOverMaxWeight = false;
     for (const pool of sortedPools) {
-      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.9);
+      const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.98);
       const targetAmount = remainingAssets.gte(maxAmount) ? maxAmount : remainingAssets;
+      logger.verbose(`Target amount: ${targetAmount.toString()}`);
+      logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
+      logger.verbose(`Max amount: ${maxAmount.toString()}`);
+      logger.verbose(`pool.max_weight: ${pool.max_weight}`);
       targetAmounts[pool.pool_id.address.toString()] = targetAmount;
       remainingAssets = remainingAssets.minus(targetAmount.toString());
       if (pool.current_weight > pool.max_weight) {
@@ -3836,11 +3850,15 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
         isDeposit: change.gt(0)
       };
     });
+    logger.verbose(`Changes: ${JSON.stringify(changes)}`);
     const sumChanges = changes.reduce((sum, c) => sum.plus(c.changeAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const sumFinal = changes.reduce((sum, c) => sum.plus(c.finalAmt.toString()), Web3Number.fromWei("0", this.decimals()));
     const hasChanges = changes.some((c) => !c.changeAmt.eq(0));
     if (!sumChanges.eq(0)) throw new Error("Sum of changes must be zero");
-    if (!sumFinal.eq(totalAssets)) throw new Error("Sum of final amounts must equal total assets");
+    logger.verbose(`Sum of changes: ${sumChanges.toString()}`);
+    logger.verbose(`Sum of final: ${sumFinal.toString()}`);
+    logger.verbose(`Total assets: ${totalAssets.toString()}`);
+    if (!sumFinal.eq(totalAssets.toString())) throw new Error("Sum of final amounts must equal total assets");
     if (!hasChanges) throw new Error("No changes required");
     const finalPools = pools.map((p) => {
       const target = targetAmounts[p.pool_id.address.toString()] || Web3Number.fromWei("0", this.decimals());
@@ -3864,13 +3882,12 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
   async getRebalanceCall(pools, isOverWeightAdjustment) {
     const actions = [];
     pools.sort((a, b) => b.isDeposit ? -1 : 1);
-    console.log("pools", pools);
     pools.forEach((p) => {
       if (p.changeAmt.eq(0)) return null;
       actions.push({
         pool_id: p.pool_id.address,
         feature: new CairoCustomEnum(p.isDeposit ? { DEPOSIT: {} } : { WITHDRAW: {} }),
-        token: this.asset().address,
+        token: this.asset().address.address,
         amount: uint2563.bnToUint256(p.changeAmt.multipliedBy(p.isDeposit ? 1 : -1).toWei())
       });
     });
@@ -3881,7 +3898,7 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     return this.contract.populate("rebalance", [actions]);
   }
   async getInvestmentFlows(pools) {
-    const netYield = this.netAPYGivenPools(pools);
+    const netYield = await this.netAPYGivenPools(pools);
     const baseFlow = {
       title: "Your Deposit",
       subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "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",
@@ -56,6 +56,7 @@
     "browser-assert": "^1.2.1",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
+    "ethers": "^6.13.5",
     "form-data": "^4.0.2",
     "inquirer": "^10.1.2",
     "node-telegram-bot-api": "^0.66.0",

package/src/dataTypes/_bignumber.ts

@@ -13,22 +13,22 @@ export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
     }
 
     multipliedBy(value: string | number | T): T {
-        let _value = Number(value).toFixed(13);
+        let _value = Number(value).toFixed(this.maxToFixedDecimals());
         return this.construct(this.mul(_value).toString(), this.decimals);
     }
 
     dividedBy(value: string | number | T): T {
-        let _value = Number(value).toFixed(13);
+        let _value = Number(value).toFixed(this.maxToFixedDecimals());
         return this.construct(this.div(_value).toString(), this.decimals);
     }
 
     plus(value: string | number | T): T {
-        const _value = Number(value).toFixed(13);
+        const _value = Number(value).toFixed(this.maxToFixedDecimals());
         return this.construct(this.add(_value).toString(), this.decimals);
     }
 
     minus(n: number | string | T, base?: number): T {
-        const _value = Number(n).toFixed(13);
+        const _value = Number(n).toFixed(this.maxToFixedDecimals());
         return this.construct(super.minus(_value, base).toString(), this.decimals);
     }
 
@@ -36,10 +36,10 @@ export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
         return new (this.constructor as { new (value: string | number, decimals: number): T })(value, decimals);
     }
 
-    toString(base?: number | undefined): string {
-        return super.toString(base);
+    toString(decimals: number | undefined = this.maxToFixedDecimals()): string {
+        return super.toFixed(decimals);
     }
-    
+
     toJSON() {
         return this.toString();
     }
@@ -47,6 +47,10 @@ export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
     valueOf() {
         return this.toString();
     }
+
+    private maxToFixedDecimals() {
+        return Math.min(this.decimals, 13);
+    }
 }
 
 BigNumber.config({ DECIMAL_PLACES: 18 })

package/src/strategies/vesu-rebalance.ts

@@ -3,7 +3,7 @@ import { FlowChartColors, getNoRiskTags, IConfig, IInvestmentFlow, IProtocol, IS
 import { Pricer } from "@/modules";
 import { CairoCustomEnum, Contract, num, uint256 } from "starknet";
 import VesuRebalanceAbi from '@/data/vesu-rebalance.abi.json';
-import { Global } from "@/global";
+import { Global, logger } from "@/global";
 import { assert } from "@/utils";
 import axios from "axios";
 import { PricerBase } from "@/modules/pricerBase";
@@ -264,7 +264,9 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
 
         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) => d.id == num.getDecimalString(p.pool_id.address));
+            const pool = pools.find((d: any) => {
+                return d.id == num.getDecimalString(p.pool_id.address.toString());
+            });
             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);
@@ -314,12 +316,13 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
      * Calculates the weighted average APY across all pools based on USD value.
      * @returns {Promise<number>} The weighted average APY across all pools
      */
-    netAPYGivenPools(pools: PoolInfoFull[]): number {
-        const weightedApy = pools.reduce((acc: number, curr) => {
+    async netAPYGivenPools(pools: PoolInfoFull[]): Promise<number> {
+        const weightedApyNumerator = pools.reduce((acc: number, curr) => {
             const weight = curr.current_weight;
-            return acc + (curr.APY.netApy * weight);
+            return acc + (curr.APY.netApy * Number(curr.amount.toString()));
         }, 0);
-        
+        const totalAssets = (await this.getTVL()).amount;
+        const weightedApy = weightedApyNumerator / Number(totalAssets.toString());
         return weightedApy * (1 - (this.metadata.additionalInfo.feeBps / 10000));
     }
 
@@ -351,18 +354,25 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
 
         // assert sum of pools.amount <= totalAssets
         const sumPools = pools.reduce((acc, curr) => acc.plus(curr.amount.toString()), Web3Number.fromWei("0", this.decimals()));
-        assert(sumPools.lte(totalAssets), 'Sum of pools.amount must be less than or equal to totalAssets'); 
+        logger.verbose(`Sum of pools: ${sumPools.toString()}`);
+        logger.verbose(`Total assets: ${totalAssets.toString()}`);
+        assert(sumPools.lte(totalAssets.multipliedBy(1.00001).toString()), 'Sum of pools.amount must be less than or equal to totalAssets'); 
         
         // Sort pools by APY and calculate target amounts
         const sortedPools = [...pools].sort((a, b) => b.APY.netApy - a.APY.netApy);
         const targetAmounts: Record<string, Web3Number> = {};
         let remainingAssets = totalAssets;
+        logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
 
         // First pass: Allocate to high APY pools up to their max weight
         let isAnyPoolOverMaxWeight = false;
         for (const pool of sortedPools) {
-            const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.9); // 10% tolerance
+            const maxAmount = totalAssets.multipliedBy(pool.max_weight * 0.98); // some tolerance
             const targetAmount = remainingAssets.gte(maxAmount) ? maxAmount : remainingAssets;
+            logger.verbose(`Target amount: ${targetAmount.toString()}`);
+            logger.verbose(`Remaining assets: ${remainingAssets.toString()}`);
+            logger.verbose(`Max amount: ${maxAmount.toString()}`);
+            logger.verbose(`pool.max_weight: ${pool.max_weight}`);
             targetAmounts[pool.pool_id.address.toString()] = targetAmount;
             remainingAssets = remainingAssets.minus(targetAmount.toString());
             if (pool.current_weight > pool.max_weight) {
@@ -384,13 +394,17 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
             };
         });
 
+        logger.verbose(`Changes: ${JSON.stringify(changes)}`);
         // Validate changes
         const sumChanges = changes.reduce((sum, c) => sum.plus(c.changeAmt.toString()), Web3Number.fromWei("0", this.decimals()));
         const sumFinal = changes.reduce((sum, c) => sum.plus(c.finalAmt.toString()), Web3Number.fromWei("0", this.decimals()));
         const hasChanges = changes.some(c => !c.changeAmt.eq(0));
 
         if (!sumChanges.eq(0)) throw new Error('Sum of changes must be zero');
-        if (!sumFinal.eq(totalAssets)) throw new Error('Sum of final amounts must equal total assets');
+        logger.verbose(`Sum of changes: ${sumChanges.toString()}`);
+        logger.verbose(`Sum of final: ${sumFinal.toString()}`);
+        logger.verbose(`Total assets: ${totalAssets.toString()}`);
+        if (!sumFinal.eq(totalAssets.toString())) throw new Error('Sum of final amounts must equal total assets');
         if (!hasChanges) throw new Error('No changes required');
 
         const finalPools: PoolInfoFull[] = pools.map((p) => {
@@ -420,13 +434,12 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
         const actions: any[] = [];
         // sort to put withdrawals first
         pools.sort((a, b) => b.isDeposit ? -1 : 1);
-        console.log('pools', pools);
         pools.forEach((p) => {
             if (p.changeAmt.eq(0)) return null;
             actions.push({
                 pool_id: p.pool_id.address,
                 feature: new CairoCustomEnum(p.isDeposit ? {DEPOSIT: {}} : {WITHDRAW: {}}),
-                token: this.asset().address,
+                token: this.asset().address.address,
                 amount: uint256.bnToUint256(p.changeAmt.multipliedBy(p.isDeposit ? 1 : -1).toWei()),
             });
         });
@@ -438,7 +451,7 @@ export class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAmo
     }
 
     async getInvestmentFlows(pools: PoolInfoFull[]) {
-        const netYield = this.netAPYGivenPools(pools);
+        const netYield = await this.netAPYGivenPools(pools);
        
         const baseFlow: IInvestmentFlow = {
             title: "Your Deposit",