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

package/esm/services/subDataService.test.js

@@ -1045,6 +1045,51 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.crvUSDPaybackSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+                        '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+                    ],
+                    ['0xa920de414ea4ab66b97da1bfe9e6eca7d4219635', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '20000', '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E'],
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService_1.crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        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)}`, () => {
+                    (0, chai_1.expect)(subDataService_1.crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1100,8 +1145,9 @@ describe('Feature: subDataService.ts', () => {
                         '0x0000000000000000000000000000000000000000000000000000000000000001',
                         '0x00000000000000000000000000000000000000000000000010a741a462780000',
                         '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
                     ],
-                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '945000000000000000', enums_1.RatioState.UNDER, 120, web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')]
+                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '945000000000000000', enums_1.RatioState.UNDER, 120, web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), false]
                 ],
                 [
                     [
@@ -1113,8 +1159,9 @@ describe('Feature: subDataService.ts', () => {
                         '0x0000000000000000000000000000000000000000000000000000000000000000',
                         '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
                         '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
                     ],
-                    [web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '860000000000000000', enums_1.RatioState.OVER, 200, web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c')]
+                    [web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '860000000000000000', enums_1.RatioState.OVER, 200, web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), false]
                 ],
             ];
             examples.forEach(([expected, actual]) => {
@@ -1175,4 +1222,61 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.aaveV3OpenOrderSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000004',
+                        '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
+                        4,
+                        web3Utils.toChecksumAddress('0x2f39d218133afab8f2b819b1066c7e434ad94e9e'),
+                        200,
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService_1.aaveV3OpenOrderSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.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)}`, () => {
+                    (0, chai_1.expect)(subDataService_1.aaveV3OpenOrderSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/services/triggerService.d.ts

@@ -172,6 +172,14 @@ export declare const crvUSDRatioTrigger: {
         ratioState: number;
     };
 };
+export declare const crvUsdHealthRatioTrigger: {
+    encode(owner: EthereumAddress, controller: EthereumAddress, ratioPercentage: number): string[];
+    decode(triggerData: string[]): {
+        owner: string;
+        controller: string;
+        ratio: number;
+    };
+};
 export declare const morphoBlueRatioTrigger: {
     encode(marketId: string, owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
     decode(triggerData: string[]): {

package/esm/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.morphoBlueRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = 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.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = 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"));
@@ -335,6 +335,20 @@ exports.crvUSDRatioTrigger = {
         };
     },
 };
+exports.crvUsdHealthRatioTrigger = {
+    encode(owner, controller, ratioPercentage) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256'], [owner, controller, ratioWei])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
+        return {
+            owner: decodedData[0],
+            controller: decodedData[1],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
+        };
+    },
+};
 exports.morphoBlueRatioTrigger = {
     encode(marketId, // bytes32
     owner, ratioPercentage, ratioState) {

package/esm/services/triggerService.test.js

@@ -859,6 +859,34 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.crvUsdHealthRatioTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000'],
+                    [web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'), web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), 20]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.crvUsdHealthRatioTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { 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)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.crvUsdHealthRatioTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing triggerService.morphoBlueRatioTrigger', () => {
         describe('encode()', () => {
             const examples = [

package/esm/types/enums.d.ts

@@ -58,15 +58,19 @@ export declare namespace Strategies {
         EXCHANGE_LIMIT_ORDER = 51,
         LIQUITY_DSR_PAYBACK = 69,
         LIQUITY_DSR_SUPPLY = 70,
-        LIQUITY_DEBT_IN_FRONT_REPAY = 75
+        LIQUITY_DEBT_IN_FRONT_REPAY = 75,
+        CURVEUSD_PAYBACK = 92,
+        AAVE_V3_OPEN_ORDER_FROM_DEBT = 96
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9
+        EXCHANGE_LIMIT_ORDER = 9,
+        AAVE_V3_OPEN_ORDER_FROM_DEBT = 12
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
-        EXCHANGE_LIMIT_ORDER = 9
+        EXCHANGE_LIMIT_ORDER = 9,
+        AAVE_V3_OPEN_ORDER_FROM_DEBT = 16
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -85,10 +89,13 @@ export declare 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"
+        DebtInFrontRepay = "debt-in-front-repay",
+        OpenOrderFromCollateral = "open-order-from-collateral",
+        OpenOrderFromDebt = "open-order-from-debt"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -132,14 +139,22 @@ export declare 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_BOOST = 33,
+        MORPHO_BLUE_EOA_REPAY = 34,
+        MORPHO_BLUE_EOA_BOOST = 35,
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
         AAVE_V3_BOOST = 1,
         AAVE_V3_CLOSE_TO_DEBT = 2,
-        AAVE_V3_CLOSE_TO_COLLATERAL = 3
+        AAVE_V3_CLOSE_TO_COLLATERAL = 3,
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -147,6 +162,7 @@ export declare namespace Bundles {
         AAVE_V3_CLOSE_TO_DEBT = 2,
         AAVE_V3_CLOSE_TO_COLLATERAL = 3,
         COMP_V3_SW_REPAY_BUNDLE = 4,
-        COMP_V3_SW_BOOST_BUNDLE = 5
+        COMP_V3_SW_BOOST_BUNDLE = 5,
+        AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6
     }
 }

package/esm/types/enums.js

@@ -71,16 +71,20 @@ var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DSR_PAYBACK"] = 69] = "LIQUITY_DSR_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
+        MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
+        MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 96] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
         OptimismIds[OptimismIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         OptimismIds[OptimismIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
+        OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 12] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
         ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 16] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -100,10 +104,13 @@ var Strategies;
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
+        Identifiers["Payback"] = "payback";
         Identifiers["BondProtection"] = "bond-protection";
         Identifiers["Dca"] = "dca";
         Identifiers["LimitOrder"] = "limit-order";
         Identifiers["DebtInFrontRepay"] = "debt-in-front-repay";
+        Identifiers["OpenOrderFromCollateral"] = "open-order-from-collateral";
+        Identifiers["OpenOrderFromDebt"] = "open-order-from-debt";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -150,8 +157,15 @@ var Bundles;
         MainnetIds[MainnetIds["COMP_V2_BOOST"] = 21] = "COMP_V2_BOOST";
         MainnetIds[MainnetIds["CRVUSD_REPAY"] = 26] = "CRVUSD_REPAY";
         MainnetIds[MainnetIds["CRVUSD_BOOST"] = 27] = "CRVUSD_BOOST";
+        MainnetIds[MainnetIds["COMP_V3_SW_REPAY_V2_BUNDLE"] = 28] = "COMP_V3_SW_REPAY_V2_BUNDLE";
+        MainnetIds[MainnetIds["COMP_V3_SW_BOOST_V2_BUNDLE"] = 29] = "COMP_V3_SW_BOOST_V2_BUNDLE";
+        MainnetIds[MainnetIds["COMP_V3_EOA_REPAY_V2_BUNDLE"] = 30] = "COMP_V3_EOA_REPAY_V2_BUNDLE";
+        MainnetIds[MainnetIds["COMP_V3_EOA_BOOST_V2_BUNDLE"] = 31] = "COMP_V3_EOA_BOOST_V2_BUNDLE";
         MainnetIds[MainnetIds["MORPHO_BLUE_REPAY"] = 32] = "MORPHO_BLUE_REPAY";
         MainnetIds[MainnetIds["MORPHO_BLUE_BOOST"] = 33] = "MORPHO_BLUE_BOOST";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_REPAY"] = 34] = "MORPHO_BLUE_EOA_REPAY";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST"] = 35] = "MORPHO_BLUE_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -159,6 +173,7 @@ var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_BOOST"] = 1] = "AAVE_V3_BOOST";
         OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_DEBT"] = 2] = "AAVE_V3_CLOSE_TO_DEBT";
         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 = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -168,5 +183,6 @@ var Bundles;
         ArbitrumIds[ArbitrumIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_REPAY_BUNDLE"] = 4] = "COMP_V3_SW_REPAY_BUNDLE";
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_BOOST_BUNDLE"] = 5] = "COMP_V3_SW_BOOST_BUNDLE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 6] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles = exports.Bundles || (exports.Bundles = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.0.2-dev",
+  "version": "3.0.2-dev2",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -12,7 +12,7 @@
     "build": "npm run lint && npm run build:umd && npm run build:esm",
     "documentMD": "npx typedoc --plugin typedoc-plugin-markdown --out docs/md",
     "document": "npx typedoc --out docs/default",
-    "lint": "node_modules/.bin/eslint ./src",
+    "lint": "eslint ./src",
     "gtc": "node scripts/generateContractTypes.js",
     "prepare": "husky install && npm run gtc",
     "test": "./.tests.sh"

package/src/automation/private/StrategiesAutomation.ts

@@ -46,7 +46,9 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getEventFromSubStorage(event: string, options?: PastEventOptions) {
-    if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || 0)) {
+    // only used for backfilling, so in case options?.fromBlock in undefined
+    // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+    if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || this.subStorageContract.createdBlock.toString())) {
       return [];
     }
     return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);

package/src/constants/index.ts

@@ -1,5 +1,5 @@
 import type {
-  ArbitrumBundleInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, StrategiesInfo,
+  ArbitrumBundleInfo, ArbitrumStrategiesInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, OptimismStrategiesInfo, StrategiesInfo,
 } from '../types';
 
 import {
@@ -12,6 +12,8 @@ import LegacyProtocol from '../automation/private/LegacyProtocol';
 // General
 export const ZERO_ADDRESS: EthereumAddress = '0x0000000000000000000000000000000000000000';
 
+export const AAVE_V3_VARIABLE_BORROW_RATE = 2;
+
 export const PROTOCOLS: Record<keyof typeof ProtocolIdentifiers.StrategiesAutomation, Interfaces.Protocol> = (() => {
   const protocolsMapping: any = {};
   Object.entries(ProtocolIdentifiers.StrategiesAutomation).forEach(([id, value]) => {
@@ -95,9 +97,19 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.DebtInFrontRepay,
     protocol: PROTOCOLS.Liquity,
   },
+  [Strategies.MainnetIds.CURVEUSD_PAYBACK]: {
+    strategyOrBundleId: Strategies.MainnetIds.CURVEUSD_PAYBACK,
+    strategyId: Strategies.Identifiers.Payback,
+    protocol: PROTOCOLS.CrvUSD,
+  },
+  [Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+    strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+    strategyId: Strategies.Identifiers.OpenOrderFromDebt,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
-export const OPTIMISM_STRATEGIES_INFO = {
+export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
   [Strategies.OptimismIds.EXCHANGE_DCA]: {
     strategyOrBundleId: Strategies.OptimismIds.EXCHANGE_DCA,
     strategyId: Strategies.Identifiers.Dca,
@@ -108,9 +120,14 @@ export const OPTIMISM_STRATEGIES_INFO = {
     strategyId: Strategies.Identifiers.LimitOrder,
     protocol: PROTOCOLS.Exchange,
   },
+  [Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+    strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+    strategyId: Strategies.Identifiers.OpenOrderFromDebt,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
-export const ARBITRUM_STRATEGIES_INFO = {
+export const ARBITRUM_STRATEGIES_INFO: ArbitrumStrategiesInfo = {
   [Strategies.ArbitrumIds.EXCHANGE_DCA]: {
     strategyOrBundleId: Strategies.ArbitrumIds.EXCHANGE_DCA,
     strategyId: Strategies.Identifiers.Dca,
@@ -121,6 +138,11 @@ export const ARBITRUM_STRATEGIES_INFO = {
     strategyId: Strategies.Identifiers.LimitOrder,
     protocol: PROTOCOLS.Exchange,
   },
+  [Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+    strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+    strategyId: Strategies.Identifiers.OpenOrderFromDebt,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const STRATEGIES_INFO: StrategiesInfo = {
@@ -178,6 +200,26 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaBoost,
     protocol: PROTOCOLS.CompoundV3,
   },
+  [Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.CompoundV3,
+  },
   [Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND]: {
     strategyOrBundleId: Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND,
     strategyId: Strategies.Identifiers.BondProtection,
@@ -303,6 +345,21 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.MorphoBlue,
   },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+    strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -326,6 +383,11 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     strategyId: Strategies.Identifiers.CloseToCollateral,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+    strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -359,6 +421,11 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.Repay,
     protocol: PROTOCOLS.CompoundV3,
   },
+  [Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+    strategyId: Strategies.Identifiers.OpenOrderFromCollateral,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {

package/src/services/ethereumService.ts

@@ -66,4 +66,4 @@ export async function getEventsFromContract<T extends BaseContract>(
   }
 
   return [...events, ...eventsFork];
-}
+}

package/src/services/strategiesService.ts

@@ -431,9 +431,8 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
-  _position.owner = triggerData.owner.toLowerCase();
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
+  _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 as Strategies.Identifiers);
 
@@ -692,7 +691,10 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
+
   const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
@@ -713,12 +715,26 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
   _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;
 }
 
+function parseCrvUSDPayback(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.crvUsdHealthRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.crvUSDPaybackSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller, Math.random());
+  _position.strategy.strategyId = Strategies.Identifiers.Payback;
+
+  return _position;
+}
+
 function parseMorphoBlueLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -729,7 +745,10 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
-  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.marketId);
+
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
   if (isRepay) {
     _position.specific = {
@@ -751,8 +770,21 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
+
+
+  return _position;
+}
+
+function parseAaveV3OpenOrderFromCollateral(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  _position.strategyData.decoded.triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+  _position.strategyData.decoded.subData = subDataService.aaveV3OpenOrderSubData.decode(subStruct.subData);
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
 
   return _position;
 }
@@ -788,6 +820,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
+    [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3OpenOrderFromCollateral,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -819,10 +852,13 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
     [Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
+    [Strategies.Identifiers.Payback]: parseCrvUSDPayback,
   },
   [ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
     [Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
+    [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
+    [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
   },
 };