From ae42f126c497c63b39ea035636e9fe141a5b3b32 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 16 Jun 2020 16:40:49 +0200
Subject: [PATCH] Use /dns/ instead of /dns4/

---
 .maintain/sentry-node/docker-compose.yml | 14 +++++++-------
 bin/node/cli/res/flaming-fir.json        |  2 +-
 client/network/src/discovery.rs          |  3 ++-
 client/network/src/lib.rs                |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.maintain/sentry-node/docker-compose.yml b/.maintain/sentry-node/docker-compose.yml
index 376538dde5786..235f2c49630a1 100644
--- a/.maintain/sentry-node/docker-compose.yml
+++ b/.maintain/sentry-node/docker-compose.yml
@@ -47,9 +47,9 @@ services:
       - "--validator"
       - "--alice"
       - "--sentry-nodes"
-      - "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
       - "--reserved-nodes"
-      - "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
       # Not only bind to localhost.
       - "--unsafe-ws-external"
       - "--unsafe-rpc-external"
@@ -83,11 +83,11 @@ services:
       - "--port"
       - "30333"
       - "--sentry"
-      - "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
       - "--reserved-nodes"
-      - "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
       - "--bootnodes"
-      - "/dns4/validator-b/tcp/30333/p2p/QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk"
+      - "/dns/validator-b/tcp/30333/p2p/QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
@@ -118,9 +118,9 @@ services:
       - "--validator"
       - "--bob"
       - "--bootnodes"
-      - "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
       - "--bootnodes"
-      - "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
diff --git a/bin/node/cli/res/flaming-fir.json b/bin/node/cli/res/flaming-fir.json
index 7cc2c11c327e1..5f2eb265880ef 100644
--- a/bin/node/cli/res/flaming-fir.json
+++ b/bin/node/cli/res/flaming-fir.json
@@ -14,7 +14,7 @@
   ],
   "telemetryEndpoints": [
     [
-      "/dns4/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F",
+      "/dns/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F",
       0
     ]
   ],
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index f5c293b25128a..73a5916947a39 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -324,7 +324,8 @@ impl DiscoveryBehaviour {
 		let ip = match addr.iter().next() {
 			Some(Protocol::Ip4(ip)) => IpNetwork::from(ip),
 			Some(Protocol::Ip6(ip)) => IpNetwork::from(ip),
-			Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_)) => return true,
+			Some(Protocol::Dns(_)) | Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_))
+				=> return true,
 			_ => return false
 		};
 		ip.is_global()
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 73e0b525a105d..6106616d99d10 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -77,7 +77,7 @@
 //! - WebSockets for addresses of the form `/ip4/1.2.3.4/tcp/5/ws`. A TCP/IP connection is open and
 //! the WebSockets protocol is negotiated on top. Communications then happen inside WebSockets data
 //! frames. Encryption and multiplexing are additionally negotiated again inside this channel.
-//! - DNS for addresses of the form `/dns4/example.com/tcp/5` or `/dns4/example.com/tcp/5/ws`. A
+//! - DNS for addresses of the form `/dns/example.com/tcp/5` or `/dns/example.com/tcp/5/ws`. A
 //! node's address can contain a domain name.
 //! - (All of the above using IPv6 instead of IPv4.)
 //!