@defisaver/automation-sdk 1.2.24 → 1.2.26

package/esm/constants/index.js

@@ -192,6 +192,16 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.Boost,
         protocol: PROTOCOLS.MorphoAaveV2,
     },
+    [Bundles.MainnetIds.LIQUITY_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.Liquity,
+    },
+    [Bundles.MainnetIds.LIQUITY_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.Liquity,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -184,7 +184,7 @@ function parseAaveV3CloseOnPrice(position, parseData) {
         price: triggerData.price,
         ratioState: triggerData.ratioState,
     };
-    const { ratioState } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset), wethToEthByAddress(_position.specific.debtAsset), parseData.chainId);
+    const { ratioState } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
     _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
     return _position;
 }
@@ -255,6 +255,35 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
     _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals, toTokenDecimals);
     return _position;
 }
+function parseLiquityLeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            minRatio: triggerData.ratio,
+            minOptimalRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+        };
+    }
+    else {
+        _position.specific = {
+            maxRatio: triggerData.ratio,
+            maxOptimalRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.specific.mergeWithSameId = true;
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -269,6 +298,8 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
         [Strategies.Identifiers.TrailingStopToColl]: parseLiquityTrailingStop,
         [Strategies.Identifiers.BondProtection]: parseLiquityBondProtection,
+        [Strategies.Identifiers.Repay]: parseLiquityLeverageManagement,
+        [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
     },
     [ProtocolIdentifiers.StrategiesAutomation.AaveV3]: {
         [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -10,6 +10,7 @@ export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     paybackFromChickenBondStrategySub(proxyAddress: EthereumAddress, ratio: number, sourceId: string, sourceType: number, ratioState?: RatioState): (boolean | string[] | Bundles.MainnetIds)[];
+    leverageManagement(minRatio: string, maxRatio: string, maxOptimalRatio: string, minOptimalRatio: string, boostEnabled: boolean): (string | boolean)[];
 };
 export declare const chickenBondsEncode: {
     rebond(bondId: number): string[];

package/esm/services/strategySubService.js

@@ -66,6 +66,15 @@ export const liquityEncode = {
         const isBundle = true;
         return [strategyId, isBundle, triggerData, subData];
     },
+    leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return [
+            new Dec(minRatio).mul(1e16).toString(),
+            new Dec(maxRatio).mul(1e16).toString(),
+            new Dec(maxOptimalRatio).mul(1e16).toString(),
+            new Dec(minOptimalRatio).mul(1e16).toString(),
+            boostEnabled,
+        ];
+    },
 };
 export const chickenBondsEncode = {
     rebond(bondId) {

package/esm/services/subDataService.d.ts

@@ -22,6 +22,11 @@ export declare const makerLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityLeverageManagementSubData: {
+    decode: (subData: string[]) => {
+        targetRatio: number;
+    };
+};
 export declare const liquityCloseSubData: {
     encode(closeToAssetAddr: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -70,6 +70,13 @@ export const makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
+export const liquityLeverageManagementSubData = {
+    decode: (subData) => {
+        const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
 export const liquityCloseSubData = {
     encode(closeToAssetAddr, chainId = ChainId.Ethereum, collAddr, debtAddr) {
         const _collAddr = collAddr || getAssetInfo('WETH', chainId).address;

package/esm/services/triggerService.d.ts

@@ -63,7 +63,7 @@ export declare const liquityRatioTrigger: {
     decode(triggerData: string[]): {
         owner: EthereumAddress;
         ratioState: RatioState;
-        ratio: string;
+        ratio: number;
     };
 };
 export declare const liquityDebtInFrontTrigger: {

package/esm/services/triggerService.js

@@ -102,7 +102,7 @@ export const liquityRatioTrigger = {
         const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
         return {
             owner: decodedData[0],
-            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toString(),
+            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
             ratioState: +decodedData[2],
         };
     },

package/esm/types/enums.d.ts

@@ -98,7 +98,9 @@ export declare namespace Bundles {
         AAVE_V3_CLOSE_TO_DEBT = 12,
         AAVE_V3_CLOSE_TO_COLLATERAL = 13,
         MORPHO_AAVE_V2_REPAY = 14,
-        MORPHO_AAVE_V2_BOOST = 15
+        MORPHO_AAVE_V2_BOOST = 15,
+        LIQUITY_REPAY = 16,
+        LIQUITY_BOOST = 17
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -113,6 +113,8 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 13] = "AAVE_V3_CLOSE_TO_COLLATERAL";
         MainnetIds[MainnetIds["MORPHO_AAVE_V2_REPAY"] = 14] = "MORPHO_AAVE_V2_REPAY";
         MainnetIds[MainnetIds["MORPHO_AAVE_V2_BOOST"] = 15] = "MORPHO_AAVE_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_REPAY"] = 16] = "LIQUITY_REPAY";
+        MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -208,6 +208,16 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.MorphoAaveV2,
   },
+  [Bundles.MainnetIds.LIQUITY_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.Liquity,
+  },
+  [Bundles.MainnetIds.LIQUITY_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.Liquity,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/strategiesService.ts

@@ -253,8 +253,8 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
 
   const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
     _position.specific.ratioState,
-    wethToEthByAddress(_position.specific.collAsset),
-    wethToEthByAddress(_position.specific.debtAsset),
+    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
+    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
     parseData.chainId,
   );
 
@@ -352,6 +352,41 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 
   return _position;
 }
+function parseLiquityLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      minRatio: triggerData.ratio,
+      minOptimalRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      maxRatio: triggerData.ratio,
+      maxOptimalRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  _position.specific.mergeWithSameId = true;
+
+  return _position;
+}
 
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
@@ -367,6 +402,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
     [Strategies.Identifiers.TrailingStopToColl]: parseLiquityTrailingStop,
     [Strategies.Identifiers.BondProtection]: parseLiquityBondProtection,
+    [Strategies.Identifiers.Repay]: parseLiquityLeverageManagement,
+    [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV3]: {
     [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,

package/src/services/strategySubService.ts

@@ -149,6 +149,21 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
+  leverageManagement(
+    minRatio:string,
+    maxRatio:string,
+    maxOptimalRatio:string,
+    minOptimalRatio:string,
+    boostEnabled:boolean,
+  ) {
+    return [
+      new Dec(minRatio).mul(1e16).toString(),
+      new Dec(maxRatio).mul(1e16).toString(),
+      new Dec(maxOptimalRatio).mul(1e16).toString(),
+      new Dec(minOptimalRatio).mul(1e16).toString(),
+      boostEnabled,
+    ];
+  },
 };
 
 export const chickenBondsEncode = {

package/src/services/subDataService.ts

@@ -98,6 +98,13 @@ export const makerLeverageManagementSubData = {
     return { vaultId, targetRatio };
   },
 };
+export const liquityLeverageManagementSubData = {
+  decode: (subData:SubData) => {
+    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+    return { targetRatio };
+  },
+};
 export const liquityCloseSubData = {
   encode(
     closeToAssetAddr: EthereumAddress,

package/src/services/triggerService.ts

@@ -120,11 +120,11 @@ export const liquityRatioTrigger = {
     const ratioWei = ratioPercentageToWei(ratioPercentage);
     return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
   },
-  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: string } {
+  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: number } {
     const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
-      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toString(),
+      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
       ratioState: +decodedData[2],
     };
   },

package/src/types/enums.ts

@@ -108,6 +108,8 @@ export namespace Bundles {
     AAVE_V3_CLOSE_TO_COLLATERAL = 13,
     MORPHO_AAVE_V2_REPAY = 14,
     MORPHO_AAVE_V2_BOOST = 15,
+    LIQUITY_REPAY = 16,
+    LIQUITY_BOOST = 17,
   }
 
   export enum OptimismIds {