@defisaver/automation-sdk 3.3.18-audit-dev → 3.3.18-spark-eoa-v2-dev

package/esm/types/enums.js

@@ -104,6 +104,7 @@ export var Strategies;
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH"] = 154] = "AAVE_V4_COLLATERAL_SWITCH";
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
         MainnetIds[MainnetIds["SPARK_COLLATERAL_SWITCH"] = 156] = "SPARK_COLLATERAL_SWITCH";
+        MainnetIds[MainnetIds["SPARK_GENERIC_FL_COLLATERAL_SWITCH"] = 167] = "SPARK_GENERIC_FL_COLLATERAL_SWITCH";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -264,6 +265,12 @@ export var Bundles;
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 85] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 86] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_CLOSE"] = 87] = "MORPHO_BLUE_EOA_CLOSE";
+        MainnetIds[MainnetIds["SPARK_EOA_REPAY"] = 88] = "SPARK_EOA_REPAY";
+        MainnetIds[MainnetIds["SPARK_EOA_BOOST"] = 89] = "SPARK_EOA_BOOST";
+        MainnetIds[MainnetIds["SPARK_EOA_REPAY_ON_PRICE"] = 90] = "SPARK_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["SPARK_EOA_BOOST_ON_PRICE"] = 91] = "SPARK_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["SPARK_EOA_CLOSE"] = 92] = "SPARK_EOA_CLOSE";
+        MainnetIds[MainnetIds["SPARK_EOA_LIQUIDATION_PROTECTION"] = 93] = "SPARK_EOA_LIQUIDATION_PROTECTION";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.18-audit-dev",
+  "version": "3.3.18-spark-eoa-v2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,15 +22,6 @@
   "author": "DeFi Saver",
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
-  "overrides": {
-    "axios": "^1.19.0",
-    "tar": "^7.5.21",
-    "ws": "^8.18.3",
-    "form-data": "^4.0.4",
-    "tough-cookie": "^4.1.3",
-    "qs": "^6.14.0",
-    "serialize-javascript": "^7.1.0"
-  },
   "dependencies": {
     "@defisaver/sdk": "^1.3.22",
     "@defisaver/tokens": "^1.6.19",
@@ -53,6 +44,7 @@
     "dotenv": "^16.3.1",
     "eslint": "^8.49.0",
     "husky": "^8.0.0",
+    "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^10.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",

package/src/constants/index.ts

@@ -140,6 +140,11 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.CollateralSwitch,
     protocol: PROTOCOLS.Spark,
   },
+  [Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH]: {
+    strategyOrBundleId: Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+    strategyId: Strategies.Identifiers.EoaCollateralSwitch,
+    protocol: PROTOCOLS.Spark,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
@@ -573,6 +578,31 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV4,
   },
+  [Bundles.MainnetIds.SPARK_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.Spark,
+  },
   [Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
     strategyOrBundleId: Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
@@ -649,6 +679,11 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
+  [Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.Spark,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/ethereumService.test.ts

@@ -1,10 +1,11 @@
 import Web3 from 'web3';
 import { expect } from 'chai';
+import { omit } from 'lodash';
 import { getAssetInfo } from '@defisaver/tokens';
 import { PastEventOptions } from 'web3-eth-contract';
 
 import { ChainId } from '../types/enums';
-import type { BlockNumber, Multicall } from '../types';
+import type { BlockNumber, Multicall, PlaceholderType } from '../types';
 import { Contract } from '../types';
 import type { Erc20 } from '../types/contracts/generated';
 
@@ -115,7 +116,6 @@ describe('Feature: ethereumService.ts', () => {
             'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
             'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
             'blockNumber': 15166163,
-            'blockTimestamp': '0x62d53ad8',
             'event': 'Transfer',
             'id': 'log_e2258e3a',
             'logIndex': 385,
@@ -142,7 +142,7 @@ describe('Feature: ethereumService.ts', () => {
           },
         ],
         [
-          makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum),
+          { ...makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum), createdBlock: 15166163 },
           null,
           'Transfer',
           {
@@ -161,7 +161,6 @@ describe('Feature: ethereumService.ts', () => {
             'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
             'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
             'blockNumber': 5353002,
-            'blockTimestamp': '0x624c1a5b',
             'event': 'Transfer',
             'id': 'log_f49645b8',
             'logIndex': 1,
@@ -207,7 +206,6 @@ describe('Feature: ethereumService.ts', () => {
             'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
             'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
             'blockNumber': 5353002,
-            'blockTimestamp': '0x624c1a5b',
             'event': 'Transfer',
             'id': 'log_f49645b8',
             'logIndex': 1,
@@ -251,9 +249,8 @@ describe('Feature: ethereumService.ts', () => {
 
     examples.forEach(([expected, actual]) => {
       it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
-        const data = await getEventsFromContract(...actual);
-        console.log(data);
-        expect(await getEventsFromContract(...actual)).to.eql(expected);
+        const events = await getEventsFromContract(...actual);
+        expect(events.map((event: PlaceholderType) => omit(event, 'blockTimestamp'))).to.eql(expected);
       });
     });
   });

package/src/services/strategiesService.ts

@@ -8,7 +8,7 @@ import type {
   BundleInfoUnion, StrategyInfoUnion,
 } from '../types';
 import {
-  ChainId, ProtocolIdentifiers, RatioState, Strategies,
+  ChainId, ProtocolIdentifiers, Strategies,
 } from '../types/enums';
 
 import {
@@ -448,11 +448,17 @@ function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: Pa
 function parseSparkCollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
   const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
+  const subData = isEOA
+    ? subDataService.sparkGenericFLCollateralSwitchSubData.decode(subStruct.subData)
+    : subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+  _position.strategy.strategyId = isEOA
+    ? Strategies.Identifiers.EoaCollateralSwitch
+    : Strategies.Identifiers.CollateralSwitch;
   return _position;
 }
 
@@ -987,16 +993,19 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
 
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
+  const subData = isEOA
+    ? subDataService.sparkGenericLeverageManagementSubData.decode(subStruct.subData)
+    : subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
 
-  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
   if (isRepay) {
     _position.specific = {
@@ -1004,7 +1013,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
       targetRepayRatio: subData.targetRatio,
       repayEnabled: isEnabled,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
       subHashRepay: subHash,
     };
   } else {
@@ -1013,12 +1022,14 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
       subHashBoost: subHash,
     };
   }
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  _position.strategy.strategyId = isEOA
+    ? Strategies.IdOverrides.EoaLeverageManagement
+    : Strategies.IdOverrides.LeverageManagement;
 
   return _position;
 }
@@ -1028,9 +1039,12 @@ function parseSparkLiquidationProtection(position: Position.Automated, parseData
 
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkLiquidationProtectionSubData.decode(subStruct.subData);
+  const subData = isEOA
+    ? subDataService.sparkGenericLiquidationProtectionSubData.decode(subStruct.subData)
+    : subDataService.sparkLiquidationProtectionSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -1045,7 +1059,9 @@ function parseSparkLiquidationProtection(position: Position.Automated, parseData
     subHashRepay: subHash,
   };
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+  _position.strategy.strategyId = isEOA
+    ? Strategies.IdOverrides.EoaLiquidationProtection
+    : Strategies.IdOverrides.LiquidationProtection;
 
   return _position;
 }
@@ -1054,9 +1070,12 @@ function parseSparkLiquidationProtection(position: Position.Automated, parseData
 function parseSparkLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
 
   const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
+  const subData = isEOA
+    ? subDataService.sparkLeverageManagementOnPriceGenericSubData.decode(subStruct.subData)
+    : subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -1077,6 +1096,10 @@ function parseSparkLeverageManagementOnPrice(position: Position.Automated, parse
     ratioState: triggerData.ratioState,
   };
 
+  _position.strategy.strategyId = isEOA
+    ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+    : Strategies.IdOverrides.LeverageManagementOnPrice;
+
   return _position;
 }
 
@@ -1087,10 +1110,13 @@ function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseDa
   const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
   const subData = subDataService.sparkCloseGenericSubData.decode(subStruct.subData);
 
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
 
   const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
 
@@ -1625,8 +1651,15 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.EoaRepay]: parseSparkLeverageManagement,
+    [Strategies.Identifiers.EoaBoost]: parseSparkLeverageManagement,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseSparkLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseSparkLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseSparkCloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
+    [Strategies.Identifiers.EoaCollateralSwitch]: parseSparkCollateralSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseSparkLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,