@defisaver/automation-sdk 3.3.21-instant-twap-close-dev → 3.3.21

package/src/services/strategiesService.test.ts

@@ -1,13 +1,10 @@
 import { expect } from 'chai';
 
-import {
-  Bundles, CloseStrategyType, CloseToAssetType, ProtocolIdentifiers, Strategies,
-} from '../types/enums';
+import { ProtocolIdentifiers, Strategies } from '../types/enums';
 import type { ParseData, Position } from '../types';
 
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
-import { aaveV3Encode } from './strategySubService';
 
 describe('Feature: strategiesService.ts', () => {
   describe('When testing strategiesService.parseStrategiesAutomatedPosition', async () => {
@@ -79,7 +76,6 @@ describe('Feature: strategiesService.ts', () => {
             subId: '379',
             proxy: '0x9cb7e19861665366011899d74e75d4f2a419aeed',
             subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
-            // @ts-ignore
             subStruct:
               {
                 strategyOrBundleId: '8',
@@ -106,78 +102,4 @@ describe('Feature: strategiesService.ts', () => {
       });
     });
   });
-
-  describe('When parsing Aave V3 instant close bundles', () => {
-    const owner = '0x1234567890123456789012345678901234567890';
-    const market = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
-    const weth = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-    const usdc = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
-
-    const bundles: Array<[string, Bundles.MainnetIds, Strategies.Identifiers]> = [
-      ['SW', Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE, Strategies.Identifiers.InstantCloseOnPrice],
-      ['EOA', Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE, Strategies.Identifiers.EoaInstantCloseOnPrice],
-    ];
-
-    bundles.forEach(([walletType, expectedBundleId, expectedStrategyId]) => {
-      describe(`${walletType} bundle`, () => {
-        const [bundleId, isBundle, triggerData, subData] = aaveV3Encode.instantCloseOnPriceGeneric(
-          expectedBundleId,
-          weth, 0, usdc, 1, market, owner,
-          '1000000000000000000', '10000000000000000',
-          1500, CloseToAssetType.DEBT, 5000, CloseToAssetType.COLLATERAL,
-        );
-
-        const parseData = {
-          chainId: 1,
-          blockNumber: 1,
-          subscriptionEventData: {
-            subId: '1',
-            proxy: owner,
-            subHash: '0xhash',
-            subStruct: {
-              strategyOrBundleId: String(bundleId), isBundle, triggerData, subData,
-            },
-          },
-          strategiesSubsData: { userProxy: owner, isEnabled: true, strategySubHash: '0xhash' },
-        } as unknown as ParseData;
-
-        const result = parseStrategiesAutomatedPosition(parseData) as Position.Automated;
-
-        it('should identify the strategy as instant close on price', () => {
-          expect(result.strategy.strategyOrBundleId).to.equal(expectedBundleId);
-          expect(result.strategy.strategyId).to.equal(expectedStrategyId);
-          expect(result.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
-        });
-
-        it('should decode sub data including tsi and slippage', () => {
-          expect(result.strategyData.decoded.subData).to.eql({
-            collAsset: weth,
-            collAssetId: 0,
-            debtAsset: usdc,
-            debtAssetId: 1,
-            closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
-            marketAddr: market,
-            owner,
-            tsi: '1000000000000000000',
-            slippage: '10000000000000000',
-          });
-        });
-
-        it('should fill specific with prices and close types', () => {
-          expect(result.specific).to.eql({
-            collAsset: weth,
-            collAssetId: 0,
-            debtAsset: usdc,
-            debtAssetId: 1,
-            baseToken: weth,
-            quoteToken: usdc,
-            stopLossPrice: '1500',
-            takeProfitPrice: '5000',
-            stopLossType: CloseToAssetType.DEBT,
-            takeProfitType: CloseToAssetType.COLLATERAL,
-          });
-        });
-      });
-    });
-  });
 });

package/src/services/strategiesService.ts

@@ -433,37 +433,6 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
   return _position;
 }
 
-function parseAaveV3InstantCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3InstantCloseGenericSubData.decode(subStruct.subData);
-
-  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.specific = {
-    collAsset: subData.collAsset,
-    collAssetId: subData.collAssetId,
-    debtAsset: subData.debtAsset,
-    debtAssetId: subData.debtAssetId,
-    baseToken: triggerData.collToken,
-    quoteToken: triggerData.debtToken,
-    stopLossPrice: triggerData.lowerPrice,
-    takeProfitPrice: triggerData.upperPrice,
-    stopLossType,
-    takeProfitType,
-  };
-
-  return _position;
-}
-
 function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -1627,8 +1596,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
