@defisaver/automation-sdk 3.3.15-liq-prot-2-dev → 3.3.15-liq-prot-3-dev

package/esm/services/strategySubService.js

@@ -30,10 +30,10 @@ export const makerEncode = {
         const isBundle = false;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
-    leverageManagementWithoutSubProxy(vaultId, triggerRatio, targetRatio, ratioState, isBoost, daiAddr) {
+    leverageManagement(vaultId, triggerRatio, targetRatio, ratioState, isBoost, daiAddr) {
         const bundleId = isBoost ? Bundles.MainnetIds.MAKER_BOOST : Bundles.MainnetIds.MAKER_REPAY;
         const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
-        const subData = subDataService.makerLeverageManagementWithoutSubProxy.encode(vaultId, targetRatio, daiAddr);
+        const subData = subDataService.makerLeverageManagementSubData.encode(vaultId, targetRatio, daiAddr);
         return [
             bundleId,
             true,
@@ -78,9 +78,9 @@ export const liquityEncode = {
         const isBundle = true;
         return [strategyId, isBundle, triggerData, subData];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.liquityLeverageManagementSubData.encode(targetRatio, ratioState);
         const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -109,15 +109,10 @@ export const liquityEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
-export const chickenBondsEncode = {
-    rebond(bondId) {
-        return subDataService.cBondsRebondSubData.encode(bondId);
-    },
-};
 export const aaveV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
+        const subData = subDataService.aaveV2LeverageManagementSubData.encode(market, targetRatio, ratioState);
         const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -144,15 +139,15 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
         const isBundle = true;
-        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState, market, user, isGeneric);
+        const subData = subDataService.aaveV3LeverageManagementSubData.encode(targetRatio, ratioState, market, user, isGeneric);
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
     liquidationProtection(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(targetRatio, ratioState, market, user);
+        const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(targetRatio, ratioState, market, user, true);
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -177,23 +172,23 @@ export const aaveV3Encode = {
     },
 };
 export const compoundV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.compoundV2LeverageManagementSubData.encode(targetRatio, ratioState);
         const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
 export const compoundV3Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+        const subData = subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, targetRatio, ratioState);
         const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
-    liquidationProtectionWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+    liquidationProtection(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.compoundV3LiquidationProtectionSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+        const subData = subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, targetRatio, ratioState);
         const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -212,11 +207,6 @@ export const compoundV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
-export const morphoAaveV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
-    },
-};
 export const exchangeEncode = {
     dca(fromToken, toToken, amount, timestamp, interval, network) {
         requireAddresses([fromToken, toToken]);
@@ -225,9 +215,9 @@ export const exchangeEncode = {
         const strategyId = STRATEGY_IDS[network].EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrderWithoutSubProxy(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
+    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
         requireAddresses([fromToken, toToken]);
-        const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
+        const subData = subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount);
         const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
         const strategyId = STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
         return [strategyId, false, triggerData, subData];
@@ -248,9 +238,9 @@ export const sparkEncode = {
         const triggerDataEncoded = triggerService.sparkQuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.sparkLeverageManagementSubData.encode(targetRatio, ratioState);
         const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },

package/esm/services/strategySubService.test.js

@@ -1,11 +1,10 @@
 import { expect } from 'chai';
-import Dec from 'decimal.js';
 import { otherAddresses } from '@defisaver/sdk';
 import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
+import { liquityEncode, makerEncode, aaveV3Encode, compoundV3Encode, exchangeEncode, crvUSDEncode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
         // @ts-ignore // TODO - this requires change in @defisaver/tokens
@@ -96,7 +95,7 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('leverageManagementWithoutSubProxy()', () => {
+        describe('leverageManagement()', () => {
             const examples = [
                 // Repay scenario (isBoost=false, RatioState.UNDER)
                 [
@@ -139,7 +138,7 @@ describe('Feature: strategySubService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(makerEncode.leverageManagementWithoutSubProxy(...actual)).to.eql(expected);
+                    expect(makerEncode.leverageManagement(...actual)).to.eql(expected);
                 });
             });
         });
@@ -266,21 +265,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.chickenBondsEncode', () => {
-        describe('rebond()', () => {
-            const examples = [
-                [
-                    ['0x00000000000000000000000000000000000000000000000000000000000005e3'],
-                    [1507]
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(chickenBondsEncode.rebond(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.aaveV3Encode', () => {
         describe('closeToAsset()', () => {
             const examples = [
@@ -970,25 +954,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.morphoAaveV2Encode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-                    [160, 220, 180, 190, true]
-                ],
-                [
-                    [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-                    [160, 200, 180, 190, false]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.exchangeEncode', () => {
         describe('dca()', () => {
             const examples = [

package/esm/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { CloseStrategyType, OrderType } from '../types/enums';
+import type { CloseStrategyType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 /**
  _______   _______ .______   .______       _______   ______     ___   .___________. _______  _______
@@ -10,13 +10,11 @@ import { ChainId, RatioState } from '../types/enums';
 |_______/ |_______|| _|      | _| `._____||_______| \______/__/     \__\  |__|     |_______||_______/
  */
 export declare const morphoAaveV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
 export declare const cBondsRebondSubData: {
-    encode(bondId: number | string): string[];
     decode(subData: string[]): {
         bondId: string;
     };
@@ -57,13 +55,13 @@ export declare const makerCloseSubData: {
         closeToAssetAddr: EthereumAddress;
     };
 };
-export declare const makerLeverageManagementSubData: {
+export declare const legacyMakerLeverageManagementSubData: {
     decode: (subData: string[]) => {
         vaultId: number;
         targetRatio: number;
     };
 };
-export declare const makerLeverageManagementWithoutSubProxy: {
+export declare const makerLeverageManagementSubData: {
     encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
     decode(subData: string[]): {
         vaultId: number;
@@ -92,12 +90,12 @@ export declare const liquityRepayFromSavingsSubData: {
         targetRatio: number;
     };
 };
-export declare const liquityLeverageManagementSubData: {
+export declare const legacyLiquityLeverageManagementSubData: {
     decode: (subData: string[]) => {
         targetRatio: number;
     };
 };
-export declare const liquityLeverageManagementSubDataWithoutSubProxy: {
+export declare const liquityLeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -186,13 +184,12 @@ export declare const liquityV2PaybackSubData: {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     / /_
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____|
  */
-export declare const aaveV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+export declare const legacyAaveV2LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
+export declare const aaveV2LeverageManagementSubData: {
     encode(market: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -208,12 +205,12 @@ export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     ___) |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____/
  */
-export declare const aaveV3LeverageManagementSubData: {
+export declare const legacyAaveV3LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
+export declare const aaveV3LeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress, isGeneric: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -221,7 +218,7 @@ export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
     };
 };
 export declare const aaveV3LiquidationProtectionSubData: {
-    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress, isGeneric: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
         ratioState: RatioState;
@@ -353,13 +350,12 @@ export declare const aaveV4CollateralSwitchSubData: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     / /_
  \______| \______/  |__|  |__| | _|             \__/     |____|
  */
-export declare const compoundV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+export declare const legacyCompoundV2LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
+export declare const compoundV2LeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -374,7 +370,7 @@ export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
+export declare const compoundV3LeverageManagementSubData: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -383,7 +379,7 @@ export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
-export declare const compoundV3LiquidationProtectionSubDataWithoutSubProxy: {
+export declare const compoundV3LiquidationProtectionSubData: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -430,15 +426,14 @@ export declare const exchangeDcaSubData: {
         interval: string;
     };
 };
-export declare const exchangeLimitOrderSubData: {
-    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType): string[];
+export declare const legacyExchangeLimitOrderSubData: {
     decode: (subData: string[], chainId: ChainId) => {
         fromToken: string;
         toToken: string;
         amount: string;
     };
 };
-export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
+export declare const exchangeLimitOrderSubData: {
     encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): string[];
     decode: (subData: string[], chainId: ChainId) => {
         fromToken: string;
@@ -454,12 +449,12 @@ export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
 .----)   |   |  |     /  _____  \  |  |\  \----.|  .  \
 |_______/    | _|    /__/     \__\ | _| `._____||__|\__\
  */
-export declare const sparkLeverageManagementSubData: {
+export declare const legacySparkLeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
+export declare const sparkLeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;