@defisaver/automation-sdk 2.0.6 → 2.0.9

package/esm/services/triggerService.d.ts

@@ -83,6 +83,13 @@ export declare const liquityDebtInFrontTrigger: {
         debtInFrontMin: string;
     };
 };
+export declare const liquityDebtInFrontWithLimitTrigger: {
+    encode(owner: EthereumAddress, debtInFrontMin: string): string[];
+    decode(triggerData: string[]): {
+        owner: EthereumAddress;
+        debtInFrontMin: string;
+    };
+};
 export declare const aaveV2RatioTrigger: {
     encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
     decode(triggerData: string[]): {

package/esm/services/triggerService.js

@@ -26,7 +26,7 @@ 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.aaveV3QuotePriceWithMaximumGasPriceTrigger = 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.liquityDebtInFrontWithLimitTrigger = 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"));
@@ -177,6 +177,19 @@ exports.liquityDebtInFrontTrigger = {
         };
     },
 };
+exports.liquityDebtInFrontWithLimitTrigger = {
+    encode(owner, debtInFrontMin) {
+        const debtInFrontMinWei = web3Utils.toWei(new decimal_js_1.default(debtInFrontMin).toString(), 'ether');
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'uint256'], [owner, debtInFrontMinWei])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256'], triggerData[0]);
+        return {
+            owner: decodedData[0],
+            debtInFrontMin: new decimal_js_1.default(decodedData[1]).div(Math.pow(10, 18)).toString(),
+        };
+    },
+};
 exports.aaveV2RatioTrigger = {
     encode(owner, market, ratioPercentage, ratioState) {
         const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);

package/esm/services/triggerService.test.js

@@ -59,7 +59,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.chainlinkPriceTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -95,7 +95,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.trailingStopTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -131,7 +131,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.makerRatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -167,7 +167,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.aaveV3RatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -203,7 +203,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.morphoAaveV2RatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -249,12 +249,72 @@ 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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.aaveV3QuotePriceTrigger.decode(actual)).to.eql(expected);
                 });
             });
         });
     });
+    describe('When testing triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000009c400000000000000000000000000000000000000000000000000000000000000001',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                    ],
+                    [(0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address, (0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address, 0.0004, enums_1.RatioState.UNDER]
+                ],
+                [
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000000000000000000000000000000000002cb417800',
+                    ],
+                    [(0, tokens_1.getAssetInfo)('WBTC', enums_1.ChainId.Ethereum).address, (0, tokens_1.getAssetInfo)('USDT', enums_1.ChainId.Ethereum).address, 0.00000023, enums_1.RatioState.OVER, 12]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        baseTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
+                        quoteTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
+                        price: '0.0004',
+                        ratioState: enums_1.RatioState.UNDER,
+                        maximumGasPrice: web3Utils.fromWei(tokens_1.MAXUINT, 'gwei')
+                    },
+                    [
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000009c400000000000000000000000000000000000000000000000000000000000000001',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                    ],
+                ],
+                [
+                    {
+                        baseTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WBTC', enums_1.ChainId.Ethereum).address),
+                        quoteTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDT', enums_1.ChainId.Ethereum).address),
+                        price: '0.00000023',
+                        ratioState: enums_1.RatioState.OVER,
+                        maximumGasPrice: '12',
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000000000000000000000000000000000002cb417800',
+                    ],
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.aaveV3QuotePriceWithMaximumGasPriceTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing triggerService.liquityRatioTrigger', () => {
         describe('encode()', () => {
             const examples = [
@@ -293,7 +353,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.compoundV2RatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -335,7 +395,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.liquityDebtInFrontTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -368,7 +428,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.aaveV2RatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -404,7 +464,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.cBondsRebondTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -450,7 +510,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.compoundV3RatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -490,7 +550,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.exchangeTimestampTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -538,7 +598,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.exchangeOffchainPriceTrigger.decode(...actual)).to.eql(expected);
                 });
             });
@@ -574,7 +634,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.sparkRatioTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -620,7 +680,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -666,7 +726,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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.curveUsdBorrowRateTrigger.decode(actual)).to.eql(expected);
                 });
             });
@@ -710,10 +770,52 @@ 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)}`, () => {
                     (0, chai_1.expect)(triggerService_1.curveUsdSoftLiquidationTrigger.decode(actual)).to.eql(expected);
                 });
             });
         });
     });
+    describe('When testing triggerService.liquityDebtInFrontWithLimitTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a0000000000000000000000000000000000000000019d971e4fe8401e74000000'],
+                    [web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'), '500000000']
+                ],
+                [
+                    ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a00000000000000000000000000000000000000000001a784379d99db42000000'],
+                    [web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'), '2000000']
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(triggerService_1.liquityDebtInFrontWithLimitTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        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)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.liquityDebtInFrontWithLimitTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/types/enums.d.ts

@@ -55,7 +55,8 @@ export declare namespace Strategies {
         EXCHANGE_DCA = 46,
         EXCHANGE_LIMIT_ORDER = 51,
         LIQUITY_DSR_PAYBACK = 69,
-        LIQUITY_DSR_SUPPLY = 70
+        LIQUITY_DSR_SUPPLY = 70,
+        LIQUITY_DEBT_IN_FRONT_REPAY = 75
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
@@ -84,7 +85,8 @@ export declare namespace Strategies {
         Rebond = "rebond",
         BondProtection = "bond-protection",
         Dca = "dca",
-        LimitOrder = "limit-order"
+        LimitOrder = "limit-order",
+        DebtInFrontRepay = "debt-in-front-repay"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",

package/esm/types/enums.js

@@ -68,6 +68,7 @@ var Strategies;
         MainnetIds[MainnetIds["EXCHANGE_LIMIT_ORDER"] = 51] = "EXCHANGE_LIMIT_ORDER";
         MainnetIds[MainnetIds["LIQUITY_DSR_PAYBACK"] = 69] = "LIQUITY_DSR_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
+        MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -100,6 +101,7 @@ var Strategies;
         Identifiers["BondProtection"] = "bond-protection";
         Identifiers["Dca"] = "dca";
         Identifiers["LimitOrder"] = "limit-order";
+        Identifiers["DebtInFrontRepay"] = "debt-in-front-repay";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {

package/esm/types/index.d.ts

@@ -45,11 +45,14 @@ export declare namespace Multicall {
     }
     type Payload = any[];
 }
-export interface SubscriptionOptions {
+interface _SubscriptionOptions {
     toBlock: BlockNumber;
     fromBlock: BlockNumber;
-    mergeWithSameId?: boolean;
+    mergeWithSameId: boolean;
+    enabledOnly: boolean;
+    unexpiredOnly: boolean;
 }
+export type SubscriptionOptions = Partial<_SubscriptionOptions>;
 export declare namespace Interfaces {
     interface ProtocolBase {
         id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation;
@@ -132,8 +135,12 @@ export declare namespace Position {
             triggerPercentage: number;
             closeToAssetAddr: EthereumAddress;
         }
+        interface DebtInFrontRepay extends Base {
+            debtInFrontMin: string;
+            targetRepayRatioIncrease: number;
+        }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay;
     interface Automated {
         chainId: ChainId;
         owner: EthereumAddress;
@@ -172,10 +179,12 @@ 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;
     [ChainId.Optimism]: OptimismStrategiesInfo;
@@ -186,7 +195,7 @@ export interface BundlesInfo {
     [ChainId.Optimism]: OptimismBundleInfo;
     [ChainId.Arbitrum]: ArbitrumBundleInfo;
 }
-export type StrategyOrBundleIds = Strategies.MainnetIds & Strategies.OptimismIds & Strategies.ArbitrumIds & Bundles.MainnetIds & Bundles.OptimismIds & Bundles.ArbitrumIds;
+export type StrategyOrBundleIds = 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;
     blockNumber: BlockNumber;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -15,15 +15,15 @@
     "lint": "node_modules/.bin/eslint ./src",
     "gtc": "node scripts/generateContractTypes.js",
     "prepare": "husky install && npm run gtc",
-    "test": "mocha \"./src/**/*.test.ts\" --require ts-node/register --extension ts"
+    "test": "./.tests.sh"
   },
   "author": "DeFi Saver",
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
     "@defisaver/eslint-config": "^1.0.0",
-    "@defisaver/sdk": "^1.0.43",
-    "@defisaver/tokens": "^1.4.55",
+    "@defisaver/sdk": "^1.0.53",
+    "@defisaver/tokens": "^1.5.1",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",
@@ -45,7 +45,7 @@
     "@typescript-eslint/parser": "^5.42.0",
     "babel-loader": "^8.2.2",
     "chai": "^4.3.8",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.3.1",
     "eslint": "8.22.0",
     "eslint-config-airbnb": "^18.0.2",
     "eslint-config-airbnb-typescript": "^17.0.0",

package/src/automation/private/LegacyAutomation.ts

@@ -1,3 +1,5 @@
+import Dec from 'decimal.js';
+
 import type Web3 from 'web3';
 import type {
   EthereumAddress, Position, Interfaces, Contract, PlaceholderType, SubscriptionOptions,
@@ -99,14 +101,22 @@ export default class LegacyAutomation extends Automation {
   }
 
   protected async getParsedSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
+    // Legacy automation was disabled on block 18213086
+    if (
+      !options?.fromBlock
+      || options?.fromBlock === 'latest'
+      || options?.fromBlock === 'pending'
+      || (options?.fromBlock && new Dec(options?.fromBlock.toString()).lt(18213086))
+    ) {
+      return [];
+    }
+
     const subscriptions = await this._getSubscriptions(addresses, options);
 
-    // @ts-ignore
-    return subscriptions.map((sub) => ({
+    return subscriptions.map((sub: any) => ({
       chainId: this.chainId,
       owner: sub[this.getOwnerPropName()],
-      isEnabled: (options?.fromBlock && options?.fromBlock !== 'latest')
-        ? options?.fromBlock > 18213086 : false, // Legacy automation was disabled on block 18213086
+      isEnabled: true,
       protocol: this.protocol,
       specific: { ...sub },
       strategy: {

package/src/automation/private/LegacyProtocol.test.ts

@@ -0,0 +1,24 @@
+import { expect } from 'chai';
+
+import { ProtocolIdentifiers } from '../../types/enums';
+
+import LegacyProtocol from './LegacyProtocol';
+
+describe('Feature: LegacyProtocol.ts', () => {
+  describe('When testing class LegacyProtocol', () => {
+    const exampleProtocol = new LegacyProtocol({ id: ProtocolIdentifiers.LegacyAutomation.MakerDAO });
+    const examples: Array<[string, string]> = [
+      [exampleProtocol.id, 'MakerDAO'],
+      [exampleProtocol.name, 'MakerDAO'],
+      [exampleProtocol.slug, 'makerdao'],
+      [exampleProtocol.version, ''],
+      [exampleProtocol.fullName, 'MakerDAO'],
+    ];
+
+    examples.forEach(([expected, actual]) => {
+      it(`Given ${actual} should return expected value: ${expected}`, () => {
+        expect(actual).to.equal(expected);
+      });
+    });
+  });
+});

package/src/automation/private/Protocol.test.ts

@@ -0,0 +1,24 @@
+import { expect } from 'chai';
+
+import { ProtocolIdentifiers } from '../../types/enums';
+
+import Protocol from './Protocol';
+
+describe('Feature: Protocol.ts', () => {
+  describe('When testing class Protocol', () => {
+    const exampleProtocol = new Protocol({ id: ProtocolIdentifiers.StrategiesAutomation.AaveV3 });
+    const examples: Array<[string, string]> = [
+      [exampleProtocol.id, 'Aave__V3'],
+      [exampleProtocol.name, 'Aave'],
+      [exampleProtocol.slug, 'aave'],
+      [exampleProtocol.version, 'V3'],
+      [exampleProtocol.fullName, 'Aave V3'],
+    ];
+
+    examples.forEach(([expected, actual]) => {
+      it(`Given ${actual} should return expected value: ${expected}`, () => {
+        expect(actual).to.equal(expected);
+      });
+    });
+  });
+});

package/src/automation/private/StrategiesAutomation.ts

@@ -8,6 +8,7 @@ import type {
   StrategyModel, SubStorage,
 } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
+import { Strategies, ProtocolIdentifiers } from '../../types/enums';
 
 import { addToObjectIf, isDefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
@@ -84,20 +85,53 @@ export default class StrategiesAutomation extends Automation {
     return parseStrategiesAutomatedPosition(parseData);
   }
 
+  /**
+   * @description Removes expired Limit Order subscriptions
+   */
+  protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]) {
+    return subscriptions.filter((subscription: Position.Automated | null) => {
+      if (!subscription) {
+        return true;
+      }
+
+      const { protocol, strategy, strategyData } = subscription;
+
+      if (
+        protocol.id === ProtocolIdentifiers.StrategiesAutomation.Exchange
+        && strategy.strategyId === Strategies.Identifiers.LimitOrder
+      ) {
+        return new Dec(strategyData.decoded.triggerData.goodUntil).gt(new Dec(Date.now()).div(1000));
+      }
+
+      return true;
+    });
+  }
+
   protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
     const _options = {
       ...addToObjectIf(isDefined(options), options),
       ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
-    };
+    } as SubscriptionOptions & PastEventOptions;
 
-
-    const subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
+    let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
 
     let subscriptions: (Position.Automated | null)[] = [];
 
     if (subscriptionEvents) {
-      // @ts-ignore
-      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+      let strategiesSubs = await this.getStrategiesSubs(
+        subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
+      );
+
+      if (_options.enabledOnly) {
+        const filteredSubscriptionEvents = [] as PlaceholderType;
+
+        strategiesSubs = strategiesSubs.filter((sub, index) => {
+          if (sub?.isEnabled) filteredSubscriptionEvents.push(subscriptionEvents[index]);
+          return sub?.isEnabled;
+        });
+
+        subscriptionEvents = filteredSubscriptionEvents;
+      }
 
       subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
         let latestUpdate = subscriptionEvents[index].returnValues;
@@ -168,7 +202,7 @@ export default class StrategiesAutomation extends Automation {
       }
     }
 
-    return subscriptions;
+    return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
   }
 
   public async getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {

package/src/constants/index.ts

@@ -90,6 +90,11 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.SavingsDsrSupply,
     protocol: PROTOCOLS.Liquity,
   },
+  [Strategies.MainnetIds.LIQUITY_DEBT_IN_FRONT_REPAY]: {
+    strategyOrBundleId: Strategies.MainnetIds.LIQUITY_DEBT_IN_FRONT_REPAY,
+    strategyId: Strategies.Identifiers.DebtInFrontRepay,
+    protocol: PROTOCOLS.Liquity,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO = {

package/src/services/contractService.ts

@@ -1,13 +1,17 @@
 import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
+
 import type {
-  BlockNumber, Contract,
+  BlockNumber, Contract, EthereumAddress,
 } from '../types';
-
 import type { BaseContract } from '../types/contracts/generated/types';
-import type { Legacy_AuthCheck, SubStorage, UniMulticall } from '../types/contracts/generated';
+import type {
+  Legacy_AuthCheck, SubStorage, UniMulticall, Erc20,
+} from '../types/contracts/generated';
 
-import { UniMulticallJson, SubStorageJson, AuthCheckJson } from '../abis';
+import {
+  UniMulticallJson, SubStorageJson, AuthCheckJson, Erc20Json,
+} from '../abis';
 
 import { isDefined } from './utils';
 import { ChainId } from '../types/enums';
@@ -62,4 +66,13 @@ export function makeAuthCheckerContract(web3: Web3, chainId: ChainId) {
 
 export function makeLegacySubscriptionContract<T extends BaseContract>(web3: Web3, contractJson: Contract.Json) {
   return makeContract<T>(web3, contractJson, ChainId.Ethereum);
+}
+
+export function makeErc20Contract(web3: Web3, tokenAddress: EthereumAddress, chainId: ChainId) {
+  return makeContract<Erc20>(web3, {
+    ...Erc20Json,
+    networks: {
+      [chainId]: { address: tokenAddress },
+    },
+  }, chainId);
 }