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

package/src/services/strategySubService.test.ts

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import Dec from 'decimal.js';
 import { otherAddresses } from '@defisaver/sdk';
 import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
@@ -9,12 +8,10 @@ import type { EthereumAddress, StrategyOrBundleIds, SubData, TriggerData } from
 
 import '../configuration';
 import {
-  chickenBondsEncode,
   liquityEncode,
   makerEncode,
   aaveV3Encode,
   compoundV3Encode,
-  morphoAaveV2Encode,
   exchangeEncode,
   crvUSDEncode,
   morphoBlueEncode,
@@ -137,7 +134,7 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
-    describe('leverageManagementWithoutSubProxy()', () => {
+    describe('leverageManagement()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
@@ -187,7 +184,7 @@ describe('Feature: strategySubService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(makerEncode.leverageManagementWithoutSubProxy(...actual)).to.eql(expected);
+          expect(makerEncode.leverageManagement(...actual)).to.eql(expected);
         });
       });
     });
@@ -348,26 +345,6 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
-  describe('When testing strategySubService.chickenBondsEncode', () => {
-    describe('rebond()', () => {
-      const examples: Array<[
-        SubData,
-        [bondId: number],
-      ]> = [
-        [
-          ['0x00000000000000000000000000000000000000000000000000000000000005e3'],
-          [1507]
-        ]
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(chickenBondsEncode.rebond(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing strategySubService.aaveV3Encode', () => {
     describe('closeToAsset()', () => {
       const examples: Array<[
@@ -1156,27 +1133,6 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
-  describe('When testing strategySubService.morphoAaveV2Encode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
-        [
-          [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],
-          [160, 220, 180, 190, true]
-        ],
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing strategySubService.exchangeEncode', () => {
     describe('dca()', () => {
       const examples: Array<[
@@ -1417,6 +1373,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,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,7 +85,7 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     vaultId: number,
     triggerRatio: number,
     targetRatio: number,
@@ -93,7 +97,27 @@ export const makerEncode = {
 
     const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
 
-    const subData = subDataService.makerLeverageManagementWithoutSubProxy.encode(vaultId, targetRatio, daiAddr);
+    const subData = subDataService.makerLeverageManagementSubData.encode(vaultId, targetRatio, daiAddr);
+
+    return [
+      bundleId,
+      true,
+      triggerData,
+      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,
@@ -162,7 +186,7 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -171,7 +195,7 @@ export const liquityEncode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+    const subData = subDataService.liquityLeverageManagementSubData.encode(targetRatio, ratioState);
     const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -223,14 +247,8 @@ export const liquityEncode = {
   },
 };
 
-export const chickenBondsEncode = {
-  rebond(bondId: number) {
-    return subDataService.cBondsRebondSubData.encode(bondId);
-  },
-};
-
 export const aaveV2Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -240,7 +258,7 @@ export const aaveV2Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
+    const subData = subDataService.aaveV2LeverageManagementSubData.encode(market, targetRatio, ratioState);
     const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -314,7 +332,7 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -325,7 +343,7 @@ export const aaveV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(
+    const subData = subDataService.aaveV3LeverageManagementSubData.encode(
       targetRatio,
       ratioState,
       market,
@@ -337,6 +355,28 @@ 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,
+      true, // isGeneric
+    );
+    const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
   leverageManagementOnPriceGeneric(
     strategyOrBundleId: number,
     price: number,
@@ -408,7 +448,7 @@ export const aaveV3Encode = {
 };
 
 export const compoundV2Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -417,7 +457,7 @@ export const compoundV2Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+    const subData = subDataService.compoundV2LeverageManagementSubData.encode(targetRatio, ratioState);
     const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -425,7 +465,24 @@ export const compoundV2Encode = {
 };
 
 export const compoundV3Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    baseToken: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    const subData = subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, targetRatio, ratioState);
+    const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
+  liquidationProtection(
     strategyOrBundleId: number,
     market: EthereumAddress,
     baseToken: EthereumAddress,
@@ -436,11 +493,12 @@ export const compoundV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+    const subData = subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, targetRatio, ratioState);
     const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     market: EthereumAddress,
@@ -479,18 +537,6 @@ export const compoundV3Encode = {
   },
 };
 
-export const morphoAaveV2Encode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ) {
-    return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
-  },
-};
-
 export const exchangeEncode = {
   dca(
     fromToken: EthereumAddress,
@@ -508,7 +554,7 @@ export const exchangeEncode = {
 
     return [strategyId, false, triggerData, subData];
   },
-  limitOrderWithoutSubProxy(
+  limitOrder(
     fromToken: EthereumAddress,
     toToken: EthereumAddress,
     amount: string,
@@ -520,7 +566,7 @@ export const exchangeEncode = {
     network: ChainId,
   ) {
     requireAddresses([fromToken, toToken]);
-    const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
+    const subData = subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount);
     const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
 
     const strategyId = STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
@@ -573,7 +619,7 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -583,7 +629,7 @@ export const sparkEncode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(
+    const subData = subDataService.sparkLeverageManagementSubData.encode(
       targetRatio,
       ratioState,
     );
@@ -591,6 +637,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,
@@ -687,6 +753,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,
@@ -815,6 +910,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 = {
@@ -832,6 +943,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,