@defisaver/automation-sdk 3.3.6 → 3.3.7-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.6",
+  "version": "3.3.7-dev.0",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -331,16 +331,6 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.Spark,
   },
-  [Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
-    strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-    strategyId: Strategies.Identifiers.CloseToDebt,
-    protocol: PROTOCOLS.Spark,
-  },
-  [Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
-    strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-    strategyId: Strategies.Identifiers.CloseToCollateral,
-    protocol: PROTOCOLS.Spark,
-  },
   [Bundles.MainnetIds.AAVE_V2_REPAY]: {
     strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_REPAY,
     strategyId: Strategies.Identifiers.Repay,
@@ -496,7 +486,11 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
-
+  [Bundles.MainnetIds.SPARK_CLOSE]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE,
+    strategyId: Strategies.Identifiers.CloseOnPrice,
+    protocol: PROTOCOLS.Spark,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -689,7 +683,6 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
-
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {

package/src/services/strategiesService.ts

@@ -17,10 +17,6 @@ import * as triggerService from './triggerService';
 
 const web3 = new Web3();
 
-const SPARK_MARKET_ADDRESSES = {
-  [ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
-};
-
 const AAVE_V3_MARKET_ADDRESSES = {
   [ChainId.Ethereum]: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
   [ChainId.Optimism]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
@@ -791,34 +787,29 @@ function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseDa
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+  const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkCloseGenericSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, SPARK_MARKET_ADDRESSES[_position.chainId as ChainId.Ethereum]);
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
 
   _position.specific = {
     collAsset: subData.collAsset,
     collAssetId: subData.collAssetId,
     debtAsset: subData.debtAsset,
     debtAssetId: subData.debtAssetId,
-    baseToken: triggerData.baseTokenAddress,
-    quoteToken: triggerData.quoteTokenAddress,
-    price: triggerData.price,
-    ratioState: triggerData.ratioState,
+    baseToken: triggerData.collToken,
+    quoteToken: triggerData.debtToken,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    stopLossType,
+    takeProfitType,
   };
 
-  const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
-    _position.specific.ratioState,
-    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
-    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
-    parseData.chainId,
-  );
-
-  _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
-
   return _position;
 }
 
@@ -1204,8 +1195,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
     [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
     [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
-    [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
-    [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,

package/src/services/strategySubService.test.ts

@@ -18,8 +18,9 @@ import {
   compoundV3Encode,
   morphoAaveV2Encode,
   exchangeEncode,
-  sparkEncode,
-  crvUSDEncode, compoundV3L2Encode, morphoBlueEncode,
+  crvUSDEncode,
+  compoundV3L2Encode,
+  morphoBlueEncode,
 } from './strategySubService';
 
 describe('Feature: strategySubService.ts', () => {
@@ -1387,97 +1388,6 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
-  describe('When testing strategySubService.sparkEncode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[
-        string,
-        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
-      ]> = [
-        [
-          '0x000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-          [160, 220, 180, 190, true]
-        ],
-        [
-          '0x000000000000000016345785d8a0000000000000000000001bc16d674ec80000000000000000000018fae27693b4000000000000000000001a5e27eef13e000000',
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('closeToAsset()', () => {
-      const examples: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [
-          strategyOrBundleId: number,
-          isBundle: boolean,
-          triggerData: {
-            baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState
-          },
-          subData: {
-            collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number,
-          },
-        ]
-      ]> = [
-        [
-          [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-            true,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000000'],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000015',
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000020',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
-          ],
-          [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-            true,
-            {
-              baseTokenAddress: getAssetInfo('WETH').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 1670, ratioState: RatioState.OVER
-            },
-            {
-              collAsset: getAssetInfo('WETH').address, collAssetId: 21, debtAsset: getAssetInfo('DAI').address, debtAssetId: 32,
-            },
-          ]
-        ],
-        [
-          [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-            true,
-            ['0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000000000084d000000000000000000000000000000000000000000000000000000000000000001'],
-            [
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000015',
-              '0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca', '0x0000000000000000000000000000000000000000000000000000000000000020',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
-          ],
-          [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-            true,
-            {
-              baseTokenAddress: getAssetInfo('LINK').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 0.00544, ratioState: RatioState.UNDER
-            },
-            {
-              collAsset: getAssetInfo('DAI').address, collAssetId: 21, debtAsset: getAssetInfo('LINK').address, debtAssetId: 32,
-            },
-          ]
-        ]
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(sparkEncode.closeToAsset(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing strategySubService.crvUSDEncode', () => {
     describe('leverageManagement()', () => {
       const examples: Array<[
@@ -1581,6 +1491,7 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
   });
+
   describe('When testing strategySubService.morphoBlueEncode', () => {
     describe('leverageManagement()', () => {
       const examples: Array<[
@@ -1709,5 +1620,4 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
   });
-
 });

package/src/services/strategySubService.ts

@@ -557,25 +557,24 @@ export const sparkEncode = {
 
     return subInput;
   },
-  closeToAsset(
+  closeOnPriceGeneric(
     strategyOrBundleId: number,
-    isBundle: boolean = true,
-    triggerData: {
-      baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState
-    },
-    subData: {
-      collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number,
-    },
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
   ) {
-    const {
-      collAsset, collAssetId, debtAsset, debtAssetId,
-    } = subData;
-    const subDataEncoded = subDataService.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+    const isBundle = true;
+    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
 
-    const {
-      baseTokenAddress, quoteTokenAddress, price, ratioState,
-    } = triggerData;
-    const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+    const subDataEncoded = subDataService.sparkCloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user);
+    const triggerDataEncoded = triggerService.sparkQuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },

package/src/services/subDataService.test.ts

@@ -4,12 +4,11 @@ import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { MAXUINT } from '@defisaver/tokens';
 
-import { ChainId, CloseStrategyType, CloseToAssetType, OrderType, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, OrderType, RatioState } from '../types/enums';
 import type { EthereumAddress, SubData } from '../types';
 
 import '../configuration';
 import * as subDataService from './subDataService';
-import { AAVE_V3_VARIABLE_BORROW_RATE } from '../constants';
 
 describe('Feature: subDataService.ts', () => {
 
@@ -941,82 +940,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.sparkQuotePriceSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress]]> = [
-        [
-          [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-          ],
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            2,
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            4,
-          ]
-        ],
-        [
-          [
-            '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-            '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-          ],
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-            6,
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            2,
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.sparkQuotePriceSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('decode()', () => {
-      const examples: Array<[{ collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number }, SubData]> = [
-        [
-          {
-            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            collAssetId: 2,
-            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            debtAssetId: 4,
-          },
-          [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-          ],
-        ],
-        [
-          {
-            collAsset: web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-            collAssetId: 6,
-            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            debtAssetId: 2,
-          },
-          [
-            '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-            '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-          ],
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.sparkQuotePriceSubData.decode(actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing subDataService.liquityDsrPaybackSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [targetRatio: number]]> = [

package/src/services/subDataService.ts

@@ -593,37 +593,6 @@ export const sparkLeverageManagementSubData = { // TODO encode?
   },
 };
 
-export const sparkQuotePriceSubData = {
-  encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    nullAddress: EthereumAddress = ZERO_ADDRESS,
-  ): SubData {
-    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
-    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
-
-    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
-    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
-
-    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
-
-    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
-  },
-  decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
-    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-
-    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-
-    return {
-      collAsset, collAssetId, debtAsset, debtAssetId,
-    };
-  },
-};
-
 export const liquityDsrPaybackSubData = {
   encode: (targetRatio: number) => {
     const daiAddress = getAssetInfo('DAI').address;
@@ -1191,3 +1160,55 @@ export const compoundV3CloseSubData = {
     };
   },
 };
+
+export const sparkCloseGenericSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedCloseType,
+      encodedMarket,
+      userEncoded,
+    ];
+  },
+
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    owner: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+    };
+  },
+};

package/src/services/triggerService.test.ts

@@ -23,7 +23,6 @@ import {
   liquityDebtInFrontTrigger,
   makerRatioTrigger,
   morphoAaveV2RatioTrigger,
-  sparkQuotePriceTrigger,
   sparkRatioTrigger,
   trailingStopTrigger,
   liquityDebtInFrontWithLimitTrigger,
@@ -879,56 +878,6 @@ describe('Feature: triggerService.ts', () => {
     });
   });
 
-  describe('When testing triggerService.sparkQuotePriceTrigger', () => {
-    describe('encode()', () => {
-      const examples: Array<[[string], [baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState]]> = [
-        [
-          ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-          [getAssetInfo('DAI', ChainId.Ethereum).address, getAssetInfo('wstETH', ChainId.Ethereum).address, 0.0004321, RatioState.UNDER]
-        ],
-        [
-          ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-          [getAssetInfo('WBTC', ChainId.Arbitrum).address, getAssetInfo('USDC', ChainId.Arbitrum).address, 0.00100023, RatioState.OVER]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(sparkQuotePriceTrigger.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('decode()', () => {
-      const examples: Array<[{ baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState }, TriggerData]> = [
-        [
-          {
-            baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Ethereum).address),
-            price: '0.0004321',
-            ratioState: RatioState.UNDER,
-          },
-          ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-        ],
-        [
-          {
-            baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Arbitrum).address),
-            quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            price: '0.00100023',
-            ratioState: RatioState.OVER,
-          },
-          ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-        ]
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing triggerService.curveUsdBorrowRateTrigger', () => {
     describe('encode()', () => {
       const examples: Array<[[string], [market: EthereumAddress, targetRate: string, rateState: RatioState]]> = [

package/src/services/triggerService.ts

@@ -328,32 +328,6 @@ export const sparkRatioTrigger = {
   },
 };
 
-export const sparkQuotePriceTrigger = {
-  encode(
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    ratioState: RatioState,
-  ) {
-    // Price is always in 8 decimals
-    const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
-    return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
-  },
-  decode(
-    triggerData: TriggerData,
-  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState } {
-    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
-    // Price is always in 8 decimals
-    const price = new Dec(decodedData[2] as string).div(10 ** 8).toDP(8).toString();
-    return {
-      price,
-      baseTokenAddress: decodedData[0] as EthereumAddress,
-      quoteTokenAddress: decodedData[1] as EthereumAddress,
-      ratioState: +decodedData[3]!,
-    };
-  },
-};
-
 export const curveUsdBorrowRateTrigger = {
   encode(
     market: EthereumAddress,
@@ -685,4 +659,33 @@ export const aaveV3QuotePriceRangeTrigger = {
       upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
     };
   },
+};
+
+export const sparkQuotePriceRangeTrigger = {
+  encode(
+    collToken: EthereumAddress,
+    debtToken: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    // Price is scaled to 1e8
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'uint256', 'uint256'],
+        [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      collToken: decodedData[0] as EthereumAddress,
+      debtToken: decodedData[1] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
+    };
+  },
 };