@defisaver/automation-sdk 3.2.4-dev-1 → 3.2.5

package/src/services/strategySubService.ts

@@ -323,6 +323,20 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+    const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+    const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
 };
 
 export const compoundV2Encode = {
@@ -350,39 +364,6 @@ export const compoundV3Encode = {
   ) {
     return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
   },
-  leverageManagementOnPrice(
-    strategyOrBundleId: number,
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    targetRatio: number,
-    price: number,
-    priceState: RatioState,
-  ) {
-    const isBundle = true;
-    const subDataEncoded = subDataService.compoundV3LeverageManagementOnPriceSubData.encode(market, collToken, baseToken, targetRatio);
-    const triggerDataEncoded = triggerService.compoundV3PriceTrigger.encode(market, collToken, price, priceState);
-
-    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-  },
-  closeOnPrice(
-    strategyOrBundleId: number,
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    stopLossPrice: number = 0,
-    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
-    takeProfitPrice: number = 0,
-    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
-  ) {
-    const isBundle = true;
-    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
-
-    const subDataEncoded = subDataService.compoundV3CloseSubData.encode(market, collToken, baseToken, closeType);
-    const triggerDataEncoded = triggerService.compoundV3PriceRangeTrigger.encode(market, collToken, stopLossPrice, takeProfitPrice);
-
-    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-  },
 };
 
 export const compoundV3L2Encode = {

package/src/services/subDataService.test.ts

@@ -7,7 +7,32 @@ import { ChainId, OrderType, RatioState } from '../types/enums';
 import type { EthereumAddress, SubData } from '../types';
 
 import '../configuration';
-import * as subDataService from './subDataService';
+import {
+  aaveV2LeverageManagementSubData,
+  aaveV3LeverageManagementSubData,
+  aaveV3QuotePriceSubData,
+  cBondsRebondSubData,
+  compoundV2LeverageManagementSubData,
+  compoundV3LeverageManagementSubData,
+  exchangeDcaSubData,
+  exchangeLimitOrderSubData,
+  liquityCloseSubData,
+  liquityDebtInFrontRepaySubData,
+  liquityDsrPaybackSubData,
+  liquityDsrSupplySubData,
+  liquityLeverageManagementSubData,
+  liquityPaybackUsingChickenBondSubData,
+  liquityRepayFromSavingsSubData,
+  makerCloseSubData,
+  makerLeverageManagementSubData,
+  makerRepayFromSavingsSubData,
+  morphoAaveV2LeverageManagementSubData,
+  sparkLeverageManagementSubData,
+  sparkQuotePriceSubData,
+  crvUSDLeverageManagementSubData,
+  compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData, crvUSDPaybackSubData,
+  aaveV3LeverageManagementOnPriceSubData,
+} from './subDataService';
 import { AAVE_V3_VARIABLE_BORROW_RATE } from '../constants';
 
 describe('Feature: subDataService.ts', () => {
@@ -26,7 +51,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.makerRepayFromSavingsSubData.encode(...actual)).to.eql(expected);
+          expect(makerRepayFromSavingsSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -49,7 +74,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.makerRepayFromSavingsSubData.decode(actual)).to.eql(expected);
+          expect(makerRepayFromSavingsSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -69,7 +94,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityRepayFromSavingsSubData.decode(actual)).to.eql(expected);
+          expect(liquityRepayFromSavingsSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -96,7 +121,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.makerCloseSubData.encode(...actual)).to.eql(expected);
+          expect(makerCloseSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -127,7 +152,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.makerCloseSubData.decode(actual)).to.eql(expected);
+          expect(makerCloseSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -147,7 +172,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.makerLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(makerLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -167,7 +192,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(liquityLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -192,7 +217,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityCloseSubData.encode(...actual)).to.eql(expected);
+          expect(liquityCloseSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -221,7 +246,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityCloseSubData.decode(actual)).to.eql(expected);
+          expect(liquityCloseSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -242,7 +267,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.aaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(aaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -261,7 +286,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(aaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -282,7 +307,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(aaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -321,7 +346,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.aaveV3QuotePriceSubData.encode(...actual)).to.eql(expected);
+          expect(aaveV3QuotePriceSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -358,7 +383,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV3QuotePriceSubData.decode(actual)).to.eql(expected);
+          expect(aaveV3QuotePriceSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -379,7 +404,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -398,7 +423,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -445,7 +470,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -470,7 +495,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -491,7 +516,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.morphoAaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(morphoAaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -510,7 +535,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.morphoAaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(morphoAaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -531,7 +556,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.cBondsRebondSubData.encode(...actual)).to.eql(expected);
+          expect(cBondsRebondSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -550,7 +575,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.cBondsRebondSubData.decode(actual)).to.eql(expected);
+          expect(cBondsRebondSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -577,7 +602,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityPaybackUsingChickenBondSubData.encode(...actual)).to.eql(expected);
+          expect(liquityPaybackUsingChickenBondSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -602,7 +627,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityPaybackUsingChickenBondSubData.decode(actual)).to.eql(expected);
+          expect(liquityPaybackUsingChickenBondSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -639,7 +664,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.exchangeDcaSubData.encode(...actual)).to.eql(expected);
+          expect(exchangeDcaSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -680,7 +705,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.exchangeDcaSubData.decode(...actual)).to.eql(expected);
+          expect(exchangeDcaSubData.decode(...actual)).to.eql(expected);
         });
       });
     });
@@ -729,7 +754,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.exchangeLimitOrderSubData.encode(...actual)).to.eql(expected);
+          expect(exchangeLimitOrderSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -768,7 +793,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.exchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
+          expect(exchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
         });
       });
     });
