@defisaver/automation-sdk 3.3.1 → 3.3.2-dev.0

package/cjs/services/triggerService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compoundV3PriceRangeTrigger = exports.compoundV3PriceTrigger = exports.fluidRatioTrigger = exports.morphoBluePriceTrigger = exports.closePriceTrigger = exports.liquityV2QuotePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityV2AdjustTimeTrigger = exports.liquityV2DebtInFrontTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.aaveV3QuotePriceRangeTrigger = exports.compoundV3PriceRangeTrigger = exports.compoundV3PriceTrigger = exports.fluidRatioTrigger = exports.morphoBluePriceTrigger = exports.closePriceTrigger = exports.liquityV2QuotePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityV2AdjustTimeTrigger = exports.liquityV2DebtInFrontTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -507,3 +507,22 @@ exports.compoundV3PriceRangeTrigger = {
         };
     },
 };
+exports.aaveV3QuotePriceRangeTrigger = {
+    encode(collToken, debtToken, lowerPrice, upperPrice) {
+        // Price is scaled to 1e8
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256', 'uint256'], [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            collToken: decodedData[0],
+            debtToken: decodedData[1],
+            lowerPrice: new decimal_js_1.default(decodedData[2]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[3]).div(1e8).toString(),
+        };
+    },
+};

package/cjs/services/triggerService.test.js

@@ -1136,4 +1136,50 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.aaveV3PriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(triggerService_1.aaveV3QuotePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.aaveV3QuotePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/cjs/types/enums.d.ts

@@ -197,7 +197,12 @@ export declare namespace Bundles {
         COMP_V3_SW_CLOSE = 48,
         COMP_V3_EOA_REPAY_ON_PRICE = 49,
         COMP_V3_EOA_BOOST_ON_PRICE = 50,
-        COMP_V3_EOA_CLOSE = 51
+        COMP_V3_EOA_CLOSE = 51,
+        AAVE_V3_EOA_REPAY = 52,
+        AAVE_V3_EOA_BOOST = 53,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 54,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 55,
+        AAVE_V3_EOA_CLOSE = 56
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -205,7 +210,12 @@ export declare namespace Bundles {
         AAVE_V3_CLOSE_TO_DEBT = 2,
         AAVE_V3_CLOSE_TO_COLLATERAL = 3,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4,
-        AAVE_V3_REPAY_ON_PRICE = 5
+        AAVE_V3_REPAY_ON_PRICE = 5,
+        AAVE_V3_EOA_REPAY = 6,
+        AAVE_V3_EOA_BOOST = 7,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 8,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 9,
+        AAVE_V3_EOA_CLOSE = 10
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -228,7 +238,12 @@ export declare namespace Bundles {
         COMP_V3_EOA_BOOST_ON_PRICE = 19,
         COMP_V3_EOA_CLOSE = 20,
         COMP_V3_EOA_REPAY = 21,
-        COMP_V3_EOA_BOOST = 22
+        COMP_V3_EOA_BOOST = 22,
+        AAVE_V3_EOA_REPAY = 23,
+        AAVE_V3_EOA_BOOST = 24,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 25,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 26,
+        AAVE_V3_EOA_CLOSE = 27
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -248,6 +263,11 @@ export declare namespace Bundles {
         COMP_V3_EOA_BOOST_ON_PRICE = 14,
         COMP_V3_EOA_CLOSE = 15,
         COMP_V3_EOA_REPAY = 16,
-        COMP_V3_EOA_BOOST = 17
+        COMP_V3_EOA_BOOST = 17,
+        AAVE_V3_EOA_REPAY = 18,
+        AAVE_V3_EOA_BOOST = 19,
+        AAVE_V3_EOA_REPAY_ON_PRICE = 20,
+        AAVE_V3_EOA_BOOST_ON_PRICE = 21,
+        AAVE_V3_EOA_CLOSE = 22
     }
 }

package/cjs/types/enums.js

@@ -221,6 +221,12 @@ var Bundles;
         MainnetIds[MainnetIds["COMP_V3_EOA_REPAY_ON_PRICE"] = 49] = "COMP_V3_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["COMP_V3_EOA_BOOST_ON_PRICE"] = 50] = "COMP_V3_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["COMP_V3_EOA_CLOSE"] = 51] = "COMP_V3_EOA_CLOSE";
+        // TODO -> Watch out for Liquity V2 Strategy deploy, should change IDs or here or there !!!
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY"] = 52] = "AAVE_V3_EOA_REPAY";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST"] = 53] = "AAVE_V3_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -230,6 +236,11 @@ var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 4] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_REPAY_ON_PRICE"] = 5] = "AAVE_V3_REPAY_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY"] = 6] = "AAVE_V3_EOA_REPAY";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST"] = 7] = "AAVE_V3_EOA_BOOST";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 8] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 9] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -254,6 +265,11 @@ var Bundles;
         BaseIds[BaseIds["COMP_V3_EOA_CLOSE"] = 20] = "COMP_V3_EOA_CLOSE";
         BaseIds[BaseIds["COMP_V3_EOA_REPAY"] = 21] = "COMP_V3_EOA_REPAY";
         BaseIds[BaseIds["COMP_V3_EOA_BOOST"] = 22] = "COMP_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY"] = 23] = "AAVE_V3_EOA_REPAY";
