@defisaver/automation-sdk 3.3.22-instant-twap-close-dev → 3.3.22

package/esm/services/strategySubService.js

@@ -164,13 +164,6 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    instantCloseOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, tsi, slippage, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
-        const isBundle = true;
-        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
-        const subDataEncoded = subDataService.aaveV3InstantCloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
     collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
         const isBundle = false;
         const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);

package/esm/services/strategySubService.test.js

@@ -732,117 +732,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('instantCloseOnPriceGeneric()', () => {
-            const examples = [
-                // Stop loss only (to debt)
-                [
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        true,
-                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                            '0x0000000000000000000000001234567890123456789012345678901234567890',
-                            '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-                            '0x000000000000000000000000000000000000000000000000002386f26fc10000',
-                        ],
-                    ],
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        0,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-                        '1000000000000000000',
-                        '10000000000000000',
-                        1500,
-                        CloseToAssetType.DEBT,
-                        0,
-                        CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
-                    ]
-                ],
-                // Take profit only (to collateral), zero tsi and slippage
-                [
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        true,
-                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-                        [
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                            '0x0000000000000000000000001234567890123456789012345678901234567890',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                        ],
-                    ],
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        0,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-                        '0',
-                        '0',
-                        0,
-                        CloseToAssetType.DEBT,
-                        5000,
-                        CloseToAssetType.COLLATERAL, // takeProfitType
-                    ]
-                ],
-                // Take profit (to debt) and stop loss (to collateral)
-                [
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        true,
-                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-                        [
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000000000000000000000000000000000000000000007',
-                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                            '0x0000000000000000000000001234567890123456789012345678901234567890',
-                            '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
-                            '0x0000000000000000000000000000000000000000000000000011c37937e08000',
-                        ],
-                    ],
-                    [
-                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        0,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-                        '50000000000000000',
-                        '5000000000000000',
-                        1500,
-                        CloseToAssetType.COLLATERAL,
-                        4000,
-                        CloseToAssetType.DEBT, // takeProfitType
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3Encode.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('collateralSwitch()', () => {
             const examples = [
                 // WETH -> USDC, price 100000, state UNDER

package/esm/services/subDataService.d.ts

@@ -248,20 +248,6 @@ export declare const aaveV3CloseGenericSubData: {
         owner: EthereumAddress;
     };
 };
-export declare const aaveV3InstantCloseGenericSubData: {
-    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress, tsi: string, slippage: string): string[];
-    decode(subData: string[]): {
-        collAsset: EthereumAddress;
-        collAssetId: number;
-        debtAsset: EthereumAddress;
-        debtAssetId: number;
-        closeType: CloseStrategyType;
-        marketAddr: EthereumAddress;
-        owner: EthereumAddress;
-        tsi: string;
-        slippage: string;
-    };
-};
 export declare const aaveV3CollateralSwitchSubData: {
     encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -511,44 +511,6 @@ export const aaveV3CloseGenericSubData = {
         };
     },
 };
-export const aaveV3InstantCloseGenericSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage) {
-        const encodedColl = AbiCoder.encodeParameter('address', collAsset);
-        const encodedCollId = AbiCoder.encodeParameter('uint16', collAssetId);
-        const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
-        const encodedDebtId = AbiCoder.encodeParameter('uint16', debtAssetId);
-        const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
-        const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
-        const encodedUser = AbiCoder.encodeParameter('address', user);
-        const encodedTsi = AbiCoder.encodeParameter('uint256', tsi);
-        const encodedSlippage = AbiCoder.encodeParameter('uint256', slippage);
-        return [
-            encodedColl,
-            encodedCollId,
-            encodedDebt,
-            encodedDebtId,
-            encodedCloseType,
-            encodedMarket,
-            encodedUser,
-            encodedTsi,
-            encodedSlippage,
-        ];
-    },
-    decode(subData) {
-        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
-        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
-        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
-        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
-        const owner = AbiCoder.decodeParameter('address', subData[6]);
-        const tsi = AbiCoder.decodeParameter('uint256', subData[7]);
-        const slippage = AbiCoder.decodeParameter('uint256', subData[8]);
-        return {
-            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
-        };
-    },
-};
 export const aaveV3CollateralSwitchSubData = {
     encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
         const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);

package/esm/services/subDataService.test.js

