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

package/src/services/strategySubService.test.ts

@@ -1002,137 +1002,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: Array<[RatioState, string, string, string]> = [
-        [
-          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: SubData = [
-            '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: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [
-          strategyOrBundleId: number,
-          fromAsset: EthereumAddress,
-          fromAssetId: number,
-          toAsset: EthereumAddress,
-          toAssetId: number,
-          marketAddr: EthereumAddress,
-          amountToSwitch: string,
-          user: EthereumAddress,
-          baseTokenAddress: EthereumAddress,
-          quoteTokenAddress: EthereumAddress,
-          price: number,
-          state: RatioState,
-        ]
-      ]> = [
-        // 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', // 10 tokens
-            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, // MaxUint256
-            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', () => {

package/src/services/strategySubService.ts

@@ -444,52 +444,6 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-
-  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,
-  ) {
-    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: number,
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    user: EthereumAddress,
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    state: RatioState,
-  ) {
-    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 = {

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]]> = [

package/src/services/subDataService.ts

@@ -735,107 +735,6 @@ export const aaveV3CollateralSwitchSubData = {
     };
   },
 };
-export const aaveV3GenericFLCollateralSwitchSubData = {
-  encode(
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    user: EthereumAddress,
-  ): 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 encodedUser = AbiCoder.encodeParameter('address', user);
-
-    return [
-      encodedFromAsset,
-      encodedFromAssetId,
-      encodedToAsset,
-      encodedToAssetId,
-      encodedMarketAddr,
-      encodedAmountToSwitch,
-      encodedUser,
-    ];
-  },
-  decode(subData: SubData): {
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    user: EthereumAddress,
-  } {
-    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;
-
-    return {
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-    };
-  },
-};
-
-export const aaveV3DebtSwitchSubData = {
-  encode(
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
-    marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    user: EthereumAddress,
-  ): 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 encodedUser = AbiCoder.encodeParameter('address', user);
-
-    return [
-      encodedFromAsset,
-      encodedFromAssetId,
-      encodedToAsset,
-      encodedToAssetId,
-      encodedMarketAddr,
-      encodedAmountToSwitch,
-      encodedUser,
-    ];
-  },
-  decode(subData: SubData): {
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    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]));
-    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;
-    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
-
-    return {
-      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
-    };
-  },
-};
 export const aaveV3QuotePriceSubData = {
   encode(
     collAsset: EthereumAddress,

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 {
@@ -166,8 +154,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',
   }

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,
 }