-    [Strategies.Identifiers.InstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
-    [Strategies.Identifiers.EoaInstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
     [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,

package/src/services/strategySubService.test.ts

@@ -887,136 +887,6 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
-    describe('instantCloseOnPriceGeneric()', () => {
-      const examples: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [
-          strategyOrBundleId: number,
-          collAsset: EthereumAddress,
-          collAssetId: number,
-          debtAsset: EthereumAddress,
-          debtAssetId: number,
-          marketAddr: EthereumAddress,
-          user: EthereumAddress,
-          tsi: string,
-          slippage: string,
-          stopLossPrice: number,
-          stopLossType: CloseToAssetType,
-          takeProfitPrice: number,
-          takeProfitType: CloseToAssetType
-        ]
-      ]> = [
-        // Stop loss only (to debt)
-        [
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            true,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x0000000000000000000000000000000000000000000000000000000000000003',
-              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-              '0x0000000000000000000000001234567890123456789012345678901234567890',
-              '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-              '0x000000000000000000000000000000000000000000000000002386f26fc10000',
-            ],
-          ],
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            0,
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1,
-            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-            '1000000000000000000', // tsi
-            '10000000000000000', // slippage
-            1500, // stopLossPrice
-            CloseToAssetType.DEBT, // stopLossType
-            0, // takeProfitPrice
-            CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
-          ]
-        ],
-        // Take profit only (to collateral), zero tsi and slippage
-        [
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            true,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-              '0x0000000000000000000000001234567890123456789012345678901234567890',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
-          ],
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            0,
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1,
-            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-            '0', // tsi
-            '0', // slippage
-            0, // stopLossPrice
-            CloseToAssetType.DEBT, // stopLossType (not used since price is 0)
-            5000, // takeProfitPrice
-            CloseToAssetType.COLLATERAL, // takeProfitType
-          ]
-        ],
-        // Take profit (to debt) and stop loss (to collateral)
-        [
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            true,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-              '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x0000000000000000000000000000000000000000000000000000000000000007',
-              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-              '0x0000000000000000000000001234567890123456789012345678901234567890',
-              '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
-              '0x0000000000000000000000000000000000000000000000000011c37937e08000',
-            ],
-          ],
-          [
-            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            0,
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1,
-            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
-            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
-            '50000000000000000', // tsi
-            '5000000000000000', // slippage
-            1500, // stopLossPrice
-            CloseToAssetType.COLLATERAL, // stopLossType
-            4000, // takeProfitPrice
-            CloseToAssetType.DEBT, // takeProfitType
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(aaveV3Encode.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
-        });
-      });
-    });
-
     describe('collateralSwitch()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],

package/src/services/strategySubService.ts

@@ -424,32 +424,6 @@ export const aaveV3Encode = {
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 
-  instantCloseOnPriceGeneric(
-    strategyOrBundleId: number,
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    marketAddr: EthereumAddress,
-    user: EthereumAddress,
-    tsi: string,
-    slippage: string,
-    stopLossPrice: number = 0,
-    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
-    takeProfitPrice: number = 0,
-    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
-  ) {
-    const isBundle = true;
-    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
-
-    const subDataEncoded = subDataService.aaveV3InstantCloseGenericSubData.encode(
-      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage,
-    );
-    const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
-
-    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-  },
-
   collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,

package/src/services/subDataService.test.ts

@@ -2495,104 +2495,6 @@ 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,67 +687,6 @@ export const aaveV3CloseGenericSubData = {
     };
   },
 };
-export const aaveV3InstantCloseGenericSubData = {
-  encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    closeType: CloseStrategyType,
-    marketAddr: EthereumAddress,
-    user: EthereumAddress,
-    tsi: string,
-    slippage: string,
-  ): SubData {
-    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 [
-      encodedColl,
-      encodedCollId,
-      encodedDebt,
-      encodedDebtId,
-      encodedCloseType,
-      encodedMarket,
-      encodedUser,
-      encodedTsi,
-      encodedSlippage,
-    ];
-  },
-
-  decode(subData: SubData): {
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    closeType: CloseStrategyType,
-    marketAddr: EthereumAddress,
-    owner: EthereumAddress,
-    tsi: string,
-    slippage: string,
-  } {
-    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 {
-      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
-    };
-  },
-};
 export const aaveV3CollateralSwitchSubData = {
   encode(
     fromAsset: EthereumAddress,

package/src/types/enums.ts

@@ -138,8 +138,6 @@ 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',
@@ -268,8 +266,6 @@ 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 {

package/src/types/index.ts

@@ -1,7 +1,7 @@
 import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
-import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
+import type { StrategyModel } from './contracts/generated/SubStorage';
 import type {
   ChainId, Strategies, Bundles, ProtocolIdentifiers,
   RatioState,
@@ -72,6 +72,22 @@ interface _SubscriptionOptions {
 
 export type SubscriptionOptions = Partial<_SubscriptionOptions>;
 
+/** Subscription record as returned by the automation API (GET /v1/subscriptions) */
+export interface ApiSubscriptionRecord {
+  id: number,
+  wallet: EthereumAddress,
+  wallet_type: string,
+  is_enabled: boolean,
+  is_bundle: boolean,
+  strategy_or_bundle_id: number,
+  strategy_ids: number[],
+  sub_data_hash: string,
+  trigger_data: string[],
+  sub_data: string[],
+  block_number: number,
+  additional_triggers: string[] | null,
+}
+
 export declare namespace Interfaces {
   interface ProtocolBase {
     id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation,
@@ -369,10 +385,18 @@ export type StrategyOrBundleIds =
   | typeof Bundles.ArbitrumIds[keyof typeof Bundles.ArbitrumIds]
   | typeof Bundles.BaseIds[keyof typeof Bundles.BaseIds];
 
+/** Fields of the Subscribe event that parsing relies on */
+export interface SubscriptionEventData {
+  subId: string,
+  proxy: EthereumAddress,
+  subHash: string,
+  subStruct: StrategyModel.StrategySubStructOutputStruct,
+}
+
 export interface ParseData {
   chainId: ChainId,
   blockNumber: BlockNumber,
-  subscriptionEventData: Subscribe['returnValues']
+  subscriptionEventData: SubscriptionEventData,
   strategiesSubsData: StrategyModel.StoredSubDataStructOutputStruct,
 }