@streamr/node 100.2.4 → 100.2.5-beta.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.
Files changed (20) hide show
  1. package/configs/development-1.env.json +2 -1
  2. package/configs/development-2.env.json +2 -1
  3. package/configs/development-3.env.json +2 -1
  4. package/configs/docker-1.env.json +2 -1
  5. package/configs/docker-2.env.json +2 -1
  6. package/configs/docker-3.env.json +2 -1
  7. package/dist/package.json +9 -9
  8. package/dist/src/config/ConfigWizard.js +7 -7
  9. package/dist/src/config/ConfigWizard.js.map +1 -1
  10. package/dist/src/helpers/generateMnemonicFromAddress.js +2 -2
  11. package/dist/src/helpers/generateMnemonicFromAddress.js.map +1 -1
  12. package/dist/src/plugins/operator/ContractFacade.d.ts +5 -5
  13. package/dist/src/plugins/operator/ContractFacade.js +37 -25
  14. package/dist/src/plugins/operator/ContractFacade.js.map +1 -1
  15. package/dist/src/plugins/operator/OperatorPlugin.d.ts +1 -1
  16. package/dist/src/plugins/operator/announceNodeToContract.js +1 -1
  17. package/dist/src/plugins/operator/announceNodeToContract.js.map +1 -1
  18. package/dist/src/plugins/operator/fetchRedundancyFactor.js +2 -2
  19. package/dist/src/plugins/operator/fetchRedundancyFactor.js.map +1 -1
  20. package/package.json +9 -9
package/configs/development-1.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/configs/development-2.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/configs/development-3.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/configs/docker-1.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/configs/docker-2.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/configs/docker-3.env.json CHANGED
@@ -35,7 +35,8 @@
35
35
  "streamStorageRegistryChainAddress": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
36
36
  "storageNodeRegistryChainAddress": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
