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

package/src/automation/private/StrategiesAutomation.ts

@@ -19,7 +19,7 @@ import Automation from './Automation';
 
 interface IStrategiesAutomation extends Interfaces.Automation {
   chainId: ChainId,
-  providerFork: Web3,
+  providerFork?: Web3,
 }
 
 export default class StrategiesAutomation extends Automation {
@@ -27,7 +27,7 @@ export default class StrategiesAutomation extends Automation {
 
   protected web3: Web3;
 
-  protected web3Fork: Web3;
+  protected web3Fork?: Web3;
 
   protected subStorageContract: Contract.WithMeta<SubStorage>;
 

package/src/automation/public/Strategies.test.ts

@@ -0,0 +1,49 @@
+import Web3 from 'web3';
+import { expect } from 'chai';
+
+import {ChainId} from '../../types/enums';
+
+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', async function () {
+      this.timeout(120000);
+      const ethStrategies = new EthereumStrategies({provider: Web3_1});
+      const subs = await ethStrategies.getSubscriptions({mergeSubs: true})
+      console.log(subs.length);
+    });
+
+    it('can fetch subscriptions on Arbitrum', async function () {
+      this.timeout(120000);
+      const arbiStrategies = new ArbitrumStrategies({provider: Web3_42161});
+      const subs = await arbiStrategies.getSubscriptions({mergeSubs: true})
+      console.log(subs.length);
+    });
+
+    it('can fetch subscriptions on Optimism', async function () {
+      this.timeout(120000);
+      const optimismStrategies = new OptimismStrategies({provider: Web3_10});
+      const subs = await optimismStrategies.getSubscriptions({mergeSubs: true})
+      console.log(subs.length);
+    });
+
+    it('can fetch subscriptions on Base', async function () {
+      this.timeout(120000);
+      const baseStrategies = new BaseStrategies({provider: Web3_8453});
+      const subs = await baseStrategies.getSubscriptions({mergeSubs: true})
+      console.log(subs.length);
+    });
+  });
+});

package/src/constants/index.ts

