@defisaver/automation-sdk 3.3.10 → 3.3.11-aave-v4-dev

package/cjs/types/index.d.ts

@@ -197,8 +197,40 @@ export declare namespace Position {
             stopLossType: CloseToAssetType | undefined;
             takeProfitType: CloseToAssetType | undefined;
         }
+        interface SparkOnPrice extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            price: string;
+            ratioState: RatioState;
+            ratio: number;
+        }
+        interface CloseBase extends Base {
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
+        interface AaveV4LeverageManagementOnPrice extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            price: string;
+            ratioState: number;
+            ratio: number;
+        }
+        interface AaveV4CloseOnPrice extends CloseBase {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+        }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice | Specific.AaveV3CloseOnPriceGeneric;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice | Specific.AaveV3CloseOnPriceGeneric | Specific.AaveV4LeverageManagementOnPrice | Specific.AaveV4CloseOnPrice | Specific.SparkOnPrice;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/esm/constants/index.d.ts

@@ -1,6 +1,7 @@
 import type { ArbitrumBundleInfo, ArbitrumStrategiesInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, OptimismStrategiesInfo, BaseBundleInfo, BaseStrategiesInfo, StrategiesInfo } from '../types';
 import { ProtocolIdentifiers, Strategies, Bundles } from '../types/enums';
 export declare const ZERO_ADDRESS: EthereumAddress;
+export declare const EMPTY_SLOT: string;
 export declare const AAVE_V3_VARIABLE_BORROW_RATE = 2;
 export declare const PROTOCOLS: Record<keyof typeof ProtocolIdentifiers.StrategiesAutomation, Interfaces.Protocol>;
 export declare const LEGACY_PROTOCOLS: Record<keyof typeof ProtocolIdentifiers.LegacyAutomation, Interfaces.LegacyProtocol>;

package/esm/constants/index.js

@@ -3,6 +3,7 @@ import Protocol from '../automation/private/Protocol';
 import LegacyProtocol from '../automation/private/LegacyProtocol';
 // General
 export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+export const EMPTY_SLOT = '0x0000000000000000000000000000000000000000000000000000000000000000';
 export const AAVE_V3_VARIABLE_BORROW_RATE = 2;
 export const PROTOCOLS = (() => {
     const protocolsMapping = {};
@@ -100,6 +101,16 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
+        strategyId: Strategies.Identifiers.CollateralSwitch,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH_EOA]: {
+        strategyOrBundleId: Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH_EOA,
+        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
+        protocol: PROTOCOLS.AaveV4,
+    },
 };
 export const OPTIMISM_STRATEGIES_INFO = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -467,6 +478,66 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.CloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
+    [Bundles.MainnetIds.SPARK_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.BoostOnPrice,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.AAVE_V4_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.BoostOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_CLOSE,
+        strategyId: Strategies.Identifiers.CloseOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
+    [Bundles.MainnetIds.AAVE_V4_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.AaveV4,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/ethereumService.test.js

@@ -142,6 +142,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
+                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -187,6 +188,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
+                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,

package/esm/services/strategiesService.js

@@ -2,7 +2,7 @@ import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 import Web3 from 'web3';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
-import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, Strategies, } from '../types/enums';
 import { getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress, } from './utils';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
@@ -285,6 +285,96 @@ function parseAaveV3CollateralSwitch(position, parseData) {
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
+function parseAaveV4LeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.aaveV4RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4LeverageManagementSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
+        };
+    }
+    return _position;
+}
+function parseAaveV4LeverageManagementOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
+    _position.specific = {
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+        ratio: subData.targetRatio,
+    };
+    return _position;
+}
+function parseAaveV4CloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4CloseSubData.decode(subStruct.subData);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
+    };
+    return _position;
+}
+function parseAaveV4CollateralSwitch(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4CollateralSwitchSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCollateralSwitch : Strategies.Identifiers.CollateralSwitch;
+    return _position;
+}
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -584,6 +674,29 @@ function parseSparkLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseSparkLeverageManagementOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.specific = {
+        // subData
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        ratio: subData.targetRatio,
+        // triggerData
+        baseToken: triggerData.baseTokenAddr,
+        quoteToken: triggerData.quoteTokenAddr,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+    };
+    return _position;
+}
 function parseSparkCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -914,6 +1027,20 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
