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

package/cjs/constants/index.js

@@ -398,36 +398,6 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
-    [enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -527,36 +497,6 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
-    [enums_1.Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_SW_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_EOA_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -609,36 +549,6 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE,
-        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/services/strategiesService.js

@@ -363,48 +363,6 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseCompoundV3LeverageManagementOnPrice(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.compoundV3PriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.compoundV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
-    _position.specific = {
-        market: subData.market,
-        collToken: subData.collToken,
-        baseToken: subData.baseToken,
-        ratio: subData.targetRatio,
-        price: triggerData.price,
-        priceState: triggerData.priceState,
-    };
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagementOnPrice : enums_1.Strategies.IdOverrides.LeverageManagementOnPrice;
-    return _position;
-}
-function parseCompoundV3CloseOnPrice(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.compoundV3PriceRangeTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.compoundV3CloseSubData.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
-    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCloseOnPrice : enums_1.Strategies.Identifiers.CloseOnPrice;
-    _position.specific = {
-        market: subData.market,
-        collToken: subData.collToken,
-        baseToken: subData.baseToken,
-        stopLossPrice: triggerData.lowerPrice,
-        takeProfitPrice: triggerData.upperPrice,
-        takeProfitType,
-        stopLossType,
-    };
-    return _position;
-}
 function parseChickenBondsRebond(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -730,6 +688,7 @@ function parseLiquityV2CloseOnPrice(position, parseData) {
     // - Only TakeProfit
     // - Only StopLoss
     // - Both
+    // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
     _position.strategy.strategyId = enums_1.Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         market: subData.market,
@@ -864,12 +823,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,
         [enums_1.Strategies.Identifiers.EoaRepay]: parseCompoundV3LeverageManagement,
         [enums_1.Strategies.Identifiers.EoaBoost]: parseCompoundV3LeverageManagement,
-        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-        [enums_1.Strategies.Identifiers.BoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
-        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
-        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
         [enums_1.Strategies.Identifiers.Rebond]: parseChickenBondsRebond,

package/cjs/services/strategySubService.d.ts

@@ -60,14 +60,13 @@ export declare const aaveV3Encode: {
         marketAddr: EthereumAddress;
         targetRatio: number;
     }): (number | boolean | string[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };
 export declare const compoundV3Encode: {
     leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
-    leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
-    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const compoundV3L2Encode: {
     leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;

package/cjs/services/strategySubService.js

@@ -175,6 +175,12 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };
 exports.compoundV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
@@ -185,19 +191,6 @@ exports.compoundV3Encode = {
     leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
     },
-    leverageManagementOnPrice(strategyOrBundleId, market, collToken, baseToken, targetRatio, price, priceState) {
-        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, market, collToken, baseToken, stopLossPrice = 0, stopLossType = enums_1.CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = enums_1.CloseToAssetType.COLLATERAL) {
-        const isBundle = true;
-        const closeType = (0, utils_1.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];
-    },
 };
 exports.compoundV3L2Encode = {
     leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {

package/cjs/services/strategySubService.test.js

@@ -558,114 +558,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('leverageManagementOnPrice()', () => {
-            const examples = [
-                [
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-                        true,
-                        ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
-                        [
-                            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000'
-                        ],
-                    ],
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
-                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        200,
-                        2000,
-                        enums_1.RatioState.UNDER,
-                    ],
-                ],
-                [
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-                        true,
-                        ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000'
-                        ],
-                    ],
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
-                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        190,
-                        3000,
-                        enums_1.RatioState.OVER,
-                    ],
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(strategySubService_1.compoundV3Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('closeOnPrice()', () => {
-            const examples = [
-                [
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-                        true,
-                        ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-                        [
-                            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000006'
-                        ],
-                    ],
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE,
-                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1500,
-                        enums_1.CloseToAssetType.DEBT,
-                        4000,
-                        enums_1.CloseToAssetType.DEBT,
-                    ],
-                ],
-                [
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-                        true,
-                        ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-                        [
-                            '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000'
-                        ],
-                    ],
-                    [
-                        enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
-                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        0,
-                        enums_1.CloseToAssetType.DEBT,
-                        5000,
-                        enums_1.CloseToAssetType.COLLATERAL,
-                    ],
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(strategySubService_1.compoundV3Encode.closeOnPrice(...actual)).to.eql(expected);
-                });
-            });
-        });
     });
     describe('When testing strategySubService.morphoAaveV2Encode', () => {
         describe('leverageManagement()', () => {

package/cjs/services/subDataService.d.ts

@@ -51,6 +51,13 @@ export declare const aaveV3LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const aaveV3QuotePriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -252,21 +259,3 @@ export declare const fluidLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const compoundV3LeverageManagementOnPriceSubData: {
-    encode(market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number): string[];
-    decode(subData: string[]): {
-        market: EthereumAddress;
-        collToken: EthereumAddress;
-        baseToken: EthereumAddress;
-        targetRatio: number;
-    };
-};
-export declare const compoundV3CloseSubData: {
-    encode(market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, closeType: CloseStrategyType): string[];
-    decode(subData: string[]): {
-        market: EthereumAddress;
-        collToken: EthereumAddress;
-        baseToken: EthereumAddress;
-        closeType: CloseStrategyType;
-    };
-};

package/cjs/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.fluidLeverageManagementSubData = exports.liquityV2PaybackSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.fluidLeverageManagementSubData = exports.liquityV2PaybackSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = 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");
@@ -126,6 +126,20 @@ exports.aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
+    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 encodedUseDefaultMarket = web3_eth_abi_1.default.encodeParameter('bool', true);
+        const encodedUseOnBehalf = web3_eth_abi_1.default.encodeParameter('bool', false);
+        return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+    },
+    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 };
+    },
+};
 exports.aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = constants_1.ZERO_ADDRESS) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -667,50 +681,3 @@ exports.fluidLeverageManagementSubData = {
         };
     },
 };
-exports.compoundV3LeverageManagementOnPriceSubData = {
-    encode(market, collToken, baseToken, targetRatio) {
-        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
-        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
-        const baseTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', baseToken);
-        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        return [
-            marketEncoded,
-            collTokenEncoded,
-            baseTokenEncoded,
-            targetRatioEncoded,
-        ];
-    },
-    decode(subData) {
-        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return {
-            market, collToken, baseToken, targetRatio,
-        };
-    },
-};
-exports.compoundV3CloseSubData = {
-    encode(market, collToken, baseToken, closeType) {
-        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
-        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
-        const baseTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', baseToken);
-        const closeTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
-        return [
-            marketEncoded,
-            collTokenEncoded,
-            baseTokenEncoded,
-            closeTypeEncoded,
-        ];
-    },
-    decode(subData) {
-        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const closeType = web3_eth_abi_1.default.decodeParameter('uint8', subData[3]);
-        return {
-            market, collToken, baseToken, closeType,
-        };
-    },
-};