Default topic: waku -> /waku/2/default-waku/proto

examples/v2/chat2.nim

@@ -30,7 +30,7 @@ const Help = """
   exit: closes the chat
 """
 
-const DefaultTopic = "waku"
+const DefaultTopic = "/waku/2/default-waku/proto"
 
 const Dingpu = "dingpu".toBytes
 const DefaultContentTopic = ContentTopic(uint32.fromBytes(Dingpu))

tests/v2/test_wakunode.nim

@@ -143,7 +143,7 @@ procSuite "WakuNode":
     await node2.start()
     node2.mountStore()
 
-    await node2.subscriptions.notify("waku", message)
+    await node2.subscriptions.notify("/waku/2/default-waku/proto", message)
 
     await sleepAsync(2000.millis)
 
@@ -186,11 +186,11 @@ procSuite "WakuNode":
         msg == message
       completionFut.complete(true)
 
-    await node1.subscribe(FilterRequest(topic: "waku", contentFilters: @[ContentFilter(topics: @[contentTopic])]), handler)
+    await node1.subscribe(FilterRequest(topic: "/waku/2/default-waku/proto", contentFilters: @[ContentFilter(topics: @[contentTopic])]), handler)
 
     await sleepAsync(2000.millis)
 
-    await node2.subscriptions.notify("waku", message)
+    await node2.subscriptions.notify("/waku/2/default-waku/proto", message)
 
     await sleepAsync(2000.millis)
 

waku/node/config_bridge.nim

@@ -108,8 +108,8 @@ type
       name: "nodekeyv2" }: crypto.PrivateKey
 
     topics* {.
-      desc: "Default topics to subscribe to (space seperated list)"
-      defaultValue: "waku"
+      desc: "Default topics to subscribe to (space separated list)"
+      defaultValue: "/waku/2/default-waku/proto"
       name: "topics" .}: string
 
     store* {.

waku/node/v2/config.nim

@@ -69,8 +69,8 @@ type
       name: "filternode" }: string
 
     topics* {.
-      desc: "Default topics to subscribe to (space seperated list)."
-      defaultValue: "waku"
+      desc: "Default topics to subscribe to (space separated list)."
+      defaultValue: "/waku/2/default-waku/proto"
       name: "topics" .}: string
 
     # NOTE: Signature is different here, we return PrivateKey and not KeyPair

waku/node/v2/quicksim2.nim

@@ -11,6 +11,8 @@ template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0]
 const sigWakuPath = sourceDir / "rpc" / "wakucallsigs.nim"
 createRpcSigs(RpcHttpClient, sigWakuPath)
 
+const defaultTopic = "/waku/2/default-waku/proto"
+
 const topicAmount = 10 #100
 
 proc message(i: int): ProtoBuffer =
@@ -31,7 +33,7 @@ for i in 0..<amount:
   var node = newRpcHttpClient()
   nodes.add(node)
   waitFor nodes[i].connect("localhost", Port(8547+i))
-  var res = waitFor nodes[i].wakuSubscribe("waku")
+  var res = waitFor nodes[i].wakuSubscribe(defaultTopic)
 
 os.sleep(2000)
 
@@ -40,18 +42,18 @@ os.sleep(2000)
 #   os.sleep(50)
 #   # TODO: This would then publish on a subtopic here
 #   var s = "hello " & $2
-#   var res3 = waitFor nodes[0].wakuPublish("waku", s)
+#   var res3 = waitFor nodes[0].wakuPublish(defaultTopic, s)
 
 # Scenario xx3 - same as xx1 but publish from multiple nodes
 # To compare FloodSub and GossipSub factor
 for i in 0..<topicAmount:
   os.sleep(50)
   # TODO: This would then publish on a subtopic here
