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

package/cjs/types/enums.js

@@ -194,8 +194,6 @@ var Bundles;
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
         MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
         MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = -21231230] = "SPARK_CLOSE_TO_DEBT";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = -21231231] = "SPARK_CLOSE_TO_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V2_REPAY"] = 22] = "AAVE_V2_REPAY";
         MainnetIds[MainnetIds["AAVE_V2_BOOST"] = 23] = "AAVE_V2_BOOST";
         MainnetIds[MainnetIds["COMP_V2_REPAY"] = 20] = "COMP_V2_REPAY";
@@ -231,6 +229,7 @@ var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
+        MainnetIds[MainnetIds["SPARK_CLOSE"] = 57] = "SPARK_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/constants/index.js

@@ -302,16 +302,6 @@ export const MAINNET_BUNDLES_INFO = {
         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,
@@ -467,6 +457,11 @@ export const MAINNET_BUNDLES_INFO = {
         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 = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -7,9 +7,6 @@ import { getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTak
 import * as subDataService from './subDataService';
 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',
@@ -590,23 +587,24 @@ function parseSparkLeverageManagement(position, parseData) {
 function parseSparkCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     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]);
+    _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;
 }
 function parseLiquitySavingsLiqProtection(position, parseData) {
@@ -917,8 +915,7 @@ const parsingMethodsMapping = {
     [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/esm/services/strategySubService.d.ts

@@ -85,17 +85,7 @@ export declare const exchangeEncode: {
 };
 export declare const sparkEncode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
-    closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
-        baseTokenAddress: EthereumAddress;
-        quoteTokenAddress: EthereumAddress;
-        price: number;
-        ratioState: RatioState;
-    }, subData: {
-        collAsset: EthereumAddress;
-        collAssetId: number;
-        debtAsset: EthereumAddress;
-        debtAssetId: number;
-    }): (number | boolean | string[])[];
+    closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];

package/esm/services/strategySubService.js

@@ -232,11 +232,11 @@ export const sparkEncode = {
         subInput = subInput.concat(boostEnabled ? '01' : '00');
         return subInput;
     },
-    closeToAsset(strategyOrBundleId, isBundle = true, triggerData, subData) {
-        const { collAsset, collAssetId, debtAsset, debtAssetId, } = subData;
-        const subDataEncoded = subDataService.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
-        const { baseTokenAddress, quoteTokenAddress, price, ratioState, } = triggerData;
-        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+    closeOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        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/esm/services/strategySubService.test.js

@@ -5,7 +5,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, sparkEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, } from './strategySubService';
+import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, } from './strategySubService';
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
         // @ts-ignore // TODO - this requires change in @defisaver/tokens
@@ -1163,78 +1163,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.sparkEncode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    '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 = [
-                [
-                    [
-                        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 = [

package/esm/services/subDataService.d.ts

@@ -166,15 +166,6 @@ export declare const sparkLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const sparkQuotePriceSubData: {
-    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
-    decode(subData: string[]): {
-        collAsset: EthereumAddress;
-        collAssetId: number;
-        debtAsset: EthereumAddress;
-        debtAssetId: number;
-    };
-};
 export declare const liquityDsrPaybackSubData: {
     encode: (targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -315,3 +306,15 @@ export declare const compoundV3CloseSubData: {
         owner: EthereumAddress;
     };
 };
+export declare const sparkCloseGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        closeType: CloseStrategyType;
+        marketAddr: EthereumAddress;
+        owner: EthereumAddress;
+    };
+};

package/esm/services/subDataService.js

@@ -411,25 +411,6 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const sparkQuotePriceSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
-        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) {
-        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-        return {
-            collAsset, collAssetId, debtAsset, debtAssetId,
-        };
-    },
-};
 export const liquityDsrPaybackSubData = {
     encode: (targetRatio) => {
         const daiAddress = getAssetInfo('DAI').address;
@@ -839,3 +820,35 @@ export const compoundV3CloseSubData = {
         };
     },
 };
+export const sparkCloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
+        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) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+        };
+    },
+};

package/esm/services/subDataService.test.js

