@defisaver/automation-sdk 3.2.4-dev-1 → 3.2.5

package/esm/services/triggerService.test.js

@@ -3,7 +3,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { ChainId, OrderType, RatioState } from '../types/enums';
 import '../configuration';
-import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkQuotePriceTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, } from './triggerService';
+import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkQuotePriceTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -1017,96 +1017,4 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
-    describe('When testing triggerService.compoundV3PriceTrigger', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
-                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 2000, RatioState.UNDER]
-                ],
-                [
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
-                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 3000, RatioState.OVER]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(compoundV3PriceTrigger.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-                        price: '2000',
-                        priceState: RatioState.UNDER,
-                    },
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
-                ],
-                [
-                    {
-                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-                        price: '3000',
-                        priceState: RatioState.OVER,
-                    },
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3PriceTrigger.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
-    describe('When testing triggerService.compoundV3PriceRangeTrigger', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
-                ],
-                [
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(compoundV3PriceRangeTrigger.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-                        lowerPrice: '1500',
-                        upperPrice: '4000',
-                    },
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-                ],
-                [
-                    {
-                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-                        lowerPrice: '0',
-                        upperPrice: '5000',
-                    },
-                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3PriceRangeTrigger.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
 });

package/esm/types/enums.d.ts

@@ -114,7 +114,6 @@ 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",
@@ -126,9 +125,7 @@ export declare namespace Strategies {
         OpenOrderFromCollateral = "open-order-from-collateral",
         OpenOrderFromDebt = "open-order-from-debt",
         BoostOnPrice = "boost-on-price",
-        RepayOnPrice = "repay-on-price",
-        EoaBoostOnPrice = "eoa-boost-on-price",
-        EoaRepayOnPrice = "eoa-repay-on-price"
+        RepayOnPrice = "repay-on-price"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -137,9 +134,7 @@ export declare namespace Strategies {
         StopLossWithGasPrice = "stop-loss-with-gas-price",
         TrailingStop = "trailing-stop",
         LeverageManagement = "leverage-management",
-        EoaLeverageManagement = "leverage-management-eoa",
-        LeverageManagementOnPrice = "leverage-management-on-price",
-        EoaLeverageManagementOnPrice = "leverage-management-on-price-eoa"
+        EoaLeverageManagement = "leverage-management-eoa"
     }
 }
 export declare namespace Bundles {
@@ -191,13 +186,7 @@ export declare namespace Bundles {
         LIQUITY_V2_REPAY_ON_PRICE = 42,
         LIQUITY_V2_BOOST_ON_PRICE = 43,
         FLUID_T1_REPAY = 44,
-        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
+        FLUID_T1_BOOST = 45
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -220,13 +209,7 @@ export declare namespace Bundles {
         AAVE_V3_REPAY_ON_PRICE = 11,
         MORPHO_BLUE_BOOST_ON_PRICE = 12,
         FLUID_T1_REPAY = 13,
-        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
+        FLUID_T1_BOOST = 14
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -238,12 +221,6 @@ 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,
-        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
+        FLUID_T1_BOOST = 9
     }
 }

package/esm/types/enums.js

@@ -131,7 +131,6 @@ 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";
@@ -144,8 +143,6 @@ 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 = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -156,8 +153,6 @@ 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;
@@ -212,12 +207,6 @@ 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 = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -243,12 +232,6 @@ 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 = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -262,11 +245,5 @@ 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 = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/esm/types/index.d.ts

@@ -171,24 +171,8 @@ 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;
-        }
     }
-    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;
+    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;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.2.4-dev-1",
+  "version": "3.2.5",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@defisaver/sdk": "^1.2.20",
-    "@defisaver/tokens": "^1.6.19",
+    "@defisaver/tokens": "^1.6.7",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",

package/src/constants/index.ts

@@ -421,36 +421,6 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.FluidT1,
   },
-  [Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.RepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.BoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.MainnetIds.COMP_V3_SW_CLOSE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-    strategyId: Strategies.Identifiers.CloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.MainnetIds.COMP_V3_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -552,36 +522,6 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.FluidT1,
   },
