@defisaver/automation-sdk 3.3.2-dev.3 → 3.3.2-dev.5

package/cjs/services/strategiesService.js

@@ -192,14 +192,17 @@ function parseAaveV3LeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-    // TODO -> should change this?
-    const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+    }
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    // TODO -> check if this change breaks something?
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    // TODO -> check if this change breaks something?
     const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
@@ -207,8 +210,8 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.EoaBoost,
             subHashRepay: subHash,
-            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -217,11 +220,88 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            subHashBoost: subHash,
             mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
-    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
+    if (!isEOA) {
+        _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    }
+    else {
+        _position.strategy.strategyId = enums_1.Strategies.IdOverrides.EoaLeverageManagement;
+    }
+    return _position;
+}
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    }
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    _position.specific = {
+        collAsset: subData.collAsset,
+        debtAsset: subData.debtAsset,
+        baseToken: triggerData.baseTokenAddress,
+        quoteToken: triggerData.quoteTokenAddress,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+        debtAssetId: subData.debtAssetId,
+        collAssetId: subData.collAssetId,
+        ratio: subData.targetRatio,
+    };
+    return _position;
+}
+function parseAaveV3CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+    if (isEOA) {
+        const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3CloseGenericSubData.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.collToken,
+            quoteToken: triggerData.debtToken,
+            stopLossPrice: triggerData.lowerPrice,
+            takeProfitPrice: triggerData.upperPrice,
+        };
+        _position.strategy.strategyId = enums_1.Strategies.Identifiers.EoaCloseOnPrice;
+    }
+    else {
+        const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3QuotePriceSubData.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 } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+        _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState)
+            ? enums_1.Strategies.IdOverrides.TakeProfit
+            : enums_1.Strategies.IdOverrides.StopLoss;
+    }
     return _position;
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
@@ -255,36 +335,6 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseAaveV3CloseOnPrice(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    // TODO -> should prob be quote price range trigger?
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    // TODO -> should change this?
-    const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
-    _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 } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    // TODO -> Check if those changes break something?
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    _position.strategy.strategyId = isEOA
-        ? enums_1.Strategies.Identifiers.EoaCloseOnPrice
-        : (_position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState)
-            ? enums_1.Strategies.IdOverrides.TakeProfit
-            : enums_1.Strategies.IdOverrides.StopLoss);
-    return _position;
-}
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -709,30 +759,6 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
-function parseAaveV3LeverageManagementOnPrice(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
-    _position.specific = {
-        collAsset: subData.collAsset,
-        debtAsset: subData.debtAsset,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
-        price: triggerData.price,
-        ratioState: triggerData.ratioState,
-        debtAssetId: subData.debtAssetId,
-        collAssetId: subData.collAssetId,
-        ratio: subData.targetRatio,
-    };
-    // // TODO -> check if this change breaks something?
-    // const isEOA = _position.strategy.strategyId.includes('eoa');
-    // _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
-    return _position;
-}
 function parseLiquityV2CloseOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;

package/cjs/services/subDataService.d.ts

@@ -67,7 +67,7 @@ export declare const aaveV3LeverageManagementOnPriceGeneric: {
         debtAssetId: number;
         marketAddr: EthereumAddress;
         targetRatio: number;
-        user: EthereumAddress;
+        owner: EthereumAddress;
     };
 };
 export declare const aaveV3CloseGenericSubData: {
@@ -79,7 +79,7 @@ export declare const aaveV3CloseGenericSubData: {
         debtAssetId: number;
         closeType: CloseStrategyType;
         marketAddr: EthereumAddress;
-        user: EthereumAddress;
+        owner: EthereumAddress;
     };
 };
 export declare const aaveV3QuotePriceSubData: {

package/cjs/services/subDataService.js

@@ -172,7 +172,7 @@ exports.aaveV3LeverageManagementOnPriceGeneric = {
         const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
         const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
+        const owner = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
         return {
             collAsset,
             collAssetId,
@@ -180,7 +180,7 @@ exports.aaveV3LeverageManagementOnPriceGeneric = {
             debtAssetId,
             marketAddr,
             targetRatio,
-            user,
+            owner,
         };
     },
 };
@@ -210,9 +210,9 @@ exports.aaveV3CloseGenericSubData = {
         const debtAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[3]));
         const closeType = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[4]));
         const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[5]);
-        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
+        const owner = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
         return {
-            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user,
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
         };
     },
 };

package/cjs/types/index.d.ts

@@ -120,6 +120,16 @@ export declare namespace Position {
             price: string;
             ratioState: RatioState;
         }
+        interface AaveV3CloseOnPriceGeneric extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+        }
         interface BoostOnPriceAave extends CloseOnPriceAave {
             ratio: number;
         }
@@ -188,7 +198,7 @@ export declare namespace Position {
             takeProfitType: CloseToAssetType | undefined;
         }
     }
-    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;
+    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;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/esm/services/strategiesService.js