@@ -2256,76 +2256,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe("When testing subDataService.aaveV3InstantCloseGenericSubData", () => {
-        const WETH = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
-        const USDC = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
-        const MARKET = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-        const USER = web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890');
-        const examples = [
-            // TAKE_PROFIT_IN_COLLATERAL, zero tsi and slippage
-            [
-                [
-                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                    '0x0000000000000000000000000000000000000000000000000000000000000001',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                    '0x0000000000000000000000001234567890123456789012345678901234567890',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                ],
-                [WETH, 0, USDC, 1, CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL, MARKET, USER, '0', '0'],
-            ],
-            // STOP_LOSS_IN_DEBT
-            [
-                [
-                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                    '0x0000000000000000000000000000000000000000000000000000000000000001',
-                    '0x0000000000000000000000000000000000000000000000000000000000000003',
-                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                    '0x0000000000000000000000001234567890123456789012345678901234567890',
-                    '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-                    '0x000000000000000000000000000000000000000000000000002386f26fc10000',
-                ],
-                [WETH, 0, USDC, 1, CloseStrategyType.STOP_LOSS_IN_DEBT, MARKET, USER, '1000000000000000000', '10000000000000000'],
-            ],
-            // TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, asset ids above uint8 range
-            [
-                [
-                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    '0x000000000000000000000000000000000000000000000000000000000000012c',
-                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                    '0x0000000000000000000000000000000000000000000000000000000000000190',
-                    '0x0000000000000000000000000000000000000000000000000000000000000007',
-                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                    '0x0000000000000000000000001234567890123456789012345678901234567890',
-                    '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
-                    '0x0000000000000000000000000000000000000000000000000011c37937e08000',
-                ],
-                [WETH, 300, USDC, 400, CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, MARKET, USER, '50000000000000000', '5000000000000000'],
-            ],
-        ];
-        describe("encode()", () => {
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3InstantCloseGenericSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe("decode()", () => {
-            examples.forEach(([encoded, [collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage]]) => {
-                const expected = {
-                    collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner: user, tsi, slippage,
-                };
-                it(`Given ${JSON.stringify(encoded)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3InstantCloseGenericSubData.decode(encoded)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkLeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/types/enums.d.ts

@@ -124,8 +124,6 @@ export declare namespace Strategies {
         CloseOnPriceToColl = "close-on-price-to-collateral",
         CloseOnPrice = "close-on-price",
         EoaCloseOnPrice = "eoa-close-on-price",
-        InstantCloseOnPrice = "instant-close-on-price",
-        EoaInstantCloseOnPrice = "eoa-instant-close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -252,9 +250,7 @@ export declare namespace Bundles {
         SPARK_EOA_REPAY_ON_PRICE = 90,
         SPARK_EOA_BOOST_ON_PRICE = 91,
         SPARK_EOA_CLOSE = 92,
-        SPARK_EOA_LIQUIDATION_PROTECTION = 93,
-        AAVE_V3_SW_INSTANT_CLOSE = 94,
-        AAVE_V3_EOA_INSTANT_CLOSE = 95
+        SPARK_EOA_LIQUIDATION_PROTECTION = 93
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -269,9 +265,7 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST_ON_PRICE = 9,
         AAVE_V3_EOA_CLOSE = 10,
         AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
-        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
-        AAVE_V3_SW_INSTANT_CLOSE = 13,
-        AAVE_V3_EOA_INSTANT_CLOSE = 14
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -313,9 +307,7 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_BOOST_ON_PRICE = 39,
         MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
         MORPHO_BLUE_EOA_CLOSE = 41,
-        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
-        AAVE_V3_SW_INSTANT_CLOSE = 43,
-        AAVE_V3_EOA_INSTANT_CLOSE = 44
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -357,8 +349,6 @@ export declare namespace Bundles {
         MORPHO_BLUE_REPAY_ON_PRICE = 36,
         MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
         MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
-        MORPHO_BLUE_EOA_CLOSE = 39,
-        AAVE_V3_SW_INSTANT_CLOSE = 40,
-        AAVE_V3_EOA_INSTANT_CLOSE = 41
+        MORPHO_BLUE_EOA_CLOSE = 39
     }
 }

package/esm/types/enums.js

@@ -141,8 +141,6 @@ export var Strategies;
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
         Identifiers["CloseOnPrice"] = "close-on-price";
         Identifiers["EoaCloseOnPrice"] = "eoa-close-on-price";
-        Identifiers["InstantCloseOnPrice"] = "instant-close-on-price";
-        Identifiers["EoaInstantCloseOnPrice"] = "eoa-instant-close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -273,8 +271,6 @@ export var Bundles;
         MainnetIds[MainnetIds["SPARK_EOA_BOOST_ON_PRICE"] = 91] = "SPARK_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["SPARK_EOA_CLOSE"] = 92] = "SPARK_EOA_CLOSE";
         MainnetIds[MainnetIds["SPARK_EOA_LIQUIDATION_PROTECTION"] = 93] = "SPARK_EOA_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["AAVE_V3_SW_INSTANT_CLOSE"] = 94] = "AAVE_V3_SW_INSTANT_CLOSE";
-        MainnetIds[MainnetIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 95] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -291,9 +287,6 @@ export var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
         OptimismIds[OptimismIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 11] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
         OptimismIds[OptimismIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 12] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
-        // TODO -> Fix ids
-        OptimismIds[OptimismIds["AAVE_V3_SW_INSTANT_CLOSE"] = 13] = "AAVE_V3_SW_INSTANT_CLOSE";
-        OptimismIds[OptimismIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 14] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -337,8 +330,6 @@ export var Bundles;
         BaseIds[BaseIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 40] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
         BaseIds[BaseIds["MORPHO_BLUE_EOA_CLOSE"] = 41] = "MORPHO_BLUE_EOA_CLOSE";
         BaseIds[BaseIds["MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION"] = 42] = "MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION";
-        BaseIds[BaseIds["AAVE_V3_SW_INSTANT_CLOSE"] = 43] = "AAVE_V3_SW_INSTANT_CLOSE";
-        BaseIds[BaseIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 44] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -382,7 +373,5 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 37] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 38] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_CLOSE"] = 39] = "MORPHO_BLUE_EOA_CLOSE";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_SW_INSTANT_CLOSE"] = 40] = "AAVE_V3_SW_INSTANT_CLOSE";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 41] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/esm/types/index.d.ts

@@ -1,7 +1,7 @@
 import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
-import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
+import type { StrategyModel } from './contracts/generated/SubStorage';
 import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
@@ -53,6 +53,21 @@ interface _SubscriptionOptions {
     unexpiredOnly: boolean;
 }
 export type SubscriptionOptions = Partial<_SubscriptionOptions>;
+/** Subscription record as returned by the automation API (GET /v1/subscriptions) */
+export interface ApiSubscriptionRecord {
+    id: number;
+    wallet: EthereumAddress;
+    wallet_type: string;
+    is_enabled: boolean;
+    is_bundle: boolean;
+    strategy_or_bundle_id: number;
+    strategy_ids: number[];
+    sub_data_hash: string;
+    trigger_data: string[];
+    sub_data: string[];
+    block_number: number;
+    additional_triggers: string[] | null;
+}
 export declare namespace Interfaces {
     interface ProtocolBase {
         id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation;
@@ -291,10 +306,17 @@ export interface BundlesInfo {
     [ChainId.Base]: BaseBundleInfo;
 }
 export type StrategyOrBundleIds = typeof Strategies.MainnetIds[keyof typeof Strategies.MainnetIds] | typeof Strategies.OptimismIds[keyof typeof Strategies.OptimismIds] | typeof Strategies.ArbitrumIds[keyof typeof Strategies.ArbitrumIds] | typeof Strategies.BaseIds[keyof typeof Strategies.BaseIds] | typeof Bundles.MainnetIds[keyof typeof Bundles.MainnetIds] | typeof Bundles.OptimismIds[keyof typeof Bundles.OptimismIds] | typeof Bundles.ArbitrumIds[keyof typeof Bundles.ArbitrumIds] | typeof Bundles.BaseIds[keyof typeof Bundles.BaseIds];
+/** Fields of the Subscribe event that parsing relies on */
+export interface SubscriptionEventData {
+    subId: string;
+    proxy: EthereumAddress;
+    subHash: string;
+    subStruct: StrategyModel.StrategySubStructOutputStruct;
+}
 export interface ParseData {
     chainId: ChainId;
     blockNumber: BlockNumber;
-    subscriptionEventData: Subscribe['returnValues'];
+    subscriptionEventData: SubscriptionEventData;
     strategiesSubsData: StrategyModel.StoredSubDataStructOutputStruct;
 }
 type MapToProtocolVersion<T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.22-instant-twap-close-dev",
+  "version": "3.3.22",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/automation/private/StrategiesAutomation.test.ts

@@ -1,7 +1,8 @@
 import Web3 from 'web3';
 import { expect } from 'chai';
 
-import {ChainId} from '../../types/enums';
+import { ChainId } from '../../types/enums';
+import type { ApiSubscriptionRecord } from '../../types';
 
 import '../../configuration';
 import StrategiesAutomation from './StrategiesAutomation';
@@ -700,4 +701,67 @@ describe('Feature: StrategiesAutomation.ts', () => {
       expect(loneBoost?.subId).to.equal(1);
     });
   });
+
+  describe('When testing StrategiesAutomation.parseSubscriptionsFromApi', () => {
+    const strategiesAutomation = new StrategiesAutomation({
+      chainId: ChainId.Ethereum,
+      provider: Web3_1,
+      providerFork: null!,
+    });
+
+    const owner = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
+    const subData = [
+      '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+      '0x0000000000000000000000000000000000000000000000000000000000000001',
+      '0x0000000000000000000000000000000000000000000000000000000000000001',
+      '0x0000000000000000000000000000000000000000000000000000000000000000',
+    ];
+    // Aave V3 leverage management: repay (bundle 8, ratio under) and boost (bundle 9, ratio over) for the same owner and market
+    const repay: ApiSubscriptionRecord = {
+      id: 379,
+      wallet: owner,
+      wallet_type: 'safe',
+      is_enabled: true,
+      is_bundle: true,
+      strategy_or_bundle_id: 8,
+      strategy_ids: [34, 35],
+      sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+      trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001'],
+      sub_data: subData,
+      block_number: 18015756,
+      additional_triggers: null,
+    };
+    const boost: ApiSubscriptionRecord = {
+      ...repay,
+      id: 380,
+      is_enabled: false,
+      strategy_or_bundle_id: 9,
+      sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111',
+      trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'],
+    };
+
+    it('Given API records should return parsed positions', () => {
+      const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost]);
+      expect(positions).to.have.length(2);
+      expect(positions.map((p) => p?.subId)).to.eql([379, 380]);
+      expect(positions.map((p) => p?.isEnabled)).to.eql([true, false]);
+    });
+
+    it('Given mergeSubs option should merge the repay and boost pair', () => {
+      const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { mergeSubs: true });
+      expect(positions).to.have.length(1);
+      expect(positions[0]?.subIds).to.eql([379, 380]);
+      expect(positions[0]?.isEnabled).to.equal(true);
+    });
+
+    it('Given enabledOnly option should drop disabled records before parsing', () => {
+      const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { enabledOnly: true });
+      expect(positions.map((p) => p?.subId)).to.eql([379]);
+    });
+
+    it('Given a record of an unknown strategy should return null for it', () => {
+      const positions = strategiesAutomation.parseSubscriptionsFromApi([{ ...repay, strategy_or_bundle_id: 9999 }]);
+      expect(positions).to.eql([null]);
+    });
+  });
 });

package/src/automation/private/StrategiesAutomation.ts

@@ -4,6 +4,7 @@ import type { PastEventOptions } from 'web3-eth-contract';
 import PromisePool from 'es6-promise-pool';
 import type {
   Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
+  ApiSubscriptionRecord,
 } from '../../types';
 import type {
   StrategyModel, Subscribe, SubStorage, UpdateData,
@@ -15,6 +16,7 @@ import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
 import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
+import { parseDataFromApiSubscription } from '../../services/apiSubscriptionsService';
 
 import Automation from './Automation';
 
@@ -259,6 +261,21 @@ export default class StrategiesAutomation extends Automation {
     return this._getSubscriptions(undefined, options);
   }
 
+  /**
+   * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+   */
+  public parseSubscriptionsFromApi(records: ApiSubscriptionRecord[], options?: SubscriptionOptions): (Position.Automated | null)[] {
+    const filtered = options?.enabledOnly ? records.filter((record) => record.is_enabled) : records;
+
+    let subscriptions = filtered.map((record) => this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId)));
+
+    if (options?.mergeSubs) {
+      subscriptions = this.mergeSubs(subscriptions);
+    }
+
+    return options?.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
+  }
+
   public async getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
     return this._getSubscriptions(addresses, options);
   }

package/src/constants/index.ts

@@ -684,16 +684,6 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.Spark,
   },
-  [Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.InstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
-  [Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -762,16 +752,6 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
-  [Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.InstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
-  [Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
 };
 
 export const BASE_BUNDLES_INFO: BaseBundleInfo = {
@@ -975,16 +955,6 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.InstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
-  [Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -1189,16 +1159,6 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.InstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
-  [Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE,
-    strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
-    protocol: PROTOCOLS.AaveV3,
-  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {