feat(status-js): publish & listen to shards 32, 128 and 256

* feat(status-js): publish & listen to shards 32, 128 and 256

* chore: add changeset for status-js

* chore(status-js/chat): remove magic number

* chore(status-js): remove deprecated shardInfo property for waku nodes - use networkConfig

* chore(status-js): remove unnecessary try/catch

---------

Co-authored-by: Felicio <[email protected]>

Author: JulesFiliot

.changeset/happy-masks-train.md

@@ -0,0 +1,5 @@
+---
+'@status-im/js': patch
+---
+
+feat: publish & listen to shards 32, 128 and 256

packages/status-js/src/client/chat.ts

@@ -1,6 +1,7 @@
 import { create, toBinary } from '@bufbuild/protobuf'
 import { createDecoder } from '@waku/message-encryption/symmetric'
 
+import { getRoutingInfo, SHARDS } from '../consts/waku'
 import { containsOnlyEmoji } from '../helpers/contains-only-emoji'
 import { ApplicationMetadataMessage_Type } from '../protos/application-metadata-message_pb'
 import {
@@ -49,6 +50,8 @@ export type ChatMessage = ChatMessageProto & {
 
 type FetchedMessage = { messageId: string; timestamp?: Date }
 
+const MESSAGES_PAGINATION_LIMIT = 50
+
 export class Chat {
   private readonly client: Client
   #clock: bigint
@@ -211,31 +214,28 @@ export class Chat {
       endTime = new Date()
     }
 
-    await this.client.waku.store.queryWithOrderedCallback(
-      [
-        createDecoder(
-          this.contentTopic,
-          {
-            clusterId: 16,
-            shardId: 32,
-            pubsubTopic: '/waku/2/rs/16/32',
-          },
-          this.symmetricKey,
-        ),
-      ],
-      wakuMessage => {
-        this.#fetchingMessages = true
-        this.client.handleWakuMessage(wakuMessage)
-        this.#fetchingMessages = false
-      },
-      {
-        timeStart: startTime,
-        timeEnd: endTime,
-        paginationLimit: 50,
-        // most recent page first
-        paginationForward: false,
-      },
-    )
+    for (const shardId of SHARDS) {
+      const decoder = createDecoder(
+        this.contentTopic,
+        getRoutingInfo(shardId),
+        this.symmetricKey,
+      )
+      await this.client.waku.store.queryWithOrderedCallback(
+        [decoder],
+        wakuMessage => {
+          this.#fetchingMessages = true
+          this.client.handleWakuMessage(wakuMessage)
+          this.#fetchingMessages = false
+        },
+        {
+          timeStart: startTime,
+          timeEnd: endTime,
+          paginationLimit: MESSAGES_PAGINATION_LIMIT,
+          // most recent page first
+          paginationForward: false,
+        },
+      )
+    }
 
     this.#previousFetchedStartTime = startTime
 

packages/status-js/src/client/client.ts

@@ -10,6 +10,7 @@ import { createLightNode, waitForRemotePeer } from '@waku/sdk'
 import { hexToBytes } from 'ethereum-cryptography/utils'
 
 import { peers } from '../consts/peers'
+import { CLUSTER_ID, getRoutingInfo, SHARDS } from '../consts/waku'
 import { ApplicationMetadataMessageSchema } from '../protos/application-metadata-message_pb'
 import { Account } from './account'
 import { ActivityCenter } from './activityCenter'
@@ -153,6 +154,9 @@ class Client {
          * Note: Not supported in light mode.
          */
         relayKeepAlive: 0,
+        networkConfig: {
+          clusterId: CLUSTER_ID,
+        },
         libp2p: {
           peerDiscovery: [
             /**
@@ -169,10 +173,6 @@ class Client {
             }),
           ],
         },
-        shardInfo: {
-          clusterId: 16,
-          shards: [32],
-        },
       })
       await waku.start()
       await waitForRemotePeer(
@@ -272,18 +272,18 @@ class Client {
       }),
     )
 
-    await this.waku.lightPush.send(
-      createEncoder({
-        contentTopic,
-        symKey,
-        sigPrivKey: hexToBytes(this.#account.privateKey),
-        routingInfo: {
-          clusterId: 16,
-          shardId: 32,
-          pubsubTopic: '/waku/2/rs/16/32',
-        },
-      }),
-      { payload: message },
+    await Promise.all(
+      SHARDS.map(shardId =>
+        this.waku.lightPush.send(
+          createEncoder({
+            contentTopic,
+            symKey,
+            sigPrivKey: hexToBytes(this.#account!.privateKey),
+            routingInfo: getRoutingInfo(shardId),
+          }),
+          { payload: message },
+        ),
+      ),
     )
   }
 

packages/status-js/src/client/community/community.ts

@@ -2,6 +2,7 @@ import { create, toBinary } from '@bufbuild/protobuf'
 import { createDecoder } from '@waku/message-encryption/symmetric'
 import { hexToBytes } from 'ethereum-cryptography/utils'
 
+import { getRoutingInfo, SHARDS } from '../../consts/waku'
 import { getDifferenceByKeys } from '../../helpers/get-difference-by-keys'
 import { getObjectsDifference } from '../../helpers/get-objects-difference'
 import { ApplicationMetadataMessage_Type } from '../../protos/application-metadata-message_pb'
@@ -92,44 +93,42 @@ export class Community {
   }
 
   public fetch = async () => {
-    // most recent page first
-    await this.client.waku.store.queryWithOrderedCallback(
-      [
-        createDecoder(
-          this.contentTopic,
-          {
-            clusterId: 16,
-            shardId: 32,
-            pubsubTopic: '/waku/2/rs/16/32',
-          },
-          this.symmetricKey,
-        ),
-      ],
-      wakuMessage => {
-        this.client.handleWakuMessage(wakuMessage)
-
-        if (this.description) {
-          return true
-        }
-      },
-    )
+    for (const shardId of SHARDS) {
+      const decoder = createDecoder(
+        this.contentTopic,
+        getRoutingInfo(shardId),
+        this.symmetricKey,
+      )
+      // most recent page first
+      await this.client.waku.store.queryWithOrderedCallback(
+        [decoder],
+        wakuMessage => {
+          this.client.handleWakuMessage(wakuMessage)
+
+          if (this.description) {
+            return true
+          }
+        },
+      )
+
+      if (this.description) {
+        break
+      }
+    }
 
     return this.description
   }
 
   private observe = async () => {
+    const decoders = SHARDS.map(shardId =>
+      createDecoder(
+        this.contentTopic,
+        getRoutingInfo(shardId),
+        this.symmetricKey,
+      ),
+    )
     await this.client.waku.filter.subscribe(
-      [
-        createDecoder(
-          this.contentTopic,
-          {
-            clusterId: 16,
-            shardId: 32,
-            pubsubTopic: '/waku/2/rs/16/32',
-          },
-          this.symmetricKey,
-        ),
-      ],
+      decoders,
       this.client.handleWakuMessage,
     )
   }
@@ -149,23 +148,21 @@ export class Community {
 
         this.chats.set(chatUuid, chat)
 
-        const decoder = createDecoder(
-          chat.contentTopic,
-          {
-            clusterId: 16,
-            shardId: 32,
-            pubsubTopic: '/waku/2/rs/16/32',
-          },
-          chat.symmetricKey,
+        const decoders = SHARDS.map(shardId =>
+          createDecoder(
+            chat.contentTopic,
+            getRoutingInfo(shardId),
+            chat.symmetricKey,
+          ),
         )
 
         await this.client.waku.filter.subscribe(
-          [decoder],
+          decoders,
           this.client.handleWakuMessage,
         )
 
         const unobserveFn = () => {
-          this.client.waku.filter.unsubscribe([decoder])
+          this.client.waku.filter.unsubscribe(decoders)
         }
 
         this.#chatUnobserveFns.set(chat.contentTopic, unobserveFn)

packages/status-js/src/consts/waku.ts

@@ -0,0 +1,8 @@
+export const CLUSTER_ID = 16
+export const SHARDS = [32, 128, 256] as const
+
+export const getRoutingInfo = (shardId: number) => ({
+  clusterId: CLUSTER_ID,
+  shardId,
+  pubsubTopic: `/waku/2/rs/${CLUSTER_ID}/${shardId}`,
+})