+        BaseIds[BaseIds["AAVE_V3_EOA_BOOST"] = 24] = "AAVE_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 25] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        BaseIds[BaseIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 26] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        BaseIds[BaseIds["AAVE_V3_EOA_CLOSE"] = 27] = "AAVE_V3_EOA_CLOSE";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -275,5 +291,10 @@ var Bundles;
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_CLOSE"] = 15] = "COMP_V3_EOA_CLOSE";
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_REPAY"] = 16] = "COMP_V3_EOA_REPAY";
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_BOOST"] = 17] = "COMP_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY"] = 18] = "AAVE_V3_EOA_REPAY";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST"] = 19] = "AAVE_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 20] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 21] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_CLOSE"] = 22] = "AAVE_V3_EOA_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles = exports.Bundles || (exports.Bundles = {}));

package/esm/constants/index.js

@@ -422,6 +422,31 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.CompoundV3,
     },
+    [Bundles.MainnetIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -454,6 +479,31 @@ export const OPTIMISM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.RepayOnPrice,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.OptimismIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.OptimismIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.OptimismIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BASE_BUNDLES_INFO = {
     [Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -561,6 +611,31 @@ export const BASE_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaBoost,
         protocol: PROTOCOLS.CompoundV3,
     },
+    [Bundles.BaseIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.BaseIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.BaseIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const ARBITRUM_BUNDLES_INFO = {
     [Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -653,6 +728,31 @@ export const ARBITRUM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaBoost,
         protocol: PROTOCOLS.CompoundV3,
     },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BUNDLES_INFO = {
     [ChainId.Ethereum]: MAINNET_BUNDLES_INFO,

package/esm/index.d.ts

@@ -13,11 +13,12 @@ import * as strategiesService from './services/strategiesService';
 import * as constants from './constants';
 import * as enums from './types/enums';
 import type * as types from './types';
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType } from './services/utils';
 declare const utils: {
     getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
     compareSubHashes: typeof compareSubHashes;
     encodeSubId: typeof encodeSubId;
+    getCloseStrategyType: typeof getCloseStrategyType;
 };
 export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
 export type { types };

package/esm/index.js

@@ -16,8 +16,8 @@ import * as strategySubService from './services/strategySubService';
 import * as strategiesService from './services/strategiesService';
 import * as constants from './constants';
 import * as enums from './types/enums';
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType, } from './services/utils';
 const utils = {
-    getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId,
+    getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType,
 };
 export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };

package/esm/services/strategiesService.js

@@ -160,21 +160,25 @@ function parseAaveV2LeverageManagement(position, parseData) {
 }
 function parseAaveV3LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    // TODO -> check if this change breaks something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    // TODO -> check if this change breaks something?
+    const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -183,10 +187,11 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
-    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
@@ -239,7 +244,13 @@ function parseAaveV3CloseOnPrice(position, parseData) {
         ratioState: triggerData.ratioState,
     };
     const { ratioState } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+    // TODO -> Check if those changes break something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA
+        ? Strategies.Identifiers.EoaCloseOnPrice
+        : (_position.strategy.strategyId = isRatioStateOver(ratioState)
+            ? Strategies.IdOverrides.TakeProfit
+            : Strategies.IdOverrides.StopLoss);
     return _position;
 }
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
@@ -313,13 +324,14 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
     const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -328,10 +340,9 @@ function parseCompoundV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: Strategies.Identifiers.Boost,
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
-    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
@@ -685,6 +696,9 @@ function parseAaveV3LeverageManagementOnPrice(position, parseData) {
         collAssetId: subData.collAssetId,
         ratio: subData.targetRatio,
     };
+    // TODO -> check if this change breaks something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseLiquityV2CloseOnPrice(position, parseData) {
@@ -824,6 +838,11 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
         [Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -60,7 +60,9 @@ export declare const aaveV3Encode: {
         marketAddr: EthereumAddress;
         targetRatio: number;
     }): (number | boolean | string[])[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, isGeneric?: boolean): (number | boolean | string[])[];
+    leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
+    closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];

package/esm/services/strategySubService.js

@@ -146,12 +146,25 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
         const isBundle = true;
-        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState, market, user, isGeneric);
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementOnPriceGeneric(strategyOrBundleId, price, ratioState, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        const isBundle = true;
+        const subDataEncoded = subDataService.aaveV3LeverageManagementOnPriceGeneric.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(collAsset, debtAsset, price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+    closeOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subDataEncoded = subDataService.aaveV3CloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 export const compoundV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {