@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/esm/types/enums.d.ts

@@ -56,6 +56,7 @@ export declare namespace ProtocolIdentifiers {
         CompoundV3 = "Compound__V3",
         AaveV2 = "Aave__V2",
         AaveV3 = "Aave__V3",
+        AaveV4 = "Aave__V4",
         MorphoAaveV2 = "Morpho-Aave__V2",
         Exchange = "Exchange",
         Spark = "Spark",
@@ -85,19 +86,26 @@ export declare namespace Strategies {
         LIQUITY_DSR_SUPPLY = 70,
         LIQUITY_DEBT_IN_FRONT_REPAY = 75,
         CURVEUSD_PAYBACK = 92,
-        LIQUITY_V2_PAYBACK = 113
+        LIQUITY_V2_PAYBACK = 113,
+        AAVE_V3_COLLATERAL_SWITCH = 135,
+        AAVE_V4_COLLATERAL_SWITCH = 154,
+        AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
+        SPARK_COLLATERAL_SWITCH = 156
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9
+        EXCHANGE_LIMIT_ORDER = 9,
+        AAVE_V3_COLLATERAL_SWITCH = 24
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9
+        EXCHANGE_LIMIT_ORDER = 9,
+        AAVE_V3_COLLATERAL_SWITCH = 56
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9
+        EXCHANGE_LIMIT_ORDER = 9,
+        AAVE_V3_COLLATERAL_SWITCH = 50
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -114,6 +122,7 @@ export declare namespace Strategies {
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
         CloseOnPrice = "close-on-price",
+        EoaCloseOnPrice = "eoa-close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -125,7 +134,11 @@ export declare namespace Strategies {
         OpenOrderFromCollateral = "open-order-from-collateral",
         OpenOrderFromDebt = "open-order-from-debt",
         BoostOnPrice = "boost-on-price",
-        RepayOnPrice = "repay-on-price"
+        RepayOnPrice = "repay-on-price",
+        EoaBoostOnPrice = "eoa-boost-on-price",
+        EoaRepayOnPrice = "eoa-repay-on-price",
+        CollateralSwitch = "collateral-switch",
+        EoaCollateralSwitch = "eoa-collateral-switch"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -134,7 +147,9 @@ export declare namespace Strategies {
         StopLossWithGasPrice = "stop-loss-with-gas-price",
         TrailingStop = "trailing-stop",
         LeverageManagement = "leverage-management",
-        EoaLeverageManagement = "leverage-management-eoa"
+        EoaLeverageManagement = "leverage-management-eoa",
+        LeverageManagementOnPrice = "leverage-management-on-price",
+        EoaLeverageManagementOnPrice = "leverage-management-on-price-eoa"
     }
 }
 export declare namespace Bundles {
@@ -161,8 +176,6 @@ export declare namespace Bundles {
         LIQUITY_BOOST = 17,
         SPARK_REPAY = 18,
         SPARK_BOOST = 19,
-        SPARK_CLOSE_TO_DEBT = -21231230,
-        SPARK_CLOSE_TO_COLLATERAL = -21231231,
         AAVE_V2_REPAY = 22,
         AAVE_V2_BOOST = 23,
         COMP_V2_REPAY = 20,
@@ -186,7 +199,32 @@ export declare namespace Bundles {
         LIQUITY_V2_REPAY_ON_PRICE = 42,
         LIQUITY_V2_BOOST_ON_PRICE = 43,
         FLUID_T1_REPAY = 44,
-        FLUID_T1_BOOST = 45
+        FLUID_T1_BOOST = 45,
+        COMP_V3_SW_REPAY_ON_PRICE = 46,
+        COMP_V3_SW_BOOST_ON_PRICE = 47,
+        COMP_V3_SW_CLOSE = 48,
+        COMP_V3_EOA_REPAY_ON_PRICE = 49,
+        COMP_V3_EOA_BOOST_ON_PRICE = 50,
+        COMP_V3_EOA_CLOSE = 51,
+        AAVE_V3_EOA_REPAY = 52,
+        AAVE_V3_EOA_BOOST = 53,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 54,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 55,
+        AAVE_V3_EOA_CLOSE = 56,
+        SPARK_CLOSE = 57,
+        MORPHO_BLUE_CLOSE = 58,
+        SPARK_REPAY_ON_PRICE = 59,
+        SPARK_BOOST_ON_PRICE = 60,
+        AAVE_V4_REPAY = 61,
+        AAVE_V4_BOOST = 62,
+        AAVE_V4_REPAY_ON_PRICE = 63,
+        AAVE_V4_BOOST_ON_PRICE = 64,
+        AAVE_V4_CLOSE = 65,
+        AAVE_V4_EOA_REPAY = 66,
+        AAVE_V4_EOA_BOOST = 67,
+        AAVE_V4_EOA_REPAY_ON_PRICE = 68,
+        AAVE_V4_EOA_BOOST_ON_PRICE = 69,
+        AAVE_V4_EOA_CLOSE = 70
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -194,7 +232,12 @@ export declare namespace Bundles {
         AAVE_V3_CLOSE_TO_DEBT = 2,
         AAVE_V3_CLOSE_TO_COLLATERAL = 3,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4,
-        AAVE_V3_REPAY_ON_PRICE = 5
+        AAVE_V3_REPAY_ON_PRICE = 5,
+        AAVE_V3_EOA_REPAY = 6,
+        AAVE_V3_EOA_BOOST = 7,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 8,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 9,
+        AAVE_V3_EOA_CLOSE = 10
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -209,7 +252,21 @@ export declare namespace Bundles {
         AAVE_V3_REPAY_ON_PRICE = 11,
         MORPHO_BLUE_BOOST_ON_PRICE = 12,
         FLUID_T1_REPAY = 13,
-        FLUID_T1_BOOST = 14
+        FLUID_T1_BOOST = 14,
+        COMP_V3_SW_REPAY_ON_PRICE = 15,
+        COMP_V3_SW_BOOST_ON_PRICE = 16,
+        COMP_V3_SW_CLOSE = 17,
+        COMP_V3_EOA_REPAY_ON_PRICE = 18,
+        COMP_V3_EOA_BOOST_ON_PRICE = 19,
+        COMP_V3_EOA_CLOSE = 20,
+        COMP_V3_EOA_REPAY = 21,
+        COMP_V3_EOA_BOOST = 22,
+        AAVE_V3_EOA_REPAY = 23,
+        AAVE_V3_EOA_BOOST = 24,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 25,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 26,
+        AAVE_V3_EOA_CLOSE = 27,
+        MORPHO_BLUE_CLOSE = 28
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -221,6 +278,25 @@ export declare namespace Bundles {
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6,
         AAVE_V3_REPAY_ON_PRICE = 7,
         FLUID_T1_REPAY = 8,
-        FLUID_T1_BOOST = 9
+        FLUID_T1_BOOST = 9,
+        COMP_V3_SW_REPAY_ON_PRICE = 10,
+        COMP_V3_SW_BOOST_ON_PRICE = 11,
+        COMP_V3_SW_CLOSE = 12,
+        COMP_V3_EOA_REPAY_ON_PRICE = 13,
+        COMP_V3_EOA_BOOST_ON_PRICE = 14,
+        COMP_V3_EOA_CLOSE = 15,
+        COMP_V3_EOA_REPAY = 16,
+        COMP_V3_EOA_BOOST = 17,
+        AAVE_V3_EOA_REPAY = 18,
+        AAVE_V3_EOA_BOOST = 19,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 20,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 21,
+        AAVE_V3_EOA_CLOSE = 22,
+        MORPHO_BLUE_REPAY = 23,
+        MORPHO_BLUE_BOOST = 24,
+        MORPHO_BLUE_BOOST_ON_PRICE = 25,
+        MORPHO_BLUE_EOA_REPAY = 26,
+        MORPHO_BLUE_EOA_BOOST = 27,
+        MORPHO_BLUE_CLOSE = 28
     }
 }

package/esm/types/enums.js

@@ -66,6 +66,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
         StrategiesAutomation["AaveV2"] = "Aave__V2";
         StrategiesAutomation["AaveV3"] = "Aave__V3";
+        StrategiesAutomation["AaveV4"] = "Aave__V4";
         StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
         StrategiesAutomation["Exchange"] = "Exchange";
         StrategiesAutomation["Spark"] = "Spark";
@@ -99,21 +100,28 @@ export var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
         MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_V2_PAYBACK"] = 113] = "LIQUITY_V2_PAYBACK";
+        MainnetIds[MainnetIds["AAVE_V3_COLLATERAL_SWITCH"] = 135] = "AAVE_V3_COLLATERAL_SWITCH";
+        MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH"] = 154] = "AAVE_V4_COLLATERAL_SWITCH";
+        MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
+        MainnetIds[MainnetIds["SPARK_COLLATERAL_SWITCH"] = 156] = "SPARK_COLLATERAL_SWITCH";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
         OptimismIds[OptimismIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         OptimismIds[OptimismIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
+        OptimismIds[OptimismIds["AAVE_V3_COLLATERAL_SWITCH"] = 24] = "AAVE_V3_COLLATERAL_SWITCH";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
         BaseIds[BaseIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         BaseIds[BaseIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
+        BaseIds[BaseIds["AAVE_V3_COLLATERAL_SWITCH"] = 56] = "AAVE_V3_COLLATERAL_SWITCH";
     })(BaseIds = Strategies.BaseIds || (Strategies.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
         ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_COLLATERAL_SWITCH"] = 50] = "AAVE_V3_COLLATERAL_SWITCH";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -131,6 +139,7 @@ export var Strategies;
         Identifiers["CloseOnPriceToDebt"] = "close-on-price-to-debt";
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
         Identifiers["CloseOnPrice"] = "close-on-price";
+        Identifiers["EoaCloseOnPrice"] = "eoa-close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -143,6 +152,10 @@ export var Strategies;
         Identifiers["OpenOrderFromDebt"] = "open-order-from-debt";
         Identifiers["BoostOnPrice"] = "boost-on-price";
         Identifiers["RepayOnPrice"] = "repay-on-price";
+        Identifiers["EoaBoostOnPrice"] = "eoa-boost-on-price";
+        Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
+        Identifiers["CollateralSwitch"] = "collateral-switch";
+        Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -153,6 +166,8 @@ export var Strategies;
         IdOverrides["TrailingStop"] = "trailing-stop";
         IdOverrides["LeverageManagement"] = "leverage-management";
         IdOverrides["EoaLeverageManagement"] = "leverage-management-eoa";
+        IdOverrides["LeverageManagementOnPrice"] = "leverage-management-on-price";
+        IdOverrides["EoaLeverageManagementOnPrice"] = "leverage-management-on-price-eoa";
     })(IdOverrides = Strategies.IdOverrides || (Strategies.IdOverrides = {}));
 })(Strategies || (Strategies = {}));
 export var Bundles;
@@ -181,8 +196,6 @@ export var Bundles;
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
         MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
         MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = -21231230] = "SPARK_CLOSE_TO_DEBT";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = -21231231] = "SPARK_CLOSE_TO_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V2_REPAY"] = 22] = "AAVE_V2_REPAY";
         MainnetIds[MainnetIds["AAVE_V2_BOOST"] = 23] = "AAVE_V2_BOOST";
         MainnetIds[MainnetIds["COMP_V2_REPAY"] = 20] = "COMP_V2_REPAY";
@@ -207,6 +220,31 @@ export var Bundles;
         MainnetIds[MainnetIds["LIQUITY_V2_BOOST_ON_PRICE"] = 43] = "LIQUITY_V2_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["FLUID_T1_REPAY"] = 44] = "FLUID_T1_REPAY";
         MainnetIds[MainnetIds["FLUID_T1_BOOST"] = 45] = "FLUID_T1_BOOST";
+        MainnetIds[MainnetIds["COMP_V3_SW_REPAY_ON_PRICE"] = 46] = "COMP_V3_SW_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["COMP_V3_SW_BOOST_ON_PRICE"] = 47] = "COMP_V3_SW_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["COMP_V3_SW_CLOSE"] = 48] = "COMP_V3_SW_CLOSE";
+        MainnetIds[MainnetIds["COMP_V3_EOA_REPAY_ON_PRICE"] = 49] = "COMP_V3_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["COMP_V3_EOA_BOOST_ON_PRICE"] = 50] = "COMP_V3_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["COMP_V3_EOA_CLOSE"] = 51] = "COMP_V3_EOA_CLOSE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY"] = 52] = "AAVE_V3_EOA_REPAY";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST"] = 53] = "AAVE_V3_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
+        MainnetIds[MainnetIds["SPARK_CLOSE"] = 57] = "SPARK_CLOSE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_CLOSE"] = 58] = "MORPHO_BLUE_CLOSE";
+        MainnetIds[MainnetIds["SPARK_REPAY_ON_PRICE"] = 59] = "SPARK_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["SPARK_BOOST_ON_PRICE"] = 60] = "SPARK_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_REPAY"] = 61] = "AAVE_V4_REPAY";
+        MainnetIds[MainnetIds["AAVE_V4_BOOST"] = 62] = "AAVE_V4_BOOST";
+        MainnetIds[MainnetIds["AAVE_V4_REPAY_ON_PRICE"] = 63] = "AAVE_V4_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_BOOST_ON_PRICE"] = 64] = "AAVE_V4_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_CLOSE"] = 65] = "AAVE_V4_CLOSE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY"] = 66] = "AAVE_V4_EOA_REPAY";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST"] = 67] = "AAVE_V4_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY_ON_PRICE"] = 68] = "AAVE_V4_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST_ON_PRICE"] = 69] = "AAVE_V4_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_CLOSE"] = 70] = "AAVE_V4_EOA_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -216,6 +254,11 @@ export var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 4] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_REPAY_ON_PRICE"] = 5] = "AAVE_V3_REPAY_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY"] = 6] = "AAVE_V3_EOA_REPAY";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST"] = 7] = "AAVE_V3_EOA_BOOST";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 8] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 9] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -232,6 +275,20 @@ export var Bundles;
         BaseIds[BaseIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 12] = "MORPHO_BLUE_BOOST_ON_PRICE";
         BaseIds[BaseIds["FLUID_T1_REPAY"] = 13] = "FLUID_T1_REPAY";
         BaseIds[BaseIds["FLUID_T1_BOOST"] = 14] = "FLUID_T1_BOOST";
