@streamr/cli-tools 101.1.2 → 102.0.0-beta.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "101.1.2",
+    "version": "102.0.0-beta.1",
     "description": "Command line tools for Streamr",
     "repository": {
         "type": "git",
@@ -11,8 +11,8 @@
         "streamr": "dist/bin/streamr.js"
     },
     "scripts": {
-        "build": "tsc -b tsconfig.json",
-        "check": "tsc -p ./tsconfig.json --noEmit",
+        "build": "tsc -b tsconfig.node.json",
+        "check": "tsc -p ./tsconfig.jest.json",
         "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
         "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
         "test": "npm run build && jest --bail --forceExit"
@@ -26,19 +26,23 @@
     "author": "Streamr Network AG <contact@streamr.com>",
     "license": "AGPL-3.0",
     "dependencies": {
-        "@streamr/sdk": "101.1.2",
-        "@streamr/utils": "101.1.2",
-        "commander": "^12.1.0",
+        "@streamr/dht": "102.0.0-beta.1",
+        "@streamr/sdk": "102.0.0-beta.1",
+        "@streamr/trackerless-network": "102.0.0-beta.1",
+        "@streamr/utils": "102.0.0-beta.1",
+        "commander": "^13.1.0",
         "easy-table": "^1.1.1",
         "ethers": "^6.13.0",
         "event-stream": "^4.0.1",
-        "lodash": "^4.17.21"
+        "lodash": "^4.17.21",
+        "semver": "^7.6.3"
     },
     "devDependencies": {
-        "@streamr/test-utils": "101.1.2",
+        "@streamr/test-utils": "102.0.0-beta.1",
         "@types/event-stream": "^4.0.5",
-        "@types/lodash": "^4.17.7",
+        "@types/lodash": "^4.17.14",
         "@types/merge2": "^1.4.4",
+        "@types/semver": "^7.5.8",
         "merge2": "^1.4.1"
     }
 }

package/dist/src/client.d.ts

@@ -1,4 +1,4 @@
-import { StreamrClientConfig, StreamrClient } from '@streamr/sdk';
+import { StreamrClient, StreamrClientConfig } from '@streamr/sdk';
 import { Options } from './command';
 export declare const getClientConfig: (commandOptions: Options, overridenOptions?: StreamrClientConfig) => StreamrClientConfig;
 export declare const createClient: (commandOptions: Options, overridenOptions?: StreamrClientConfig) => StreamrClient;

package/dist/src/client.js

@@ -4,15 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createClient = exports.getClientConfig = void 0;
-const omit_1 = __importDefault(require("lodash/omit"));
-const merge_1 = __importDefault(require("lodash/merge"));
 const sdk_1 = require("@streamr/sdk");
+const merge_1 = __importDefault(require("lodash/merge"));
 const config_1 = require("./config");
 const getClientConfig = (commandOptions, overridenOptions = {}) => {
-    const environmentOptions = commandOptions.dev ? (0, omit_1.default)(sdk_1.CONFIG_TEST, 'auth') : undefined;
     const configFileJson = (0, config_1.getConfig)(commandOptions.config)?.client;
+    const environmentOptions = { environment: commandOptions.env };
     const authenticationOptions = (commandOptions.privateKey !== undefined) ? { auth: { privateKey: commandOptions.privateKey } } : undefined;
-    return (0, merge_1.default)(environmentOptions, configFileJson, authenticationOptions, overridenOptions);
+    return (0, merge_1.default)(configFileJson, environmentOptions, authenticationOptions, overridenOptions);
 };
 exports.getClientConfig = getClientConfig;
 const addInterruptHandler = (client) => {

package/dist/src/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA8B;AAC9B,yDAAgC;AAChC,sCAA8E;AAE9E,qCAAoC;AAE7B,MAAM,eAAe,GAAG,CAAC,cAAuB,EAAE,mBAAwC,EAAE,EAAuB,EAAE;IACxH,MAAM,kBAAkB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,cAAI,EAAC,iBAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrF,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAC/D,MAAM,qBAAqB,GAAG,CAAC,cAAc,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACzI,OAAO,IAAA,eAAK,EACR,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,CACnB,CAAA;AACL,CAAC,CAAA;AAVY,QAAA,eAAe,mBAU3B;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAClD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC5B,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;QAAC,MAAM,CAAC;YACL,QAAQ;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,YAAY,GAAG,CAAC,cAAuB,EAAE,mBAAwC,EAAE,EAAiB,EAAE;IAC/G,MAAM,MAAM,GAAG,IAAA,uBAAe,EAAC,cAAc,EAAE,gBAAgB,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,IAAI,mBAAa,CAAC,MAAM,CAAC,CAAA;IACxC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC3B,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAiE;AACjE,yDAAgC;AAEhC,qCAAoC;AAE7B,MAAM,eAAe,GAAG,CAAC,cAAuB,EAAE,mBAAwC,EAAE,EAAuB,EAAE;IACxH,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAC/D,MAAM,kBAAkB,GAAG,EAAE,WAAW,EAAE,cAAc,CAAC,GAAG,EAAE,CAAA;IAC9D,MAAM,qBAAqB,GAAG,CAAC,cAAc,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACzI,OAAO,IAAA,eAAK,EACR,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,CACnB,CAAA;AACL,CAAC,CAAA;AAVY,QAAA,eAAe,mBAU3B;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAClD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC5B,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;QAAC,MAAM,CAAC;YACL,QAAQ;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,YAAY,GAAG,CAAC,cAAuB,EAAE,mBAAwC,EAAE,EAAiB,EAAE;IAC/G,MAAM,MAAM,GAAG,IAAA,uBAAe,EAAC,cAAc,EAAE,gBAAgB,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,IAAI,mBAAa,CAAC,MAAM,CAAC,CAAA;IACxC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC3B,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB"}

package/dist/src/command.d.ts

@@ -1,9 +1,9 @@
-import commander, { Command } from 'commander';
-import { StreamrClientConfig } from '@streamr/sdk';
+import { EnvironmentId, StreamrClientConfig } from '@streamr/sdk';
+import commander from 'commander';
 export interface Options {
     privateKey?: string;
     config?: string;
-    dev: boolean;
+    env?: EnvironmentId;
 }
 export declare const createCommand: () => commander.Command;
 export interface CommandOpts {

package/dist/src/command.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createClientCommand = exports.createCommand = void 0;
+const sdk_1 = require("@streamr/sdk");
 const commander_1 = require("commander");
 const package_json_1 = __importDefault(require("../package.json"));
 const client_1 = require("./client");
+const common_1 = require("./common");
 const createCommand = () => {
     return new commander_1.Command()
         .version(package_json_1.default.version)
@@ -21,7 +23,7 @@ const createClientCommand = (action, opts = {
     return (0, exports.createCommand)()
         .option('--private-key <key>', 'use an Ethereum private key to authenticate')
         .option('--config <file>', 'read connection and authentication settings from a config file')
-        .option('--dev', 'use pre-defined development environment', false)
+        .option('--env <environmentId>', `use pre-defined environment (${(0, common_1.formEnumArgValueDescription)(sdk_1.ENVIRONMENT_IDS, sdk_1.DEFAULT_ENVIRONMENT_ID)})`, (0, common_1.createFnParseEnum)('env', sdk_1.ENVIRONMENT_IDS))
         .action(async (...args) => {
         const commandOptions = args[args.length - 1].opts();
         try {

package/dist/src/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/command.ts"],"names":[],"mappings":";;;;;;AAAA,yCAA8C;AAE9C,mEAAiC;AACjC,qCAAuC;AAQhC,MAAM,aAAa,GAAG,GAAsB,EAAE;IACjD,OAAO,IAAI,mBAAO,EAAE;SACf,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;SACpB,kBAAkB,EAAE;SACpB,oBAAoB,CAAC,KAAK,CAAC,CAAA;AACpC,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB;AAOM,MAAM,mBAAmB,GAAG,CAC/B,MAA+C,EAC/C,OAAoB;IAChB,iBAAiB,EAAE,IAAI;IACvB,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACnC,EACgB,EAAE;IACnB,OAAO,IAAA,qBAAa,GAAE;SACjB,MAAM,CAAC,qBAAqB,EAAE,6CAA6C,CAAC;SAC5E,MAAM,CAAC,iBAAiB,EAAE,gEAAgE,CAAC;SAC3F,MAAM,CAAC,OAAO,EAAE,yCAAyC,EAAE,KAAK,CAAC;SACjE,MAAM,CAAC,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;QAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACnD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,cAAc,EAAE,IAAI,CAAC,oBAAqB,CAAC,cAAc,CAAC,CAAC,CAAA;YACvF,IAAI,CAAC;gBACD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;YAC1C,CAAC;oBAAS,CAAC;gBACP,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACzB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;AACV,CAAC,CAAA;AA3BY,QAAA,mBAAmB,uBA2B/B"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/command.ts"],"names":[],"mappings":";;;;;;AAAA,sCAA0G;AAC1G,yCAA8C;AAC9C,mEAAiC;AACjC,qCAAuC;AACvC,qCAAyE;AAQlE,MAAM,aAAa,GAAG,GAAsB,EAAE;IACjD,OAAO,IAAI,mBAAO,EAAE;SACf,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;SACpB,kBAAkB,EAAE;SACpB,oBAAoB,CAAC,KAAK,CAAC,CAAA;AACpC,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB;AAOM,MAAM,mBAAmB,GAAG,CAC/B,MAA+C,EAC/C,OAAoB;IAChB,iBAAiB,EAAE,IAAI;IACvB,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACnC,EACgB,EAAE;IACnB,OAAO,IAAA,qBAAa,GAAE;SACjB,MAAM,CAAC,qBAAqB,EAAE,6CAA6C,CAAC;SAC5E,MAAM,CAAC,iBAAiB,EAAE,gEAAgE,CAAC;SAC3F,MAAM,CAAC,uBAAuB,EAAE,gCAAgC,IAAA,oCAA2B,EAAC,qBAAe,EAAE,4BAAsB,CAAC,GAAG,EACpI,IAAA,0BAAiB,EAAC,KAAK,EAAE,qBAAe,CAAC,CAAC;SAC7C,MAAM,CAAC,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;QAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACnD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,cAAc,EAAE,IAAI,CAAC,oBAAqB,CAAC,cAAc,CAAC,CAAC,CAAA;YACvF,IAAI,CAAC;gBACD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;YAC1C,CAAC;oBAAS,CAAC;gBACP,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACzB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;AACV,CAAC,CAAA;AA5BY,QAAA,mBAAmB,uBA4B/B"}

package/dist/src/common.d.ts

@@ -4,3 +4,6 @@ export declare enum OptionType {
 }
 export declare const getOptionType: (value: string | boolean) => OptionType | never;
 export declare function createFnParseInt(name: string): (s: string) => number;
+export declare function createFnParseEnum(name: string, allowedValues: string[]): (s: string) => string;
+export declare const formEnumArgValueDescription: (allowedValues: string[], defaultValue: string) => string;
+export declare const wrapWithQuotes: (str: string) => string;

package/dist/src/common.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFnParseInt = exports.getOptionType = exports.OptionType = void 0;
+exports.wrapWithQuotes = exports.formEnumArgValueDescription = exports.getOptionType = exports.OptionType = void 0;
+exports.createFnParseInt = createFnParseInt;
+exports.createFnParseEnum = createFnParseEnum;
 var OptionType;
 (function (OptionType) {
     OptionType[OptionType["FLAG"] = 0] = "FLAG";
@@ -28,5 +30,21 @@ function createFnParseInt(name) {
         return n;
     };
 }
-exports.createFnParseInt = createFnParseInt;
+function createFnParseEnum(name, allowedValues) {
+    return (value) => {
+        if (!allowedValues.includes(value)) {
+            console.error(`${name} must be one of: ${allowedValues.map((s) => (0, exports.wrapWithQuotes)(s)).join(', ')}`);
+            process.exit(1);
+        }
+        return value;
+    };
+}
+const formEnumArgValueDescription = (allowedValues, defaultValue) => {
+    return `one of: ${allowedValues.map(exports.wrapWithQuotes).join(', ')}, default: ${(0, exports.wrapWithQuotes)(defaultValue)}`;
+};
+exports.formEnumArgValueDescription = formEnumArgValueDescription;
+const wrapWithQuotes = (str) => {
+    return `"${str}"`;
+};
+exports.wrapWithQuotes = wrapWithQuotes;
 //# sourceMappingURL=common.js.map

package/dist/src/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,2CAAI,CAAA;IACJ,mDAAQ,CAAA,CAAE,8BAA8B;AAC5C,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAEM,MAAM,aAAa,GAAG,CAAC,KAAuB,EAAsB,EAAE;IACzE,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC,IAAI,CAAA;IAC1B,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC,QAAQ,CAAA;IAC9B,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,GAAG,CAAC,CAAA;IAC5D,CAAC;AACL,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;AAED,SAAgB,gBAAgB,CAAC,IAAY;IACzC,OAAO,CAAC,GAAW,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC3B,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,6BAA6B,GAAG,IAAI,CAAC,CAAA;YAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QACD,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;AACL,CAAC;AATD,4CASC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":";;;AAeA,4CASC;AAED,8CAQC;AAlCD,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,2CAAI,CAAA;IACJ,mDAAQ,CAAA,CAAE,8BAA8B;AAC5C,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAEM,MAAM,aAAa,GAAG,CAAC,KAAuB,EAAsB,EAAE;IACzE,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC,IAAI,CAAA;IAC1B,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC,QAAQ,CAAA;IAC9B,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,GAAG,CAAC,CAAA;IAC5D,CAAC;AACL,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;AAED,SAAgB,gBAAgB,CAAC,IAAY;IACzC,OAAO,CAAC,GAAW,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC3B,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,6BAA6B,GAAG,IAAI,CAAC,CAAA;YAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QACD,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;AACL,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAY,EAAE,aAAuB;IACnE,OAAO,CAAC,KAAa,EAAE,EAAE;QACrB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,oBAAoB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC,CAAA;AACL,CAAC;AAEM,MAAM,2BAA2B,GAAG,CAAC,aAAuB,EAAE,YAAoB,EAAU,EAAE;IACjG,OAAO,WAAW,aAAa,CAAC,GAAG,CAAC,sBAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAE,CAAA;AAC9G,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC;AAEM,MAAM,cAAc,GAAG,CAAC,GAAW,EAAU,EAAE;IAClD,OAAO,IAAI,GAAG,GAAG,CAAA;AACrB,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B"}

package/dist/src/permission.js

@@ -38,7 +38,7 @@ const runModifyPermissionsCommand = (modify, modification) => {
         else {
             assignment = {
                 permissions,
-                user
+                userId: user
             };
         }
         await modify(stream, assignment);

package/dist/src/permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/permission.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,sCAA4F;AAC5F,uCAA+C;AAE/C,MAAM,cAAc,GAAG,QAAQ,CAAA;AAElB,QAAA,WAAW,GAAG,IAAI,GAAG,CAA2B;IACzD,CAAC,WAAW,EAAE,sBAAgB,CAAC,SAAS,CAAC;IACzC,CAAC,SAAS,EAAE,sBAAgB,CAAC,OAAO,CAAC;IACrC,CAAC,MAAM,EAAE,sBAAgB,CAAC,IAAI,CAAC;IAC/B,CAAC,QAAQ,EAAE,sBAAgB,CAAC,MAAM,CAAC;IACnC,CAAC,OAAO,EAAE,sBAAgB,CAAC,KAAK,CAAC;CACpC,CAAC,CAAA;AAEK,MAAM,aAAa,GAAG,CAAC,EAAU,EAA4B,EAAE;IAClE,MAAM,MAAM,GAAG,mBAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAA;IAChD,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAEM,MAAM,eAAe,GAAG,CAAC,UAA4B,EAAU,EAAE;IACpE,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAE,CAAC,CAAC,CAAC,CAAA;AACrF,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,2BAA2B,GAAG,CACvC,MAA2E,EAC3E,YAAoB,EAChB,EAAE;IACN,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,IAAY,EAAE,aAAuB,EAAE,EAAE;QACzG,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC/C,MAAM,WAAW,GAAuB,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC,CAAA;QACxG,IAAI,UAAgC,CAAA;QACpC,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1B,UAAU,GAAG;gBACT,WAAW;gBACX,MAAM,EAAE,IAAI;aACf,CAAA;QACL,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG;gBACT,WAAW;gBACX,IAAI;aACP,CAAA;QACL,CAAC;QACD,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACpC,CAAC,CAAC;SACG,WAAW,CAAC,IAAI,oBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC,WAAW,CAAC,IAAI,oBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC,WAAW,CAAC,IAAI,oBAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACrF,WAAW,CAAC,GAAG,YAAY,kDAAkD,YAAY,sBAAsB,CAAC;SAChH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACjC,CAAC,CAAA;AA1BY,QAAA,2BAA2B,+BA0BvC"}
+{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/permission.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,sCAA4F;AAC5F,uCAA+C;AAE/C,MAAM,cAAc,GAAG,QAAQ,CAAA;AAElB,QAAA,WAAW,GAAG,IAAI,GAAG,CAA2B;IACzD,CAAC,WAAW,EAAE,sBAAgB,CAAC,SAAS,CAAC;IACzC,CAAC,SAAS,EAAE,sBAAgB,CAAC,OAAO,CAAC;IACrC,CAAC,MAAM,EAAE,sBAAgB,CAAC,IAAI,CAAC;IAC/B,CAAC,QAAQ,EAAE,sBAAgB,CAAC,MAAM,CAAC;IACnC,CAAC,OAAO,EAAE,sBAAgB,CAAC,KAAK,CAAC;CACpC,CAAC,CAAA;AAEK,MAAM,aAAa,GAAG,CAAC,EAAU,EAA4B,EAAE;IAClE,MAAM,MAAM,GAAG,mBAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAA;IAChD,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAEM,MAAM,eAAe,GAAG,CAAC,UAA4B,EAAU,EAAE;IACpE,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAE,CAAC,CAAC,CAAC,CAAA;AACrF,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,2BAA2B,GAAG,CACvC,MAA2E,EAC3E,YAAoB,EAChB,EAAE;IACN,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,IAAY,EAAE,aAAuB,EAAE,EAAE;QACzG,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC/C,MAAM,WAAW,GAAuB,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC,CAAA;QACxG,IAAI,UAAgC,CAAA;QACpC,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1B,UAAU,GAAG;gBACT,WAAW;gBACX,MAAM,EAAE,IAAI;aACf,CAAA;QACL,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG;gBACT,WAAW;gBACX,MAAM,EAAE,IAAI;aACf,CAAA;QACL,CAAC;QACD,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACpC,CAAC,CAAC;SACG,WAAW,CAAC,IAAI,oBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC,WAAW,CAAC,IAAI,oBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC,WAAW,CAAC,IAAI,oBAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACrF,WAAW,CAAC,GAAG,YAAY,kDAAkD,YAAY,sBAAsB,CAAC;SAChH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACjC,CAAC,CAAA;AA1BY,QAAA,2BAA2B,+BA0BvC"}

package/jest.config.ts

@@ -0,0 +1 @@
+export { default } from '../../jest.config'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/cli-tools",
-  "version": "101.1.2",
+  "version": "102.0.0-beta.1",
   "description": "Command line tools for Streamr",
   "repository": {
     "type": "git",
@@ -11,8 +11,8 @@
     "streamr": "dist/bin/streamr.js"
   },
   "scripts": {
-    "build": "tsc -b tsconfig.json",
-    "check": "tsc -p ./tsconfig.json --noEmit",
+    "build": "tsc -b tsconfig.node.json",
+    "check": "tsc -p ./tsconfig.jest.json",
     "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
     "test": "npm run build && jest --bail --forceExit"
@@ -26,19 +26,23 @@
   "author": "Streamr Network AG <contact@streamr.com>",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@streamr/sdk": "101.1.2",
-    "@streamr/utils": "101.1.2",
-    "commander": "^12.1.0",
+    "@streamr/dht": "102.0.0-beta.1",
+    "@streamr/sdk": "102.0.0-beta.1",
+    "@streamr/trackerless-network": "102.0.0-beta.1",
+    "@streamr/utils": "102.0.0-beta.1",
+    "commander": "^13.1.0",
     "easy-table": "^1.1.1",
     "ethers": "^6.13.0",
     "event-stream": "^4.0.1",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@streamr/test-utils": "101.1.2",
+    "@streamr/test-utils": "102.0.0-beta.1",
     "@types/event-stream": "^4.0.5",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.14",
     "@types/merge2": "^1.4.4",
+    "@types/semver": "^7.5.8",
     "merge2": "^1.4.1"
   }
 }

package/src/client.ts

@@ -1,16 +1,15 @@
-import omit from 'lodash/omit'
+import { StreamrClient, StreamrClientConfig } from '@streamr/sdk'
 import merge from 'lodash/merge'
-import { StreamrClientConfig, StreamrClient, CONFIG_TEST } from '@streamr/sdk'
 import { Options } from './command'
 import { getConfig } from './config'
 
 export const getClientConfig = (commandOptions: Options, overridenOptions: StreamrClientConfig = {}): StreamrClientConfig => {
-    const environmentOptions = commandOptions.dev ? omit(CONFIG_TEST, 'auth') : undefined
     const configFileJson = getConfig(commandOptions.config)?.client
+    const environmentOptions = { environment: commandOptions.env }
     const authenticationOptions = (commandOptions.privateKey !== undefined) ? { auth: { privateKey: commandOptions.privateKey } } : undefined
     return merge(
-        environmentOptions,
         configFileJson,
+        environmentOptions,
         authenticationOptions,
         overridenOptions
     )

package/src/command.ts

@@ -1,12 +1,13 @@
+import { DEFAULT_ENVIRONMENT_ID, ENVIRONMENT_IDS, EnvironmentId, StreamrClientConfig } from '@streamr/sdk'
 import commander, { Command } from 'commander'
-import { StreamrClientConfig } from '@streamr/sdk'
 import pkg from '../package.json'
 import { createClient } from './client'
+import { createFnParseEnum, formEnumArgValueDescription } from './common'
 
 export interface Options {
     privateKey?: string
     config?: string
-    dev: boolean
+    env?: EnvironmentId
 }
 
 export const createCommand = (): commander.Command => {
@@ -31,7 +32,8 @@ export const createClientCommand = (
     return createCommand()
         .option('--private-key <key>', 'use an Ethereum private key to authenticate')
         .option('--config <file>', 'read connection and authentication settings from a config file')
-        .option('--dev', 'use pre-defined development environment', false)
+        .option('--env <environmentId>', `use pre-defined environment (${formEnumArgValueDescription(ENVIRONMENT_IDS, DEFAULT_ENVIRONMENT_ID)})`,
+            createFnParseEnum('env', ENVIRONMENT_IDS))
         .action(async (...args: any[]) => {
             const commandOptions = args[args.length - 1].opts()
             try {

package/src/common.ts

@@ -23,3 +23,21 @@ export function createFnParseInt(name: string): (s: string) => number {
         return n
     }
 }
+
+export function createFnParseEnum(name: string, allowedValues: string[]): (s: string) => string {
+    return (value: string) => {
+        if (!allowedValues.includes(value)) {
+            console.error(`${name} must be one of: ${allowedValues.map((s) => wrapWithQuotes(s)).join(', ')}`)
+            process.exit(1)
+        }
+        return value
+    }
+}
+
+export const formEnumArgValueDescription = (allowedValues: string[], defaultValue: string): string => {
+    return `one of: ${allowedValues.map(wrapWithQuotes).join(', ')}, default: ${wrapWithQuotes(defaultValue)}`
+}
+
+export const wrapWithQuotes = (str: string): string => {
+    return `"${str}"`
+}

package/src/permission.ts

@@ -40,7 +40,7 @@ export const runModifyPermissionsCommand = (
         } else {
             assignment = {
                 permissions,
-                user
+                userId: user
             }
         }
         await modify(stream, assignment) 

package/test/environment.test.ts

@@ -0,0 +1,32 @@
+import { randomString } from '@streamr/utils'
+import fs from 'fs/promises'
+import { runCommand } from './utils'
+import { StreamrClientConfig } from '@streamr/sdk'
+
+const POLYGON_AMOY_CHAIN_ID = 80002
+
+describe('env command line option', () => {
+
+    it('takes precedence over client.environment config', async () => {
+        const configFileName = `test-${randomString(10)}.json`
+        await fs.writeFile(configFileName, JSON.stringify({
+            client: {
+                environment: 'dev2'
+            }
+        }))
+        const outputLines = await runCommand(`internal show-sdk-config --env polygonAmoy --config ${configFileName}`, {
+            devEnvironment: false
+        })
+        const outputJson: StreamrClientConfig = JSON.parse(outputLines.join(''))
+        await fs.unlink(configFileName)
+        expect(outputJson.contracts!.ethereumNetwork!.chainId).toBe(POLYGON_AMOY_CHAIN_ID)
+    })
+
+    it('invalid value', async () => {
+        const outputLines = await runCommand('stream show foobar --env invalid-environment', {
+            devEnvironment: false
+        })
+        expect(outputLines).toHaveLength(1)
+        expect(outputLines[0]).toEqual('env must be one of: "polygon", "polygonAmoy", "dev2"')
+    }, 60 * 1000)
+})

package/test/internal-operator.test.ts

@@ -0,0 +1,57 @@
+import { _operatorContractUtils } from '@streamr/sdk'
+import { fetchPrivateKeyWithGas, generateWalletWithGasAndTokens } from '@streamr/test-utils'
+import { createTestClient, runCommand } from './utils'
+import { parseEther, Wallet } from 'ethers'
+import { wait } from '@streamr/utils'
+
+const DELEGATION_AMOUNT = '20000'
+const STAKE_AMOUNT = '10000'
+const SELF_DELEGATION_AMOUNT = '100000'
+const MINIMUM_DELEGATION_SECONDS = 1  // the config value defined in StreamrEnvDeployer in network-contracts repo
+
+describe('operator', () => {
+
+    it('happy path', async () => {
+        const client = createTestClient(await fetchPrivateKeyWithGas())
+        const stream = await client.createStream('/test')
+        const sponsorshipContract = await _operatorContractUtils.deploySponsorshipContract({ 
+            streamId: stream.id,
+            deployer: new Wallet(await fetchPrivateKeyWithGas()).connect(_operatorContractUtils.getProvider())
+        })
+        const sponsorshipAddress: string = await sponsorshipContract.getAddress()
+        const operator = await generateWalletWithGasAndTokens()
+        const operatorContract = await _operatorContractUtils.deployOperatorContract({
+            deployer: operator
+        })
+        await _operatorContractUtils.delegate(operator, await operatorContract.getAddress(), parseEther(SELF_DELEGATION_AMOUNT))
+        const delegator = await generateWalletWithGasAndTokens()
+        const operatorAddress: string = await operatorContract.getAddress()
+
+        // delegate
+        await runCommand(`internal operator-delegate ${operatorAddress} ${DELEGATION_AMOUNT}`, {
+            privateKey: delegator.privateKey
+        })
+        expect(await operatorContract.balanceInData(await delegator.getAddress())).toEqual(parseEther(DELEGATION_AMOUNT))
+
+        // stake
+        await runCommand(`internal operator-stake ${operatorAddress} ${sponsorshipAddress} ${STAKE_AMOUNT}`, {
+            privateKey: operator.privateKey
+        })
+        expect(await operatorContract.totalStakedIntoSponsorshipsWei()).toEqual(parseEther(STAKE_AMOUNT))
+
+        // unstake
+        await runCommand(`internal operator-unstake ${operatorAddress} ${sponsorshipAddress}`, {
+            privateKey: operator.privateKey
+        })
+        expect(await operatorContract.totalStakedIntoSponsorshipsWei()).toEqual(0n)
+
+        // undelegate
+        await wait(MINIMUM_DELEGATION_SECONDS)
+        await runCommand(`internal operator-undelegate ${operatorAddress} ${DELEGATION_AMOUNT}`, {
+            privateKey: delegator.privateKey
+        })
+        expect(await operatorContract.balanceInData(await delegator.getAddress())).toEqual(0n)
+
+        await client.destroy()
+    }, 30 * 1000)
+})

package/test/internal-sponsorship-sponsor.test.ts

@@ -0,0 +1,28 @@
+import { _operatorContractUtils } from '@streamr/sdk'
+import { fetchPrivateKeyWithGas, generateWalletWithGasAndTokens } from '@streamr/test-utils'
+import { createTestClient, runCommand } from './utils'
+import { parseEther, Wallet } from 'ethers'
+
+const SPONSOR_AMOUNT = '12345'
+
+describe('sponsorship-sponsor', () => {
+
+    it('happy path', async () => {
+        const client = createTestClient(await fetchPrivateKeyWithGas())
+        const stream = await client.createStream('/test')
+        const sponsorshipContract = await _operatorContractUtils.deploySponsorshipContract({ 
+            streamId: stream.id,
+            deployer: new Wallet(await fetchPrivateKeyWithGas()).connect(_operatorContractUtils.getProvider())
+        })
+
+        const sponsorer = await generateWalletWithGasAndTokens()
+        const sponsorshipAddress: string = await sponsorshipContract.getAddress()
+        await runCommand(`internal sponsorship-sponsor ${sponsorshipAddress} ${SPONSOR_AMOUNT}`, {
+            privateKey: sponsorer.privateKey
+        })
+
+        const remainingWei = await sponsorshipContract.connect(sponsorer, _operatorContractUtils.getProvider()).remainingWei()
+        expect(remainingWei).toEqual(parseEther(SPONSOR_AMOUNT))
+        await client.destroy()
+    })
+})

package/test/mock-data.test.ts

@@ -16,4 +16,18 @@ describe('mock-data', () => {
         expect(json).toBeObject()
     })
 
+    it('generate binary', async () => {
+        const abortController = new AbortController()
+        const outputIterable = startCommand('mock-data generate --binary --min-length 32 --max-length 64', {
+            abortSignal: abortController.signal,
+            devEnvironment: false
+        })
+        const firstLine = (await collect(outputIterable, 1))[0]
+        abortController.abort()
+        expect(firstLine).toMatch(/^[0-9a-f]+$/)
+        const lengthInBytes = firstLine.length / 2
+        expect(lengthInBytes).toBeGreaterThanOrEqual(32)
+        expect(lengthInBytes).toBeLessThanOrEqual(64)
+    })
+
 })

package/test/storage-node.test.ts

@@ -2,7 +2,7 @@ import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import 'jest-extended'
 import { StreamID } from '@streamr/sdk'
 import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
-import { waitForCondition } from '@streamr/utils'
+import { until } from '@streamr/utils'
 
 const isStored = async (streamId: StreamID): Promise<boolean> => {
     const output = await runCommand(`storage-node list-streams ${DOCKER_DEV_STORAGE_NODE}`)
@@ -19,11 +19,11 @@ describe('storage node', () => {
         await runCommand(`storage-node add-stream ${DOCKER_DEV_STORAGE_NODE} ${stream.id}`, {
             privateKey
         })
-        await waitForCondition(async () => await isStored(stream.id) === true, 15 * 1000, 1000)
+        await until(async () => await isStored(stream.id) === true, 15 * 1000, 1000)
         await runCommand(`storage-node remove-stream ${DOCKER_DEV_STORAGE_NODE} ${stream.id}`, {
             privateKey
         })
-        await waitForCondition(async () => await isStored(stream.id) === false, 15 * 1000, 1000)
+        await until(async () => await isStored(stream.id) === false, 15 * 1000, 1000)
     }, 80 * 1000)
 
     it('list nodes', async () => {

package/test/stream-create.test.ts

@@ -19,7 +19,7 @@ describe('create stream', () => {
         })
         const client = createTestClient()
         const stream = await client.getStream(streamId)
-        expect(stream.getMetadata().partitions).toBe(1)
+        expect(await stream.getPartitionCount()).toBe(1)
         await client.destroy()
     }, 20 * 1000)
 

package/test/stream-permission.test.ts

@@ -1,4 +1,4 @@
-import { fetchPrivateKeyWithGas, randomEthereumAddress } from '@streamr/test-utils'
+import { fetchPrivateKeyWithGas, randomUserId } from '@streamr/test-utils'
 import 'jest-extended'
 import { StreamPermission } from '@streamr/sdk'
 import { createTestClient, runCommand } from './utils'
@@ -9,9 +9,9 @@ describe('permission', () => {
         const privateKey = await fetchPrivateKeyWithGas()
         const client = createTestClient(privateKey)
         const stream = await client.createStream(`/${Date.now()}`)
-        const otherUser = randomEthereumAddress()
+        const otherUser = randomUserId()
         const hasPermission = () => client.hasPermission({
-            user: otherUser,
+            userId: otherUser,
             permission: StreamPermission.PUBLISH,
             streamId: stream.id,
             allowPublic: false

package/test/stream-publish-subscribe.test.ts

@@ -18,7 +18,7 @@ describe('publish and subscribe', () => {
         const client = createTestClient(publisherPrivateKey)
         const stream = await client.createStream(`/${Date.now()}`)
         await stream.grantPermissions({
-            user: new Wallet(subscriberPrivateKey).address,
+            userId: new Wallet(subscriberPrivateKey).address,
             permissions: [StreamPermission.SUBSCRIBE]
         })
         streamId = stream.id

package/test/stream-resend.test.ts

@@ -18,7 +18,7 @@ describe('resend stream', () => {
         privateKey = await fetchPrivateKeyWithGas()
         const client = createTestClient(privateKey)
         stream = await client.createStream(`/${Date.now()}`)
-        await stream.addToStorageNode(DOCKER_DEV_STORAGE_NODE)
+        await stream.addToStorageNode(DOCKER_DEV_STORAGE_NODE, { wait: true })
         for (const msgId of range(10)) {
             await wait(10) // to prevent duplicate timestamps (to make test assertions simpler)
             const msg = await stream.publish({ msgId })

package/test/utils.ts

@@ -1,7 +1,7 @@
-import { collect, waitForCondition } from '@streamr/utils'
+import { Stream, StreamrClient } from '@streamr/sdk'
+import { collect, until } from '@streamr/utils'
 import { spawn } from 'child_process'
 import merge2 from 'merge2'
-import { CONFIG_TEST, Stream, StreamrClient } from '@streamr/sdk'
 
 export const DOCKER_DEV_STORAGE_NODE = '0xde1112f631486CfC759A50196853011528bC5FA0'
 
@@ -24,7 +24,7 @@ export async function* startCommand(commandLine: string, opts?: StartCommandOpti
         args.push('--private-key', opts.privateKey)
     }
     if (opts?.devEnvironment !== false) {
-        args.push('--dev')
+        args.push('--env', 'dev2')
     }
     const executable = spawn(`node`, args, {
         signal: opts?.abortSignal,
@@ -69,13 +69,13 @@ async function* lines(src: AsyncIterable<Buffer>): AsyncGenerator<string, any, a
 
 export const createTestClient = (privateKey?: string): StreamrClient => {
     return new StreamrClient({
-        ...CONFIG_TEST,
+        environment: 'dev2',
         auth: (privateKey !== undefined) ? { privateKey } : undefined
     })
 }
 
 export const waitForTheGraphToHaveIndexed = async (stream: Stream, client: StreamrClient): Promise<void> => {
-    await waitForCondition(async () => {
+    await until(async () => {
         // eslint-disable-next-line no-underscore-dangle
         for await (const _msg of client.searchStreams(stream.id, undefined)) {
             return true

package/tsconfig.json

@@ -1,16 +1,3 @@
 {
-    "extends": "../../tsconfig.node.json",
-    "compilerOptions": {
-        "composite": true,
-        "outDir": "dist"
-    },
-    "include": [
-        "package.json",
-        "src/**/*",
-        "bin/**/*"
-    ],
-    "references": [
-        { "path": "../utils/tsconfig.node.json" },
-        { "path": "../sdk/tsconfig.node.json" }
-    ]
+    "extends": "./tsconfig.jest.json"
 }

package/tsconfig.node.json

@@ -0,0 +1,16 @@
+{
+    "extends": "../../tsconfig.node.json",
+    "compilerOptions": {
+        "composite": true,
+        "outDir": "dist"
+    },
+    "include": [
+        "package.json",
+        "src/**/*",
+        "bin/**/*"
+    ],
+    "references": [
+        { "path": "../utils/tsconfig.node.json" },
+        { "path": "../sdk/tsconfig.node.json" }
+    ]
+}

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules/**
-dist/**

package/.eslintrc

@@ -1,6 +0,0 @@
-{
-  "extends": "../../.eslintrc.js",
-  "rules": {
-    "no-console": "off"
-  }
-}