@defisaver/automation-sdk 3.3.18 → 3.3.19-sub-fetching.1-dev

package/esm/services/strategySubService.test.js

@@ -1453,6 +1453,224 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('leverageManagementGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.leverageManagementGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('liquidationProtection()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.liquidationProtection(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('liquidationProtectionGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.liquidationProtectionGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('leverageManagementOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+                        2500,
+                        RatioState.UNDER,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        200,
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000417bce6c8000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+                        45000,
+                        RatioState.OVER,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        4,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        250,
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('closeOnPrice()', () => {
             const examples = [
                 [
@@ -1491,6 +1709,44 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('closeOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_CLOSE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000003a35294400000000000000000000000000000000000000000000000000000000574fbde6000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        4,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        40000,
+                        CloseToAssetType.DEBT,
+                        60000,
+                        CloseToAssetType.COLLATERAL,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('collateralSwitch()', () => {
             const examples = [
                 // WETH -> cbBTC, price 0.025 WETH/cbBTC, state UNDER
@@ -1590,6 +1846,45 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('collateralSwitchGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+                        false,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf00000000000000000000000000000000000000000000000000000000002625a00000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                            '0x0000000000000000000000000000000000000000000000000000000000000007',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '10000000000000000000',
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        0.025,
+                        RatioState.UNDER,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.collateralSwitchGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.aaveV4Encode', () => {
         describe('leverageManagement()', () => {

package/esm/services/subDataService.d.ts

@@ -468,6 +468,20 @@ export declare const sparkLiquidationProtectionSubData: {
         ratioState: RatioState;
     };
 };
+export declare const sparkGenericLeverageManagementSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
+export declare const sparkGenericLiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const sparkCloseGenericSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -491,6 +505,18 @@ export declare const sparkLeverageManagementOnPriceSubData: {
         targetRatio: number;
     };
 };
+export declare const sparkLeverageManagementOnPriceGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: string;
+        collAssetId: number;
+        debtAsset: string;
+        debtAssetId: number;
+        marketAddr: string;
+        targetRatio: number;
+        user: string;
+    };
+};
 export declare const sparkCollateralSwitchSubData: {
     encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
     decode(subData: string[]): {
@@ -502,6 +528,18 @@ export declare const sparkCollateralSwitchSubData: {
         amountToSwitch: string;
     };
 };
+export declare const sparkGenericFLCollateralSwitchSubData: {
+    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;
+    };
+};
 /**
   ______ .______     ____    ____  __    __       _______. _______
  /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \

package/esm/services/subDataService.js

@@ -933,6 +933,21 @@ export const sparkLeverageManagementSubData = {
     },
 };
 export const sparkLiquidationProtectionSubData = sparkLeverageManagementSubData;
+export const sparkGenericLeverageManagementSubData = {
+    encode(targetRatio, ratioState, market, user) {
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedUser = AbiCoder.encodeParameter('address', user);
+        return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
+    },
+    decode(subData) {
+        const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[0])));
+        const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        return { targetRatio, ratioState };
+    },
+};
+export const sparkGenericLiquidationProtectionSubData = sparkGenericLeverageManagementSubData;
 export const sparkCloseGenericSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);
@@ -989,6 +1004,33 @@ export const sparkLeverageManagementOnPriceSubData = {
         };
     },
 };
+export const sparkLeverageManagementOnPriceGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        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 encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedUser = AbiCoder.encodeParameter('address', user);
+        return [
+            encodedColl, encodedCollId, encodedDebt, encodedDebtId,
+            encodedMarket, encodedTargetRatio, encodedUser,
+        ];
+    },
+    decode(subData) {
+        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 marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[5])));
+        const user = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user,
+        };
+    },
+};
 export const sparkCollateralSwitchSubData = {
     encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
         const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
@@ -1020,6 +1062,38 @@ export const sparkCollateralSwitchSubData = {
         };
     },
 };
+export const sparkGenericFLCollateralSwitchSubData = {
+    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,
+        };
+    },
+};
 /**
   ______ .______     ____    ____  __    __       _______. _______
  /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \