@defisaver/automation-sdk 3.3.12-strategies-refactor-1-dev → 3.3.12-strategies-refactor-3-dev

package/cjs/services/strategiesService.js

@@ -92,7 +92,7 @@ function parseMakerTrailingStop(position, parseData) {
 }
 function parseMakerLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
@@ -104,9 +104,10 @@ function parseMakerLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -116,6 +117,7 @@ function parseMakerLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -155,7 +157,7 @@ function parseLiquityTrailingStop(position, parseData) {
 }
 function parseAaveV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -167,9 +169,10 @@ function parseAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -179,6 +182,7 @@ function parseAaveV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -406,7 +410,7 @@ function parseAaveV4CollateralSwitch(position, parseData) {
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -418,9 +422,10 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -430,6 +435,7 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -462,7 +468,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
 }
 function parseCompoundV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
@@ -475,9 +481,10 @@ function parseCompoundV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -487,6 +494,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     const isEOA = _position.strategy.strategyId.includes('eoa');
@@ -495,7 +503,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
 }
 function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
     const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
@@ -509,9 +517,10 @@ function parseCompoundV3LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -521,6 +530,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -608,7 +618,7 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
 }
 function parseLiquityLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
@@ -620,9 +630,10 @@ function parseLiquityLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -632,6 +643,7 @@ function parseLiquityLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -672,7 +684,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
 }
 function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
@@ -684,9 +696,10 @@ function parseSparkLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -696,6 +709,7 @@ function parseSparkLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;

package/cjs/services/strategySubService.d.ts

@@ -78,9 +78,6 @@ export declare const compoundV3Encode: {
     leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, ratioState: RatioState, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number | undefined, stopLossType: CloseToAssetType | undefined, takeProfitPrice: number | undefined, takeProfitType: CloseToAssetType | undefined, user: EthereumAddress): (number | boolean | string[])[];
 };
-export declare const compoundV3L2Encode: {
-    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA?: boolean): string;
-};
 export declare const morphoAaveV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };

package/cjs/services/strategySubService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV4Encode = exports.fluidEncode = exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.aaveV4Encode = exports.fluidEncode = exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
@@ -158,7 +158,7 @@ exports.aaveV2Encode = {
     },
     leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
         const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -260,11 +260,6 @@ exports.compoundV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
-exports.compoundV3L2Encode = {
-    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA = false) {
-        return subDataService.compoundV3L2LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
-    },
-};
 exports.morphoAaveV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
         return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);

package/cjs/services/strategySubService.test.js

@@ -1450,37 +1450,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.compoundV3L2Encode', () => {
-        describe('leverageManagement()', () => {
-            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: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(strategySubService_1.compoundV3L2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.sparkEncode', () => {
         describe('leverageManagement()', () => {
             const examples = [

package/cjs/services/subDataService.d.ts

@@ -185,8 +185,9 @@ export declare const aaveV2LeverageManagementSubData: {
     };
 };
 export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
-    encode(targetRatio: number, ratioState: RatioState): string[];
+    encode(market: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
+        market: EthereumAddress;
         targetRatio: number;
         ratioState: RatioState;
     };
@@ -364,12 +365,6 @@ export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
-export declare const compoundV3L2LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string;
-    decode(subData: string[]): {
-        targetRatio: number;
-    };
-};
 export declare const compoundV3LeverageManagementOnPriceSubData: {
     encode(market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState, user: EthereumAddress): string[];
     decode(subData: string[]): {

package/cjs/services/subDataService.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
-exports.fluidLeverageManagementSubData = void 0;
+exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = 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");
@@ -170,13 +169,18 @@ exports.liquityLeverageManagementSubData = {
 };
 exports.liquityLeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        return [encodedTargetRatio, encodedRatioState];
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [encodedRatioState, encodedTargetRatio, collActionTypeEncoded, debtActionTypeEncoded];
     },
     decode(subData) {
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[0]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
         return { targetRatio, ratioState };
     },
 };
@@ -412,15 +416,22 @@ exports.aaveV2LeverageManagementSubData = {
     },
 };
 exports.aaveV2LeverageManagementSubDataWithoutSubProxy = {
-    encode(targetRatio, ratioState) {
+    encode(market, targetRatio, ratioState) {
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        return [encodedTargetRatio, encodedRatioState];
+        const isBoost = ratioState === enums_1.RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = web3_eth_abi_1.default.encodeParameter('uint256', 1);
+            return [encodedMarket, encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedMarket, encodedTargetRatio, encodedRatioState];
     },
     decode(subData) {
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
-        return { targetRatio, ratioState };
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        return { market, targetRatio, ratioState };
     },
 };
 /**
@@ -781,6 +792,11 @@ exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === enums_1.RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = web3_eth_abi_1.default.encodeParameter('uint256', 1);
+            return [encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
         return [encodedTargetRatio, encodedRatioState];
     },
     decode(subData) {
@@ -820,43 +836,20 @@ exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
     encode(market, baseToken, targetRatio, ratioState) {
         const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
         const encodedBaseToken = web3_eth_abi_1.default.encodeParameter('address', baseToken);
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        return [encodedMarket, encodedBaseToken, encodedTargetRatio, encodedRatioState];
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
     },
     decode(subData) {
         const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
         const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[2]));
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[3]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
         return {
             market, baseToken, targetRatio, ratioState,
         };
     },
 };
-exports.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 decimal_js_1.default(triggerRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(triggerBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(targetBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(targetRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(boostEnabled ? '01' : '00');
-        subInput = subInput.concat(isEOA ? '01' : '00');
-        return subInput;
-    },
-    decode(subData) {
-        const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
-        return { targetRatio };
-    },
-};
 exports.compoundV3LeverageManagementOnPriceSubData = {
     encode(market, collToken, baseToken, targetRatio, ratioState, user) {
         const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);

package/cjs/services/subDataService.test.js

@@ -1216,48 +1216,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}`, () => {
-                    (0, chai_1.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)}`, () => {
-                    (0, chai_1.expect)(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [