@defisaver/automation-sdk 3.1.3 → 3.1.4-dev-1

package/cjs/services/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
+exports.getStopLossAndTakeProfitTypeByCloseStrategyType = exports.getCloseStrategyType = exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3Utils = __importStar(require("web3-utils"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -129,3 +129,54 @@ function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
 exports.getPositionId = getPositionId;
+function getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType) {
+    const isStopLoss = stopLossPrice > 0;
+    const isTakeProfit = takeProfitPrice > 0;
+    if (!isStopLoss && !isTakeProfit) {
+        throw new Error('CloseOnPrice: At least one price must be defined');
+    }
+    if (isStopLoss && isTakeProfit) {
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL && takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+        }
+        return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+    }
+    if (isStopLoss) {
+        return stopLossType === enums_1.CloseToAssetType.COLLATERAL
+            ? enums_1.CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+            : enums_1.CloseStrategyType.STOP_LOSS_IN_DEBT;
+    }
+    return takeProfitType === enums_1.CloseToAssetType.COLLATERAL
+        ? enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+        : enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}
+exports.getCloseStrategyType = getCloseStrategyType;
+function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType) {
+    switch (closeStrategyType) {
+        case enums_1.CloseStrategyType.STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: undefined };
+        case enums_1.CloseStrategyType.STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: undefined };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL:
+            return { stopLossType: undefined, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT:
+            return { stopLossType: undefined, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        default:
+            throw new Error('CloseStrategyType not supported');
+    }
+}
+exports.getStopLossAndTakeProfitTypeByCloseStrategyType = getStopLossAndTakeProfitTypeByCloseStrategyType;

package/cjs/types/enums.d.ts

@@ -17,6 +17,28 @@ export declare enum BundleProtocols {
     Yearn = "yearn",
     Rari = "rari"
 }
