fix: update wakuv2 fleet DNS discovery enrtree

https://github.com/status-im/infra-misc/issues/171

android/src/main/java/com/wakureactnative/ReactNativeModule.kt

@@ -183,4 +183,8 @@ class ReactNativeModule(reactContext: ReactApplicationContext) : ReactContextBas
         promise.resolve(Gowaku.filterUnsubscribe(filterJSON, ms.toLong()))
     }
 
+    @ReactMethod
+    fun dnsDiscovery(url: String, nameserver: String = "", ms: Double, promise: Promise) {
+        promise.resolve(Gowaku.dnsDiscovery(url, nameserver, ms.toLong()))
+    }
 }

download-gowaku.sh

@@ -30,11 +30,11 @@ mkdir -p tmp
 cd tmp
 
 rm -f ${SHA_FILE}
-wget "https://github.com/status-im/go-waku/releases/download/v${VERSION}/${SHA_FILE}"
+wget "https://github.com/waku-org/go-waku/releases/download/v${VERSION}/${SHA_FILE}"
 
 if [ "$DOWNLOAD_ANDROID" = true ]; then
     rm -f ${ANDROID_TAR}
-    wget "https://github.com/status-im/go-waku/releases/download/v${VERSION}/${ANDROID_TAR}"
+    curl -L "https://github.com/waku-org/go-waku/releases/download/v${VERSION}/${ANDROID_TAR}" --output $ANDROID_TAR
     sha256sum --status --ignore-missing -c ${SHA_FILE}
     if ! sha256sum --status --ignore-missing -c ${SHA_FILE}; then
         echo "checksum failed - verify download"
@@ -47,7 +47,7 @@ fi
 
 if [ "$DOWNLOAD_IOS" = true ]; then
     rm -f ${IOS_TAR}
-    wget "https://github.com/status-im/go-waku/releases/download/v${VERSION}/${IOS_TAR}"
+    curl -L "https://github.com/waku-org/go-waku/releases/download/v${VERSION}/${IOS_TAR}" --output $IOS_TAR
 
     if ! sha256sum --status --ignore-missing -c ${SHA_FILE}; then
         echo "checksum failed - verify download"

example/App.js

@@ -24,8 +24,11 @@ import {
   FilterSubscription,
   ContentFilter,
   filterSubscribe,
+  dnsDiscovery,
 } from '@waku/react-native';
 
