@strkfarm/sdk 1.0.17 → 1.0.18

package/dist/index.browser.global.js

@@ -13943,6 +13943,7 @@ var strkfarm_risk_engine = (() => {
     AutoCompounderSTRK: () => AutoCompounderSTRK,
     ContractAddr: () => ContractAddr,
     FatalError: () => FatalError,
+    FlowChartColors: () => FlowChartColors,
     Global: () => Global,
     ILending: () => ILending,
     Initializable: () => Initializable,
@@ -33240,6 +33241,12 @@ var strkfarm_risk_engine = (() => {
     Network2["devnet"] = "devnet";
     return Network2;
   })(Network || {});
+  var FlowChartColors = /* @__PURE__ */ ((FlowChartColors2) => {
+    FlowChartColors2["Green"] = "purple";
+    FlowChartColors2["Blue"] = "#35484f";
+    FlowChartColors2["Purple"] = "#6e53dc";
+    return FlowChartColors2;
+  })(FlowChartColors || {});
   function getMainnetConfig(rpcUrl = "https://starknet-mainnet.public.blastapi.io", blockIdentifier = "pending") {
     return {
       provider: new RpcProvider2({
@@ -34944,7 +34951,7 @@ var strkfarm_risk_engine = (() => {
         const assets = await vTokenContract.convert_to_assets(uint256_exports.bnToUint256(bal.toString()));
         const item = {
           pool_id: p.pool_id,
-          pool_name: vesuPosition?.pool.name,
+          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,
@@ -35090,19 +35097,22 @@ var strkfarm_risk_engine = (() => {
     async getInvestmentFlows(pools) {
       const netYield = this.netAPYGivenPools(pools);
       const baseFlow = {
-        title: "Deposit $1000",
-        subItems: [`Net yield: ${(netYield * 100).toFixed(2)}%`],
-        linkedFlows: []
+        title: "Your Deposit",
+        subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],
+        linkedFlows: [],
+        style: { backgroundColor: "#6e53dc" /* Purple */.valueOf() }
       };
-      pools.forEach((p) => {
-        if (p.amount.eq(0)) return;
+      let _pools = [...pools];
+      _pools = _pools.sort((a, b) => Number(b.amount.toString()) - Number(a.amount.toString()));
+      _pools.forEach((p) => {
         const flow = {
-          title: `${p.pool_name} - $${(p.current_weight * 1e3).toFixed(2)}`,
+          title: `Pool name: ${p.pool_name}`,
           subItems: [
-            `APY: ${(p.APY.netApy * 100).toFixed(2)}%`,
-            `Weight: ${(p.current_weight * 100).toFixed(2)}% / ${(p.max_weight * 100).toFixed(2)}%`
+            { key: `APY`, value: `${(p.APY.netApy * 100).toFixed(2)}%` },
+            { key: "Weight", value: `${(p.current_weight * 100).toFixed(2)} / ${(p.max_weight * 100).toFixed(2)}%` }
           ],
-          linkedFlows: []
+          linkedFlows: [],
+          style: p.amount.greaterThan(0) ? { backgroundColor: "#35484f" /* Blue */.valueOf() } : { color: "gray" }
         };
         baseFlow.linkedFlows.push(flow);
       });

package/dist/index.browser.mjs

@@ -666,6 +666,12 @@ var Network = /* @__PURE__ */ ((Network2) => {
   Network2["devnet"] = "devnet";
   return Network2;
 })(Network || {});
+var FlowChartColors = /* @__PURE__ */ ((FlowChartColors2) => {
+  FlowChartColors2["Green"] = "purple";
+  FlowChartColors2["Blue"] = "#35484f";
+  FlowChartColors2["Purple"] = "#6e53dc";
+  return FlowChartColors2;
+})(FlowChartColors || {});
 function getMainnetConfig(rpcUrl = "https://starknet-mainnet.public.blastapi.io", blockIdentifier = "pending") {
   return {
     provider: new RpcProvider2({
@@ -2375,7 +2381,7 @@ var VesuRebalance = class _VesuRebalance {
       const assets = await vTokenContract.convert_to_assets(uint2562.bnToUint256(bal.toString()));
       const item = {
         pool_id: p.pool_id,
-        pool_name: vesuPosition?.pool.name,
+        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,
@@ -2521,19 +2527,22 @@ var VesuRebalance = class _VesuRebalance {
   async getInvestmentFlows(pools) {
     const netYield = this.netAPYGivenPools(pools);
     const baseFlow = {
-      title: "Deposit $1000",
-      subItems: [`Net yield: ${(netYield * 100).toFixed(2)}%`],
-      linkedFlows: []
+      title: "Your Deposit",
+      subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],
+      linkedFlows: [],
+      style: { backgroundColor: "#6e53dc" /* Purple */.valueOf() }
     };
-    pools.forEach((p) => {
-      if (p.amount.eq(0)) return;
+    let _pools = [...pools];
+    _pools = _pools.sort((a, b) => Number(b.amount.toString()) - Number(a.amount.toString()));
+    _pools.forEach((p) => {
       const flow = {
-        title: `${p.pool_name} - $${(p.current_weight * 1e3).toFixed(2)}`,
+        title: `Pool name: ${p.pool_name}`,
         subItems: [
-          `APY: ${(p.APY.netApy * 100).toFixed(2)}%`,
-          `Weight: ${(p.current_weight * 100).toFixed(2)}% / ${(p.max_weight * 100).toFixed(2)}%`
+          { key: `APY`, value: `${(p.APY.netApy * 100).toFixed(2)}%` },
+          { key: "Weight", value: `${(p.current_weight * 100).toFixed(2)} / ${(p.max_weight * 100).toFixed(2)}%` }
         ],
-        linkedFlows: []
+        linkedFlows: [],
+        style: p.amount.greaterThan(0) ? { backgroundColor: "#35484f" /* Blue */.valueOf() } : { color: "gray" }
       };
       baseFlow.linkedFlows.push(flow);
     });
@@ -2564,6 +2573,7 @@ export {
   AutoCompounderSTRK,
   ContractAddr,
   FatalError,
+  FlowChartColors,
   Global,
   ILending,
   Initializable,

package/dist/index.d.ts

@@ -66,6 +66,11 @@ interface IProtocol {
     name: string;
     logo: string;
 }
+declare enum FlowChartColors {
+    Green = "purple",
+    Blue = "#35484f",
+    Purple = "#6e53dc"
+}
 /**
  * @property risk.riskFactor.factor - The risk factors that are considered for the strategy.
  * @property risk.riskFactor.factor - The value of the risk factor from 0 to 10, 0 being the lowest and 10 being the highest.
@@ -86,8 +91,12 @@ interface IStrategyMetadata {
 }
 interface IInvestmentFlow {
     title: string;
-    subItems: string[];
+    subItems: {
+        key: string;
+        value: string;
+    }[];
     linkedFlows: IInvestmentFlow[];
+    style?: any;
 }
 declare function getMainnetConfig(rpcUrl?: string, blockIdentifier?: BlockIdentifier): IConfig;
 
@@ -594,4 +603,4 @@ declare class PasswordJsonCryptoUtil {
     decrypt(encryptedData: string, password: string): any;
 }
 
-export { type AccountInfo, type AllAccountsStore, AutoCompounderSTRK, ContractAddr, FatalError, Global, type IConfig, type IInvestmentFlow, ILending, type ILendingMetadata, type ILendingPosition, type IProtocol, type IStrategyMetadata, Initializable, type LendingToken, MarginType, Network, PasswordJsonCryptoUtil, Pragma, type PriceInfo, Pricer, PricerFromApi, PricerRedis, type RequiredFields, type RequiredKeys, type RequiredStoreConfig, type RiskFactor, RiskType, Store, type StoreConfig, TelegramNotif, type TokenInfo, VesuRebalance, VesuRebalanceStrategies, Web3Number, ZkLend, assert, getDefaultStoreConfig, getMainnetConfig, logger };
+export { type AccountInfo, type AllAccountsStore, AutoCompounderSTRK, ContractAddr, FatalError, FlowChartColors, Global, type IConfig, type IInvestmentFlow, ILending, type ILendingMetadata, type ILendingPosition, type IProtocol, type IStrategyMetadata, Initializable, type LendingToken, MarginType, Network, PasswordJsonCryptoUtil, Pragma, type PriceInfo, Pricer, PricerFromApi, PricerRedis, type RequiredFields, type RequiredKeys, type RequiredStoreConfig, type RiskFactor, RiskType, Store, type StoreConfig, TelegramNotif, type TokenInfo, VesuRebalance, VesuRebalanceStrategies, Web3Number, ZkLend, assert, getDefaultStoreConfig, getMainnetConfig, logger };

package/dist/index.js

@@ -33,6 +33,7 @@ __export(src_exports, {
   AutoCompounderSTRK: () => AutoCompounderSTRK,
   ContractAddr: () => ContractAddr,
   FatalError: () => FatalError,
+  FlowChartColors: () => FlowChartColors,
   Global: () => Global,
   ILending: () => ILending,
   Initializable: () => Initializable,
@@ -725,6 +726,12 @@ var Network = /* @__PURE__ */ ((Network2) => {
   Network2["devnet"] = "devnet";
   return Network2;
 })(Network || {});
+var FlowChartColors = /* @__PURE__ */ ((FlowChartColors2) => {
+  FlowChartColors2["Green"] = "purple";
+  FlowChartColors2["Blue"] = "#35484f";
+  FlowChartColors2["Purple"] = "#6e53dc";
+  return FlowChartColors2;
+})(FlowChartColors || {});
 function getMainnetConfig(rpcUrl = "https://starknet-mainnet.public.blastapi.io", blockIdentifier = "pending") {
   return {
     provider: new import_starknet3.RpcProvider({
@@ -2434,7 +2441,7 @@ var VesuRebalance = class _VesuRebalance {
       const assets = await vTokenContract.convert_to_assets(import_starknet5.uint256.bnToUint256(bal.toString()));
       const item = {
         pool_id: p.pool_id,
-        pool_name: vesuPosition?.pool.name,
+        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,
@@ -2580,19 +2587,22 @@ var VesuRebalance = class _VesuRebalance {
   async getInvestmentFlows(pools) {
     const netYield = this.netAPYGivenPools(pools);
     const baseFlow = {
-      title: "Deposit $1000",
-      subItems: [`Net yield: ${(netYield * 100).toFixed(2)}%`],
-      linkedFlows: []
+      title: "Your Deposit",
+      subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],
+      linkedFlows: [],
+      style: { backgroundColor: "#6e53dc" /* Purple */.valueOf() }
     };
-    pools.forEach((p) => {
-      if (p.amount.eq(0)) return;
+    let _pools = [...pools];
+    _pools = _pools.sort((a, b) => Number(b.amount.toString()) - Number(a.amount.toString()));
+    _pools.forEach((p) => {
       const flow = {
-        title: `${p.pool_name} - $${(p.current_weight * 1e3).toFixed(2)}`,
+        title: `Pool name: ${p.pool_name}`,
         subItems: [
-          `APY: ${(p.APY.netApy * 100).toFixed(2)}%`,
-          `Weight: ${(p.current_weight * 100).toFixed(2)}% / ${(p.max_weight * 100).toFixed(2)}%`
+          { key: `APY`, value: `${(p.APY.netApy * 100).toFixed(2)}%` },
+          { key: "Weight", value: `${(p.current_weight * 100).toFixed(2)} / ${(p.max_weight * 100).toFixed(2)}%` }
         ],
-        linkedFlows: []
+        linkedFlows: [],
+        style: p.amount.greaterThan(0) ? { backgroundColor: "#35484f" /* Blue */.valueOf() } : { color: "gray" }
       };
       baseFlow.linkedFlows.push(flow);
     });
@@ -2886,6 +2896,7 @@ var Store = class _Store {
   AutoCompounderSTRK,
   ContractAddr,
   FatalError,
+  FlowChartColors,
   Global,
   ILending,
   Initializable,

package/dist/index.mjs

@@ -666,6 +666,12 @@ var Network = /* @__PURE__ */ ((Network2) => {
   Network2["devnet"] = "devnet";
   return Network2;
 })(Network || {});
+var FlowChartColors = /* @__PURE__ */ ((FlowChartColors2) => {
+  FlowChartColors2["Green"] = "purple";
+  FlowChartColors2["Blue"] = "#35484f";
+  FlowChartColors2["Purple"] = "#6e53dc";
+  return FlowChartColors2;
+})(FlowChartColors || {});
 function getMainnetConfig(rpcUrl = "https://starknet-mainnet.public.blastapi.io", blockIdentifier = "pending") {
   return {
     provider: new RpcProvider2({
@@ -2375,7 +2381,7 @@ var VesuRebalance = class _VesuRebalance {
       const assets = await vTokenContract.convert_to_assets(uint2562.bnToUint256(bal.toString()));
       const item = {
         pool_id: p.pool_id,
-        pool_name: vesuPosition?.pool.name,
+        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,
@@ -2521,19 +2527,22 @@ var VesuRebalance = class _VesuRebalance {
   async getInvestmentFlows(pools) {
     const netYield = this.netAPYGivenPools(pools);
     const baseFlow = {
-      title: "Deposit $1000",
-      subItems: [`Net yield: ${(netYield * 100).toFixed(2)}%`],
-      linkedFlows: []
+      title: "Your Deposit",
+      subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }],
+      linkedFlows: [],
+      style: { backgroundColor: "#6e53dc" /* Purple */.valueOf() }
     };
-    pools.forEach((p) => {
-      if (p.amount.eq(0)) return;
+    let _pools = [...pools];
+    _pools = _pools.sort((a, b) => Number(b.amount.toString()) - Number(a.amount.toString()));
+    _pools.forEach((p) => {
       const flow = {
-        title: `${p.pool_name} - $${(p.current_weight * 1e3).toFixed(2)}`,
+        title: `Pool name: ${p.pool_name}`,
         subItems: [
-          `APY: ${(p.APY.netApy * 100).toFixed(2)}%`,
-          `Weight: ${(p.current_weight * 100).toFixed(2)}% / ${(p.max_weight * 100).toFixed(2)}%`
+          { key: `APY`, value: `${(p.APY.netApy * 100).toFixed(2)}%` },
+          { key: "Weight", value: `${(p.current_weight * 100).toFixed(2)} / ${(p.max_weight * 100).toFixed(2)}%` }
         ],
-        linkedFlows: []
+        linkedFlows: [],
+        style: p.amount.greaterThan(0) ? { backgroundColor: "#35484f" /* Blue */.valueOf() } : { color: "gray" }
       };
       baseFlow.linkedFlows.push(flow);
     });
@@ -2826,6 +2835,7 @@ export {
   AutoCompounderSTRK,
   ContractAddr,
   FatalError,
+  FlowChartColors,
   Global,
   ILending,
   Initializable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "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",
@@ -55,6 +55,7 @@
     "browser-assert": "^1.2.1",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
+    "form-data": "^4.0.2",
     "inquirer": "^10.1.2",
     "node-telegram-bot-api": "^0.66.0",
     "proxy-from-env": "^1.1.0",

package/src/interfaces/common.ts

@@ -43,6 +43,12 @@ export interface IProtocol {
     logo: string,
 }
 
+export enum FlowChartColors {
+    Green = 'purple',
+    Blue = '#35484f',
+    Purple = '#6e53dc',
+}
+
 /**
  * @property risk.riskFactor.factor - The risk factors that are considered for the strategy.
  * @property risk.riskFactor.factor - The value of the risk factor from 0 to 10, 0 being the lowest and 10 being the highest.
@@ -64,8 +70,9 @@ export interface IStrategyMetadata {
 
 export interface IInvestmentFlow {
     title: string,
-    subItems: string[],
+    subItems: {key: string, value: string}[],
     linkedFlows: IInvestmentFlow[],
+    style?: any
 }
 
 export function getMainnetConfig(rpcUrl = "https://starknet-mainnet.public.blastapi.io", blockIdentifier: BlockIdentifier = 'pending'): IConfig {

package/src/strategies/vesu-rebalance.ts

@@ -1,5 +1,5 @@
 import { ContractAddr, Web3Number } from "@/dataTypes";
-import { IConfig, IInvestmentFlow, IProtocol, IStrategyMetadata, RiskFactor, RiskType } from "@/interfaces";
+import { FlowChartColors, IConfig, IInvestmentFlow, IProtocol, IStrategyMetadata, RiskFactor, RiskType } from "@/interfaces";
 import { Pricer } from "@/modules";
 import { CairoCustomEnum, Contract, num, uint256 } from "starknet";
 import VesuRebalanceAbi from '@/data/vesu-rebalance.abi.json';
@@ -248,7 +248,7 @@ export class VesuRebalance {
             const assets = await vTokenContract.convert_to_assets(uint256.bnToUint256(bal.toString()));
             const item = {
                 pool_id: p.pool_id,
-                pool_name: vesuPosition?.pool.name,
+                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,
@@ -418,24 +418,26 @@ export class VesuRebalance {
         const netYield = this.netAPYGivenPools(pools);
        
         const baseFlow: IInvestmentFlow = {
-            title: "Deposit $1000",
-            subItems: [`Net yield: ${(netYield * 100).toFixed(2)}%`],
+            title: "Your Deposit",
+            subItems: [{key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%`}],
             linkedFlows: [],
+            style: {backgroundColor: FlowChartColors.Purple.valueOf()},
         };
 
-        pools.forEach((p) => {
-            if (p.amount.eq(0)) return;
+        let _pools = [...pools];
+        _pools = _pools.sort((a, b) => Number(b.amount.toString()) - Number(a.amount.toString()));
+        _pools.forEach((p) => {
             const flow: IInvestmentFlow = {
-                title: `${p.pool_name} - $${(p.current_weight * 1000).toFixed(2)}`,
+                title: `Pool name: ${p.pool_name}`,
                 subItems: [
-                    `APY: ${(p.APY.netApy * 100).toFixed(2)}%`,
-                    `Weight: ${(p.current_weight * 100).toFixed(2)}% / ${(p.max_weight * 100).toFixed(2)}%`,
+                    {key: `APY`, value: `${(p.APY.netApy * 100).toFixed(2)}%`},
+                    {key: 'Weight', value: `${(p.current_weight * 100).toFixed(2)} / ${(p.max_weight * 100).toFixed(2)}%`}
                 ],
                 linkedFlows: [],
+                style: p.amount.greaterThan(0) ? {backgroundColor: FlowChartColors.Blue.valueOf()} : {color: 'gray'},
             };
             baseFlow.linkedFlows.push(flow);
         });
-
         return [baseFlow];
     }
 }