@defisaver/automation-sdk 2.0.4 → 2.0.6

package/src/services/triggerService.ts

@@ -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);
@@ -206,21 +247,23 @@ export const exchangeTimestampTrigger = {
   ): { timestamp: number, interval: number } {
     const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256'], triggerData[0]);
     return {
-      timestamp: decodedData[0] as number,
-      interval: decodedData[1] as number,
+      timestamp: Number(decodedData[0]) as number,
+      interval: Number(decodedData[1]) as number,
     };
   },
 };
+
 export const exchangeOffchainPriceTrigger = {
   encode(
     targetPrice: string,
     goodUntil: number,
     orderType: OrderType,
     fromTokenDecimals: number,
+    toTokenDecimals: number,
   ) {
-    const price = new Dec(targetPrice.toString()).mul(10 ** fromTokenDecimals).floor().toString();
-    const goodUntilWei = web3Utils.toWei(new Dec(goodUntil).toString(), 'ether');
-    return [AbiCoder.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
+    const decimals = new Dec(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
+    const price = new Dec(targetPrice.toString()).mul(10 ** decimals).floor().toString();
+    return [AbiCoder.encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
   },
   decode(
     triggerData: TriggerData,
@@ -232,7 +275,7 @@ export const exchangeOffchainPriceTrigger = {
     const price = new Dec(decodedData[0] as string).div(new Dec(10).pow(decimals)).toDP(fromTokenDecimals).toString();
     return {
       targetPrice: price,
-      goodUntil: decodedData[1],
+      goodUntil: +decodedData[1],
       orderType: +decodedData[2]!,
     };
   },
@@ -298,7 +341,7 @@ export const curveUsdBorrowRateTrigger = {
     triggerData: TriggerData,
   ): { market: EthereumAddress, targetRate: string, rateState: RatioState } {
     const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-    const rateEth = weiToRatioPercentage(decodedData[1] as string);
+    const rateEth = web3Utils.fromWei(decodedData[1] as string, 'ether');
 
     // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
     const exponentRate = new Dec(rateEth).mul(365).mul(86400);

package/src/types/enums.ts

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

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