hasPermission, getPermissions, grantPermissions, revokePermissions, s…

…etPermissions

packages/cli-tools/bin/streamr-stream-show.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
+import { StreamrClient, UserPermissionAssignment } from '@streamr/sdk'
+import { Options as BaseOptions, createClientCommand } from '../src/command'
 import '../src/logLevel'
-import { StreamrClient } from '@streamr/sdk'
-import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { getPermissionId } from '../src/permission'
+import { toUserId } from '@streamr/utils'
 
 interface Options extends BaseOptions {
     includePermissions: boolean
@@ -16,6 +17,9 @@ createClientCommand(async (client: StreamrClient, streamId: string, options: Opt
         obj.permissions = assigments.map((assignment) => {
             return {
                 ...assignment,
+                user: ((assignment as UserPermissionAssignment).user !== undefined) 
+                    ? toUserId((assignment as UserPermissionAssignment).user)
+                    : undefined,
                 permissions: assignment.permissions.map(getPermissionId)
             }
         })

packages/cli-tools/src/permission.ts

@@ -1,6 +1,7 @@
 import { Argument } from 'commander'
 import { PermissionAssignment, Stream, StreamPermission, StreamrClient } from '@streamr/sdk'
 import { createClientCommand } from './command'
+import { toUserId, toUserIdRaw } from '@streamr/utils'
 
 const PUBLIC_USER_ID = 'public'
 
@@ -40,7 +41,7 @@ export const runModifyPermissionsCommand = (
         } else {
             assignment = {
                 permissions,
-                user
+                user: toUserIdRaw(toUserId(user))
             }
         }
         await modify(stream, assignment) 

packages/cli-tools/test/stream-permission.test.ts

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

packages/cli-tools/test/stream-publish-subscribe.test.ts

@@ -1,6 +1,6 @@
 import { Wallet } from 'ethers'
 import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import { collect } from '@streamr/utils'
+import { collect, toUserId, toUserIdRaw } from '@streamr/utils'
 import { StreamPermission } from '@streamr/sdk'
 import { createTestClient, runCommand, startCommand } from './utils'
 
@@ -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,
+            user: toUserIdRaw(toUserId(new Wallet(subscriberPrivateKey).address)),
             permissions: [StreamPermission.SUBSCRIBE]
         })
         streamId = stream.id

packages/node/test/integration/broker-subscriptions.test.ts

@@ -2,7 +2,7 @@ import { Wallet } from 'ethers'
 import mqtt, { AsyncMqttClient } from 'async-mqtt'
 import { StreamrClient, Stream, StreamPartID, StreamPermission } from '@streamr/sdk'
 import { fastWallet, fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import { wait, waitForCondition } from '@streamr/utils'
+import { toUserId, toUserIdRaw, wait, waitForCondition } from '@streamr/utils'
 import { Broker } from '../../src/broker'
 import { startBroker, createClient, createTestStream } from '../utils'
 
@@ -18,7 +18,7 @@ const createMqttClient = (mqttPort: number) => {
 const grantPermissions = async (streams: Stream[], brokerUsers: Wallet[]) => {
     for await (const s of streams) {
         const assignments = brokerUsers.map((user) => {
-            return { permissions: [StreamPermission.SUBSCRIBE], user: user.address }
+            return { permissions: [StreamPermission.SUBSCRIBE], user: toUserIdRaw(toUserId(user.address)) }
         })
         await s.grantPermissions(...assignments)
     }

packages/node/test/integration/plugins/operator/OperatorPlugin.test.ts

@@ -5,7 +5,7 @@ import {
     _operatorContractUtils
 } from '@streamr/sdk'
 import { fastPrivateKey, fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import { collect, waitForCondition, StreamPartIDUtils, EthereumAddress, toEthereumAddress } from '@streamr/utils'
+import { collect, waitForCondition, StreamPartIDUtils, EthereumAddress, toEthereumAddress, toUserIdRaw } from '@streamr/utils'
 import { Wallet } from 'ethers'
 import { Broker, createBroker } from '../../../../src/broker'
 import { createClient, createTestStream, formConfig, startBroker } from '../../../utils'
@@ -60,7 +60,7 @@ describe('OperatorPlugin', () => {
         const publisher = createClient(fastPrivateKey())
         await stream.grantPermissions({
             permissions: [StreamPermission.PUBLISH],
-            user: await publisher.getAddress()
+            user: toUserIdRaw(await publisher.getUserId())
         })
         const publishTimer = setInterval(async () => {
             await publisher.publish({ id: stream.id }, { foo: 'bar' })

packages/sdk/src/contracts/StreamRegistry.ts

@@ -4,11 +4,14 @@ import {
     Logger,
     StreamID,
     StreamIDUtils,
-    TheGraphClient, UserID, UserIDOld, collect,
+    TheGraphClient,
+    UserID,
+    collect,
     isENSName,
     toEthereumAddress,
     toStreamID,
-    toUserId
+    toUserId,
+    toUserIdRaw
 } from '@streamr/utils'
 import { ContractTransactionResponse } from 'ethers'
 import { Lifecycle, inject, scoped } from 'tsyringe'
@@ -356,9 +359,9 @@ export class StreamRegistry {
         if (isPublicPermissionQuery(query)) {
             return this.streamRegistryContractReadonly.hasPublicPermission(streamId, permissionType)
         } else if (query.allowPublic) {
-            return this.streamRegistryContractReadonly.hasPermission(streamId, toEthereumAddress(query.user), permissionType)
+            return this.streamRegistryContractReadonly.hasPermission(streamId, toUserId(query.user), permissionType)
         } else {
-            return this.streamRegistryContractReadonly.hasDirectPermission(streamId, toEthereumAddress(query.user), permissionType)
+            return this.streamRegistryContractReadonly.hasDirectPermission(streamId, toUserId(query.user), permissionType)
         }
     }
 
@@ -408,7 +411,7 @@ export class StreamRegistry {
                     })
                 } else {
                     assignments.push({
-                        user: permissionResult.userAddress,
+                        user: toUserIdRaw(toUserId(permissionResult.userAddress)),
                         permissions
                     })
                 }
@@ -419,7 +422,7 @@ export class StreamRegistry {
 
     async grantPermissions(streamIdOrPath: string, ...assignments: PermissionAssignment[]): Promise<void> {
         const overrides = await getEthersOverrides(this.rpcProviderSource, this.config)
-        return this.updatePermissions(streamIdOrPath, (streamId: StreamID, user: UserIDOld | undefined, solidityType: bigint) => {
+        return this.updatePermissions(streamIdOrPath, (streamId: StreamID, user: UserID | undefined, solidityType: bigint) => {
             return (user === undefined)
                 ? this.streamRegistryContract!.grantPublicPermission(streamId, solidityType, overrides)
                 : this.streamRegistryContract!.grantPermission(streamId, user, solidityType, overrides)
@@ -429,7 +432,7 @@ export class StreamRegistry {
     /* eslint-disable max-len */
     async revokePermissions(streamIdOrPath: string, ...assignments: PermissionAssignment[]): Promise<void> {
         const overrides = await getEthersOverrides(this.rpcProviderSource, this.config)
-        return this.updatePermissions(streamIdOrPath, (streamId: StreamID, user: UserIDOld | undefined, solidityType: bigint) => {
+        return this.updatePermissions(streamIdOrPath, (streamId: StreamID, user: UserID | undefined, solidityType: bigint) => {
             return (user === undefined)
                 ? this.streamRegistryContract!.revokePublicPermission(streamId, solidityType, overrides)
                 : this.streamRegistryContract!.revokePermission(streamId, user, solidityType, overrides)
@@ -438,7 +441,7 @@ export class StreamRegistry {
 
     private async updatePermissions(
         streamIdOrPath: string,
-        createTransaction: (streamId: StreamID, user: UserIDOld | undefined, solidityType: bigint) => Promise<ContractTransactionResponse>,
+        createTransaction: (streamId: StreamID, user: UserID | undefined, solidityType: bigint) => Promise<ContractTransactionResponse>,
         ...assignments: PermissionAssignment[]
     ): Promise<void> {
         const streamId = await this.streamIdBuilder.toStreamID(streamIdOrPath)
@@ -447,7 +450,7 @@ export class StreamRegistry {
         for (const assignment of assignments) {
             for (const permission of assignment.permissions) {
                 const solidityType = streamPermissionToSolidityType(permission)
-                const user = isPublicPermissionAssignment(assignment) ? undefined : toEthereumAddress(assignment.user)
+                const user = isPublicPermissionAssignment(assignment) ? undefined : toUserId(assignment.user)
                 const txToSubmit = createTransaction(streamId, user, solidityType)
                 // eslint-disable-next-line no-await-in-loop
                 await waitForTx(txToSubmit)
@@ -460,15 +463,15 @@ export class StreamRegistry {
         assignments: PermissionAssignment[]
     }[]): Promise<void> {
         const streamIds: StreamID[] = []
-        const targets: string[][] = []
+        const targets: (UserID | typeof PUBLIC_PERMISSION_ADDRESS)[][] = []
         const chainPermissions: ChainPermissions[][] = []
         for (const item of items) {
             // eslint-disable-next-line no-await-in-loop
             const streamId = await this.streamIdBuilder.toStreamID(item.streamId)
             this.clearStreamCache(streamId)
             streamIds.push(streamId)
             targets.push(item.assignments.map((assignment) => {
-                return isPublicPermissionAssignment(assignment) ? PUBLIC_PERMISSION_ADDRESS : assignment.user
+                return isPublicPermissionAssignment(assignment) ? PUBLIC_PERMISSION_ADDRESS : toUserId(assignment.user)
             }))
             chainPermissions.push(item.assignments.map((assignment) => {
                 return convertStreamPermissionsToChainPermission(assignment.permissions)

packages/sdk/src/permission.ts

@@ -12,7 +12,7 @@ export enum StreamPermission {
 export interface UserPermissionQuery {
     streamId: string
     permission: StreamPermission
-    user: string
+    user: Uint8Array
     allowPublic: boolean
 }
 
@@ -26,7 +26,7 @@ export type PermissionQuery = UserPermissionQuery | PublicPermissionQuery
 
 export interface UserPermissionAssignment {
     permissions: StreamPermission[]
-    user: string
+    user: Uint8Array
 }
 
 export interface PublicPermissionAssignment {

packages/sdk/test/browser-smoke-test/smoke-test.html

@@ -38,7 +38,7 @@
             // 2. Grant permissions
             await stream.grantPermissions({
                 permissions: ['subscribe'],
-                user: await subscriberClient.getAddress()
+                user: toUserIdRaw(await subscriberClient.getUserId())
             })
             document.getElementById('permissionGranted').checked = true
             document.getElementById('permissionGrantedValue').value = await subscriberClient.getAddress()