+        BaseIds[BaseIds["COMP_V3_SW_REPAY_ON_PRICE"] = 15] = "COMP_V3_SW_REPAY_ON_PRICE";
+        BaseIds[BaseIds["COMP_V3_SW_BOOST_ON_PRICE"] = 16] = "COMP_V3_SW_BOOST_ON_PRICE";
+        BaseIds[BaseIds["COMP_V3_SW_CLOSE"] = 17] = "COMP_V3_SW_CLOSE";
+        BaseIds[BaseIds["COMP_V3_EOA_REPAY_ON_PRICE"] = 18] = "COMP_V3_EOA_REPAY_ON_PRICE";
+        BaseIds[BaseIds["COMP_V3_EOA_BOOST_ON_PRICE"] = 19] = "COMP_V3_EOA_BOOST_ON_PRICE";
+        BaseIds[BaseIds["COMP_V3_EOA_CLOSE"] = 20] = "COMP_V3_EOA_CLOSE";
+        BaseIds[BaseIds["COMP_V3_EOA_REPAY"] = 21] = "COMP_V3_EOA_REPAY";
+        BaseIds[BaseIds["COMP_V3_EOA_BOOST"] = 22] = "COMP_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY"] = 23] = "AAVE_V3_EOA_REPAY";
+        BaseIds[BaseIds["AAVE_V3_EOA_BOOST"] = 24] = "AAVE_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 25] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        BaseIds[BaseIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 26] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        BaseIds[BaseIds["AAVE_V3_EOA_CLOSE"] = 27] = "AAVE_V3_EOA_CLOSE";
+        BaseIds[BaseIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -245,5 +302,24 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["AAVE_V3_REPAY_ON_PRICE"] = 7] = "AAVE_V3_REPAY_ON_PRICE";
         ArbitrumIds[ArbitrumIds["FLUID_T1_REPAY"] = 8] = "FLUID_T1_REPAY";
         ArbitrumIds[ArbitrumIds["FLUID_T1_BOOST"] = 9] = "FLUID_T1_BOOST";
