@defisaver/automation-sdk 3.3.14 → 3.3.15-liq-prot-1-dev

package/src/services/strategySubService.ts

@@ -1,22 +1,26 @@
-import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
+import Dec from 'decimal.js';
 
-import type { OrderType } from '../types/enums';
+import { STRATEGY_IDS } from '../constants';
 import {
-  CloseToAssetType,
   Bundles,
   ChainId,
+  CloseToAssetType,
   RatioState,
   Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 
-import { STRATEGY_IDS } from '../constants';
+import type { OrderType } from '../types/enums';
 
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 import {
-  compareAddresses, getCloseStrategyType, requireAddress, requireAddresses,
+  compareAddresses,
+  getBundleIdsByNetwork,
+  getCloseStrategyType,
+  requireAddress,
+  requireAddresses,
 } from './utils';
 
 export const makerEncode = {
@@ -81,23 +85,6 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  leverageManagement(
-    vaultId: number,
-    triggerRepayRatio: string,
-    triggerBoostRatio: string,
-    targetBoostRatio: string,
-    targetRepayRatio: string,
-    boostEnabled: boolean,
-  ) {
-    return [
-      vaultId,
-      new Dec(triggerRepayRatio).mul(1e16).toString(),
-      new Dec(triggerBoostRatio).mul(1e16).toString(),
-      new Dec(targetBoostRatio).mul(1e16).toString(),
-      new Dec(targetRepayRatio).mul(1e16).toString(),
-      boostEnabled,
-    ];
-  },
   leverageManagementWithoutSubProxy(
     vaultId: number,
     triggerRatio: number,
@@ -119,6 +106,26 @@ export const makerEncode = {
       subData,
     ];
   },
+
+  liquidationProtection(
+    vaultId: number,
+    triggerRatio: number,
+    targetRatio: number,
+    ratioState: RatioState,
+    daiAddr?: EthereumAddress,
+  ) {
+    const bundleId = Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION;
+
+    const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
+    const subData = subDataService.makerLiquidationProtectionSubData.encode(vaultId, targetRatio, daiAddr);
+
+    return [
+      bundleId,
+      true,
+      triggerData,
+      subData,
+    ];
+  },
 };
 
 export const liquityEncode = {
@@ -179,20 +186,19 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
-  leverageManagement(
-    triggerRepayRatio:string,
-    triggerBoostRatio:string,
-    targetBoostRatio:string,
-    targetRepayRatio:string,
-    boostEnabled:boolean,
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
   ) {
-    return [
-      new Dec(triggerRepayRatio).mul(1e16).toString(),
-      new Dec(triggerBoostRatio).mul(1e16).toString(),
-      new Dec(targetBoostRatio).mul(1e16).toString(),
-      new Dec(targetRepayRatio).mul(1e16).toString(),
-      boostEnabled,
-    ];
+    const isBundle = true;
+
+    const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+    const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
   },
   dsrPayback(
     proxyAddress: EthereumAddress,
@@ -248,39 +254,24 @@ export const chickenBondsEncode = {
 };
 
 export const aaveV2Encode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
   ) {
-    return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    const isBundle = true;
+
+    const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
+    const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 };
 
 export const aaveV3Encode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ) {
-    let subInput = '0x';
-
-    subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(boostEnabled ? '01' : '00');
-
-    return subInput;
-  },
   closeToAsset(
     strategyOrBundleId: number,
     isBundle: boolean = true,
@@ -370,6 +361,27 @@ export const aaveV3Encode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 
+  liquidationProtection(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(
+      targetRatio,
+      ratioState,
+      market,
+      user,
+    );
+    const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
   leverageManagementOnPriceGeneric(
     strategyOrBundleId: number,
     price: number,
@@ -441,30 +453,57 @@ export const aaveV3Encode = {
 };
 
 export const compoundV2Encode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
   ) {
-    return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    const isBundle = true;
+
+    const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+    const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 };
 
 export const compoundV3Encode = {
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+    const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
+  liquidationProtectionWithoutSubProxy(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    baseToken: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
   ) {
-    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    const isBundle = true;
+
+    const subData = subDataService.compoundV3LiquidationProtectionSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+    const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     market: EthereumAddress,
@@ -503,21 +542,6 @@ export const compoundV3Encode = {
   },
 };
 
-export const compoundV3L2Encode = {
-  leverageManagement(
-    market: EthereumAddress,
-    baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean = false,
-  ) {
-    return subDataService.compoundV3L2LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
-  },
-};
-
 export const morphoAaveV2Encode = {
   leverageManagement(
     triggerRepayRatio: number,
@@ -547,40 +571,28 @@ export const exchangeEncode = {
 
     return [strategyId, false, triggerData, subData];
   },
-  limitOrder(
+  limitOrderWithoutSubProxy(
     fromToken: EthereumAddress,
     toToken: EthereumAddress,
     amount: string,
     targetPrice: string,
     goodUntil: string | number,
     orderType: OrderType,
+    fromTokenDecimals: number,
+    toTokenDecimals: number,
+    network: ChainId,
   ) {
-    return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
+    requireAddresses([fromToken, toToken]);
+    const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
+    const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
+
+    const strategyId = STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
+
+    return [strategyId, false, triggerData, subData];
   },
 };
 
 export const sparkEncode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ) {
-    let subInput = '0x';
-
-    subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(boostEnabled ? '01' : '00');
-
-    return subInput;
-  },
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     isBundle: boolean = true,
@@ -642,6 +654,26 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    const subData = subDataService.sparkLiquidationProtectionSubData.encode(
+      targetRatio,
+      ratioState,
+    );
+    const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
   collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,
@@ -738,6 +770,35 @@ export const morphoBlueEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    marketId: string,
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+    user: EthereumAddress,
+    isEOA: boolean,
+    network: ChainId,
+  ) {
+    const subData = subDataService.morphoBlueLiquidationProtectionSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
+
+    const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
+
+
+    // Type casting because there is no MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION for Base chain.
+    // That is fine because we will just always send isEOA == false for Base chain.
+    const bundleNetwork = getBundleIdsByNetwork(network) as typeof Bundles.MainnetIds;
+    const bundleId = isEOA ? bundleNetwork.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundleNetwork.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
+    const isBundle = true;
+
+    return [bundleId, isBundle, triggerData, subData];
+  },
+
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     isBundle: boolean = true,
@@ -866,6 +927,22 @@ export const fluidEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    nftId: string,
+    vault: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+    strategyOrBundleId: number,
+  ) {
+    const isBundle = true;
+    const subData = subDataService.fluidLiquidationProtectionSubData.encode(nftId, vault, ratioState, targetRatio);
+    const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
 };
 
 export const aaveV4Encode = {
@@ -883,6 +960,22 @@ export const aaveV4Encode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+    const subData = subDataService.aaveV4LiquidationProtectionSubData.encode(spoke, owner, ratioState, targetRatio);
+    const triggerData = triggerService.aaveV4RatioTrigger.encode(owner, spoke, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     owner: EthereumAddress,

package/src/services/subDataService.test.ts

@@ -734,78 +734,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
-        [
-          [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(220).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            true, false,
-          ],
-          [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            160, 220, 180, 190,
-            true, false,
-          ]
-        ],
-        [
-          [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(210).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            false, true,
-          ],
-          [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            160, 210, 180, 190,
-            false, true,
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('decode()', () => {
-      const examples: Array<[{ targetRatio: number }, SubData]> = [
-        [
-          { targetRatio: 123 },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-          ],
-        ],
-        [
-          { targetRatio: 200 },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-          ],
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
@@ -1408,54 +1336,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[
-        string,
-        [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean],
-      ]> = [
-        [
-          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
-          [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true, false]
-        ],
-        [
-          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
-          [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 110, false, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-    describe('decode()', () => {
-      const examples: Array<[{ targetRatio: number }, SubData]> = [
-        [
-          { targetRatio: 200 },
-          [
-            '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000213d212133AFaB8F2B829B1066c7E43cAd94E2c',
-           '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-          ],
-        ],
-        [
-          { targetRatio: 123 },
-          [
-            '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000413d212133AFaB8F2B829B1066c7E43cAd94E2c',
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-          ],
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[