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

package/src/services/strategiesService.ts

@@ -102,7 +102,7 @@ function parseMakerTrailingStop(position: Position.Automated, parseData: ParseDa
 function parseMakerLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
@@ -119,10 +119,9 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -131,7 +130,6 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -192,7 +190,7 @@ function parseLiquityTrailingStop(position: Position.Automated, parseData: Parse
 function parseAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -209,10 +207,9 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -221,7 +218,6 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -505,7 +501,7 @@ function parseAaveV4CollateralSwitch(position: Position.Automated, parseData: Pa
 function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -522,10 +518,9 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -534,7 +529,6 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -585,7 +579,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated
 function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
@@ -603,10 +597,9 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -615,7 +608,6 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -628,10 +620,12 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
 function parseCompoundV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
-  const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
+  const subDataDecoder = position.chainId !== 1
+    ? subDataService.compoundV3L2LeverageManagementSubData
+    : subDataService.compoundV3LeverageManagementSubData;
 
   const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
   const subData = subDataDecoder.decode(subStruct.subData);
@@ -649,10 +643,9 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -661,7 +654,6 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -787,7 +779,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 function parseLiquityLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
@@ -804,10 +796,9 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -816,7 +807,6 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -871,7 +861,7 @@ function parseLiquityV2LeverageManagement(position: Position.Automated, parseDat
 function parseSparkLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { subStruct, subId } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
@@ -888,10 +878,9 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: isEnabled,
+      repayEnabled: true,
       subId1: Number(subId),
       mergeWithId: Strategies.Identifiers.Boost,
-      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -900,7 +889,6 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
       boostEnabled: isEnabled,
       subId2: Number(subId),
       mergeId: Strategies.Identifiers.Boost,
-      subHashBoost: subHash,
     };
   }
 
@@ -1140,7 +1128,6 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
     debtAsset: subData.loanToken,
     price: triggerData.price,
     ratio: subData.targetRatio,
-    ratioState: triggerData.priceState,
   };
 
   return _position;

package/src/services/strategySubService.test.ts

@@ -9,14 +9,17 @@ import type { EthereumAddress, StrategyOrBundleIds, SubData, TriggerData } from
 
 import '../configuration';
 import {
+  aaveV2Encode,
   chickenBondsEncode,
   liquityEncode,
   makerEncode,
   aaveV3Encode,
+  compoundV2Encode,
   compoundV3Encode,
   morphoAaveV2Encode,
   exchangeEncode,
   crvUSDEncode,
+  compoundV3L2Encode,
   morphoBlueEncode,
   sparkEncode,
   aaveV4Encode,
@@ -137,6 +140,39 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [
+          vaultId: number, triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string,
+          targetRepayRatio: string, boostEnabled: boolean,
+        ],
+        [
+          vaultId: number, triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string,
+          targetRepayRatio: string, boostEnabled: boolean,
+        ]
+      ]> = [
+        [
+          [
+            5791,
+            new Dec('210').mul(1e16).toString(),
+            new Dec('290').mul(1e16).toString(),
+            new Dec('240').mul(1e16).toString(),
+            new Dec('240').mul(1e16).toString(),
+            true,
+          ],
+          [
+            5791, '210', '290', '240', '240', true,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(makerEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('leverageManagementWithoutSubProxy()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
@@ -260,6 +296,38 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [
+          triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string,
+          targetRepayRatio: string, boostEnabled: boolean,
+        ],
+        [
+          triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string,
+          targetRepayRatio: string, boostEnabled: boolean,
+        ]
+      ]> = [
+        [
+          [
+            new Dec('210').mul(1e16).toString(),
+            new Dec('290').mul(1e16).toString(),
+            new Dec('240').mul(1e16).toString(),
+            new Dec('240').mul(1e16).toString(),
+            false,
+          ],
+          [
+            '210', '290', '240', '240', false,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(liquityEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('paybackFromChickenBondStrategySub()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
@@ -368,7 +436,53 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
+  describe('When testing strategySubService.aaveV2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [string, string, string, string, boolean],
+        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+      ]> = [
+        [
+          [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(aaveV2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing strategySubService.aaveV3Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        string,
+        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+      ]> = [
+        [
+          '0x000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
+          [160, 220, 180, 190, true]
+        ],
+        [
+          '0x000000000000000016345785d8a0000000000000000000001bc16d674ec80000000000000000000018fae27693b4000000000000000000001a5e27eef13e000000',
+          [160, 200, 180, 190, false]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('closeToAsset()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
@@ -1027,7 +1141,74 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
+  describe('When testing strategySubService.compoundV2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [string, string, string, string, boolean],
+        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+      ]> = [
+        [
+          [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(compoundV2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing strategySubService.compoundV3Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
+        [
+          [
+            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            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, false,
+          ],
+          [
+            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            160, 220, 180, 190,
+            true, false,
+          ]
+        ],
+        [
+          [
+            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            new Dec(160).mul(1e16).toString(),
+            new Dec(210).mul(1e16).toString(),
+            new Dec(180).mul(1e16).toString(),
+            new Dec(190).mul(1e16).toString(),
+            false, true,
+          ],
+          [
+            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            160, 210, 180, 190,
+            false, true,
+          ]
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV3Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
     describe('leverageManagementOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
@@ -1215,6 +1396,53 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('limitOrder()', () => {
+      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string], [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType]]> = [
+        [
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            '2131',
+            '0.53123',
+            '1696590921159',
+            `${OrderType.STOP_LOSS}`
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            '2131',
+            '0.53123',
+            1696590921159,
+            OrderType.STOP_LOSS
+          ]
+        ],
+        [
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
+            '2131',
+            '0.43123',
+            '1646590921159',
+            `${OrderType.TAKE_PROFIT}`
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
+            '2131',
+            '0.43123',
+            1646590921159,
+            OrderType.TAKE_PROFIT
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(exchangeEncode.limitOrder(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
 
   describe('When testing strategySubService.crvUSDEncode', () => {
@@ -1473,7 +1701,58 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
+  describe('When testing strategySubService.compoundV3L2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[string, [EthereumAddress, EthereumAddress, number, number, number, number, boolean, boolean]]> = [
+        [
+          '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)}`, () => {
+          expect(compoundV3L2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing strategySubService.sparkEncode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[string, [number, number, number, number, boolean]]> = [
+        [
+          '0x0000000000000000136dcc951d8c00000000000000000000214e8348c4f0000000000000000000001d24b2dfac52000000000000000000001a5e27eef13e000001',
+          [140,240,210,190,true]
+        ],
+        [
+          '0x0000000000000000130337bdce49000000000000000000001988fe4052b800000000000000000000281b57b028e1000000000000000000002223acf76376000000',
+          [137, 184, 289, 246, false]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
     describe('leverageManagementOnPrice()', () => {
       const examples: Array<[[StrategyOrBundleIds, boolean, TriggerData, SubData], 
       [