+const myContentTopic = '/example/1/react-native-app/proto';
+
 export default function App() {
   const [result, setResult] = React.useState();
 
@@ -39,14 +42,16 @@ export default function App() {
       }
       console.log('The node ID:', await peerID());
 
-     await relaySubscribe();
+      await relaySubscribe();
 
       onMessage((event) => {
+        if (event.wakuMessage.contentTopic !== myContentTopic) return;
+
         setResult(
           'Message received: ' +
             event.wakuMessage.timestamp +
             ' - payload:[' +
-            event.wakuMessage.payload +
+            JSON.stringify(event.wakuMessage.payload) +
             ']'
         );
         console.log('Message received: ', event);
@@ -80,7 +85,7 @@ export default function App() {
       console.log('Peers', await peers());
 
       let msg = new WakuMessage();
-      msg.contentTopic = 'ABC';
+      msg.contentTopic = myContentTopic;
       msg.payload = new Uint8Array([1, 2, 3, 4, 5]);
       msg.timestamp = new Date();
       msg.version = 0;
@@ -92,13 +97,21 @@ export default function App() {
       // TO RETRIEVE HISTORIC MESSAGES:
       console.log('Retrieving messages from store node');
       const query = new StoreQuery();
-      query.contentFilters.push(new ContentFilter('ABC'));
+      query.contentFilters.push(new ContentFilter(myContentTopic));
       const queryResult = await storeQuery(
         query,
         '16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm'
       );
       console.log(queryResult);
 
+      // DNS Discovery
+      console.log('Retrieving Nodes using DNS Discovery');
+      const dnsDiscoveryResult = await dnsDiscovery(
+        'enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im',
+        '1.1.1.1'
+      );
+      console.log(dnsDiscoveryResult);
+
       // USING FILTER INSTEAD OF RELAY:
       // Instantiate the node passing these parameters:
       // let config = new Config();

example/package-lock.json

@@ -21,11 +21,11 @@
     },
     "..": {
       "name": "@waku/react-native",
-      "version": "0.0.12",
+      "version": "0.2.0",
       "license": "MIT",
       "dependencies": {
-        "base-64": "^1.0.0",
+        "big-integer": "^1.6.51",
-        "big-integer": "^1.6.51"
+        "buffer": "^6.0.3"
       },
       "devDependencies": {
         "@arkweid/lefthook": "^0.7.7",
@@ -14055,8 +14055,8 @@
         "@types/jest": "^28.1.2",
         "@types/react": "~17.0.21",
         "@types/react-native": "0.68.0",
-        "base-64": "^1.0.0",
         "big-integer": "^1.6.51",
+        "buffer": "^6.0.3",
         "commitlint": "^17.0.2",
         "eslint": "^8.4.1",
         "eslint-config-prettier": "^8.5.0",

example/package.json

@@ -7,7 +7,8 @@
     "start": "expo start --dev-client",
     "android": "expo run:android",
     "ios": "expo run:ios",
-    "web": "expo start --web"
+    "web": "expo start --web",
+    "pods": "npx pod-install"
   },
   "dependencies": {
     "@waku/react-native": "file:../",

go-waku.VERSION

@@ -1 +1 @@
-0.3.1
+0.5.1

ios/ReactNative.m

@@ -146,5 +146,11 @@ RCT_EXTERN_METHOD(filterUnsubscribe:(NSString *)filterJSON
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(dnsDiscovery:(NSString *)url
+                 withNameserver:(NSString *)nameserver
+                 withMs:(nonnull NSNumber *)ms
+                 withResolver:(RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
+
 
 @end

ios/ReactNative.swift

@@ -177,4 +177,9 @@ class ReactNative: RCTEventEmitter {
         resolve(GowakuFilterUnsubscribe(filterJSON, ms))
     }
 
+    @objc(dnsDiscovery:withNameserver:withMs:withResolver:withRejecter:)
+    func dnsDiscovery(url: String, nameserver: String, ms: Int, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
+        resolve(GowakuDnsDiscovery(url, nameserver, ms))
+    }
+
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/react-native",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Waku React Native",
   "author": "Status Research & Development GMBH",
   "authors": [
@@ -21,6 +21,8 @@
     "android",
     "ios",
     "cpp",
+    "download-gowaku.sh",
+    "go-waku.VERSION",
     "waku-react-native.podspec",
     "!lib/typescript/example",
     "!android/build",
@@ -36,6 +38,7 @@
     "prepare": "bob build",
     "release": "release-it",
     "example": "yarn --cwd example",
+    "pods": "npx pod-install",
     "bootstrap": "yarn example && yarn && yarn example pods"
   },
   "keywords": [
@@ -158,7 +161,7 @@
     ]
   },
   "dependencies": {
-    "base-64": "^1.0.0",
+    "big-integer": "^1.6.51",
-    "big-integer": "^1.6.51"
+    "buffer": "^6.0.3"
   }
 }

src/index.tsx

@@ -1,6 +1,6 @@
 import { NativeModules, Platform, NativeEventEmitter } from 'react-native';
-import { decode, encode } from 'base-64';
 import bigInt from 'big-integer';
+import { Buffer } from 'buffer';
 
 const LINKING_ERROR =
   `The package '@waku/react-native' doesn't seem to be linked. Make sure: \n\n` +
@@ -28,14 +28,13 @@ export class WakuMessage {
   timestamp?: Date = undefined;
 
   toJSON() {
-    const b64encoded = encode(String.fromCharCode(...this.payload));
     return {
       contentTopic: this.contentTopic,
       version: this.version,
       timestamp: this.timestamp
         ? bigInt(this.timestamp.valueOf()).multiply(OneMillion).toString(10)
         : 0,
-      payload: b64encoded,
+      payload: Buffer.from(this.payload).toString('base64'),
     };
   }
 }
@@ -57,24 +56,25 @@ export function onMessage(cb: (arg0: any) => void) {
         : undefined;
     signal.event.wakuMessage.version = msg.version || 0;
     signal.event.wakuMessage.contentTopic = msg.contentTopic;
-    signal.event.wakuMessage.payload = new Uint8Array(
+    signal.event.wakuMessage.payload = Buffer.from(msg.payload || [], 'base64');
-      decode(msg.payload ?? [])
-        .split('')
-        .map((c: any) => c.charCodeAt(0))
-    );
     cb(signal.event);
   });
 }
 
 export class Config {
-  host: String | null = null;
+  host: String | null = null; // IP address. Default 0.0.0.0
-  port: Number | null = null;
+  port: Number | null = null; // TCP port to listen. Default 60000. Use 0 for random
-  advertiseAddr: String | null = null;
+  advertiseAddr: String | null = null; // Advertise custom multiaddress
-  nodeKey: String | null = null;
+  nodeKey: String | null = null; // secp256k1 private key. Default random
-  keepAliveInterval: Number | null = null;
+  keepAliveInterval: Number | null = null; // interval in seconds to ping all peers
-  relay: Boolean | null = null;
+  relay: Boolean | null = null; // enable waku relay
-  filter: Boolean | null = null;
+  relayTopics: Array<String> = []; // array of pubsub topics that WakuRelay will automatically subscribe to when the node starts
   minPeersToPublish: Number | null = null;
+  filter: Boolean | null = null; // enable waku filter
+  discv5: Boolean | null = null; // enable discv5
+  discV5BootstrapNodes: Array<String> = []; // array of bootstrap nodes ENR
+  discV5UDPPort: Number | null = null; // UDP port for DiscoveryV5
+  logLevel: String | null = null; // Set the log level. Default `INFO`. Allowed values "DEBUG", "INFO", "WARN", "ERROR", "DPANIC", "PANIC", "FATAL"
 }
 
 /**
@@ -382,6 +382,27 @@ export function peerCnt(): Promise<Number> {
   });
 }
 
+export class EncryptedPayload extends WakuMessage {
+  constructor(msg: WakuMessage) {
+    super();
+    this.contentTopic = msg.contentTopic;
+    this.version = msg.version;
+    this.timestamp = msg.timestamp;
+    this.payload = msg.payload;
+  }
+
+  toJSON() {
+    return {
+      contentTopic: this.contentTopic,
+      version: this.version,
+      timestamp: this.timestamp
+        ? bigInt(this.timestamp.valueOf()).multiply(OneMillion).toJSNumber()
+        : 0,
+      payload: Buffer.from(Array.from(this.payload)).toString('base64'),
+    };
+  }
+}
+
 export class DecodedPayload {
   payload: Uint8Array = new Uint8Array();
   padding: Uint8Array = new Uint8Array();
@@ -389,11 +410,9 @@ export class DecodedPayload {
   signature: String | null = '';
 
   toJSON() {
-    const b64payload = encode(String.fromCharCode(...this.payload));
-    const b64padding = encode(String.fromCharCode(...this.padding));
     return {
-      payload: b64payload,
+      payload: Buffer.from(this.payload).toString('base64'),
-      padding: b64padding,
+      padding: Buffer.from(this.padding).toString('base64'),
       pubkey: this.pubkey,
       signature: this.signature,
     };
@@ -411,7 +430,8 @@ export function decodeSymmetric(
   symmetricKey: String
 ): Promise<DecodedPayload> {
   return new Promise<DecodedPayload>(async (resolve, reject) => {
-    let messageJSON = JSON.stringify(msg);
+    let message = new EncryptedPayload(msg);
+    let messageJSON = JSON.stringify(message);
     let response = JSON.parse(
       await ReactNative.decodeSymmetric(messageJSON, symmetricKey)
     );
@@ -419,16 +439,8 @@ export function decodeSymmetric(
       reject(response.error);
     } else {
       let decodedPayload = new DecodedPayload();
-      decodedPayload.payload = new Uint8Array(
+      decodedPayload.payload = Buffer.from(response.result.data, 'base64');
-        atob(response.result.payload)
+      decodedPayload.padding = Buffer.from(response.result.padding, 'base64');
-          .split('')
-          .map((c) => c.charCodeAt(0))
-      );
-      decodedPayload.padding = new Uint8Array(
-        atob(response.result.padding)
-          .split('')
-          .map((c) => c.charCodeAt(0))
-      );
       decodedPayload.pubkey = response.result.pubkey;
       decodedPayload.signature = response.result.signature;
       resolve(decodedPayload);
@@ -447,24 +459,17 @@ export function decodeAsymmetric(
   privateKey: String
 ): Promise<DecodedPayload> {
   return new Promise<DecodedPayload>(async (resolve, reject) => {
-    let messageJSON = JSON.stringify(msg);
+    let message = new EncryptedPayload(msg);
+    let messageJSON = JSON.stringify(message);
     let response = JSON.parse(
-      await ReactNative.decodeSymmetric(messageJSON, privateKey)
+      await ReactNative.decodeAsymmetric(messageJSON, privateKey)
     );
     if (response.error) {
       reject(response.error);
     } else {
       let decodedPayload = new DecodedPayload();
-      decodedPayload.payload = new Uint8Array(
+      decodedPayload.payload = Buffer.from(response.result.data, 'base64');
-        atob(response.result.payload)
+      decodedPayload.padding = Buffer.from(response.result.padding, 'base64');
-          .split('')
-          .map((c) => c.charCodeAt(0))
-      );
-      decodedPayload.padding = new Uint8Array(
-        atob(response.result.padding)
-          .split('')
-          .map((c) => c.charCodeAt(0))
-      );
       decodedPayload.pubkey = response.result.pubkey;
       decodedPayload.signature = response.result.signature;
       resolve(decodedPayload);
@@ -557,7 +562,8 @@ export function lightpushPublishEncAsymmetric(
   timeoutMs: Number = 0
 ): Promise<string> {
   return new Promise<string>(async (resolve, reject) => {
-    let messageJSON = JSON.stringify(msg);
+    let message = new EncryptedPayload(msg);
+    let messageJSON = JSON.stringify(message);
     let response = JSON.parse(
       await ReactNative.lightpushPublishEncodeAsymmetric(
         messageJSON,
@@ -595,7 +601,8 @@ export function lightpushPublishEncSymmetric(
   timeoutMs: Number = 0
 ): Promise<string> {
   return new Promise<string>(async (resolve, reject) => {
-    let messageJSON = JSON.stringify(msg);
+    let message = new EncryptedPayload(msg);
+    let messageJSON = JSON.stringify(message);
     let response = JSON.parse(
       await ReactNative.lightpushPublishEncodeAsymmetric(
         messageJSON,
@@ -652,6 +659,45 @@ export function peers(): Promise<Array<Peer>> {
   });
 }
 
+export class DiscoveredNode {
+  peerID: String = '';
+  addrs: Array<String> = Array();
+  enr: String = '';
+
+  constructor(
+    peerID: String,
+    addrs: Array<String>,
+    enr: String
+  ) {
+    this.peerID = peerID;
+    this.addrs = addrs;
+    this.enr = enr;
+  }
+}
+
+/**
+ * Use DNS Discovery to retrieve a list of nodes from an enrtree:// URL
+ * @return List of Nodes
+ */
+export function dnsDiscovery(
+  url: String,
+  nameserver: String,
+  timeoutMs: Number = 0
+): Promise<Array<DiscoveredNode>> {
+  return new Promise<Array<DiscoveredNode>>(async (resolve, reject) => {
+    let response = JSON.parse(await ReactNative.dnsDiscovery(url, nameserver, timeoutMs));
+    if (response.error) {
+      reject(response.error);
+    } else {
+      resolve(
+        response.result.map(
+          (x: any) => new DiscoveredNode(x.peerID, x.multiaddrs, x.enr)
+        )
+      );
+    }
+  });
+}
+
 export class Index {
   digest: Uint8Array = new Uint8Array();
   receiverTime: Number = 0;
@@ -745,9 +791,7 @@ export function storeQuery(
               ? new Date(bigInt(t).divide(OneMillion).toJSNumber())
               : undefined;
           response.result.messages[i].payload = new Uint8Array(
-            decode(response.result.messages[i].payload ?? [])
+            Buffer.from(response.result.messages[i].payload ?? [], 'base64')
-              .split('')
-              .map((c) => c.charCodeAt(0))
           );
         }
       }