@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

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, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkQuotePriceTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, } 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, morphoBluePriceRangeTrigger, sparkQuotePriceTrigger, aaveV4RatioTrigger, aaveV4QuotePriceTrigger, aaveV4QuotePriceRangeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -423,6 +423,125 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.liquityV2DebtInFrontTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434ad94e2c00000000000000000000000000000000000000000000000000000000075bcd1500000000000000000000000000000000000000000000006e0be8c4995af80000'],
+                    [web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434Ad94E2c'), '123456789', '2030']
+                ],
+                [
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434a192e2c000000000000000000000000000000000000000000000000000000003ade68b1000000000000000000000000000000000000000000004697f83e6356dd440000'],
+                    [web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434A192E2c'), '987654321', '333369']
+                ],
+                [
+                    ['0x00000000000000000000000030462ad9d8f01a20a2ec7e7f1a8f1b303662aebf00000000000000000000000000000000000000000000000000000000075bd924000000000000000000000000000000000000000000084595161401484a000000'],
+                    [web3Utils.toChecksumAddress('0x30462AD9D8F01A20A2EC7E7F1A8F1B303662AEBF'), '123459876', '10000000']
+                ],
+                [
+                    ['0x00000000000000000000000030462ad9d8f01a20a2ec7e7f1a8f1b303662aebf000000000000000000000000000000000000000000000000000000002060d4950000000000000000000000000000000000000000000000000000000000989680'],
+                    [web3Utils.toChecksumAddress('0x30462AD9D8F01A20A2EC7E7F1A8F1B303662AEBF'), '543216789', '0.00000000001']
+                ],
+                [
+                    ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a000000000000000000000000000000000000000000000000000000003ade5ca20000000000000000000000000000000000000000019d971e4fe8401e74000000'],
+                    [web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'), '987651234', '500000000']
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(liquityV2DebtInFrontTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434Ad94E2c'),
+                        troveId: '123456789',
+                        debtInFrontMin: '2030',
+                    },
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434ad94e2c00000000000000000000000000000000000000000000000000000000075bcd1500000000000000000000000000000000000000000000006e0be8c4995af80000'],
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434A192E2c'),
+                        troveId: '987654321',
+                        debtInFrontMin: '333369',
+                    },
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434a192e2c000000000000000000000000000000000000000000000000000000003ade68b1000000000000000000000000000000000000000000004697f83e6356dd440000'],
+                ], [
+                    {
+                        market: web3Utils.toChecksumAddress('0x30462AD9D8F01A20A2EC7E7F1A8F1B303662AEBF'),
+                        troveId: '123459876',
+                        debtInFrontMin: '10000000',
+                    },
+                    ['0x00000000000000000000000030462ad9d8f01a20a2ec7e7f1a8f1b303662aebf00000000000000000000000000000000000000000000000000000000075bd924000000000000000000000000000000000000000000084595161401484a000000'],
+                ], [
+                    {
+                        market: web3Utils.toChecksumAddress('0x30462AD9D8F01A20A2EC7E7F1A8F1B303662AEBF'),
+                        troveId: '543216789',
+                        debtInFrontMin: '0.00000000001',
+                    },
+                    ['0x00000000000000000000000030462ad9d8f01a20a2ec7e7f1a8f1b303662aebf000000000000000000000000000000000000000000000000000000002060d4950000000000000000000000000000000000000000000000000000000000989680'],
+                ], [
+                    {
+                        market: web3Utils.toChecksumAddress('0x235d6A8DB3C57c3f7b4ebA749E1738Db6093732a'),
+                        troveId: '987651234',
+                        debtInFrontMin: '500000000',
+                    },
+                    ['0x000000000000000000000000235d6a8db3c57c3f7b4eba749e1738db6093732a000000000000000000000000000000000000000000000000000000003ade5ca20000000000000000000000000000000000000000019d971e4fe8401e74000000'],
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(liquityV2DebtInFrontTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.liquityV2AdjustTimeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434ad94e2c00000000000000000000000000000000000000000000000000000000075bcd15'],
+                    [web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434Ad94E2c'), '123456789']
+                ],
+                [
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434a192e2c000000000000000000000000000000000000000000000000000000003ade68b1'],
+                    [web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434A192E2c'), '987654321']
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(liquityV2AdjustTimeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434Ad94E2c'),
+                        troveId: '123456789',
+                    },
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434ad94e2c00000000000000000000000000000000000000000000000000000000075bcd15'],
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0x0049d218133AFaB8F2B829B1066c7E434A192E2c'),
+                        troveId: '987654321',
+                    },
+                    ['0x0000000000000000000000000049d218133afab8f2b829b1066c7e434a192e2c000000000000000000000000000000000000000000000000000000003ade68b1'],
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(liquityV2AdjustTimeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing triggerService.aaveV2RatioTrigger', () => {
         describe('encode()', () => {
             const examples = [
@@ -662,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 = [
@@ -898,4 +971,322 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.compoundV3PriceTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f07775030000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
+                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'), 2000, RatioState.UNDER]
+                ],
+                [
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f077750300000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
+                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'), 3000, RatioState.OVER]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(compoundV3PriceTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        user: web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+                        price: '2000',
+                        priceState: RatioState.UNDER,
+                    },
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f07775030000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        user: web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+                        price: '3000',
+                        priceState: RatioState.OVER,
+                    },
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f077750300000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(compoundV3PriceTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.compoundV3PriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(compoundV3PriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(compoundV3PriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.aaveV3PriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(aaveV3QuotePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV3QuotePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(morphoBluePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8dA6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.aaveV4RatioTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+                    [web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 120, RatioState.UNDER]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(aaveV4RatioTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), ratio: 120, ratioState: RatioState.UNDER },
+                    ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4RatioTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.aaveV4QuotePriceTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000'],
+                    [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 10, 20, '1500', RatioState.OVER]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(aaveV4QuotePriceTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), baseTokenId: 10, quoteTokenId: 20, price: '1500', ratioState: RatioState.OVER },
+                    ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4QuotePriceTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.aaveV4QuotePriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae00000000000000000000000000000000000000000000000000056bc75e2d631000000'],
+                    [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 10, 20, '1400', '1600']
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(aaveV4QuotePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), baseTokenId: 10, quoteTokenId: 20, lowerPrice: '1400', upperPrice: '1600' },
+                    ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae00000000000000000000000000000000000000000000000000056bc75e2d631000000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4QuotePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing triggerService.sparkQuotePriceTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                    [web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address), web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address), 2500, RatioState.UNDER]
+                ],
+                [
+                    ['0x000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000000000c1c0000000000000000000000000000000000000000000000000000000000000000'],
+                    [web3Utils.toChecksumAddress(getAssetInfo('USDT', ChainId.Ethereum).address), web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address), 0.000031, 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 = [
+                [
+                    {
+                        baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        price: '2500',
+                        ratioState: RatioState.UNDER
+                    },
+                    ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001']
+                ],
+                [
+                    {
+                        baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('USDT', ChainId.Ethereum).address),
+                        quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        price: '0.000031',
+                        ratioState: RatioState.OVER
+                    },
+                    ['0x000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000000000c1c0000000000000000000000000000000000000000000000000000000000000000']
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/services/utils.d.ts

@@ -23,7 +23,7 @@ export declare function getRatioStateInfoForAaveCloseStrategy(currentRatioState:
     ratioState: RatioState;
 };
 export declare function getPositionId(...args: (number | string)[]): string;
-export declare function getCloseStrategyType(stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType): CloseStrategyType;
+export declare function getCloseStrategyType(stopLossPrice: number | string, stopLossType: CloseToAssetType, takeProfitPrice: number | string, takeProfitType: CloseToAssetType): CloseStrategyType;
 export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType: CloseStrategyType): {
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;

package/esm/services/utils.js

@@ -81,8 +81,16 @@ export function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
 export function getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType) {
-    const isStopLoss = stopLossPrice > 0;
-    const isTakeProfit = takeProfitPrice > 0;
+    const stopLossPriceDec = new Dec(stopLossPrice);
+    const takeProfitPriceDec = new Dec(takeProfitPrice);
+    if (!stopLossPriceDec.isFinite() || stopLossPriceDec.isNegative()) {
+        throw new Error('CloseOnPrice: stopLossPrice must be a finite non-negative number');
+    }
+    if (!takeProfitPriceDec.isFinite() || takeProfitPriceDec.isNegative()) {
+        throw new Error('CloseOnPrice: takeProfitPrice must be a finite non-negative number');
+    }
+    const isStopLoss = stopLossPriceDec.gt(0);
+    const isTakeProfit = takeProfitPriceDec.gt(0);
     if (!isStopLoss && !isTakeProfit) {
         throw new Error('CloseOnPrice: At least one price must be defined');
     }

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'],