@@ -163,14 +163,17 @@ function parseAaveV3LeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-    // TODO -> should change this?
-    const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+    }
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    // TODO -> check if this change breaks something?
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    // TODO -> check if this change breaks something?
     const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
@@ -178,8 +181,8 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.EoaBoost,
             subHashRepay: subHash,
-            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -188,11 +191,88 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            subHashBoost: subHash,
             mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
-    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
+    if (!isEOA) {
+        _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    }
+    else {
+        _position.strategy.strategyId = Strategies.IdOverrides.EoaLeverageManagement;
+    }
+    return _position;
+}
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    }
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    _position.specific = {
+        collAsset: subData.collAsset,
+        debtAsset: subData.debtAsset,
+        baseToken: triggerData.baseTokenAddress,
+        quoteToken: triggerData.quoteTokenAddress,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+        debtAssetId: subData.debtAssetId,
+        collAssetId: subData.collAssetId,
+        ratio: subData.targetRatio,
+    };
+    return _position;
+}
+function parseAaveV3CloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+    if (isEOA) {
+        const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3CloseGenericSubData.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.collToken,
+            quoteToken: triggerData.debtToken,
+            stopLossPrice: triggerData.lowerPrice,
+            takeProfitPrice: triggerData.upperPrice,
+        };
+        _position.strategy.strategyId = Strategies.Identifiers.EoaCloseOnPrice;
+    }
+    else {
+        const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3QuotePriceSubData.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;
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
@@ -226,36 +306,6 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseAaveV3CloseOnPrice(position, parseData) {
-    const _position = cloneDeep(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    // TODO -> should prob be quote price range trigger?
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    // TODO -> should change this?
-    const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
-    _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);
-    // TODO -> Check if those changes break something?
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    _position.strategy.strategyId = isEOA
-        ? Strategies.Identifiers.EoaCloseOnPrice
-        : (_position.strategy.strategyId = isRatioStateOver(ratioState)
-            ? Strategies.IdOverrides.TakeProfit
-            : Strategies.IdOverrides.StopLoss);
-    return _position;
-}
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -680,30 +730,6 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
-function parseAaveV3LeverageManagementOnPrice(position, parseData) {
-    const _position = cloneDeep(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
-    _position.strategyData.decoded.triggerData = triggerData;
-    _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
-    _position.specific = {
-        collAsset: subData.collAsset,
-        debtAsset: subData.debtAsset,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
-        price: triggerData.price,
-        ratioState: triggerData.ratioState,
-        debtAssetId: subData.debtAssetId,
-        collAssetId: subData.collAssetId,
-        ratio: subData.targetRatio,
-    };
-    // // TODO -> check if this change breaks something?
-    // const isEOA = _position.strategy.strategyId.includes('eoa');
-    // _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
-    return _position;
-}
 function parseLiquityV2CloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;

package/esm/services/subDataService.d.ts

@@ -67,7 +67,7 @@ export declare const aaveV3LeverageManagementOnPriceGeneric: {
         debtAssetId: number;
         marketAddr: EthereumAddress;
         targetRatio: number;
-        user: EthereumAddress;
+        owner: EthereumAddress;
     };
 };
 export declare const aaveV3CloseGenericSubData: {
@@ -79,7 +79,7 @@ export declare const aaveV3CloseGenericSubData: {
         debtAssetId: number;
         closeType: CloseStrategyType;
         marketAddr: EthereumAddress;
-        user: EthereumAddress;
+        owner: EthereumAddress;
     };
 };
 export declare const aaveV3QuotePriceSubData: {

package/esm/services/subDataService.js

@@ -166,7 +166,7 @@ export const aaveV3LeverageManagementOnPriceGeneric = {
         const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
         const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
         const targetRatio = weiToRatioPercentage(weiRatio);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
         return {
             collAsset,
             collAssetId,
@@ -174,7 +174,7 @@ export const aaveV3LeverageManagementOnPriceGeneric = {
             debtAssetId,
             marketAddr,
             targetRatio,
-            user,
+            owner,
         };
     },
 };
@@ -204,9 +204,9 @@ export const aaveV3CloseGenericSubData = {
         const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
         const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
         const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
         return {
-            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user,
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
         };
     },
 };

package/esm/types/index.d.ts

@@ -120,6 +120,16 @@ export declare namespace Position {
             price: string;
             ratioState: RatioState;
         }
+        interface AaveV3CloseOnPriceGeneric extends Base {
+            collAsset: EthereumAddress;
+            collAssetId: number;
+            debtAsset: EthereumAddress;
+            debtAssetId: number;
+            baseToken: EthereumAddress;
+            quoteToken: EthereumAddress;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+        }
         interface BoostOnPriceAave extends CloseOnPriceAave {
             ratio: number;
         }
@@ -188,7 +198,7 @@ export declare namespace Position {
             takeProfitType: CloseToAssetType | undefined;
         }
     }
-    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;
+    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;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.2-dev.3",
+  "version": "3.3.2-dev.5",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/services/strategiesService.ts

@@ -235,18 +235,19 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-  // TODO -> should change this?
-  const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  let subData;
+  if (isEOA) {
+    subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+  } else {
+    subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  }
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
 