+        ArbitrumIds[ArbitrumIds["COMP_V3_SW_REPAY_ON_PRICE"] = 10] = "COMP_V3_SW_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_SW_BOOST_ON_PRICE"] = 11] = "COMP_V3_SW_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_SW_CLOSE"] = 12] = "COMP_V3_SW_CLOSE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_REPAY_ON_PRICE"] = 13] = "COMP_V3_EOA_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_BOOST_ON_PRICE"] = 14] = "COMP_V3_EOA_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_CLOSE"] = 15] = "COMP_V3_EOA_CLOSE";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_REPAY"] = 16] = "COMP_V3_EOA_REPAY";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_BOOST"] = 17] = "COMP_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY"] = 18] = "AAVE_V3_EOA_REPAY";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST"] = 19] = "AAVE_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 20] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 21] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_CLOSE"] = 22] = "AAVE_V3_EOA_CLOSE";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_REPAY"] = 23] = "MORPHO_BLUE_REPAY";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_BOOST"] = 24] = "MORPHO_BLUE_BOOST";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 25] = "MORPHO_BLUE_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY"] = 26] = "MORPHO_BLUE_EOA_REPAY";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST"] = 27] = "MORPHO_BLUE_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/esm/types/index.d.ts

@@ -120,6 +120,16 @@ export declare namespace Position {
             price: string;
             ratioState: RatioState;
         }
