@defisaver/automation-sdk 3.3.22-coll-switch-generic-dev → 3.3.22

package/cjs/services/subDataService.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData = exports.legacySparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.legacyExchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.legacyCompoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3DebtSwitchSubData = exports.aaveV3GenericFLCollateralSwitchSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData = exports.legacyAaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.legacyAaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.legacyLiquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData = exports.legacyMakerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
-exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkGenericFLCollateralSwitchSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceGenericSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = void 0;
+exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData = exports.legacySparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.legacyExchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.legacyCompoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData = exports.legacyAaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.legacyAaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.legacyLiquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData = exports.legacyMakerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkGenericFLCollateralSwitchSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceGenericSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -549,70 +549,6 @@ exports.aaveV3CollateralSwitchSubData = {
         };
     },
 };
-exports.aaveV3GenericFLCollateralSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
-        const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
-        const encodedFromAssetId = web3_eth_abi_1.default.encodeParameter('uint16', fromAssetId);
-        const encodedToAsset = web3_eth_abi_1.default.encodeParameter('address', toAsset);
-        const encodedToAssetId = web3_eth_abi_1.default.encodeParameter('uint16', toAssetId);
-        const encodedMarketAddr = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
-        const encodedAmountToSwitch = web3_eth_abi_1.default.encodeParameter('uint256', amountToSwitch);
-        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
-        return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUser,
-        ];
-    },
-    decode(subData) {
-        const fromAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const fromAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[1]));
-        const toAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const toAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[3]));
-        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
-        const amountToSwitch = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
-        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
-        return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-        };
-    },
-};
-exports.aaveV3DebtSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
-        const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
-        const encodedFromAssetId = web3_eth_abi_1.default.encodeParameter('uint8', fromAssetId);
-        const encodedToAsset = web3_eth_abi_1.default.encodeParameter('address', toAsset);
-        const encodedToAssetId = web3_eth_abi_1.default.encodeParameter('uint8', toAssetId);
-        const encodedMarketAddr = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
-        const encodedAmountToSwitch = web3_eth_abi_1.default.encodeParameter('uint256', amountToSwitch);
-        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
-        return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUser,
-        ];
-    },
-    decode(subData) {
-        const fromAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const fromAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[1]));
-        const toAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const toAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[3]));
-        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
-        const amountToSwitch = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
-        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
-        return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-        };
-    },
-};
 exports.aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = constants_1.ZERO_ADDRESS) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);

package/cjs/services/subDataService.test.js