37
37
  "streamRegistryChainRPCs": {
38
- "chainId": 8995,
38
+ "chainId": 31337,
39
+ "name": "dev2",
39
40
  "rpcs": [
40
41
  {
41
42
  "url": "http://10.200.10.1:8547"
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/node",
3
- "version": "100.2.4",
3
+ "version": "100.2.5-beta.0",
4
4
  "description": "A full-featured node implementation for the Streamr Network",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,13 +28,13 @@
28
28
  "author": "Streamr Network AG <contact@streamr.network>",
29
29
  "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
30
30
  "dependencies": {
31
- "@ethersproject/hdnode": "^5.4.0",
31
+ "@ensdomains/ens-contracts": "1.1.4",
32
32
  "@inquirer/prompts": "^4.2.1",
33
33
  "@streamr/config": "^5.3.7",
34
- "@streamr/network-contracts": "^7.1.1",
35
- "@streamr/protocol": "100.2.4",
36
- "@streamr/sdk": "100.2.4",
37
- "@streamr/utils": "100.2.4",
34
+ "@streamr/network-contracts-ethers6": "^7.1.2",
35
+ "@streamr/protocol": "100.2.5-beta.0",
36
+ "@streamr/sdk": "100.2.5-beta.0",
37
+ "@streamr/utils": "100.2.5-beta.0",
38
38
  "aedes": "^0.51.0",
39
39
  "ajv": "^8.8.2",
40
40
  "ajv-formats": "^2.1.1",
@@ -43,7 +43,7 @@
43
43
  "commander": "^12.0.0",
44
44
  "consistent-hash": "^1.1.1",
45
45
  "cors": "^2.8.5",
46
- "ethers": "^5.4.7",
46
+ "ethers": "^6.12.0",
47
47
  "express": "^4.19.2",
48
48
  "heap": "^0.2.6",
49
49
  "lodash": "^4.17.21",
@@ -58,8 +58,8 @@
58
58
  },
59
59
  "devDependencies": {
60
60
  "@inquirer/testing": "^2.1.12",
61
- "@streamr/dht": "100.2.4",
62
- "@streamr/test-utils": "100.2.4",
61
+ "@streamr/dht": "100.2.5-beta.0",
62
+ "@streamr/test-utils": "100.2.5-beta.0",
63
63
  "@types/cors": "^2.8.17",
64
64
  "@types/express": "^4.17.21",
65
65
  "@types/heap": "^0.2.34",
package/dist/src/config/ConfigWizard.js CHANGED
@@ -32,20 +32,20 @@ const config_1 = require("@streamr/config");
32
32
  const utils_1 = require("@streamr/utils");
33
33
  const chalk_1 = __importDefault(require("chalk"));
34
34
  const ethers_1 = require("ethers");
35
- const utils_2 = require("ethers/lib/utils");
36
35
  const fs_1 = require("fs");
37
36
  const capitalize_1 = __importDefault(require("lodash/capitalize"));
38
37
  const omit_1 = __importDefault(require("lodash/omit"));
39
38
  const path_1 = __importDefault(require("path"));
40
39
  const uuid_1 = require("uuid");
41
40
  const zod_1 = require("zod");
41
+ const node_fetch_1 = __importDefault(require("node-fetch"));
42
42
  const migration_1 = require("../config/migration");
43
43
  const generateMnemonicFromAddress_1 = require("../helpers/generateMnemonicFromAddress");
44
44
  const MqttConfigSchema = __importStar(require("../plugins/mqtt/config.schema.json"));
45
45
  const WebsocketConfigSchema = __importStar(require("../plugins/websocket/config.schema.json"));
46
46
  const config_2 = require("./config");
47
47
  const BrokerConfigSchema = __importStar(require("./config.schema.json"));
48
- const MIN_BALANCE = ethers_1.utils.parseEther('0.1');
48
+ const MIN_BALANCE = (0, ethers_1.parseEther)('0.1');
49
49
  async function start() {
50
50
  log(`
51
51
  >
@@ -109,9 +109,9 @@ async function start() {
109
109
  const resume = animateLine((spinner) => style(`> Your node address has *${spinner} MATIC* _– checking balance…_`));
110
110
  try {
111
111
  const balance = await getNativeBalance(environmentId, nodeAddress);
112
- const content = `Your node address has *${Number(ethers_1.utils.formatEther(balance)).toFixed(2)} MATIC*`;
112
+ const content = `Your node address has *${Number((0, ethers_1.formatEther)(balance)).toFixed(2)} MATIC*`;
113
113
  resume();
114
- if (balance.lt(MIN_BALANCE)) {
114
+ if (balance < MIN_BALANCE) {
115
115
  log(`
116
116
  > ! ${content}. You'll need to fund it with a small amount of MATIC tokens.
117
117
  `);
@@ -252,7 +252,7 @@ async function getOperatorAddress() {
252
252
  const operator = await (0, prompts_1.input)({
253
253
  message: 'Enter your Operator address:',
254
254
  validate(value) {
255
- return (0, utils_2.isAddress)(value) ? true : 'Invalid ethereum address';
255
+ return (0, ethers_1.isAddress)(value) ? true : 'Invalid ethereum address';
256
256
  },
257
257
  });
258
258
  return operator.toLowerCase();
@@ -363,7 +363,7 @@ async function getNativeBalance(environmentId, address) {
363
363
  if (!url || !/^https?:/i.test(url)) {
364
364
  throw new Error('Invalid RPC');
365
365
  }
366
- return new ethers_1.providers.JsonRpcProvider(url).getBalance(address);
366
+ return new ethers_1.JsonRpcProvider(url).getBalance(address);
367
367
  }
368
368
  /**
369
369
  * Gets an array of node addresses associated with the given operator
@@ -371,7 +371,7 @@ async function getNativeBalance(environmentId, address) {
371
371
  */
372
372
  async function getOperatorNodeAddresses(environmentId, operatorAddress) {
373
373
  const url = config_1.config[environmentId].theGraphUrl;
374
- const resp = await fetch(url, {
374
+ const resp = await (0, node_fetch_1.default)(url, {
375
375
  method: 'POST',
376
376
  body: JSON.stringify({
377
377
  query: `query { operator(id: "${operatorAddress}") { nodes } }`,
package/dist/src/config/ConfigWizard.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ConfigWizard.js","sourceRoot":"","sources":["../../../src/config/ConfigWizard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConfigWizard.js","sourceRoot":"","sources":["../../../src/config/ConfigWizard.ts"],"names":[],"mappings":"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"}
package/dist/src/helpers/generateMnemonicFromAddress.js CHANGED
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateMnemonicFromAddress = void 0;
4
- const hdnode_1 = require("@ethersproject/hdnode");
4
+ const ethers_1 = require("ethers");
5
5
  /**
6
6
  * @param address - valid eth address with leading 0x
7
7
  */
8
8
  const generateMnemonicFromAddress = (address) => {
9
- return (0, hdnode_1.entropyToMnemonic)(address)
9
+ return ethers_1.Mnemonic.entropyToPhrase(address)
10
10
  .split(' ')
11
11
  .slice(0, 3)
12
12
  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
package/dist/src/helpers/generateMnemonicFromAddress.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateMnemonicFromAddress.js","sourceRoot":"","sources":["../../../src/helpers/generateMnemonicFromAddress.ts"],"names":[],"mappings":";;;AAAA,kDAAyD;AAGzD;;GAEG;AACI,MAAM,2BAA2B,GAAG,CAAC,OAAwB,EAAU,EAAE;IAC5E,OAAO,IAAA,0BAAiB,EAAC,OAAO,CAAC;SAC5B,KAAK,CAAC,GAAG,CAAC;SACV,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC3D,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC,CAAA;AANY,QAAA,2BAA2B,+BAMvC"}
1
+ {"version":3,"file":"generateMnemonicFromAddress.js","sourceRoot":"","sources":["../../../src/helpers/generateMnemonicFromAddress.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAGjC;;GAEG;AACI,MAAM,2BAA2B,GAAG,CAAC,OAAwB,EAAU,EAAE;IAC5E,OAAO,iBAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;SACnC,KAAK,CAAC,GAAG,CAAC;SACV,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC3D,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC,CAAA;AANY,QAAA,2BAA2B,+BAMvC"}
package/dist/src/plugins/operator/ContractFacade.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
- import { Provider } from '@ethersproject/providers';
3
- import { Operator } from '@streamr/network-contracts';
2
+ import { Provider } from 'ethers';
3
+ import { Operator } from '@streamr/network-contracts-ethers6';
4
4
  import { StreamID } from '@streamr/protocol';
5
5
  import { EthereumAddress, TheGraphClient } from '@streamr/utils';
6
6
  import { Overrides } from 'ethers';
@@ -42,7 +42,7 @@ export declare class ContractFacade {
42
42
  static createInstance(config: OperatorServiceConfig): ContractFacade;
43
43
  writeHeartbeat(nodeDescriptor: NetworkPeerDescriptor): Promise<void>;
44
44
  getTimestampOfLastHeartbeat(): Promise<number | undefined>;
45
- getOperatorContractAddress(): EthereumAddress;
45
+ getOperatorContractAddress(): Promise<EthereumAddress>;
46
46
  getSponsorshipsOfOperator(operatorAddress: EthereumAddress): Promise<SponsorshipResult[]>;
47
47
  getExpiredFlags(sponsorships: EthereumAddress[], maxAgeInMs: number): Promise<Flag[]>;
48
48
  getOperatorsInSponsorship(sponsorshipAddress: EthereumAddress): Promise<EthereumAddress[]>;
@@ -66,7 +66,7 @@ export declare class ContractFacade {
66
66
  id: string;
67
67
  };
68
68
  };
69
- }>;
69
+ }, undefined, undefined>;
70
70
  hasOpenFlag(operatorAddress: EthereumAddress, sponsorshipAddress: EthereumAddress): Promise<boolean>;
71
71
  addReviewRequestListener(listener: ReviewRequestListener, abortSignal: AbortSignal): void;
72
72
  getStreamId(sponsorshipAddress: string): Promise<StreamID>;
@@ -75,6 +75,6 @@ export declare class ContractFacade {
75
75
  addOperatorContractStakeEventListener(eventName: 'Staked' | 'Unstaked', listener: (sponsorship: string) => unknown): void;
76
76
  removeOperatorContractStakeEventListener(eventName: 'Staked' | 'Unstaked', listener: (sponsorship: string) => unknown): void;
77
77
  getProvider(): Provider;
78
- getEthersOverrides(): Overrides;
78
+ getEthersOverrides(): Promise<Overrides>;
79
79
  }
80
80
  export {};
package/dist/src/plugins/operator/ContractFacade.js CHANGED
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.ContractFacade = exports.parsePartitionFromReviewRequestMetadata = exports.ParseError = exports.VOTE_NO_KICK = exports.VOTE_KICK = void 0;
7
- const network_contracts_1 = require("@streamr/network-contracts");
7
+ const network_contracts_ethers6_1 = require("@streamr/network-contracts-ethers6");
8
8
  const protocol_1 = require("@streamr/protocol");
9
9
  const utils_1 = require("@streamr/utils");
10
10
  const ethers_1 = require("ethers");
@@ -44,6 +44,17 @@ function parsePartitionFromReviewRequestMetadata(metadataAsString) {
44
44
  return partition;
45
45
  }
46
46
  exports.parsePartitionFromReviewRequestMetadata = parsePartitionFromReviewRequestMetadata;
47
+ const compareBigInts = (a, b) => {
48
+ if (a < b) {
49
+ return -1;
50
+ }
51
+ else if (a > b) {
52
+ return 1;
53
+ }
54
+ else {
55
+ return 0;
56
+ }
57
+ };
47
58
  const logger = new utils_1.Logger(module);
48
59
  class ContractFacade {
49
60
  operatorContract;
@@ -56,7 +67,7 @@ class ContractFacade {
56
67
  this.config = config;
57
68
  }
58
69
  static createInstance(config) {
59
- return new ContractFacade(new ethers_1.Contract(config.operatorContractAddress, network_contracts_1.operatorABI, config.signer), new utils_1.TheGraphClient({
70
+ return new ContractFacade(new ethers_1.Contract(config.operatorContractAddress, network_contracts_ethers6_1.operatorABI, config.signer), new utils_1.TheGraphClient({
60
71
  serverUrl: config.theGraphUrl,
61
72
  fetch: node_fetch_1.default,
62
73
  logger
@@ -64,12 +75,12 @@ class ContractFacade {
64
75
  }
65
76
  async writeHeartbeat(nodeDescriptor) {
66
77
  const metadata = JSON.stringify(nodeDescriptor);
67
- await (await this.operatorContract.heartbeat(metadata, this.getEthersOverrides())).wait();
78
+ await (await this.operatorContract.heartbeat(metadata, await this.getEthersOverrides())).wait();
68
79
  }
69
80
  async getTimestampOfLastHeartbeat() {
70
81
  const result = await this.theGraphClient.queryEntity({
71
82
  query: `{
72
- operator(id: "${this.getOperatorContractAddress()}") {
83
+ operator(id: "${await this.getOperatorContractAddress()}") {
73
84
  latestHeartbeatTimestamp
74
85
  }
75
86
  }`
@@ -85,8 +96,8 @@ class ContractFacade {
85
96
  return timestampInSecs * 1000;
86
97
  }
87
98
  }
88
- getOperatorContractAddress() {
89
- return (0, utils_1.toEthereumAddress)(this.operatorContract.address);
99
+ async getOperatorContractAddress() {
100
+ return (0, utils_1.toEthereumAddress)(await this.operatorContract.getAddress());
90
101
  }
91
102
  async getSponsorshipsOfOperator(operatorAddress) {
92
103
  const createQuery = (lastId, pageSize) => {
@@ -183,12 +194,12 @@ class ContractFacade {
183
194
  }
184
195
  async flag(sponsorship, operator, partition) {
185
196
  const metadata = JSON.stringify({ partition });
186
- await (await this.operatorContract.flag(sponsorship, operator, metadata, this.getEthersOverrides())).wait();
197
+ await (await this.operatorContract.flag(sponsorship, operator, metadata, await this.getEthersOverrides())).wait();
187
198
  }
188
199
  async getRandomOperator() {
189
- const latestBlock = await this.operatorContract.provider.getBlockNumber();
200
+ const latestBlock = await this.getProvider().getBlockNumber();
190
201
  const operators = await this.getOperatorAddresses(latestBlock);
191
- const excluded = this.getOperatorContractAddress();
202
+ const excluded = await this.getOperatorContractAddress();
192
203
  const operatorAddresses = operators.filter((id) => id !== excluded);
193
204
  logger.debug(`Found ${operatorAddresses.length} operators`);
194
205
  return (0, sample_1.default)(operatorAddresses);
@@ -200,28 +211,28 @@ class ContractFacade {
200
211
  * - only take sponsorships that have more than minSponsorshipEarningsInWithdraw, or all if undefined
201
212
  */
202
213
  async getEarningsOf(operatorContractAddress, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw) {
203
- const operator = new ethers_1.Contract(operatorContractAddress, network_contracts_1.operatorABI, this.config.signer);
214
+ const operator = new ethers_1.Contract(operatorContractAddress, network_contracts_ethers6_1.operatorABI, this.config.signer);
204
215
  const minSponsorshipEarningsInWithdrawWei = BigInt(minSponsorshipEarningsInWithdraw ?? 0);
205
216
  const { addresses: allSponsorshipAddresses, earnings, maxAllowedEarnings, } = await operator.getSponsorshipsAndEarnings();
206
217
  const sponsorships = allSponsorshipAddresses
207
- .map((address, i) => ({ address, earnings: earnings[i].toBigInt() }))
218
+ .map((address, i) => ({ address, earnings: earnings[i] }))
208
219
  .filter((sponsorship) => sponsorship.earnings >= minSponsorshipEarningsInWithdrawWei)
209
- .sort((a, b) => Number(b.earnings - a.earnings)) // TODO: after Node 20, use .toSorted() instead
220
+ .sort((a, b) => compareBigInts(a.earnings, b.earnings)) // TODO: after Node 20, use .toSorted() instead
210
221
  .slice(0, maxSponsorshipsInWithdraw); // take all if maxSponsorshipsInWithdraw is undefined
211
222
  return {
212
223
  sponsorshipAddresses: sponsorships.map((sponsorship) => (0, utils_1.toEthereumAddress)(sponsorship.address)),
213
224
  sumDataWei: sponsorships.reduce((sum, sponsorship) => sum += sponsorship.earnings, 0n),
214
- maxAllowedEarningsDataWei: maxAllowedEarnings.toBigInt()
225
+ maxAllowedEarningsDataWei: maxAllowedEarnings
215
226
  };
216
227
  }
217
228
  async getMyEarnings(minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw) {
218
- return this.getEarningsOf(this.getOperatorContractAddress(), minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
229
+ return this.getEarningsOf(await this.getOperatorContractAddress(), minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
219
230
  }
220
231
  async withdrawMyEarningsFromSponsorships(sponsorshipAddresses) {
221
- await (await this.operatorContract.withdrawEarningsFromSponsorships(sponsorshipAddresses, this.getEthersOverrides())).wait();
232
+ await (await this.operatorContract.withdrawEarningsFromSponsorships(sponsorshipAddresses, await this.getEthersOverrides())).wait();
222
233
  }
223
234
  async triggerWithdraw(targetOperatorAddress, sponsorshipAddresses) {
224
- await (await this.operatorContract.triggerAnotherOperatorWithdraw(targetOperatorAddress, sponsorshipAddresses, this.getEthersOverrides())).wait();
235
+ await (await this.operatorContract.triggerAnotherOperatorWithdraw(targetOperatorAddress, sponsorshipAddresses, await this.getEthersOverrides())).wait();
225
236
  }
226
237
  async getOperatorAddresses(requiredBlockNumber) {
227
238
  // TODO: find a clever more efficient way of selecting a random operator? (NET-1113)
@@ -244,12 +255,13 @@ class ContractFacade {
244
255
  }
245
256
  return operatorAddresses;
246
257
  }
247
- pullStakedStreams(requiredBlockNumber) {
258
+ async *pullStakedStreams(requiredBlockNumber) {
259
+ const contractAddress = await this.getOperatorContractAddress();
248
260
  const createQuery = (lastId, pageSize) => {
249
261
  return {
250
262
  query: `
251
263
  {
252
- operator(id: "${this.getOperatorContractAddress()}") {
264
+ operator(id: "${contractAddress}") {
253
265
  stakes(where: {id_gt: "${lastId}"}, first: ${pageSize}) {
254
266
  sponsorship {
255
267
  id
@@ -270,13 +282,13 @@ class ContractFacade {
270
282
  };
271
283
  const parseItems = (response) => {
272
284
  if (!response.operator) {
273
- logger.error('Unable to find operator in The Graph', { operatorContractAddress: this.operatorContract.address });
285
+ logger.error('Unable to find operator in The Graph', { operatorContractAddress: contractAddress });
274
286
  return [];
275
287
  }
276
288
  return response.operator.stakes;
277
289
  };
278
290
  this.theGraphClient.updateRequiredBlockNumber(requiredBlockNumber);
279
- return this.theGraphClient.queryEntities(createQuery, parseItems);
291
+ yield* this.theGraphClient.queryEntities(createQuery, parseItems);
280
292
  }
281
293
  async hasOpenFlag(operatorAddress, sponsorshipAddress) {
282
294
  const createQuery = () => {
@@ -305,7 +317,7 @@ class ContractFacade {
305
317
  }
306
318
  }
307
319
  addReviewRequestListener(listener, abortSignal) {
308
- (0, utils_1.addManagedEventListener)(this.operatorContract, 'ReviewRequest', (sponsorship, targetOperator, voteStartTimestampInSecs, voteEndTimestampInSecs, metadataAsString) => {
320
+ (0, utils_1.addManagedEventListener)(this.operatorContract, 'ReviewRequest', async (sponsorship, targetOperator, voteStartTimestampInSecs, voteEndTimestampInSecs, metadataAsString) => {
309
321
  let partition;
310
322
  try {
311
323
  partition = parsePartitionFromReviewRequestMetadata(metadataAsString);
@@ -313,7 +325,7 @@ class ContractFacade {
313
325
  catch (err) {
314
326
  if (err instanceof ParseError) {
315
327
  logger.warn(`Skip review request (${err.reasonText})`, {
316
- address: this.operatorContract.address,
328
+ address: await this.operatorContract.getAddress(),
317
329
  sponsorship,
318
330
  targetOperator,
319
331
  });
@@ -324,7 +336,7 @@ class ContractFacade {
324
336
  return;
325
337
  }
326
338
  logger.debug('Receive review request', {
327
- address: this.operatorContract.address,
339
+ address: await this.operatorContract.getAddress(),
328
340
  sponsorship,
329
341
  targetOperator,
330
342
  partition
@@ -333,7 +345,7 @@ class ContractFacade {
333
345
  }, abortSignal);
334
346
  }
335
347
  async getStreamId(sponsorshipAddress) {
336
- const sponsorship = new ethers_1.Contract(sponsorshipAddress, network_contracts_1.sponsorshipABI, this.config.signer);
348
+ const sponsorship = new ethers_1.Contract(sponsorshipAddress, network_contracts_ethers6_1.sponsorshipABI, this.config.signer);
337
349
  return (0, protocol_1.toStreamID)(await sponsorship.streamId());
338
350
  }
339
351
  async voteOnFlag(sponsorship, targetOperator, kick) {
@@ -348,7 +360,7 @@ class ContractFacade {
348
360
  await this.voteOnFlag(sponsorship, targetOperator, false);
349
361
  }
350
362
  addOperatorContractStakeEventListener(eventName, listener) {
351
- this.operatorContract.on(eventName, listener);
363
+ this.operatorContract.on(eventName, listener); // TODO better type
352
364
  }
353
365
  removeOperatorContractStakeEventListener(eventName, listener) {
354
366
  this.operatorContract.off(eventName, listener);
package/dist/src/plugins/operator/ContractFacade.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ContractFacade.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ContractFacade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContractFacade.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ContractFacade.ts"],"names":[],"mappings":"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"}
package/dist/src/plugins/operator/OperatorPlugin.d.ts CHANGED
@@ -36,7 +36,7 @@ export interface OperatorServiceConfig {
36
36
  signer: SignerWithProvider;
37
37
  operatorContractAddress: EthereumAddress;
38
38
  theGraphUrl: string;
39
- getEthersOverrides: () => Overrides;
39
+ getEthersOverrides: () => Promise<Overrides>;
40
40
  }
41
41
  export declare class OperatorPlugin extends Plugin<OperatorPluginConfig> {
42
42
  private readonly abortController;
package/dist/src/plugins/operator/announceNodeToContract.js CHANGED
@@ -11,7 +11,7 @@ const announceNodeToContract = async (writeIntervalInMs, contractFacade, streamr
11
11
  exports.announceNodeToContract = announceNodeToContract;
12
12
  const isHeartbeatStale = async (writeIntervalInMs, contractFacade) => {
13
13
  logger.debug('Polling last heartbeat timestamp', {
14
- operatorContractAddress: contractFacade.getOperatorContractAddress()
14
+ operatorContractAddress: await contractFacade.getOperatorContractAddress()
15
15
  });
16
16
  let lastHeartbeatTs;
17
17
  try {
package/dist/src/plugins/operator/announceNodeToContract.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"announceNodeToContract.js","sourceRoot":"","sources":["../../../../src/plugins/operator/announceNodeToContract.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAIvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,sBAAsB,GAAG,KAAK,EACvC,iBAAyB,EACzB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,IAAI,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,CAAC,EAAE,CAAC;QAC5D,MAAM,cAAc,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;IACvD,CAAC;AACL,CAAC,CAAA;AARY,QAAA,sBAAsB,0BAQlC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC1B,iBAAyB,EACzB,cAA8B,EACd,EAAE;IAClB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;QAC7C,uBAAuB,EAAE,cAAc,CAAC,0BAA0B,EAAE;KACvE,CAAC,CAAA;IACF,IAAI,eAAe,CAAA;IACnB,IAAI,CAAC;QACD,eAAe,GAAG,MAAM,cAAc,CAAC,2BAA2B,EAAE,CAAA;IACxE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;QAChF,OAAO,KAAK,CAAA,CAAC,+EAA+E;IAChG,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,iBAAiB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtG,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3E,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,KAAK,EACxB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,IAAI,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;QAC9D,MAAM,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;QACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;IACtE,CAAC;AACL,CAAC,CAAA"}
1
+ {"version":3,"file":"announceNodeToContract.js","sourceRoot":"","sources":["../../../../src/plugins/operator/announceNodeToContract.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAIvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,sBAAsB,GAAG,KAAK,EACvC,iBAAyB,EACzB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,IAAI,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,CAAC,EAAE,CAAC;QAC5D,MAAM,cAAc,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;IACvD,CAAC;AACL,CAAC,CAAA;AARY,QAAA,sBAAsB,0BAQlC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC1B,iBAAyB,EACzB,cAA8B,EACd,EAAE;IAClB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;QAC7C,uBAAuB,EAAE,MAAM,cAAc,CAAC,0BAA0B,EAAE;KAC7E,CAAC,CAAA;IACF,IAAI,eAAe,CAAA;IACnB,IAAI,CAAC;QACD,eAAe,GAAG,MAAM,cAAc,CAAC,2BAA2B,EAAE,CAAA;IACxE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;QAChF,OAAO,KAAK,CAAA,CAAC,+EAA+E;IAChG,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,iBAAiB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtG,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3E,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,KAAK,EACxB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,IAAI,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;QAC9D,MAAM,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;QACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;IACtE,CAAC;AACL,CAAC,CAAA"}
package/dist/src/plugins/operator/fetchRedundancyFactor.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchRedundancyFactor = void 0;
4
4
  const utils_1 = require("@streamr/utils");
5
5
  const ethers_1 = require("ethers");
6
- const network_contracts_1 = require("@streamr/network-contracts");
6
+ const network_contracts_ethers6_1 = require("@streamr/network-contracts-ethers6");
7
7
  const zod_1 = require("zod");
8
8
  const logger = new utils_1.Logger(module);
9
9
  const MetadataSchema = zod_1.z.object({
@@ -12,7 +12,7 @@ const MetadataSchema = zod_1.z.object({
12
12
  .gte(1)
13
13
  });
14
14
  async function fetchRedundancyFactor({ operatorContractAddress, signer }) {
15
- const operator = new ethers_1.Contract(operatorContractAddress, network_contracts_1.operatorABI, signer);
15
+ const operator = new ethers_1.Contract(operatorContractAddress, network_contracts_ethers6_1.operatorABI, signer);
16
16
  const metadataAsString = await operator.metadata();
17
17
  if (metadataAsString.length === 0) {
18
18
  return 1;
package/dist/src/plugins/operator/fetchRedundancyFactor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetchRedundancyFactor.js","sourceRoot":"","sources":["../../../../src/plugins/operator/fetchRedundancyFactor.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,mCAAiC;AACjC,kEAAkE;AAElE,6BAAuB;AAEvB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE;SACvB,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;CACd,CAAC,CAAA;AAEK,KAAK,UAAU,qBAAqB,CAAC,EACxC,uBAAuB,EACvB,MAAM,EAC0D;IAChE,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC,uBAAuB,EAAE,+BAAW,EAAE,MAAM,CAAwB,CAAA;IAClG,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IAElD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,CAAA;IACZ,CAAC;IAED,IAAI,QAAiC,CAAA;IACrC,IAAI,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC5F,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,IAAI,iBAAiD,CAAA;IACrD,IAAI,CAAC;QACD,iBAAiB,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,uBAAuB;YACvB,gBAAgB;YAChB,MAAM,EAAE,GAAG,EAAE,MAAM;SACtB,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,OAAO,iBAAiB,CAAC,gBAAgB,CAAA;AAC7C,CAAC;AA/BD,sDA+BC"}
1
+ {"version":3,"file":"fetchRedundancyFactor.js","sourceRoot":"","sources":["../../../../src/plugins/operator/fetchRedundancyFactor.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,mCAAiC;AACjC,kFAA0E;AAE1E,6BAAuB;AAEvB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE;SACvB,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;CACd,CAAC,CAAA;AAEK,KAAK,UAAU,qBAAqB,CAAC,EACxC,uBAAuB,EACvB,MAAM,EAC0D;IAChE,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC,uBAAuB,EAAE,uCAAW,EAAE,MAAM,CAAwB,CAAA;IAClG,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IAElD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,CAAA;IACZ,CAAC;IAED,IAAI,QAAiC,CAAA;IACrC,IAAI,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC5F,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,IAAI,iBAAiD,CAAA;IACrD,IAAI,CAAC;QACD,iBAAiB,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,uBAAuB;YACvB,gBAAgB;YAChB,MAAM,EAAE,GAAG,EAAE,MAAM;SACtB,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,OAAO,iBAAiB,CAAC,gBAAgB,CAAA;AAC7C,CAAC;AA/BD,sDA+BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/node",
3
- "version": "100.2.4",
3
+ "version": "100.2.5-beta.0",
4
4
  "description": "A full-featured node implementation for the Streamr Network",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,13 +28,13 @@
28
28
  "author": "Streamr Network AG <contact@streamr.network>",
29
29
  "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
30
30
  "dependencies": {
31
- "@ethersproject/hdnode": "^5.4.0",
31
+ "@ensdomains/ens-contracts": "1.1.4",
32
32
  "@inquirer/prompts": "^4.2.1",
33
33
  "@streamr/config": "^5.3.7",
34
- "@streamr/network-contracts": "^7.1.1",
35
- "@streamr/protocol": "100.2.4",
36
- "@streamr/sdk": "100.2.4",
37
- "@streamr/utils": "100.2.4",
34
+ "@streamr/network-contracts-ethers6": "^7.1.2",
35
+ "@streamr/protocol": "100.2.5-beta.0",
36
+ "@streamr/sdk": "100.2.5-beta.0",
37
+ "@streamr/utils": "100.2.5-beta.0",
38
38
  "aedes": "^0.51.0",
39
39
  "ajv": "^8.8.2",
40
40
  "ajv-formats": "^2.1.1",
@@ -43,7 +43,7 @@
43
43
  "commander": "^12.0.0",
44
44
  "consistent-hash": "^1.1.1",
45
45
  "cors": "^2.8.5",
46
- "ethers": "^5.4.7",
46
+ "ethers": "^6.12.0",
47
47
  "express": "^4.19.2",
48
48
  "heap": "^0.2.6",
49
49
  "lodash": "^4.17.21",
@@ -58,8 +58,8 @@
58
58
  },
59
59
  "devDependencies": {
60
60
  "@inquirer/testing": "^2.1.12",
61
- "@streamr/dht": "100.2.4",
62
- "@streamr/test-utils": "100.2.4",
61
+ "@streamr/dht": "100.2.5-beta.0",
62
+ "@streamr/test-utils": "100.2.5-beta.0",
63
63
  "@types/cors": "^2.8.17",
64
64
  "@types/express": "^4.17.21",
65
65
  "@types/heap": "^0.2.34",