@defisaver/automation-sdk 3.3.11 → 3.3.12

package/esm/services/subDataService.test.js

@@ -2118,4 +2118,161 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.aaveV4LeverageManagementSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000014d1120d7b160000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), RatioState.UNDER, 150]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        ratioState: RatioState.UNDER,
+                        targetRatio: 150,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000014d1120d7b160000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4LeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000016345785d8a00000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        RatioState.OVER, 160
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        collAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        collAssetId: 10,
+                        debtAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        debtAssetId: 20,
+                        ratioState: RatioState.OVER,
+                        targetRatio: 160,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000016345785d8a00000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4CloseSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4CloseSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        collAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        collAssetId: 10,
+                        debtAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        debtAssetId: 20,
+                        closeType: CloseStrategyType.STOP_LOSS_IN_COLLATERAL,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4CloseSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4CollateralSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        '1000000000000000000'
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4CollateralSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        fromAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        fromAssetId: 10,
+                        toAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        toAssetId: 20,
+                        amountToSwitch: '1000000000000000000'
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4CollateralSwitchSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/services/triggerService.d.ts

@@ -294,3 +294,32 @@ export declare const sparkQuotePriceTrigger: {
         ratioState: number;
     };
 };
+export declare const aaveV4RatioTrigger: {
+    encode(owner: EthereumAddress, spoke: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        owner: string;
+        spoke: string;
+        ratio: number;
+        ratioState: number;
+    };
+};
+export declare const aaveV4QuotePriceTrigger: {
+    encode(spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, price: string, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        spoke: string;
+        baseTokenId: number;
+        quoteTokenId: number;
+        price: string;
+        ratioState: number;
+    };
+};
+export declare const aaveV4QuotePriceRangeTrigger: {
+    encode(spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, lowerPrice: string, upperPrice: string): string[];
+    decode(triggerData: string[]): {
+        spoke: string;
+        baseTokenId: number;
+        quoteTokenId: number;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/esm/services/triggerService.js

@@ -533,3 +533,55 @@ export const sparkQuotePriceTrigger = {
         };
     },
 };
