npm - @defisaver/automation-sdk - Versions diffs - 2.0.5 → 2.0.6 - Mend

@defisaver/automation-sdk 2.0.5 → 2.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/esm/automation/private/StrategiesAutomation.js +1 -1
package/esm/constants/index.js +10 -0
package/esm/services/strategiesService.js +26 -0
package/esm/services/strategySubService.d.ts +12 -0
package/esm/services/strategySubService.js +7 -0
package/esm/services/triggerService.d.ts +10 -0
package/esm/services/triggerService.js +29 -1
package/esm/types/enums.d.ts +6 -0
package/esm/types/enums.js +6 -0
package/esm/types/index.d.ts +12 -1
package/package.json +2 -2
package/src/automation/private/StrategiesAutomation.ts +1 -1
package/src/constants/index.ts +10 -0
package/src/services/strategiesService.ts +39 -0
package/src/services/strategySubService.ts +22 -0
package/src/services/triggerService.test.ts +2 -1
package/src/services/triggerService.ts +41 -0
package/src/types/enums.ts +6 -0
package/src/types/index.ts +14 -1
package/umd/index.js +166 -73

package/esm/automation/private/StrategiesAutomation.js CHANGED Viewed

@@ -77,7 +77,7 @@ class StrategiesAutomation extends Automation_1.default {
             let subscriptions = [];
             if (subscriptionEvents) {
                 // @ts-ignore
-                const strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.fromBlock);
+                const strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
                 subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     let latestUpdate = subscriptionEvents[index].returnValues;

package/esm/constants/index.js CHANGED Viewed

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

package/esm/services/strategiesService.js CHANGED Viewed

@@ -243,6 +243,30 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState) ? enums_1.Strategies.IdOverrides.TakeProfit : enums_1.Strategies.IdOverrides.StopLoss;
     return _position;
 }
+function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
+    const _position = (0, lodash_1.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 } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+    _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState)
+        ? enums_1.Strategies.IdOverrides.TakeProfitWithGasPrice
+        : enums_1.Strategies.IdOverrides.StopLossWithGasPrice;
+    return _position;
+}
 function parseCompoundV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -461,7 +485,9 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
         [enums_1.Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
+        [enums_1.Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [enums_1.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
+        [enums_1.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/esm/services/strategySubService.d.ts CHANGED Viewed

@@ -33,6 +33,18 @@ export declare const aaveV3Encode: {
         debtAsset: EthereumAddress;
         debtAssetId: number;
     }): (number | boolean | string[])[];
+    closeToAssetWithMaximumGasPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+        baseTokenAddress: EthereumAddress;
+        quoteTokenAddress: EthereumAddress;
+        price: number;
+        ratioState: RatioState;
+        maximumGasPrice: number;
+    }, subData: {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+    }): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];

package/esm/services/strategySubService.js CHANGED Viewed

@@ -152,6 +152,13 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    closeToAssetWithMaximumGasPrice(strategyOrBundleId, isBundle = true, triggerData, subData) {
+        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];
+    },
 };
 exports.compoundV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {

package/esm/services/triggerService.d.ts CHANGED Viewed

@@ -50,6 +50,16 @@ export declare const aaveV3QuotePriceTrigger: {
         ratioState: RatioState;
     };
 };
+export declare const aaveV3QuotePriceWithMaximumGasPriceTrigger: {
+    encode(baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState, maximumGasPriceInGwei?: number): string[];
+    decode(triggerData: string[]): {
+        baseTokenAddress: EthereumAddress;
+        quoteTokenAddress: EthereumAddress;
+        price: string;
+        ratioState: RatioState;
+        maximumGasPrice: string;
+    };
+};
 export declare const compoundV2RatioTrigger: {
     encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
     decode(triggerData: string[]): {

package/esm/services/triggerService.js CHANGED Viewed

@@ -26,8 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3Utils = __importStar(require("web3-utils"));
 const utils_1 = require("./utils");
@@ -109,6 +110,33 @@ exports.aaveV3QuotePriceTrigger = {
         };
     },
 };
+exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = {
+    encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPriceInGwei) {
+        // Price is always in 8 decimals
+        const _price = new decimal_js_1.default(price.toString()).mul(Math.pow(10, 8)).floor().toString();
+        const _maximumGasPrice = maximumGasPriceInGwei
+            ? new decimal_js_1.default(maximumGasPriceInGwei.toString()).mul(Math.pow(10, 9)).floor().toString() // We convert it to WEI
+            : tokens_1.MAXUINT; // If undefined than set to MAXUINT
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState]),
+            web3_eth_abi_1.default.encodeParameters(['uint256'], [_maximumGasPrice]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedPriceTrigger = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+        const decodedMaximumGasPriceTrigger = web3_eth_abi_1.default.decodeParameters(['uint256'], triggerData[1]);
+        // Price is always in 8 decimals
+        const price = new decimal_js_1.default(decodedPriceTrigger[2]).div(Math.pow(10, 8)).toDP(8).toString();
+        const maximumGasPrice = new decimal_js_1.default(decodedMaximumGasPriceTrigger[0]).div(Math.pow(10, 9)).toDP(9).toString();
+        return {
+            baseTokenAddress: decodedPriceTrigger[0],
+            quoteTokenAddress: decodedPriceTrigger[1],
+            price,
+            ratioState: +decodedPriceTrigger[3],
+            maximumGasPrice,
+        };
+    },
+};
 exports.compoundV2RatioTrigger = {
     encode(owner, ratioPercentage, ratioState) {
         const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);

package/esm/types/enums.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "2.0.5",
+  "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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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];
   },
 };

package/src/services/triggerService.test.ts CHANGED Viewed

@@ -13,7 +13,8 @@ import {
   chainlinkPriceTrigger,
   compoundV2RatioTrigger,
   compoundV3RatioTrigger,
-  curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger,
+  curveUsdBorrowRateTrigger,
+  curveUsdSoftLiquidationTrigger,
   exchangeOffchainPriceTrigger,
   exchangeTimestampTrigger,
   liquityDebtInFrontTrigger,

package/src/services/triggerService.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import Dec from 'decimal.js';
+import { MAXUINT } from '@defisaver/tokens';
 import AbiCoder from 'web3-eth-abi';
 import * as web3Utils from 'web3-utils';
@@ -100,6 +101,46 @@ export const aaveV3QuotePriceTrigger = {
   },
 };
