@defisaver/automation-sdk 3.3.19 → 3.3.21-coll-switch-generic-dev

package/esm/services/subDataService.test.js

@@ -510,6 +510,145 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                // USDC -> DAI
+                [
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        3,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        '10000000000000000000',
+                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+                    ]
+                ],
+                // DAI -> USDC (MaxUint256)
+                [
+                    [
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        3,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        MAXUINT,
+                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3DebtSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                // USDC -> DAI
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        fromAssetId: 1,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', 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(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        fromAssetId: 3,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        toAssetId: 1,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        amountToSwitch: 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)}`, () => {
+                    expect(subDataService.aaveV3DebtSwitchSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV3GenericFLCollateralSwitchSubData', () => {
+        const fromAsset = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
+        const toAsset = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
+        const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
+        const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
+        const examples = [
+            ['10000000000000000000', '0x0000000000000000000000000000000000000000000000008ac7230489e80000'],
+            [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}`, () => {
+                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}`, () => {
+                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/esm/types/enums.d.ts

@@ -91,22 +91,30 @@ 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
+        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
+        AAVE_V3_DEBT_SWITCH = 168,
+        AAVE_V3_DEBT_SWITCH_EOA = 169
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 24
+        AAVE_V3_COLLATERAL_SWITCH = 24,
+        AAVE_V3_DEBT_SWITCH = 25,
+        AAVE_V3_DEBT_SWITCH_EOA = 26
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 56
+        AAVE_V3_COLLATERAL_SWITCH = 56,
+        AAVE_V3_DEBT_SWITCH = 61,
+        AAVE_V3_DEBT_SWITCH_EOA = 62
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 50
+        AAVE_V3_COLLATERAL_SWITCH = 50,
+        AAVE_V3_DEBT_SWITCH = 55,
+        AAVE_V3_DEBT_SWITCH_EOA = 56
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -140,6 +148,8 @@ 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/esm/types/enums.js

@@ -105,24 +105,32 @@ export 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 = 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 = 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 = 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 = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -157,6 +165,8 @@ export 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.19",
+  "version": "3.3.21-coll-switch-generic-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,6 +22,17 @@
   "author": "DeFi Saver",
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
+  "overrides": {
+    "axios": "^1.19.0",
+    "tar": "^7.5.21",
+    "ws": "^8.18.3",
+    "form-data": "^4.0.4",
+    "tough-cookie": "^4.1.3",
+    "qs": "^6.16.0",
+    "serialize-javascript": "^7.1.0",
+    "fast-uri": "^3.1.8",
+    "js-yaml": "^4.3.2"
+  },
   "dependencies": {
     "@defisaver/sdk": "^1.3.22",
     "@defisaver/tokens": "^1.6.19",
@@ -44,7 +55,6 @@
     "dotenv": "^16.3.1",
     "eslint": "^8.49.0",
     "husky": "^8.0.0",
-    "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^10.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",

package/src/constants/index.ts

@@ -145,6 +145,16 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     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: OptimismStrategiesInfo = {
@@ -163,6 +173,16 @@ export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
     strategyId: Strategies.Identifiers.CollateralSwitch,
     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: BaseStrategiesInfo = {
@@ -181,6 +201,16 @@ export const BASE_STRATEGIES_INFO: BaseStrategiesInfo = {
     strategyId: Strategies.Identifiers.CollateralSwitch,
     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: ArbitrumStrategiesInfo = {
@@ -199,6 +229,16 @@ export const ARBITRUM_STRATEGIES_INFO: ArbitrumStrategiesInfo = {
     strategyId: Strategies.Identifiers.CollateralSwitch,
     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: StrategiesInfo = {

package/src/services/strategiesService.test.ts

@@ -1,12 +1,117 @@
 import { expect } from 'chai';
 
-import { ProtocolIdentifiers, Strategies } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, RatioState, Strategies } from '../types/enums';
 import type { ParseData, Position } from '../types';
+import { MAINNET_STRATEGIES_INFO } from '../constants';
 
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
 
 describe('Feature: strategiesService.ts', () => {
+  describe('When parsing Aave V3 collateral switch subscriptions', () => {
+    const proxy = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
+    const user = '0x1234567890123456789012345678901234567890';
+    const fromAsset = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
+    const toAsset = '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf';
+    const marketAddr = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
+    const amountToSwitch = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
+    const subHash = `0x${'ab'.repeat(32)}`;
+    const triggerData = [
+      '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
+      + '000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf'
+      + '0000000000000000000000000000000000000000000000000000000000989680'
+      + '0000000000000000000000000000000000000000000000000000000000000001',
+    ];
+
+    function getParseData(strategyId: number, isGeneric: boolean, chainId = ChainId.Ethereum): ParseData {
+      const subData = [
+        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+        isGeneric
+          ? '0x0000000000000000000000000000000000000000000000000000000000000100'
+          : '0x0000000000000000000000000000000000000000000000000000000000000000',
+        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+        isGeneric
+          ? '0x000000000000000000000000000000000000000000000000000000000000ffff'
+          : '0x0000000000000000000000000000000000000000000000000000000000000007',
+        '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+        isGeneric
+          ? '0x0000000000000000000000001234567890123456789012345678901234567890'
+          : '0x0000000000000000000000000000000000000000000000000000000000000000',
+      ];
+      const subStruct = Object.assign(
+        [String(strategyId), false, triggerData, subData] as [string, boolean, string[], string[]],
+        { strategyOrBundleId: String(strategyId), isBundle: false, triggerData, subData },
+      );
+      return {
+        chainId,
+        blockNumber: 18015756,
+        subscriptionEventData: {
+          subId: '379', proxy, subHash, subStruct,
+          0: '379', 1: proxy, 2: subHash, 3: subStruct,
+        },
+        strategiesSubsData: {
+          userProxy: proxy, isEnabled: true, strategySubHash: subHash,
+        },
+      };
+    }
+
+    it('decodes generic collateral switches with the user and uint16 reserve IDs', () => {
+      const strategyId = Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH;
+      const originalInfo = MAINNET_STRATEGIES_INFO[strategyId];
+      const parseData = getParseData(strategyId, true);
+      let position: Position.Automated;
+      MAINNET_STRATEGIES_INFO[strategyId] = {
+        ...originalInfo,
+        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
+      };
+      try {
+        position = parseStrategiesAutomatedPosition(parseData)!;
+      } finally {
+        MAINNET_STRATEGIES_INFO[strategyId] = originalInfo;
+      }
+
+      expect(position).not.to.equal(null);
+      expect(position.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
+      expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.EoaCollateralSwitch);
+      expect(position.strategy.isBundle).to.equal(false);
+      expect(position.strategyData.encoded).to.eql({
+        triggerData,
+        subData: parseData.subscriptionEventData.subStruct.subData,
+      });
+      expect(position.strategyData.decoded.triggerData).to.eql({
+        baseTokenAddress: fromAsset,
+        quoteTokenAddress: toAsset,
+        price: '0.1',
+        ratioState: RatioState.UNDER,
+      });
+      expect(position.strategyData.decoded.subData).to.eql({
+        fromAsset, fromAssetId: 256, toAsset, toAssetId: 65535, marketAddr, amountToSwitch, user,
+      });
+      expect(position.owner).to.equal(proxy.toLowerCase());
+      expect(position.positionId).to.equal(`1-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
+    });
+
+    const legacyStrategies: Array<[ChainId, number]> = [
+      [ChainId.Ethereum, Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH],
+      [ChainId.Optimism, Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH],
+      [ChainId.Arbitrum, Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH],
+      [ChainId.Base, Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH],
+    ];
+    legacyStrategies.forEach(([chainId, strategyId]) => {
+      it(`continues to decode legacy collateral switches on chain ${chainId}`, () => {
+        const position = parseStrategiesAutomatedPosition(getParseData(strategyId, false, chainId))!;
+
+        expect(position).not.to.equal(null);
+        expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.CollateralSwitch);
+        expect(position.strategyData.decoded.subData).to.eql({
+          fromAsset, fromAssetId: 0, toAsset, toAssetId: 7, marketAddr, amountToSwitch,
+        });
+        expect(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
+      });
+    });
+  });
+
   describe('When testing strategiesService.parseStrategiesAutomatedPosition', async () => {
     // TODO: we should probably write this for every strategy?
     const examples: Array<[Position.Automated | null, ParseData]> = [

package/src/services/strategiesService.ts

@@ -434,12 +434,31 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
 }
 
 function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = isEOA
+    ? subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subStruct.subData)
+    : subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+  _position.strategy.strategyId = isEOA
+    ? Strategies.Identifiers.EoaCollateralSwitch
+    : Strategies.Identifiers.CollateralSwitch;
+
+  return _position;
+}
+
+function parseAaveV3DebtSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
   const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
+  const subData = subDataService.aaveV3DebtSwitchSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+  // TODO -> This isn't enough for ID
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
 
   return _position;
@@ -1597,6 +1616,9 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
+    [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
+    [Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
+    [Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
     [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
   },

package/src/services/strategySubService.test.ts

@@ -1002,6 +1002,137 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('collateralSwitchGeneric()', () => {
+      const strategyId = 12345;
+      const fromAsset = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
+      const toAsset = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
+      const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
+      const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
+      const examples: Array<[RatioState, string, string, string]> = [
+        [
+          RatioState.UNDER,
+          '10000000000000000000',
+          '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+          '0000000000000000000000000000000000000000000000000000000000000001',
+        ],
+        [
+          RatioState.OVER,
+          MAXUINT,
+          '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+          '0000000000000000000000000000000000000000000000000000000000000000',
+        ],
+      ];
+
+      examples.forEach(([state, amountToSwitch, encodedAmount, encodedState]) => {
+        it(`encodes a generic collateral switch with the supplied quote pair and state ${state}`, () => {
+          const expectedTrigger = `0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e8${encodedState}`;
+          const expectedSubData: SubData = [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000100',
+            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+            '0x000000000000000000000000000000000000000000000000000000000000ffff',
+            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+            encodedAmount,
+            '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
+          ];
+
+          expect(aaveV3Encode.collateralSwitchGeneric(
+            strategyId, fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user,
+            toAsset, fromAsset, 0.00001, state,
+          )).to.eql([strategyId, false, [expectedTrigger], expectedSubData]);
+        });
+      });
+    });
+
+    describe('debtSwitch()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          fromAsset: EthereumAddress,
+          fromAssetId: number,
+          toAsset: EthereumAddress,
+          toAssetId: number,
+          marketAddr: EthereumAddress,
+          amountToSwitch: string,
+          user: EthereumAddress,
+          baseTokenAddress: EthereumAddress,
+          quoteTokenAddress: EthereumAddress,
+          price: number,
+          state: RatioState,
+        ]
+      ]> = [
+        // USDC -> DAI, price 100000, state UNDER
+        [
+          [
+            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            false,
+            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000003',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+              '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+            ],
+          ],
+          [
+            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            3,
+            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+            '10000000000000000000', // 10 tokens
+            web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            100000,
+            RatioState.UNDER,
+          ]
+        ],
+        // DAI -> USDC (MaxUint256), price 1, state OVER
+        [
+          [
+            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            false,
+            ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000003',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+              '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+            ],
+          ],
+          [
+            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            3,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+            MAXUINT, // MaxUint256
+            web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            RatioState.OVER,
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3Encode.debtSwitch(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
 
   describe('When testing strategySubService.compoundV3Encode', () => {