+        interface AaveV3CloseOnPriceGeneric extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+        }
         interface BoostOnPriceAave extends CloseOnPriceAave {
             ratio: number;
         }
@@ -171,8 +181,56 @@ export declare namespace Position {
             subHashBoost?: string;
             subHashRepay?: string;
         }
+        interface CompoundV3Base extends Base {
+            market: EthereumAddress;
+            collToken: EthereumAddress;
+            baseToken: EthereumAddress;
+        }
+        interface CompoundV3LeverageManagementOnPrice extends CompoundV3Base {
+            ratio: number;
+            price: string;
+            priceState: RatioState;
+        }
+        interface CompoundV3CloseOnPrice extends CompoundV3Base {
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
+        interface SparkOnPrice extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            price: string;
+            ratioState: RatioState;
+            ratio: number;
+        }
+        interface CloseBase extends Base {
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
+        interface AaveV4LeverageManagementOnPrice extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            price: string;
+            ratioState: number;
+            ratio: number;
+        }
+        interface AaveV4CloseOnPrice extends CloseBase {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+        }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice | Specific.AaveV3CloseOnPriceGeneric | Specific.AaveV4LeverageManagementOnPrice | Specific.AaveV4CloseOnPrice | Specific.SparkOnPrice;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.1.10",
+  "version": "3.1.14-spark-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,12 +23,12 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@defisaver/sdk": "^1.2.17",
-    "@defisaver/tokens": "^1.5.54",
+    "@defisaver/sdk": "^1.3.22",
+    "@defisaver/tokens": "^1.6.19",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",
+    "es6-promise-pool": "^2.5.0",
     "lodash": "^4.17.21",
     "web3-eth-abi": "^1.10.2",
     "web3-utils": "^1.10.2"
