diff --git a/Cargo.lock b/Cargo.lock
index 60fabe2a99..7d72ee4968 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -192,7 +192,7 @@ dependencies = [
  "instant",
  "pin-project 0.4.27",
  "rand 0.7.3",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -428,6 +428,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
 [[package]]
 name = "bstr"
 version = "0.2.14"
@@ -618,7 +624,7 @@ dependencies = [
  "hex 0.4.2",
  "http-api-problem",
  "ipnet",
- "libp2p",
+ "libp2p 0.31.1",
  "libp2p-tokio-socks5",
  "libsqlite3-sys",
  "log 0.4.11",
@@ -642,7 +648,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "time 0.2.22",
- "tokio",
+ "tokio 0.2.22",
  "toml",
  "tracing",
  "tracing-core",
@@ -673,7 +679,7 @@ dependencies = [
  "genawaiter",
  "hex 0.4.2",
  "levenshtein",
- "libp2p",
+ "libp2p 0.31.1",
  "lru",
  "num 0.3.1",
  "primitive-types",
@@ -691,7 +697,7 @@ dependencies = [
  "testcontainers",
  "thiserror",
  "time 0.2.22",
- "tokio",
+ "tokio 0.2.22",
  "tracing",
  "tracing-futures",
  "uuid",
@@ -1422,7 +1428,7 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio",
+ "tokio 0.2.22",
  "tokio-util",
  "tracing",
 ]
@@ -1649,7 +1655,7 @@ dependencies = [
  "itoa",
  "pin-project 0.4.27",
  "socket2",
- "tokio",
+ "tokio 0.2.22",
  "tower-service",
  "tracing",
  "want",
@@ -1664,7 +1670,7 @@ dependencies = [
  "bytes 0.5.6",
  "hyper 0.13.8",
  "native-tls",
- "tokio",
+ "tokio 0.2.22",
  "tokio-tls",
 ]
 
@@ -1895,18 +1901,38 @@ dependencies = [
  "bytes 0.5.6",
  "futures",
  "lazy_static",
- "libp2p-core",
- "libp2p-core-derive",
+ "libp2p-core 0.23.1",
+ "libp2p-core-derive 0.20.2",
+ "libp2p-swarm 0.23.0",
+ "multihash 0.11.4",
+ "parity-multiaddr 0.9.3",
+ "parking_lot",
+ "pin-project 1.0.1",
+ "smallvec",
+ "wasm-timer",
+]
+
+[[package]]
+name = "libp2p"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24966e73cc5624a6cf14b025365f67cb6da436b4d6337ed84d198063ba74451d"
+dependencies = [
+ "atomic",
+ "bytes 0.5.6",
+ "futures",
+ "lazy_static",
+ "libp2p-core 0.25.1",
+ "libp2p-core-derive 0.21.0",
  "libp2p-dns",
  "libp2p-gossipsub",
  "libp2p-mplex",
  "libp2p-noise",
  "libp2p-request-response",
- "libp2p-swarm",
+ "libp2p-swarm 0.25.0",
  "libp2p-tcp",
  "libp2p-yamux",
- "multihash",
- "parity-multiaddr",
+ "parity-multiaddr 0.10.0",
  "parking_lot",
  "pin-project 1.0.1",
  "smallvec",
@@ -1920,7 +1946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771"
 dependencies = [
  "asn1_der",
- "bs58",
+ "bs58 0.3.1",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -1929,9 +1955,44 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log 0.4.11",
- "multihash",
- "multistream-select",
- "parity-multiaddr",
+ "multihash 0.11.4",
+ "multistream-select 0.8.4",
+ "parity-multiaddr 0.9.3",
+ "parking_lot",
+ "pin-project 1.0.1",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "ring",
+ "rw-stream-sink",
+ "sha2 0.9.1",
+ "smallvec",
+ "thiserror",
+ "unsigned-varint",
+ "void",
+ "zeroize",
+]
+
+[[package]]
+name = "libp2p-core"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d92fab5df60c9705e05750d9ecee6a5af15aed1e3fa86e09fd3dd07ec5dc8e"
+dependencies = [
+ "asn1_der",
+ "bs58 0.4.0",
+ "bytes 0.5.6",
+ "ed25519-dalek",
+ "either",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "lazy_static",
+ "libsecp256k1",
+ "log 0.4.11",
+ "multihash 0.13.1",
+ "multistream-select 0.9.0",
+ "parity-multiaddr 0.10.0",
  "parking_lot",
  "pin-project 1.0.1",
  "prost",
@@ -1957,22 +2018,32 @@ dependencies = [
  "syn 1.0.48",
 ]
 
+[[package]]
+name = "libp2p-core-derive"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
+dependencies = [
+ "quote 1.0.7",
+ "syn 1.0.48",
+]
+
 [[package]]
 name = "libp2p-dns"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f"
+checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012"
 dependencies = [
  "futures",
- "libp2p-core",
+ "libp2p-core 0.25.1",
  "log 0.4.11",
 ]
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9"
+checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -1981,8 +2052,8 @@ dependencies = [
  "futures",
  "futures_codec",
  "hex_fmt",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.25.1",
+ "libp2p-swarm 0.25.0",
  "log 0.4.11",
  "lru_time_cache",
  "prost",
@@ -1996,14 +2067,14 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "696c8ee8b42496690b88b0de84a96387caf6e09880bcc8e794bb88afa054e995"
+checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b"
 dependencies = [
  "bytes 0.5.6",
  "futures",
  "futures_codec",
- "libp2p-core",
+ "libp2p-core 0.25.1",
  "log 0.4.11",
  "nohash-hasher",
  "parking_lot",
@@ -2014,15 +2085,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6"
+checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek",
  "futures",
  "lazy_static",
- "libp2p-core",
+ "libp2p-core 0.25.1",
  "log 0.4.11",
  "prost",
  "prost-build",
@@ -2036,15 +2107,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9"
+checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
  "futures",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.25.1",
+ "libp2p-swarm 0.25.0",
  "log 0.4.11",
  "lru",
  "minicbor",
@@ -2062,7 +2133,23 @@ checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1"
 dependencies = [
  "either",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.23.1",
+ "log 0.4.11",
+ "rand 0.7.3",
+ "smallvec",
+ "void",
+ "wasm-timer",
+]
+
+[[package]]
+name = "libp2p-swarm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de333c483f27d02ecf7b6cef814a36f5e1876f15139eefb00225c405350e1c22"
+dependencies = [
+ "either",
+ "futures",
+ "libp2p-core 0.25.1",
  "log 0.4.11",
  "rand 0.7.3",
  "smallvec",
@@ -2072,18 +2159,18 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.23.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5"
+checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0"
 dependencies = [
  "futures",
  "futures-timer",
  "if-addrs",
  "ipnet",
- "libp2p-core",
+ "libp2p-core 0.25.1",
  "log 0.4.11",
  "socket2",
- "tokio",
+ "tokio 0.3.4",
 ]
 
 [[package]]
@@ -2097,21 +2184,21 @@ dependencies = [
  "futures-timer",
  "get_if_addrs",
  "ipnet",
- "libp2p",
+ "libp2p 0.29.1",
  "log 0.4.11",
  "socket2",
- "tokio",
+ "tokio 0.2.22",
  "tokio-socks",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.26.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110"
+checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6"
 dependencies = [
  "futures",
- "libp2p-core",
+ "libp2p-core 0.25.1",
  "parking_lot",
  "thiserror",
  "yamux",
@@ -2284,18 +2371,18 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781"
+checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c"
+checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -2325,12 +2412,25 @@ dependencies = [
  "kernel32-sys",
  "libc",
  "log 0.4.11",
- "miow",
+ "miow 0.2.1",
  "net2",
  "slab",
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "mio"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
+dependencies = [
+ "libc",
+ "log 0.4.11",
+ "miow 0.3.6",
+ "ntapi",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "miow"
 version = "0.2.1"
@@ -2343,6 +2443,16 @@ dependencies = [
  "ws2_32-sys",
 ]
 
+[[package]]
+name = "miow"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+dependencies = [
+ "socket2",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "multihash"
 version = "0.11.4"
@@ -2358,6 +2468,33 @@ dependencies = [
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
+dependencies = [
+ "digest 0.9.0",
+ "generic-array 0.14.4",
+ "multihash-derive",
+ "sha2 0.9.1",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.48",
+ "synstructure",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.2"
@@ -2378,6 +2515,20 @@ dependencies = [
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multistream-select"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46e19fd46149acdd3600780ebaa09f6ae4e7f2ddbafec64aab54cf75aafd1746"
+dependencies = [
+ "bytes 0.5.6",
+ "futures",
+ "log 0.4.11",
+ "pin-project 1.0.1",
+ "smallvec",
+ "unsigned-varint",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.4"
@@ -2420,7 +2571,7 @@ dependencies = [
  "futures-timer",
  "genawaiter",
  "hex 0.4.2",
- "libp2p",
+ "libp2p 0.31.1",
  "log 0.4.11",
  "num 0.3.1",
  "pem",
@@ -2444,7 +2595,7 @@ dependencies = [
  "testcontainers",
  "thiserror",
  "time 0.2.22",
- "tokio",
+ "tokio 0.2.22",
  "toml",
  "tracing",
  "tracing-futures",
@@ -2482,6 +2633,15 @@ dependencies = [
  "version_check 0.9.2",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -2763,10 +2923,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a"
 dependencies = [
  "arrayref",
- "bs58",
+ "bs58 0.3.1",
+ "byteorder",
+ "data-encoding",
+ "multihash 0.11.4",
+ "percent-encoding 2.1.0",
+ "serde",
+ "static_assertions",
+ "unsigned-varint",
+ "url 2.2.0",
+]
+
+[[package]]
+name = "parity-multiaddr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16"
+dependencies = [
+ "arrayref",
+ "bs58 0.4.0",
  "byteorder",
  "data-encoding",
- "multihash",
+ "multihash 0.13.1",
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
@@ -2947,6 +3125,15 @@ dependencies = [
  "uint",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+dependencies = [
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -3391,7 +3578,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded 0.7.0",
- "tokio",
+ "tokio 0.2.22",
  "tokio-tls",
  "url 2.2.0",
  "wasm-bindgen",
@@ -4287,13 +4474,26 @@ dependencies = [
  "iovec",
  "lazy_static",
  "memchr",
- "mio",
+ "mio 0.6.22",
  "num_cpus",
  "pin-project-lite 0.1.11",
  "slab",
  "tokio-macros",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dfe2523e6fa84ddf5e688151d4e5fddc51678de9752c6512a24714c23818d61"
+dependencies = [
+ "autocfg 1.0.1",
+ "lazy_static",
+ "libc",
+ "mio 0.7.6",
+ "pin-project-lite 0.2.0",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "0.2.5"
@@ -4315,7 +4515,7 @@ dependencies = [
  "either",
  "futures",
  "thiserror",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -4325,7 +4525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
 dependencies = [
  "native-tls",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -4339,7 +4539,7 @@ dependencies = [
  "futures-sink",
  "log 0.4.11",
  "pin-project-lite 0.1.11",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -4670,7 +4870,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded 0.6.1",
- "tokio",
+ "tokio 0.2.22",
  "tower-service",
  "tracing",
  "tracing-futures",
diff --git a/cnd/Cargo.toml b/cnd/Cargo.toml
index eb46b0fed7..75781d9405 100644
--- a/cnd/Cargo.toml
+++ b/cnd/Cargo.toml
@@ -27,7 +27,7 @@ get_if_addrs = "0.5"
 hex = "0.4"
 http-api-problem = { version = "0.15", features = [ "with_warp" ] }
 ipnet = "2.3"
-libp2p = { version = "0.29", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns", "noise" ] }
+libp2p = { version = "0.31", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns", "noise" ] }
 libp2p-tokio-socks5 = "0.4"
 libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = [ "bundled" ] }
 log = { version = "0.4", features = [ "serde" ] }
diff --git a/comit/Cargo.toml b/comit/Cargo.toml
index cb5e92a885..fc16aefb15 100644
--- a/comit/Cargo.toml
+++ b/comit/Cargo.toml
@@ -19,7 +19,7 @@ futures = { version = "0.3", default-features = false }
 genawaiter = { version = "0.99", default-features = false, features = [ "futures03" ] }
 hex = { version = "0.4", features = [ "serde" ] }
 levenshtein = "1"
-libp2p = { version = "0.29", default-features = false, features = [ "gossipsub", "request-response" ] }
+libp2p = { version = "0.31", default-features = false, features = [ "gossipsub", "request-response" ] }
 lru = "0.6"
 num = "0.3"
 primitive-types = { version = "0.7", features = [ "serde" ] }
@@ -42,7 +42,7 @@ uuid = { version = "0.8", features = [ "serde", "v4" ] }
 
 [dev-dependencies]
 bitcoincore-rpc = "0.12"
-libp2p = { version = "0.29", default-features = false, features = [ "yamux", "noise" ] }
+libp2p = { version = "0.31", default-features = false, features = [ "yamux", "noise" ] }
 proptest = "0.10"
 spectral = { version = "0.6", default-features = false }
 tokio = { version = "0.2", features = [ "macros" ] }
diff --git a/nectar/Cargo.toml b/nectar/Cargo.toml
index 52f30c17da..7180781283 100644
--- a/nectar/Cargo.toml
+++ b/nectar/Cargo.toml
@@ -24,7 +24,7 @@ futures = "0.3"
 futures-timer = "3.0"
 genawaiter = { version = "0.99", default-features = false, features = [ "futures03" ] }
 hex = "0.4"
-libp2p = { version = "0.29", default-features = false, features = [ "tcp-tokio", "noise", "yamux", "mplex", "dns" ] }
+libp2p = { version = "0.31", default-features = false, features = [ "tcp-tokio", "noise", "yamux", "mplex", "dns" ] }
 log = "0.4"
 num = "0.3"
 pem = "0.8"