+        [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.Boost]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.RepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.BoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseAaveV4CloseOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
+        [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
+        [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
+    },
     [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
         [Strategies.Identifiers.Boost]: parseCompoundV2LeverageManagement,
@@ -944,6 +1071,8 @@ const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
         [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
         [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {

package/esm/services/strategySubService.d.ts

@@ -86,6 +86,19 @@ export declare const exchangeEncode: {
 };
 export declare const sparkEncode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
+    leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+        baseTokenAddr: EthereumAddress;
+        quoteTokenAddr: EthereumAddress;
+        price: number;
+        ratioState: RatioState;
+    }, subData: {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        marketAddr: EthereumAddress;
+        targetRatio: number;
+    }): (number | boolean | string[])[];
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
@@ -107,3 +120,9 @@ export declare const liquityV2Encode: {
 export declare const fluidEncode: {
     leverageManagement(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
 };
+export declare const aaveV4Encode: {
+    leverageManagement(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, targetRatio: number, price: string, priceState: RatioState, ratioState: RatioState): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, stopLossPrice?: string, stopLossType?: CloseToAssetType, takeProfitPrice?: string, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    collateralSwitch(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, amountToSwitch: string, price: string, ratioState: RatioState): (number | boolean | string[])[];
+};

package/esm/services/strategySubService.js

@@ -243,6 +243,13 @@ export const sparkEncode = {
         subInput = subInput.concat(boostEnabled ? '01' : '00');
         return subInput;
     },
+    leverageManagementOnPrice(strategyOrBundleId, isBundle = true, triggerData, subData) {
+        const { collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, } = subData;
+        const subDataEncoded = subDataService.sparkLeverageManagementOnPriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
+        const { baseTokenAddr, quoteTokenAddr, price, ratioState, } = triggerData;
+        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddr, quoteTokenAddr, price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
     closeOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
         const isBundle = true;
         const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
@@ -341,3 +348,32 @@ export const fluidEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
+export const aaveV4Encode = {
+    leverageManagement(strategyOrBundleId, owner, spoke, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.aaveV4LeverageManagementSubData.encode(spoke, owner, ratioState, targetRatio);
+        const triggerData = triggerService.aaveV4RatioTrigger.encode(owner, spoke, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    leverageManagementOnPrice(strategyOrBundleId, owner, spoke, collAsset, collAssetId, debtAsset, debtAssetId, targetRatio, price, priceState, ratioState) {
+        const isBundle = true;
+        const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.encode(spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio);
+        const triggerData = triggerService.aaveV4QuotePriceTrigger.encode(spoke, collAssetId, debtAssetId, price, priceState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    closeOnPrice(strategyOrBundleId, owner, spoke, collAsset, collAssetId, debtAsset, debtAssetId, stopLossPrice = '0', stopLossType = CloseToAssetType.DEBT, takeProfitPrice = '0', takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subData = subDataService.aaveV4CloseSubData.encode(spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, closeType);
+        const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.encode(spoke, collAssetId, debtAssetId, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    collateralSwitch(strategyOrBundleId, owner, spoke, fromAsset, fromAssetId, toAsset, toAssetId, amountToSwitch, price, ratioState) {
+        const isBundle = false;
+        const subData = subDataService.aaveV4CollateralSwitchSubData.encode(spoke, owner, fromAsset, fromAssetId, toAsset, toAssetId, amountToSwitch);
+        const triggerData = triggerService.aaveV4QuotePriceTrigger.encode(spoke, fromAssetId, // baseTokenId
+        toAssetId, // quoteTokenId
+        price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};

package/esm/services/strategySubService.test.js

@@ -5,7 +5,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, } from './strategySubService';
+import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
         // @ts-ignore // TODO - this requires change in @defisaver/tokens
@@ -1453,4 +1453,233 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
+    describe('When testing strategySubService.sparkEncode', () => {
+        describe('leverageManagement()', () => {
+            const examples = [
+                [
+                    '0x0000000000000000136dcc951d8c00000000000000000000214e8348c4f0000000000000000000001d24b2dfac52000000000000000000001a5e27eef13e000001',
+                    [140, 240, 210, 190, true]
+                ],
+                [
+                    '0x0000000000000000130337bdce49000000000000000000001988fe4052b800000000000000000000281b57b028e1000000000000000000002223acf76376000000',
+                    [137, 184, 289, 246, false]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('leverageManagementOnPrice()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        59,
+                        true,
+                        {
+                            baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                            quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                            price: 2500,
+                            ratioState: RatioState.UNDER,
+                        },
+                        {
+                            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                            collAssetId: 0,
+                            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                            debtAssetId: 1,
+                            marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                            targetRatio: 200,
+                        },
+                    ]
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_BOOST_ON_PRICE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000417bce6c8000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ]
+                    ],
+                    [
+                        60,
+                        true,
+                        {
+                            baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                            quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                            price: 45000,
+                            ratioState: RatioState.OVER,
+                        },
+                        {
+                            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                            collAssetId: 2,
+                            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                            debtAssetId: 4,
+                            marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                            targetRatio: 250,
+                        },
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.leverageManagementOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('closeOnPrice()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_CLOSE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000003a35294400000000000000000000000000000000000000000000000000000000574fbde6000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ]
+                    ],
+                    [
+                        57,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        4,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        40000,
+                        CloseToAssetType.DEBT,
+                        60000,
+                        CloseToAssetType.COLLATERAL,
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing strategySubService.aaveV4Encode', () => {
+        describe('leverageManagement()', () => {
+            const examples = [
+                [
+                    [1, true, ["0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001"], ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000014d1120d7b160000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]],
+                    [
+                        1,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        RatioState.UNDER,
+                        150,
+                        120,
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4Encode.leverageManagement(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('leverageManagementOnPrice()', () => {
+            const examples = [
+                [
+                    [2, true, ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000"], ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000016345785d8a00000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]],
+                    [
+                        2,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        20,
+                        160,
+                        '1500',
+                        RatioState.OVER,
+                        RatioState.OVER, // ratioState - UNDER for repay, OVER for boost
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('closeOnPrice()', () => {
+            const examples = [
+                [
+                    [3, true, ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae000000000000000000000000000000000000000000000000000000000000000000000"], ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000003", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]],
+                    [
+                        3,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        20,
+                        '1400',
+                        CloseToAssetType.DEBT,
+                        '0',
+                        CloseToAssetType.COLLATERAL
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4Encode.closeOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('collateralSwitch()', () => {
+            const examples = [
+                [
+                    [4, false, ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000001"], ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]],
+                    [
+                        4,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        20,
+                        '1000000000000000000',
+                        '1500',
+                        RatioState.UNDER,
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV4Encode.collateralSwitch(...actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });