@defisaver/automation-sdk 1.1.2 → 1.2.1

package/esm/constants/index.js

@@ -130,6 +130,16 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.Boost,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.MainnetIds.MAKER_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.MAKER_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.MakerDAO,
+    },
+    [Bundles.MainnetIds.MAKER_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.MAKER_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.MakerDAO,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -49,6 +49,35 @@ function parseMakerTrailingStop(position, parseData) {
     };
     return _position;
 }
+function parseMakerLeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.makerLeverageManagementSubData.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;
+}
 function parseLiquityCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -186,6 +215,8 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.CloseOnPriceToColl]: parseMakerCloseOnPrice,
         [Strategies.Identifiers.TrailingStopToColl]: parseMakerTrailingStop,
         [Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
+        [Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
+        [Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
     },
     [ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
         [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,

package/esm/services/strategySubService.d.ts

@@ -4,6 +4,7 @@ export declare const makerEncode: {
     repayFromSavings(bundleId: StrategyOrBundleIds, vaultId: number, priceOverOrUnder: RatioState, targetRatio: number, isBundle?: boolean, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[])[];
     closeOnPrice(vaultId: number, ratioState: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(vaultId: number, triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
+    leverageManagement(vaultId: number, minRatio: string, maxRatio: string, maxOptimalRatio: string, minOptimalRatio: string, boostEnabled: boolean): (string | number | boolean)[];
 };
 export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];

package/esm/services/strategySubService.js

@@ -30,6 +30,16 @@ export const makerEncode = {
         const isBundle = false;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagement(vaultId, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return [
+            vaultId,
+            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 liquityEncode = {
     closeOnPrice(priceOverOrUnder, price, closeToAssetAddr, chainlinkCollAddress, chainId = ChainId.Ethereum, collAddr, debtAddr) {

package/esm/services/subDataService.d.ts

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

package/esm/services/subDataService.js

@@ -54,6 +54,22 @@ export const makerCloseSubData = {
         };
     },
 };
+export const makerLeverageManagementSubData = {
+    // encode: (vaultId:number, repayFrom, boostFrom, boostTo, repayTo, boostEnabled) => [
+    //   vaultId,
+    //   new Dec(repayFrom).mul(1e16).toString(),
+    //   new Dec(boostFrom).mul(1e16).toString(),
+    //   new Dec(boostTo).mul(1e16).toString(),
+    //   new Dec(repayTo).mul(1e16).toString(),
+    //   boostEnabled,
+    // ],
+    decode: (subData) => {
+        const vaultId = +mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]).toString();
+        const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { vaultId, targetRatio };
+    },
+};
 export const liquityCloseSubData = {
     encode(closeToAssetAddr, chainId = ChainId.Ethereum, collAddr, debtAddr) {
         const _collAddr = collAddr || getAssetInfo('WETH', chainId).address;

package/esm/types/enums.d.ts

@@ -82,7 +82,9 @@ export declare namespace Bundles {
         COMP_V3_EOA_BOOST_BUNDLE = 6,
         LIQUITY_PAYBACK_USING_CHICKEN_BOND = 7,
         AAVE_V3_REPAY = 8,
-        AAVE_V3_BOOST = 9
+        AAVE_V3_BOOST = 9,
+        MAKER_REPAY = 10,
+        MAKER_BOOST = 11
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -97,6 +97,8 @@ export var Bundles;
         MainnetIds[MainnetIds["LIQUITY_PAYBACK_USING_CHICKEN_BOND"] = 7] = "LIQUITY_PAYBACK_USING_CHICKEN_BOND";
         MainnetIds[MainnetIds["AAVE_V3_REPAY"] = 8] = "AAVE_V3_REPAY";
         MainnetIds[MainnetIds["AAVE_V3_BOOST"] = 9] = "AAVE_V3_BOOST";
+        MainnetIds[MainnetIds["MAKER_REPAY"] = 10] = "MAKER_REPAY";
+        MainnetIds[MainnetIds["MAKER_BOOST"] = 11] = "MAKER_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -14,7 +14,8 @@
     "document": "npx typedoc --out docs/default",
     "lint": "node_modules/.bin/eslint ./src",
     "gtc": "node scripts/generateContractTypes.js",
-    "prepare": "husky install && npm run gtc"
+    "prepare": "husky install && npm run gtc",
+    "cpublish": "yarn build && yarn publish"
   },
   "author": "DeFi Saver",
   "repository": "https://github.com/defisaver/automation-sdk",

package/src/constants/index.ts

@@ -146,6 +146,16 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.MainnetIds.MAKER_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.MAKER_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.MakerDAO,
+  },
+  [Bundles.MainnetIds.MAKER_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.MAKER_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.MakerDAO,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -204,4 +214,4 @@ export const BUNDLE_IDS = {
   [ChainId.Ethereum]: Bundles.MainnetIds,
   [ChainId.Optimism]: Bundles.OptimismIds,
   [ChainId.Arbitrum]: Bundles.ArbitrumIds,
-};
+};

package/src/services/strategiesService.ts

@@ -75,7 +75,41 @@ function parseMakerTrailingStop(position: Position.Automated, parseData: ParseDa
 
   return _position;
 }
+function parseMakerLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.makerLeverageManagementSubData.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;
+}
 function parseLiquityCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -265,6 +299,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CloseOnPriceToColl]: parseMakerCloseOnPrice,
     [Strategies.Identifiers.TrailingStopToColl]: parseMakerTrailingStop,
     [Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
+    [Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
+    [Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
   },
   [ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
     [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
@@ -339,4 +375,4 @@ export function parseStrategiesAutomatedPosition(parseData: ParseData): Position
   };
 
   return getParsingMethod(position.protocol.id, position.strategy)(position, parseData);
-}
+}

package/src/services/strategySubService.ts

@@ -72,6 +72,23 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  leverageManagement(
+    vaultId:number,
+    minRatio:string,
+    maxRatio:string,
+    maxOptimalRatio:string,
+    minOptimalRatio:string,
+    boostEnabled:boolean,
+  ) {
+    return [
+      vaultId,
+      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 liquityEncode = {
@@ -199,4 +216,4 @@ export const compoundV3Encode = {
   ) {
     return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
   },
-};
+};

package/src/services/subDataService.ts

@@ -82,6 +82,22 @@ export const makerCloseSubData = {
   },
 };
 
+export const makerLeverageManagementSubData = {
+  // encode: (vaultId:number, repayFrom, boostFrom, boostTo, repayTo, boostEnabled) => [
+  //   vaultId,
+  //   new Dec(repayFrom).mul(1e16).toString(),
+  //   new Dec(boostFrom).mul(1e16).toString(),
+  //   new Dec(boostTo).mul(1e16).toString(),
+  //   new Dec(repayTo).mul(1e16).toString(),
+  //   boostEnabled,
+  // ],
+  decode: (subData:SubData) => {
+    const vaultId = +mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]).toString();
+    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+    return { vaultId, targetRatio };
+  },
+};
 export const liquityCloseSubData = {
   encode(
     closeToAssetAddr: EthereumAddress,
@@ -210,4 +226,4 @@ export const liquityPaybackUsingChickenBondSubData = {
 
     return { sourceId, sourceType };
   },
-};
+};

package/src/types/enums.ts

@@ -90,6 +90,8 @@ export namespace Bundles {
     LIQUITY_PAYBACK_USING_CHICKEN_BOND = 7,
     AAVE_V3_REPAY = 8,
     AAVE_V3_BOOST = 9,
+    MAKER_REPAY = 10,
+    MAKER_BOOST = 11,
   }
 
   export enum OptimismIds {