@defisaver/automation-sdk 3.3.22-coll-switch-generic-dev → 3.3.22-instant-twap-close-dev

package/esm/services/strategiesService.test.js

@@ -8,102 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { expect } from 'chai';
-import { ChainId, ProtocolIdentifiers, RatioState, Strategies } from '../types/enums';
+import { Bundles, CloseStrategyType, CloseToAssetType, ProtocolIdentifiers, Strategies, } from '../types/enums';
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
+import { aaveV3Encode } from './strategySubService';
 describe('Feature: strategiesService.ts', () => {
-    describe('When parsing Aave V3 collateral switch subscriptions', () => {
-        const proxy = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
-        const user = '0x1234567890123456789012345678901234567890';
-        const fromAsset = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-        const toAsset = '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf';
-        const marketAddr = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
-        const amountToSwitch = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-        const subHash = `0x${'ab'.repeat(32)}`;
-        const triggerData = [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
-                + '000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf'
-                + '0000000000000000000000000000000000000000000000000000000000989680'
-                + '0000000000000000000000000000000000000000000000000000000000000001',
-        ];
-        function getParseData(strategyId, isGeneric, chainId = ChainId.Ethereum) {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                isGeneric
-                    ? '0x0000000000000000000000000000000000000000000000000000000000000100'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-                '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
-                isGeneric
-                    ? '0x000000000000000000000000000000000000000000000000000000000000ffff'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000007',
-                '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                isGeneric
-                    ? '0x0000000000000000000000001234567890123456789012345678901234567890'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ];
-            const subStruct = Object.assign([String(strategyId), false, triggerData, subData], { strategyOrBundleId: String(strategyId), isBundle: false, triggerData, subData });
-            return {
-                chainId,
-                blockNumber: 18015756,
-                subscriptionEventData: {
-                    subId: '379', proxy, subHash, subStruct,
-                    0: '379', 1: proxy, 2: subHash, 3: subStruct,
-                },
-                strategiesSubsData: {
-                    userProxy: proxy, isEnabled: true, strategySubHash: subHash,
-                },
-            };
-        }
-        const genericStrategies = [
-            [ChainId.Ethereum, Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [ChainId.Optimism, Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [ChainId.Arbitrum, Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [ChainId.Base, Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-        ];
-        genericStrategies.forEach(([chainId, strategyId]) => {
-            it(`decodes generic collateral switches with the user and uint16 reserve IDs on chain ${chainId}`, () => {
-                const parseData = getParseData(strategyId, true, chainId);
-                const position = parseStrategiesAutomatedPosition(parseData);
-                expect(position).not.to.equal(null);
-                expect(position.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
-                expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.EoaCollateralSwitch);
-                expect(position.strategy.isBundle).to.equal(false);
-                expect(position.strategyData.encoded).to.eql({
-                    triggerData,
-                    subData: parseData.subscriptionEventData.subStruct.subData,
-                });
-                expect(position.strategyData.decoded.triggerData).to.eql({
-                    baseTokenAddress: fromAsset,
-                    quoteTokenAddress: toAsset,
-                    price: '0.1',
-                    ratioState: RatioState.UNDER,
-                });
-                expect(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 256, toAsset, toAssetId: 65535, marketAddr, amountToSwitch, user,
-                });
-                expect(position.owner).to.equal(proxy.toLowerCase());
-                expect(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-        const legacyStrategies = [
-            [ChainId.Ethereum, Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH],
-            [ChainId.Optimism, Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH],
-            [ChainId.Arbitrum, Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH],
-            [ChainId.Base, Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH],
-        ];
-        legacyStrategies.forEach(([chainId, strategyId]) => {
-            it(`continues to decode legacy collateral switches on chain ${chainId}`, () => {
-                const position = parseStrategiesAutomatedPosition(getParseData(strategyId, false, chainId));
-                expect(position).not.to.equal(null);
-                expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.CollateralSwitch);
-                expect(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 0, toAsset, toAssetId: 7, marketAddr, amountToSwitch,
-                });
-                expect(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-    });
     describe('When testing strategiesService.parseStrategiesAutomatedPosition', () => __awaiter(void 0, void 0, void 0, function* () {
         // TODO: we should probably write this for every strategy?
         const examples = [
@@ -198,4 +107,65 @@ describe('Feature: strategiesService.ts', () => {
             }));
         });
     }));
+    describe('When parsing Aave V3 instant close bundles', () => {
+        const owner = '0x1234567890123456789012345678901234567890';
+        const market = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
+        const weth = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
+        const usdc = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
+        const bundles = [
+            ['SW', Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE, Strategies.Identifiers.InstantCloseOnPrice],
+            ['EOA', Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE, Strategies.Identifiers.EoaInstantCloseOnPrice],
+        ];
+        bundles.forEach(([walletType, expectedBundleId, expectedStrategyId]) => {
+            describe(`${walletType} bundle`, () => {
+                const [bundleId, isBundle, triggerData, subData] = aaveV3Encode.instantCloseOnPriceGeneric(expectedBundleId, weth, 0, usdc, 1, market, owner, '1000000000000000000', '10000000000000000', 1500, CloseToAssetType.DEBT, 5000, CloseToAssetType.COLLATERAL);
+                const parseData = {
+                    chainId: 1,
+                    blockNumber: 1,
+                    subscriptionEventData: {
+                        subId: '1',
+                        proxy: owner,
+                        subHash: '0xhash',
+                        subStruct: {
+                            strategyOrBundleId: String(bundleId), isBundle, triggerData, subData,
+                        },
+                    },
+                    strategiesSubsData: { userProxy: owner, isEnabled: true, strategySubHash: '0xhash' },
+                };
+                const result = parseStrategiesAutomatedPosition(parseData);
+                it('should identify the strategy as instant close on price', () => {
+                    expect(result.strategy.strategyOrBundleId).to.equal(expectedBundleId);
+                    expect(result.strategy.strategyId).to.equal(expectedStrategyId);
+                    expect(result.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
+                });
+                it('should decode sub data including tsi and slippage', () => {
+                    expect(result.strategyData.decoded.subData).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+                        marketAddr: market,
+                        owner,
+                        tsi: '1000000000000000000',
+                        slippage: '10000000000000000',
+                    });
+                });
+                it('should fill specific with prices and close types', () => {
+                    expect(result.specific).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        baseToken: weth,
+                        quoteToken: usdc,
+                        stopLossPrice: '1500',
+                        takeProfitPrice: '5000',
+                        stopLossType: CloseToAssetType.DEBT,
+                        takeProfitType: CloseToAssetType.COLLATERAL,
+                    });
+                });
+            });
+        });
+    });
 });

package/esm/services/strategySubService.d.ts

@@ -61,9 +61,8 @@ export declare const aaveV3Encode: {
     liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (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[])[];
+    instantCloseOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, tsi: string, slippage: string, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
-    collateralSwitchGeneric(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
-    debtSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];

package/esm/services/strategySubService.js

@@ -164,21 +164,16 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
-    collateralSwitchGeneric(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+    instantCloseOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, tsi, slippage, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subDataEncoded = subDataService.aaveV3InstantCloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    debtSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
+    collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
         const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3DebtSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
+        const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },

package/esm/services/strategySubService.test.js

@@ -732,6 +732,117 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('instantCloseOnPriceGeneric()', () => {
+            const examples = [
+                // Stop loss only (to debt)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000003',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+                            '0x000000000000000000000000000000000000000000000000002386f26fc10000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '1000000000000000000',
+                        '10000000000000000',
+                        1500,
+                        CloseToAssetType.DEBT,
+                        0,
+                        CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
+                    ]
+                ],
+                // Take profit only (to collateral), zero tsi and slippage
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '0',
+                        '0',
+                        0,
+                        CloseToAssetType.DEBT,
+                        5000,
+                        CloseToAssetType.COLLATERAL, // takeProfitType
+                    ]
+                ],
+                // Take profit (to debt) and stop loss (to collateral)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000007',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
+                            '0x0000000000000000000000000000000000000000000000000011c37937e08000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '50000000000000000',
+                        '5000000000000000',
+                        1500,
+                        CloseToAssetType.COLLATERAL,
+                        4000,
+                        CloseToAssetType.DEBT, // takeProfitType
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV3Encode.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('collateralSwitch()', () => {
             const examples = [
                 // WETH -> USDC, price 100000, state UNDER
@@ -831,113 +942,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('collateralSwitchGeneric()', () => {
-            const strategyId = 12345;
-            const fromAsset = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
-            const toAsset = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
-            const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-            const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
-            const examples = [
-                [
-                    RatioState.UNDER,
-                    '10000000000000000000',
-                    '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                    '0000000000000000000000000000000000000000000000000000000000000001',
-                ],
-                [
-                    RatioState.OVER,
-                    MAXUINT,
-                    '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                    '0000000000000000000000000000000000000000000000000000000000000000',
-                ],
-            ];
-            examples.forEach(([state, amountToSwitch, encodedAmount, encodedState]) => {
-                it(`encodes a generic collateral switch with the supplied quote pair and state ${state}`, () => {
-                    const expectedTrigger = `0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e8${encodedState}`;
-                    const expectedSubData = [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                        '0x0000000000000000000000000000000000000000000000000000000000000100',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x000000000000000000000000000000000000000000000000000000000000ffff',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        encodedAmount,
-                        '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-                    ];
-                    expect(aaveV3Encode.collateralSwitchGeneric(strategyId, fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user, toAsset, fromAsset, 0.00001, state)).to.eql([strategyId, false, [expectedTrigger], expectedSubData]);
-                });
-            });
-        });
-        describe('debtSwitch()', () => {
-            const examples = [
-                // USDC -> DAI, price 100000, state UNDER
-                [
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
-                        [
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        100000,
-                        RatioState.UNDER,
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256), price 1, state OVER
-                [
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        RatioState.OVER,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3Encode.debtSwitch(...actual)).to.eql(expected);
-                });
-            });
-        });
     });
     describe('When testing strategySubService.compoundV3Encode', () => {
         describe('leverageManagementOnPrice()', () => {

package/esm/services/subDataService.d.ts

@@ -248,31 +248,22 @@ export declare const aaveV3CloseGenericSubData: {
         owner: EthereumAddress;
     };
 };
-export declare const aaveV3CollateralSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
-    decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
-        marketAddr: EthereumAddress;
-        amountToSwitch: string;
-    };
-};
-export declare const aaveV3GenericFLCollateralSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
+export declare const aaveV3InstantCloseGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress, tsi: string, slippage: string): string[];
     decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        closeType: CloseStrategyType;
         marketAddr: EthereumAddress;
-        amountToSwitch: string;
-        user: EthereumAddress;
+        owner: EthereumAddress;
+        tsi: string;
+        slippage: string;
     };
 };
-export declare const aaveV3DebtSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
+export declare const aaveV3CollateralSwitchSubData: {
+    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
     decode(subData: string[]): {
         fromAsset: EthereumAddress;
         fromAssetId: number;
@@ -280,7 +271,6 @@ export declare const aaveV3DebtSwitchSubData: {
         toAssetId: number;
         marketAddr: EthereumAddress;
         amountToSwitch: string;
-        user: EthereumAddress;
     };
 };
 export declare const aaveV3QuotePriceSubData: {

package/esm/services/subDataService.js

@@ -511,78 +511,53 @@ export const aaveV3CloseGenericSubData = {
         };
     },
 };
-export const aaveV3CollateralSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
-        const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
-        const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
-        const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
-        const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
-        const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
-        const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
-        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
-        return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUseOnBehalf,
-        ];
-    },
-    decode(subData) {
-        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
-        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
-        return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
-        };
-    },
-};
-export const aaveV3GenericFLCollateralSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
-        const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
-        const encodedFromAssetId = AbiCoder.encodeParameter('uint16', fromAssetId);
-        const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
-        const encodedToAssetId = AbiCoder.encodeParameter('uint16', toAssetId);
-        const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
-        const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
+export const aaveV3InstantCloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage) {
+        const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+        const encodedCollId = AbiCoder.encodeParameter('uint16', collAssetId);
+        const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+        const encodedDebtId = AbiCoder.encodeParameter('uint16', debtAssetId);
+        const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+        const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
         const encodedUser = AbiCoder.encodeParameter('address', user);
+        const encodedTsi = AbiCoder.encodeParameter('uint256', tsi);
+        const encodedSlippage = AbiCoder.encodeParameter('uint256', slippage);
         return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
+            encodedColl,
+            encodedCollId,
+            encodedDebt,
+            encodedDebtId,
+            encodedCloseType,
+            encodedMarket,
             encodedUser,
+            encodedTsi,
+            encodedSlippage,
         ];
     },
     decode(subData) {
-        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const fromAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
-        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const toAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
-        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
-        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        const tsi = AbiCoder.decodeParameter('uint256', subData[7]);
+        const slippage = AbiCoder.decodeParameter('uint256', subData[8]);
         return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
         };
     },
 };
-export const aaveV3DebtSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
+export const aaveV3CollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
         const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
         const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
         const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
         const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
         const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
         const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
-        const encodedUser = AbiCoder.encodeParameter('address', user);
+        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
         return [
             encodedFromAsset,
             encodedFromAssetId,
@@ -590,7 +565,7 @@ export const aaveV3DebtSwitchSubData = {
             encodedToAssetId,
             encodedMarketAddr,
             encodedAmountToSwitch,
-            encodedUser,
+            encodedUseOnBehalf,
         ];
     },
     decode(subData) {
@@ -600,9 +575,8 @@ export const aaveV3DebtSwitchSubData = {
         const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
         const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
         const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
         return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
         };
     },
 };