@@ -535,145 +535,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        tokens_2.MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(subDataService.aaveV3DebtSwitchSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        fromAssetId: 1,
-                        toAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        toAssetId: 3,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: '10000000000000000000',
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        fromAssetId: 3,
-                        toAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        toAssetId: 1,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: tokens_2.MAXUINT,
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(subDataService.aaveV3DebtSwitchSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
-    describe('When testing subDataService.aaveV3GenericFLCollateralSwitchSubData', () => {
-        const fromAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address);
-        const toAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address);
-        const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-        const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
-        const examples = [
-            ['10000000000000000000', '0x0000000000000000000000000000000000000000000000008ac7230489e80000'],
-            [tokens_2.MAXUINT, '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'],
-        ];
-        examples.forEach(([amountToSwitch, encodedAmount]) => {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                '0x0000000000000000000000000000000000000000000000000000000000000100',
-                '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                '0x000000000000000000000000000000000000000000000000000000000000ffff',
-                '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                encodedAmount,
-                '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-            ];
-            it(`encode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                (0, chai_1.expect)(subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user)).to.eql(subData);
-            });
-            it(`decode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                (0, chai_1.expect)(subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subData)).to.eql({
-                    fromAsset,
-                    fromAssetId: 256,
-                    toAsset,
-                    toAssetId: 65535,
-                    marketAddr,
-                    amountToSwitch,
-                    user,
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
         describe('encode()', () => {
             const examples = [

package/cjs/types/enums.d.ts

@@ -91,34 +91,22 @@ export declare namespace Strategies {
         AAVE_V4_COLLATERAL_SWITCH = 154,
         AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
         SPARK_COLLATERAL_SWITCH = 156,
-        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
-        AAVE_V3_DEBT_SWITCH = 168,
-        AAVE_V3_DEBT_SWITCH_EOA = 169,
-        AAVE_V3_COLLATERAL_SWITCH_EOA = 170
+        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 24,
-        AAVE_V3_DEBT_SWITCH = 25,
-        AAVE_V3_DEBT_SWITCH_EOA = 26,
-        AAVE_V3_COLLATERAL_SWITCH_EOA = 27
+        AAVE_V3_COLLATERAL_SWITCH = 24
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 56,
-        AAVE_V3_DEBT_SWITCH = 61,
-        AAVE_V3_DEBT_SWITCH_EOA = 62,
-        AAVE_V3_COLLATERAL_SWITCH_EOA = 63
+        AAVE_V3_COLLATERAL_SWITCH = 56
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 50,
-        AAVE_V3_DEBT_SWITCH = 55,
-        AAVE_V3_DEBT_SWITCH_EOA = 56,
-        AAVE_V3_COLLATERAL_SWITCH_EOA = 57
+        AAVE_V3_COLLATERAL_SWITCH = 50
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -152,8 +140,6 @@ export declare namespace Strategies {
         EoaRepayOnPrice = "eoa-repay-on-price",
         CollateralSwitch = "collateral-switch",
         EoaCollateralSwitch = "eoa-collateral-switch",
-        DebtSwitch = "debt-switch",
-        EoaDebtSwitch = "eoa-debt-switch",
         LiquidationProtection = "liquidation-protection",
         EoaLiquidationProtection = "liquidation-protection-eoa"
     }

package/cjs/types/enums.js

@@ -108,36 +108,24 @@ var Strategies;
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
         MainnetIds[MainnetIds["SPARK_COLLATERAL_SWITCH"] = 156] = "SPARK_COLLATERAL_SWITCH";
         MainnetIds[MainnetIds["SPARK_GENERIC_FL_COLLATERAL_SWITCH"] = 167] = "SPARK_GENERIC_FL_COLLATERAL_SWITCH";
-        MainnetIds[MainnetIds["AAVE_V3_DEBT_SWITCH"] = 168] = "AAVE_V3_DEBT_SWITCH";
-        MainnetIds[MainnetIds["AAVE_V3_DEBT_SWITCH_EOA"] = 169] = "AAVE_V3_DEBT_SWITCH_EOA";
-        MainnetIds[MainnetIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 170] = "AAVE_V3_COLLATERAL_SWITCH_EOA";
     })(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_COLLATERAL_SWITCH"] = 24] = "AAVE_V3_COLLATERAL_SWITCH";
-        OptimismIds[OptimismIds["AAVE_V3_DEBT_SWITCH"] = 25] = "AAVE_V3_DEBT_SWITCH";
-        OptimismIds[OptimismIds["AAVE_V3_DEBT_SWITCH_EOA"] = 26] = "AAVE_V3_DEBT_SWITCH_EOA";
-        OptimismIds[OptimismIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 27] = "AAVE_V3_COLLATERAL_SWITCH_EOA";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
         BaseIds[BaseIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         BaseIds[BaseIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
         BaseIds[BaseIds["AAVE_V3_COLLATERAL_SWITCH"] = 56] = "AAVE_V3_COLLATERAL_SWITCH";
-        BaseIds[BaseIds["AAVE_V3_DEBT_SWITCH"] = 61] = "AAVE_V3_DEBT_SWITCH";
-        BaseIds[BaseIds["AAVE_V3_DEBT_SWITCH_EOA"] = 62] = "AAVE_V3_DEBT_SWITCH_EOA";
-        BaseIds[BaseIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 63] = "AAVE_V3_COLLATERAL_SWITCH_EOA";
     })(BaseIds = Strategies.BaseIds || (Strategies.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
         ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
         ArbitrumIds[ArbitrumIds["AAVE_V3_COLLATERAL_SWITCH"] = 50] = "AAVE_V3_COLLATERAL_SWITCH";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_DEBT_SWITCH"] = 55] = "AAVE_V3_DEBT_SWITCH";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_DEBT_SWITCH_EOA"] = 56] = "AAVE_V3_DEBT_SWITCH_EOA";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 57] = "AAVE_V3_COLLATERAL_SWITCH_EOA";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -172,8 +160,6 @@ var Strategies;
         Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
         Identifiers["CollateralSwitch"] = "collateral-switch";
         Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
-        Identifiers["DebtSwitch"] = "debt-switch";
-        Identifiers["EoaDebtSwitch"] = "eoa-debt-switch";
         Identifiers["LiquidationProtection"] = "liquidation-protection";
         Identifiers["EoaLiquidationProtection"] = "liquidation-protection-eoa";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));

package/cjs/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/esm/automation/private/StrategiesAutomation.d.ts

@@ -1,6 +1,6 @@
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
-import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber } from '../../types';
+import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber, ApiSubscriptionRecord } from '../../types';
 import type { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
@@ -30,6 +30,10 @@ export default class StrategiesAutomation extends Automation {
     protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
     protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
     getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records: ApiSubscriptionRecord[], options?: SubscriptionOptions): (Position.Automated | null)[];
     getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
 }
 export {};

package/esm/automation/private/StrategiesAutomation.js

@@ -14,6 +14,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';
 export default class StrategiesAutomation extends Automation {
     constructor(args) {
@@ -184,6 +185,17 @@ export default class StrategiesAutomation extends Automation {
             return this._getSubscriptions(undefined, options);
         });
     }
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records, options) {
+        const filtered = (options === null || options === void 0 ? void 0 : options.enabledOnly) ? records.filter((record) => record.is_enabled) : records;
+        let subscriptions = filtered.map((record) => this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId)));
+        if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
+            subscriptions = this.mergeSubs(subscriptions);
+        }
+        return (options === null || options === void 0 ? void 0 : options.unexpiredOnly) ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
+    }
     getSubscriptionsFor(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._getSubscriptions(addresses, options);

package/esm/automation/private/StrategiesAutomation.test.js

@@ -688,4 +688,55 @@ describe('Feature: StrategiesAutomation.ts', () => {
             expect(loneBoost === null || loneBoost === void 0 ? void 0 : 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 = {
+            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 = Object.assign(Object.assign({}, 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 === null || p === void 0 ? void 0 : p.subId)).to.eql([379, 380]);
+            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.isEnabled)).to.eql([true, false]);
+        });
+        it('Given mergeSubs option should merge the repay and boost pair', () => {
+            var _a, _b;
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { mergeSubs: true });
+            expect(positions).to.have.length(1);
+            expect((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.subIds).to.eql([379, 380]);
+            expect((_b = positions[0]) === null || _b === void 0 ? void 0 : _b.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 === null || p === void 0 ? void 0 : p.subId)).to.eql([379]);
+        });
+        it('Given a record of an unknown strategy should return null for it', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { strategy_or_bundle_id: 9999 })]);
+            expect(positions).to.eql([null]);
+        });
+    });
 });

