@defisaver/automation-sdk 1.2.27 → 1.2.28

package/esm/constants/index.js

@@ -202,6 +202,26 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.Boost,
         protocol: PROTOCOLS.Liquity,
     },
+    [Bundles.MainnetIds.SPARK_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
+        strategyId: Strategies.Identifiers.CloseToDebt,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
+        strategyId: Strategies.Identifiers.CloseToCollateral,
+        protocol: PROTOCOLS.Spark,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -284,6 +284,56 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.specific.mergeWithSameId = true;
     return _position;
 }
+function parseSparkLeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            minRatio: triggerData.ratio,
+            minOptimalRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+        };
+    }
+    else {
+        _position.specific = {
+            maxRatio: triggerData.ratio,
+            maxOptimalRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.specific.mergeWithSameId = true;
+    return _position;
+}
+function parseSparkCloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+    _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.baseTokenAddress,
+        quoteToken: triggerData.quoteTokenAddress,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+    };
+    const { ratioState } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+    _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -324,6 +374,12 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.Dca]: parseExchangeDca,
         [Strategies.Identifiers.LimitOrder]: parseExchangeLimitOrder,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
+        [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+    },
 };
 function getParsingMethod(id, strategy) {
     return parsingMethodsMapping[id][strategy.strategyId];

package/esm/services/strategySubService.d.ts

@@ -39,3 +39,17 @@ export declare const exchangeEncode: {
     dca(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: number): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds)[];
     limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string, orderType: number): string[];
 };
+export declare const sparkEncode: {
+    leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string;
+    closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+        baseTokenAddress: EthereumAddress;
+        quoteTokenAddress: EthereumAddress;
+        price: number;
+        ratioState: RatioState;
+    }, subData: {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+    }): (number | boolean | string[])[];
+};

package/esm/services/strategySubService.js

@@ -130,3 +130,25 @@ export const exchangeEncode = {
         return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
     },
 };
+export const sparkEncode = {
+    leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        let subInput = '0x';
+        subInput = subInput.concat(new Dec(minRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new Dec(maxRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new Dec(maxOptimalRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new Dec(minOptimalRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(boostEnabled ? '01' : '00');
+        return subInput;
+    },
+    closeToAsset(strategyOrBundleId, isBundle = true, triggerData, subData) {
+        const { collAsset, collAssetId, debtAsset, debtAssetId, } = subData;
+        const subDataEncoded = subDataService.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+        const { baseTokenAddress, quoteTokenAddress, price, ratioState, } = triggerData;
+        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+};

package/esm/services/subDataService.d.ts

@@ -95,3 +95,17 @@ export declare const exchangeLimitOrderSubData: {
         amount: string;
     };
 };
+export declare const sparkLeverageManagementSubData: {
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
+export declare const sparkQuotePriceSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+    };
+};

package/esm/services/subDataService.js

@@ -226,3 +226,29 @@ export const exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
+export const sparkLeverageManagementSubData = {
+    decode(subData) {
+        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
+        const targetRatio = weiToRatioPercentage(ratioWei);
+        return { targetRatio };
+    },
+};
+export const sparkQuotePriceSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
+        const encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
+        const encodedCollId = mockedWeb3.eth.abi.encodeParameter('uint8', collAssetId);
+        const encodedDebt = mockedWeb3.eth.abi.encodeParameter('address', debtAsset);
+        const encodedDebtId = mockedWeb3.eth.abi.encodeParameter('uint8', debtAssetId);
+        const encodedNullAddress = mockedWeb3.eth.abi.encodeParameter('address', nullAddress);
+        return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+    },
+    decode(subData) {
+        const collAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[0]);
+        const collAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[1]));
+        const debtAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[3]));
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId,
+        };
+    },
+};

package/esm/services/triggerService.d.ts

@@ -112,3 +112,21 @@ export declare const exchangeOffchainPriceTrigger: {
         goodUntil: any;
     };
 };
+export declare const sparkRatioTrigger: {
+    encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        owner: string;
+        market: string;
+        ratio: number;
+        ratioState: number;
+    };
+};
+export declare const sparkQuotePriceTrigger: {
+    encode(baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        baseTokenAddress: EthereumAddress;
+        quoteTokenAddress: EthereumAddress;
+        price: string;
+        ratioState: RatioState;
+    };
+};

package/esm/services/triggerService.js

