@defisaver/automation-sdk 2.0.4 → 2.0.6

package/esm/types/enums.d.ts

@@ -74,7 +74,9 @@ export declare namespace Strategies {
         Boost = "boost",
         EoaBoost = "eoa-boost",
         CloseToDebt = "close-to-debt",
+        CloseToDebtWithGasPrice = "close-to-debt-with-gas-price",
         CloseToCollateral = "close-to-collateral",
+        CloseToCollateralWithGasPrice = "close-to-collateral-with-gas-price",
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
         TrailingStopToColl = "trailing-stop-to-collateral",
@@ -87,6 +89,8 @@ export declare namespace Strategies {
     enum IdOverrides {
         TakeProfit = "take-profit",
         StopLoss = "stop-loss",
+        TakeProfitWithGasPrice = "take-profit-with-gas-price",
+        StopLossWithGasPrice = "stop-loss-with-gas-price",
         TrailingStop = "trailing-stop",
         LeverageManagement = "leverage-management",
         EoaLeverageManagement = "leverage-management-eoa"
@@ -107,7 +111,9 @@ export declare namespace Bundles {
         MAKER_REPAY = 10,
         MAKER_BOOST = 11,
         AAVE_V3_CLOSE_TO_DEBT = 12,
+        AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE = 24,
         AAVE_V3_CLOSE_TO_COLLATERAL = 13,
+        AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE = 25,
         MORPHO_AAVE_V2_REPAY = 14,
         MORPHO_AAVE_V2_BOOST = 15,
         LIQUITY_REPAY = 16,

package/esm/types/enums.js

@@ -89,7 +89,9 @@ var Strategies;
         Identifiers["Boost"] = "boost";
         Identifiers["EoaBoost"] = "eoa-boost";
         Identifiers["CloseToDebt"] = "close-to-debt";
+        Identifiers["CloseToDebtWithGasPrice"] = "close-to-debt-with-gas-price";
         Identifiers["CloseToCollateral"] = "close-to-collateral";
+        Identifiers["CloseToCollateralWithGasPrice"] = "close-to-collateral-with-gas-price";
         Identifiers["CloseOnPriceToDebt"] = "close-on-price-to-debt";
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
@@ -103,6 +105,8 @@ var Strategies;
     (function (IdOverrides) {
         IdOverrides["TakeProfit"] = "take-profit";
         IdOverrides["StopLoss"] = "stop-loss";
+        IdOverrides["TakeProfitWithGasPrice"] = "take-profit-with-gas-price";
+        IdOverrides["StopLossWithGasPrice"] = "stop-loss-with-gas-price";
         IdOverrides["TrailingStop"] = "trailing-stop";
         IdOverrides["LeverageManagement"] = "leverage-management";
         IdOverrides["EoaLeverageManagement"] = "leverage-management-eoa";
@@ -125,7 +129,9 @@ var Bundles;
         MainnetIds[MainnetIds["MAKER_REPAY"] = 10] = "MAKER_REPAY";
         MainnetIds[MainnetIds["MAKER_BOOST"] = 11] = "MAKER_BOOST";
         MainnetIds[MainnetIds["AAVE_V3_CLOSE_TO_DEBT"] = 12] = "AAVE_V3_CLOSE_TO_DEBT";
+        MainnetIds[MainnetIds["AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE"] = 24] = "AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 13] = "AAVE_V3_CLOSE_TO_COLLATERAL";
+        MainnetIds[MainnetIds["AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE"] = 25] = "AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE";
         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";

package/esm/types/index.d.ts

@@ -116,13 +116,24 @@ export declare namespace Position {
             price: string;
             ratioState: RatioState;
         }
+        interface CloseOnPriceWithMaximumGasPriceAave extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            price: string;
+            maximumGasPrice: string;
+            ratioState: RatioState;
+        }
         interface TrailingStop extends Base {
             roundId: number;
             triggerPercentage: number;
             closeToAssetAddr: EthereumAddress;
         }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave;
     interface Automated {
         chainId: ChainId;
         owner: EthereumAddress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -15,7 +15,7 @@
     "lint": "node_modules/.bin/eslint ./src",
     "gtc": "node scripts/generateContractTypes.js",
     "prepare": "husky install && npm run gtc",
-    "test": "mocha \"./src/**/*.test.ts\" --loader=ts-node/esm --extension ts"
+    "test": "mocha \"./src/**/*.test.ts\" --require ts-node/register --extension ts"
   },
   "author": "DeFi Saver",
   "repository": "https://github.com/defisaver/automation-sdk",

package/src/automation/private/StrategiesAutomation.ts

@@ -97,7 +97,7 @@ export default class StrategiesAutomation extends Automation {
 
     if (subscriptionEvents) {
       // @ts-ignore
-      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.fromBlock);
+      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
 
       subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
         let latestUpdate = subscriptionEvents[index].returnValues;

package/src/constants/index.ts

@@ -203,11 +203,21 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.CloseToDebt,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.MainnetIds.AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE,
+    strategyId: Strategies.Identifiers.CloseToDebtWithGasPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
   [Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL]: {
     strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL,
     strategyId: Strategies.Identifiers.CloseToCollateral,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE,
+    strategyId: Strategies.Identifiers.CloseToCollateralWithGasPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
   [Bundles.MainnetIds.MORPHO_AAVE_V2_REPAY]: {
     strategyOrBundleId: Bundles.MainnetIds.MORPHO_AAVE_V2_REPAY,
     strategyId: Strategies.Identifiers.Repay,

package/src/services/strategiesService.ts

@@ -299,6 +299,43 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
   return _position;
 }
 
+function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    collAssetId: subData.collAssetId,
+    debtAsset: subData.debtAsset,
+    debtAssetId: subData.debtAssetId,
+    baseToken: triggerData.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    maximumGasPrice: triggerData.maximumGasPrice,
+    ratioState: triggerData.ratioState,
+  };
+
+  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.TakeProfitWithGasPrice
+    : Strategies.IdOverrides.StopLossWithGasPrice;
+
+  return _position;
+}
+
 function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -579,7 +616,9 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
+    [Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
+    [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/src/services/strategySubService.ts

@@ -256,6 +256,28 @@ export const aaveV3Encode = {
     } = triggerData;
     const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
 
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
+  closeToAssetWithMaximumGasPrice(
+    strategyOrBundleId: number,
+    isBundle: boolean = true,
+    triggerData: {
+      baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState, maximumGasPrice: number
+    },
+    subData: {
+      collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number,
+    },
+  ) {
+    const {
+      collAsset, collAssetId, debtAsset, debtAssetId,
+    } = subData;
+    const subDataEncoded = subDataService.aaveV3QuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+
+    const {
+      baseTokenAddress, quoteTokenAddress, price, maximumGasPrice, ratioState,
+    } = triggerData;
+    const triggerDataEncoded = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
+
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 };