u

status-im · Mar 13, 2024 · b0c6b67 · b0c6b67
1 parent 97aff5b
commit b0c6b67
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 26 deletions.
diff --git a/packages/status-js/src/client/chat.ts b/packages/status-js/src/client/chat.ts
@@ -208,7 +208,12 @@ export class Chat {
     }
 
     await this.client.waku.store.queryWithOrderedCallback(
-      [createDecoder(this.contentTopic, this.symmetricKey)],
+      [
+        createDecoder(this.contentTopic, this.symmetricKey, {
+          clusterId: 16,
+          shard: 32,
+        }),
+      ],
       wakuMessage => {
         this.#fetchingMessages = true
         this.client.handleWakuMessage(wakuMessage)

diff --git a/packages/status-js/src/client/client.ts b/packages/status-js/src/client/client.ts
@@ -168,6 +168,10 @@ class Client {
             }),
           ],
         },
+        shardInfo: {
+          clusterId: 16,
+          shards: [32],
+        },
       })
       await waku.start()
       await waitForRemotePeer(
@@ -269,6 +273,10 @@ class Client {
         contentTopic,
         symKey,
         sigPrivKey: hexToBytes(this.#account.privateKey),
+        pubsubTopicShardInfo: {
+          clusterId: 16,
+          shard: 32,
+        },
       }),
       { payload: message }
     )

diff --git a/packages/status-js/src/client/community/community.ts b/packages/status-js/src/client/community/community.ts
@@ -94,7 +94,12 @@ export class Community {
   public fetch = async () => {
     // most recent page first
     await this.client.waku.store.queryWithOrderedCallback(
-      [createDecoder(this.contentTopic, this.symmetricKey)],
+      [
+        createDecoder(this.contentTopic, this.symmetricKey, {
+          clusterId: 16,
+          shard: 32,
+        }),
+      ],
       wakuMessage => {
         this.client.handleWakuMessage(wakuMessage)
 
@@ -109,7 +114,12 @@ export class Community {
 
   private observe = async () => {
     await this.client.waku.filter.subscribe(
-      [createDecoder(this.contentTopic, this.symmetricKey)],
+      [
+        createDecoder(this.contentTopic, this.symmetricKey, {
+          clusterId: 16,
+          shard: 32,
+        }),
+      ],
       this.client.handleWakuMessage
     )
   }
@@ -130,7 +140,12 @@ export class Community {
         this.chats.set(chatUuid, chat)
 
         const unobserveFn = await this.client.waku.filter.subscribe(
-          [createDecoder(chat.contentTopic, chat.symmetricKey)],
+          [
+            createDecoder(chat.contentTopic, chat.symmetricKey, {
+              clusterId: 16,
+              shard: 32,
+            }),
+          ],
           this.client.handleWakuMessage
         )
 

diff --git a/packages/status-js/src/request-client/request-client.ts b/packages/status-js/src/request-client/request-client.ts
@@ -70,10 +70,6 @@ class RequestClient {
             }),
           ],
         },
-        // pubsubTopics: [
-        //   '/waku/2/rs/16/32',
-        //   //  '/waku/2/default-waku/proto'
-        // ],
         shardInfo: {
           clusterId: 16,
           shards: [32],
@@ -159,15 +155,10 @@ class RequestClient {
     let communityDescription: CommunityDescription | undefined = undefined
     await this.waku.store.queryWithOrderedCallback(
       [
-        createDecoder(
-          contentTopic,
-          symmetricKey,
-          // '/waku/2/rs/16/32'
-          {
-            clusterId: 16,
-            shard: 32,
-          }
-        ),
+        createDecoder(contentTopic, symmetricKey, {
+          clusterId: 16,
+          shard: 32,
+        }),
       ],
       wakuMessage => {
         // handle
@@ -226,15 +217,10 @@ class RequestClient {
       undefined
     await this.waku.store.queryWithOrderedCallback(
       [
-        createDecoder(
-          contentTopic,
-          symmetricKey,
-          //  '/waku/2/rs/16/32'
-          {
-            clusterId: 16,
-            shard: 32,
-          }
-        ),
+        createDecoder(contentTopic, symmetricKey, {
+          clusterId: 16,
+          shard: 32,
+        }),
       ],
       wakuMessage => {
         // handle