@@ -189,3 +189,36 @@ export const exchangeOffchainPriceTrigger = {
         };
     },
 };
+export const sparkRatioTrigger = {
+    encode(owner, market, ratioPercentage, ratioState) {
+        const ratioWei = ratioPercentageToWei(ratioPercentage);
+        return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            owner: decodedData[0],
+            market: decodedData[1],
+            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};
+export const sparkQuotePriceTrigger = {
+    encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
+        // Price is always in 8 decimals
+        const _price = new Dec(price.toString()).mul(Math.pow(10, 8)).floor().toString();
+        return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+        // Price is always in 8 decimals
+        const price = new Dec(decodedData[2]).div(Math.pow(10, 8)).toDP(8).toString();
+        return {
+            price,
+            baseTokenAddress: decodedData[0],
+            quoteTokenAddress: decodedData[1],
+            ratioState: +decodedData[3],
+        };
+    },
+};

package/esm/types/enums.d.ts

@@ -27,7 +27,8 @@ export declare namespace ProtocolIdentifiers {
         CompoundV3 = "Compound__V3",
         AaveV3 = "Aave__V3",
         MorphoAaveV2 = "Morpho-Aave__V2",
-        Exchange = "Exchange"
+        Exchange = "Exchange",
+        Spark = "Spark"
     }
     enum LegacyAutomation {
         MakerDAO = "MakerDAO",
@@ -100,7 +101,11 @@ export declare namespace Bundles {
         MORPHO_AAVE_V2_REPAY = 14,
         MORPHO_AAVE_V2_BOOST = 15,
         LIQUITY_REPAY = 16,
-        LIQUITY_BOOST = 17
+        LIQUITY_BOOST = 17,
+        SPARK_REPAY = 18,
+        SPARK_BOOST = 19,
+        SPARK_CLOSE_TO_DEBT = 20,
+        SPARK_CLOSE_TO_COLLATERAL = 21
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -33,6 +33,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["AaveV3"] = "Aave__V3";
         StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
         StrategiesAutomation["Exchange"] = "Exchange";
+        StrategiesAutomation["Spark"] = "Spark";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -115,6 +116,10 @@ export var Bundles;
         MainnetIds[MainnetIds["MORPHO_AAVE_V2_BOOST"] = 15] = "MORPHO_AAVE_V2_BOOST";
         MainnetIds[MainnetIds["LIQUITY_REPAY"] = 16] = "LIQUITY_REPAY";
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
+        MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
+        MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
+        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = 20] = "SPARK_CLOSE_TO_DEBT";
+        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = 21] = "SPARK_CLOSE_TO_COLLATERAL";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.2.27",
+  "version": "1.2.28",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -218,6 +218,26 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.Liquity,
   },
+  [Bundles.MainnetIds.SPARK_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
+    strategyId: Strategies.Identifiers.CloseToDebt,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
+    strategyId: Strategies.Identifiers.CloseToCollateral,
+    protocol: PROTOCOLS.Spark,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/strategiesService.ts

@@ -388,6 +388,76 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+function parseSparkLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      minRatio: triggerData.ratio,
+      minOptimalRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      maxRatio: triggerData.ratio,
+      maxOptimalRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  _position.specific.mergeWithSameId = true;
+
+  return _position;
+}
+
+function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+
+  _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.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    ratioState: triggerData.ratioState,
+  };
+
+  const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
+    _position.specific.ratioState,
+    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
+    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
+    parseData.chainId,
+  );
+
+  _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+
+  return _position;
+}
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -428,6 +498,12 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Dca]: parseExchangeDca,
     [Strategies.Identifiers.LimitOrder]: parseExchangeLimitOrder,
   },