@@ -46,7 +46,6 @@
     "husky": "^8.0.0",
     "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^10.2.0",
-    "react": "^18.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
     "typechain-target-web3-v1-3mihai3": "^6.0.1",

package/src/automation/private/StrategiesAutomation.test.ts

@@ -659,5 +659,45 @@ describe('Feature: StrategiesAutomation.ts', () => {
         expect(JSON.stringify(actual)).to.equal(JSON.stringify(expected));
       });
     });
+
+    it('Aave V4: pairs repay/boost merge only when trigger spoke matches (no cross-spoke merge)', () => {
+      const spoke1 = '0x0000000000000000000000000000000000000a01';
+      const spoke2 = '0x0000000000000000000000000000000000000a02';
+      const base = {
+        isEnabled: true,
+        chainId: 1,
+        owner: '0x0000000000000000000000000000000000000b01',
+        protocol: { id: 'Aave__V4' },
+        strategy: { strategyId: 'leverage-management' },
+        blockNumber: 0,
+        subHash: '0x1',
+        positionId: 'test',
+      };
+      const boostSpoke1 = {
+        ...base,
+        subId: 1,
+        strategyData: { decoded: { triggerData: { spoke: spoke1 }, subData: {} } },
+        specific: { mergeId: 'boost', subId2: 1 },
+      };
+      const repaySpoke2 = {
+        ...base,
+        subId: 2,
+        strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } },
+        specific: { mergeWithId: 'boost', subId1: 2 },
+      };
+      const boostSpoke2 = {
+        ...base,
+        subId: 3,
+        strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } },
+        specific: { mergeId: 'boost', subId2: 3 },
+      };
+      // @ts-ignore — mergeSubs is protected; exercised here as in examples above
+      const merged = exampleStrategiesAutomation.mergeSubs([boostSpoke1, repaySpoke2, boostSpoke2]);
+      expect(merged).to.have.length(2);
+      const mergedPair = merged.find((m: { subIds?: number[] }) => m.subIds?.length === 2);
+      const loneBoost = merged.find((m: { subIds?: number[] }) => m.subIds?.length === 1);
+      expect(mergedPair?.strategyData?.decoded?.triggerData?.spoke).to.equal(spoke2);
+      expect(loneBoost?.subId).to.equal(1);
+    });
   });
 });

package/src/automation/private/StrategiesAutomation.ts