@@ -1,5 +1,16 @@
 import type {
-  ArbitrumBundleInfo, ArbitrumStrategiesInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, OptimismStrategiesInfo, BaseBundleInfo, BaseStrategiesInfo, StrategiesInfo,
+  ArbitrumBundleInfo,
+  ArbitrumStrategiesInfo,
+  BundlesInfo,
+  EthereumAddress,
+  Interfaces,
+  MainnetBundleInfo,
+  MainnetStrategiesInfo,
+  OptimismBundleInfo,
+  OptimismStrategiesInfo,
+  BaseBundleInfo,
+  BaseStrategiesInfo,
+  StrategiesInfo,
 } from '../types';
 
 import {
@@ -102,11 +113,6 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     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: OptimismStrategiesInfo = {
@@ -120,11 +126,6 @@ export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
     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: BaseStrategiesInfo = {
@@ -151,11 +152,6 @@ export const ARBITRUM_STRATEGIES_INFO: ArbitrumStrategiesInfo = {
     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: StrategiesInfo = {
@@ -375,6 +371,26 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     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: OptimismBundleInfo = {
@@ -403,6 +419,11 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     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: BaseBundleInfo = {
@@ -451,6 +472,11 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     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: ArbitrumBundleInfo = {
@@ -489,6 +515,11 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     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: BundlesInfo = {

package/src/services/strategiesService.ts

@@ -9,7 +9,7 @@ import type {
 import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
 
 import {
-  getPositionId, getRatioStateInfoForAaveCloseStrategy, isRatioStateOver, wethToEthByAddress,
+  getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress,
 } from './utils';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
@@ -563,6 +563,49 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+function parseLiquityV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  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: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -779,13 +822,13 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
-function parseAaveV3OpenOrderFromCollateral(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   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;
@@ -806,6 +849,42 @@ function parseAaveV3OpenOrderFromCollateral(position: Position.Automated, parseD
   return _position;
 }
 
+function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  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: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -826,6 +905,11 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [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,
@@ -837,7 +921,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [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/src/services/strategySubService.test.ts

@@ -565,7 +565,7 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
-    describe('openOrder()', () => {
+    describe('leverageManagementOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
@@ -614,7 +614,7 @@ describe('Feature: strategySubService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(aaveV3Encode.openOrder(...actual)).to.eql(expected);
+          expect(aaveV3Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
         });
       });
     });

package/src/services/strategySubService.ts

@@ -3,6 +3,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 
 import type { OrderType } from '../types/enums';
 import {
+  CloseStrategyType, CloseToAssetType,
   Bundles, ChainId, RatioState, Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
@@ -11,7 +12,9 @@ import { STRATEGY_IDS } from '../constants';
 
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
-import { compareAddresses, requireAddress, requireAddresses } from './utils';
+import {
+  compareAddresses, getCloseStrategyType, requireAddress, requireAddresses,
+} from './utils';
 
 export const makerEncode = {
   repayFromSavings(
@@ -298,7 +301,7 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  openOrder(
+  leverageManagementOnPrice(
     strategyOrBundleId: number,
     isBundle: boolean = true,
     triggerData: {
@@ -311,7 +314,7 @@ export const aaveV3Encode = {
     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,
@@ -522,3 +525,49 @@ export const morphoBlueEncode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 };
+
+export const liquityV2Encode = {
+  leverageManagement(
+    market: EthereumAddress,
+    troveId: string,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+    strategyOrBundleId: number,
+  ) {
+    const isBundle = true;
+    const isRepay = ratioState === 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: number,
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
+  ) {
+    const isBundle = true;
+    const closeType = 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/src/services/subDataService.test.ts

@@ -31,7 +31,7 @@ import {
   sparkQuotePriceSubData,
   crvUSDLeverageManagementSubData,
   compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData, crvUSDPaybackSubData,
-  aaveV3OpenOrderSubData,
+  aaveV3LeverageManagementOnPriceSubData,
 } from './subDataService';
 import { AAVE_V3_VARIABLE_BORROW_RATE } from '../constants';
 
@@ -1324,7 +1324,7 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.aaveV3OpenOrderSubData', () => {
+  describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]]> = [
         [
@@ -1350,7 +1350,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(aaveV3OpenOrderSubData.encode(...actual)).to.eql(expected);
+          expect(aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1379,7 +1379,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(aaveV3OpenOrderSubData.decode(actual)).to.eql(expected);
+          expect(aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
         });
       });
     });

package/src/services/subDataService.ts

@@ -6,8 +6,10 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisave
 import { otherAddresses } from '@defisaver/sdk';
 
 import type { SubData, EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
-import { ChainId, RatioState } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
+import {
+  ChainId, CollActionType, DebtActionType, RatioState,
+} from '../types/enums';
 
 import { AAVE_V3_VARIABLE_BORROW_RATE, ZERO_ADDRESS } from '../constants';
 
@@ -594,7 +596,7 @@ export const morphoBlueLeverageManagementSubData = {
   },
 };
 
-export const aaveV3OpenOrderSubData = {
+export const aaveV3LeverageManagementOnPriceSubData = {
   encode(
     collAsset: EthereumAddress,
     collAssetId: number,
@@ -642,4 +644,83 @@ export const aaveV3OpenOrderSubData = {
       collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
     };
   },
-};
+};
+
+export const liquityV2LeverageManagementSubData = {
+  encode: (
+    market: EthereumAddress,
+    troveId: string,
+    ratioState: RatioState,
+    targetRatio: number,
+  ) => {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+
+    const isRepay = ratioState === RatioState.UNDER;
+    const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+    const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+
+    const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+    const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+
+    return [marketEncoded, troveIdEncoded, ratioStateEncoded, targetRatioEncoded, collActionTypeEncoded, debtActionTypeEncoded];
+  },
+  decode: (subData: SubData) => {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[2]) as any as RatioState;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      market, troveId, ratioState, targetRatio,
+    };
+  },
+};
+
+export const liquityV2CloseSubData = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
+  ): SubData {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+    const wethAddress = getAssetInfo('WETH').address;
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+
+    return [
+      marketEncoded,
+      troveIdEncoded,
+      collAddrEncoded,
+      boldTokenEncoded,
+      wethAddressEncoded,
+      closeTypeEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    // skip wethAddress
+    const closeType = AbiCoder.decodeParameter('uint8', subData[5]) as any as CloseStrategyType;
+
+    return {
+      market, troveId, collToken, boldToken, closeType,
+    };
+  },
+};

package/src/services/triggerService.ts

@@ -447,3 +447,56 @@ export const morphoBlueRatioTrigger = {
     };
   },
 };
+
+export const liquityV2RatioTrigger = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    ratioPercentage: number,
+    ratioState: RatioState,
+  ) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint8'], [market, troveId, ratioWei, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      market: decodedData[0] as EthereumAddress,
+      troveId: decodedData[1] as string,
+      ratio: weiToRatioPercentage(decodedData[2] as string),
+      ratioState: Number(decodedData[3]),
+    };
+  },
+};
+
+export const closePriceTrigger = {
+  encode(
+    tokenAddr: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'uint256', 'uint256'],
+        [tokenAddr, lowerPriceFormatted, upperPriceFormatted],
+      ),
+    ];
+  },
+  decode(triggerData: TriggerData): {
+    tokenAddr: EthereumAddress,
+    lowerPrice: string,
+    upperPrice: string,
+  } {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      tokenAddr: decodedData[0] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[1] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+    };
+  },
+};