+export const aaveV4RatioTrigger = {
+    encode(owner, spoke, ratioPercentage, ratioState) {
+        const ratioWei = ratioPercentageToWei(ratioPercentage);
+        return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, spoke, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            owner: decodedData[0],
+            spoke: decodedData[1],
+            ratio: weiToRatioPercentage(decodedData[2]),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};
+export const aaveV4QuotePriceTrigger = {
+    encode(spoke, baseTokenId, quoteTokenId, price, ratioState) {
+        // Price is intentionally scaled to 1e18 for higher precision.
+        const _price = new Dec(price).mul(1e18).floor().toString();
+        return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint8'], [spoke, baseTokenId, quoteTokenId, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            spoke: decodedData[0],
+            baseTokenId: Number(decodedData[1]),
+            quoteTokenId: Number(decodedData[2]),
+            price: new Dec(decodedData[3]).div(1e18).toString(),
+            ratioState: Number(decodedData[4]),
+        };
+    },
+};
+export const aaveV4QuotePriceRangeTrigger = {
+    encode(spoke, baseTokenId, quoteTokenId, lowerPrice, upperPrice) {
+        // Price is intentionally scaled to 1e18 for higher precision.
+        const lowerPriceFormatted = new Dec(lowerPrice).mul(1e18).floor().toString();
+        const upperPriceFormatted = new Dec(upperPrice).mul(1e18).floor().toString();
+        return [
+            AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint256'], [spoke, baseTokenId, quoteTokenId, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            spoke: decodedData[0],
+            baseTokenId: Number(decodedData[1]),
+            quoteTokenId: Number(decodedData[2]),
+            lowerPrice: new Dec(decodedData[3]).div(1e18).toString(),
+            upperPrice: new Dec(decodedData[4]).div(1e18).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, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, morphoBluePriceRangeTrigger, sparkQuotePriceTrigger, } 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()', () => {
@@ -1159,6 +1159,90 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    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 = [

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/types/enums.d.ts

@@ -56,6 +56,7 @@ export declare namespace ProtocolIdentifiers {
         CompoundV3 = "Compound__V3",
         AaveV2 = "Aave__V2",
         AaveV3 = "Aave__V3",
+        AaveV4 = "Aave__V4",
         MorphoAaveV2 = "Morpho-Aave__V2",
         Exchange = "Exchange",
         Spark = "Spark",
@@ -86,7 +87,9 @@ export declare namespace Strategies {
         LIQUITY_DEBT_IN_FRONT_REPAY = 75,
         CURVEUSD_PAYBACK = 92,
         LIQUITY_V2_PAYBACK = 113,
-        AAVE_V3_COLLATERAL_SWITCH = 135
+        AAVE_V3_COLLATERAL_SWITCH = 135,
+        AAVE_V4_COLLATERAL_SWITCH = 154,
+        AAVE_V4_COLLATERAL_SWITCH_EOA = 155
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
@@ -133,7 +136,8 @@ export declare namespace Strategies {
         RepayOnPrice = "repay-on-price",
         EoaBoostOnPrice = "eoa-boost-on-price",
         EoaRepayOnPrice = "eoa-repay-on-price",
-        CollateralSwitch = "collateral-switch"
+        CollateralSwitch = "collateral-switch",
+        EoaCollateralSwitch = "eoa-collateral-switch"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -209,7 +213,17 @@ export declare namespace Bundles {
         SPARK_CLOSE = 57,
         MORPHO_BLUE_CLOSE = 58,
         SPARK_REPAY_ON_PRICE = 59,
-        SPARK_BOOST_ON_PRICE = 60
+        SPARK_BOOST_ON_PRICE = 60,
+        AAVE_V4_REPAY = 61,
+        AAVE_V4_BOOST = 62,
+        AAVE_V4_REPAY_ON_PRICE = 63,
+        AAVE_V4_BOOST_ON_PRICE = 64,
+        AAVE_V4_CLOSE = 65,
+        AAVE_V4_EOA_REPAY = 66,
+        AAVE_V4_EOA_BOOST = 67,
+        AAVE_V4_EOA_REPAY_ON_PRICE = 68,
+        AAVE_V4_EOA_BOOST_ON_PRICE = 69,
+        AAVE_V4_EOA_CLOSE = 70
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -66,6 +66,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
         StrategiesAutomation["AaveV2"] = "Aave__V2";
         StrategiesAutomation["AaveV3"] = "Aave__V3";
+        StrategiesAutomation["AaveV4"] = "Aave__V4";
         StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
         StrategiesAutomation["Exchange"] = "Exchange";
         StrategiesAutomation["Spark"] = "Spark";
@@ -100,6 +101,8 @@ export var Strategies;
         MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_V2_PAYBACK"] = 113] = "LIQUITY_V2_PAYBACK";
         MainnetIds[MainnetIds["AAVE_V3_COLLATERAL_SWITCH"] = 135] = "AAVE_V3_COLLATERAL_SWITCH";
+        MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH"] = 154] = "AAVE_V4_COLLATERAL_SWITCH";
+        MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -151,6 +154,7 @@ export var Strategies;
         Identifiers["EoaBoostOnPrice"] = "eoa-boost-on-price";
         Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
         Identifiers["CollateralSwitch"] = "collateral-switch";
+        Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -230,6 +234,16 @@ export var Bundles;
         MainnetIds[MainnetIds["MORPHO_BLUE_CLOSE"] = 58] = "MORPHO_BLUE_CLOSE";
         MainnetIds[MainnetIds["SPARK_REPAY_ON_PRICE"] = 59] = "SPARK_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["SPARK_BOOST_ON_PRICE"] = 60] = "SPARK_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_REPAY"] = 61] = "AAVE_V4_REPAY";
+        MainnetIds[MainnetIds["AAVE_V4_BOOST"] = 62] = "AAVE_V4_BOOST";
+        MainnetIds[MainnetIds["AAVE_V4_REPAY_ON_PRICE"] = 63] = "AAVE_V4_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_BOOST_ON_PRICE"] = 64] = "AAVE_V4_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_CLOSE"] = 65] = "AAVE_V4_CLOSE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY"] = 66] = "AAVE_V4_EOA_REPAY";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST"] = 67] = "AAVE_V4_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY_ON_PRICE"] = 68] = "AAVE_V4_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST_ON_PRICE"] = 69] = "AAVE_V4_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_CLOSE"] = 70] = "AAVE_V4_EOA_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/types/index.d.ts

@@ -208,8 +208,29 @@ export declare namespace Position {
             ratioState: RatioState;
             ratio: number;
         }
+        interface CloseBase extends Base {
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
+        interface AaveV4LeverageManagementOnPrice extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            price: string;
+            ratioState: number;
+            ratio: number;
+        }
+        interface AaveV4CloseOnPrice extends CloseBase {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+        }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice | Specific.AaveV3CloseOnPriceGeneric | Specific.SparkOnPrice;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice | Specific.AaveV3CloseOnPriceGeneric | Specific.AaveV4LeverageManagementOnPrice | Specific.AaveV4CloseOnPrice | Specific.SparkOnPrice;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.11",
+  "version": "3.3.12",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,7 +23,7 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/sdk": "^1.3.21",
+    "@defisaver/sdk": "^1.3.22",
     "@defisaver/tokens": "^1.6.19",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",

package/src/automation/private/StrategiesAutomation.test.ts

@@ -659,5 +659,45 @@ describe('Feature: StrategiesAutomation.ts', () => {
         expect(JSON.stringify(actual)).to.equal(JSON.stringify(expected));
       });
     });
