@defisaver/automation-sdk 3.3.17 → 3.3.18-spark-eoa-dev

package/cjs/constants/index.js

@@ -122,6 +122,11 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.Spark,
     },
+    [enums_1.Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -549,6 +554,86 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV4,
     },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.MakerDAO,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
     [enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
@@ -569,6 +654,11 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -626,6 +716,16 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -768,6 +868,41 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
     [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY]: {
         strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY,
         strategyId: enums_1.Strategies.Identifiers.EoaRepay,
@@ -945,6 +1080,41 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
     [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
         strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
         strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,

package/cjs/index.d.ts

@@ -15,10 +15,10 @@ import * as enums from './types/enums';
 import type * as types from './types';
 import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType } from './services/utils';
 declare const utils: {
-    getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
     compareSubHashes: typeof compareSubHashes;
     encodeSubId: typeof encodeSubId;
     getCloseStrategyType: typeof getCloseStrategyType;
+    getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
 };
-export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
+export { ArbitrumStrategies, BaseStrategies, EthereumStrategies, LegacyAaveAutomation, LegacyCompoundAutomation, LegacyMakerAutomation, OptimismStrategies, constants, enums, strategiesService, strategySubService, subDataService, triggerService, utils, };
 export type { types };

package/cjs/index.js

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strategiesService = exports.constants = exports.enums = exports.utils = exports.strategySubService = exports.subDataService = exports.triggerService = exports.BaseStrategies = exports.ArbitrumStrategies = exports.OptimismStrategies = exports.EthereumStrategies = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.LegacyMakerAutomation = void 0;
+exports.utils = exports.triggerService = exports.subDataService = exports.strategySubService = exports.strategiesService = exports.enums = exports.constants = exports.OptimismStrategies = exports.LegacyMakerAutomation = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.EthereumStrategies = exports.BaseStrategies = exports.ArbitrumStrategies = void 0;
 require("./configuration");
 const LegacyMakerAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyMakerAutomation"));
 exports.LegacyMakerAutomation = LegacyMakerAutomation_1.default;
@@ -60,6 +60,9 @@ const enums = __importStar(require("./types/enums"));
 exports.enums = enums;
 const utils_1 = require("./services/utils");
 const utils = {
-    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId, getCloseStrategyType: utils_1.getCloseStrategyType,
+    compareSubHashes: utils_1.compareSubHashes,
+    encodeSubId: utils_1.encodeSubId,
+    getCloseStrategyType: utils_1.getCloseStrategyType,
+    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy,
 };
 exports.utils = utils;

package/cjs/services/ethereumService.test.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_1 = __importDefault(require("web3"));
 const chai_1 = require("chai");
+const lodash_1 = require("lodash");
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
 require("../configuration");
@@ -101,7 +102,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
                         'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
                         'blockNumber': 15166163,
-                        'blockTimestamp': '0x62d53ad8',
                         'event': 'Transfer',
                         'id': 'log_e2258e3a',
                         'logIndex': 385,
@@ -128,7 +128,7 @@ describe('Feature: ethereumService.ts', () => {
                     },
                 ],
                 [
-                    (0, contractService_1.makeErc20Contract)(Web3_1, (0, tokens_1.getAssetInfo)('LUSD').address, enums_1.ChainId.Ethereum),
+                    Object.assign(Object.assign({}, (0, contractService_1.makeErc20Contract)(Web3_1, (0, tokens_1.getAssetInfo)('LUSD').address, enums_1.ChainId.Ethereum)), { createdBlock: 15166163 }),
                     null,
                     'Transfer',
                     {
@@ -147,7 +147,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -193,7 +192,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -236,9 +234,8 @@ describe('Feature: ethereumService.ts', () => {
         ];
         examples.forEach(([expected, actual]) => {
             it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => __awaiter(void 0, void 0, void 0, function* () {
-                const data = yield (0, ethereumService_1.getEventsFromContract)(...actual);
-                console.log(data);
-                (0, chai_1.expect)(yield (0, ethereumService_1.getEventsFromContract)(...actual)).to.eql(expected);
+                const events = yield (0, ethereumService_1.getEventsFromContract)(...actual);
+                (0, chai_1.expect)(events.map((event) => (0, lodash_1.omit)(event, 'blockTimestamp'))).to.eql(expected);
             }));
         });
     });