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

package/esm/services/apiSubscriptionsService.test.js

@@ -0,0 +1,65 @@
+import { expect } from 'chai';
+import { ChainId } from '../types/enums';
+import '../configuration';
+import { parseDataFromApiSubscription } from './apiSubscriptionsService';
+import { parseStrategiesAutomatedPosition } from './strategiesService';
+describe('Feature: apiSubscriptionsService.ts', () => {
+    describe('When testing apiSubscriptionsService.parseDataFromApiSubscription', () => {
+        // same subscription as in strategiesService.test.ts, in the shape the automation API returns it
+        const record = {
+            id: 379,
+            wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+            wallet_type: 'safe',
+            is_enabled: true,
+            is_bundle: true,
+            strategy_or_bundle_id: 8,
+            strategy_ids: [34, 35],
+            sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            trigger_data: [
+                '0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+            ],
+            sub_data: [
+                '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+            block_number: 18015756,
+            additional_triggers: null,
+        };
+        const fromEvents = {
+            chainId: ChainId.Ethereum,
+            blockNumber: 18015756,
+            subscriptionEventData: {
+                subId: '379',
+                proxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+                subStruct: {
+                    strategyOrBundleId: '8',
+                    isBundle: true,
+                    triggerData: [
+                        '0x0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+                    ],
+                    subData: record.sub_data,
+                },
+            },
+            strategiesSubsData: {
+                userProxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                isEnabled: true,
+                strategySubHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            },
+        };
+        it('Given an API record should return the same parse data as Subscribe event and SubStorage would', () => {
+            expect(parseDataFromApiSubscription(record, ChainId.Ethereum)).to.eql(fromEvents);
+        });
+        it('Given an API record the parsed position should match the one parsed from events', () => {
+            const fromApi = parseStrategiesAutomatedPosition(parseDataFromApiSubscription(record, ChainId.Ethereum));
+            expect(fromApi).to.not.equal(null);
+            expect(fromApi).to.eql(parseStrategiesAutomatedPosition(fromEvents));
+        });
+        it('Given a disabled record should keep it disabled', () => {
+            const parseData = parseDataFromApiSubscription(Object.assign(Object.assign({}, record), { is_enabled: false }), ChainId.Ethereum);
+            expect(parseData.strategiesSubsData.isEnabled).to.equal(false);
+        });
+    });
+});

package/esm/services/strategiesService.js

@@ -318,29 +318,12 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     return _position;
 }
 function parseAaveV3CollateralSwitch(position, parseData) {
-    const _position = cloneDeep(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = isEOA
-        ? subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subStruct.subData)
-        : subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
-    _position.strategy.strategyId = isEOA
-        ? Strategies.Identifiers.EoaCollateralSwitch
-        : Strategies.Identifiers.CollateralSwitch;
-    return _position;
-}
-function parseAaveV3DebtSwitch(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3DebtSwitchSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    // TODO -> This isn't enough for ID
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
@@ -1234,9 +1217,6 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-        [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
-        [Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-        [Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
         [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
         [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },

package/esm/services/strategiesService.test.js

@@ -8,102 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { expect } from 'chai';
-import { ChainId, ProtocolIdentifiers, RatioState, Strategies } from '../types/enums';
+import { ProtocolIdentifiers, Strategies } from '../types/enums';
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
 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 = [
@@ -173,7 +81,6 @@ describe('Feature: strategiesService.ts', () => {
                         subId: '379',
                         proxy: '0x9cb7e19861665366011899d74e75d4f2a419aeed',
                         subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
-                        // @ts-ignore
                         subStruct: {
                             strategyOrBundleId: '8',
                             isBundle: true,

package/esm/services/strategySubService.d.ts

@@ -62,8 +62,6 @@ export declare const aaveV3Encode: {
     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[])[];
     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

@@ -170,18 +170,6 @@ export const aaveV3Encode = {
         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);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
-    debtSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3DebtSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
 };
 export const compoundV2Encode = {
     leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {

package/esm/services/strategySubService.test.js

@@ -831,113 +831,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

@@ -259,30 +259,6 @@ export declare const aaveV3CollateralSwitchSubData: {
         amountToSwitch: string;
     };
 };
-export declare const aaveV3GenericFLCollateralSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
-    decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
-        marketAddr: EthereumAddress;
-        amountToSwitch: string;
-        user: EthereumAddress;
-    };
-};
-export declare const aaveV3DebtSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
-    decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
-        marketAddr: EthereumAddress;
-        amountToSwitch: string;
-        user: EthereumAddress;
-    };
-};
 export declare const aaveV3QuotePriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -542,70 +542,6 @@ export const aaveV3CollateralSwitchSubData = {
         };
     },
 };
-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);
-        const encodedUser = AbiCoder.encodeParameter('address', user);
-        return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUser,
-        ];
-    },
-    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]);
-        return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-        };
-    },
-};
-export const aaveV3DebtSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
-        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);
-        return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUser,
-        ];
-    },
-    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]);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
-        return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-        };
-    },
-};
 export const aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);

package/esm/services/subDataService.test.js

@@ -510,145 +510,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3DebtSwitchSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        fromAssetId: 1,
-                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        toAssetId: 3,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: '10000000000000000000',
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        fromAssetId: 3,
-                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        toAssetId: 1,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: MAXUINT,
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3DebtSwitchSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
-    describe('When testing subDataService.aaveV3GenericFLCollateralSwitchSubData', () => {
-        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 = [
-            ['10000000000000000000', '0x0000000000000000000000000000000000000000000000008ac7230489e80000'],
-            [MAXUINT, '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'],
-        ];
-        examples.forEach(([amountToSwitch, encodedAmount]) => {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                '0x0000000000000000000000000000000000000000000000000000000000000100',
-                '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                '0x000000000000000000000000000000000000000000000000000000000000ffff',
-                '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                encodedAmount,
-                '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-            ];
-            it(`encode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                expect(subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user)).to.eql(subData);
-            });
-            it(`decode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                expect(subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subData)).to.eql({
-                    fromAsset,
-                    fromAssetId: 256,
-                    toAsset,
-                    toAssetId: 65535,
-                    marketAddr,
-                    amountToSwitch,
-                    user,
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
         describe('encode()', () => {
             const examples = [