@defisaver/automation-sdk 2.0.5 → 2.0.8

package/src/services/subDataService.ts

@@ -4,6 +4,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisave
 import { otherAddresses } from '@defisaver/sdk';
 
 import type { EthereumAddress, SubData } from '../types';
+import type { OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 
 import { ZERO_ADDRESS } from '../constants';
@@ -82,7 +83,7 @@ export const makerCloseSubData = {
     const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!;
     // if closing to collateral, asset addr will be 2nd param out of 4
     // if closing to DAI, will return 2nd param out of 3, which will be DAI addr
-    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[1])!.toString().toLowerCase();
+    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[1])!.toString();
 
     return {
       vaultId, closeToAssetAddr,
@@ -91,14 +92,6 @@ export const makerCloseSubData = {
 };
 
 export const makerLeverageManagementSubData = {
-  // encode: (vaultId:number, repayFrom, boostFrom, boostTo, repayTo, boostEnabled) => [
-  //   vaultId,
-  //   new Dec(repayFrom).mul(1e16).toString(),
-  //   new Dec(boostFrom).mul(1e16).toString(),
-  //   new Dec(boostTo).mul(1e16).toString(),
-  //   new Dec(repayTo).mul(1e16).toString(),
-  //   boostEnabled,
-  // ],
   decode: (subData:SubData) => {
     const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
     const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
@@ -106,6 +99,7 @@ export const makerLeverageManagementSubData = {
     return { vaultId, targetRatio };
   },
 };
+
 export const liquityLeverageManagementSubData = {
   decode: (subData:SubData) => {
     const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
@@ -113,6 +107,7 @@ export const liquityLeverageManagementSubData = {
     return { targetRatio };
   },
 };
+
 export const liquityCloseSubData = {
   encode(
     closeToAssetAddr: EthereumAddress,
@@ -125,16 +120,16 @@ export const liquityCloseSubData = {
 
     const collAddrEncoded = AbiCoder.encodeParameter('address', _collAddr);
     const debtAddrEncoded = AbiCoder.encodeParameter('address', _debtAddr);
-    // if (compareAddresses(closeToAssetAddr, daiAddr)) { // TODO - Uhm, wth?
+    // if (compareAddresses(closeToAssetAddr, _debtAddr)) { // Closing to debt strategy was not implemented, but it should be in the future
     //   // close to LUSD strategy
-    //   return [daiAddrEncoded, mcdManagerAddrEncoded];
+    //   return [debtAddrEncoded, collAddrEncoded];
     // }
     // close to collateral strategy
     return [collAddrEncoded, debtAddrEncoded];
   },
   decode(subData: SubData): { closeToAssetAddr: EthereumAddress, debtAddr: string } {
-    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[0])!.toString().toLowerCase();
-    const debtAddr = AbiCoder.decodeParameter('address', subData[1])!.toString().toLowerCase();
+    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[0])!.toString();
+    const debtAddr = AbiCoder.decodeParameter('address', subData[1])!.toString();
 
     return { closeToAssetAddr, debtAddr };
   },
@@ -342,7 +337,7 @@ export const exchangeDcaSubData = {
 };
 
 export const exchangeLimitOrderSubData = {
-  encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: number) : SubData {
+  encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType) : SubData {
     return [
       fromToken,
       toToken,
@@ -437,3 +432,23 @@ export const liquityDsrSupplySubData = {
     return { targetRatio };
   },
 };
+
+export const liquityDebtInFrontRepaySubData = {
+  encode: (targetRatioIncrease: number) => {
+    const wethAddress = getAssetInfo('WETH').address;
+    const lusdAddress = getAssetInfo('LUSD').address;
+
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
+    const targetRatioIncreaseEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatioIncrease));
+    const withdrawIdEncoded = AbiCoder.encodeParameter('uint8', 1); // withdraw - 1
+    const paybackIdEncoded = AbiCoder.encodeParameter('uint8', 0); // payback - 0
+
+    return [wethAddressEncoded, lusdAddressEncoded, targetRatioIncreaseEncoded, withdrawIdEncoded, paybackIdEncoded];
+  },
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]) as any as string;
+    const targetRatioIncrease = weiToRatioPercentage(weiRatio);
+    return { targetRatioIncrease };
+  },
+};

package/src/services/triggerService.test.ts

@@ -1,19 +1,21 @@
 import { expect } from 'chai';
-import { getAssetInfo } from '@defisaver/tokens';
+import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 
 import { ChainId, OrderType, RatioState } from '../types/enums';
