@defisaver/automation-sdk 3.0.2-dev → 3.0.2-dev2

package/esm/automation/private/StrategiesAutomation.js

@@ -32,7 +32,9 @@ class StrategiesAutomation extends Automation_1.default {
     getEventFromSubStorage(event, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || 0)) {
+            // only used for backfilling, so in case options?.fromBlock in undefined
+            // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || this.subStorageContract.createdBlock.toString())) {
                 return [];
             }
             return (0, ethereumService_1.getEventsFromContract)(this.subStorageContract, this.subStorageContractFork, event, options);

package/esm/constants/index.d.ts

@@ -1,33 +1,12 @@
-import type { ArbitrumBundleInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, StrategiesInfo } from '../types';
+import type { ArbitrumBundleInfo, ArbitrumStrategiesInfo, BundlesInfo, EthereumAddress, Interfaces, MainnetBundleInfo, MainnetStrategiesInfo, OptimismBundleInfo, OptimismStrategiesInfo, StrategiesInfo } from '../types';
 import { ProtocolIdentifiers, Strategies, Bundles } from '../types/enums';
 export declare const ZERO_ADDRESS: EthereumAddress;
+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>;
 export declare const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo;
-export declare const OPTIMISM_STRATEGIES_INFO: {
-    8: {
-        strategyOrBundleId: Strategies.OptimismIds;
-        strategyId: Strategies.Identifiers;
-        protocol: Interfaces.Protocol;
-    };
-    9: {
-        strategyOrBundleId: Strategies.OptimismIds;
-        strategyId: Strategies.Identifiers;
-        protocol: Interfaces.Protocol;
-    };
-};
-export declare const ARBITRUM_STRATEGIES_INFO: {
-    8: {
-        strategyOrBundleId: Strategies.ArbitrumIds;
-        strategyId: Strategies.Identifiers;
-        protocol: Interfaces.Protocol;
-    };
-    9: {
-        strategyOrBundleId: Strategies.ArbitrumIds;
-        strategyId: Strategies.Identifiers;
-        protocol: Interfaces.Protocol;
-    };
-};
+export declare const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo;
+export declare const ARBITRUM_STRATEGIES_INFO: ArbitrumStrategiesInfo;
 export declare const STRATEGIES_INFO: StrategiesInfo;
 export declare const STRATEGY_IDS: {
     1: typeof Strategies.MainnetIds;

package/esm/constants/index.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BUNDLE_IDS = exports.BUNDLES_INFO = exports.ARBITRUM_BUNDLES_INFO = exports.OPTIMISM_BUNDLES_INFO = exports.MAINNET_BUNDLES_INFO = exports.STRATEGY_IDS = exports.STRATEGIES_INFO = exports.ARBITRUM_STRATEGIES_INFO = exports.OPTIMISM_STRATEGIES_INFO = exports.MAINNET_STRATEGIES_INFO = exports.LEGACY_PROTOCOLS = exports.PROTOCOLS = exports.ZERO_ADDRESS = void 0;
+exports.BUNDLE_IDS = exports.BUNDLES_INFO = exports.ARBITRUM_BUNDLES_INFO = exports.OPTIMISM_BUNDLES_INFO = exports.MAINNET_BUNDLES_INFO = exports.STRATEGY_IDS = exports.STRATEGIES_INFO = exports.ARBITRUM_STRATEGIES_INFO = exports.OPTIMISM_STRATEGIES_INFO = exports.MAINNET_STRATEGIES_INFO = exports.LEGACY_PROTOCOLS = exports.PROTOCOLS = exports.AAVE_V3_VARIABLE_BORROW_RATE = exports.ZERO_ADDRESS = void 0;
 const enums_1 = require("../types/enums");
 const Protocol_1 = __importDefault(require("../automation/private/Protocol"));
 const LegacyProtocol_1 = __importDefault(require("../automation/private/LegacyProtocol"));
 // General
 exports.ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+exports.AAVE_V3_VARIABLE_BORROW_RATE = 2;
 exports.PROTOCOLS = (() => {
     const protocolsMapping = {};
     Object.entries(enums_1.ProtocolIdentifiers.StrategiesAutomation).forEach(([id, value]) => {
@@ -90,6 +91,16 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.DebtInFrontRepay,
         protocol: exports.PROTOCOLS.Liquity,
     },
+    [enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK,
+        strategyId: enums_1.Strategies.Identifiers.Payback,
+        protocol: exports.PROTOCOLS.CrvUSD,
+    },
+    [enums_1.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -102,6 +113,11 @@ exports.OPTIMISM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
+    [enums_1.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_STRATEGIES_INFO = {
     [enums_1.Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -114,6 +130,11 @@ exports.ARBITRUM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
+    [enums_1.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
+        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromDebt,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.STRATEGIES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_STRATEGIES_INFO,
@@ -168,6 +189,26 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaBoost,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
     [enums_1.Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND,
         strategyId: enums_1.Strategies.Identifiers.BondProtection,
@@ -293,6 +334,21 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -315,6 +371,11 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CloseToCollateral,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -347,6 +408,11 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Repay,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/esm/services/strategiesService.js

@@ -333,8 +333,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     const subData = subDataDecoder.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    _position.owner = triggerData.owner.toLowerCase();
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
     const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
@@ -520,6 +519,7 @@ function parseCrvUSDLeverageManagement(position, parseData) {
     const subData = subDataService.crvUSDLeverageManagementSubData.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.controller);
     const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
     if (isRepay) {
         _position.specific = {
@@ -541,10 +541,20 @@ function parseCrvUSDLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseCrvUSDPayback(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.crvUsdHealthRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.crvUSDPaybackSubData.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.controller, Math.random());
+    _position.strategy.strategyId = enums_1.Strategies.Identifiers.Payback;
+    return _position;
+}
 function parseMorphoBlueLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
@@ -553,7 +563,8 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.marketId);
+    const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
@@ -574,8 +585,16 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
+function parseAaveV3OpenOrderFromCollateral(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    _position.strategyData.decoded.triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    _position.strategyData.decoded.subData = subDataService.aaveV3OpenOrderSubData.decode(subStruct.subData);
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
     return _position;
 }
 const parsingMethodsMapping = {
@@ -609,6 +628,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [enums_1.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
+        [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3OpenOrderFromCollateral,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -640,10 +660,13 @@ const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
+        [enums_1.Strategies.Identifiers.Payback]: parseCrvUSDPayback,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
         [enums_1.Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     },
 };
 function getParsingMethod(id, strategy) {

package/esm/services/strategySubService.d.ts

@@ -47,6 +47,19 @@ export declare const aaveV3Encode: {
         debtAsset: EthereumAddress;
         debtAssetId: number;
     }): (number | boolean | string[])[];
+    openOrder(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+        baseTokenAddress: EthereumAddress;
+        quoteTokenAddress: EthereumAddress;
+        price: number;
+        state: RatioState.UNDER;
+    }, subData: {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        marketAddr: EthereumAddress;
+        targetRatio: number;
+    }): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
@@ -80,7 +93,8 @@ export declare const sparkEncode: {
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
+    payback(proxyAddress: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
 };
 export declare const morphoBlueEncode: {
-    leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
+    leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean): (boolean | string[] | Bundles.MainnetIds)[];
 };

package/esm/services/strategySubService.js

@@ -168,6 +168,13 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    openOrder(strategyOrBundleId, isBundle = true, triggerData, subData) {
+        const { collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, } = subData;
+        const subDataEncoded = subDataService.aaveV3OpenOrderSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
+        const { baseTokenAddress, quoteTokenAddress, price, state, } = triggerData;
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 exports.compoundV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
@@ -232,13 +239,25 @@ exports.crvUSDEncode = {
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    payback(proxyAddress, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr, controllerAddr, minHealthRatio) {
+        const subData = subDataService.crvUSDPaybackSubData.encode(controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr);
+        const triggerData = triggerService.crvUsdHealthRatioTrigger.encode(proxyAddress, controllerAddr, minHealthRatio);
+        const strategyId = enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK;
+        const isBundle = false;
+        return [strategyId, isBundle, triggerData, subData];
+    },
 };
 exports.morphoBlueEncode = {
-    leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user) {
-        const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user);
+    leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user, isEOA) {
+        const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
         const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
         // over is boost, under is repay
-        const strategyOrBundleId = ratioState === enums_1.RatioState.OVER ? enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST : enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY;
+        const isBoost = ratioState === enums_1.RatioState.OVER;
+        let strategyOrBundleId;
+        if (isBoost)
+            strategyOrBundleId = isEOA ? enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST : enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST;
+        else
+            strategyOrBundleId = isEOA ? enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY : enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY;
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },

package/esm/services/strategySubService.test.js

@@ -454,6 +454,46 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('openOrder()', () => {
+            const examples = [
+                [
+                    [
+                        enums_1.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000007acead34980000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x000000000000000000000000000000000000000000000000000000000000000a',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        enums_1.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
+                        true,
+                        {
+                            baseTokenAddress: (0, tokens_1.getAssetInfo)('WETH').address, quoteTokenAddress: (0, tokens_1.getAssetInfo)('DAI').address, price: 5274.534678, state: enums_1.RatioState.UNDER
+                        },
+                        {
+                            collAsset: (0, tokens_1.getAssetInfo)('WETH').address,
+                            collAssetId: 10,
+                            debtAsset: (0, tokens_1.getAssetInfo)('DAI').address,
+                            debtAssetId: 4,
+                            marketAddr: '0x2f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            targetRatio: 200,
+                        },
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(strategySubService_1.aaveV3Encode.openOrder(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.compoundV2Encode', () => {
         describe('leverageManagement()', () => {
@@ -750,6 +790,40 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('payback()', () => {
+            const examples = [
+                [
+                    [
+                        enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK,
+                        false,
+                        [
+                            '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
+                        ],
+                        [
+                            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+                            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+                            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
+                        ],
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
+                        web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+                        web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+                        '20000',
+                        '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+                        web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
+                        20,
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(strategySubService_1.crvUSDEncode.payback(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.morphoBlueEncode', () => {
         describe('leverageManagement()', () => {
@@ -770,6 +844,7 @@ describe('Feature: strategySubService.ts', () => {
                             '0x0000000000000000000000000000000000000000000000000000000000000001',
                             '0x000000000000000000000000000000000000000000000000136dcc951d8c0000',
                             '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
                         ],
                     ],
                     [
@@ -782,7 +857,8 @@ describe('Feature: strategySubService.ts', () => {
                         enums_1.RatioState.UNDER,
                         140,
                         120,
-                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        false,
                     ]
                 ],
                 [
@@ -801,6 +877,7 @@ describe('Feature: strategySubService.ts', () => {
                             '0x0000000000000000000000000000000000000000000000000000000000000000',
                             '0x00000000000000000000000000000000000000000000000016345785d8a00000',
                             '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
                         ],
                     ],
                     [
@@ -813,7 +890,8 @@ describe('Feature: strategySubService.ts', () => {
                         enums_1.RatioState.OVER,
                         160,
                         200,
-                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        false,
                     ]
                 ],
             ];

package/esm/services/subDataService.d.ts

@@ -158,8 +158,17 @@ export declare const crvUSDLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const crvUSDPaybackSubData: {
+    encode: (controllerAddr: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress) => string[];
+    decode: (subData: string[]) => {
+        controller: string;
+        addressToPullTokensFrom: string;
+        positionOwner: string;
+        paybackAmount: string;
+    };
+};
 export declare const morphoBlueLeverageManagementSubData: {
-    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress) => string[];
+    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress, isEOA: boolean) => string[];
     decode: (subData: string[]) => {
         loanToken: string;
         collToken: string;
@@ -170,3 +179,14 @@ export declare const morphoBlueLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV3OpenOrderSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number): string[];
+    decode(subData: string[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        marketAddr: EthereumAddress;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morphoBlueLeverageManagementSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.aaveV3OpenOrderSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
+const web3_utils_1 = require("web3-utils");
 const tokens_1 = require("@defisaver/tokens");
 const sdk_1 = require("@defisaver/sdk");
 const enums_1 = require("../types/enums");
@@ -378,8 +379,37 @@ exports.crvUSDLeverageManagementSubData = {
         return { controller, targetRatio };
     },
 };
+exports.crvUSDPaybackSubData = {
+    encode: (controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr) => {
+        const controllerAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', controllerAddr);
+        const addressToPullTokensFromEncoded = web3_eth_abi_1.default.encodeParameter('address', addressToPullTokensFrom);
+        const positionOwnerEncoded = web3_eth_abi_1.default.encodeParameter('address', positionOwner);
+        const paybackAmountEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, web3_utils_1.toWei)(paybackAmount, 'ether'));
+        const crvUSDAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', crvUSDAddr);
+        return [
+            controllerAddrEncoded,
+            addressToPullTokensFromEncoded,
+            positionOwnerEncoded,
+            paybackAmountEncoded,
+            crvUSDAddrEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const controller = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const addressToPullTokensFrom = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const positionOwner = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const weiPaybackAmount = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const paybackAmount = (0, web3_utils_1.fromWei)(weiPaybackAmount, 'ether');
+        return {
+            controller,
+            addressToPullTokensFrom,
+            positionOwner,
+            paybackAmount,
+        };
+    },
+};
 exports.morphoBlueLeverageManagementSubData = {
-    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user) => {
+    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
         const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
         const oracleEncoded = web3_eth_abi_1.default.encodeParameter('address', oracle);
@@ -388,7 +418,8 @@ exports.morphoBlueLeverageManagementSubData = {
         const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const userEncoded = web3_eth_abi_1.default.encodeParameter('address', user);
-        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded];
+        const isEOAEncoded = web3_eth_abi_1.default.encodeParameter('bool', isEOA);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
     },
     decode: (subData) => {
         const loanToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
@@ -410,3 +441,35 @@ exports.morphoBlueLeverageManagementSubData = {
         };
     },
 };
+exports.aaveV3OpenOrderSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
+        const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
+        const encodedCollId = web3_eth_abi_1.default.encodeParameter('uint8', collAssetId);
+        const encodedDebt = web3_eth_abi_1.default.encodeParameter('address', debtAsset);
+        const encodedDebtId = web3_eth_abi_1.default.encodeParameter('uint8', debtAssetId);
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const useOnBehalfEncoded = web3_eth_abi_1.default.encodeParameter('bool', false);
+        return [
+            encodedColl,
+            encodedCollId,
+            encodedDebt,
+            encodedDebtId,
+            encodedMarket,
+            encodedTargetRatio,
+            useOnBehalfEncoded,
+        ];
+    },
+    decode(subData) {
+        const collAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const collAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[1]));
+        const debtAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[3]));
+        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);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+        };
+    },
+};