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

package/src/services/subDataService.ts

@@ -1249,6 +1249,27 @@ export const sparkLeverageManagementSubData = {
 
 export const sparkLiquidationProtectionSubData = sparkLeverageManagementSubData;
 
+export const sparkGenericLeverageManagementSubData = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+    market: EthereumAddress,
+    user: EthereumAddress,
+  ): SubData {
+    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: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[0])));
+    const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[1])) as RatioState;
+    return { targetRatio, ratioState };
+  },
+};
+
+export const sparkGenericLiquidationProtectionSubData = sparkGenericLeverageManagementSubData;
 
 export const sparkCloseGenericSubData = {
   encode(
@@ -1339,6 +1360,41 @@ export const sparkLeverageManagementOnPriceSubData = {
     };
   },
 };
+export const sparkLeverageManagementOnPriceGenericSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+    user: EthereumAddress,
+  ): 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 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: SubData) {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as any as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as any as EthereumAddress;
+    const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[5])));
+    const user = AbiCoder.decodeParameter('address', subData[6]) as any as EthereumAddress;
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user,
+    };
+  },
+};
 export const sparkCollateralSwitchSubData = {
   encode(
     fromAsset: EthereumAddress,
@@ -1388,6 +1444,57 @@ export const sparkCollateralSwitchSubData = {
   },
 };
 
+export const sparkGenericFLCollateralSwitchSubData = {
+  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,
+    };
+  },
+};
+
 
 /**
   ______ .______     ____    ____  __    __       _______. _______

package/src/types/enums.ts

@@ -5,6 +5,13 @@ export enum ChainId {
   Base = 8453,
 }
 
+export enum SubscriptionStatus {
+  Active = 'active',
+  Disabled = 'disabled',
+  Finished = 'finished',
+  Invalid = 'invalid',
+}
+
 export enum RatioState {
   OVER = 0,
   UNDER = 1,
@@ -101,6 +108,7 @@ export namespace Strategies {
     AAVE_V4_COLLATERAL_SWITCH = 154,
     AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
     SPARK_COLLATERAL_SWITCH = 156,
+    SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
   }
 
   export enum OptimismIds {
@@ -259,6 +267,12 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_BOOST_ON_PRICE = 85,
     MORPHO_BLUE_EOA_REPAY_ON_PRICE = 86,
     MORPHO_BLUE_EOA_CLOSE = 87,
+    SPARK_EOA_REPAY = 88,
+    SPARK_EOA_BOOST = 89,
+    SPARK_EOA_REPAY_ON_PRICE = 90,
+    SPARK_EOA_BOOST_ON_PRICE = 91,
+    SPARK_EOA_CLOSE = 92,
+    SPARK_EOA_LIQUIDATION_PROTECTION = 93,
   }
 
   export enum OptimismIds {

package/src/types/index.ts

@@ -1,11 +1,12 @@
 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,
   CloseToAssetType,
+  SubscriptionStatus,
 } from './enums';
 
 export type PlaceholderType = any; // TODO - fix any types
@@ -72,6 +73,24 @@ 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,
+  invalid: boolean,
+  status: SubscriptionStatus,
+  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,
@@ -301,6 +320,8 @@ export declare namespace Position {
     subId: number,
     subIds?: number[],
     isEnabled?: boolean,
+    /** Set only for subscriptions parsed from the automation API */
+    status?: SubscriptionStatus,
     subHash: string,
     blockNumber: BlockNumber,
     protocol: Interfaces.Protocol,
@@ -369,10 +390,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,
 }