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

package/src/services/strategySubService.test.ts

@@ -1457,6 +1457,93 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
+    describe('leverageManagementOnPriceGeneric()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          user: EthereumAddress,
+          targetRatio: number,
+          price: number,
+          priceState: RatioState,
+          isBoost: boolean,
+          isEOA: boolean,
+          network: ChainId,
+        ]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            200,
+            2500,
+            RatioState.UNDER,
+            false,
+            false,
+            ChainId.Ethereum,
+          ],
+        ],
+        [
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+            true,
+            ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            160,
+            4000,
+            RatioState.OVER,
+            true,
+            false,
+            ChainId.Ethereum,
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBlueEncode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('closeOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
@@ -1500,7 +1587,7 @@ describe('Feature: strategySubService.ts', () => {
             1500,
             CloseToAssetType.DEBT,
             4000,
-            CloseToAssetType.COLLATERAL
+            CloseToAssetType.COLLATERAL,
           ]
         ],
       ];
@@ -1511,6 +1598,63 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('closeOnPriceGeneric()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType,
+          isEOA: boolean,
+          network: ChainId,
+        ]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+            true,
+             ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000005',
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            1500,
+            CloseToAssetType.DEBT,
+            4000,
+            CloseToAssetType.COLLATERAL,
+            false,
+            ChainId.Ethereum,
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBlueEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
 
   describe('When testing strategySubService.sparkEncode', () => {

package/src/services/strategySubService.ts

@@ -17,7 +17,6 @@ import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 import {
   compareAddresses,
-  getBundleIdsByNetwork,
   getCloseStrategyType,
   requireAddress,
   requireAddresses,
@@ -718,6 +717,46 @@ export const crvUSDEncode = {
   },
 };
 
+export type MorphoBlueBundleStrategy = 'repay' | 'boost' | 'repayOnPrice' | 'boostOnPrice' | 'close' | 'liquidationProtection';
+
+function getMorphoBlueBundlesIds(network: ChainId) {
+  switch (network) {
+    case ChainId.Ethereum:
+      return Bundles.MainnetIds;
+    case ChainId.Base:
+      return Bundles.BaseIds;
+    case ChainId.Arbitrum:
+      return Bundles.ArbitrumIds;
+    default:
+      throw new Error(`Morpho Blue strategies are not supported on chain ${network}`);
+  }
+}
+
+export function getMorphoBlueBundleId(
+  network: ChainId,
+  strategy: MorphoBlueBundleStrategy,
+  isEOA: boolean,
+): number {
+  const bundlesIds = getMorphoBlueBundlesIds(network);
+
+  switch (strategy) {
+    case 'repay':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
+    case 'boost':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
+    case 'repayOnPrice':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE : bundlesIds.MORPHO_BLUE_REPAY_ON_PRICE;
+    case 'boostOnPrice':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE : bundlesIds.MORPHO_BLUE_BOOST_ON_PRICE;
+    case 'close':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_CLOSE : bundlesIds.MORPHO_BLUE_CLOSE;
+    case 'liquidationProtection':
+      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundlesIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
+    default:
+      throw new Error(`Unknown Morpho Blue strategy: ${strategy}`);
+  }
+}
+
 export const morphoBlueEncode = {
   leverageManagement(
     marketId: string,
@@ -739,19 +778,10 @@ export const morphoBlueEncode = {
 
     // over is boost, under is repay
     const isBoost = ratioState === RatioState.OVER;
-    let strategyOrBundleId;
-
-    if (network === ChainId.Base) {
-      return [isBoost ? Bundles.BaseIds.MORPHO_BLUE_BOOST : Bundles.BaseIds.MORPHO_BLUE_REPAY, true, triggerData, subData];
-    }
-
-    const bundlesIds = network === ChainId.Arbitrum ? Bundles.ArbitrumIds : Bundles.MainnetIds;
-
-    if (isBoost) strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
-    else strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
+    const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boost' : 'repay', isEOA);
     const isBundle = true;
 
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return [bundleId, isBundle, triggerData, subData];
   },
 
   liquidationProtection(
@@ -772,11 +802,7 @@ export const morphoBlueEncode = {
 
     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 bundleId = getMorphoBlueBundleId(network, 'liquidationProtection', isEOA);
     const isBundle = true;
 
     return [bundleId, isBundle, triggerData, subData];
@@ -799,6 +825,28 @@ export const morphoBlueEncode = {
     const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  leverageManagementOnPriceGeneric(
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    targetRatio: number,
+    price: number,
+    priceState: RatioState,
+    isBoost: boolean,
+    isEOA: boolean,
+    network: ChainId,
+  ) {
+    const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
+    const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+
+    const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boostOnPrice' : 'repayOnPrice', isEOA);
+    const isBundle = true;
+
+    return [bundleId, isBundle, triggerData, subData];
+  },
   closeOnPrice(
     strategyOrBundleId: number,
     loanToken: EthereumAddress,
@@ -820,6 +868,30 @@ export const morphoBlueEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
+  closeOnPriceGeneric(
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
+    isEOA: boolean,
+    network: ChainId,
+  ) {
+    const isBundle = true;
+    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+
+    const subDataEncoded = subDataService.morphoBlueCloseOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, user, closeType);
+    const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
+
+    const bundleId = getMorphoBlueBundleId(network, 'close', isEOA);
+
+    return [bundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
 };
 
 export const liquityV2Encode = {

package/src/services/utils.ts

@@ -174,15 +174,3 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(
   }
 }
 
-export function getBundleIdsByNetwork(network: ChainId) {
-  switch (Number(network)) {
-    case ChainId.Ethereum:
-      return Bundles.MainnetIds;
-    case ChainId.Arbitrum:
-      return Bundles.ArbitrumIds;
-    case ChainId.Base:
-      return Bundles.BaseIds;
-    default:
-      throw new Error(`Unsupported network ${network}`);
-  }
-}

package/src/types/enums.ts

@@ -256,6 +256,9 @@ export namespace Bundles {
     COMP_V3_SW_LIQUIDATION_PROTECTION = 82,
     COMP_V3_EOA_LIQUIDATION_PROTECTION = 83,
     MORPHO_BLUE_REPAY_ON_PRICE = 84,
+    MORPHO_BLUE_EOA_BOOST_ON_PRICE = 85,
+    MORPHO_BLUE_EOA_REPAY_ON_PRICE = 86,
+    MORPHO_BLUE_EOA_CLOSE = 87,
   }
 
   export enum OptimismIds {
@@ -309,6 +312,12 @@ export namespace Bundles {
     AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
     MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 35,
     MORPHO_BLUE_REPAY_ON_PRICE = 36,
+    MORPHO_BLUE_EOA_REPAY = 37,
+    MORPHO_BLUE_EOA_BOOST = 38,
+    MORPHO_BLUE_EOA_BOOST_ON_PRICE = 39,
+    MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
+    MORPHO_BLUE_EOA_CLOSE = 41,
+    MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
   }
 
   export enum ArbitrumIds {
@@ -349,5 +358,8 @@ export namespace Bundles {
     AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
     MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 35,
     MORPHO_BLUE_REPAY_ON_PRICE = 36,
+    MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
+    MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
+    MORPHO_BLUE_EOA_CLOSE = 39,
   }
 }