@@ -789,7 +814,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -828,7 +853,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.sparkQuotePriceSubData.encode(...actual)).to.eql(expected);
+          expect(sparkQuotePriceSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -865,7 +890,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.sparkQuotePriceSubData.decode(actual)).to.eql(expected);
+          expect(sparkQuotePriceSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -892,7 +917,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
+          expect(liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -921,7 +946,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
+          expect(liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -948,7 +973,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
+          expect(liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -977,7 +1002,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityDsrSupplySubData.decode(actual)).to.eql(expected);
+          expect(liquityDsrSupplySubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1006,7 +1031,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityDebtInFrontRepaySubData.encode(...actual)).to.eql(expected);
+          expect(liquityDebtInFrontRepaySubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1037,7 +1062,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityDebtInFrontRepaySubData.decode(actual)).to.eql(expected);
+          expect(liquityDebtInFrontRepaySubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1069,7 +1094,7 @@ describe('Feature: subDataService.ts', () => {
       ];
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.crvUSDLeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(crvUSDLeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1096,7 +1121,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.crvUSDLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(crvUSDLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1118,7 +1143,7 @@ describe('Feature: subDataService.ts', () => {
       ];
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+          expect(crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1148,7 +1173,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+          expect(crvUSDPaybackSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1172,7 +1197,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1196,7 +1221,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1240,7 +1265,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.morphoBlueLeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(morphoBlueLeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1293,7 +1318,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.morphoBlueLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(morphoBlueLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -1325,7 +1350,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+          expect(aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -1354,87 +1379,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
-  describe('When testing subDataService.compoundV3LeverageManagementOnPriceSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[string[], [market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number]]> = [
-        [
-          [
-            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000'
-          ],
-          [
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
-            200
-          ]
-        ],
-        [
-          [
-            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000'
-          ],
-          [
-            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
-            190
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('decode()', () => {
-      const examples: Array<[{ market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number }, string[]]> = [
-        [
-          {
-            market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
-            targetRatio: 200,
-          },
-          [
-            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000'
-          ]
-        ],
-        [
-          {
-            market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-            collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
-            targetRatio: 190,
-          },
-          [
-            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000'
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+          expect(aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
         });
       });
     });

package/src/services/subDataService.ts

@@ -173,6 +173,26 @@ export const aaveV3LeverageManagementSubData = { // TODO encode?
   },
 };
 
+export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+    const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
+
+    return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
+
+    return { targetRatio, ratioState };
+  },
+};
+
 export const aaveV3QuotePriceSubData = {
   encode(
     collAsset: EthereumAddress,
@@ -912,76 +932,3 @@ export const fluidLeverageManagementSubData = {
     };
   },
 };
-
-export const compoundV3LeverageManagementOnPriceSubData = {
-  encode(
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    targetRatio: number,
-  ): SubData {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
-    const baseTokenEncoded = AbiCoder.encodeParameter('address', baseToken);
-    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-
-    return [
-      marketEncoded,
-      collTokenEncoded,
-      baseTokenEncoded,
-      targetRatioEncoded,
-    ];
-  },
-  decode(subData: SubData): {
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    targetRatio: number,
-  } {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collToken = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
-    const baseToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      market, collToken, baseToken, targetRatio,
-    };
-  },
-};
-
-export const compoundV3CloseSubData = {
-  encode(
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    closeType: CloseStrategyType,
-  ): SubData {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
-    const baseTokenEncoded = AbiCoder.encodeParameter('address', baseToken);
-    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
-
-    return [
-      marketEncoded,
-      collTokenEncoded,
-      baseTokenEncoded,
-      closeTypeEncoded,
-    ];
-  },
-  decode(subData: SubData): {
-    market: EthereumAddress,
-    collToken: EthereumAddress,
-    baseToken: EthereumAddress,
-    closeType: CloseStrategyType,
-  } {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collToken = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
-    const baseToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const closeType = AbiCoder.decodeParameter('uint8', subData[3]) as any as CloseStrategyType;
-
-    return {
-      market, collToken, baseToken, closeType,
-    };
-  },
-};