@streamr/node 101.0.0-beta.1 → 101.0.0-beta.3
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/package.json +6 -6
- package/dist/src/plugins/consoleMetrics/ConsoleMetricsPlugin.js +1 -1
- package/dist/src/plugins/consoleMetrics/ConsoleMetricsPlugin.js.map +1 -1
- package/dist/src/plugins/mqtt/Bridge.js +2 -3
- package/dist/src/plugins/mqtt/Bridge.js.map +1 -1
- package/dist/src/plugins/mqtt/MqttServer.js.map +1 -1
- package/dist/src/plugins/operator/ConsistentHashRing.d.ts +1 -1
- package/dist/src/plugins/operator/ConsistentHashRing.js +2 -2
- package/dist/src/plugins/operator/ConsistentHashRing.js.map +1 -1
- package/dist/src/plugins/operator/MaintainTopologyHelper.d.ts +4 -4
- package/dist/src/plugins/operator/MaintainTopologyHelper.js +18 -19
- package/dist/src/plugins/operator/MaintainTopologyHelper.js.map +1 -1
- package/dist/src/plugins/operator/MaintainTopologyService.js +1 -2
- package/dist/src/plugins/operator/MaintainTopologyService.js.map +1 -1
- package/dist/src/plugins/operator/OperatorFleetState.d.ts +2 -2
- package/dist/src/plugins/operator/OperatorFleetState.js.map +1 -1
- package/dist/src/plugins/operator/OperatorPlugin.d.ts +1 -1
- package/dist/src/plugins/operator/OperatorPlugin.js +45 -54
- package/dist/src/plugins/operator/OperatorPlugin.js.map +1 -1
- package/dist/src/plugins/operator/StreamPartAssignments.d.ts +1 -1
- package/dist/src/plugins/operator/StreamPartAssignments.js.map +1 -1
- package/dist/src/plugins/operator/announceNodeToContract.d.ts +2 -3
- package/dist/src/plugins/operator/announceNodeToContract.js +8 -8
- package/dist/src/plugins/operator/announceNodeToContract.js.map +1 -1
- package/dist/src/plugins/operator/checkOperatorValueBreach.d.ts +2 -2
- package/dist/src/plugins/operator/checkOperatorValueBreach.js +4 -4
- package/dist/src/plugins/operator/checkOperatorValueBreach.js.map +1 -1
- package/dist/src/plugins/operator/closeExpiredFlags.d.ts +2 -3
- package/dist/src/plugins/operator/closeExpiredFlags.js +6 -6
- package/dist/src/plugins/operator/closeExpiredFlags.js.map +1 -1
- package/dist/src/plugins/operator/formCoordinationStreamId.d.ts +1 -2
- package/dist/src/plugins/operator/formCoordinationStreamId.js +2 -2
- package/dist/src/plugins/operator/formCoordinationStreamId.js.map +1 -1
- package/dist/src/plugins/operator/inspectRandomNode.d.ts +3 -4
- package/dist/src/plugins/operator/inspectRandomNode.js +5 -6
- package/dist/src/plugins/operator/inspectRandomNode.js.map +1 -1
- package/dist/src/plugins/operator/inspectionUtils.d.ts +3 -5
- package/dist/src/plugins/operator/inspectionUtils.js +11 -10
- package/dist/src/plugins/operator/inspectionUtils.js.map +1 -1
- package/dist/src/plugins/operator/maintainOperatorValue.d.ts +2 -2
- package/dist/src/plugins/operator/maintainOperatorValue.js +3 -3
- package/dist/src/plugins/operator/maintainOperatorValue.js.map +1 -1
- package/dist/src/plugins/operator/reviewSuspectNode.d.ts +3 -4
- package/dist/src/plugins/operator/reviewSuspectNode.js +4 -5
- package/dist/src/plugins/operator/reviewSuspectNode.js.map +1 -1
- package/dist/src/plugins/storage/BatchManager.js +1 -2
- package/dist/src/plugins/storage/BatchManager.js.map +1 -1
- package/dist/src/plugins/storage/BucketManager.js +2 -3
- package/dist/src/plugins/storage/BucketManager.js.map +1 -1
- package/dist/src/plugins/storage/DataQueryFormat.d.ts +1 -1
- package/dist/src/plugins/storage/DataQueryFormat.js +2 -2
- package/dist/src/plugins/storage/DataQueryFormat.js.map +1 -1
- package/dist/src/plugins/storage/Storage.d.ts +4 -4
- package/dist/src/plugins/storage/Storage.js +8 -10
- package/dist/src/plugins/storage/Storage.js.map +1 -1
- package/dist/src/plugins/storage/StorageConfig.d.ts +1 -2
- package/dist/src/plugins/storage/StorageConfig.js +1 -1
- package/dist/src/plugins/storage/StorageConfig.js.map +1 -1
- package/dist/src/plugins/storage/StorageEventListener.js +4 -4
- package/dist/src/plugins/storage/StorageEventListener.js.map +1 -1
- package/dist/src/plugins/storage/StoragePlugin.d.ts +1 -1
- package/dist/src/plugins/storage/StoragePlugin.js +6 -7
- package/dist/src/plugins/storage/StoragePlugin.js.map +1 -1
- package/dist/src/plugins/storage/storageConfigEndpoint.d.ts +1 -1
- package/dist/src/plugins/storage/storageConfigEndpoint.js +2 -2
- package/dist/src/plugins/storage/storageConfigEndpoint.js.map +1 -1
- package/package.json +6 -6
- package/dist/src/plugins/operator/ContractFacade.d.ts +0 -80
- package/dist/src/plugins/operator/ContractFacade.js +0 -376
- package/dist/src/plugins/operator/ContractFacade.js.map +0 -1
- package/dist/src/plugins/operator/fetchRedundancyFactor.d.ts +0 -2
- package/dist/src/plugins/operator/fetchRedundancyFactor.js +0 -43
- package/dist/src/plugins/operator/fetchRedundancyFactor.js.map +0 -1
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "101.0.0-beta.
|
|
3
|
+
"version": "101.0.0-beta.3",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@ensdomains/ens-contracts": "1.1.4",
|
|
32
32
|
"@inquirer/prompts": "^4.2.1",
|
|
33
33
|
"@streamr/config": "^5.3.12",
|
|
34
|
+
"@streamr/dht": "101.0.0-beta.3",
|
|
34
35
|
"@streamr/network-contracts-ethers6": "^7.1.2",
|
|
35
|
-
"@streamr/
|
|
36
|
-
"@streamr/
|
|
37
|
-
"@streamr/utils": "101.0.0-beta.1",
|
|
36
|
+
"@streamr/sdk": "101.0.0-beta.3",
|
|
37
|
+
"@streamr/utils": "101.0.0-beta.3",
|
|
38
38
|
"aedes": "^0.51.0",
|
|
39
39
|
"ajv": "^8.8.2",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
@@ -44,6 +44,7 @@
|
|
|
44
44
|
"consistent-hash": "^1.1.1",
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"ethers": "^6.13.0",
|
|
47
|
+
"eventemitter3": "^5.0.0",
|
|
47
48
|
"express": "^4.19.2",
|
|
48
49
|
"heap": "^0.2.6",
|
|
49
50
|
"lodash": "^4.17.21",
|
|
@@ -58,8 +59,7 @@
|
|
|
58
59
|
},
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@inquirer/testing": "^2.1.12",
|
|
61
|
-
"@streamr/
|
|
62
|
-
"@streamr/test-utils": "101.0.0-beta.1",
|
|
62
|
+
"@streamr/test-utils": "101.0.0-beta.3",
|
|
63
63
|
"@types/cors": "^2.8.17",
|
|
64
64
|
"@types/express": "^4.17.21",
|
|
65
65
|
"@types/heap": "^0.2.34",
|
|
@@ -15,7 +15,7 @@ function formatNumber(n) {
|
|
|
15
15
|
class ConsoleMetricsPlugin extends Plugin_1.Plugin {
|
|
16
16
|
abortController = new AbortController();
|
|
17
17
|
async start(streamrClient) {
|
|
18
|
-
const metricsContext =
|
|
18
|
+
const metricsContext = await streamrClient.getNode().getMetricsContext();
|
|
19
19
|
metricsContext.createReportProducer((report) => {
|
|
20
20
|
// omit timestamp info as that is printed by the logger
|
|
21
21
|
const data = (0, omit_1.default)(report, 'period');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleMetricsPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsD;AAEtD,uDAA8B;AAE9B,yCAAqC;AACrC,8EAAuD;AAEvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,SAAS,YAAY,CAAC,CAAS;IAC3B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACxD,CAAC;AAMD,MAAa,oBAAqB,SAAQ,eAAkC;IAEvD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAExD,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"ConsoleMetricsPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsD;AAEtD,uDAA8B;AAE9B,yCAAqC;AACrC,8EAAuD;AAEvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,SAAS,YAAY,CAAC,CAAS;IAC3B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACxD,CAAC;AAMD,MAAa,oBAAqB,SAAQ,eAAkC;IAEvD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAExD,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC,iBAAiB,EAAE,CAAA;QACxE,cAAc,CAAC,oBAAoB,CAAC,CAAC,MAAqB,EAAE,EAAE;YAC1D,uDAAuD;YACvD,MAAM,IAAI,GAAG,IAAA,cAAI,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnC,4CAA4C;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACnE,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAA;QACpC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpF,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAED,kDAAkD;IACzC,eAAe;QACpB,OAAO,4BAAoB,CAAA;IAC/B,CAAC;CACJ;AAvBD,oDAuBC"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Bridge = void 0;
|
|
7
|
-
const protocol_1 = require("@streamr/protocol");
|
|
8
7
|
const utils_1 = require("@streamr/utils");
|
|
9
8
|
const without_1 = __importDefault(require("lodash/without"));
|
|
10
9
|
const parser_1 = require("../../helpers/parser");
|
|
@@ -114,7 +113,7 @@ class Bridge {
|
|
|
114
113
|
getSubscribeStreamPart(topic) {
|
|
115
114
|
const { base, query } = (0, parser_1.parseQueryAndBase)(topic);
|
|
116
115
|
const partition = (0, parser_1.parseQueryParameter)('partition', query, parser_1.parsePositiveInteger);
|
|
117
|
-
return (0,
|
|
116
|
+
return (0, utils_1.toStreamPartID)(this.getStreamId(base), partition ?? DEFAULT_PARTITION);
|
|
118
117
|
}
|
|
119
118
|
getPublishStreamPart(topic) {
|
|
120
119
|
const { base, query } = (0, parser_1.parseQueryAndBase)(topic);
|
|
@@ -124,7 +123,7 @@ class Bridge {
|
|
|
124
123
|
};
|
|
125
124
|
}
|
|
126
125
|
getStreamId(topicBase) {
|
|
127
|
-
return (0,
|
|
126
|
+
return (0, utils_1.toStreamID)((this.streamIdDomain !== undefined) ? `${this.streamIdDomain}/${topicBase}` : topicBase);
|
|
128
127
|
}
|
|
129
128
|
getSubscription(streamPartId) {
|
|
130
129
|
return this.subscriptions.find((s) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Bridge.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/Bridge.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"Bridge.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/Bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttServer.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,gDAAuB;
|
|
1
|
+
{"version":3,"file":"MqttServer.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ConsistentHashRing = void 0;
|
|
7
|
-
const
|
|
7
|
+
const utils_1 = require("@streamr/utils");
|
|
8
8
|
const consistent_hash_1 = __importDefault(require("consistent-hash"));
|
|
9
9
|
/**
|
|
10
10
|
* Slight variations at the very end of a string will not result in the keys
|
|
@@ -14,7 +14,7 @@ const consistent_hash_1 = __importDefault(require("consistent-hash"));
|
|
|
14
14
|
* TODO: use md5 instead?
|
|
15
15
|
*/
|
|
16
16
|
function formKey(streamPartId) {
|
|
17
|
-
const [streamId, partition] =
|
|
17
|
+
const [streamId, partition] = utils_1.StreamPartIDUtils.getStreamIDAndPartition(streamPartId);
|
|
18
18
|
return `${partition}#${streamId}`;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsistentHashRing.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ConsistentHashRing.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"ConsistentHashRing.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ConsistentHashRing.ts"],"names":[],"mappings":";;;;;;AACA,0CAAgE;AAChE,sEAA4C;AAE5C;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,YAA0B;IACvC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,yBAAiB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;IACrF,OAAO,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAA;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAa,kBAAkB;IACV,KAAK,GAAG,IAAI,KAAK,EAAc,CAAA;IACxC,cAAc,CAAiB;IACtB,gBAAgB,CAAQ;IAEzC,YAAY,gBAAwB;QAChC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAC5C,CAAC;IAED,GAAG,CAAC,MAAkB;QAClB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QACnC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAkB;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACtC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YACzB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QACnC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,YAA0B;QAC1B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,GAAG,IAAI,yBAAc,CAAC;gBACrC,YAAY,EAAE,SAAS;aAC1B,CAAC,CAAA;YACF,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;YACjB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACpF,OAAO,MAAsB,IAAI,EAAE,CAAA;IACvC,CAAC;CACJ;AArCD,gDAqCC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Operator } from '@streamr/sdk';
|
|
2
|
+
import { StreamID } from '@streamr/utils';
|
|
2
3
|
import { EventEmitter } from 'eventemitter3';
|
|
3
|
-
import { ContractFacade } from './ContractFacade';
|
|
4
4
|
export interface MaintainTopologyHelperEvents {
|
|
5
5
|
/**
|
|
6
6
|
* Emitted when staking into a Sponsorship on a stream that we haven't staked on before (in another Sponsorship)
|
|
@@ -16,8 +16,8 @@ export declare class MaintainTopologyHelper extends EventEmitter<MaintainTopolog
|
|
|
16
16
|
private readonly sponsorshipCountOfStream;
|
|
17
17
|
private onStakedListener?;
|
|
18
18
|
private onUnstakedListener?;
|
|
19
|
-
private readonly
|
|
20
|
-
constructor(
|
|
19
|
+
private readonly operator;
|
|
20
|
+
constructor(operator: Operator);
|
|
21
21
|
start(): Promise<void>;
|
|
22
22
|
stop(): void;
|
|
23
23
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MaintainTopologyHelper = void 0;
|
|
4
|
-
const protocol_1 = require("@streamr/protocol");
|
|
5
4
|
const utils_1 = require("@streamr/utils");
|
|
6
5
|
const eventemitter3_1 = require("eventemitter3");
|
|
7
6
|
const logger = new utils_1.Logger(module);
|
|
@@ -10,17 +9,18 @@ class MaintainTopologyHelper extends eventemitter3_1.EventEmitter {
|
|
|
10
9
|
sponsorshipCountOfStream = new Map();
|
|
11
10
|
onStakedListener;
|
|
12
11
|
onUnstakedListener;
|
|
13
|
-
|
|
14
|
-
constructor(
|
|
12
|
+
operator;
|
|
13
|
+
constructor(operator) {
|
|
15
14
|
super();
|
|
16
|
-
this.
|
|
15
|
+
this.operator = operator;
|
|
17
16
|
}
|
|
18
17
|
async start() {
|
|
19
|
-
const latestBlock = await this.
|
|
20
|
-
this.onStakedListener = async (
|
|
18
|
+
const latestBlock = await this.operator.getCurrentBlockNumber();
|
|
19
|
+
this.onStakedListener = async (event) => {
|
|
20
|
+
const sponsorship = event.sponsorship;
|
|
21
21
|
logger.info('Receive "Staked" event', { sponsorship });
|
|
22
22
|
const sponsorshipAddress = (0, utils_1.toEthereumAddress)(sponsorship);
|
|
23
|
-
const streamId = await this.
|
|
23
|
+
const streamId = await this.operator.getStreamId(sponsorshipAddress); // TODO: add catching here
|
|
24
24
|
if (this.streamIdOfSponsorship.has(sponsorshipAddress)) {
|
|
25
25
|
logger.debug('Ignore already staked into sponsorship', { sponsorship });
|
|
26
26
|
return;
|
|
@@ -32,8 +32,9 @@ class MaintainTopologyHelper extends eventemitter3_1.EventEmitter {
|
|
|
32
32
|
this.emit('addStakedStreams', [streamId]);
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
|
-
this.
|
|
36
|
-
this.onUnstakedListener = (
|
|
35
|
+
this.operator.on('staked', this.onStakedListener);
|
|
36
|
+
this.onUnstakedListener = (event) => {
|
|
37
|
+
const sponsorship = event.sponsorship;
|
|
37
38
|
logger.info('Receive "Unstaked" event', { sponsorship });
|
|
38
39
|
const sponsorshipAddress = (0, utils_1.toEthereumAddress)(sponsorship);
|
|
39
40
|
const streamId = this.streamIdOfSponsorship.get(sponsorshipAddress);
|
|
@@ -49,15 +50,13 @@ class MaintainTopologyHelper extends eventemitter3_1.EventEmitter {
|
|
|
49
50
|
this.emit('removeStakedStream', streamId);
|
|
50
51
|
}
|
|
51
52
|
};
|
|
52
|
-
this.
|
|
53
|
-
const queryResult = this.
|
|
53
|
+
this.operator.on('unstaked', this.onUnstakedListener);
|
|
54
|
+
const queryResult = this.operator.pullStakedStreams(latestBlock);
|
|
54
55
|
for await (const stake of queryResult) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
this.
|
|
59
|
-
const sponsorshipCount = (this.sponsorshipCountOfStream.get(streamId) || 0) + 1;
|
|
60
|
-
this.sponsorshipCountOfStream.set(streamId, sponsorshipCount);
|
|
56
|
+
if (this.streamIdOfSponsorship.get(stake.sponsorship) !== stake.streamId) {
|
|
57
|
+
this.streamIdOfSponsorship.set(stake.sponsorship, stake.streamId);
|
|
58
|
+
const sponsorshipCount = (this.sponsorshipCountOfStream.get(stake.streamId) || 0) + 1;
|
|
59
|
+
this.sponsorshipCountOfStream.set(stake.streamId, sponsorshipCount);
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
62
|
if (this.sponsorshipCountOfStream.size > 0) {
|
|
@@ -66,8 +65,8 @@ class MaintainTopologyHelper extends eventemitter3_1.EventEmitter {
|
|
|
66
65
|
}
|
|
67
66
|
}
|
|
68
67
|
stop() {
|
|
69
|
-
this.
|
|
70
|
-
this.
|
|
68
|
+
this.operator.off('staked', this.onStakedListener);
|
|
69
|
+
this.operator.off('unstaked', this.onUnstakedListener);
|
|
71
70
|
this.removeAllListeners();
|
|
72
71
|
}
|
|
73
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaintainTopologyHelper.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyHelper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MaintainTopologyHelper.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MaintainTopologyService = void 0;
|
|
7
7
|
const utils_1 = require("@streamr/utils");
|
|
8
|
-
const protocol_1 = require("@streamr/protocol");
|
|
9
8
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
10
9
|
const logger = new utils_1.Logger(module);
|
|
11
10
|
class MaintainTopologyService {
|
|
@@ -18,7 +17,7 @@ class MaintainTopologyService {
|
|
|
18
17
|
assignments.on('unassigned', this.onRemoveStakedStreamPart);
|
|
19
18
|
}
|
|
20
19
|
onAddStakedStreamPart = this.concurrencyLimiter(async (streamPartId) => {
|
|
21
|
-
const [id, partition] =
|
|
20
|
+
const [id, partition] = utils_1.StreamPartIDUtils.getStreamIDAndPartition(streamPartId);
|
|
22
21
|
let subscription;
|
|
23
22
|
try {
|
|
24
23
|
logger.info('Join stream partition', { streamPartId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaintainTopologyService.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyService.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"MaintainTopologyService.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyService.ts"],"names":[],"mappings":";;;;;;AACA,0CAAwE;AACxE,sDAA4B;AAG5B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAuB;IACf,aAAa,CAAe;IAC5B,aAAa,GAAG,IAAI,GAAG,EAA8B,CAAA;IACrD,gBAAgB,GAAG,IAAA,iBAAM,EAAC,CAAC,CAAC,CAAA;IAE7C,YAAY,aAA4B,EAAE,WAAkC;QACxE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACtD,WAAW,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC/D,CAAC;IAEO,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,YAA0B,EAAiB,EAAE;QACxG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,yBAAiB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QAC/E,IAAI,YAA0B,CAAA;QAC9B,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;YACtD,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;gBAC9C,EAAE;gBACF,SAAS;gBACT,GAAG,EAAE,IAAI;aACZ,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;YACrF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEM,wBAAwB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,YAA0B,EAAiB,EAAE;QAC3G,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACzD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACvC,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;YACvD,MAAM,YAAY,EAAE,WAAW,EAAE,CAAA;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;IACL,CAAC,CAAC,CAAA;IAEM,kBAAkB,CACtB,EAAiD;QAEjD,OAAO,CAAC,YAAY,EAAE,EAAE;YACpB,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxD,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;CACJ;AAhDD,0DAgDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { StreamID } from '@streamr/protocol';
|
|
3
|
-
import { EventEmitter } from 'eventemitter3';
|
|
4
2
|
import { NetworkPeerDescriptor, StreamrClient } from '@streamr/sdk';
|
|
3
|
+
import { StreamID } from '@streamr/utils';
|
|
4
|
+
import { EventEmitter } from 'eventemitter3';
|
|
5
5
|
export interface OperatorFleetStateEvents {
|
|
6
6
|
added: (nodeId: DhtAddress) => void;
|
|
7
7
|
removed: (nodeId: DhtAddress) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorFleetState.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorFleetState.ts"],"names":[],"mappings":";;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"OperatorFleetState.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorFleetState.ts"],"names":[],"mappings":";;;;;;AAEA,0CAAkG;AAClG,iDAA4C;AAC5C,qDAA4B;AAC5B,uDAA8B;AAC9B,qDAA2E;AAE3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAcjC,gCAAgC;AAChC,MAAa,kBAAmB,SAAQ,4BAAsC;IACzD,aAAa,CAAe;IAC5B,oBAAoB,CAAU;IAC9B,YAAY,CAAc;IAC1B,YAAY,CAAQ;IACpB,iBAAiB,CAAQ;IACzB,qBAAqB,CAAQ;IAC7B,gBAAgB,CAAQ;IACxB,gBAAgB,CAAQ;IACxB,gBAAgB,GAAG,IAAI,GAAG,EAAyB,CAAA;IACnD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IACvC,KAAK,GAAG,IAAI,YAAI,CAAC,KAAK,CAAC,CAAA;IAChC,YAAY,CAAe;IAEnC,MAAM,CAAC,+BAA+B,CAClC,aAA4B,EAC5B,qBAA6B,EAC7B,YAAoB,EACpB,iBAAyB,EACzB,gBAAwB,EACxB,gBAAwB,EACxB,YAAY,GAAG,IAAI,CAAC,GAAG;QAEvB,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,IAAI,kBAAkB,CACnD,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,CACf,CAAA;IACL,CAAC;IAED,YACI,aAA4B,EAC5B,oBAA8B,EAC9B,qBAA6B,EAC7B,YAAoB,EACpB,iBAAyB,EACzB,gBAAwB,EACxB,gBAAwB,EACxB,YAAY,GAAG,IAAI,CAAC,GAAG;QAEvB,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACtC,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;QACrC,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,UAAU,EAAE,EAAE;YAC7F,+GAA+G;YAC/G,cAAc;YACd,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,mBAAmB;gBAChF,OAAM;YACV,CAAC;YAED,IAAI,OAAyB,CAAA;YAC7B,IAAI,CAAC;gBACD,OAAO,GAAG,uCAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YACtD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE;oBAC3D,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;oBAC/C,MAAM,EAAE,GAAG,EAAE,MAAM;iBACtB,CAAC,CAAA;gBACF,OAAM;YACV,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,MAAoB,CAAA;gBAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAChD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE;oBAC9B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;oBAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;iBACzC,CAAC,CAAA;gBACF,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAC9B,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;oBACvB,IAAI,CAAC,wBAAwB,EAAE,CAAA;gBACnC,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QACF,IAAA,4BAAoB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAC7G,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5B,MAAM,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,CAAA;IAC1C,CAAC;IAED,eAAe;QACX,OAAO,IAAA,aAAG,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA,CAAC,2CAA2C;IAC7E,CAAC;IAED,UAAU;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB,CAAC,MAAkB;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,cAAc,CAAA;IAC5D,CAAC;IAEO,wBAAwB,GAAG,IAAA,cAAI,EAAC,GAAG,EAAE;QACzC,IAAA,2BAAmB,EAAC,GAAG,EAAE;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrB,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACvF,CAAC,CAAC,CAAA;IAEM,iBAAiB;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;QAC/B,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1D,IAAI,GAAG,GAAG,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AApID,gDAoIC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { SignerWithProvider, StreamrClient } from '@streamr/sdk';
|
|
1
2
|
import { EthereumAddress } from '@streamr/utils';
|
|
2
3
|
import { Schema } from 'ajv';
|
|
3
4
|
import { Overrides } from 'ethers';
|
|
4
|
-
import { StreamrClient, SignerWithProvider } from '@streamr/sdk';
|
|
5
5
|
import { Plugin } from '../../Plugin';
|
|
6
6
|
export interface OperatorPluginConfig {
|
|
7
7
|
operatorContractAddress: string;
|
|
@@ -6,42 +6,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.OperatorPlugin = void 0;
|
|
7
7
|
const utils_1 = require("@streamr/utils");
|
|
8
8
|
const Plugin_1 = require("../../Plugin");
|
|
9
|
-
const
|
|
9
|
+
const MaintainTopologyHelper_1 = require("./MaintainTopologyHelper");
|
|
10
10
|
const MaintainTopologyService_1 = require("./MaintainTopologyService");
|
|
11
11
|
const OperatorFleetState_1 = require("./OperatorFleetState");
|
|
12
|
-
const
|
|
13
|
-
const createIsLeaderFn_1 = require("./createIsLeaderFn");
|
|
12
|
+
const StreamPartAssignments_1 = require("./StreamPartAssignments");
|
|
14
13
|
const announceNodeToContract_1 = require("./announceNodeToContract");
|
|
15
14
|
const announceNodeToStream_1 = require("./announceNodeToStream");
|
|
16
15
|
const checkOperatorValueBreach_1 = require("./checkOperatorValueBreach");
|
|
17
|
-
const
|
|
16
|
+
const closeExpiredFlags_1 = require("./closeExpiredFlags");
|
|
17
|
+
const config_schema_json_1 = __importDefault(require("./config.schema.json"));
|
|
18
|
+
const createIsLeaderFn_1 = require("./createIsLeaderFn");
|
|
18
19
|
const formCoordinationStreamId_1 = require("./formCoordinationStreamId");
|
|
19
|
-
const StreamPartAssignments_1 = require("./StreamPartAssignments");
|
|
20
|
-
const MaintainTopologyHelper_1 = require("./MaintainTopologyHelper");
|
|
21
20
|
const inspectRandomNode_1 = require("./inspectRandomNode");
|
|
22
|
-
const
|
|
21
|
+
const maintainOperatorValue_1 = require("./maintainOperatorValue");
|
|
23
22
|
const reviewSuspectNode_1 = require("./reviewSuspectNode");
|
|
24
|
-
const closeExpiredFlags_1 = require("./closeExpiredFlags");
|
|
25
23
|
const logger = new utils_1.Logger(module);
|
|
26
24
|
class OperatorPlugin extends Plugin_1.Plugin {
|
|
27
25
|
abortController = new AbortController();
|
|
28
26
|
async start(streamrClient) {
|
|
29
|
-
const signer = await streamrClient.getSigner();
|
|
30
27
|
const nodeId = await streamrClient.getNodeId();
|
|
31
28
|
const operatorContractAddress = (0, utils_1.toEthereumAddress)(this.pluginConfig.operatorContractAddress);
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
operatorContractAddress,
|
|
35
|
-
theGraphUrl: streamrClient.getConfig().contracts.theGraphUrl,
|
|
36
|
-
getEthersOverrides: () => streamrClient.getEthersOverrides()
|
|
37
|
-
};
|
|
38
|
-
const redundancyFactor = await (0, fetchRedundancyFactor_1.fetchRedundancyFactor)(serviceConfig);
|
|
29
|
+
const operator = streamrClient.getOperator(operatorContractAddress);
|
|
30
|
+
const redundancyFactor = await operator.fetchRedundancyFactor();
|
|
39
31
|
if (redundancyFactor === undefined) {
|
|
40
32
|
throw new Error('Failed to fetch my redundancy factor');
|
|
41
33
|
}
|
|
42
34
|
logger.info('Fetched my redundancy factor', { redundancyFactor });
|
|
43
|
-
const
|
|
44
|
-
const maintainTopologyHelper = new MaintainTopologyHelper_1.MaintainTopologyHelper(contractFacade);
|
|
35
|
+
const maintainTopologyHelper = new MaintainTopologyHelper_1.MaintainTopologyHelper(operator);
|
|
45
36
|
const createOperatorFleetState = OperatorFleetState_1.OperatorFleetState.createOperatorFleetStateBuilder(streamrClient, this.pluginConfig.heartbeatUpdateIntervalInMs, this.pluginConfig.fleetState.pruneAgeInMs, this.pluginConfig.fleetState.pruneIntervalInMs, this.pluginConfig.fleetState.latencyExtraInMs, this.pluginConfig.fleetState.warmupPeriodInMs);
|
|
46
37
|
const fleetState = createOperatorFleetState((0, formCoordinationStreamId_1.formCoordinationStreamId)(operatorContractAddress));
|
|
47
38
|
const streamPartAssignments = new StreamPartAssignments_1.StreamPartAssignments(nodeId, redundancyFactor, async (streamId) => {
|
|
@@ -64,7 +55,7 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
64
55
|
await (0, announceNodeToStream_1.announceNodeToStream)((0, utils_1.toEthereumAddress)(this.pluginConfig.operatorContractAddress), streamrClient);
|
|
65
56
|
})();
|
|
66
57
|
}, this.pluginConfig.heartbeatUpdateIntervalInMs, this.abortController.signal);
|
|
67
|
-
await (0, utils_1.scheduleAtInterval)(async () => (0, checkOperatorValueBreach_1.checkOperatorValueBreach)(
|
|
58
|
+
await (0, utils_1.scheduleAtInterval)(async () => (0, checkOperatorValueBreach_1.checkOperatorValueBreach)(operator, streamrClient, this.pluginConfig.maintainOperatorValue.minSponsorshipEarningsInWithdraw, this.pluginConfig.maintainOperatorValue.maxSponsorshipsInWithdraw).catch((err) => {
|
|
68
59
|
logger.warn('Encountered error', { err });
|
|
69
60
|
}), this.pluginConfig.checkOperatorValueBreachIntervalInMs, true, this.abortController.signal);
|
|
70
61
|
await fleetState.waitUntilReady();
|
|
@@ -72,7 +63,7 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
72
63
|
try {
|
|
73
64
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
74
65
|
if (isLeader()) {
|
|
75
|
-
await (0, announceNodeToContract_1.announceNodeToContract)(this.pluginConfig.announceNodeToContract.writeIntervalInMs,
|
|
66
|
+
await (0, announceNodeToContract_1.announceNodeToContract)(this.pluginConfig.announceNodeToContract.writeIntervalInMs, operator, streamrClient);
|
|
76
67
|
}
|
|
77
68
|
}, this.pluginConfig.announceNodeToContract.pollIntervalInMs, true, this.abortController.signal);
|
|
78
69
|
}
|
|
@@ -83,7 +74,7 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
83
74
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
84
75
|
if (isLeader()) {
|
|
85
76
|
try {
|
|
86
|
-
await (0, maintainOperatorValue_1.maintainOperatorValue)(this.pluginConfig.maintainOperatorValue.withdrawLimitSafetyFraction, this.pluginConfig.maintainOperatorValue.minSponsorshipEarningsInWithdraw, this.pluginConfig.maintainOperatorValue.maxSponsorshipsInWithdraw,
|
|
77
|
+
await (0, maintainOperatorValue_1.maintainOperatorValue)(this.pluginConfig.maintainOperatorValue.withdrawLimitSafetyFraction, this.pluginConfig.maintainOperatorValue.minSponsorshipEarningsInWithdraw, this.pluginConfig.maintainOperatorValue.maxSponsorshipsInWithdraw, operator);
|
|
87
78
|
}
|
|
88
79
|
catch (err) {
|
|
89
80
|
logger.error('Encountered error while checking earnings', { err });
|
|
@@ -92,10 +83,9 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
92
83
|
}, this.pluginConfig.maintainOperatorValue.intervalInMs, true, this.abortController.signal);
|
|
93
84
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
94
85
|
try {
|
|
95
|
-
await (0, inspectRandomNode_1.inspectRandomNode)(operatorContractAddress,
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}), createOperatorFleetState, this.abortController.signal);
|
|
86
|
+
await (0, inspectRandomNode_1.inspectRandomNode)(operatorContractAddress, operator, streamPartAssignments, streamrClient, this.pluginConfig.heartbeatTimeoutInMs, async (targetOperatorContractAddress) => {
|
|
87
|
+
return streamrClient.getOperator(targetOperatorContractAddress).fetchRedundancyFactor();
|
|
88
|
+
}, createOperatorFleetState, this.abortController.signal);
|
|
99
89
|
}
|
|
100
90
|
catch (err) {
|
|
101
91
|
logger.error('Encountered error while inspecting random node', { err });
|
|
@@ -103,41 +93,42 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
103
93
|
}, this.pluginConfig.inspectRandomNode.intervalInMs, false, this.abortController.signal);
|
|
104
94
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
105
95
|
try {
|
|
106
|
-
await (0, closeExpiredFlags_1.closeExpiredFlags)(this.pluginConfig.closeExpiredFlags.maxAgeInMs,
|
|
96
|
+
await (0, closeExpiredFlags_1.closeExpiredFlags)(this.pluginConfig.closeExpiredFlags.maxAgeInMs, operator);
|
|
107
97
|
}
|
|
108
98
|
catch (err) {
|
|
109
99
|
logger.error('Encountered error while closing expired flags', { err });
|
|
110
100
|
}
|
|
111
101
|
}, this.pluginConfig.closeExpiredFlags.intervalInMs, false, this.abortController.signal);
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
102
|
+
(0, utils_1.addManagedEventListener)(operator, 'reviewRequested', (event) => {
|
|
103
|
+
setImmediate(async () => {
|
|
104
|
+
try {
|
|
105
|
+
if (isLeader()) {
|
|
106
|
+
await (0, reviewSuspectNode_1.reviewSuspectNode)({
|
|
107
|
+
sponsorshipAddress: event.sponsorship,
|
|
108
|
+
targetOperator: event.targetOperator,
|
|
109
|
+
partition: event.partition,
|
|
110
|
+
myOperator: operator,
|
|
111
|
+
streamrClient,
|
|
112
|
+
createOperatorFleetState,
|
|
113
|
+
getRedundancyFactor: async (targetOperatorContractAddress) => {
|
|
114
|
+
return streamrClient.getOperator(targetOperatorContractAddress).fetchRedundancyFactor();
|
|
115
|
+
},
|
|
116
|
+
maxSleepTime: 5 * 60 * 1000,
|
|
117
|
+
heartbeatTimeoutInMs: this.pluginConfig.heartbeatTimeoutInMs,
|
|
118
|
+
votingPeriod: {
|
|
119
|
+
startTime: event.votingPeriodStartTimestamp,
|
|
120
|
+
endTime: event.votingPeriodEndTimestamp
|
|
121
|
+
},
|
|
122
|
+
inspectionIntervalInMs: 8 * 60 * 1000,
|
|
123
|
+
maxInspections: 10,
|
|
124
|
+
abortSignal: this.abortController.signal
|
|
125
|
+
});
|
|
126
|
+
}
|
|
136
127
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
logger.error('Encountered error while processing review request', { err });
|
|
130
|
+
}
|
|
131
|
+
});
|
|
141
132
|
}, this.abortController.signal);
|
|
142
133
|
});
|
|
143
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { StreamID, StreamPartID } from '@streamr/
|
|
2
|
+
import { StreamID, StreamPartID } from '@streamr/utils';
|
|
3
3
|
import EventEmitter3 from 'eventemitter3';
|
|
4
4
|
import { MaintainTopologyHelperEvents } from './MaintainTopologyHelper';
|
|
5
5
|
import { OperatorFleetStateEvents } from './OperatorFleetState';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":";;;;;;AACA,0CAA+D;AAC/D,kEAAyC;AACzC,sDAA4B;AAC5B,6DAAyD;AAIzD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAsB,SAAQ,uBAAyC;IAC/D,cAAc,GAAG,IAAI,GAAG,EAAgB,CAAA;IACxC,aAAa,GAAG,IAAI,GAAG,EAAgB,CAAA;IACvC,gBAAgB,GAAG,IAAA,iBAAM,EAAC,CAAC,CAAC,CAAA;IAC5B,kBAAkB,CAAoB;IACtC,QAAQ,CAAY;IACpB,cAAc,CAAiD;IAC/D,kBAAkB,CAAyC;IAC3D,sBAAsB,CAA6C;IAEpF,YACI,QAAoB,EACpB,gBAAwB,EACxB,cAA+D,EAC/D,kBAA2D,EAC3D,sBAAmE;QAEnE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAA;QACpD,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,gBAAgB,CAAC,CAAA;QAClE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACnD,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACvD,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;QACtE,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC7E,CAAC;IAED,gBAAgB;QACZ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACzC,CAAC;IAEO,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAkB,EAAiB,EAAE;QACpF,IAAI,MAAM,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAM;QACV,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnC,IAAI,CAAC,sBAAsB,CAAC,aAAa,MAAM,EAAE,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAkB,EAAiB,EAAE;QACtF,IAAI,MAAM,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAM;QACV,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACtC,IAAI,CAAC,sBAAsB,CAAC,eAAe,MAAM,EAAE,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,SAAqB,EAAiB,EAAE;QAC3F,MAAM,aAAa,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACtF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACzC,CAAC;QACD,+EAA+E;QAC/E,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACpE,CAAC,CAAC,CAAA;IAEM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAkB,EAAiB,EAAE;QACzF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAC3D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC5C,CAAC;QACD,iFAAiF;QACjF,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAA;IAC7D,CAAC,CAAC,CAAA;IAEM,sBAAsB,CAAC,OAAe;QAC1C,MAAM,QAAQ,GAAmB,EAAE,CAAA;QACnC,MAAM,UAAU,GAAmB,EAAE,CAAA;QACrC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7G,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;gBACpC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;YACvC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/G,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAC7B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBACvC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;YACzC,CAAC;QACL,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7E,CAAC;IAEO,gBAAgB,GAAG,KAAK,EAAE,QAAkB,EAA2B,EAAE;QAC7E,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;YAC7E,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC,CAAA;IAEO,kBAAkB,CACtB,EAA2B;QAE3B,OAAO,CAAC,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC7C,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;CACJ;AA1GD,sDA0GC"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import StreamrClient from '@streamr/sdk';
|
|
2
|
-
|
|
3
|
-
export declare const announceNodeToContract: (writeIntervalInMs: number, contractFacade: ContractFacade, streamrClient: StreamrClient) => Promise<void>;
|
|
1
|
+
import { Operator, StreamrClient } from '@streamr/sdk';
|
|
2
|
+
export declare const announceNodeToContract: (writeIntervalInMs: number, operator: Operator, streamrClient: StreamrClient) => Promise<void>;
|