From 2d363453a350a507302fd9573aae6d98fc1021aa Mon Sep 17 00:00:00 2001
From: Felicio Mununga <felicio@users.noreply.github.com>
Date: Tue, 15 Nov 2022 01:47:56 +0100
Subject: [PATCH] Use WakuLight

---
 packages/status-js/src/client/client.ts            | 14 +++++++-------
 .../status-js/src/client/community/community.ts    | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/status-js/src/client/client.ts b/packages/status-js/src/client/client.ts
index 571d922e..c3d997cc 100644
--- a/packages/status-js/src/client/client.ts
+++ b/packages/status-js/src/client/client.ts
@@ -4,7 +4,7 @@
 
 import { hexToBytes } from 'ethereum-cryptography/utils'
 import { Protocols } from 'js-waku'
-import { createFullNode } from 'js-waku/lib/create_waku'
+import { createLightNode } from 'js-waku/lib/create_waku'
 import { PeerDiscoveryStaticPeers } from 'js-waku/lib/peer_discovery_static_list'
 import { waitForRemotePeer } from 'js-waku/lib/wait_for_remote_peer'
 import { SymEncoder } from 'js-waku/lib/waku_message/version_1'
@@ -18,7 +18,7 @@ import { handleWakuMessage } from './community/handle-waku-message'
 import { LocalStorage } from './storage'
 
 import type { Storage } from './storage'
-import type { WakuFull } from 'js-waku/lib/interfaces'
+import type { WakuLight } from 'js-waku/lib/interfaces'
 import type { MessageV1 as WakuMessage } from 'js-waku/lib/waku_message/version_1'
 
 const THROWAWAY_ACCOUNT_STORAGE_KEY = 'throwaway_account'
@@ -37,7 +37,7 @@ export interface ClientOptions {
 }
 
 class Client {
-  public waku: WakuFull
+  public waku: WakuLight
   public readonly wakuMessages: Set<string>
   /**
    * Tracks open connections which had their streams silently destroyed
@@ -62,7 +62,7 @@ class Client {
   storage: Storage
 
   constructor(
-    waku: WakuFull,
+    waku: WakuLight,
     wakuDisconnectionTimer: ReturnType<typeof setInterval>,
     options: ClientOptions
   ) {
@@ -91,7 +91,7 @@ class Client {
     // Waku
     const { environment = 'production' } = options
 
-    const waku = await createFullNode({
+    const waku = await createLightNode({
       defaultBootstrap: false,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
@@ -110,7 +110,7 @@ class Client {
       },
     })
     await waku.start()
-    await waitForRemotePeer(waku, [Protocols.Relay, Protocols.Store], 10 * 1000)
+    await waitForRemotePeer(waku, [Protocols.Store], 10 * 1000)
     const wakuDisconnectionTimer = setInterval(async () => {
       const connectionsToClose: Promise<void>[] = []
 
@@ -190,7 +190,7 @@ class Client {
       payload,
     })
 
-    await this.waku.relay.send(
+    await this.waku.lightPush.push(
       new SymEncoder(
         contentTopic,
         symKey,
diff --git a/packages/status-js/src/client/community/community.ts b/packages/status-js/src/client/community/community.ts
index 15eede2a..38abd52a 100644
--- a/packages/status-js/src/client/community/community.ts
+++ b/packages/status-js/src/client/community/community.ts
@@ -58,7 +58,7 @@ export class Community {
     }
 
     // Observe community description
-    this.observe()
+    await this.observe()
 
     // Chats
     await this.observeChatMessages(this.description.chats)
@@ -97,9 +97,9 @@ export class Community {
     return this.description
   }
 
-  private observe = () => {
-    this.client.waku.relay.addObserver(
-      new SymDecoder(this.contentTopic, this.symmetricKey),
+  private observe = async () => {
+    await this.client.waku.filter.subscribe(
+      [new SymDecoder(this.contentTopic, this.symmetricKey)],
       this.client.handleWakuMessage
     )
   }
@@ -119,8 +119,8 @@ export class Community {
 
         this.chats.set(chatUuid, chat)
 
-        const unobserveFn = this.client.waku.relay.addObserver(
-          new SymDecoder(chat.contentTopic, chat.symmetricKey),
+        const unobserveFn = await this.client.waku.filter.subscribe(
+          [new SymDecoder(chat.contentTopic, chat.symmetricKey)],
           this.client.handleWakuMessage
         )