@defisaver/automation-sdk 2.0.4 → 2.0.6

package/esm/automation/private/StrategiesAutomation.js

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

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

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

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

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

@@ -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[]): {
@@ -105,7 +115,7 @@ export declare const exchangeTimestampTrigger: {
     };
 };
 export declare const exchangeOffchainPriceTrigger: {
-    encode(targetPrice: string, goodUntil: number, orderType: OrderType, fromTokenDecimals: number): string[];
+    encode(targetPrice: string, goodUntil: number, orderType: OrderType, fromTokenDecimals: number, toTokenDecimals: number): string[];
     decode(triggerData: string[], fromTokenDecimals: number, toTokenDecimals: number): {
         orderType: OrderType;
         targetPrice: string;

package/esm/services/triggerService.js

@@ -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);
@@ -197,16 +225,16 @@ exports.exchangeTimestampTrigger = {
     decode(triggerData) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['uint256', 'uint256'], triggerData[0]);
         return {
-            timestamp: decodedData[0],
-            interval: decodedData[1],
+            timestamp: Number(decodedData[0]),
+            interval: Number(decodedData[1]),
         };
     },
 };
 exports.exchangeOffchainPriceTrigger = {
-    encode(targetPrice, goodUntil, orderType, fromTokenDecimals) {
-        const price = new decimal_js_1.default(targetPrice.toString()).mul(Math.pow(10, fromTokenDecimals)).floor().toString();
-        const goodUntilWei = web3Utils.toWei(new decimal_js_1.default(goodUntil).toString(), 'ether');
-        return [web3_eth_abi_1.default.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
+    encode(targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals) {
+        const decimals = new decimal_js_1.default(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
+        const price = new decimal_js_1.default(targetPrice.toString()).mul(Math.pow(10, decimals)).floor().toString();
+        return [web3_eth_abi_1.default.encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
     },
     decode(triggerData, fromTokenDecimals, toTokenDecimals) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
@@ -214,7 +242,7 @@ exports.exchangeOffchainPriceTrigger = {
         const price = new decimal_js_1.default(decodedData[0]).div(new decimal_js_1.default(10).pow(decimals)).toDP(fromTokenDecimals).toString();
         return {
             targetPrice: price,
-            goodUntil: decodedData[1],
+            goodUntil: +decodedData[1],
             orderType: +decodedData[2],
         };
     },
@@ -263,7 +291,7 @@ exports.curveUsdBorrowRateTrigger = {
     },
     decode(triggerData) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-        const rateEth = (0, utils_1.weiToRatioPercentage)(decodedData[1]);
+        const rateEth = web3Utils.fromWei(decodedData[1], 'ether');
         // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
         const exponentRate = new decimal_js_1.default(rateEth).mul(365).mul(86400);
         const targetRate = new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponentRate).minus(1)).mul(100)

package/esm/services/triggerService.test.d.ts

@@ -0,0 +1 @@
+export {};