-  var res3 = waitFor nodes[0].wakuPublish("waku", message(0).buffer)
-  res3 = waitFor nodes[1].wakuPublish("waku", message(1).buffer)
-  res3 = waitFor nodes[2].wakuPublish("waku", message(2).buffer)
-  res3 = waitFor nodes[3].wakuPublish("waku", message(3).buffer)
-  res3 = waitFor nodes[4].wakuPublish("waku", message(4).buffer)
+  var res3 = waitFor nodes[0].wakuPublish(defaultTopic, message(0).buffer)
+  res3 = waitFor nodes[1].wakuPublish(defaultTopic, message(1).buffer)
+  res3 = waitFor nodes[2].wakuPublish(defaultTopic, message(2).buffer)
+  res3 = waitFor nodes[3].wakuPublish(defaultTopic, message(3).buffer)
+  res3 = waitFor nodes[4].wakuPublish(defaultTopic, message(4).buffer)
 
 # Scenario xx2 - 14 full nodes, two edge nodes
 # Assume one full topic
@@ -65,8 +67,8 @@ for i in 0..<topicAmount:
 #let version = waitFor nodea.wakuVersion()
 #info "Version is", version
 #
-#let res1 = waitFor nodea.wakuSubscribe("waku")
-#let res2 = waitFor nodeb.wakuSubscribe("waku")
+#let res1 = waitFor nodea.wakuSubscribe(defaultTopic)
+#let res2 = waitFor nodeb.wakuSubscribe(defaultTopic)
 #
 #let amount = 14
 #var nodes: seq[RPCHttpClient]
@@ -74,7 +76,7 @@ for i in 0..<topicAmount:
 #  var node = newRpcHttpClient()
 #  nodes.add(node)
 #  waitFor nodes[i].connect("localhost", Port(8547+i))
-#  var res = waitFor nodes[i].wakuSubscribe("waku")
+#  var res = waitFor nodes[i].wakuSubscribe(defaultTopic)
 #
 #os.sleep(2000)
 #
@@ -83,7 +85,7 @@ for i in 0..<topicAmount:
 #  os.sleep(50)
 #  # TODO: This would then publish on a subtopic here
 #  var s = "hello " & $2
-#  var res3 = waitFor nodea.wakuPublish("waku", s)
+#  var res3 = waitFor nodea.wakuPublish(defaultTopic, s)
 
 # Misc old scenarios
 #########################################

waku/node/v2/rpc/rpc_publish.nim

@@ -27,10 +27,7 @@ echo "Input is:", input
 var node = newRpcHttpClient()
 waitfor node.connect("localhost", rpcPort)
 
-# Subscribe ourselves to topic
-#var res = node.wakuSubscribe("waku")
-
-let pubSubTopic = "waku"
+let pubSubTopic = "/waku/2/default-waku/proto"
 let contentTopic = "foobar"
 var wakuMessage = WakuMessage(payload: input.toBytes(), contentTopic: contentTopic)
 # XXX This should be WakuMessage type, but need to setup JSON-RPC mapping for that to work

waku/node/v2/rpc/rpc_subscribe.nim

@@ -23,5 +23,5 @@ waitfor client.connect("localhost", rpcPort)
 echo "Subscribing"
 
 # Subscribe to waku topic
-var res = waitFor client.wakuSubscribe("waku")
+var res = waitFor client.wakuSubscribe("/waku/2/default-waku/proto")
 echo res

waku/node/v2/rpc/rpc_subscribe_filter.nim

@@ -26,7 +26,7 @@ echo "Input is:", input
 var node = newRpcHttpClient()
 waitfor node.connect("localhost", rpcPort)
 
-let pubSubTopic = "waku"
+let pubSubTopic = "/waku/2/default-waku/proto"
 let contentTopic = "foobar"
 var res = waitfor node.wakuSubscribeFilter(pubSubTopic, @[@[contentTopic]])
 echo "Waku query response: ", res

waku/node/v2/wakunode2.nim

@@ -232,7 +232,7 @@ proc mountRelay*(node: WakuNode, topics: seq[string] = newSeq[string]()) {.async
       node.filters.notify(msg.value(), "")
       await node.subscriptions.notify(topic, msg.value())
 
-  await node.wakuRelay.subscribe("waku", relayHandler)
+  await node.wakuRelay.subscribe("/waku/2/default-waku/proto", relayHandler)
 
   for topic in topics:
     proc handler(topic: string, data: seq[byte]) {.async, gcsafe.} =