+
+    it('Aave V4: pairs repay/boost merge only when trigger spoke matches (no cross-spoke merge)', () => {
+      const spoke1 = '0x0000000000000000000000000000000000000a01';
+      const spoke2 = '0x0000000000000000000000000000000000000a02';
+      const base = {
+        isEnabled: true,
+        chainId: 1,
+        owner: '0x0000000000000000000000000000000000000b01',
+        protocol: { id: 'Aave__V4' },
+        strategy: { strategyId: 'leverage-management' },
+        blockNumber: 0,
+        subHash: '0x1',
+        positionId: 'test',
+      };
+      const boostSpoke1 = {
+        ...base,
+        subId: 1,
+        strategyData: { decoded: { triggerData: { spoke: spoke1 }, subData: {} } },
+        specific: { mergeId: 'boost', subId2: 1 },
+      };
+      const repaySpoke2 = {
+        ...base,
+        subId: 2,
+        strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } },
+        specific: { mergeWithId: 'boost', subId1: 2 },
+      };
+      const boostSpoke2 = {
+        ...base,
+        subId: 3,
+        strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } },
+        specific: { mergeId: 'boost', subId2: 3 },
+      };
+      // @ts-ignore — mergeSubs is protected; exercised here as in examples above
+      const merged = exampleStrategiesAutomation.mergeSubs([boostSpoke1, repaySpoke2, boostSpoke2]);
+      expect(merged).to.have.length(2);
+      const mergedPair = merged.find((m: { subIds?: number[] }) => m.subIds?.length === 2);
+      const loneBoost = merged.find((m: { subIds?: number[] }) => m.subIds?.length === 1);
+      expect(mergedPair?.strategyData?.decoded?.triggerData?.spoke).to.equal(spoke2);
+      expect(loneBoost?.subId).to.equal(1);
+    });
   });
 });

package/src/automation/private/StrategiesAutomation.ts

@@ -129,9 +129,20 @@ export default class StrategiesAutomation extends Automation {
       && (
         s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
         || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase()
+      )
+      && (
+        s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.AaveV4
+        || this._aaveV4MergeSpokesMatch(s, current)
       );
   }
 
+  /** Repay/boost leverage pairs must not merge across different Aave V4 spokes. */
+  private _aaveV4MergeSpokesMatch(s: Position.Automated, current: Position.Automated): boolean {
+    const a = s.strategyData?.decoded?.triggerData?.spoke as EthereumAddress | undefined;
+    const b = current.strategyData?.decoded?.triggerData?.spoke as EthereumAddress | undefined;
+    return !!a && !!b && a.toLowerCase() === b.toLowerCase();
+  }
+
   protected mergeSubs(_subscriptions:(Position.Automated | null)[]) {
     const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId)) as Position.Automated[];
     const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId)) as Position.Automated[];