+  [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
+    [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
+    [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
+    [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+  },
 };
 
 function getParsingMethod(id: ProtocolIdentifiers.StrategiesAutomation, strategy: BundleOrStrategy) {

package/src/services/strategySubService.ts

@@ -278,3 +278,49 @@ export const exchangeEncode = {
     return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
   },
 };
+
+export const sparkEncode = {
+  leverageManagement(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ) {
+    let subInput = '0x';
+
+    subInput = subInput.concat(new Dec(minRatio).mul(1e16).toHex().slice(2)
+      .padStart(32, '0'));
+    subInput = subInput.concat(new Dec(maxRatio).mul(1e16).toHex().slice(2)
+      .padStart(32, '0'));
+    subInput = subInput.concat(new Dec(maxOptimalRatio).mul(1e16).toHex().slice(2)
+      .padStart(32, '0'));
+    subInput = subInput.concat(new Dec(minOptimalRatio).mul(1e16).toHex().slice(2)
+      .padStart(32, '0'));
+    subInput = subInput.concat(boostEnabled ? '01' : '00');
+
+    return subInput;
+  },
+  closeToAsset(
+    strategyOrBundleId: number,
+    isBundle: boolean = true,
+    triggerData: {
+      baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState
+    },
+    subData: {
+      collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number,
+    },
+  ) {
+    const {
+      collAsset, collAssetId, debtAsset, debtAssetId,
+    } = subData;
+    const subDataEncoded = subDataService.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+
+    const {
+      baseTokenAddress, quoteTokenAddress, price, ratioState,
+    } = triggerData;
+    const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
+};

package/src/services/subDataService.ts

@@ -301,3 +301,43 @@ export const exchangeLimitOrderSubData = {
     return { fromToken, toToken, amount };
   },
 };
+
+export const sparkLeverageManagementSubData = { // TODO encode?
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+
+export const sparkQuotePriceSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    nullAddress: EthereumAddress = ZERO_ADDRESS,
+  ): SubData {
+    const encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
+    const encodedCollId = mockedWeb3.eth.abi.encodeParameter('uint8', collAssetId);
+
+    const encodedDebt = mockedWeb3.eth.abi.encodeParameter('address', debtAsset);
+    const encodedDebtId = mockedWeb3.eth.abi.encodeParameter('uint8', debtAssetId);
+
+    const encodedNullAddress = mockedWeb3.eth.abi.encodeParameter('address', nullAddress);
+
+    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+  },
+  decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
+    const collAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[1]));
+
+    const debtAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[3]));
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId,
+    };
+  },
+};

package/src/services/triggerService.ts

@@ -236,3 +236,45 @@ export const exchangeOffchainPriceTrigger = {
     };
   },
 };
+
+export const sparkRatioTrigger = {
+  encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+  },
+  decode(triggerData: TriggerData) {
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as string[];
+    return {
+      owner: decodedData[0],
+      market: decodedData[1],
+      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
+      ratioState: Number(decodedData[3]),
+    };
+  },
+};
+
+export const sparkQuotePriceTrigger = {
+  encode(
+    baseTokenAddress: EthereumAddress,
+    quoteTokenAddress: EthereumAddress,
+    price: number,
+    ratioState: RatioState,
+  ) {
+    // Price is always in 8 decimals
+    const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState } {
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as Array<string>;
+    // Price is always in 8 decimals
+    const price = new Dec(decodedData[2]).div(10 ** 8).toDP(8).toString();
+    return {
+      price,
+      baseTokenAddress: decodedData[0],
+      quoteTokenAddress: decodedData[1],
+      ratioState: +decodedData[3],
+    };
+  },
+};

package/src/types/enums.ts

@@ -31,6 +31,7 @@ export namespace ProtocolIdentifiers {
     AaveV3 = 'Aave__V3',
     MorphoAaveV2 = 'Morpho-Aave__V2',
     Exchange = 'Exchange',
+    Spark = 'Spark',
   }
 
   export enum LegacyAutomation {
@@ -110,6 +111,10 @@ export namespace Bundles {
     MORPHO_AAVE_V2_BOOST = 15,
     LIQUITY_REPAY = 16,
     LIQUITY_BOOST = 17,
+    SPARK_REPAY = 18,
+    SPARK_BOOST = 19,
+    SPARK_CLOSE_TO_DEBT = 20,
+    SPARK_CLOSE_TO_COLLATERAL = 21,
   }
 
   export enum OptimismIds {

package/umd/index.js

@@ -308,6 +308,26 @@ var MAINNET_BUNDLES_INFO = {
     strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.LIQUITY_BOOST,
     strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.Liquity
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_REPAY]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_REPAY,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.Spark
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_BOOST]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_BOOST,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.Spark
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToDebt,
+    protocol: PROTOCOLS.Spark
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToCollateral,
+    protocol: PROTOCOLS.Spark
   }
 };
 var OPTIMISM_BUNDLES_INFO = {
@@ -415,6 +435,7 @@ var ProtocolIdentifiers;
     StrategiesAutomation["AaveV3"] = "Aave__V3";
     StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
     StrategiesAutomation["Exchange"] = "Exchange";
+    StrategiesAutomation["Spark"] = "Spark";
   })(StrategiesAutomation || (StrategiesAutomation = {}));
   _ProtocolIdentifiers.StrategiesAutomation = StrategiesAutomation;
   var LegacyAutomation;
