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

package/cjs/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/cjs/automation/public/Strategies.test.d.ts

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

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

@@ -0,0 +1,61 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const web3_1 = __importDefault(require("web3"));
+require("../../configuration");
+const EthereumStrategies_1 = __importDefault(require("./EthereumStrategies"));
+const ArbitrumStrategies_1 = __importDefault(require("./ArbitrumStrategies"));
+const OptimismStrategies_1 = __importDefault(require("./OptimismStrategies"));
+const BaseStrategies_1 = __importDefault(require("./BaseStrategies"));
+require('dotenv').config({ path: '.env' });
+const Web3_1 = new web3_1.default(process.env.RPC_1);
+const Web3_42161 = new web3_1.default(process.env.RPC_42161);
+const Web3_10 = new web3_1.default(process.env.RPC_10);
+const Web3_8453 = new web3_1.default(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_1.default({ 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_1.default({ 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_1.default({ 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_1.default({ provider: Web3_8453 });
+                const subs = yield baseStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+    });
+});

package/cjs/constants/index.js

@@ -96,11 +96,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Payback,
         protocol: exports.PROTOCOLS.CrvUSD,
     },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -113,11 +108,6 @@ exports.OPTIMISM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.BASE_STRATEGIES_INFO = {
     [enums_1.Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -142,11 +132,6 @@ exports.ARBITRUM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
-        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.STRATEGIES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_STRATEGIES_INFO,
@@ -363,6 +348,26 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -390,6 +395,11 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -437,6 +447,11 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.BaseIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -474,6 +489,11 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/services/strategiesService.js

@@ -429,6 +429,39 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseLiquityV2LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -590,11 +623,11 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseAaveV3OpenOrderFromCollateral(position, parseData) {
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
@@ -611,6 +644,32 @@ function parseAaveV3OpenOrderFromCollateral(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market);
+    const { takeProfitType, stopLossType } = (0, utils_1.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 = enums_1.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 = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -631,6 +690,11 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
         [enums_1.Strategies.Identifiers.DebtInFrontRepay]: parseLiquityDebtInFrontRepay,
     },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+    },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
@@ -642,7 +706,8 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [enums_1.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
-        [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3OpenOrderFromCollateral,
+        [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/cjs/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[])[];
+};

package/cjs/services/strategySubService.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.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
@@ -168,9 +168,9 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    openOrder(strategyOrBundleId, isBundle = true, triggerData, subData) {
+    leverageManagementOnPrice(strategyOrBundleId, isBundle = true, triggerData, subData) {
         const { collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, } = subData;
-        const subDataEncoded = subDataService.aaveV3OpenOrderSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
+        const subDataEncoded = subDataService.aaveV3LeverageManagementOnPriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
         const { baseTokenAddress, quoteTokenAddress, price, state, } = triggerData;
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
@@ -265,3 +265,25 @@ exports.morphoBlueEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
+exports.liquityV2Encode = {
+    leverageManagement(market, troveId, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, ratioState, targetRatio);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        // TODO: we can hardcode right bundles after testing
+        // const strategyOrBundleId = ratioState === RatioState.OVER
+        //   ? Bundles.MainnetIds.LIQUITY_V2_BOOST
+        //   : Bundles.MainnetIds.LIQUITY_V2_REPAY;
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    closeOnPrice(strategyOrBundleId, market, troveId, collToken, boldToken, stopLossPrice = 0, stopLossType = enums_1.CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = enums_1.CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = (0, utils_1.getCloseStrategyType)(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
+        const triggerData = triggerService.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        // TODO: we can hardcode bundleID after testing
+        // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};

package/cjs/services/strategySubService.test.js

@@ -454,7 +454,7 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('openOrder()', () => {
+        describe('leverageManagementOnPrice()', () => {
             const examples = [
                 [
                     [
@@ -490,7 +490,7 @@ describe('Feature: strategySubService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(strategySubService_1.aaveV3Encode.openOrder(...actual)).to.eql(expected);
+                    (0, chai_1.expect)(strategySubService_1.aaveV3Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
                 });
             });
         });

package/cjs/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 export declare const makerRepayFromSavingsSubData: {
     encode(vaultId: number, targetRatioPercentage: number, chainId: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): string[];
@@ -179,7 +179,7 @@ export declare const morphoBlueLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const aaveV3OpenOrderSubData: {
+export declare const aaveV3LeverageManagementOnPriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number): string[];
     decode(subData: string[]): {
         collAsset: EthereumAddress;
@@ -190,3 +190,22 @@ export declare const aaveV3OpenOrderSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityV2LeverageManagementSubData: {
+    encode: (market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        market: string;
+        troveId: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
+export declare const liquityV2CloseSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        closeType: CloseStrategyType;
+    };
+};

package/cjs/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV3OpenOrderSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -441,7 +441,7 @@ exports.morphoBlueLeverageManagementSubData = {
         };
     },
 };
-exports.aaveV3OpenOrderSubData = {
+exports.aaveV3LeverageManagementOnPriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
         const encodedCollId = web3_eth_abi_1.default.encodeParameter('uint8', collAssetId);
@@ -473,3 +473,57 @@ exports.aaveV3OpenOrderSubData = {
         };
     },
 };
+exports.liquityV2LeverageManagementSubData = {
+    encode: (market, troveId, ratioState, targetRatio) => {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [marketEncoded, troveIdEncoded, ratioStateEncoded, targetRatioEncoded, collActionTypeEncoded, debtActionTypeEncoded];
+    },
+    decode: (subData) => {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            market, troveId, ratioState, targetRatio,
+        };
+    },
+};
+exports.liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const collAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const wethAddress = (0, tokens_1.getAssetInfo)('WETH').address;
+        const wethAddressEncoded = web3_eth_abi_1.default.encodeParameter('address', wethAddress);
+        const closeTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collAddrEncoded,
+            boldTokenEncoded,
+            wethAddressEncoded,
+            closeTypeEncoded,
+        ];
+    },
+    decode(subData) {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        // skip wethAddress
+        const closeType = web3_eth_abi_1.default.decodeParameter('uint8', subData[5]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};

package/cjs/services/subDataService.test.js

@@ -1222,7 +1222,7 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.aaveV3OpenOrderSubData', () => {
+    describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [
                 [
@@ -1247,7 +1247,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    (0, chai_1.expect)(subDataService_1.aaveV3OpenOrderSubData.encode(...actual)).to.eql(expected);
+                    (0, chai_1.expect)(subDataService_1.aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1274,7 +1274,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(subDataService_1.aaveV3OpenOrderSubData.decode(actual)).to.eql(expected);
+                    (0, chai_1.expect)(subDataService_1.aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
                 });
             });
         });

package/cjs/services/triggerService.d.ts

@@ -189,3 +189,20 @@ export declare const morphoBlueRatioTrigger: {
         ratioState: number;
     };
 };
+export declare const liquityV2RatioTrigger: {
+    encode(market: EthereumAddress, troveId: string, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        market: string;
+        troveId: string;
+        ratio: number;
+        ratioState: number;
+    };
+};
+export declare const closePriceTrigger: {
+    encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        tokenAddr: EthereumAddress;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/cjs/services/triggerService.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.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.closePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -365,3 +365,35 @@ exports.morphoBlueRatioTrigger = {
         };
     },
 };
+exports.liquityV2RatioTrigger = {
+    encode(market, troveId, ratioPercentage, ratioState) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint256', 'uint8'], [market, troveId, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            market: decodedData[0],
+            troveId: decodedData[1],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};
+exports.closePriceTrigger = {
+    encode(tokenAddr, lowerPrice, upperPrice) {
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint256'], [tokenAddr, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            tokenAddr: decodedData[0],
+            lowerPrice: new decimal_js_1.default(decodedData[1]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[2]).div(1e8).toString(),
+        };
+    },
+};

package/cjs/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -23,3 +23,8 @@ export declare function getRatioStateInfoForAaveCloseStrategy(currentRatioState:
     ratioState: RatioState;
 };
 export declare function getPositionId(...args: (number | string)[]): string;
+export declare function getCloseStrategyType(stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType): CloseStrategyType;
+export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType: CloseStrategyType): {
+    stopLossType: CloseToAssetType | undefined;
+    takeProfitType: CloseToAssetType | undefined;
+};