@defisaver/automation-sdk 3.3.22-instant-twap-close-dev → 3.3.23

package/src/services/subDataService.ts

@@ -687,68 +687,55 @@ export const aaveV3CloseGenericSubData = {
     };
   },
 };
-export const aaveV3InstantCloseGenericSubData = {
+export const aaveV3CollateralSwitchSubData = {
   encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    closeType: CloseStrategyType,
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
     marketAddr: EthereumAddress,
-    user: EthereumAddress,
-    tsi: string,
-    slippage: string,
+    amountToSwitch: string,
+    useOnBehalf: boolean = false,
   ): 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);
+    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 [
-      encodedColl,
-      encodedCollId,
-      encodedDebt,
-      encodedDebtId,
-      encodedCloseType,
-      encodedMarket,
-      encodedUser,
-      encodedTsi,
-      encodedSlippage,
+      encodedFromAsset,
+      encodedFromAssetId,
+      encodedToAsset,
+      encodedToAssetId,
+      encodedMarketAddr,
+      encodedAmountToSwitch,
+      encodedUseOnBehalf,
     ];
   },
-
   decode(subData: SubData): {
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    closeType: CloseStrategyType,
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
     marketAddr: EthereumAddress,
-    owner: EthereumAddress,
-    tsi: string,
-    slippage: string,
+    amountToSwitch: 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;
+    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 {
-      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
+      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
     };
   },
 };
-export const aaveV3CollateralSwitchSubData = {
+export const aaveV3DebtSwitchSubData = {
   encode(
     fromAsset: EthereumAddress,
     fromAssetId: number,
@@ -756,7 +743,7 @@ export const aaveV3CollateralSwitchSubData = {
     toAssetId: number,
     marketAddr: EthereumAddress,
     amountToSwitch: string,
-    useOnBehalf: boolean = false,
+    user: EthereumAddress,
   ): SubData {
     const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
     const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
@@ -764,7 +751,7 @@ export const aaveV3CollateralSwitchSubData = {
     const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
     const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
     const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
-    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
+    const encodedUser = AbiCoder.encodeParameter('address', user);
 
     return [
       encodedFromAsset,
@@ -773,7 +760,7 @@ export const aaveV3CollateralSwitchSubData = {
       encodedToAssetId,
       encodedMarketAddr,
       encodedAmountToSwitch,
-      encodedUseOnBehalf,
+      encodedUser,
     ];
   },
   decode(subData: SubData): {
@@ -783,6 +770,7 @@ export const aaveV3CollateralSwitchSubData = {
     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]));
@@ -790,9 +778,10 @@ export const aaveV3CollateralSwitchSubData = {
     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,
+      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
     };
   },
 };

package/src/types/enums.ts

@@ -102,24 +102,32 @@ 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,
   }
 
   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,
   }
 
   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,
   }
 
   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,
   }
 
   export enum Identifiers {
@@ -138,8 +146,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',
@@ -156,6 +162,8 @@ 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',
   }
@@ -268,8 +276,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 {
@@ -286,9 +292,6 @@ 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 {
@@ -332,8 +335,6 @@ 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 {
@@ -377,7 +378,5 @@ 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,
   }
 }

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