@@ -873,78 +873,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.sparkQuotePriceSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        '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 = [
-                [
-                    {
-                        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 = [

package/esm/services/triggerService.d.ts

@@ -153,15 +153,6 @@ export declare const sparkRatioTrigger: {
         ratioState: number;
     };
 };
-export declare const sparkQuotePriceTrigger: {
-    encode(baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState): string[];
-    decode(triggerData: string[]): {
-        baseTokenAddress: EthereumAddress;
-        quoteTokenAddress: EthereumAddress;
-        price: string;
-        ratioState: RatioState;
-    };
-};
 export declare const curveUsdBorrowRateTrigger: {
     encode(market: EthereumAddress, targetRate: string, rateState: RatioState): string[];
     decode(triggerData: string[]): {
@@ -275,3 +266,12 @@ export declare const aaveV3QuotePriceRangeTrigger: {
         upperPrice: string;
     };
 };
+export declare const sparkQuotePriceRangeTrigger: {
+    encode(collToken: EthereumAddress, debtToken: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        collToken: string;
+        debtToken: string;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/esm/services/triggerService.js

@@ -261,24 +261,6 @@ export const sparkRatioTrigger = {
         };
     },
 };
-export const sparkQuotePriceTrigger = {
-    encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
-        // Price is always in 8 decimals
-        const _price = new Dec(price.toString()).mul(Math.pow(10, 8)).floor().toString();
-        return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
-    },
-    decode(triggerData) {
-        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
-        // Price is always in 8 decimals
-        const price = new Dec(decodedData[2]).div(Math.pow(10, 8)).toDP(8).toString();
-        return {
-            price,
-            baseTokenAddress: decodedData[0],
-            quoteTokenAddress: decodedData[1],
-            ratioState: +decodedData[3],
-        };
-    },
-};
 export const curveUsdBorrowRateTrigger = {
     encode(market, targetRate, rateState) {
         // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
@@ -497,3 +479,22 @@ export const aaveV3QuotePriceRangeTrigger = {
         };
     },
 };
+export const sparkQuotePriceRangeTrigger = {
+    encode(collToken, debtToken, lowerPrice, upperPrice) {
+        // 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) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            collToken: decodedData[0],
+            debtToken: decodedData[1],
+            lowerPrice: new Dec(decodedData[2]).div(1e8).toString(),
+            upperPrice: new Dec(decodedData[3]).div(1e8).toString(),
+        };
+    },
+};

package/esm/services/triggerService.test.js

@@ -3,7 +3,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { ChainId, OrderType, RatioState } from '../types/enums';
 import '../configuration';
-import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkQuotePriceTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, } from './triggerService';
+import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -781,52 +781,6 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
-    describe('When testing triggerService.sparkQuotePriceTrigger', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['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 = [
-                [
-                    {
-                        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 = [

package/esm/services/utils.test.js

@@ -1,11 +1,8 @@
 import { expect } from 'chai';
-import * as web3Utils from 'web3-utils';
-import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo } from '@defisaver/tokens';
 import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
-import { sparkEncode } from './strategySubService';
 import '../configuration';
-import { addToArrayIf, addToObjectIf, compareAddresses, compareSubHashes, encodeSubId, ethToWeth, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
+import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
 describe('Feature: utils.ts', () => {
     describe('When testing utils.isDefined()', () => {
         const examples = [
@@ -139,54 +136,6 @@ describe('Feature: utils.ts', () => {
             });
         });
     });
-    describe('When testing utils.compareSubHashes()', () => {
-        const subDataToEncodeOne = [
-            12,
-            false,
-            {
-                baseTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                quoteTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                price: 100,
-                ratioState: 1,
-            },
-            {
-                collAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                collAssetId: 2,
-                debtAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                debtAssetId: 3,
-            },
-        ];
-        const subDataToEncodeTwo = [
-            13,
-            true,
-            {
-                baseTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                quoteTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                price: 100,
-                ratioState: 2,
-            },
-            {
-                collAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                collAssetId: 2,
-                debtAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                debtAssetId: 3,
-            },
-        ];
-        // @ts-ignore
-        const encodedSubDataOne = sparkEncode.closeToAsset(...subDataToEncodeOne);
-        // @ts-ignore
-        const encodedSubDataTwo = sparkEncode.closeToAsset(...subDataToEncodeTwo);
-        const encodedParams = web3Utils.keccak256(AbiCoder.encodeParameter('(uint64,bool,bytes[],bytes32[])', encodedSubDataOne));
-        const examples = [
-            [true, [encodedParams, encodedSubDataOne]],
-            [false, [encodedParams, encodedSubDataTwo]],
-        ];
-        examples.forEach(([expected, actual]) => {
-            it(`Given ${actual} should return expected value: ${expected}`, () => {
-                expect(compareSubHashes(...actual)).to.equal(expected);
-            });
-        });
-    });
     describe('When testing utils.encodeSubId()', () => {
         const examples = [
             ['00000001', '1'],

package/esm/types/enums.d.ts

@@ -171,8 +171,6 @@ export declare namespace Bundles {
         LIQUITY_BOOST = 17,
         SPARK_REPAY = 18,
         SPARK_BOOST = 19,
-        SPARK_CLOSE_TO_DEBT = -21231230,
-        SPARK_CLOSE_TO_COLLATERAL = -21231231,
         AAVE_V2_REPAY = 22,
         AAVE_V2_BOOST = 23,
         COMP_V2_REPAY = 20,
@@ -207,7 +205,8 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST = 53,
         AAVE_V3_EOA_REPAY_ON_PRICE = 54,
         AAVE_V3_EOA_BOOST_ON_PRICE = 55,
-        AAVE_V3_EOA_CLOSE = 56
+        AAVE_V3_EOA_CLOSE = 56,
+        SPARK_CLOSE = 57
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -191,8 +191,6 @@ export var Bundles;
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
         MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
         MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = -21231230] = "SPARK_CLOSE_TO_DEBT";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = -21231231] = "SPARK_CLOSE_TO_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V2_REPAY"] = 22] = "AAVE_V2_REPAY";
         MainnetIds[MainnetIds["AAVE_V2_BOOST"] = 23] = "AAVE_V2_BOOST";
         MainnetIds[MainnetIds["COMP_V2_REPAY"] = 20] = "COMP_V2_REPAY";
@@ -228,6 +226,7 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
+        MainnetIds[MainnetIds["SPARK_CLOSE"] = 57] = "SPARK_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {