@hyperlane-xyz/rebalancer 2.0.0 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bridges/LiFiBridge.d.ts +67 -0
- package/dist/bridges/LiFiBridge.d.ts.map +1 -0
- package/dist/bridges/LiFiBridge.js +386 -0
- package/dist/bridges/LiFiBridge.js.map +1 -0
- package/dist/config/RebalancerConfig.d.ts +8 -2
- package/dist/config/RebalancerConfig.d.ts.map +1 -1
- package/dist/config/RebalancerConfig.js +9 -4
- package/dist/config/RebalancerConfig.js.map +1 -1
- package/dist/config/RebalancerConfig.test.js +135 -1
- package/dist/config/RebalancerConfig.test.js.map +1 -1
- package/dist/config/types.d.ts +1023 -304
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js +113 -10
- package/dist/config/types.js.map +1 -1
- package/dist/core/InventoryRebalancer.d.ts +190 -0
- package/dist/core/InventoryRebalancer.d.ts.map +1 -0
- package/dist/core/InventoryRebalancer.js +892 -0
- package/dist/core/InventoryRebalancer.js.map +1 -0
- package/dist/core/InventoryRebalancer.test.d.ts +2 -0
- package/dist/core/InventoryRebalancer.test.d.ts.map +1 -0
- package/dist/core/InventoryRebalancer.test.js +1382 -0
- package/dist/core/InventoryRebalancer.test.js.map +1 -0
- package/dist/core/Rebalancer.d.ts +11 -4
- package/dist/core/Rebalancer.d.ts.map +1 -1
- package/dist/core/Rebalancer.js +92 -9
- package/dist/core/Rebalancer.js.map +1 -1
- package/dist/core/Rebalancer.test.js +82 -49
- package/dist/core/Rebalancer.test.js.map +1 -1
- package/dist/core/RebalancerOrchestrator.d.ts +30 -9
- package/dist/core/RebalancerOrchestrator.d.ts.map +1 -1
- package/dist/core/RebalancerOrchestrator.js +79 -71
- package/dist/core/RebalancerOrchestrator.js.map +1 -1
- package/dist/core/RebalancerOrchestrator.test.d.ts +2 -0
- package/dist/core/RebalancerOrchestrator.test.d.ts.map +1 -0
- package/dist/core/RebalancerOrchestrator.test.js +719 -0
- package/dist/core/RebalancerOrchestrator.test.js.map +1 -0
- package/dist/core/RebalancerService.d.ts +7 -3
- package/dist/core/RebalancerService.d.ts.map +1 -1
- package/dist/core/RebalancerService.js +44 -24
- package/dist/core/RebalancerService.js.map +1 -1
- package/dist/core/RebalancerService.test.js +74 -110
- package/dist/core/RebalancerService.test.js.map +1 -1
- package/dist/e2e/collateral-deficit.e2e-test.js +1 -3
- package/dist/e2e/collateral-deficit.e2e-test.js.map +1 -1
- package/dist/e2e/composite.e2e-test.js.map +1 -1
- package/dist/e2e/harness/BridgeSetup.d.ts +6 -0
- package/dist/e2e/harness/BridgeSetup.d.ts.map +1 -1
- package/dist/e2e/harness/BridgeSetup.js +10 -1
- package/dist/e2e/harness/BridgeSetup.js.map +1 -1
- package/dist/e2e/harness/ForkIndexer.d.ts.map +1 -1
- package/dist/e2e/harness/ForkIndexer.js +1 -0
- package/dist/e2e/harness/ForkIndexer.js.map +1 -1
- package/dist/e2e/harness/TestHelpers.d.ts.map +1 -1
- package/dist/e2e/harness/TestHelpers.js +1 -4
- package/dist/e2e/harness/TestHelpers.js.map +1 -1
- package/dist/e2e/harness/TestRebalancer.d.ts +1 -1
- package/dist/e2e/harness/TestRebalancer.d.ts.map +1 -1
- package/dist/e2e/harness/TestRebalancer.js +9 -9
- package/dist/e2e/harness/TestRebalancer.js.map +1 -1
- package/dist/e2e/minAmount.e2e-test.js +0 -1
- package/dist/e2e/minAmount.e2e-test.js.map +1 -1
- package/dist/e2e/weighted.e2e-test.js +0 -1
- package/dist/e2e/weighted.e2e-test.js.map +1 -1
- package/dist/factories/RebalancerContextFactory.d.ts +48 -6
- package/dist/factories/RebalancerContextFactory.d.ts.map +1 -1
- package/dist/factories/RebalancerContextFactory.js +171 -17
- package/dist/factories/RebalancerContextFactory.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/interfaces/IExternalBridge.d.ts +101 -0
- package/dist/interfaces/IExternalBridge.d.ts.map +1 -0
- package/dist/interfaces/IExternalBridge.js +2 -0
- package/dist/interfaces/IExternalBridge.js.map +1 -0
- package/dist/interfaces/IMonitor.d.ts +1 -0
- package/dist/interfaces/IMonitor.d.ts.map +1 -1
- package/dist/interfaces/IRebalancer.d.ts +25 -25
- package/dist/interfaces/IRebalancer.d.ts.map +1 -1
- package/dist/interfaces/IStrategy.d.ts +36 -3
- package/dist/interfaces/IStrategy.d.ts.map +1 -1
- package/dist/interfaces/IStrategy.js +12 -1
- package/dist/interfaces/IStrategy.js.map +1 -1
- package/dist/metrics/PriceGetter.js +1 -1
- package/dist/metrics/PriceGetter.js.map +1 -1
- package/dist/metrics/scripts/metrics.d.ts +3 -3
- package/dist/monitor/Monitor.d.ts +12 -2
- package/dist/monitor/Monitor.d.ts.map +1 -1
- package/dist/monitor/Monitor.js +46 -1
- package/dist/monitor/Monitor.js.map +1 -1
- package/dist/service.js +40 -17
- package/dist/service.js.map +1 -1
- package/dist/strategy/BaseStrategy.d.ts +12 -6
- package/dist/strategy/BaseStrategy.d.ts.map +1 -1
- package/dist/strategy/BaseStrategy.js +56 -21
- package/dist/strategy/BaseStrategy.js.map +1 -1
- package/dist/strategy/CollateralDeficitStrategy.d.ts +1 -1
- package/dist/strategy/CollateralDeficitStrategy.d.ts.map +1 -1
- package/dist/strategy/CollateralDeficitStrategy.js +19 -11
- package/dist/strategy/CollateralDeficitStrategy.js.map +1 -1
- package/dist/strategy/CollateralDeficitStrategy.test.js +135 -2
- package/dist/strategy/CollateralDeficitStrategy.test.js.map +1 -1
- package/dist/strategy/CompositeStrategy.test.js +13 -0
- package/dist/strategy/CompositeStrategy.test.js.map +1 -1
- package/dist/strategy/MinAmountStrategy.test.js +4 -0
- package/dist/strategy/MinAmountStrategy.test.js.map +1 -1
- package/dist/strategy/StrategyFactory.d.ts +2 -1
- package/dist/strategy/StrategyFactory.d.ts.map +1 -1
- package/dist/strategy/StrategyFactory.js +24 -8
- package/dist/strategy/StrategyFactory.js.map +1 -1
- package/dist/strategy/WeightedStrategy.test.js +6 -0
- package/dist/strategy/WeightedStrategy.test.js.map +1 -1
- package/dist/test/helpers.d.ts +8 -7
- package/dist/test/helpers.d.ts.map +1 -1
- package/dist/test/helpers.js +23 -5
- package/dist/test/helpers.js.map +1 -1
- package/dist/test/lifiMocks.d.ts +51 -0
- package/dist/test/lifiMocks.d.ts.map +1 -0
- package/dist/test/lifiMocks.js +130 -0
- package/dist/test/lifiMocks.js.map +1 -0
- package/dist/tracking/ActionTracker.d.ts +34 -1
- package/dist/tracking/ActionTracker.d.ts.map +1 -1
- package/dist/tracking/ActionTracker.js +233 -26
- package/dist/tracking/ActionTracker.js.map +1 -1
- package/dist/tracking/ActionTracker.test.js +380 -19
- package/dist/tracking/ActionTracker.test.js.map +1 -1
- package/dist/tracking/IActionTracker.d.ts +48 -3
- package/dist/tracking/IActionTracker.d.ts.map +1 -1
- package/dist/tracking/InflightContextAdapter.d.ts.map +1 -1
- package/dist/tracking/InflightContextAdapter.js +24 -7
- package/dist/tracking/InflightContextAdapter.js.map +1 -1
- package/dist/tracking/InflightContextAdapter.test.js +7 -4
- package/dist/tracking/InflightContextAdapter.test.js.map +1 -1
- package/dist/tracking/types.d.ts +33 -2
- package/dist/tracking/types.d.ts.map +1 -1
- package/dist/utils/ExplorerClient.d.ts +3 -1
- package/dist/utils/ExplorerClient.d.ts.map +1 -1
- package/dist/utils/ExplorerClient.js +16 -8
- package/dist/utils/ExplorerClient.js.map +1 -1
- package/dist/utils/bridgeUtils.d.ts +27 -4
- package/dist/utils/bridgeUtils.d.ts.map +1 -1
- package/dist/utils/bridgeUtils.js +38 -0
- package/dist/utils/bridgeUtils.js.map +1 -1
- package/dist/utils/bridgeUtils.test.js +9 -0
- package/dist/utils/bridgeUtils.test.js.map +1 -1
- package/dist/utils/gasEstimation.d.ts +65 -0
- package/dist/utils/gasEstimation.d.ts.map +1 -0
- package/dist/utils/gasEstimation.js +176 -0
- package/dist/utils/gasEstimation.js.map +1 -0
- package/dist/utils/tokenUtils.d.ts +9 -1
- package/dist/utils/tokenUtils.d.ts.map +1 -1
- package/dist/utils/tokenUtils.js +11 -0
- package/dist/utils/tokenUtils.js.map +1 -1
- package/package.json +9 -7
- package/src/bridges/LiFiBridge.ts +538 -0
- package/src/config/RebalancerConfig.test.ts +162 -0
- package/src/config/RebalancerConfig.ts +21 -3
- package/src/config/types.ts +147 -10
- package/src/core/InventoryRebalancer.test.ts +1721 -0
- package/src/core/InventoryRebalancer.ts +1265 -0
- package/src/core/Rebalancer.test.ts +84 -30
- package/src/core/Rebalancer.ts +144 -23
- package/src/core/RebalancerOrchestrator.test.ts +869 -0
- package/src/core/RebalancerOrchestrator.ts +146 -95
- package/src/core/RebalancerService.test.ts +86 -124
- package/src/core/RebalancerService.ts +67 -33
- package/src/e2e/collateral-deficit.e2e-test.ts +2 -4
- package/src/e2e/composite.e2e-test.ts +5 -5
- package/src/e2e/harness/BridgeSetup.ts +28 -1
- package/src/e2e/harness/ForkIndexer.ts +1 -0
- package/src/e2e/harness/TestHelpers.ts +1 -4
- package/src/e2e/harness/TestRebalancer.ts +10 -7
- package/src/e2e/minAmount.e2e-test.ts +1 -2
- package/src/e2e/weighted.e2e-test.ts +1 -2
- package/src/factories/RebalancerContextFactory.ts +294 -24
- package/src/index.ts +22 -5
- package/src/interfaces/IExternalBridge.ts +115 -0
- package/src/interfaces/IMonitor.ts +1 -0
- package/src/interfaces/IRebalancer.ts +45 -29
- package/src/interfaces/IStrategy.ts +50 -3
- package/src/metrics/PriceGetter.ts +1 -1
- package/src/monitor/Monitor.ts +81 -2
- package/src/service.ts +59 -18
- package/src/strategy/BaseStrategy.ts +77 -24
- package/src/strategy/CollateralDeficitStrategy.test.ts +181 -4
- package/src/strategy/CollateralDeficitStrategy.ts +42 -15
- package/src/strategy/CompositeStrategy.test.ts +13 -0
- package/src/strategy/MinAmountStrategy.test.ts +4 -0
- package/src/strategy/StrategyFactory.ts +33 -6
- package/src/strategy/WeightedStrategy.test.ts +6 -0
- package/src/test/helpers.ts +39 -14
- package/src/test/lifiMocks.ts +174 -0
- package/src/tracking/ActionTracker.test.ts +443 -19
- package/src/tracking/ActionTracker.ts +339 -28
- package/src/tracking/IActionTracker.ts +59 -3
- package/src/tracking/InflightContextAdapter.test.ts +7 -4
- package/src/tracking/InflightContextAdapter.ts +42 -9
- package/src/tracking/types.ts +45 -2
- package/src/utils/ExplorerClient.ts +27 -10
- package/src/utils/bridgeUtils.test.ts +9 -0
- package/src/utils/bridgeUtils.ts +75 -6
- package/src/utils/gasEstimation.ts +272 -0
- package/src/utils/tokenUtils.ts +12 -0
- package/dist/tracking/index.d.ts +0 -7
- package/dist/tracking/index.d.ts.map +0 -1
- package/dist/tracking/index.js +0 -6
- package/dist/tracking/index.js.map +0 -1
- package/dist/utils/index.d.ts +0 -5
- package/dist/utils/index.d.ts.map +0 -1
- package/dist/utils/index.js +0 -5
- package/dist/utils/index.js.map +0 -1
- package/src/tracking/index.ts +0 -36
- package/src/utils/index.ts +0 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RebalancerOrchestrator.test.js","sourceRoot":"","sources":["../../src/core/RebalancerOrchestrator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Logger } from 'pino';
|
|
|
2
2
|
import { IRegistry } from '@hyperlane-xyz/registry';
|
|
3
3
|
import { type MultiProtocolProvider, type MultiProvider } from '@hyperlane-xyz/sdk';
|
|
4
4
|
import { RebalancerConfig } from '../config/RebalancerConfig.js';
|
|
5
|
-
import { IActionTracker } from '../tracking/IActionTracker.js';
|
|
5
|
+
import type { IActionTracker } from '../tracking/IActionTracker.js';
|
|
6
6
|
export interface RebalancerServiceConfig {
|
|
7
7
|
/** Execution mode: 'manual' for one-off execution, 'daemon' for continuous monitoring */
|
|
8
8
|
mode: 'manual' | 'daemon';
|
|
@@ -73,6 +73,7 @@ export interface ManualRebalanceRequest {
|
|
|
73
73
|
*/
|
|
74
74
|
export declare class RebalancerService {
|
|
75
75
|
private readonly multiProvider;
|
|
76
|
+
private readonly inventoryMultiProvider;
|
|
76
77
|
private readonly multiProtocolProvider;
|
|
77
78
|
private readonly registry;
|
|
78
79
|
private readonly rebalancerConfig;
|
|
@@ -87,8 +88,8 @@ export declare class RebalancerService {
|
|
|
87
88
|
private mode;
|
|
88
89
|
private actionTracker?;
|
|
89
90
|
private inflightContextAdapter?;
|
|
90
|
-
private orchestrator
|
|
91
|
-
constructor(multiProvider: MultiProvider, multiProtocolProvider: MultiProtocolProvider | undefined, registry: IRegistry, rebalancerConfig: RebalancerConfig, config: RebalancerServiceConfig);
|
|
91
|
+
private orchestrator?;
|
|
92
|
+
constructor(multiProvider: MultiProvider, inventoryMultiProvider: MultiProvider | undefined, multiProtocolProvider: MultiProtocolProvider | undefined, registry: IRegistry, rebalancerConfig: RebalancerConfig, config: RebalancerServiceConfig);
|
|
92
93
|
/**
|
|
93
94
|
* Initialize the service components
|
|
94
95
|
*/
|
|
@@ -109,6 +110,9 @@ export declare class RebalancerService {
|
|
|
109
110
|
* Gracefully shutdown the service
|
|
110
111
|
*/
|
|
111
112
|
gracefulShutdown(): Promise<void>;
|
|
113
|
+
/**
|
|
114
|
+
* Handle token info events from monitor by delegating to orchestrator
|
|
115
|
+
*/
|
|
112
116
|
private onTokenInfo;
|
|
113
117
|
/**
|
|
114
118
|
* Event handler for monitor errors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RebalancerService.d.ts","sourceRoot":"","sources":["../../src/core/RebalancerService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RebalancerService.d.ts","sourceRoot":"","sources":["../../src/core/RebalancerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAEnB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAoBjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAKpE,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAE1B,qEAAqE;IACrE,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,qBAAa,iBAAiB;IAa1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAjBzB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAC,CAA2B;IAClD,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,QAAQ,CAAC,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAC,CAAc;IACjC,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAiB;IACvC,OAAO,CAAC,sBAAsB,CAAC,CAAyB;IACxD,OAAO,CAAC,YAAY,CAAC,CAAyB;gBAE3B,aAAa,EAAE,aAAa,EAC5B,sBAAsB,EAAE,aAAa,GAAG,SAAS,EACjD,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,EACxD,QAAQ,EAAE,SAAS,EACnB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,uBAAuB;IAMlD;;OAEG;YACW,UAAU;IA2GxB;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEnE;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;OAEG;YACW,WAAW;IASzB;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;IACH,OAAO,CAAC,cAAc;CAGvB"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { randomUUID } from 'crypto';
|
|
2
1
|
import { assert, toWei } from '@hyperlane-xyz/utils';
|
|
3
2
|
import { getStrategyChainConfig, getStrategyChainNames, } from '../config/types.js';
|
|
4
3
|
import { RebalancerContextFactory } from '../factories/RebalancerContextFactory.js';
|
|
5
4
|
import { MonitorEventType, MonitorPollingError, MonitorStartError, } from '../interfaces/IMonitor.js';
|
|
6
|
-
import { RebalancerOrchestrator } from './RebalancerOrchestrator.js';
|
|
7
5
|
import { InflightContextAdapter } from '../tracking/InflightContextAdapter.js';
|
|
8
6
|
/**
|
|
9
7
|
* RebalancerService is the main orchestrator for the Hyperlane Warp Route Rebalancer.
|
|
@@ -48,6 +46,7 @@ import { InflightContextAdapter } from '../tracking/InflightContextAdapter.js';
|
|
|
48
46
|
*/
|
|
49
47
|
export class RebalancerService {
|
|
50
48
|
multiProvider;
|
|
49
|
+
inventoryMultiProvider;
|
|
51
50
|
multiProtocolProvider;
|
|
52
51
|
registry;
|
|
53
52
|
rebalancerConfig;
|
|
@@ -63,8 +62,9 @@ export class RebalancerService {
|
|
|
63
62
|
actionTracker;
|
|
64
63
|
inflightContextAdapter;
|
|
65
64
|
orchestrator;
|
|
66
|
-
constructor(multiProvider, multiProtocolProvider, registry, rebalancerConfig, config) {
|
|
65
|
+
constructor(multiProvider, inventoryMultiProvider, multiProtocolProvider, registry, rebalancerConfig, config) {
|
|
67
66
|
this.multiProvider = multiProvider;
|
|
67
|
+
this.inventoryMultiProvider = inventoryMultiProvider;
|
|
68
68
|
this.multiProtocolProvider = multiProtocolProvider;
|
|
69
69
|
this.registry = registry;
|
|
70
70
|
this.rebalancerConfig = rebalancerConfig;
|
|
@@ -82,12 +82,7 @@ export class RebalancerService {
|
|
|
82
82
|
}
|
|
83
83
|
this.logger.info('Initializing RebalancerService...');
|
|
84
84
|
// Create context factory
|
|
85
|
-
this.contextFactory = await RebalancerContextFactory.create(this.rebalancerConfig, this.multiProvider, this.multiProtocolProvider, this.registry, this.logger);
|
|
86
|
-
// Create monitor (always needed for daemon mode)
|
|
87
|
-
if (this.mode === 'daemon') {
|
|
88
|
-
const checkFrequency = this.config.checkFrequency ?? 60_000;
|
|
89
|
-
this.monitor = this.contextFactory.createMonitor(checkFrequency);
|
|
90
|
-
}
|
|
85
|
+
this.contextFactory = await RebalancerContextFactory.create(this.rebalancerConfig, this.multiProvider, this.inventoryMultiProvider, this.multiProtocolProvider, this.registry, this.logger);
|
|
91
86
|
// Create metrics if enabled
|
|
92
87
|
if (this.config.withMetrics) {
|
|
93
88
|
this.metrics = await this.contextFactory.createMetrics(this.config.coingeckoApiKey);
|
|
@@ -95,14 +90,8 @@ export class RebalancerService {
|
|
|
95
90
|
}
|
|
96
91
|
// Create strategy
|
|
97
92
|
this.strategy = await this.contextFactory.createStrategy(this.metrics);
|
|
98
|
-
// Create rebalancer (unless in monitor-only mode)
|
|
99
|
-
if (!this.config.monitorOnly) {
|
|
100
|
-
this.rebalancer = this.contextFactory.createRebalancer(this.metrics);
|
|
101
|
-
}
|
|
102
|
-
else {
|
|
103
|
-
this.logger.warn('Running in monitorOnly mode: no transactions will be executed.');
|
|
104
|
-
}
|
|
105
93
|
// Create or use provided ActionTracker for tracking inflight actions
|
|
94
|
+
// Must be created BEFORE rebalancer since rebalancer needs it
|
|
106
95
|
if (this.config.actionTracker) {
|
|
107
96
|
// Use externally provided ActionTracker (e.g., for simulation/testing)
|
|
108
97
|
this.actionTracker = this.config.actionTracker;
|
|
@@ -117,14 +106,37 @@ export class RebalancerService {
|
|
|
117
106
|
await this.actionTracker.initialize();
|
|
118
107
|
this.logger.info('ActionTracker initialized');
|
|
119
108
|
}
|
|
120
|
-
|
|
109
|
+
// Create rebalancers (both movableCollateral and inventory if configured)
|
|
110
|
+
let rebalancers = [];
|
|
111
|
+
let externalBridgeRegistry = {};
|
|
112
|
+
let inventoryConfig;
|
|
113
|
+
if (!this.config.monitorOnly) {
|
|
114
|
+
const result = await this.contextFactory.createRebalancers(this.actionTracker, this.metrics);
|
|
115
|
+
rebalancers = result.rebalancers;
|
|
116
|
+
externalBridgeRegistry = result.externalBridgeRegistry;
|
|
117
|
+
inventoryConfig = result.inventoryConfig;
|
|
118
|
+
if (rebalancers.length > 0) {
|
|
119
|
+
this.logger.info(`${rebalancers.length} rebalancer(s) created`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
this.logger.warn('Running in monitorOnly mode: no transactions will be executed.');
|
|
124
|
+
}
|
|
125
|
+
// Set instance variable for backward compatibility with executeManual
|
|
126
|
+
// (Task 5 will remove this when refactoring executeManual)
|
|
127
|
+
if (rebalancers.length > 0) {
|
|
128
|
+
this.rebalancer = rebalancers[0];
|
|
129
|
+
}
|
|
130
|
+
if (this.mode === 'daemon') {
|
|
131
|
+
const checkFrequency = this.config.checkFrequency ?? 60_000;
|
|
132
|
+
this.monitor = this.contextFactory.createMonitor(checkFrequency, inventoryConfig);
|
|
133
|
+
}
|
|
134
|
+
this.orchestrator = this.contextFactory.createOrchestrator({
|
|
121
135
|
strategy: this.strategy,
|
|
122
|
-
rebalancer: this.rebalancer,
|
|
123
136
|
actionTracker: this.actionTracker,
|
|
124
137
|
inflightContextAdapter: this.inflightContextAdapter,
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
logger: this.logger,
|
|
138
|
+
rebalancers,
|
|
139
|
+
externalBridgeRegistry: externalBridgeRegistry,
|
|
128
140
|
metrics: this.metrics,
|
|
129
141
|
});
|
|
130
142
|
this.logger.info({
|
|
@@ -157,14 +169,15 @@ export class RebalancerService {
|
|
|
157
169
|
// Use destination-specific bridge override if configured, otherwise use default
|
|
158
170
|
const bridge = originConfig.override?.[destination]?.bridge ?? originConfig.bridge;
|
|
159
171
|
try {
|
|
160
|
-
const
|
|
161
|
-
intentId: randomUUID(),
|
|
172
|
+
const manualRoute = {
|
|
162
173
|
origin,
|
|
163
174
|
destination,
|
|
164
175
|
amount: BigInt(toWei(amount, originToken.decimals)),
|
|
176
|
+
executionType: 'movableCollateral',
|
|
165
177
|
bridge,
|
|
178
|
+
intentId: `manual-${Date.now()}`,
|
|
166
179
|
};
|
|
167
|
-
await this.rebalancer.rebalance([
|
|
180
|
+
await this.rebalancer.rebalance([manualRoute]);
|
|
168
181
|
this.logger.info(`✅ Manual rebalance from ${origin} to ${destination} for amount ${amount} submitted successfully.`);
|
|
169
182
|
}
|
|
170
183
|
catch (error) {
|
|
@@ -221,7 +234,14 @@ export class RebalancerService {
|
|
|
221
234
|
this.logger.info('Rebalancer shutdown complete');
|
|
222
235
|
process.exit(0);
|
|
223
236
|
}
|
|
237
|
+
/**
|
|
238
|
+
* Handle token info events from monitor by delegating to orchestrator
|
|
239
|
+
*/
|
|
224
240
|
async onTokenInfo(event) {
|
|
241
|
+
if (!this.orchestrator) {
|
|
242
|
+
this.logger.error('Orchestrator not initialized');
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
225
245
|
await this.orchestrator.executeCycle(event);
|
|
226
246
|
}
|
|
227
247
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RebalancerService.js","sourceRoot":"","sources":["../../src/core/RebalancerService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RebalancerService.js","sourceRoot":"","sources":["../../src/core/RebalancerService.ts"],"names":[],"mappings":"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"}
|