@defisaver/automation-sdk 3.0.2-dev → 3.0.2-dev2

package/src/services/strategySubService.test.ts

@@ -564,6 +564,60 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('openOrder()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          isBundle: boolean,
+          triggerData: {
+            baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState.UNDER
+          },
+          subData: {
+            collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number,
+          },
+        ]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000007acead34980000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000000000000000000000000000000000000000000a',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+            true,
+            {
+              baseTokenAddress: getAssetInfo('WETH').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 5274.534678, state: RatioState.UNDER
+            },
+            {
+              collAsset: getAssetInfo('WETH').address,
+              collAssetId: 10,
+              debtAsset: getAssetInfo('DAI').address,
+              debtAssetId: 4,
+              marketAddr: '0x2f39d218133afab8f2b819b1066c7e434ad94e9e',
+              targetRatio: 200,
+            },
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3Encode.openOrder(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
 
   describe('When testing strategySubService.compoundV2Encode', () => {
@@ -899,6 +953,44 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+    describe('payback()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [owner: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number],
+      ]> = [
+        [
+          [
+            Strategies.MainnetIds.CURVEUSD_PAYBACK,
+            false,
+            [
+              '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
+            ],
+            [
+              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            '20000',
+            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+            web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
+            20,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDEncode.payback(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
   describe('When testing strategySubService.morphoBlueEncode', () => {
     describe('leverageManagement()', () => {
@@ -915,6 +1007,7 @@ describe('Feature: strategySubService.ts', () => {
           targetRatio: number,
           triggerRatio: number,
           user: EthereumAddress,
+          isEoa: boolean,
         ],
       ]> = [
         [
@@ -933,6 +1026,7 @@ describe('Feature: strategySubService.ts', () => {
               '0x0000000000000000000000000000000000000000000000000000000000000001',
               '0x000000000000000000000000000000000000000000000000136dcc951d8c0000',
               '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
@@ -945,7 +1039,8 @@ describe('Feature: strategySubService.ts', () => {
             RatioState.UNDER,
             140,
             120,
-            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            false,
           ]
         ],
         [
@@ -964,6 +1059,7 @@ describe('Feature: strategySubService.ts', () => {
               '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x00000000000000000000000000000000000000000000000016345785d8a00000',
               '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
@@ -976,7 +1072,8 @@ describe('Feature: strategySubService.ts', () => {
             RatioState.OVER,
             160,
             200,
-            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            false,
           ]
         ],
       ];

package/src/services/strategySubService.ts

@@ -296,6 +296,28 @@ export const aaveV3Encode = {
     } = triggerData;
     const triggerDataEncoded = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
 
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
+  openOrder(
+    strategyOrBundleId: number,
+    isBundle: boolean = true,
+    triggerData: {
+      baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState.UNDER
+    },
+    subData: {
+      collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number,
+    },
+  ) {
+    const {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+    } = subData;
+    const subDataEncoded = subDataService.aaveV3OpenOrderSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
+
+    const {
+      baseTokenAddress, quoteTokenAddress, price, state,
+    } = triggerData;
+    const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 };
@@ -447,6 +469,23 @@ export const crvUSDEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  payback(
+    proxyAddress: EthereumAddress,
+    addressToPullTokensFrom: EthereumAddress,
+    positionOwner: EthereumAddress,
+    paybackAmount: string,
+    crvUSDAddr: EthereumAddress,
+    controllerAddr: EthereumAddress,
+    minHealthRatio: number,
+  ) {
+    const subData = subDataService.crvUSDPaybackSubData.encode(controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr);
+    const triggerData = triggerService.crvUsdHealthRatioTrigger.encode(proxyAddress, controllerAddr, minHealthRatio);
+
+    const strategyId = Strategies.MainnetIds.CURVEUSD_PAYBACK;
+    const isBundle = false;
+
+    return [strategyId, isBundle, triggerData, subData];
+  },
 };
 
 export const morphoBlueEncode = {
@@ -461,13 +500,17 @@ export const morphoBlueEncode = {
     targetRatio: number,
     triggerRatio: number,
     user: EthereumAddress,
+    isEOA: boolean,
   ) {
-    const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user);
+    const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
 
     const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
 
     // over is boost, under is repay
-    const strategyOrBundleId = ratioState === RatioState.OVER ? Bundles.MainnetIds.MORPHO_BLUE_BOOST : Bundles.MainnetIds.MORPHO_BLUE_REPAY;
+    const isBoost = ratioState === RatioState.OVER;
+    let strategyOrBundleId;
+    if (isBoost) strategyOrBundleId = isEOA ? Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST : Bundles.MainnetIds.MORPHO_BLUE_BOOST;
+    else strategyOrBundleId = isEOA ? Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY : Bundles.MainnetIds.MORPHO_BLUE_REPAY;
     const isBundle = true;
 
     return [strategyOrBundleId, isBundle, triggerData, subData];

package/src/services/subDataService.test.ts

@@ -30,8 +30,10 @@ import {
   sparkLeverageManagementSubData,
   sparkQuotePriceSubData,
   crvUSDLeverageManagementSubData,
-  compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData,
+  compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData, crvUSDPaybackSubData,
+  aaveV3OpenOrderSubData,
 } from './subDataService';
+import { AAVE_V3_VARIABLE_BORROW_RATE } from '../constants';
 
 describe('Feature: subDataService.ts', () => {
 
@@ -1125,6 +1127,58 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.crvUSDPaybackSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [controller: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress]]> = [
+        [
+          [
+            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+          ],
+          ['0xa920de414ea4ab66b97da1bfe9e6eca7d4219635', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '20000', '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E'],
+        ]
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{
+        controller: EthereumAddress,
+        addressToPullTokensFrom: EthereumAddress,
+        positionOwner: EthereumAddress,
+        paybackAmount: string,
+      }, SubData]> = [
+        [
+          {
+            controller: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
+            addressToPullTokensFrom: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+            positionOwner: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+            paybackAmount: '20000'
+          },
+          [
+            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[
@@ -1177,7 +1231,7 @@ describe('Feature: subDataService.ts', () => {
     describe('encode()', () => {
       const examples: Array<[
         SubData,
-        [loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress],
+        [loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress, isEOA: boolean],
       ]> = [
         [
           [
@@ -1189,8 +1243,9 @@ describe('Feature: subDataService.ts', () => {
             '0x0000000000000000000000000000000000000000000000000000000000000001',
             '0x00000000000000000000000000000000000000000000000010a741a462780000',
             '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '945000000000000000', RatioState.UNDER, 120, web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')]
+          [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '945000000000000000', RatioState.UNDER, 120, web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), false]
         ],
         [
           [
@@ -1202,8 +1257,9 @@ describe('Feature: subDataService.ts', () => {
             '0x0000000000000000000000000000000000000000000000000000000000000000',
             '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
             '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '860000000000000000', RatioState.OVER, 200, web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c')]
+          [web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '860000000000000000', RatioState.OVER, 200, web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), false]
         ],
       ];
 
@@ -1268,5 +1324,64 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.aaveV3OpenOrderSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]]> = [
+        [
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            4,
+            web3Utils.toChecksumAddress('0x2f39d218133afab8f2b819b1066c7e434ad94e9e'),
+            200,
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(aaveV3OpenOrderSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number}, SubData]> = [
+        [
+          {
+            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            collAssetId: 0,
+            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            debtAssetId: 4,
+            marketAddr: web3Utils.toChecksumAddress('0x2f39d218133afab8f2b819b1066c7e434ad94e9e'),
+            targetRatio: 200,
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+          ],
+        ],
+      ];
 
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3OpenOrderSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/subDataService.ts

@@ -1,5 +1,7 @@
 import Dec from 'decimal.js';
 import AbiCoder from 'web3-eth-abi';
+import { fromWei, toWei } from 'web3-utils';
+
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { otherAddresses } from '@defisaver/sdk';
 
@@ -7,7 +9,7 @@ import type { SubData, EthereumAddress } from '../types';
 import type { OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 
-import { ZERO_ADDRESS } from '../constants';
+import { AAVE_V3_VARIABLE_BORROW_RATE, ZERO_ADDRESS } from '../constants';
 
 import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './utils';
 
@@ -511,6 +513,42 @@ export const crvUSDLeverageManagementSubData = {
   },
 };
 
+export const crvUSDPaybackSubData = {
+  encode: (
+    controllerAddr: EthereumAddress,
+    addressToPullTokensFrom: EthereumAddress,
+    positionOwner: EthereumAddress,
+    paybackAmount: string,
+    crvUSDAddr: EthereumAddress,
+  ) => {
+    const controllerAddrEncoded = AbiCoder.encodeParameter('address', controllerAddr);
+    const addressToPullTokensFromEncoded = AbiCoder.encodeParameter('address', addressToPullTokensFrom);
+    const positionOwnerEncoded = AbiCoder.encodeParameter('address', positionOwner);
+    const paybackAmountEncoded = AbiCoder.encodeParameter('uint256', toWei(paybackAmount, 'ether'));
+    const crvUSDAddrEncoded = AbiCoder.encodeParameter('address', crvUSDAddr);
+    return [
+      controllerAddrEncoded,
+      addressToPullTokensFromEncoded,
+      positionOwnerEncoded,
+      paybackAmountEncoded,
+      crvUSDAddrEncoded,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const controller = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const addressToPullTokensFrom = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
+    const positionOwner = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const weiPaybackAmount = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const paybackAmount = fromWei(weiPaybackAmount, 'ether');
+    return {
+      controller,
+      addressToPullTokensFrom,
+      positionOwner,
+      paybackAmount,
+    };
+  },
+};
+
 export const morphoBlueLeverageManagementSubData = {
   encode: (
     loanToken: EthereumAddress,
@@ -521,6 +559,7 @@ export const morphoBlueLeverageManagementSubData = {
     ratioState: RatioState,
     targetRatio: number,
     user: EthereumAddress,
+    isEOA: boolean,
   ) => {
     const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
     const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
@@ -530,7 +569,8 @@ export const morphoBlueLeverageManagementSubData = {
     const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
     const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
     const userEncoded = AbiCoder.encodeParameter('address', user);
-    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded];
+    const isEOAEncoded = AbiCoder.encodeParameter('bool', isEOA);
+    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
   },
   decode: (subData: SubData) => {
     const loanToken = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
@@ -553,3 +593,53 @@ export const morphoBlueLeverageManagementSubData = {
     };
   },
 };
+
+export const aaveV3OpenOrderSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const useOnBehalfEncoded = AbiCoder.encodeParameter('bool', false);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedMarket,
+      encodedTargetRatio,
+      useOnBehalfEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+    };
+  },
+};

package/src/services/triggerService.test.ts

@@ -28,6 +28,7 @@ import {
   liquityDebtInFrontWithLimitTrigger,
   crvUSDRatioTrigger,
   morphoBlueRatioTrigger,
+  crvUsdHealthRatioTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -934,6 +935,35 @@ describe('Feature: triggerService.ts', () => {
     });
   });
 
+  describe('When testing triggerService.crvUsdHealthRatioTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [owner: EthereumAddress, controller: EthereumAddress, ratioPercentage: number]]> = [
+        [
+          ['0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000'],
+          [web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'), web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), 20]
+        ]
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUsdHealthRatioTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{ owner: EthereumAddress, controller: EthereumAddress, ratio: number }, TriggerData]> = [
+        [
+          { owner: web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'), controller: web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), ratio: 20 },
+          ['0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000'],
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUsdHealthRatioTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing triggerService.morphoBlueRatioTrigger', () => {
     describe('encode()', () => {
       const examples: Array<[[string], [marketId: string, owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState]]> = [

package/src/services/triggerService.ts

@@ -381,7 +381,6 @@ export const curveUsdSoftLiquidationTrigger = {
   },
 };
 
-
 export const crvUSDRatioTrigger = {
   encode(
     owner: EthereumAddress,
@@ -405,6 +404,27 @@ export const crvUSDRatioTrigger = {
   },
 };
 
+export const crvUsdHealthRatioTrigger = {
+  encode(
+    owner: EthereumAddress,
+    controller: EthereumAddress,
+    ratioPercentage: number,
+  ) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['address', 'address', 'uint256'], [owner, controller, ratioWei])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
+    return {
+      owner: decodedData[0] as EthereumAddress,
+      controller: decodedData[1] as EthereumAddress,
+      ratio: weiToRatioPercentage(decodedData[2] as string),
+    };
+  },
+};
+
 export const morphoBlueRatioTrigger = {
   encode(
     marketId: string, // bytes32

package/src/types/enums.ts

@@ -65,16 +65,20 @@ export namespace Strategies {
     LIQUITY_DSR_PAYBACK = 69,
     LIQUITY_DSR_SUPPLY = 70,
     LIQUITY_DEBT_IN_FRONT_REPAY = 75,
+    CURVEUSD_PAYBACK = 92,
+    AAVE_V3_OPEN_ORDER_FROM_DEBT = 96,
   }
 
   export enum OptimismIds {
     EXCHANGE_DCA = 8,
     EXCHANGE_LIMIT_ORDER = 9,
+    AAVE_V3_OPEN_ORDER_FROM_DEBT = 12,
   }
 
   export enum ArbitrumIds {
     EXCHANGE_DCA = 8,
     EXCHANGE_LIMIT_ORDER = 9,
+    AAVE_V3_OPEN_ORDER_FROM_DEBT = 16,
   }
 
   export enum Identifiers {
@@ -94,10 +98,13 @@ export namespace Strategies {
     TrailingStopToColl = 'trailing-stop-to-collateral',
     TrailingStopToDebt = 'trailing-stop-to-debt',
     Rebond = 'rebond',
+    Payback = 'payback',
     BondProtection = 'bond-protection',
     Dca = 'dca',
     LimitOrder = 'limit-order',
     DebtInFrontRepay = 'debt-in-front-repay',
+    OpenOrderFromCollateral = 'open-order-from-collateral',
+    OpenOrderFromDebt = 'open-order-from-debt',
   }
   export enum IdOverrides {
     TakeProfit = 'take-profit',
@@ -142,8 +149,15 @@ export namespace Bundles {
     COMP_V2_BOOST = 21,
     CRVUSD_REPAY = 26,
     CRVUSD_BOOST = 27,
+    COMP_V3_SW_REPAY_V2_BUNDLE = 28,
+    COMP_V3_SW_BOOST_V2_BUNDLE = 29,
+    COMP_V3_EOA_REPAY_V2_BUNDLE = 30,
+    COMP_V3_EOA_BOOST_V2_BUNDLE = 31,
     MORPHO_BLUE_REPAY = 32,
     MORPHO_BLUE_BOOST = 33,
+    MORPHO_BLUE_EOA_REPAY = 34,
+    MORPHO_BLUE_EOA_BOOST = 35,
+    AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
   }
 
   export enum OptimismIds {
@@ -151,6 +165,7 @@ export namespace Bundles {
     AAVE_V3_BOOST = 1,
     AAVE_V3_CLOSE_TO_DEBT = 2,
     AAVE_V3_CLOSE_TO_COLLATERAL = 3,
+    AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4,
   }
 
   export enum ArbitrumIds {
@@ -160,6 +175,7 @@ export namespace Bundles {
     AAVE_V3_CLOSE_TO_COLLATERAL = 3,
     COMP_V3_SW_REPAY_BUNDLE = 4,
     COMP_V3_SW_BOOST_BUNDLE = 5,
+    AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6,
   }
 }