@@ -504,6 +525,10 @@ var Bundles;
     MainnetIds[MainnetIds["MORPHO_AAVE_V2_BOOST"] = 15] = "MORPHO_AAVE_V2_BOOST";
     MainnetIds[MainnetIds["LIQUITY_REPAY"] = 16] = "LIQUITY_REPAY";
     MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
+    MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
+    MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
+    MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = 20] = "SPARK_CLOSE_TO_DEBT";
+    MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = 21] = "SPARK_CLOSE_TO_COLLATERAL";
   })(MainnetIds || (MainnetIds = {}));
   _Bundles.MainnetIds = MainnetIds;
   var OptimismIds;
@@ -1780,6 +1805,64 @@ function parseLiquityLeverageManagement(position, parseData) {
   _position.specific.mergeWithSameId = true;
   return _position;
 }
+function parseSparkLeverageManagement(position, parseData) {
+  var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
+  var {
+    subStruct,
+    subId
+  } = parseData.subscriptionEventData;
+  var {
+    isEnabled
+  } = parseData.strategiesSubsData;
+  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.sparkRatioTrigger.decode(subStruct.triggerData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.sparkLeverageManagementSubData.decode(subStruct.subData);
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay;
+  if (isRepay) {
+    _position.specific = {
+      minRatio: triggerData.ratio,
+      minOptimalRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId)
+    };
+  } else {
+    _position.specific = {
+      maxRatio: triggerData.ratio,
+      maxOptimalRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId)
+    };
+  }
+  _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
+  _position.specific.mergeWithSameId = true;
+  return _position;
+}
+function parseSparkCloseOnPrice(position, parseData) {
+  var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
+  var {
+    subStruct
+  } = parseData.subscriptionEventData;
+  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.sparkQuotePriceSubData.decode(subStruct.subData);
+  _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.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    ratioState: triggerData.ratioState
+  };
+  var {
+    ratioState
+  } = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0,_utils__WEBPACK_IMPORTED_MODULE_4__.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0,_utils__WEBPACK_IMPORTED_MODULE_4__.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+  _position.strategy.strategyId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.isRatioStateOver)(ratioState) ? _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.TakeProfit : _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.StopLoss;
+  return _position;
+}
 var parsingMethodsMapping = {
   [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1819,6 +1902,12 @@ var parsingMethodsMapping = {
   [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.Exchange]: {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Dca]: parseExchangeDca,
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.LimitOrder]: parseExchangeLimitOrder
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.Spark]: {
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice
   }
 };
 function getParsingMethod(id, strategy) {
@@ -19096,7 +19185,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "makerCloseSubData": () => (/* binding */ makerCloseSubData),
 /* harmony export */   "makerLeverageManagementSubData": () => (/* binding */ makerLeverageManagementSubData),
 /* harmony export */   "makerRepayFromSavingsSubData": () => (/* binding */ makerRepayFromSavingsSubData),
-/* harmony export */   "morphoAaveV2LeverageManagementSubData": () => (/* binding */ morphoAaveV2LeverageManagementSubData)
+/* harmony export */   "morphoAaveV2LeverageManagementSubData": () => (/* binding */ morphoAaveV2LeverageManagementSubData),
+/* harmony export */   "sparkLeverageManagementSubData": () => (/* binding */ sparkLeverageManagementSubData),
+/* harmony export */   "sparkQuotePriceSubData": () => (/* binding */ sparkQuotePriceSubData)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -19353,6 +19444,39 @@ var exchangeLimitOrderSubData = {
     };
   }
 };