-import { EthereumAddress, TriggerData } from '../types';
+import type { EthereumAddress, TriggerData } from '../types';
 
 import {
   aaveV2RatioTrigger,
   aaveV3QuotePriceTrigger,
+  aaveV3QuotePriceWithMaximumGasPriceTrigger,
   aaveV3RatioTrigger,
   cBondsRebondTrigger,
   chainlinkPriceTrigger,
   compoundV2RatioTrigger,
   compoundV3RatioTrigger,
-  curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger,
+  curveUsdBorrowRateTrigger,
+  curveUsdSoftLiquidationTrigger,
   exchangeOffchainPriceTrigger,
   exchangeTimestampTrigger,
   liquityDebtInFrontTrigger,
@@ -22,6 +24,7 @@ import {
   sparkQuotePriceTrigger,
   sparkRatioTrigger,
   trailingStopTrigger,
+  liquityDebtInFrontWithLimitTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -59,7 +62,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(chainlinkPriceTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -99,7 +102,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(trailingStopTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -139,7 +142,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(makerRatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -179,7 +182,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(aaveV3RatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -219,7 +222,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(morphoAaveV2RatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -269,13 +272,77 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(aaveV3QuotePriceTrigger.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
+  describe('When testing triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[TriggerData, [baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState, maximumGasPriceInGwei?: number]]> = [
+        [
+          [
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000009c400000000000000000000000000000000000000000000000000000000000000001',
+            '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+          ],
+          [getAssetInfo('DAI', ChainId.Ethereum).address, getAssetInfo('WETH', ChainId.Ethereum).address, 0.0004, RatioState.UNDER]
+        ],
+        [
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000000000000000000000000000000000002cb417800',
+          ],
+          [getAssetInfo('WBTC', ChainId.Ethereum).address, getAssetInfo('USDT', ChainId.Ethereum).address, 0.00000023, RatioState.OVER, 12]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState, maximumGasPrice: string }, TriggerData]> = [
+        [
+          {
+            baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            price: '0.0004',
+            ratioState: RatioState.UNDER,
+            maximumGasPrice: web3Utils.fromWei(MAXUINT, 'gwei')
+          },
+          [
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000009c400000000000000000000000000000000000000000000000000000000000000001',
+            '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+          ],
+        ],
+        [
+          {
+            baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('USDT', ChainId.Ethereum).address),
+            price: '0.00000023',
+            ratioState: RatioState.OVER,
+            maximumGasPrice: '12',
+          },
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000000000000000000000000000000000002cb417800',
+          ],
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3QuotePriceWithMaximumGasPriceTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing triggerService.liquityRatioTrigger', () => {
     describe('encode()', () => {
       const examples: Array<[[string], [owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState]]> = [
@@ -317,7 +384,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(compoundV2RatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -363,7 +430,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(liquityDebtInFrontTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -400,7 +467,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(aaveV2RatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -440,7 +507,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(cBondsRebondTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -490,7 +557,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(compoundV3RatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -534,7 +601,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(exchangeTimestampTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -586,7 +653,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(exchangeOffchainPriceTrigger.decode(...actual)).to.eql(expected);
         });
       });
@@ -626,7 +693,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(sparkRatioTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -676,7 +743,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -726,7 +793,7 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(curveUsdBorrowRateTrigger.decode(actual)).to.eql(expected);
         });
       });
@@ -774,11 +841,57 @@ describe('Feature: triggerService.ts', () => {
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
           expect(curveUsdSoftLiquidationTrigger.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
+  describe('When testing triggerService.liquityDebtInFrontWithLimitTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [owner: EthereumAddress, debtInFrontMin: string]]> = [
+        [
+          ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a0000000000000000000000000000000000000000019d971e4fe8401e74000000'],
+          [web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'), '500000000']
+        ],
+        [
+          ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a00000000000000000000000000000000000000000001a784379d99db42000000'],
+          [web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'), '2000000']
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(liquityDebtInFrontWithLimitTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ owner: EthereumAddress, debtInFrontMin: string }, TriggerData]> = [
+        [
+          {
+            owner: web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'),
+            debtInFrontMin: '500000000',
+          },
+          ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a0000000000000000000000000000000000000000019d971e4fe8401e74000000'],
+        ],
+        [
+          {
+            owner: web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'),
+            debtInFrontMin: '2000000',
+          },
+          ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a00000000000000000000000000000000000000000001a784379d99db42000000'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(liquityDebtInFrontWithLimitTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
 });

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);
@@ -143,6 +184,20 @@ export const liquityDebtInFrontTrigger = {
   },
 };
 
+export const liquityDebtInFrontWithLimitTrigger = {
+  encode(owner: EthereumAddress, debtInFrontMin: string) {
+    const debtInFrontMinWei = web3Utils.toWei(new Dec(debtInFrontMin).toString(), 'ether');
+    return [AbiCoder.encodeParameters(['address', 'uint256'], [owner, debtInFrontMinWei])];
+  },
+  decode(triggerData: TriggerData): { owner: EthereumAddress, debtInFrontMin: string } {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256'], triggerData[0]);
+    return {
+      owner: decodedData[0] as EthereumAddress,
+      debtInFrontMin: new Dec(decodedData[1] as string).div(10 ** 18).toString(),
+    };
+  },
+};
+
 export const aaveV2RatioTrigger = {
   encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
     const ratioWei = ratioPercentageToWei(ratioPercentage);

package/src/services/utils.test.ts

@@ -3,7 +3,7 @@ import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo } from '@defisaver/tokens';
 
-import { EthereumAddress } from '../types';
+import type { EthereumAddress } from '../types';
 import { ChainId, RatioState } from '../types/enums';
 
 import { sparkEncode } from './strategySubService';

package/src/types/enums.ts

@@ -62,6 +62,7 @@ export namespace Strategies {
     EXCHANGE_LIMIT_ORDER = 51,
     LIQUITY_DSR_PAYBACK = 69,
     LIQUITY_DSR_SUPPLY = 70,
+    LIQUITY_DEBT_IN_FRONT_REPAY = 75,
   }
 
   export enum OptimismIds {
@@ -83,7 +84,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',
@@ -92,10 +95,13 @@ export namespace Strategies {
     BondProtection = 'bond-protection',
     Dca = 'dca',
     LimitOrder = 'limit-order',
+    DebtInFrontRepay = 'debt-in-front-repay',
   }
   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 +123,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,14 +140,32 @@ 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,
     }
+
+    interface DebtInFrontRepay extends Base {
+      debtInFrontMin: string,
+      targetRepayRatioIncrease: number,
+    }
   }
 
-  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave;
+  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay;
 
   export interface Automated {
     chainId: ChainId,
@@ -189,11 +207,13 @@ type StrategyInfo<T extends number> = Record<T, Strategy<T>>;
 export type MainnetStrategiesInfo = StrategyInfo<Strategies.MainnetIds>;
 export type OptimismStrategiesInfo = StrategyInfo<Strategies.OptimismIds>;
 export type ArbitrumStrategiesInfo = StrategyInfo<Strategies.ArbitrumIds>;
+export type StrategyInfoUnion = MainnetStrategiesInfo | OptimismStrategiesInfo | ArbitrumStrategiesInfo;
 
 type BundleInfo<T extends number> = Record<T, BundleOrStrategy<T>>;
 export type MainnetBundleInfo = BundleInfo<Bundles.MainnetIds>;
 export type OptimismBundleInfo = BundleInfo<Bundles.OptimismIds>;
 export type ArbitrumBundleInfo = BundleInfo<Bundles.ArbitrumIds>;
+export type BundleInfoUnion = MainnetBundleInfo | OptimismBundleInfo | ArbitrumBundleInfo;
 
 export interface StrategiesInfo {
   [ChainId.Ethereum]: MainnetStrategiesInfo,
@@ -208,8 +228,12 @@ export interface BundlesInfo {
 }
 
 export type StrategyOrBundleIds =
-  Strategies.MainnetIds & Strategies.OptimismIds & Strategies.ArbitrumIds
-  & Bundles.MainnetIds & Bundles.OptimismIds & Bundles.ArbitrumIds;
+  typeof Strategies.MainnetIds[keyof typeof Strategies.MainnetIds]
+  | typeof Strategies.OptimismIds[keyof typeof Strategies.OptimismIds]
+  | typeof Strategies.ArbitrumIds[keyof typeof Strategies.ArbitrumIds]
+  | typeof Bundles.MainnetIds[keyof typeof Bundles.MainnetIds]
+  | typeof Bundles.OptimismIds[keyof typeof Bundles.OptimismIds]
+  | typeof Bundles.ArbitrumIds[keyof typeof Bundles.ArbitrumIds];
 
 export interface ParseData {
   chainId: ChainId,