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

package/src/services/strategySubService.ts

@@ -424,52 +424,33 @@ export const aaveV3Encode = {
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 
-  collateralSwitch(
-    strategyOrBundleId: number,
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    state: RatioState,
-  ) {
-    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(
+  instantCloseOnPriceGeneric(
     strategyOrBundleId: number,
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
     marketAddr: EthereumAddress,
-    amountToSwitch: string,
     user: EthereumAddress,
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    state: RatioState,
+    tsi: string,
+    slippage: string,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
   ) {
-    const isBundle = false;
+    const isBundle = true;
+    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
 
-    const subDataEncoded = subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+    const subDataEncoded = subDataService.aaveV3InstantCloseGenericSubData.encode(
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage,
     );
-    const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+    const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 
-  debtSwitch(
+  collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,
     fromAssetId: number,
@@ -477,7 +458,6 @@ export const aaveV3Encode = {
     toAssetId: number,
     marketAddr: EthereumAddress,
     amountToSwitch: string,
-    user: EthereumAddress,
     baseTokenAddress: EthereumAddress,
     quoteTokenAddress: EthereumAddress,
     price: number,
@@ -485,7 +465,7 @@ export const aaveV3Encode = {
   ) {
     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/src/services/subDataService.test.ts

@@ -549,155 +549,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[SubData, [fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress]]> = [
-        // 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', // 10 tokens
-            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, // MaxUint256
-            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: Array<[{ fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress }, SubData]> = [
-        // 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: 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: Array<[SubData, [fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean]]> = [
@@ -2644,6 +2495,104 @@ describe('Feature: subDataService.ts', () => {
       });
     });
   });
+
+  describe("When testing subDataService.aaveV3InstantCloseGenericSubData", () => {
+    const WETH = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
+    const USDC = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
+    const MARKET = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
+    const USER = web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890');
+
+    const examples: Array<
+      [
+        string[],
+        [
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          closeType: CloseStrategyType,
+          marketAddr: EthereumAddress,
+          user: EthereumAddress,
+          tsi: string,
+          slippage: string
+        ]
+      ]
+    > = [
+      // TAKE_PROFIT_IN_COLLATERAL, zero tsi and slippage
+      [
+        [
+          '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+          '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+          '0x0000000000000000000000000000000000000000000000000000000000000001',
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+          '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+          '0x0000000000000000000000001234567890123456789012345678901234567890',
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+        ],
+        [WETH, 0, USDC, 1, CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL, MARKET, USER, '0', '0'],
+      ],
+      // STOP_LOSS_IN_DEBT
+      [
+        [
+          '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+          '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+          '0x0000000000000000000000000000000000000000000000000000000000000001',
+          '0x0000000000000000000000000000000000000000000000000000000000000003',
+          '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+          '0x0000000000000000000000001234567890123456789012345678901234567890',
+          '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+          '0x000000000000000000000000000000000000000000000000002386f26fc10000',
+        ],
+        [WETH, 0, USDC, 1, CloseStrategyType.STOP_LOSS_IN_DEBT, MARKET, USER, '1000000000000000000', '10000000000000000'],
+      ],
+      // TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, asset ids above uint8 range
+      [
+        [
+          '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          '0x000000000000000000000000000000000000000000000000000000000000012c',
+          '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+          '0x0000000000000000000000000000000000000000000000000000000000000190',
+          '0x0000000000000000000000000000000000000000000000000000000000000007',
+          '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+          '0x0000000000000000000000001234567890123456789012345678901234567890',
+          '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
+          '0x0000000000000000000000000000000000000000000000000011c37937e08000',
+        ],
+        [WETH, 300, USDC, 400, CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, MARKET, USER, '50000000000000000', '5000000000000000'],
+      ],
+    ];
+
+    describe("encode()", () => {
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(
+          actual
+        )} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(
+            subDataService.aaveV3InstantCloseGenericSubData.encode(...actual)
+          ).to.eql(expected);
+        });
+      });
+    });
+
+    describe("decode()", () => {
+      examples.forEach(([encoded, [collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage]]) => {
+        const expected = {
+          collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner: user, tsi, slippage,
+        };
+
+        it(`Given ${JSON.stringify(
+          encoded
+        )} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(
+            subDataService.aaveV3InstantCloseGenericSubData.decode(encoded)
+          ).to.eql(expected);
+        });
+      });
+    });
+  });
   describe('When testing subDataService.sparkLeverageManagementOnPriceSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]] > = 

package/src/services/subDataService.ts

@@ -687,106 +687,68 @@ export const aaveV3CloseGenericSubData = {
     };
   },
 };
-export const aaveV3CollateralSwitchSubData = {
+export const aaveV3InstantCloseGenericSubData = {
   encode(
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    useOnBehalf: boolean = false,
-  ): SubData {
-    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: SubData): {
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-  } {
-    const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-    const toAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
-    const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
-
-    return {
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
-    };
-  },
-};
-export const aaveV3GenericFLCollateralSwitchSubData = {
-  encode(
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
     marketAddr: EthereumAddress,
-    amountToSwitch: string,
     user: EthereumAddress,
+    tsi: string,
+    slippage: string,
   ): SubData {
-    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 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: SubData): {
-    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,
   } {
-    const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const fromAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
-    const toAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const toAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
-    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
-    const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
-    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+    const tsi = AbiCoder.decodeParameter('uint256', subData[7]) as unknown as string;
+    const slippage = AbiCoder.decodeParameter('uint256', subData[8]) as unknown as string;
 
     return {
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
     };
   },
 };
-
-export const aaveV3DebtSwitchSubData = {
+export const aaveV3CollateralSwitchSubData = {
   encode(
     fromAsset: EthereumAddress,
     fromAssetId: number,
@@ -794,7 +756,7 @@ export const aaveV3DebtSwitchSubData = {
     toAssetId: number,
     marketAddr: EthereumAddress,
     amountToSwitch: string,
-    user: EthereumAddress,
+    useOnBehalf: boolean = false,
   ): SubData {
     const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
     const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
@@ -802,7 +764,7 @@ export const aaveV3DebtSwitchSubData = {
     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,
@@ -811,7 +773,7 @@ export const aaveV3DebtSwitchSubData = {
       encodedToAssetId,
       encodedMarketAddr,
       encodedAmountToSwitch,
-      encodedUser,
+      encodedUseOnBehalf,
     ];
   },
   decode(subData: SubData): {
@@ -821,7 +783,6 @@ export const aaveV3DebtSwitchSubData = {
     toAssetId: number,
     marketAddr: EthereumAddress,
     amountToSwitch: string,
-    user: EthereumAddress,
   } {
     const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
     const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
@@ -829,10 +790,9 @@ export const aaveV3DebtSwitchSubData = {
     const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
     const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
     const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
-    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
 
     return {
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
     };
   },
 };

package/src/types/enums.ts

@@ -102,36 +102,24 @@ export namespace Strategies {
     AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
     SPARK_COLLATERAL_SWITCH = 156,
     SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
-    AAVE_V3_DEBT_SWITCH = 168,
-    AAVE_V3_DEBT_SWITCH_EOA = 169,
-    AAVE_V3_COLLATERAL_SWITCH_EOA = 170,
   }
 
   export enum OptimismIds {
     EXCHANGE_DCA = 8,
     EXCHANGE_LIMIT_ORDER = 9,
     AAVE_V3_COLLATERAL_SWITCH = 24,
-    AAVE_V3_DEBT_SWITCH = 25,
-    AAVE_V3_DEBT_SWITCH_EOA = 26,
-    AAVE_V3_COLLATERAL_SWITCH_EOA = 27,
   }
 
   export enum BaseIds {
     EXCHANGE_DCA = 8,
     EXCHANGE_LIMIT_ORDER = 9,
     AAVE_V3_COLLATERAL_SWITCH = 56,
-    AAVE_V3_DEBT_SWITCH = 61,
-    AAVE_V3_DEBT_SWITCH_EOA = 62,
-    AAVE_V3_COLLATERAL_SWITCH_EOA = 63,
   }
 
   export enum ArbitrumIds {
     EXCHANGE_DCA = 8,
     EXCHANGE_LIMIT_ORDER = 9,
     AAVE_V3_COLLATERAL_SWITCH = 50,
-    AAVE_V3_DEBT_SWITCH = 55,
-    AAVE_V3_DEBT_SWITCH_EOA = 56,
-    AAVE_V3_COLLATERAL_SWITCH_EOA = 57,
   }
 
   export enum Identifiers {
@@ -150,6 +138,8 @@ export namespace Strategies {
     CloseOnPriceToColl = 'close-on-price-to-collateral',
     CloseOnPrice = 'close-on-price',
     EoaCloseOnPrice = 'eoa-close-on-price',
+    InstantCloseOnPrice = 'instant-close-on-price',
+    EoaInstantCloseOnPrice = 'eoa-instant-close-on-price',
     TrailingStopToColl = 'trailing-stop-to-collateral',
     TrailingStopToDebt = 'trailing-stop-to-debt',
     Rebond = 'rebond',
@@ -166,8 +156,6 @@ export namespace Strategies {
     EoaRepayOnPrice = 'eoa-repay-on-price',
     CollateralSwitch = 'collateral-switch',
     EoaCollateralSwitch = 'eoa-collateral-switch',
-    DebtSwitch = 'debt-switch',
-    EoaDebtSwitch = 'eoa-debt-switch',
     LiquidationProtection = 'liquidation-protection',
     EoaLiquidationProtection = 'liquidation-protection-eoa',
   }
@@ -280,6 +268,8 @@ export namespace Bundles {
     SPARK_EOA_BOOST_ON_PRICE = 91,
     SPARK_EOA_CLOSE = 92,
     SPARK_EOA_LIQUIDATION_PROTECTION = 93,
+    AAVE_V3_SW_INSTANT_CLOSE = 94,
+    AAVE_V3_EOA_INSTANT_CLOSE = 95,
   }
 
   export enum OptimismIds {
@@ -296,6 +286,9 @@ export namespace Bundles {
     AAVE_V3_EOA_CLOSE = 10,
     AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
     AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
+    // TODO -> Fix ids
+    AAVE_V3_SW_INSTANT_CLOSE = 13,
+    AAVE_V3_EOA_INSTANT_CLOSE = 14,
   }
 
   export enum BaseIds {
@@ -339,6 +332,8 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
     MORPHO_BLUE_EOA_CLOSE = 41,
     MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
+    AAVE_V3_SW_INSTANT_CLOSE = 43,
+    AAVE_V3_EOA_INSTANT_CLOSE = 44,
   }
 
   export enum ArbitrumIds {
@@ -382,5 +377,7 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
     MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
     MORPHO_BLUE_EOA_CLOSE = 39,
+    AAVE_V3_SW_INSTANT_CLOSE = 40,
+    AAVE_V3_EOA_INSTANT_CLOSE = 41,
   }
 }