Merge pull request #141 from waku-org/chore/js-waku-0.30.0

.github/workflows/ci.yml

@@ -16,7 +16,6 @@ jobs:
             eth-pm,
             relay-angular-chat,
             relay-reactjs-chat,
-            rln-react-ts,
             store-reactjs-chat,
             web-chat
           ]

ci/Jenkinsfile

@@ -37,7 +37,6 @@ pipeline {
         stage('eth-pm') { steps { script { buildExample() } } }
         stage('relay-angular-chat') { steps { script { buildExample() } } }
         stage('relay-reactjs-chat') { steps { script { buildExample() } } }
-        stage('rln-react-ts') { steps { script { buildExample() } } }
         stage('store-reactjs-chat') { steps { script { buildExample() } } }
         stage('web-chat') { steps { script { buildExample() } } }
       }

eth-pm/package.json

@@ -10,7 +10,7 @@
     "@material-ui/icons": "^4.11.2",
     "ethers": "5.7.1",
     "fontsource-roboto": "^4.0.0",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "protobufjs": "^7.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

eth-pm/pnpm-lock.yaml

@@ -14,7 +14,7 @@ specifiers:
   eslint: ^8.9.0
   ethers: 5.7.1
   fontsource-roboto: ^4.0.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   npm-run-all: ^4.1.5
   prettier: ^2.5.1
   protobufjs: ^7.1.0
@@ -31,7 +31,7 @@ dependencies:
   '@material-ui/icons': 4.11.3_upnjamd3tbaukgopcqqdlc7jbm
   ethers: 5.7.1
   fontsource-roboto: 4.0.0
-  js-waku: 0.29.0_undici@5.10.0
+  js-waku: 0.30.0_undici@5.10.0
   protobufjs: 7.1.0
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
@@ -8487,8 +8487,8 @@ packages:
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-waku/0.29.0_undici@5.10.0:
+  /js-waku/0.30.0_undici@5.10.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1_undici@5.10.0

eth-pm/src/waku.ts

@@ -5,11 +5,6 @@ import { PrivateMessage, PublicKeyMessage } from "./messaging/wire";
 import { validatePublicKeyMessage } from "./crypto";
 import { Message } from "./messaging/Messages";
 import { equals } from "uint8arrays/equals";
-import { PeerDiscoveryStaticPeers } from "js-waku/lib/peer_discovery_static_list";
-import {
-  getPredefinedBootstrapNodes,
-  Fleet,
-} from "js-waku/lib/predefined_bootstrap_nodes";
 import { waitForRemotePeer } from "js-waku/lib/wait_for_remote_peer";
 import { createLightNode } from "js-waku/lib/create_waku";
 
@@ -17,13 +12,7 @@ export const PublicKeyContentTopic = "/eth-pm/1/public-key/proto";
 export const PrivateMessageContentTopic = "/eth-pm/1/private-message/proto";
 
 export async function initWaku(): Promise<WakuLight> {
-  const waku = await createLightNode({
+  const waku = await createLightNode({ defaultBootstrap: true });
-    libp2p: {
-      peerDiscovery: [
-        new PeerDiscoveryStaticPeers(getPredefinedBootstrapNodes(Fleet.Test)),
-      ],
-    },
-  });
   await waku.start();
   await waitForRemotePeer(waku, [Protocols.Filter, Protocols.LightPush]);
 

light-js/index.html

@@ -22,30 +22,22 @@
 <input id='remote-multiaddr'
        type='text'
        value="/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm">
-<button id='dial' type='button' disabled>Dial</button>
+<button disabled id='dial' type='button'>Dial</button>
 <br/>
-<button id='subscribe' type='button' disabled>Subscribe with Filter</button>
+<button disabled id='subscribe' type='button'>Subscribe with Filter</button>
-<button id='unsubscribe' type='button' disabled>Unsubscribe with Filter</button>
+<button disabled id='unsubscribe' type='button'>Unsubscribe with Filter</button>
 <br/>
 <label for='textInput'>Message text</label>
 <input id='textInput' placeholder='Type your message here' type='text'>
-<button id='sendButton' type='button' disabled>Send message using Light Push</button>
+<button disabled id='sendButton' type='button'>Send message using Light Push</button>
 <br/>
 <div id="messages"></div>
 
 <script type='module'>
-    import {
+    import {utils} from 'https://unpkg.com/js-waku@0.30.0/bundle/index.js';
-        utils,
+    import {createLightNode} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/create_waku.js'
-    } from 'https://unpkg.com/js-waku@0.29.0/bundle/index.js';
+    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/wait_for_remote_peer.js'
-    import {
+    import {EncoderV0, DecoderV0} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/waku_message/version_0.js'
-        createLightNode
-    } from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/create_waku.js'
-    import {
-        waitForRemotePeer
-    } from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/wait_for_remote_peer.js'
-    import {
-        EncoderV0, DecoderV0
-    } from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/waku_message/version_0.js'
 
     const peerIdDiv = document.getElementById('peer-id');
     const remotePeerIdDiv = document.getElementById('remote-peer-id');

relay-angular-chat/package.json

@@ -21,7 +21,7 @@
     "@angular/platform-browser": "~14.2.0",
     "@angular/platform-browser-dynamic": "~14.2.0",
     "@angular/router": "~14.2.0",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "protobufjs": "^7.1.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",

relay-angular-chat/pnpm-lock.yaml

@@ -16,7 +16,7 @@ specifiers:
   '@types/node': ^17.0.21
   is-ci-cli: ^2.2.0
   jasmine-core: ~4.3.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   karma: ~6.4.0
   karma-chrome-launcher: ~3.1.0
   karma-coverage: ~2.2.0
@@ -37,7 +37,7 @@ dependencies:
   '@angular/platform-browser': 14.2.0_afytwol7hs4qio34buyx2grhfa
   '@angular/platform-browser-dynamic': 14.2.0_owch6soaoexeadly32xw5vendq
   '@angular/router': 14.2.0_6lk4yxyxfaqzosenawf2bqx6vy
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   protobufjs: 7.1.0
   rxjs: 7.5.6
   tslib: 2.4.0
@@ -5440,8 +5440,8 @@ packages:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-waku/0.29.0:
+  /js-waku/0.30.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1

relay-js/index.html

@@ -26,10 +26,10 @@
      * Recommended payload is protobuf. Using simple utf-8 string for demo purposes only.
      */
 
-    import {utils} from 'https://unpkg.com/js-waku@0.29.0/bundle/index.js';
+    import {utils} from 'https://unpkg.com/js-waku@0.30.0/bundle/index.js';
-    import {createPrivacyNode} from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/create_waku.js'
+    import {createPrivacyNode} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/create_waku.js'
-    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/wait_for_remote_peer.js'
+    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/wait_for_remote_peer.js'
-    import {DecoderV0, EncoderV0} from "https://unpkg.com/js-waku@0.29.0/bundle/lib/waku_message/version_0.js";
+    import {DecoderV0, EncoderV0} from "https://unpkg.com/js-waku@0.30.0/bundle/lib/waku_message/version_0.js";
 
     const statusDiv = document.getElementById('status');
     const messagesDiv = document.getElementById('messages');

relay-reactjs-chat/package.json

@@ -7,7 +7,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "protobufjs": "^7.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

relay-reactjs-chat/pnpm-lock.yaml

@@ -6,7 +6,7 @@ specifiers:
   '@testing-library/react': ^13.3.0
   '@testing-library/user-event': ^13.5.0
   eslint: ^8.22.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   protobufjs: ^7.0.0
   react: ^18.2.0
   react-dom: ^18.2.0
@@ -17,7 +17,7 @@ dependencies:
   '@testing-library/jest-dom': 5.16.5
   '@testing-library/react': 13.3.0_biqbaboplfbrettd7655fr4n2y
   '@testing-library/user-event': 13.5.0_wl4iynrlixafokvgqnhzlvigei
-  js-waku: 0.29.0_undici@5.10.0
+  js-waku: 0.30.0_undici@5.10.0
   protobufjs: 7.0.0
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
@@ -7001,8 +7001,8 @@ packages:
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-waku/0.29.0_undici@5.10.0:
+  /js-waku/0.30.0_undici@5.10.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1_undici@5.10.0

rln-js/index.html

@@ -103,13 +103,13 @@
 <div id="messages"></div>
 
 <script type='module'>
-    import {utils} from 'https://unpkg.com/js-waku@0.29.0-29436ea/bundle/index.js';
+    import {utils} from 'https://unpkg.com/js-waku@0.30.0/bundle/index.js';
-    import {createLightNode} from 'https://unpkg.com/js-waku@0.29.0-29436ea/bundle/lib/create_waku.js'
+    import {createLightNode} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/create_waku.js'
-    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.29.0-29436ea/bundle/lib/wait_for_remote_peer.js'
+    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/wait_for_remote_peer.js'
     import {
         EncoderV0,
         DecoderV0
-    } from 'https://unpkg.com/js-waku@0.29.0-29436ea/bundle/lib/waku_message/version_0.js'
+    } from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/waku_message/version_0.js'
 
     import {protobuf} from "https://taisukef.github.io/protobuf-es.js/dist/protobuf-es.js";
 

rln-react-ts/.gitignore

@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

rln-react-ts/README.md

@@ -1,17 +0,0 @@
-# RLN React TypeScript Waku App
-
-**Demonstrates**:
-
-- RLN
-- React/TypeScript
-
-The `master` branch's HEAD is deployed at https://examples.waku.org/rln-react-ts/.
-
-To run a development version locally, do:
-
-```shell
-git clone https://github.com/waku-org/js-waku-examples
-cd rln-react-ts
-npm install
-npm run start
-```

rln-react-ts/package.json

@@ -1,50 +0,0 @@
-{
-  "name": "rln-reactts",
-  "version": "0.1.0",
-  "private": true,
-  "homepage": "/rln-react-ts",
-  "dependencies": {
-    "@emotion/react": "^11.10.4",
-    "@emotion/styled": "^11.10.4",
-    "@mui/material": "^5.10.6",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.5.2",
-    "@types/node": "^16.11.59",
-    "@types/react": "^18.0.21",
-    "@types/react-dom": "^18.0.6",
-    "@waku/rln": "0.0.8",
-    "ethers": "^5.7.1",
-    "js-waku": "^0.29.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-scripts": "5.0.1",
-    "typescript": "^4.8.3",
-    "web-vitals": "^2.1.4"
-  },
-  "scripts": {
-    "start": "PORT=3004 react-scripts start",
-    "build": "react-scripts build",
-    "test": "exit 0",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}

rln-react-ts/public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

rln-react-ts/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

rln-react-ts/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

rln-react-ts/src/App.css

@@ -1,19 +0,0 @@
-.App {
-}
-
-.App-header {
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  font-size: calc(10px + 2vmin);
-}
-
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

rln-react-ts/src/App.tsx

@@ -1,87 +0,0 @@
-import React, { useEffect, useState } from "react";
-import "./App.css";
-import * as rln from "@waku/rln";
-import type { RLNInstance, MembershipKey } from "@waku/rln/dist/rln.js";
-import { utils } from "js-waku";
-import Button from "@mui/material/Button";
-import ConnectWallet from "./ConnectWallet";
-import { ethers } from "ethers";
-
-function App() {
-  // RLN
-  const [rlnInstance, setRlnInstance] = useState<RLNInstance>();
-  const [membershipKey, setMembershipKey] = useState<MembershipKey>();
-  const [rlnKey, setRlnKey] = useState<string>();
-  const [rlnCommitment, setRlnCommitment] = useState<string>();
-
-  // Wallet
-  const [provider, setProvider] = useState<ethers.providers.Web3Provider>();
-  const [address, setAddress] = useState<string>();
-  const [network, setNetwork] = useState<string>();
-
-  useEffect(() => {
-    if (rlnInstance) return;
-
-    (async () => {
-      const instance = await rln.create();
-      setRlnInstance(instance);
-    })();
-  });
-
-  useEffect(() => {
-    if (!membershipKey) return;
-
-    const _rlnKey = utils.bytesToHex(membershipKey.IDKey);
-    const _rlnCommitment = utils.bytesToHex(membershipKey.IDCommitment);
-
-    setRlnKey(_rlnKey);
-    setRlnCommitment(_rlnCommitment);
-  }, [membershipKey]);
-
-  useEffect(() => {
-    if (!provider) return;
-
-    (async () => {
-      const _network = await provider.detectNetwork();
-      setNetwork(_network.name);
-    })();
-  }, [provider]);
-
-  return (
-    <div className="App">
-      <h2>RLN Credentials:</h2>
-      <p>key: {rlnKey}</p>
-      <p>commitment: {rlnCommitment}</p>
-      <Generate rlnInstance={rlnInstance} setMembershipKey={setMembershipKey} />
-      <h2>Wallet</h2>
-      <p>network: {network}</p>
-      <p>address: {address}</p>
-      <ConnectWallet setAddress={setAddress} setProvider={setProvider} />
-    </div>
-  );
-}
-
-export default App;
-
-interface GenerateProps {
-  rlnInstance?: RLNInstance;
-  setMembershipKey: (k: MembershipKey) => void;
-}
-
-function Generate(props: GenerateProps) {
-  const { rlnInstance, setMembershipKey } = props;
-
-  const onClick = async () => {
-    if (!rlnInstance) return;
-    const membershipKey = rlnInstance.generateMembershipKey();
-    setMembershipKey(membershipKey);
-  };
-
-  return (
-    <div>
-      <Button variant="contained" onClick={onClick} disabled={!rlnInstance}>
-        Generate RLN Credentials
-      </Button>
-    </div>
-  );
-}

rln-react-ts/src/ConnectWallet.tsx

@@ -1,29 +0,0 @@
-import Button from "@mui/material/Button";
-import React from "react";
-import { ethers } from "ethers";
-
-declare let window: any;
-
-interface Props {
-  setAddress: (address: string) => void;
-  setProvider: (provider: ethers.providers.Web3Provider) => void;
-}
-
-export default function ConnectWallet({ setAddress, setProvider }: Props) {
-  const connectWallet = async () => {
-    try {
-      const provider = new ethers.providers.Web3Provider(window.ethereum);
-      const accounts = await provider.send("eth_requestAccounts", []);
-      setAddress(accounts[0]);
-      setProvider(provider);
-    } catch (e) {
-      console.error("No web3 provider available", e);
-    }
-  };
-
-  return (
-    <Button variant="contained" color="primary" onClick={connectWallet}>
-      Connect Wallet
-    </Button>
-  );
-}

rln-react-ts/src/index.css

@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

rln-react-ts/src/index.tsx

@@ -1,13 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
-import "./index.css";
-import App from "./App";
-
-const root = ReactDOM.createRoot(
-  document.getElementById("root") as HTMLElement
-);
-root.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-);

rln-react-ts/src/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

rln-react-ts/src/react-app-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="react-scripts" />

rln-react-ts/src/setupTests.ts

@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

rln-react-ts/tsconfig.json

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": [
-    "src"
-  ]
-}

store-js/index.html

@@ -13,10 +13,10 @@
 <div id='timestamp'></div>
 
 <script type='module'>
-    import {Protocols} from 'https://unpkg.com/js-waku@0.29.0/bundle/index.js';
+    import {Protocols} from 'https://unpkg.com/js-waku@0.30.0/bundle/index.js';
-    import {createWaku} from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/create_waku.js'
+    import {createLightNode} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/create_waku.js'
-    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/wait_for_remote_peer.js'
+    import {waitForRemotePeer} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/wait_for_remote_peer.js'
-    import {DecoderV0} from 'https://unpkg.com/js-waku@0.29.0/bundle/lib/waku_message/version_0.js'
+    import {DecoderV0} from 'https://unpkg.com/js-waku@0.30.0/bundle/lib/waku_message/version_0.js'
 
     /**
      * This example demonstrates how to use the js-waku minified bundle
@@ -28,7 +28,7 @@
     const timestampDiv = document.getElementById('timestamp');
 
     timestampDiv.innerHTML = '<p>Creating waku.</p>';
-    const node = await createWaku({defaultBootstrap: true});
+    const node = await createLightNode({defaultBootstrap: true});
 
     timestampDiv.innerHTML = '<p>Starting waku.</p>';
     await node.start();
@@ -46,25 +46,10 @@
         return true;
     };
 
-    const startTime = new Date();
+    await node.store
-    // Only retrieve a week of messages
+        .queryOrderedCallback([new DecoderV0("/relay-ping/1/ping/null")],
-    startTime.setTime(Date.now() - 7 * 24 * 60 * 60 * 1000);
+            callback,
-    try {
+            {pageDirection: 'backward'});
-        await node.store
-            .queryOrderedCallback([new DecoderV0("/relay-ping/1/ping/null")],
-                callback,
-                {
-                    pageDirection: 'backward',
-                    pageSize: 1,
-                    timeFilter: {
-                        startTime,
-                        endTime: new Date()
-                    }
-                });
-    } catch (e) {
-        // Known issue: https://github.com/status-im/nwaku/issues/1157
-        console.log(e)
-    }
 </script>
 </body>
 

store-reactjs-chat/package.json

@@ -7,7 +7,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.2.0",
     "@testing-library/user-event": "^14.1.1",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "protobufjs": "^7.1.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

store-reactjs-chat/pnpm-lock.yaml

@@ -5,7 +5,7 @@ specifiers:
   '@testing-library/jest-dom': ^5.16.4
   '@testing-library/react': ^13.2.0
   '@testing-library/user-event': ^14.1.1
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   protobufjs: ^7.1.0
   react: ^18.1.0
   react-dom: ^18.1.0
@@ -17,7 +17,7 @@ dependencies:
   '@testing-library/jest-dom': 5.16.5
   '@testing-library/react': 13.3.0_biqbaboplfbrettd7655fr4n2y
   '@testing-library/user-event': 14.4.2_znfriv3ismgf3ybh2woqwlpfea
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   protobufjs: 7.1.0
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
@@ -7375,8 +7375,8 @@ packages:
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-waku/0.29.0:
+  /js-waku/0.30.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1

store-reactjs-chat/src/App.js

@@ -2,11 +2,6 @@ import { utils } from "js-waku";
 import * as React from "react";
 import protobuf from "protobufjs";
 import { createLightNode } from "js-waku/lib/create_waku";
-import {
-  Fleet,
-  getPredefinedBootstrapNodes,
-} from "js-waku/lib/predefined_bootstrap_nodes";
-import { PeerDiscoveryStaticPeers } from "js-waku/lib/peer_discovery_static_list";
 import { waitForRemotePeer } from "js-waku/lib/wait_for_remote_peer";
 import { DecoderV0 } from "js-waku/lib/waku_message/version_0";
 
@@ -28,13 +23,7 @@ function App() {
 
     setWakuStatus("Starting");
 
-    createLightNode({
+    createLightNode({ defaultBootstrap: true }).then((waku) => {
-      libp2p: {
-        peerDiscovery: [
-          new PeerDiscoveryStaticPeers(getPredefinedBootstrapNodes(Fleet.Test)),
-        ],
-      },
-    }).then((waku) => {
       waku.start().then(() => {
         setWaku(waku);
         setWakuStatus("Connecting");

web-chat/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@livechat/ui-kit": "^0.5.0-20",
     "@multiformats/multiaddr": "^10.4.0",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "process": "^0.11.10",
     "protons-runtime": "^3.1.0",
     "react": "^17.0.2",

web-chat/pnpm-lock.yaml

@@ -9,7 +9,7 @@ specifiers:
   '@types/react-dom': ^17.0.11
   cspell: ^6.0.0
   gh-pages: ^4.0.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   npm-run-all: ^4.1.5
   prettier: ^2.6.2
   process: ^0.11.10
@@ -26,7 +26,7 @@ specifiers:
 dependencies:
   '@livechat/ui-kit': 0.5.0-20_ibvs32p3vr2bbtbo3dwziny444
   '@multiformats/multiaddr': 10.4.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   process: 0.11.10
   protons-runtime: 3.1.0_uint8arraylist@2.3.2
   react: 17.0.2
@@ -8382,8 +8382,8 @@ packages:
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-waku/0.29.0:
+  /js-waku/0.30.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1

web-chat/src/App.tsx

@@ -219,8 +219,7 @@ async function initWaku(setter: (waku: WakuLight) => void) {
 
 function selectFleetEnv() {
   // Works with react-scripts
-  // TODO: Re-enable the switch once nwaku v0.12 is deployed
+  if (process?.env?.NODE_ENV === "development") {
-  if (true || process?.env?.NODE_ENV === "development") {
     return Fleet.Test;
   } else {
     return Fleet.Prod;

web-chat/src/Room.tsx

@@ -76,7 +76,7 @@ async function handleMessage(
   message: string,
   nick: string,
   commandHandler: (cmd: string) => void,
-  sender: (wakuMsg: WakuMessage) => Promise<void>
+  sender: (wakuMsg: Partial<WakuMessage>) => Promise<void>
 ) {
   if (message.startsWith("/")) {
     commandHandler(message);