add encryption algorithm slot (#1862)

same issue here — initially created the PR with unsigned commits... 
should be 1:1 with #1808

core/node/events/snapshot.go

@@ -545,6 +545,9 @@ func update_Snapshot_Member(
 		}
 		snapshot.Pins = snapPins
 		return nil
+	case *MemberPayload_EncryptionAlgorithm_:
+		snapshot.EncryptionAlgorithm.Algorithm = content.EncryptionAlgorithm.Algorithm
+		return nil
 	default:
 		return RiverError(Err_INVALID_ARGUMENT, "unknown membership payload type %T", memberPayload.Content)
 	}

core/node/rules/can_add_event.go

@@ -563,6 +563,9 @@ func (params *aeParams) canAddMemberPayload(payload *StreamEvent_MemberPayload)
 	case *MemberPayload_Mls_:
 		return aeBuilder().
 			check(params.creatorIsMember)
+	case *MemberPayload_EncryptionAlgorithm_:
+		return aeBuilder().
+			check(params.creatorIsMember)
 	default:
 		return aeBuilder().
 			fail(unknownContentType(content))

packages/sdk/src/client.ts

@@ -134,6 +134,7 @@ import {
     make_UserMetadataPayload_Bio,
     make_UserPayload_BlockchainTransaction,
     ContractReceipt,
+    make_MemberPayload_EncryptionAlgorithm,
 } from './types'
 
 import debug from 'debug'
@@ -876,6 +877,29 @@ export class Client
         })
     }
 
+    async setStreamEncryptionAlgorithm(streamId: string, encryptionAlgorithm?: string) {
+        assert(
+            isChannelStreamId(streamId) ||
+                isSpaceStreamId(streamId) ||
+                isDMChannelStreamId(streamId) ||
+                isGDMChannelStreamId(streamId),
+            'channelId must be a valid streamId',
+        )
+        const stream = this.stream(streamId)
+        check(isDefined(stream), 'stream not found')
+        check(
+            stream.view.membershipContent.encryptionAlgorithm != encryptionAlgorithm,
+            `mlsEnabled is already set to ${encryptionAlgorithm}`,
+        )
+        return this.makeEventAndAddToStream(
+            streamId,
+            make_MemberPayload_EncryptionAlgorithm(encryptionAlgorithm),
+            {
+                method: 'setMlsEnabled',
+            },
+        )
+    }
+
     async sendFullyReadMarkers(
         channelId: string | Uint8Array,
         fullyReadMarkers: Record<string, FullyReadMarker>,

packages/sdk/src/streamEvents.ts

@@ -120,6 +120,7 @@ export type StreamStateEvents = {
     streamEnsAddressUpdated: (streamId: string, userId: string) => void
     streamNftUpdated: (streamId: string, userId: string) => void
     streamChannelPropertiesUpdated: (streamId: string) => void
+    streamEncryptionAlgorithmUpdated: (streamId: string, encryptionAlgorithm?: string) => void
 }
 
 export type StreamEvents = StreamEncryptionEvents & StreamStateEvents & SyncedStreamEvents

packages/sdk/src/streamStateView_Members.ts

@@ -48,6 +48,7 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
     readonly solicitHelper: StreamStateView_Members_Solicitations
     readonly memberMetadata: StreamStateView_MemberMetadata
     readonly pins: Pin[] = []
+    encryptionAlgorithm?: string = undefined
 
     constructor(streamId: string) {
         super()
@@ -150,6 +151,8 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
                 )
             }
         })