+export declare enum CollActionType {
+    SUPPLY = 0,
+    WITHDRAW = 1
+}
+export declare enum DebtActionType {
+    PAYBACK = 0,
+    BORROW = 1
+}
+export declare enum CloseStrategyType {
+    TAKE_PROFIT_IN_COLLATERAL = 0,
+    STOP_LOSS_IN_COLLATERAL = 1,
+    TAKE_PROFIT_IN_DEBT = 2,
+    STOP_LOSS_IN_DEBT = 3,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+    TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+    TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7
+}
+export declare enum CloseToAssetType {
+    COLLATERAL = 0,
+    DEBT = 1
+}
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -28,6 +50,7 @@ export declare namespace ProtocolIdentifiers {
     enum StrategiesAutomation {
         MakerDAO = "MakerDAO",
         Liquity = "Liquity",
+        LiquityV2 = "Liquity__V2",
         ChickenBonds = "Chicken Bonds",
         CompoundV2 = "Compound__V2",
         CompoundV3 = "Compound__V3",
@@ -60,13 +83,11 @@ export declare namespace Strategies {
         LIQUITY_DSR_PAYBACK = 69,
         LIQUITY_DSR_SUPPLY = 70,
         LIQUITY_DEBT_IN_FRONT_REPAY = 75,
-        CURVEUSD_PAYBACK = 92,
-        AAVE_V3_OPEN_ORDER_FROM_DEBT = 96
+        CURVEUSD_PAYBACK = 92
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_OPEN_ORDER_FROM_DEBT = 12
+        EXCHANGE_LIMIT_ORDER = 9
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
@@ -74,8 +95,7 @@ export declare namespace Strategies {
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_OPEN_ORDER_FROM_DEBT = 16
+        EXCHANGE_LIMIT_ORDER = 9
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -91,6 +111,7 @@ export declare namespace Strategies {
         CloseToCollateralWithGasPrice = "close-to-collateral-with-gas-price",
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
+        CloseOnPrice = "close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -100,7 +121,8 @@ export declare namespace Strategies {
         LimitOrder = "limit-order",
         DebtInFrontRepay = "debt-in-front-repay",
         OpenOrderFromCollateral = "open-order-from-collateral",
-        OpenOrderFromDebt = "open-order-from-debt"
+        OpenOrderFromDebt = "open-order-from-debt",
+        RepayOnPrice = "repay-on-price"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -152,14 +174,19 @@ export declare namespace Bundles {
         MORPHO_BLUE_BOOST = 33,
         MORPHO_BLUE_EOA_REPAY = 34,
         MORPHO_BLUE_EOA_BOOST = 35,
-        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
+        AAVE_V3_REPAY_ON_PRICE = 37,
+        LIQUITY_V2_REPAY = 38,
+        LIQUITY_V2_BOOST = 39,
+        LIQUITY_V2_CLOSE = 40
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
         AAVE_V3_BOOST = 1,
         AAVE_V3_CLOSE_TO_DEBT = 2,
         AAVE_V3_CLOSE_TO_COLLATERAL = 3,
-        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4,
+        AAVE_V3_REPAY_ON_PRICE = 5
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -170,7 +197,8 @@ export declare namespace Bundles {
         COMP_V3_SW_BOOST_BUNDLE = 5,
         MORPHO_BLUE_REPAY = 8,
         MORPHO_BLUE_BOOST = 9,
-        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 10
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 10,
+        AAVE_V3_REPAY_ON_PRICE = 11
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -179,6 +207,7 @@ export declare namespace Bundles {
         AAVE_V3_CLOSE_TO_COLLATERAL = 3,
         COMP_V3_SW_REPAY_BUNDLE = 4,
         COMP_V3_SW_BOOST_BUNDLE = 5,
-        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6,
+        AAVE_V3_REPAY_ON_PRICE = 7
     }
 }

package/cjs/types/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.ChainId = void 0;
+exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.CloseToAssetType = exports.CloseStrategyType = exports.DebtActionType = exports.CollActionType = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.ChainId = void 0;
 var ChainId;
 (function (ChainId) {
     ChainId[ChainId["Ethereum"] = 1] = "Ethereum";
@@ -24,6 +24,32 @@ var BundleProtocols;
     BundleProtocols["Yearn"] = "yearn";
     BundleProtocols["Rari"] = "rari";
 })(BundleProtocols = exports.BundleProtocols || (exports.BundleProtocols = {}));
+var CollActionType;
+(function (CollActionType) {
+    CollActionType[CollActionType["SUPPLY"] = 0] = "SUPPLY";
+    CollActionType[CollActionType["WITHDRAW"] = 1] = "WITHDRAW";
+})(CollActionType = exports.CollActionType || (exports.CollActionType = {}));
+var DebtActionType;
+(function (DebtActionType) {
+    DebtActionType[DebtActionType["PAYBACK"] = 0] = "PAYBACK";
+    DebtActionType[DebtActionType["BORROW"] = 1] = "BORROW";
+})(DebtActionType = exports.DebtActionType || (exports.DebtActionType = {}));
+var CloseStrategyType;
+(function (CloseStrategyType) {
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL"] = 0] = "TAKE_PROFIT_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_COLLATERAL"] = 1] = "STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT"] = 2] = "TAKE_PROFIT_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_DEBT"] = 3] = "STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL"] = 4] = "TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT"] = 5] = "TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT"] = 6] = "TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL"] = 7] = "TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL";
+})(CloseStrategyType = exports.CloseStrategyType || (exports.CloseStrategyType = {}));
+var CloseToAssetType;
+(function (CloseToAssetType) {
+    CloseToAssetType[CloseToAssetType["COLLATERAL"] = 0] = "COLLATERAL";
+    CloseToAssetType[CloseToAssetType["DEBT"] = 1] = "DEBT";
+})(CloseToAssetType = exports.CloseToAssetType || (exports.CloseToAssetType = {}));
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -37,6 +63,7 @@ var ProtocolIdentifiers;
     (function (StrategiesAutomation) {
         StrategiesAutomation["MakerDAO"] = "MakerDAO";
         StrategiesAutomation["Liquity"] = "Liquity";
+        StrategiesAutomation["LiquityV2"] = "Liquity__V2";
         StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
         StrategiesAutomation["CompoundV2"] = "Compound__V2";
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
@@ -73,13 +100,11 @@ var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
         MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
-        MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 96] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(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_OPEN_ORDER_FROM_DEBT"] = 12] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -90,7 +115,6 @@ var Strategies;
     (function (ArbitrumIds) {
         ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 16] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -107,6 +131,7 @@ var Strategies;
         Identifiers["CloseToCollateralWithGasPrice"] = "close-to-collateral-with-gas-price";
         Identifiers["CloseOnPriceToDebt"] = "close-on-price-to-debt";
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
+        Identifiers["CloseOnPrice"] = "close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -117,6 +142,7 @@ var Strategies;
         Identifiers["DebtInFrontRepay"] = "debt-in-front-repay";
         Identifiers["OpenOrderFromCollateral"] = "open-order-from-collateral";
         Identifiers["OpenOrderFromDebt"] = "open-order-from-debt";
+        Identifiers["RepayOnPrice"] = "repay-on-price";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -172,6 +198,10 @@ var Bundles;
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_REPAY"] = 34] = "MORPHO_BLUE_EOA_REPAY";
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST"] = 35] = "MORPHO_BLUE_EOA_BOOST";
         MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
+        MainnetIds[MainnetIds["AAVE_V3_REPAY_ON_PRICE"] = 37] = "AAVE_V3_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["LIQUITY_V2_REPAY"] = 38] = "LIQUITY_V2_REPAY";
+        MainnetIds[MainnetIds["LIQUITY_V2_BOOST"] = 39] = "LIQUITY_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_V2_CLOSE"] = 40] = "LIQUITY_V2_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -180,6 +210,7 @@ var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_DEBT"] = 2] = "AAVE_V3_CLOSE_TO_DEBT";
         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 = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -192,6 +223,7 @@ var Bundles;
         BaseIds[BaseIds["MORPHO_BLUE_REPAY"] = 8] = "MORPHO_BLUE_REPAY";
         BaseIds[BaseIds["MORPHO_BLUE_BOOST"] = 9] = "MORPHO_BLUE_BOOST";
         BaseIds[BaseIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 10] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
+        BaseIds[BaseIds["AAVE_V3_REPAY_ON_PRICE"] = 11] = "AAVE_V3_REPAY_ON_PRICE";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -202,5 +234,6 @@ var Bundles;
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_REPAY_BUNDLE"] = 4] = "COMP_V3_SW_REPAY_BUNDLE";
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_BOOST_BUNDLE"] = 5] = "COMP_V3_SW_BOOST_BUNDLE";
         ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 6] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_REPAY_ON_PRICE"] = 7] = "AAVE_V3_REPAY_ON_PRICE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles = exports.Bundles || (exports.Bundles = {}));

package/cjs/types/index.d.ts

@@ -2,7 +2,7 @@ import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
 import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState } from './enums';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -69,7 +69,7 @@ export declare namespace Interfaces {
     }
     interface Automation {
         provider: Web3;
-        providerFork: Web3;
+        providerFork?: Web3;
     }
     interface LegacyAutomation<T extends BaseContract> {
         provider: Web3;
@@ -134,6 +134,15 @@ export declare namespace Position {
             maximumGasPrice: string;
             ratioState: RatioState;
         }
+        interface CloseOnPriceLiquityV2 extends Base {
+            market: EthereumAddress;
+            troveId: string;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            closeToAssetAddr: EthereumAddress;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
         interface TrailingStop extends Base {
             roundId: number;
             triggerPercentage: number;
@@ -148,7 +157,7 @@ export declare namespace Position {
             subHashRepay?: string;
         }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/esm/automation/private/StrategiesAutomation.d.ts

@@ -6,12 +6,12 @@ import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
 interface IStrategiesAutomation extends Interfaces.Automation {
     chainId: ChainId;
-    providerFork: Web3;
+    providerFork?: Web3;
 }
 export default class StrategiesAutomation extends Automation {
     protected chainId: ChainId;
     protected web3: Web3;
-    protected web3Fork: Web3;
+    protected web3Fork?: Web3;
     protected subStorageContract: Contract.WithMeta<SubStorage>;
     protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
     constructor(args: IStrategiesAutomation);

package/esm/automation/public/Strategies.test.d.ts

@@ -0,0 +1 @@
+import '../../configuration';

package/esm/automation/public/Strategies.test.js

@@ -0,0 +1,56 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import Web3 from 'web3';
+import '../../configuration';
+import EthereumStrategies from './EthereumStrategies';
+import ArbitrumStrategies from './ArbitrumStrategies';
+import OptimismStrategies from './OptimismStrategies';
+import BaseStrategies from './BaseStrategies';
+require('dotenv').config({ path: '.env' });
+const Web3_1 = new Web3(process.env.RPC_1);
+const Web3_42161 = new Web3(process.env.RPC_42161);
+const Web3_10 = new Web3(process.env.RPC_10);
+const Web3_8453 = new Web3(process.env.RPC_8453);
+describe('Feature: StrategiesAutomation.ts', () => {
+    describe('Fetching subscriptions', () => {
+        it('can fetch subscriptions on Mainnet', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const ethStrategies = new EthereumStrategies({ provider: Web3_1 });
+                const subs = yield ethStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Arbitrum', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const arbiStrategies = new ArbitrumStrategies({ provider: Web3_42161 });
+                const subs = yield arbiStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Optimism', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const optimismStrategies = new OptimismStrategies({ provider: Web3_10 });
+                const subs = yield optimismStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Base', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const baseStrategies = new BaseStrategies({ provider: Web3_8453 });
+                const subs = yield baseStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+    });
+});

package/esm/constants/index.js

@@ -90,11 +90,6 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.Payback,
         protocol: PROTOCOLS.CrvUSD,
     },
-    [Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const OPTIMISM_STRATEGIES_INFO = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -107,11 +102,6 @@ export const OPTIMISM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.LimitOrder,
         protocol: PROTOCOLS.Exchange,
     },
-    [Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const BASE_STRATEGIES_INFO = {
     [Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -136,11 +126,6 @@ export const ARBITRUM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.LimitOrder,
         protocol: PROTOCOLS.Exchange,
     },
-    [Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const STRATEGIES_INFO = {
     [ChainId.Ethereum]: MAINNET_STRATEGIES_INFO,
@@ -357,6 +342,26 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.MainnetIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.LIQUITY_V2_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.LiquityV2,
+    },
+    [Bundles.MainnetIds.LIQUITY_V2_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.LiquityV2,
+    },
+    [Bundles.MainnetIds.LIQUITY_V2_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_CLOSE,
+        strategyId: Strategies.Identifiers.CloseOnPrice,
+        protocol: PROTOCOLS.LiquityV2,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -384,6 +389,11 @@ export const OPTIMISM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.OptimismIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BASE_BUNDLES_INFO = {
     [Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -431,6 +441,11 @@ export const BASE_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.BaseIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const ARBITRUM_BUNDLES_INFO = {
     [Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -468,6 +483,11 @@ export const ARBITRUM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.ArbitrumIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BUNDLES_INFO = {
     [ChainId.Ethereum]: MAINNET_BUNDLES_INFO,

package/esm/services/strategiesService.js

@@ -2,7 +2,7 @@ import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
-import { getPositionId, getRatioStateInfoForAaveCloseStrategy, isRatioStateOver, wethToEthByAddress, } from './utils';
+import { getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress, } from './utils';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 const SPARK_MARKET_ADDRESSES = {
@@ -403,6 +403,39 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseLiquityV2LeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 function parseSparkLeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -564,11 +597,11 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseAaveV3OpenOrderFromCollateral(position, parseData) {
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3OpenOrderSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
@@ -585,6 +618,32 @@ function parseAaveV3OpenOrderFromCollateral(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.closePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2CloseSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    // User can have:
+    // - 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,
+        troveId: subData.troveId,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        closeToAssetAddr: triggerData.tokenAddr,
+        takeProfitType,
+        stopLossType,
+    };
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -605,6 +664,11 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
         [Strategies.Identifiers.DebtInFrontRepay]: parseLiquityDebtInFrontRepay,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
+        [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
+        [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+        [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+    },
     [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
         [Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
@@ -616,7 +680,8 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
         [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
-        [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3OpenOrderFromCollateral,
+        [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -1,5 +1,5 @@
 import type { OrderType } from '../types/enums';
-import { Bundles, ChainId, RatioState, Strategies } from '../types/enums';
+import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 export declare const makerEncode: {
     repayFromSavings(bundleId: StrategyOrBundleIds, vaultId: number, triggerRepayRatio: number, targetRepayRatio: number, isBundle?: boolean, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds | Bundles.MainnetIds | Bundles.OptimismIds | Bundles.ArbitrumIds | Bundles.BaseIds)[];
@@ -47,7 +47,7 @@ export declare const aaveV3Encode: {
         debtAsset: EthereumAddress;
         debtAssetId: number;
     }): (number | boolean | string[])[];
-    openOrder(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+    leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
         baseTokenAddress: EthereumAddress;
         quoteTokenAddress: EthereumAddress;
         price: number;
@@ -98,3 +98,7 @@ export declare const crvUSDEncode: {
 export declare const morphoBlueEncode: {
     leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (boolean | string[] | Bundles.MainnetIds)[] | (boolean | string[] | Bundles.BaseIds)[];
 };
+export declare const liquityV2Encode: {
+    leverageManagement(market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+};