@@ -1,11 +1,12 @@
 import Dec from 'decimal.js';
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
+import PromisePool from 'es6-promise-pool';
 import type {
   Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
 } from '../../types';
 import type {
-  StrategyModel, SubStorage,
+  StrategyModel, Subscribe, SubStorage, UpdateData,
 } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import { Strategies, ProtocolIdentifiers } from '../../types/enums';
@@ -77,13 +78,13 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getSubscriptionEventsFromSubStorage(options?: PastEventOptions) {
-    return this.getEventFromSubStorage('Subscribe', options);
+    return this.getEventFromSubStorage('Subscribe', options) as Promise<Subscribe[]>;
   }
 
   protected async getUpdateDataEventsFromSubStorage(options?: PastEventOptions) {
     const events = await this.getEventFromSubStorage('UpdateData', options);
     /** @dev - Some RPCs sort events differently */
-    return events.sort((a, b) => a.blockNumber - b.blockNumber);
+    return events.sort((a, b) => a.blockNumber - b.blockNumber) as UpdateData[];
   }
 
   protected getParsedSubscriptions(parseData: ParseData) {
@@ -128,9 +129,20 @@ export default class StrategiesAutomation extends Automation {
       && (
         s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
         || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase()
+      )
+      && (
+        s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.AaveV4
+        || this._aaveV4MergeSpokesMatch(s, current)
       );
   }
 
+  /** Repay/boost leverage pairs must not merge across different Aave V4 spokes. */
+  private _aaveV4MergeSpokesMatch(s: Position.Automated, current: Position.Automated): boolean {
+    const a = s.strategyData?.decoded?.triggerData?.spoke as EthereumAddress | undefined;
+    const b = current.strategyData?.decoded?.triggerData?.spoke as EthereumAddress | undefined;
+    return !!a && !!b && a.toLowerCase() === b.toLowerCase();
+  }
+
   protected mergeSubs(_subscriptions:(Position.Automated | null)[]) {
     const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId)) as Position.Automated[];
     const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId)) as Position.Automated[];
@@ -168,7 +180,6 @@ export default class StrategiesAutomation extends Automation {
       }
     });
     if (mergeExtension.length > 0) {
-      console.error('Not all merge-able extensions were used', mergeExtension);
       subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
         ...s,
         subIds: [s.subId],
@@ -183,13 +194,13 @@ export default class StrategiesAutomation extends Automation {
       ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
     } as SubscriptionOptions & PastEventOptions;
 
-    let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
+    let subscriptionEvents = await this.getSubscriptionEventsFromSubStorage(_options);
 
     let subscriptions: (Position.Automated | null)[] = [];
 
     if (subscriptionEvents) {
       let strategiesSubs = await this.getStrategiesSubs(
-        subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
+        subscriptionEvents.map((e) => +e.returnValues.subId), _options.toBlock,
       );
 
       if (_options.enabledOnly) {
@@ -203,8 +214,9 @@ export default class StrategiesAutomation extends Automation {
         subscriptionEvents = filteredSubscriptionEvents;
       }
 
-      subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
-        let latestUpdate = subscriptionEvents[index].returnValues;
+      const replaceSubWithUpdate = async (index: number) => {
+        const sub = strategiesSubs[index];
+        let latestUpdate = { ...subscriptionEvents[index].returnValues };
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
           const updates = await this.getUpdateDataEventsFromSubStorage({
@@ -214,15 +226,26 @@ export default class StrategiesAutomation extends Automation {
           latestUpdate = {
             ...latestUpdate, // Update is missing proxy, hence this
             ...updates?.[updates.length - 1]?.returnValues,
+            2: latestUpdate[2], // type issue
           };
         }
-        return this.getParsedSubscriptions({
-          chainId: this.chainId,
-          blockNumber: subscriptionEvents[index].blockNumber,
-          subscriptionEventData: latestUpdate,
-          strategiesSubsData: sub,
-        });
-      }));
+        subscriptions.push(
+          this.getParsedSubscriptions({
+            chainId: this.chainId,
+            blockNumber: subscriptionEvents[index].blockNumber,
+            subscriptionEventData: latestUpdate,
+            strategiesSubsData: sub,
+          }),
+        );
+      };
+
+      // eslint-disable-next-line func-names
+      const pool = new PromisePool(function* () {
+        for (let index = 0; index < strategiesSubs.length; index++) {
+          yield replaceSubWithUpdate(index);
+        }
+      } as any, 50);
+      await pool.start();
 
       if (options?.mergeSubs) {
         subscriptions = this.mergeSubs(subscriptions);