+export const aaveV3QuotePriceWithMaximumGasPriceTrigger = {
+  encode(
+    baseTokenAddress: EthereumAddress,
+    quoteTokenAddress: EthereumAddress,
+    price: number,
+    ratioState: RatioState,
+    maximumGasPriceInGwei?: number,
+  ) {
+    // Price is always in 8 decimals
+    const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
+    const _maximumGasPrice = maximumGasPriceInGwei
+      ? new Dec(maximumGasPriceInGwei.toString()).mul(10 ** 9).floor().toString() // We convert it to WEI
+      : MAXUINT; // If undefined than set to MAXUINT
+    return [
+      AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState]),
+      AbiCoder.encodeParameters(['uint256'], [_maximumGasPrice]),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState, maximumGasPrice: string } {
+    const decodedPriceTrigger = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as Array<string>;
+    const decodedMaximumGasPriceTrigger = AbiCoder.decodeParameters(['uint256'], triggerData[1]) as Array<string>;
+    // Price is always in 8 decimals
+    const price = new Dec(decodedPriceTrigger[2]).div(10 ** 8).toDP(8).toString();
+    const maximumGasPrice = new Dec(decodedMaximumGasPriceTrigger[0]).div(10 ** 9).toDP(9).toString();
+    return {
+      baseTokenAddress: decodedPriceTrigger[0],
+      quoteTokenAddress: decodedPriceTrigger[1],
+      price,
+      ratioState: +decodedPriceTrigger[3],
+      maximumGasPrice,
+    };
+  },
+};
 export const compoundV2RatioTrigger = {
   encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
     const ratioWei = ratioPercentageToWei(ratioPercentage);

package/src/types/enums.ts CHANGED Viewed

@@ -83,7 +83,9 @@ export 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',
@@ -96,6 +98,8 @@ export namespace Strategies {
   export 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',
@@ -117,7 +121,9 @@ export 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/src/types/index.ts CHANGED Viewed

@@ -140,6 +140,19 @@ 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,
@@ -147,7 +160,7 @@ export declare namespace Position {
     }
   }
-  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave;
+  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave;
   export interface Automated {
     chainId: ChainId,

package/umd/index.js CHANGED Viewed

@@ -283,11 +283,21 @@ var MAINNET_BUNDLES_INFO = {
     strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToDebt,
     protocol: PROTOCOLS.AaveV3
   },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_DEBT_WITH_GAS_PRICE,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToDebtWithGasPrice,
+    protocol: PROTOCOLS.AaveV3
+  },
   [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL]: {
     strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL,
     strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToCollateral,
     protocol: PROTOCOLS.AaveV3
   },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_CLOSE_TO_COLLATERAL_WITH_GAS_PRICE,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToCollateralWithGasPrice,
+    protocol: PROTOCOLS.AaveV3
+  },
   [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_AAVE_V2_REPAY]: {
     strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_AAVE_V2_REPAY,
     strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
@@ -513,7 +523,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";
@@ -528,6 +540,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";
@@ -551,7 +565,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";
@@ -1006,8 +1022,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _services_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17);
 /* harmony import */ var _Automation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
 /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -1142,8 +1158,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(web3_eth_abi__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _contractService__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -1313,8 +1329,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _private_StrategiesAutomation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
 /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -1344,8 +1360,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _services_ethereumService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(22);
 /* harmony import */ var _services_strategiesService__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28);
 /* harmony import */ var _Automation__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(23);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -1434,7 +1450,7 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_5__["def
       var subscriptions = [];
       if (subscriptionEvents) {
         // @ts-ignore
-        var strategiesSubs = yield _this5.getStrategiesSubs(subscriptionEvents.map(e => e.returnValues.subId), _options.fromBlock);
+        var strategiesSubs = yield _this5.getStrategiesSubs(subscriptionEvents.map(e => e.returnValues.subId), _options.toBlock);
         subscriptions = yield Promise.all(strategiesSubs.map( /*#__PURE__*/function () {
           var _ref = _asyncToGenerator(function* (sub, index) {
             var latestUpdate = subscriptionEvents[index].returnValues;
@@ -1445,7 +1461,7 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_5__["def
                   subId: latestUpdate.subId
                 }
               }));
-              latestUpdate = _objectSpread(_objectSpread({}, latestUpdate), updates === null || updates === void 0 ? void 0 : (_updates = updates[updates.length - 1]) === null || _updates === void 0 ? void 0 : _updates.returnValues);
+              latestUpdate = _objectSpread(_objectSpread({}, latestUpdate), updates === null || updates === void 0 || (_updates = updates[updates.length - 1]) === null || _updates === void 0 ? void 0 : _updates.returnValues);
             }
             return _this5.getParsedSubscriptions({
               chainId: _this5.chainId,
@@ -1526,8 +1542,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
 /* harmony import */ var _subDataService__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
 /* harmony import */ var _triggerService__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(313);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -1780,6 +1796,32 @@ function parseAaveV3CloseOnPrice(position, parseData) {
   _position.strategy.strategyId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.isRatioStateOver)(ratioState) ? _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.TakeProfit : _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.StopLoss;
   return _position;
 }
+function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
+  var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
+  var {
+    subStruct
+  } = parseData.subscriptionEventData;
+  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.aaveV3QuotePriceWithMaximumGasPriceTrigger.decode(subStruct.triggerData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.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
+  };
+  var {
+    ratioState
+  } = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0,_utils__WEBPACK_IMPORTED_MODULE_4__.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0,_utils__WEBPACK_IMPORTED_MODULE_4__.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+  _position.strategy.strategyId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.isRatioStateOver)(ratioState) ? _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.TakeProfitWithGasPrice : _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.StopLossWithGasPrice;
+  return _position;
+}
 function parseCompoundV2LeverageManagement(position, parseData) {
   var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
   var {
@@ -2029,7 +2071,9 @@ var parsingMethodsMapping = {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
-    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice
   },
   [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -32328,6 +32372,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   aaveV2RatioTrigger: () => (/* binding */ aaveV2RatioTrigger),
 /* harmony export */   aaveV3QuotePriceTrigger: () => (/* binding */ aaveV3QuotePriceTrigger),
+/* harmony export */   aaveV3QuotePriceWithMaximumGasPriceTrigger: () => (/* binding */ aaveV3QuotePriceWithMaximumGasPriceTrigger),
 /* harmony export */   aaveV3RatioTrigger: () => (/* binding */ aaveV3RatioTrigger),
 /* harmony export */   cBondsRebondTrigger: () => (/* binding */ cBondsRebondTrigger),
 /* harmony export */   chainlinkPriceTrigger: () => (/* binding */ chainlinkPriceTrigger),
@@ -32347,11 +32392,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
-/* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(web3_utils__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17);
+/* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
+/* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
+/* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(web3_eth_abi__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
+/* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(web3_utils__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
@@ -32359,10 +32407,10 @@ __webpack_require__.r(__webpack_exports__);
 var chainlinkPriceTrigger = {
   encode(tokenAddr, price, state) {
     var _price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(price).mul(1e8).floor().toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256', 'uint8'], [tokenAddr, _price, state])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256', 'uint8'], [tokenAddr, _price, state])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
     return {
       tokenAddr: decodedData[0],
       price: new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[1]).div(1e8).toString(),
@@ -32373,10 +32421,10 @@ var chainlinkPriceTrigger = {
 var trailingStopTrigger = {
   encode(tokenAddr, percentage, roundId) {
     var _percentage = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(percentage).mul(1e8).toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256', 'uint80'], [tokenAddr, _percentage, roundId])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256', 'uint80'], [tokenAddr, _percentage, roundId])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint80'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256', 'uint80'], triggerData[0]);
     var triggerPercentage = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[1]).div(1e8).toNumber();
     return {
       tokenAddr: decodedData[0],
@@ -32387,29 +32435,29 @@ var trailingStopTrigger = {
 };
 var makerRatioTrigger = {
   encode(vaultId, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256', 'uint256', 'uint8'], [vaultId, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['uint256', 'uint256', 'uint8'], [vaultId, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
     return {
       vaultId: +decodedData[0],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[1]),
       ratioState: +decodedData[2]
     };
   }
 };
 var aaveV3RatioTrigger = {
   encode(owner, market, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
       ratioState: Number(decodedData[3])
     };
   }
@@ -32417,10 +32465,10 @@ var aaveV3RatioTrigger = {
 var morphoAaveV2RatioTrigger = {
   encode(owner, ratioPercentage, ratioState) {
     var ratioWei = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(ratioPercentage).mul(1e16).toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       ratio: new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[1]).div(1e16).toNumber(),
@@ -32432,10 +32480,10 @@ var aaveV3QuotePriceTrigger = {
   encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
     // Price is always in 8 decimals
     var _price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(price.toString()).mul(10 ** 8).floor().toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     // Price is always in 8 decimals
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[2]).div(10 ** 8).toDP(8).toString();
     return {
@@ -32446,40 +32494,64 @@ var aaveV3QuotePriceTrigger = {
     };
   }
 };
+var aaveV3QuotePriceWithMaximumGasPriceTrigger = {
+  encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPriceInGwei) {
+    // Price is always in 8 decimals
+    var _price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(price.toString()).mul(10 ** 8).floor().toString();
+    var _maximumGasPrice = maximumGasPriceInGwei ? new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maximumGasPriceInGwei.toString()).mul(10 ** 9).floor().toString() // We convert it to WEI
+    : _defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.MAXUINT; // If undefined than set to MAXUINT
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState]), web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['uint256'], [_maximumGasPrice])];
+  },
+  decode(triggerData) {
+    var decodedPriceTrigger = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedMaximumGasPriceTrigger = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['uint256'], triggerData[1]);
+    // Price is always in 8 decimals
+    var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedPriceTrigger[2]).div(10 ** 8).toDP(8).toString();
+    var maximumGasPrice = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedMaximumGasPriceTrigger[0]).div(10 ** 9).toDP(9).toString();
+    return {
+      baseTokenAddress: decodedPriceTrigger[0],
+      quoteTokenAddress: decodedPriceTrigger[1],
+      price,
+      ratioState: +decodedPriceTrigger[3],
+      maximumGasPrice
+    };
+  }
+};
 var compoundV2RatioTrigger = {
   encode(owner, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[1]),
       ratioState: +decodedData[2]
     };
   }
 };
 var liquityRatioTrigger = {
   encode(owner, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[1]),
       ratioState: +decodedData[2]
     };
   }
 };
 var liquityDebtInFrontTrigger = {
   encode(owner, debtInFrontMin) {
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256'], [owner, debtInFrontMin])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256'], [owner, debtInFrontMin])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256'], triggerData[0]);
     return {
       owner: decodedData[0],
       debtInFrontMin: decodedData[1]
@@ -32488,25 +32560,25 @@ var liquityDebtInFrontTrigger = {
 };
 var aaveV2RatioTrigger = {
   encode(owner, market, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
       ratioState: +decodedData[3]
     };
   }
 };
 var cBondsRebondTrigger = {
   encode(bondId) {
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256'], [bondId])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['uint256'], [bondId])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['uint256'], triggerData[0]);
     return {
       bondId: decodedData[0]
     };
@@ -32514,15 +32586,15 @@ var cBondsRebondTrigger = {
 };
 var compoundV3RatioTrigger = {
   encode(owner, market, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
       ratioState: +decodedData[3]
     };
   }
@@ -32531,10 +32603,10 @@ var exchangeTimestampTrigger = {
   encode(timestamp, interval) {
     var timestampWei = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(timestamp).toString();
     var intervalWei = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(interval).toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256', 'uint256'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['uint256', 'uint256'], triggerData[0]);
     return {
       timestamp: Number(decodedData[0]),
       interval: Number(decodedData[1])
@@ -32545,10 +32617,10 @@ var exchangeOffchainPriceTrigger = {
   encode(targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals) {
     var decimals = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(targetPrice.toString()).mul(10 ** decimals).floor().toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
   },
   decode(triggerData, fromTokenDecimals, toTokenDecimals) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
     var decimals = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(toTokenDecimals).plus(18).minus(fromTokenDecimals).toString();
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[0]).div(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(10).pow(decimals)).toDP(fromTokenDecimals).toString();
     return {
@@ -32560,15 +32632,15 @@ var exchangeOffchainPriceTrigger = {
 };
 var sparkRatioTrigger = {
   encode(owner, market, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.ratioPercentageToWei)(ratioPercentage);
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
       ratioState: Number(decodedData[3])
     };
   }
@@ -32577,10 +32649,10 @@ var sparkQuotePriceTrigger = {
   encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
     // Price is always in 8 decimals
     var _price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(price.toString()).mul(10 ** 8).floor().toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     // Price is always in 8 decimals
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[2]).div(10 ** 8).toDP(8).toString();
     return {
@@ -32598,11 +32670,11 @@ var curveUsdBorrowRateTrigger = {
     var rate = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(targetRate).div(100)).plus(1)).ln().div(365).div(86400).toString();
     var rateWei = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(rate).mul(10 ** 18).floor().toString(); // 18 decimals
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'uint256', 'uint8'], [market, rateWei, rateState])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'uint256', 'uint8'], [market, rateWei, rateState])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-    var rateEth = web3_utils__WEBPACK_IMPORTED_MODULE_2__.fromWei(decodedData[1], 'ether');
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    var rateEth = web3_utils__WEBPACK_IMPORTED_MODULE_3__.fromWei(decodedData[1], 'ether');
     // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
     var exponentRate = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(rateEth).mul(365).mul(86400);
@@ -32618,10 +32690,10 @@ var curveUsdSoftLiquidationTrigger = {
   encode(market, owner, percentage) {
     // 100% = 1e18 => 1% = 1e16
     var _percentage = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(percentage).mul(10 ** 16).floor().toString();
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['address', 'address', 'uint256'], [market, owner, _percentage])];
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256'], [market, owner, _percentage])];
   },
   decode(triggerData) {
-    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
     return {
       market: decodedData[0],
       owner: decodedData[1],
@@ -32641,8 +32713,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _private_StrategiesAutomation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
 /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -32667,8 +32739,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _private_StrategiesAutomation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
 /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -32841,6 +32913,27 @@ var aaveV3Encode = {
     } = triggerData;
     var triggerDataEncoded = _triggerService__WEBPACK_IMPORTED_MODULE_4__.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
+  closeToAssetWithMaximumGasPrice(strategyOrBundleId) {
+    var isBundle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    var triggerData = arguments.length > 2 ? arguments[2] : undefined;
+    var subData = arguments.length > 3 ? arguments[3] : undefined;
+    var {
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId
+    } = subData;
+    var subDataEncoded = _subDataService__WEBPACK_IMPORTED_MODULE_3__.aaveV3QuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+    var {
+      baseTokenAddress,
+      quoteTokenAddress,
+      price,
+      maximumGasPrice,
+      ratioState
+    } = triggerData;
+    var triggerDataEncoded = _triggerService__WEBPACK_IMPORTED_MODULE_4__.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   }
 };
 var compoundV2Encode = {