Consistent config. Update CHANGELOG. (#538)

CHANGELOG.md

@@ -17,6 +17,8 @@
 - Added a new column of `version` to the `Message` table of the message store db.
 - Fix: allow mounting light protocols without `relay`
 - Add `keep-alive` option to maintain stable connection to `relay` peers on idle topics
+- Add a bridge between Waku v1 and v2
+- Add a chat application (`chat2`) over Waku v2 with bridging to matterbridge
 
 ## 2021-01-05 v0.2
 

examples/v2/matterbridge/chat2bridge.nim

@@ -233,7 +233,7 @@ when isMainModule:
     bridge = Chat2Matterbridge.new(
                             mbHostUri = "http://" & $initTAddress(conf.mbHostAddress, Port(conf.mbHostPort)),
                             mbGateway = conf.mbGateway,
-                            nodev2Key = conf.nodeKeyv2,
+                            nodev2Key = conf.nodekey,
                             nodev2BindIp = conf.listenAddress, nodev2BindPort = Port(uint16(conf.libp2pTcpPort) + conf.portsShift),
                             nodev2ExtIp = nodev2ExtIp, nodev2ExtPort = nodev2ExtPort)
 
@@ -247,8 +247,8 @@ when isMainModule:
   if conf.filter:
     mountFilter(bridge.nodev2)
 
-  if conf.staticnodesv2.len > 0:
-    waitFor connectToNodes(bridge.nodev2, conf.staticnodesv2)
+  if conf.staticnodes.len > 0:
+    waitFor connectToNodes(bridge.nodev2, conf.staticnodes)
 
   if conf.storenode != "":
     setStorePeer(bridge.nodev2, conf.storenode)

examples/v2/matterbridge/config_chat2bridge.nim

@@ -66,14 +66,14 @@ type
       name: "metrics-server-port" .}: uint16
 
     ### Waku v2 options
-    staticnodesv2* {.
+    staticnodes* {.
       desc: "Multiaddr of peer to directly connect with. Argument may be repeated"
-      name: "staticnodev2" }: seq[string]
+      name: "staticnode" }: seq[string]
 
-    nodekeyv2* {.
+    nodekey* {.
       desc: "P2P node private key as hex"
       defaultValue: crypto.PrivateKey.random(Secp256k1, newRng()[]).tryGet()
-      name: "nodekeyv2" }: crypto.PrivateKey
+      name: "nodekey" }: crypto.PrivateKey
 
     topics* {.
       desc: "Default topics to subscribe to (space separated list)"