@defisaver/automation-sdk 3.3.12 → 3.3.13-strategies-refactor-dev

package/esm/services/subDataService.js

@@ -161,6 +161,23 @@ export const liquityLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const liquityLeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const isRepay = ratioState === RatioState.UNDER;
+        const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+        const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [encodedRatioState, encodedTargetRatio, collActionTypeEncoded, debtActionTypeEncoded];
+    },
+    decode(subData) {
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[0]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
+        return { targetRatio, ratioState };
+    },
+};
 export const liquityCloseSubData = {
     encode(closeToAssetAddr, chainId = ChainId.Ethereum, collAddr, debtAddr) {
         const _collAddr = collAddr || getAssetInfo('WETH', chainId).address;
@@ -392,6 +409,25 @@ export const aaveV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const aaveV2LeverageManagementSubDataWithoutSubProxy = {
+    encode(market, targetRatio, ratioState) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+            return [encodedMarket, encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedMarket, encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
+        return { market, targetRatio, ratioState };
+    },
+};
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
     /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
@@ -746,6 +782,23 @@ export const compoundV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+            return [encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
  /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
@@ -773,27 +826,22 @@ export const compoundV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const compoundV3L2LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        let subInput = '0x';
-        subInput = subInput.concat(market.slice(2));
-        subInput = subInput.concat(baseToken.slice(2));
-        subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(boostEnabled ? '01' : '00');
-        subInput = subInput.concat(isEOA ? '01' : '00');
-        return subInput;
+export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
+    encode(market, baseToken, targetRatio, ratioState) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedBaseToken = AbiCoder.encodeParameter('address', baseToken);
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
     },
     decode(subData) {
-        const ratioWei = AbiCoder.decodeParameter('uint256', subData[3]);
-        const targetRatio = weiToRatioPercentage(ratioWei);
-        return { targetRatio };
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const baseToken = AbiCoder.decodeParameter('address', subData[1]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]));
+        return {
+            market, baseToken, targetRatio, ratioState,
+        };
     },
 };
 export const compoundV3LeverageManagementOnPriceSubData = {
@@ -899,6 +947,21 @@ export const exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
+export const exchangeLimitOrderSubDataWithoutSubProxy = {
+    encode(fromToken, toToken, amount) {
+        return [
+            AbiCoder.encodeParameter('address', fromToken),
+            AbiCoder.encodeParameter('address', toToken),
+            AbiCoder.encodeParameter('uint256', amount),
+        ];
+    },
+    decode: (subData, chainId) => {
+        const fromToken = AbiCoder.decodeParameter('address', subData[0]).toString();
+        const toToken = AbiCoder.decodeParameter('address', subData[1]).toString();
+        const amount = assetAmountInEth(AbiCoder.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
+        return { fromToken, toToken, amount };
+    },
+};
 /**
      _______..______      ___      .______       __  ___
     /       ||   _  \    /   \     |   _  \     |  |/  /
@@ -984,6 +1047,37 @@ export const sparkLeverageManagementOnPriceSubData = {
         };
     },
 };
+export const sparkCollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
+        const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
+        const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
+        const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
+        const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
+        const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
+        const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
+        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
+        return [
+            encodedFromAsset,
+            encodedFromAssetId,
+            encodedToAsset,
+            encodedToAssetId,
+            encodedMarketAddr,
+            encodedAmountToSwitch,
+            encodedUseOnBehalf,
+        ];
+    },
+    decode(subData) {
+        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
+        return {
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+        };
+    },
+};
 /**
   ______ .______     ____    ____  __    __       _______. _______
  /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \

package/esm/services/subDataService.test.js

@@ -528,6 +528,127 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                // WETH -> cbBTC
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '10000000000000000000',
+                        false,
+                    ]
+                ],
+                // cbBTC -> WETH (MaxUint256)
+                [
+                    [
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        MAXUINT,
+                    ]
+                ],
+                // WETH -> cbBTC (5 WETH)
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000004563918244f40000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '5000000000000000000', // 5 WETH
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkCollateralSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                // WETH -> cbBTC
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        fromAssetId: 0,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        toAssetId: 7,
+                        marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        amountToSwitch: '10000000000000000000',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+                // cbBTC -> WETH (MaxUint256)
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        fromAssetId: 7,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        toAssetId: 0,
+                        marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        amountToSwitch: MAXUINT,
+                    },
+                    [
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkCollateralSwitchSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.compoundV2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1188,48 +1309,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true, false]
-                ],
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 110, false, false]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    { targetRatio: 200 },
-                    [
-                        '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000213d212133AFaB8F2B829B1066c7E43cAd94E2c',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-                    ],
-                ],
-                [
-                    { targetRatio: 123 },
-                    [
-                        '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000413d212133AFaB8F2B829B1066c7E43cAd94E2c',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/types/enums.d.ts

@@ -89,7 +89,8 @@ export declare namespace Strategies {
         LIQUITY_V2_PAYBACK = 113,
         AAVE_V3_COLLATERAL_SWITCH = 135,
         AAVE_V4_COLLATERAL_SWITCH = 154,
-        AAVE_V4_COLLATERAL_SWITCH_EOA = 155
+        AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
+        SPARK_COLLATERAL_SWITCH = 156
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,

package/esm/types/enums.js

@@ -103,6 +103,7 @@ export var Strategies;
         MainnetIds[MainnetIds["AAVE_V3_COLLATERAL_SWITCH"] = 135] = "AAVE_V3_COLLATERAL_SWITCH";
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH"] = 154] = "AAVE_V4_COLLATERAL_SWITCH";
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
+        MainnetIds[MainnetIds["SPARK_COLLATERAL_SWITCH"] = 156] = "SPARK_COLLATERAL_SWITCH";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.12",
+  "version": "3.3.13-strategies-refactor-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -135,6 +135,11 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.EoaCollateralSwitch,
     protocol: PROTOCOLS.AaveV4,
   },
+  [Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH]: {
+    strategyOrBundleId: Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+    strategyId: Strategies.Identifiers.CollateralSwitch,
+    protocol: PROTOCOLS.Spark,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {

package/src/services/strategiesService.ts

@@ -102,7 +102,7 @@ function parseMakerTrailingStop(position: Position.Automated, parseData: ParseDa
 function parseMakerLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
@@ -119,9 +119,10 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -130,6 +131,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -190,7 +192,7 @@ function parseLiquityTrailingStop(position: Position.Automated, parseData: Parse
 function parseAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -207,9 +209,10 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -218,6 +221,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -385,6 +389,17 @@ function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: Pa
   return _position;
 }
 
+function parseSparkCollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkCollateralSwitchSubData.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);
+  return _position;
+}
+
 function parseAaveV4LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
@@ -490,7 +505,7 @@ function parseAaveV4CollateralSwitch(position: Position.Automated, parseData: Pa
 function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -507,9 +522,10 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -518,6 +534,7 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -568,7 +585,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated
 function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
@@ -586,9 +603,10 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -597,6 +615,7 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -609,12 +628,10 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
 function parseCompoundV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
-  const subDataDecoder = position.chainId !== 1
-    ? subDataService.compoundV3L2LeverageManagementSubData
-    : subDataService.compoundV3LeverageManagementSubData;
+  const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
 
   const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
   const subData = subDataDecoder.decode(subStruct.subData);
@@ -632,9 +649,10 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -643,6 +661,7 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -768,7 +787,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 function parseLiquityLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
@@ -785,9 +804,10 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -796,6 +816,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -850,7 +871,7 @@ function parseLiquityV2LeverageManagement(position: Position.Automated, parseDat
 function parseSparkLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
@@ -867,9 +888,10 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -878,6 +900,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
@@ -1117,6 +1140,7 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
     debtAsset: subData.loanToken,
     price: triggerData.price,
     ratio: subData.targetRatio,
+    ratioState: triggerData.priceState,
   };
 
   return _position;
@@ -1386,6 +1410,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,