@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/cjs/automation/private/StrategiesAutomation.d.ts

@@ -1,7 +1,7 @@
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
 import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber } from '../../types';
-import type { StrategyModel, SubStorage } from '../../types/contracts/generated/SubStorage';
+import type { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
 interface IStrategiesAutomation extends Interfaces.Automation {
@@ -17,14 +17,16 @@ export default class StrategiesAutomation extends Automation {
     constructor(args: IStrategiesAutomation);
     protected getEventFromSubStorage(event: string, options?: PastEventOptions): Promise<any[]>;
     protected getStrategiesSubs(subIds: number[], fromBlock?: BlockNumber): Promise<StrategyModel.StoredSubDataStructOutputStruct[]>;
-    protected getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
-    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
+    protected getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<Subscribe[]>;
+    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<UpdateData[]>;
     protected getParsedSubscriptions(parseData: ParseData): Position.Automated | null;
     /**
      * @description Removes expired Limit Order subscriptions
      */
     protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]): (Position.Automated | null)[];
     private _mergeCheck;
+    /** Repay/boost leverage pairs must not merge across different Aave V4 spokes. */
+    private _aaveV4MergeSpokesMatch;
     protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
     protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
     getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;

package/cjs/automation/private/StrategiesAutomation.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const es6_promise_pool_1 = __importDefault(require("es6-promise-pool"));
 const enums_1 = require("../../types/enums");
 const utils_1 = require("../../services/utils");
 const contractService_1 = require("../../services/contractService");
@@ -103,7 +104,16 @@ class StrategiesAutomation extends Automation_1.default {
             && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
                 || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase())
             && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
-                || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase());
+                || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase())
+            && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV4
+                || this._aaveV4MergeSpokesMatch(s, current));
+    }
+    /** Repay/boost leverage pairs must not merge across different Aave V4 spokes. */
+    _aaveV4MergeSpokesMatch(s, current) {
+        var _a, _b, _c, _d, _e, _f;
+        const a = (_c = (_b = (_a = s.strategyData) === null || _a === void 0 ? void 0 : _a.decoded) === null || _b === void 0 ? void 0 : _b.triggerData) === null || _c === void 0 ? void 0 : _c.spoke;
+        const b = (_f = (_e = (_d = current.strategyData) === null || _d === void 0 ? void 0 : _d.decoded) === null || _e === void 0 ? void 0 : _e.triggerData) === null || _f === void 0 ? void 0 : _f.spoke;
+        return !!a && !!b && a.toLowerCase() === b.toLowerCase();
     }
     mergeSubs(_subscriptions) {
         const mergeBase = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isDefined)(s.specific.mergeWithId));
@@ -125,7 +135,6 @@ class StrategiesAutomation extends Automation_1.default {
             }
         });
         if (mergeExtension.length > 0) {
-            console.error('Not all merge-able extensions were used', mergeExtension);
             subscriptions = [...subscriptions, ...mergeExtension.map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
         }
         return subscriptions;
@@ -133,10 +142,10 @@ class StrategiesAutomation extends Automation_1.default {
     _getSubscriptions(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const _options = Object.assign(Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), options)), (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(addresses), { filter: { proxy: addresses } }));
-            let subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
+            let subscriptionEvents = yield this.getSubscriptionEventsFromSubStorage(_options);
             let subscriptions = [];
             if (subscriptionEvents) {
-                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => +e.returnValues.subId), _options.toBlock);
                 if (_options.enabledOnly) {
                     const filteredSubscriptionEvents = [];
                     strategiesSubs = strategiesSubs.filter((sub, index) => {
@@ -146,20 +155,28 @@ class StrategiesAutomation extends Automation_1.default {
                     });
                     subscriptionEvents = filteredSubscriptionEvents;
                 }
-                subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
+                const replaceSubWithUpdate = (index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    const sub = strategiesSubs[index];
+                    let latestUpdate = Object.assign({}, subscriptionEvents[index].returnValues);
                     if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
                         const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, (0, utils_1.addToObjectIf)(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
-                        latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
+                        latestUpdate = Object.assign(Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues), { 2: latestUpdate[2] });
                     }
-                    return this.getParsedSubscriptions({
+                    subscriptions.push(this.getParsedSubscriptions({
                         chainId: this.chainId,
                         blockNumber: subscriptionEvents[index].blockNumber,
                         subscriptionEventData: latestUpdate,
                         strategiesSubsData: sub,
-                    });
-                })));
+                    }));
+                });
+                // eslint-disable-next-line func-names
+                const pool = new es6_promise_pool_1.default(function* () {
+                    for (let index = 0; index < strategiesSubs.length; index++) {
+                        yield replaceSubWithUpdate(index);
+                    }
+                }, 50);
+                yield pool.start();
                 if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
                     subscriptions = this.mergeSubs(subscriptions);
                 }

package/cjs/automation/private/StrategiesAutomation.test.js

@@ -667,5 +667,30 @@ describe('Feature: StrategiesAutomation.ts', () => {
                 (0, chai_1.expect)(JSON.stringify(actual)).to.equal(JSON.stringify(expected));
             }));
         });
+        it('Aave V4: pairs repay/boost merge only when trigger spoke matches (no cross-spoke merge)', () => {
+            var _a, _b, _c;
+            const spoke1 = '0x0000000000000000000000000000000000000a01';
+            const spoke2 = '0x0000000000000000000000000000000000000a02';
+            const base = {
+                isEnabled: true,
+                chainId: 1,
+                owner: '0x0000000000000000000000000000000000000b01',
+                protocol: { id: 'Aave__V4' },
+                strategy: { strategyId: 'leverage-management' },
+                blockNumber: 0,
+                subHash: '0x1',
+                positionId: 'test',
+            };
+            const boostSpoke1 = Object.assign(Object.assign({}, base), { subId: 1, strategyData: { decoded: { triggerData: { spoke: spoke1 }, subData: {} } }, specific: { mergeId: 'boost', subId2: 1 } });
+            const repaySpoke2 = Object.assign(Object.assign({}, base), { subId: 2, strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } }, specific: { mergeWithId: 'boost', subId1: 2 } });
+            const boostSpoke2 = Object.assign(Object.assign({}, base), { subId: 3, strategyData: { decoded: { triggerData: { spoke: spoke2 }, subData: {} } }, specific: { mergeId: 'boost', subId2: 3 } });
+            // @ts-ignore — mergeSubs is protected; exercised here as in examples above
+            const merged = exampleStrategiesAutomation.mergeSubs([boostSpoke1, repaySpoke2, boostSpoke2]);
+            (0, chai_1.expect)(merged).to.have.length(2);
+            const mergedPair = merged.find((m) => { var _a; return ((_a = m.subIds) === null || _a === void 0 ? void 0 : _a.length) === 2; });
+            const loneBoost = merged.find((m) => { var _a; return ((_a = m.subIds) === null || _a === void 0 ? void 0 : _a.length) === 1; });
+            (0, chai_1.expect)((_c = (_b = (_a = mergedPair === null || mergedPair === void 0 ? void 0 : mergedPair.strategyData) === null || _a === void 0 ? void 0 : _a.decoded) === null || _b === void 0 ? void 0 : _b.triggerData) === null || _c === void 0 ? void 0 : _c.spoke).to.equal(spoke2);
+            (0, chai_1.expect)(loneBoost === null || loneBoost === void 0 ? void 0 : loneBoost.subId).to.equal(1);
+        });
     }));
 });

package/cjs/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/cjs/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.BASE_BUNDLES_INFO = exports.OPTIMISM_BUNDLES_INFO = exports.MAINNET_BUNDLES_INFO = exports.STRATEGY_IDS = exports.STRATEGIES_INFO = exports.ARBITRUM_STRATEGIES_INFO = exports.BASE_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;
+exports.BUNDLE_IDS = exports.BUNDLES_INFO = exports.ARBITRUM_BUNDLES_INFO = exports.BASE_BUNDLES_INFO = exports.OPTIMISM_BUNDLES_INFO = exports.MAINNET_BUNDLES_INFO = exports.STRATEGY_IDS = exports.STRATEGIES_INFO = exports.ARBITRUM_STRATEGIES_INFO = exports.BASE_STRATEGIES_INFO = exports.OPTIMISM_STRATEGIES_INFO = exports.MAINNET_STRATEGIES_INFO = exports.LEGACY_PROTOCOLS = exports.PROTOCOLS = exports.AAVE_V3_VARIABLE_BORROW_RATE = exports.EMPTY_SLOT = 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.EMPTY_SLOT = '0x0000000000000000000000000000000000000000000000000000000000000000';
 exports.AAVE_V3_VARIABLE_BORROW_RATE = 2;
 exports.PROTOCOLS = (() => {
     const protocolsMapping = {};
@@ -101,6 +102,26 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Payback,
         protocol: exports.PROTOCOLS.LiquityV2,
     },
+    [enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH_EOA]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH_EOA,
+        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -113,6 +134,11 @@ exports.OPTIMISM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
+    [enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_STRATEGIES_INFO = {
     [enums_1.Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -125,6 +151,11 @@ exports.BASE_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
+    [enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_STRATEGIES_INFO = {
     [enums_1.Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -137,6 +168,11 @@ exports.ARBITRUM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.LimitOrder,
         protocol: exports.PROTOCOLS.Exchange,
     },
+    [enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.STRATEGIES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_STRATEGIES_INFO,
@@ -288,16 +324,6 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.Spark,
     },
-    [enums_1.Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-        strategyId: enums_1.Strategies.Identifiers.CloseToDebt,
-        protocol: exports.PROTOCOLS.Spark,
-    },
-    [enums_1.Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-        strategyId: enums_1.Strategies.Identifiers.CloseToCollateral,
-        protocol: exports.PROTOCOLS.Spark,
-    },
     [enums_1.Bundles.MainnetIds.AAVE_V2_REPAY]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V2_REPAY,
         strategyId: enums_1.Strategies.Identifiers.Repay,
@@ -398,6 +424,131 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -430,6 +581,31 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -497,6 +673,76 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_SW_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -549,6 +795,101 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.CompoundV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/index.d.ts

@@ -13,11 +13,12 @@ import * as strategiesService from './services/strategiesService';
 import * as constants from './constants';
 import * as enums from './types/enums';
 import type * as types from './types';
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType } from './services/utils';
 declare const utils: {
     getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
     compareSubHashes: typeof compareSubHashes;
     encodeSubId: typeof encodeSubId;
+    getCloseStrategyType: typeof getCloseStrategyType;
 };
 export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
 export type { types };

package/cjs/index.js

@@ -60,6 +60,6 @@ const enums = __importStar(require("./types/enums"));
 exports.enums = enums;
 const utils_1 = require("./services/utils");
 const utils = {
-    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId,
+    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId, getCloseStrategyType: utils_1.getCloseStrategyType,
 };
 exports.utils = utils;

package/cjs/services/ethereumService.js

@@ -19,20 +19,27 @@ const utils_1 = require("./utils");
 function multicall(web3, chainId, calls, block = 'latest') {
     return __awaiter(this, void 0, void 0, function* () {
         const multicallContract = (0, contractService_1.makeUniMulticallContract)(web3, chainId).contract;
-        const formattedCalls = calls.map((call) => ({
-            callData: web3_eth_abi_1.default.encodeFunctionCall(call.abiItem, call.params),
-            target: call.target || '0x0',
-            gasLimit: call.gasLimit || 1e6,
-        }));
-        const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, block);
-        let formattedResult = [];
-        callResult.returnData.forEach(([success, gasUsed, result], i) => {
-            const formattedRes = (result !== '0x'
-                ? web3_eth_abi_1.default.decodeParameters(calls[i].abiItem.outputs, result)
-                : undefined);
-            formattedResult = [...formattedResult, formattedRes];
-        });
-        return formattedResult;
+        const MAX_CALLS_PER_BATCH = 1000;
+        const allResults = [];
+        // Process each chunk
+        for (let i = 0; i < calls.length; i += MAX_CALLS_PER_BATCH) {
+            const chunk = calls.slice(i, i + MAX_CALLS_PER_BATCH);
+            const formattedCalls = chunk.map((call) => ({
+                callData: web3_eth_abi_1.default.encodeFunctionCall(call.abiItem, call.params),
+                target: call.target || '0x0',
+                gasLimit: call.gasLimit || 1e6,
+            }));
+            const callResult = yield multicallContract.methods.multicall(formattedCalls).call({}, block);
+            let formattedResult = [];
+            callResult.returnData.forEach(([success, , result], j) => {
+                const formattedRes = (success && result !== '0x'
+                    ? web3_eth_abi_1.default.decodeParameters(chunk[j].abiItem.outputs, result)
+                    : undefined);
+                formattedResult = [...formattedResult, formattedRes];
+            });
+            allResults.push(...formattedResult);
+        }
+        return allResults;
     });
 }
 exports.multicall = multicall;