package/esm/constants/index.js

@@ -101,11 +101,6 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
     [Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
         strategyOrBundleId: Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
         strategyId: Strategies.Identifiers.CollateralSwitch,
@@ -126,16 +121,6 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.EoaCollateralSwitch,
         protocol: PROTOCOLS.Spark,
     },
-    [Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const OPTIMISM_STRATEGIES_INFO = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -153,21 +138,6 @@ export const OPTIMISM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const BASE_STRATEGIES_INFO = {
     [Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -185,21 +155,6 @@ export const BASE_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.BaseIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const ARBITRUM_STRATEGIES_INFO = {
     [Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -217,21 +172,6 @@ export const ARBITRUM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const STRATEGIES_INFO = {
     [ChainId.Ethereum]: MAINNET_STRATEGIES_INFO,

package/esm/services/apiSubscriptionsService.d.ts

@@ -0,0 +1,7 @@
+import type { ApiSubscriptionRecord, ParseData } from '../types';
+import type { ChainId } from '../types/enums';
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+export declare function parseDataFromApiSubscription(record: ApiSubscriptionRecord, chainId: ChainId): ParseData;

package/esm/services/apiSubscriptionsService.js

@@ -0,0 +1,29 @@
+function addHexPrefix(value) {
+    return value.startsWith('0x') ? value : `0x${value}`;
+}
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+export function parseDataFromApiSubscription(record, chainId) {
+    return {
+        chainId,
+        blockNumber: record.block_number,
+        subscriptionEventData: {
+            subId: record.id.toString(),
+            proxy: record.wallet,
+            subHash: record.sub_data_hash,
+            subStruct: {
+                strategyOrBundleId: record.strategy_or_bundle_id.toString(),
+                isBundle: record.is_bundle,
+                triggerData: record.trigger_data.map(addHexPrefix),
+                subData: record.sub_data.map(addHexPrefix),
+            },
+        },
+        strategiesSubsData: {
+            userProxy: record.wallet,
+            isEnabled: record.is_enabled,
+            strategySubHash: record.sub_data_hash,
+        },
+    };
+}

package/esm/services/apiSubscriptionsService.test.d.ts

@@ -0,0 +1 @@
+import '../configuration';