-  [Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.RepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.BoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.BaseIds.COMP_V3_SW_CLOSE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_SW_CLOSE,
-    strategyId: Strategies.Identifiers.CloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.BaseIds.COMP_V3_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.BaseIds.COMP_V3_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -635,36 +575,6 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.FluidT1,
   },
-  [Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.RepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.BoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.ArbitrumIds.COMP_V3_SW_CLOSE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_SW_CLOSE,
-    strategyId: Strategies.Identifiers.CloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
-  [Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
-    protocol: PROTOCOLS.CompoundV3,
-  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {
@@ -679,4 +589,5 @@ export const BUNDLE_IDS = {
   [ChainId.Optimism]: Bundles.OptimismIds,
   [ChainId.Arbitrum]: Bundles.ArbitrumIds,
   [ChainId.Base]: Bundles.BaseIds,
+
 };

package/src/services/strategiesService.ts

@@ -466,62 +466,6 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
-function parseCompoundV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.compoundV3PriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.compoundV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
-
-  _position.specific = {
-    market: subData.market,
-    collToken: subData.collToken,
-    baseToken: subData.baseToken,
-    ratio: subData.targetRatio,
-    price: triggerData.price,
-    priceState: triggerData.priceState,
-  };
-
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
-
-  return _position;
-}
-
-function parseCompoundV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.compoundV3PriceRangeTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.compoundV3CloseSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
-
-  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
-
-  _position.specific = {
-    market: subData.market,
-    collToken: subData.collToken,
-    baseToken: subData.baseToken,
-    stopLossPrice: triggerData.lowerPrice,
-    takeProfitPrice: triggerData.upperPrice,
-    takeProfitType,
-    stopLossType,
-  };
-
-  return _position;
-}
-
 function parseChickenBondsRebond(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -965,6 +909,7 @@ function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: Par
   // - Only TakeProfit
   // - Only StopLoss
   // - Both
+  // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
   _position.strategy.strategyId = Strategies.Identifiers.CloseOnPrice;
   _position.specific = {
     market: subData.market,
@@ -1122,12 +1067,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,
     [Strategies.Identifiers.EoaRepay]: parseCompoundV3LeverageManagement,
     [Strategies.Identifiers.EoaBoost]: parseCompoundV3LeverageManagement,
-    [Strategies.Identifiers.RepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-    [Strategies.Identifiers.BoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-    [Strategies.Identifiers.EoaRepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-    [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-    [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
-    [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
     [Strategies.Identifiers.Rebond]: parseChickenBondsRebond,

package/src/services/strategySubService.test.ts

@@ -4,7 +4,7 @@ import { otherAddresses } from '@defisaver/sdk';
 import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 
-import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
+import { Bundles, ChainId, OrderType, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds, SubData, TriggerData } from '../types';
 
 import '../configuration';
@@ -688,120 +688,6 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
-    describe('leverageManagementOnPrice()', () => {
-      const examples: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState]
-      ]> = [
-        [
-          [
-            Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-            true,
-            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
-            [
-              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000'
-            ],
-          ],
-          [
-            Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            200,
-            2000,
-            RatioState.UNDER,
-          ],
-        ],
-        [
-          [
-            Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-            true,
-            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
-            [
-              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000'
-            ],
-          ],
-          [
-            Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            190,
-            3000,
-            RatioState.OVER,
-          ],
-        ]
-      ];
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(compoundV3Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
-        });
-      });
-    });
-    describe('closeOnPrice()', () => {
-      const examples: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType]
-      ]> = [
-        [
-          [
-            Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-            true,
-            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-            [
-              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000000000000000000006'
-            ],
-          ],
-          [
-            Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1500,
-            CloseToAssetType.DEBT,
-            4000,
-            CloseToAssetType.DEBT,
-          ],
-        ],
-        [
-          [
-            Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-            true,
-            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-            [
-              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000000000000000000000'
-            ],
-          ],
-          [
-            Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            0,
-            CloseToAssetType.DEBT,
-            5000,
-            CloseToAssetType.COLLATERAL,
-          ],
-        ]
-      ];
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(compoundV3Encode.closeOnPrice(...actual)).to.eql(expected);
-        });
-      });
-    });
   });
 
   describe('When testing strategySubService.morphoAaveV2Encode', () => {