+var sparkLeverageManagementSubData = {
+  // TODO encode?
+  decode(subData) {
+    var ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
+    var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.weiToRatioPercentage)(ratioWei);
+    return {
+      targetRatio
+    };
+  }
+};
+var sparkQuotePriceSubData = {
+  encode(collAsset, collAssetId, debtAsset, debtAssetId) {
+    var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_4__.ZERO_ADDRESS;
+    var encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
+    var encodedCollId = mockedWeb3.eth.abi.encodeParameter('uint8', collAssetId);
+    var encodedDebt = mockedWeb3.eth.abi.encodeParameter('address', debtAsset);
+    var encodedDebtId = mockedWeb3.eth.abi.encodeParameter('uint8', debtAssetId);
+    var encodedNullAddress = mockedWeb3.eth.abi.encodeParameter('address', nullAddress);
+    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+  },
+  decode(subData) {
+    var collAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[0]);
+    var collAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[1]));
+    var debtAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[2]);
+    var debtAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[3]));
+    return {
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId
+    };
+  }
+};
 
 /***/ }),
 /* 30 */
@@ -28870,6 +28994,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "liquityRatioTrigger": () => (/* binding */ liquityRatioTrigger),
 /* harmony export */   "makerRatioTrigger": () => (/* binding */ makerRatioTrigger),
 /* harmony export */   "morphoAaveV2RatioTrigger": () => (/* binding */ morphoAaveV2RatioTrigger),
+/* harmony export */   "sparkQuotePriceTrigger": () => (/* binding */ sparkQuotePriceTrigger),
+/* harmony export */   "sparkRatioTrigger": () => (/* binding */ sparkRatioTrigger),
 /* harmony export */   "trailingStopTrigger": () => (/* binding */ trailingStopTrigger)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
@@ -29082,6 +29208,39 @@ var exchangeOffchainPriceTrigger = {
     };
   }
 };
+var sparkRatioTrigger = {
+  encode(owner, market, ratioPercentage, ratioState) {
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.ratioPercentageToWei)(ratioPercentage);
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
+  },
+  decode(triggerData) {
+    var decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      owner: decodedData[0],
+      market: decodedData[1],
+      ratio: new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
+      ratioState: Number(decodedData[3])
+    };
+  }
+};
+var sparkQuotePriceTrigger = {
+  encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
+    // Price is always in 8 decimals
+    var _price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(price.toString()).mul(10 ** 8).floor().toString();
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
+  },
+  decode(triggerData) {
+    var decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    // Price is always in 8 decimals
+    var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[2]).div(10 ** 8).toDP(8).toString();
+    return {
+      price,
+      baseTokenAddress: decodedData[0],
+      quoteTokenAddress: decodedData[1],
+      ratioState: +decodedData[3]
+    };
+  }
+};
 
 /***/ }),
 /* 247 */
@@ -29148,7 +29307,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "exchangeEncode": () => (/* binding */ exchangeEncode),
 /* harmony export */   "liquityEncode": () => (/* binding */ liquityEncode),
 /* harmony export */   "makerEncode": () => (/* binding */ makerEncode),
-/* harmony export */   "morphoAaveV2Encode": () => (/* binding */ morphoAaveV2Encode)
+/* harmony export */   "morphoAaveV2Encode": () => (/* binding */ morphoAaveV2Encode),
+/* harmony export */   "sparkEncode": () => (/* binding */ sparkEncode)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -29295,6 +29455,37 @@ var exchangeEncode = {
     return _subDataService__WEBPACK_IMPORTED_MODULE_3__.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
   }
 };
+var sparkEncode = {
+  leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+    var subInput = '0x';
+    subInput = subInput.concat(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minRatio).mul(1e16).toHex().slice(2).padStart(32, '0'));
+    subInput = subInput.concat(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxRatio).mul(1e16).toHex().slice(2).padStart(32, '0'));
+    subInput = subInput.concat(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxOptimalRatio).mul(1e16).toHex().slice(2).padStart(32, '0'));
+    subInput = subInput.concat(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minOptimalRatio).mul(1e16).toHex().slice(2).padStart(32, '0'));
+    subInput = subInput.concat(boostEnabled ? '01' : '00');
+    return subInput;
+  },
+  closeToAsset(strategyOrBundleId) {
+    var isBundle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    var triggerData = arguments.length > 2 ? arguments[2] : undefined;
+    var subData = arguments.length > 3 ? arguments[3] : undefined;
+    var {
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId
+    } = subData;
+    var subDataEncoded = _subDataService__WEBPACK_IMPORTED_MODULE_3__.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
+    var {
+      baseTokenAddress,
+      quoteTokenAddress,
+      price,
+      ratioState
+    } = triggerData;
+    var triggerDataEncoded = _triggerService__WEBPACK_IMPORTED_MODULE_4__.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  }
+};
 
 /***/ })
 /******/ 	]);