@defisaver/automation-sdk 3.3.15-liq-prot-2-dev → 3.3.16

package/src/services/strategySubService.test.ts

@@ -1417,6 +1417,90 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
+    describe('leverageManagementOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          isBundle: boolean,
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          user: EthereumAddress,
+          targetRatio: number,
+          price: number,
+          priceState: RatioState,
+        ]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+            true,
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            200,
+            2500,
+            RatioState.UNDER,
+          ],
+        ],
+        [
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+            true,
+            ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+            true,
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            160,
+            4000,
+            RatioState.OVER,
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBlueEncode.leverageManagementOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('closeOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],

package/src/services/strategySubService.ts

@@ -1,26 +1,22 @@
-import { getAssetInfo } from '@defisaver/tokens';
 import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
 
-import { STRATEGY_IDS } from '../constants';
+import type { OrderType } from '../types/enums';
 import {
+  CloseToAssetType,
   Bundles,
   ChainId,
-  CloseToAssetType,
   RatioState,
   Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 
-import type { OrderType } from '../types/enums';
+import { STRATEGY_IDS } from '../constants';
 
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 import {
-  compareAddresses,
-  getBundleIdsByNetwork,
-  getCloseStrategyType,
-  requireAddress,
-  requireAddresses,
+  compareAddresses, getCloseStrategyType, requireAddress, requireAddresses,
 } from './utils';
 
 export const makerEncode = {
@@ -106,26 +102,6 @@ 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 = {
@@ -361,27 +337,6 @@ 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,
@@ -486,24 +441,6 @@ export const compoundV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-
-  liquidationProtectionWithoutSubProxy(
-    strategyOrBundleId: number,
-    market: EthereumAddress,
-    baseToken: EthereumAddress,
-    user: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
-  ) {
-    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,
@@ -654,26 +591,6 @@ 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,
@@ -770,35 +687,6 @@ 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,
@@ -927,22 +815,6 @@ 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 = {
@@ -960,22 +832,6 @@ 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,6 +734,78 @@ 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]]> = [
@@ -1492,6 +1564,116 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.morphoBlueLeverageManagementOnPriceSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress],
+      ]> = [
+        [
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+          ],
+          [
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            200,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+          ],
+        ],
+        [
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+          ],
+          [
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            160,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[
+        { loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress },
+        SubData,
+      ]> = [
+        [
+          {
+            loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+            oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+            irm: '0x0000000000000000000000000000000000000000',
+            lltv: '945000000000000000',
+            targetRatio: 200,
+            user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+          ],
+        ],
+        [
+          {
+            loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+            oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+            irm: '0x0000000000000000000000000000000000000000',
+            lltv: '945000000000000000',
+            targetRatio: 160,
+            user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]]> = [