@streamr/cli-tools 102.0.0-beta.2 → 102.0.0

package/bin/streamr-internal-token-mint.ts

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+import '../src/logLevel'
+
+import { _operatorContractUtils } from '@streamr/sdk'
+import { parseEther } from 'ethers'
+import { createCommand } from '../src/command'
+
+createCommand().action(async (targetAddress: string, dataTokenAmount: string, gasAmount?: string) => {
+    const adminWallet = _operatorContractUtils.getTestAdminWallet()
+    const token = _operatorContractUtils.getTestTokenContract().connect(adminWallet)
+    await (await token.mint(targetAddress, parseEther(dataTokenAmount))).wait()
+    if (gasAmount !== undefined) {
+        await (await adminWallet.sendTransaction({
+            to: targetAddress,
+            value: parseEther(gasAmount)
+        })).wait()
+    }
+})
+    .arguments('<targetAddress> <dataTokenAmount> [gasAmount]')
+    .description('mint test tokens and optionally transfer gas to the given Ethereum address')
+    .parseAsync()

package/bin/streamr-internal.ts

@@ -14,4 +14,5 @@ program
     .command('operator-undelegate', 'undelegate funds from an operator')
     .command('operator-stake', 'stake operator\'s funds to a sponsorship')
     .command('operator-unstake', 'unstake all operator\'s funds from a sponsorship')
+    .command('token-mint', 'mint test tokens')
     .parse()

package/dist/bin/streamr-internal-token-mint.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../src/logLevel';

package/dist/bin/streamr-internal-token-mint.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
+const sdk_1 = require("@streamr/sdk");
+const ethers_1 = require("ethers");
+const command_1 = require("../src/command");
+(0, command_1.createCommand)().action(async (targetAddress, dataTokenAmount, gasAmount) => {
+    const adminWallet = sdk_1._operatorContractUtils.getTestAdminWallet();
+    const token = sdk_1._operatorContractUtils.getTestTokenContract().connect(adminWallet);
+    await (await token.mint(targetAddress, (0, ethers_1.parseEther)(dataTokenAmount))).wait();
+    if (gasAmount !== undefined) {
+        await (await adminWallet.sendTransaction({
+            to: targetAddress,
+            value: (0, ethers_1.parseEther)(gasAmount)
+        })).wait();
+    }
+})
+    .arguments('<targetAddress> <dataTokenAmount> [gasAmount]')
+    .description('mint test tokens and optionally transfer gas to the given Ethereum address')
+    .parseAsync();
+//# sourceMappingURL=streamr-internal-token-mint.js.map

package/dist/bin/streamr-internal-token-mint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-internal-token-mint.js","sourceRoot":"","sources":["../../bin/streamr-internal-token-mint.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,sCAAqD;AACrD,mCAAmC;AACnC,4CAA8C;AAE9C,IAAA,uBAAa,GAAE,CAAC,MAAM,CAAC,KAAK,EAAE,aAAqB,EAAE,eAAuB,EAAE,SAAkB,EAAE,EAAE;IAChG,MAAM,WAAW,GAAG,4BAAsB,CAAC,kBAAkB,EAAE,CAAA;IAC/D,MAAM,KAAK,GAAG,4BAAsB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAChF,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,mBAAU,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAC3E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,WAAW,CAAC,eAAe,CAAC;YACrC,EAAE,EAAE,aAAa;YACjB,KAAK,EAAE,IAAA,mBAAU,EAAC,SAAS,CAAC;SAC/B,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACd,CAAC;AACL,CAAC,CAAC;KACG,SAAS,CAAC,+CAA+C,CAAC;KAC1D,WAAW,CAAC,4EAA4E,CAAC;KACzF,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-internal.js

@@ -18,5 +18,6 @@ commander_1.program
     .command('operator-undelegate', 'undelegate funds from an operator')
     .command('operator-stake', 'stake operator\'s funds to a sponsorship')
     .command('operator-unstake', 'unstake all operator\'s funds from a sponsorship')
+    .command('token-mint', 'mint test tokens')
     .parse();
 //# sourceMappingURL=streamr-internal.js.map

package/dist/bin/streamr-internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-internal.js","sourceRoot":"","sources":["../../bin/streamr-internal.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,kEAAkE,CAAC;KAC/E,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;KACzC,OAAO,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;KAC3D,OAAO,CAAC,iBAAiB,EAAE,4CAA4C,CAAC;KACxE,OAAO,CAAC,qBAAqB,EAAE,uBAAuB,CAAC;KACvD,OAAO,CAAC,mBAAmB,EAAE,+BAA+B,CAAC;KAC7D,OAAO,CAAC,qBAAqB,EAAE,mCAAmC,CAAC;KACnE,OAAO,CAAC,gBAAgB,EAAE,0CAA0C,CAAC;KACrE,OAAO,CAAC,kBAAkB,EAAE,kDAAkD,CAAC;KAC/E,KAAK,EAAE,CAAA"}
+{"version":3,"file":"streamr-internal.js","sourceRoot":"","sources":["../../bin/streamr-internal.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,kEAAkE,CAAC;KAC/E,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;KACzC,OAAO,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;KAC3D,OAAO,CAAC,iBAAiB,EAAE,4CAA4C,CAAC;KACxE,OAAO,CAAC,qBAAqB,EAAE,uBAAuB,CAAC;KACvD,OAAO,CAAC,mBAAmB,EAAE,+BAA+B,CAAC;KAC7D,OAAO,CAAC,qBAAqB,EAAE,mCAAmC,CAAC;KACnE,OAAO,CAAC,gBAAgB,EAAE,0CAA0C,CAAC;KACrE,OAAO,CAAC,kBAAkB,EAAE,kDAAkD,CAAC;KAC/E,OAAO,CAAC,YAAY,EAAE,kBAAkB,CAAC;KACzC,KAAK,EAAE,CAAA"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "102.0.0-beta.2",
+    "version": "102.0.0",
     "description": "Command line tools for Streamr",
     "repository": {
         "type": "git",
@@ -26,10 +26,10 @@
     "author": "Streamr Network AG <contact@streamr.com>",
     "license": "AGPL-3.0",
     "dependencies": {
-        "@streamr/dht": "102.0.0-beta.2",
-        "@streamr/sdk": "102.0.0-beta.2",
-        "@streamr/trackerless-network": "102.0.0-beta.2",
-        "@streamr/utils": "102.0.0-beta.2",
+        "@streamr/dht": "102.0.0",
+        "@streamr/sdk": "102.0.0",
+        "@streamr/trackerless-network": "102.0.0",
+        "@streamr/utils": "102.0.0",
         "commander": "^13.1.0",
         "easy-table": "^1.1.1",
         "ethers": "^6.13.0",
@@ -38,7 +38,7 @@
         "semver": "^7.6.3"
     },
     "devDependencies": {
-        "@streamr/test-utils": "102.0.0-beta.2",
+        "@streamr/test-utils": "102.0.0",
         "@types/event-stream": "^4.0.5",
         "@types/lodash": "^4.17.14",
         "@types/merge2": "^1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/cli-tools",
-  "version": "102.0.0-beta.2",
+  "version": "102.0.0",
   "description": "Command line tools for Streamr",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
   "author": "Streamr Network AG <contact@streamr.com>",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@streamr/dht": "102.0.0-beta.2",
-    "@streamr/sdk": "102.0.0-beta.2",
-    "@streamr/trackerless-network": "102.0.0-beta.2",
-    "@streamr/utils": "102.0.0-beta.2",
+    "@streamr/dht": "102.0.0",
+    "@streamr/sdk": "102.0.0",
+    "@streamr/trackerless-network": "102.0.0",
+    "@streamr/utils": "102.0.0",
     "commander": "^13.1.0",
     "easy-table": "^1.1.1",
     "ethers": "^6.13.0",
@@ -38,7 +38,7 @@
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@streamr/test-utils": "102.0.0-beta.2",
+    "@streamr/test-utils": "102.0.0",
     "@types/event-stream": "^4.0.5",
     "@types/lodash": "^4.17.14",
     "@types/merge2": "^1.4.4",

package/test/internal-operator.test.ts

@@ -1,8 +1,8 @@
 import { _operatorContractUtils } from '@streamr/sdk'
-import { fetchPrivateKeyWithGas, generateWalletWithGasAndTokens } from '@streamr/test-utils'
-import { createTestClient, runCommand } from './utils'
-import { parseEther, Wallet } from 'ethers'
+import { createTestPrivateKey, createTestWallet } from '@streamr/test-utils'
 import { wait } from '@streamr/utils'
+import { parseEther } from 'ethers'
+import { createTestClient, runCommand } from './utils'
 
 const DELEGATION_AMOUNT = '20000'
 const STAKE_AMOUNT = '10000'
@@ -12,19 +12,19 @@ const MINIMUM_DELEGATION_SECONDS = 1  // the config value defined in StreamrEnvD
 describe('operator', () => {
 
     it('happy path', async () => {
-        const client = createTestClient(await fetchPrivateKeyWithGas())
+        const client = createTestClient(await createTestPrivateKey({ gas: true }))
         const stream = await client.createStream('/test')
         const sponsorshipContract = await _operatorContractUtils.deploySponsorshipContract({ 
             streamId: stream.id,
-            deployer: new Wallet(await fetchPrivateKeyWithGas()).connect(_operatorContractUtils.getProvider())
+            deployer: await createTestWallet({ gas: true })
         })
         const sponsorshipAddress: string = await sponsorshipContract.getAddress()
-        const operator = await generateWalletWithGasAndTokens()
+        const operator = await createTestWallet({ gas: true, tokens: true })
         const operatorContract = await _operatorContractUtils.deployOperatorContract({
             deployer: operator
         })
         await _operatorContractUtils.delegate(operator, await operatorContract.getAddress(), parseEther(SELF_DELEGATION_AMOUNT))
-        const delegator = await generateWalletWithGasAndTokens()
+        const delegator = await createTestWallet({ gas: true, tokens: true })
         const operatorAddress: string = await operatorContract.getAddress()
 
         // delegate

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

@@ -1,21 +1,21 @@
 import { _operatorContractUtils } from '@streamr/sdk'
-import { fetchPrivateKeyWithGas, generateWalletWithGasAndTokens } from '@streamr/test-utils'
+import { createTestPrivateKey, createTestWallet } from '@streamr/test-utils'
+import { parseEther } from 'ethers'
 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 client = createTestClient(await createTestPrivateKey({ gas: true }))
         const stream = await client.createStream('/test')
         const sponsorshipContract = await _operatorContractUtils.deploySponsorshipContract({ 
             streamId: stream.id,
-            deployer: new Wallet(await fetchPrivateKeyWithGas()).connect(_operatorContractUtils.getProvider())
+            deployer: await createTestWallet({ gas: true })
         })
 
-        const sponsorer = await generateWalletWithGasAndTokens()
+        const sponsorer = await createTestWallet({ gas: true, tokens: true })
         const sponsorshipAddress: string = await sponsorshipContract.getAddress()
         await runCommand(`internal sponsorship-sponsor ${sponsorshipAddress} ${SPONSOR_AMOUNT}`, {
             privateKey: sponsorer.privateKey

package/test/storage-node.test.ts

@@ -1,8 +1,8 @@
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import 'jest-extended'
 import { StreamID } from '@streamr/sdk'
-import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
+import { createTestPrivateKey } from '@streamr/test-utils'
 import { until } from '@streamr/utils'
+import 'jest-extended'
+import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
 
 const isStored = async (streamId: StreamID): Promise<boolean> => {
     const output = await runCommand(`storage-node list-streams ${DOCKER_DEV_STORAGE_NODE}`)
@@ -12,7 +12,7 @@ const isStored = async (streamId: StreamID): Promise<boolean> => {
 describe('storage node', () => {
 
     it('add and remove stream', async () => {
-        const privateKey = await fetchPrivateKeyWithGas()
+        const privateKey = await createTestPrivateKey({ gas: true })
         const client = createTestClient(privateKey)
         const stream = await client.createStream(`/${Date.now()}`)
         await client.destroy()

package/test/stream-create.test.ts

@@ -1,11 +1,11 @@
+import { createTestPrivateKey } from '@streamr/test-utils'
 import { Wallet } from 'ethers'
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import { createTestClient, runCommand } from './utils'
 
 describe('create stream', () => {
 
     it('happy path', async () => {
-        const privateKey = await fetchPrivateKeyWithGas()
+        const privateKey = await createTestPrivateKey({ gas: true })
         const address = new Wallet(privateKey).address.toLowerCase()
         const path = `/${Date.now()}`
         const streamId = `${address}${path}`

package/test/stream-permission.test.ts

@@ -1,12 +1,12 @@
-import { fetchPrivateKeyWithGas, randomUserId } from '@streamr/test-utils'
-import 'jest-extended'
 import { StreamPermission } from '@streamr/sdk'
+import { createTestPrivateKey, randomUserId } from '@streamr/test-utils'
+import 'jest-extended'
 import { createTestClient, runCommand } from './utils'
 
 describe('permission', () => {
 
     it('grant and revoke', async () => {
-        const privateKey = await fetchPrivateKeyWithGas()
+        const privateKey = await createTestPrivateKey({ gas: true })
         const client = createTestClient(privateKey)
         const stream = await client.createStream(`/${Date.now()}`)
         const otherUser = randomUserId()

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

@@ -1,7 +1,7 @@
-import { Wallet } from 'ethers'
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import { collect } from '@streamr/utils'
 import { StreamPermission } from '@streamr/sdk'
+import { createTestPrivateKey } from '@streamr/test-utils'
+import { collect } from '@streamr/utils'
+import { Wallet } from 'ethers'
 import { createTestClient, runCommand, startCommand } from './utils'
 
 const TIMEOUT = 30 * 1000
@@ -13,8 +13,8 @@ describe('publish and subscribe', () => {
     let streamId: string
 
     beforeAll(async () => {
-        publisherPrivateKey = await fetchPrivateKeyWithGas()
-        subscriberPrivateKey = await fetchPrivateKeyWithGas()
+        publisherPrivateKey = await createTestPrivateKey({ gas: true })
+        subscriberPrivateKey = await createTestPrivateKey({ gas: true })
         const client = createTestClient(publisherPrivateKey)
         const stream = await client.createStream(`/${Date.now()}`)
         await stream.grantPermissions({

package/test/stream-resend.test.ts

@@ -1,8 +1,8 @@
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import range from 'lodash/range'
 import { Message, Stream } from '@streamr/sdk'
-import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
+import { createTestPrivateKey } from '@streamr/test-utils'
 import { wait } from '@streamr/utils'
+import range from 'lodash/range'
+import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
 
 const parseJSONs = (lines: string[]): any[] => {
     return lines.map((line) => JSON.parse(line))
@@ -15,7 +15,7 @@ describe('resend stream', () => {
     const messages: Message[] = []
 
     beforeAll(async () => {
-        privateKey = await fetchPrivateKeyWithGas()
+        privateKey = await createTestPrivateKey({ gas: true })
         const client = createTestClient(privateKey)
         stream = await client.createStream(`/${Date.now()}`)
         await stream.addToStorageNode(DOCKER_DEV_STORAGE_NODE, { wait: true })

package/test/stream-search.test.ts

@@ -1,4 +1,4 @@
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
+import { createTestPrivateKey } from '@streamr/test-utils'
 import { randomString } from '@streamr/utils'
 import { createTestClient, runCommand, waitForTheGraphToHaveIndexed } from './utils'
 
@@ -6,7 +6,7 @@ describe('search streams', () => {
 
     it('happy path', async () => {
         const testId = randomString(10)
-        const client = createTestClient(await fetchPrivateKeyWithGas())
+        const client = createTestClient(await createTestPrivateKey({ gas: true }))
         const stream1 = await client.createStream(`/${testId}-1`)
         const stream2 = await client.createStream(`/${testId}-2`)
         await Promise.all([

package/test/stream-show.test.ts

@@ -1,11 +1,11 @@
+import { createTestPrivateKey } from '@streamr/test-utils'
 import { Wallet } from 'ethers'
-import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import { createTestClient, runCommand, waitForTheGraphToHaveIndexed } from './utils'
 
 describe('show stream', () => {
 
     it('happy path', async () => {
-        const creatorPrivateKey = await fetchPrivateKeyWithGas()
+        const creatorPrivateKey = await createTestPrivateKey({ gas: true })
         const client = createTestClient(creatorPrivateKey)
         const stream = await client.createStream(`/${Date.now()}`)
         await waitForTheGraphToHaveIndexed(stream, client)