-  // TODO -> check if this change breaks something?
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-
-  // TODO -> check if this change breaks something?
   const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
   if (isRepay) {
@@ -255,8 +256,8 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.EoaBoost,
       subHashRepay: subHash,
-      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -264,12 +265,109 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      subHashBoost: subHash,
       mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
+  if (!isEOA) {
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  } else {
+    _position.strategy.strategyId = Strategies.IdOverrides.EoaLeverageManagement;
+  }
+
+  return _position;
+}
+
+function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  let subData;
+  if (isEOA) {
+    subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
+  } else {
+    subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+  }
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    debtAsset: subData.debtAsset,
+    baseToken: triggerData.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    ratioState: triggerData.ratioState,
+    debtAssetId: subData.debtAssetId,
+    collAssetId: subData.collAssetId,
+    ratio: subData.targetRatio,
+  };
+
+  return _position;
+}
+
+function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+
+  if (isEOA) {
+    const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3CloseGenericSubData.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.collToken,
+      quoteToken: triggerData.debtToken,
+      stopLossPrice: triggerData.lowerPrice,
+      takeProfitPrice: triggerData.upperPrice,
+    };
+
+    _position.strategy.strategyId = Strategies.Identifiers.EoaCloseOnPrice;
+  } else {
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3QuotePriceSubData.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;
+  }
 
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
   return _position;
 }
 
@@ -312,50 +410,6 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
   return _position;
 }
 
-function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  // TODO -> should prob be quote price range trigger?
-  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-  // TODO -> should change this?
-  const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
-
-  _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,
-  );
-
-  // TODO -> Check if those changes break something?
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-  _position.strategy.strategyId = isEOA
-    ? Strategies.Identifiers.EoaCloseOnPrice
-    : (_position.strategy.strategyId = isRatioStateOver(ratioState)
-      ? Strategies.IdOverrides.TakeProfit
-      : Strategies.IdOverrides.StopLoss);
-
-  return _position;
-}
-
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -929,37 +983,6 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
   return _position;
 }
 
-function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
-
-  _position.specific = {
-    collAsset: subData.collAsset,
-    debtAsset: subData.debtAsset,
-    baseToken: triggerData.baseTokenAddress,
-    quoteToken: triggerData.quoteTokenAddress,
-    price: triggerData.price,
-    ratioState: triggerData.ratioState,
-    debtAssetId: subData.debtAssetId,
-    collAssetId: subData.collAssetId,
-    ratio: subData.targetRatio,
-  };
-
-  // // TODO -> check if this change breaks something?
-  // const isEOA = _position.strategy.strategyId.includes('eoa');
-  // _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
-
-  return _position;
-}
-
 function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 

package/src/services/subDataService.ts

@@ -236,7 +236,7 @@ export const aaveV3LeverageManagementOnPriceGeneric = {
     debtAssetId: number,
     marketAddr: EthereumAddress,
     targetRatio: number,
-    user: EthereumAddress,
+    owner: EthereumAddress,
   } {
     const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
     const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
@@ -247,7 +247,7 @@ export const aaveV3LeverageManagementOnPriceGeneric = {
     const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
-    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
 
     return {
       collAsset,
@@ -256,7 +256,7 @@ export const aaveV3LeverageManagementOnPriceGeneric = {
       debtAssetId,
       marketAddr,
       targetRatio,
-      user,
+      owner,
     };
   },
 };
@@ -297,7 +297,7 @@ export const aaveV3CloseGenericSubData = {
     debtAssetId: number,
     closeType: CloseStrategyType,
     marketAddr: EthereumAddress,
-    user: EthereumAddress,
+    owner: EthereumAddress,
   } {
     const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
     const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
@@ -305,10 +305,10 @@ export const aaveV3CloseGenericSubData = {
     const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
     const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
     const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
-    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
 
     return {
-      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user,
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
     };
   },
 };

package/src/types/index.ts

@@ -166,6 +166,18 @@ export declare namespace Position {
       price: string,
       ratioState: RatioState,
     }
+
+    interface AaveV3CloseOnPriceGeneric extends Base {
+      collAsset: EthereumAddress,
+      collAssetId: number,
+      debtAsset: EthereumAddress,
+      debtAssetId: number,
+      baseToken: EthereumAddress,
+      quoteToken: EthereumAddress,
+      stopLossPrice: string,
+      takeProfitPrice: string,
+    }
+
     interface BoostOnPriceAave extends CloseOnPriceAave {
       ratio: number,
     }
@@ -260,7 +272,8 @@ export declare namespace Position {
     | Specific.BoostOnPriceLiquityV2
     | Specific.PaybackLiquityV2
     | Specific.CompoundV3LeverageManagementOnPrice
-    | Specific.CompoundV3CloseOnPrice;
+    | Specific.CompoundV3CloseOnPrice
+    | Specific.AaveV3CloseOnPriceGeneric;
 
   export interface Automated {
     chainId: ChainId,