+
+        this.encryptionAlgorithm = snapshot.members.encryptionAlgorithm?.algorithm
     }
 
     prependEvent(
@@ -309,6 +312,14 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
                 break
             case 'mls':
                 break
+            case 'encryptionAlgorithm':
+                this.encryptionAlgorithm = payload.content.value.algorithm
+                stateEmitter?.emit(
+                    'streamEncryptionAlgorithmUpdated',
+                    this.streamId,
+                    this.encryptionAlgorithm,
+                )
+                break
             case undefined:
                 break
             default:
@@ -362,6 +373,8 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
                 break
             case 'mls':
                 break
+            case 'encryptionAlgorithm':
+                break
             case undefined:
                 break
             default:

packages/sdk/src/sync-agent/timeline/models/timeline-types.ts

@@ -90,6 +90,7 @@ export type TimelineEvent_OneOf =
     | UserReceivedBlockchainTransactionEvent
     | UnpinEvent
     | MlsEvent
+    | StreamEncryptionAlgorithmEvent
 
 export enum RiverTimelineEvent {
     MiniblockHeader = 'm.miniblockheader',
@@ -120,6 +121,7 @@ export enum RiverTimelineEvent {
     UserBlockchainTransaction = 'm.user_blockchain_transaction',
     UserReceivedBlockchainTransaction = 'm.user_received_blockchain_transaction',
     Mls = 'm.mls',
+    StreamEncryptionAlgorithm = 'm.stream_encryption_algorithm',
 }
 
 export interface MiniblockHeaderEvent {
@@ -221,6 +223,11 @@ export interface MlsEvent {
     kind: RiverTimelineEvent.Mls
 }
 
+export interface StreamEncryptionAlgorithmEvent {
+    kind: RiverTimelineEvent.StreamEncryptionAlgorithm
+    algorithm?: string
+}
+
 export interface RoomMessageEncryptedEvent {
     kind: RiverTimelineEvent.RoomMessageEncrypted
     error?: DecryptionSessionError

packages/sdk/src/sync-agent/timeline/models/timelineEvent.ts

@@ -50,6 +50,7 @@ import {
     UserBlockchainTransactionEvent,
     MemberBlockchainTransactionEvent,
     UserReceivedBlockchainTransactionEvent,
+    StreamEncryptionAlgorithmEvent,
 } from './timeline-types'
 import type { PlainMessage } from '@bufbuild/protobuf'
 import { userIdFromAddress, streamIdFromBytes, streamIdAsString } from '../../../id'
@@ -364,7 +365,13 @@ function toTownsContent_MemberPayload(
                     kind: RiverTimelineEvent.Mls,
                 },
             }
-            break
+        case 'encryptionAlgorithm':
+            return {
+                content: {
+                    kind: RiverTimelineEvent.StreamEncryptionAlgorithm,
+                    algorithm: value.content.value.algorithm,
+                } satisfies StreamEncryptionAlgorithmEvent,
+            }
         case 'memberBlockchainTransaction':
             return {
                 content: {
@@ -987,6 +994,8 @@ export function getFallbackContent(
                     ? bin_toHexString(content.receivedTransaction.fromUserAddress)
                     : ''
             }`
+        case RiverTimelineEvent.StreamEncryptionAlgorithm:
+            return `algorithm: ${content.algorithm}`
     }
 }
 

packages/sdk/src/tests/multi_ne/memberMetadata.test.ts

@@ -4,7 +4,7 @@
 
 import { MemberPayload_Nft } from '@river-build/proto'
 import { Client } from '../../client'
-import { userIdFromAddress } from '../../id'
+import { makeUniqueChannelStreamId, userIdFromAddress } from '../../id'
 import {
     makeDonePromise,
     makeRandomUserAddress,
@@ -659,4 +659,53 @@ describe('memberMetadataTests', () => {
 
         await expect(bobsClient.setNft(streamId, '', 0, '')).resolves.not.toThrow()
     })
+
+    test('clientCanSetStreamEncryptionAlgorithm', async () => {
+        await expect(bobsClient.initializeUser()).resolves.not.toThrow()
+        bobsClient.startSync()
+        const spaceId = makeUniqueSpaceStreamId()
+        const channelId = makeUniqueChannelStreamId(spaceId)
+        await bobsClient.createSpace(spaceId)
+        await bobsClient.waitForStream(spaceId)
+
+        await bobsClient.createChannel(spaceId, 'secret channel', 'messaging like spies', channelId)
+        await bobsClient.waitForStream(channelId)
+
+        // initial value is "undefined"
+        expect(bobsClient.stream(channelId)?.view.membershipContent.encryptionAlgorithm).toBe(
+            undefined,
+        )
+
+        // set mls enabled to mls_0.0.1
+        const truePromise = makeDonePromise()
+        bobsClient.once('streamEncryptionAlgorithmUpdated', (updatedStreamId, value) => {
+            expect(updatedStreamId).toBe(channelId)
+            expect(value).toBe('mls_0.0.1')
+            truePromise.done()
+        })
+
+        await expect(
+            bobsClient.setStreamEncryptionAlgorithm(channelId, 'mls_0.0.1'),
+        ).resolves.not.toThrow()
+        await truePromise.expectToSucceed()
+        expect(bobsClient.stream(channelId)?.view.membershipContent.encryptionAlgorithm).toBe(
+            'mls_0.0.1',
+        )
+
+        // toggle back to to undefined
+        const falsePromise = makeDonePromise()
+        bobsClient.once('streamEncryptionAlgorithmUpdated', (updatedStreamId, value) => {
+            expect(updatedStreamId).toBe(channelId)
+            expect(value).toBe(undefined)
+            falsePromise.done()
+        })
+
+        await expect(
+            bobsClient.setStreamEncryptionAlgorithm(channelId, undefined),
+        ).resolves.not.toThrow()
+        await falsePromise.expectToSucceed()
+        expect(bobsClient.stream(channelId)?.view.membershipContent.encryptionAlgorithm).toBe(
+            undefined,
+        )
+    })
 })

packages/sdk/src/types.ts

@@ -784,6 +784,22 @@ export const make_ChannelPayload_Redaction = (
     }
 }
 
+export const make_MemberPayload_EncryptionAlgorithm = (
+    content?: string,
+): PlainMessage<StreamEvent>['payload'] => {
+    return {
+        case: 'memberPayload',
+        value: {
+            content: {
+                case: 'encryptionAlgorithm',
+                value: {
+                    algorithm: content,
+                },
+            },
+        },
+    }
+}
+
 export const make_MemberPayload_KeyFulfillment = (
     value: PlainMessage<MemberPayload_KeyFulfillment>,
 ): PlainMessage<StreamEvent>['payload'] => {

protocol/protocol.proto

@@ -176,6 +176,7 @@ message MemberPayload {
         repeated Member joined = 1;
         repeated SnappedPin pins = 2;
         Mls mls = 3;
+        EncryptionAlgorithm encryption_algorithm = 4;
     }
 
     message Membership {
@@ -222,6 +223,10 @@ message MemberPayload {
 
     }
 
+    message EncryptionAlgorithm {
+        optional string algorithm = 1;
+    }
+
     message MemberBlockchainTransaction {
         BlockchainTransaction transaction = 1;
         bytes from_user_address = 2;
@@ -239,6 +244,7 @@ message MemberPayload {
         Unpin unpin = 9;
         Mls mls = 10;
         MemberBlockchainTransaction member_blockchain_transaction = 11;
+        EncryptionAlgorithm encryption_algorithm = 12;
     }
 }