From e927e05326c0aff190ee9d2c1b5d87f549ad4447 Mon Sep 17 00:00:00 2001
From: kianenigma <kian@parity.io>
Date: Thu, 25 Mar 2021 14:49:56 +0100
Subject: [PATCH 1/5] helper macro to create storage types on the fly

---
 Cargo.lock                                    | 530 ++++++++++++++++--
 .../src/migrations_3_0_0.rs                   |  48 +-
 frame/staking/src/lib.rs                      |  29 +-
 frame/support/src/lib.rs                      | 114 ++++
 4 files changed, 605 insertions(+), 116 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48673e57ce542..9bef2b420ab02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2630,6 +2630,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "if-watch"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
+dependencies = [
+ "async-io",
+ "futures 0.3.13",
+ "futures-lite",
+ "if-addrs",
+ "ipnet",
+ "libc",
+ "log",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "if-watch"
 version = "0.2.0"
@@ -3109,6 +3125,44 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
+[[package]]
+name = "libp2p"
+version = "0.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
+dependencies = [
+ "atomic",
+ "bytes 1.0.1",
+ "futures 0.3.13",
+ "lazy_static",
+ "libp2p-core 0.27.1",
+ "libp2p-deflate 0.27.1",
+ "libp2p-dns 0.27.0",
+ "libp2p-floodsub 0.27.0",
+ "libp2p-gossipsub 0.28.0",
+ "libp2p-identify 0.27.0",
+ "libp2p-kad 0.28.1",
+ "libp2p-mdns 0.28.1",
+ "libp2p-mplex 0.27.1",
+ "libp2p-noise 0.29.0",
+ "libp2p-ping 0.27.0",
+ "libp2p-plaintext 0.27.1",
+ "libp2p-pnet",
+ "libp2p-request-response 0.9.1",
+ "libp2p-swarm 0.27.2",
+ "libp2p-swarm-derive",
+ "libp2p-tcp 0.27.1",
+ "libp2p-uds 0.27.0",
+ "libp2p-wasm-ext 0.27.0",
+ "libp2p-websocket 0.28.0",
+ "libp2p-yamux 0.30.1",
+ "parity-multiaddr",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.5",
+ "smallvec 1.6.1",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p"
 version = "0.36.0"
@@ -3119,28 +3173,28 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.13",
  "lazy_static",
- "libp2p-core",
- "libp2p-deflate",
- "libp2p-dns",
- "libp2p-floodsub",
- "libp2p-gossipsub",
- "libp2p-identify",
- "libp2p-kad",
- "libp2p-mdns",
- "libp2p-mplex",
- "libp2p-noise",
- "libp2p-ping",
- "libp2p-plaintext",
+ "libp2p-core 0.28.1",
+ "libp2p-deflate 0.28.0",
+ "libp2p-dns 0.28.0",
+ "libp2p-floodsub 0.28.0",
+ "libp2p-gossipsub 0.29.0",
+ "libp2p-identify 0.28.0",
+ "libp2p-kad 0.29.0",
+ "libp2p-mdns 0.29.0",
+ "libp2p-mplex 0.28.0",
+ "libp2p-noise 0.30.0",
+ "libp2p-ping 0.28.0",
+ "libp2p-plaintext 0.28.0",
  "libp2p-pnet",
  "libp2p-relay",
- "libp2p-request-response",
- "libp2p-swarm",
+ "libp2p-request-response 0.10.0",
+ "libp2p-swarm 0.28.0",
  "libp2p-swarm-derive",
- "libp2p-tcp",
- "libp2p-uds",
- "libp2p-wasm-ext",
- "libp2p-websocket",
- "libp2p-yamux",
+ "libp2p-tcp 0.28.0",
+ "libp2p-uds 0.28.0",
+ "libp2p-wasm-ext 0.28.0",
+ "libp2p-websocket 0.29.0",
+ "libp2p-yamux 0.31.0",
  "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -3148,6 +3202,40 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-core"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
+dependencies = [
+ "asn1_der",
+ "bs58",
+ "ed25519-dalek",
+ "either",
+ "fnv",
+ "futures 0.3.13",
+ "futures-timer 3.0.2",
+ "lazy_static",
+ "libsecp256k1",
+ "log",
+ "multihash",
+ "multistream-select",
+ "parity-multiaddr",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.5",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "ring",
+ "rw-stream-sink",
+ "sha2 0.9.3",
+ "smallvec 1.6.1",
+ "thiserror",
+ "unsigned-varint 0.7.0",
+ "void",
+ "zeroize",
+]
+
 [[package]]
 name = "libp2p-core"
 version = "0.28.1"
@@ -3182,6 +3270,17 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "libp2p-deflate"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
+dependencies = [
+ "flate2",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+]
+
 [[package]]
 name = "libp2p-deflate"
 version = "0.28.0"
@@ -3190,7 +3289,18 @@ checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
+]
+
+[[package]]
+name = "libp2p-dns"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
+dependencies = [
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "log",
 ]
 
 [[package]]
@@ -3201,12 +3311,30 @@ checksum = "9712eb3e9f7dcc77cc5ca7d943b6a85ce4b1faaf91a67e003442412a26d6d6f8"
 dependencies = [
  "async-std-resolver",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "smallvec 1.6.1",
  "trust-dns-resolver",
 ]
 
+[[package]]
+name = "libp2p-floodsub"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
+dependencies = [
+ "cuckoofilter",
+ "fnv",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+]
+
 [[package]]
 name = "libp2p-floodsub"
 version = "0.28.0"
@@ -3216,13 +3344,39 @@ dependencies = [
  "cuckoofilter",
  "fnv",
  "futures 0.3.13",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
+ "log",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+]
+
+[[package]]
+name = "libp2p-gossipsub"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
+dependencies = [
+ "asynchronous-codec 0.6.0",
+ "base64 0.13.0",
+ "byteorder",
+ "bytes 1.0.1",
+ "fnv",
+ "futures 0.3.13",
+ "hex_fmt",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
+ "regex",
+ "sha2 0.9.3",
  "smallvec 1.6.1",
+ "unsigned-varint 0.7.0",
+ "wasm-timer",
 ]
 
 [[package]]
@@ -3238,8 +3392,8 @@ dependencies = [
  "fnv",
  "futures 0.3.13",
  "hex_fmt",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "prost",
  "prost-build",
@@ -3251,6 +3405,22 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-identify"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
+dependencies = [
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "prost",
+ "prost-build",
+ "smallvec 1.6.1",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-identify"
 version = "0.28.0"
@@ -3258,8 +3428,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f88ebc841d744979176ab4b8b294a3e655a7ba4ef26a905d073a52b49ed4dff5"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "prost",
  "prost-build",
@@ -3267,6 +3437,32 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-kad"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
+dependencies = [
+ "arrayvec 0.5.2",
+ "asynchronous-codec 0.6.0",
+ "bytes 1.0.1",
+ "either",
+ "fnv",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "sha2 0.9.3",
+ "smallvec 1.6.1",
+ "uint",
+ "unsigned-varint 0.7.0",
+ "void",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-kad"
 version = "0.29.0"
@@ -3279,8 +3475,8 @@ dependencies = [
  "either",
  "fnv",
  "futures 0.3.13",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "prost",
  "prost-build",
@@ -3293,6 +3489,27 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-mdns"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
+dependencies = [
+ "async-io",
+ "data-encoding",
+ "dns-parser",
+ "futures 0.3.13",
+ "if-watch 0.1.8",
+ "lazy_static",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "socket2 0.3.19",
+ "void",
+]
+
 [[package]]
 name = "libp2p-mdns"
 version = "0.29.0"
@@ -3303,10 +3520,10 @@ dependencies = [
  "data-encoding",
  "dns-parser",
  "futures 0.3.13",
- "if-watch",
+ "if-watch 0.2.0",
  "lazy_static",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "rand 0.8.3",
  "smallvec 1.6.1",
@@ -3314,6 +3531,24 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "libp2p-mplex"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
+dependencies = [
+ "asynchronous-codec 0.6.0",
+ "bytes 1.0.1",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "log",
+ "nohash-hasher",
+ "parking_lot 0.11.1",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "unsigned-varint 0.7.0",
+]
+
 [[package]]
 name = "libp2p-mplex"
 version = "0.28.0"
@@ -3323,7 +3558,7 @@ dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
@@ -3332,6 +3567,28 @@ dependencies = [
  "unsigned-varint 0.7.0",
 ]
 
+[[package]]
+name = "libp2p-noise"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
+dependencies = [
+ "bytes 1.0.1",
+ "curve25519-dalek 3.0.2",
+ "futures 0.3.13",
+ "lazy_static",
+ "libp2p-core 0.27.1",
+ "log",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "sha2 0.9.3",
+ "snow",
+ "static_assertions",
+ "x25519-dalek",
+ "zeroize",
+]
+
 [[package]]
 name = "libp2p-noise"
 version = "0.30.0"
@@ -3342,7 +3599,7 @@ dependencies = [
  "curve25519-dalek 3.0.2",
  "futures 0.3.13",
  "lazy_static",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "prost",
  "prost-build",
@@ -3354,6 +3611,21 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "libp2p-ping"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
+dependencies = [
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "rand 0.7.3",
+ "void",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-ping"
 version = "0.28.0"
@@ -3361,14 +3633,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea10fc5209260915ea65b78f612d7ff78a29ab288e7aa3250796866af861c45"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "rand 0.7.3",
  "void",
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-plaintext"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
+dependencies = [
+ "asynchronous-codec 0.6.0",
+ "bytes 1.0.1",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "log",
+ "prost",
+ "prost-build",
+ "unsigned-varint 0.7.0",
+ "void",
+]
+
 [[package]]
 name = "libp2p-plaintext"
 version = "0.28.0"
@@ -3378,7 +3667,7 @@ dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "prost",
  "prost-build",
@@ -3410,8 +3699,8 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "pin-project 1.0.5",
  "prost",
@@ -3423,6 +3712,26 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-request-response"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
+dependencies = [
+ "async-trait",
+ "bytes 1.0.1",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "libp2p-swarm 0.27.2",
+ "log",
+ "lru",
+ "minicbor 0.7.2",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "unsigned-varint 0.7.0",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-request-response"
 version = "0.10.0"
@@ -3432,17 +3741,33 @@ dependencies = [
  "async-trait",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core",
- "libp2p-swarm",
+ "libp2p-core 0.28.1",
+ "libp2p-swarm 0.28.0",
  "log",
  "lru",
- "minicbor",
+ "minicbor 0.8.0",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-swarm"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
+dependencies = [
+ "either",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "log",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "void",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-swarm"
 version = "0.28.0"
@@ -3451,7 +3776,7 @@ checksum = "75c26980cadd7c25d89071cb23e1f7f5df4863128cc91d83c6ddc72338cecafa"
 dependencies = [
  "either",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "rand 0.7.3",
  "smallvec 1.6.1",
@@ -3469,6 +3794,23 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "libp2p-tcp"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
+dependencies = [
+ "async-io",
+ "futures 0.3.13",
+ "futures-timer 3.0.2",
+ "if-watch 0.1.8",
+ "ipnet",
+ "libc",
+ "libp2p-core 0.27.1",
+ "log",
+ "socket2 0.3.19",
+]
+
 [[package]]
 name = "libp2p-tcp"
 version = "0.28.0"
@@ -3478,14 +3820,26 @@ dependencies = [
  "async-io",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "if-watch",
+ "if-watch 0.2.0",
  "ipnet",
  "libc",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "socket2 0.4.0",
 ]
 
+[[package]]
+name = "libp2p-uds"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
+dependencies = [
+ "async-std",
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "log",
+]
+
 [[package]]
 name = "libp2p-uds"
 version = "0.28.0"
@@ -3494,10 +3848,24 @@ checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
 ]
 
+[[package]]
+name = "libp2p-wasm-ext"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
+dependencies = [
+ "futures 0.3.13",
+ "js-sys",
+ "libp2p-core 0.27.1",
+ "parity-send-wrapper",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "libp2p-wasm-ext"
 version = "0.28.0"
@@ -3506,12 +3874,30 @@ checksum = "6df65fc13f6188edf7e6927b086330448b3ca27af86b49748c6d299d7c8d9040"
 dependencies = [
  "futures 0.3.13",
  "js-sys",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "parity-send-wrapper",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "libp2p-websocket"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
+dependencies = [
+ "either",
+ "futures 0.3.13",
+ "futures-rustls",
+ "libp2p-core 0.27.1",
+ "log",
+ "quicksink",
+ "rw-stream-sink",
+ "soketto",
+ "url 2.2.1",
+ "webpki-roots",
+]
+
 [[package]]
 name = "libp2p-websocket"
 version = "0.29.0"
@@ -3521,7 +3907,7 @@ dependencies = [
  "either",
  "futures 0.3.13",
  "futures-rustls",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "log",
  "quicksink",
  "rw-stream-sink",
@@ -3530,6 +3916,19 @@ dependencies = [
  "webpki-roots",
 ]
 
+[[package]]
+name = "libp2p-yamux"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
+dependencies = [
+ "futures 0.3.13",
+ "libp2p-core 0.27.1",
+ "parking_lot 0.11.1",
+ "thiserror",
+ "yamux",
+]
+
 [[package]]
 name = "libp2p-yamux"
 version = "0.31.0"
@@ -3537,7 +3936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d6144cc94143fb0a8dd1e7c2fbcc32a2808168bcd1d69920635424d5993b7b"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core",
+ "libp2p-core 0.28.1",
  "parking_lot 0.11.1",
  "thiserror",
  "yamux",
@@ -3794,6 +4193,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "minicbor"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
+dependencies = [
+ "minicbor-derive",
+]
+
 [[package]]
 name = "minicbor"
 version = "0.8.0"
@@ -4073,7 +4481,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "jsonrpc-core",
- "libp2p",
+ "libp2p 0.36.0",
  "node-cli",
  "sc-rpc-api",
  "serde",
@@ -4094,7 +4502,7 @@ dependencies = [
  "frame-system",
  "futures 0.3.13",
  "hex-literal",
- "libp2p-wasm-ext",
+ "libp2p-wasm-ext 0.28.0",
  "log",
  "nix",
  "node-executor",
@@ -6898,7 +7306,7 @@ dependencies = [
  "either",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "parity-scale-codec 2.0.1",
  "prost",
@@ -7000,7 +7408,7 @@ dependencies = [
  "fdlimit",
  "futures 0.3.13",
  "hex",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "names",
  "parity-scale-codec 2.0.1",
@@ -7615,7 +8023,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
- "libp2p",
+ "libp2p 0.36.0",
  "linked-hash-map",
  "linked_hash_set",
  "log",
@@ -7661,7 +8069,7 @@ dependencies = [
  "async-std",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "lru",
  "quickcheck",
@@ -7681,7 +8089,7 @@ dependencies = [
  "async-std",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "parking_lot 0.11.1",
  "rand 0.7.3",
@@ -7742,7 +8150,7 @@ name = "sc-peerset"
 version = "3.0.0"
 dependencies = [
  "futures 0.3.13",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "rand 0.7.3",
  "serde_json",
@@ -7998,7 +8406,7 @@ version = "3.0.0"
 dependencies = [
  "chrono",
  "futures 0.3.13",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -8666,7 +9074,7 @@ version = "0.9.0"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p",
+ "libp2p 0.36.0",
  "log",
  "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
@@ -9394,7 +9802,7 @@ dependencies = [
  "getrandom 0.2.2",
  "js-sys",
  "kvdb-web",
- "libp2p-wasm-ext",
+ "libp2p-wasm-ext 0.28.0",
  "log",
  "rand 0.7.3",
  "sc-chain-spec",
@@ -9712,7 +10120,7 @@ dependencies = [
  "futures 0.1.31",
  "futures 0.3.13",
  "jsonrpc-core",
- "libp2p",
+ "libp2p 0.35.1",
  "log",
  "node-cli",
  "parity-scale-codec 1.3.7",
diff --git a/frame/elections-phragmen/src/migrations_3_0_0.rs b/frame/elections-phragmen/src/migrations_3_0_0.rs
index 8adc4c1a69f7c..8afc9ed66920b 100644
--- a/frame/elections-phragmen/src/migrations_3_0_0.rs
+++ b/frame/elections-phragmen/src/migrations_3_0_0.rs
@@ -21,7 +21,6 @@ use codec::{Encode, Decode, FullCodec};
 use sp_std::prelude::*;
 use frame_support::{
 	RuntimeDebug, weights::Weight, Twox64Concat,
-	storage::types::{StorageMap, StorageValue},
 	traits::{GetPalletVersion, PalletVersion},
 };
 
@@ -51,38 +50,21 @@ pub trait V2ToV3 {
 	type Balance: 'static + FullCodec + Copy;
 }
 
-struct __Candidates;
-impl frame_support::traits::StorageInstance for __Candidates {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Candidates";
-}
-
-#[allow(type_alias_bounds)]
-type Candidates<T: V2ToV3> = StorageValue<__Candidates, Vec<(T::AccountId, T::Balance)>>;
-
-struct __Members;
-impl frame_support::traits::StorageInstance for __Members {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Members";
-}
-#[allow(type_alias_bounds)]
-type Members<T: V2ToV3> = StorageValue<__Members, Vec<SeatHolder<T::AccountId, T::Balance>>>;
-
-struct __RunnersUp;
-impl frame_support::traits::StorageInstance for __RunnersUp {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "RunnersUp";
-}
-#[allow(type_alias_bounds)]
-type RunnersUp<T: V2ToV3> = StorageValue<__RunnersUp, Vec<SeatHolder<T::AccountId, T::Balance>>>;
-
-struct __Voting;
-impl frame_support::traits::StorageInstance for __Voting {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Voting";
-}
-#[allow(type_alias_bounds)]
-type Voting<T: V2ToV3> = StorageMap<__Voting, Twox64Concat, T::AccountId, Voter<T::AccountId, T::Balance>>;
+frame_support::generate_storage_alias!(
+	PhragmenElection, Candidates<T: V2ToV3> => Value<Vec<(T::AccountId, T::Balance)>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, Members<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, RunnersUp<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, Voting<T: V2ToV3> => Map<
+		(Twox64Concat, T::AccountId),
+		Voter<T::AccountId, T::Balance>
+	>
+);
 
 /// Apply all of the migrations from 2_0_0 to 3_0_0.
 ///
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 31735f75ebc14..8cec56824cfa1 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1036,30 +1036,15 @@ pub mod migrations {
 
 	pub mod v6 {
 		use super::*;
-		use frame_support::{traits::Get, weights::Weight, pallet_prelude::*};
-
-		macro_rules! generate_storage_types {
-			($name:ident => Value<$value:ty>) => {
-				paste::paste! {
-					struct [<$name Instance>];
-					impl frame_support::traits::StorageInstance for [<$name Instance>] {
-						fn pallet_prefix() -> &'static str {
-							"Staking"
-						}
-						const STORAGE_PREFIX: &'static str = stringify!($name);
-					}
-					type $name = StorageValue<[<$name Instance>], $value, ValueQuery>;
-				}
-			}
-		}
+		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
 
 		// NOTE: value type doesn't matter, we just set it to () here.
-		generate_storage_types!(SnapshotValidators => Value<()>);
-		generate_storage_types!(SnapshotNominators => Value<()>);
-		generate_storage_types!(QueuedElected => Value<()>);
-		generate_storage_types!(QueuedScore => Value<()>);
-		generate_storage_types!(EraElectionStatus => Value<()>);
-		generate_storage_types!(IsCurrentSessionFinal => Value<()>);
+		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
+		generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
+		generate_storage_alias!(Staking, QueuedElected => Value<()>);
+		generate_storage_alias!(Staking, QueuedScore => Value<()>);
+		generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
+		generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
 
 		/// check to execute prior to migration.
 		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 220e7a06bdf31..d97d7eab2d542 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -87,6 +87,120 @@ pub const LOG_TARGET: &'static str = "runtime::frame-support";
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
 
+/// Generate a new type aliases for [`storage::types::value::StorageValue`],
+/// [`storage::types::value::StorageMap`] and [`storage::types::value::StorageDoubleMap`].
+///
+/// Useful for creating a *storage-like* struct for test and migrations.
+///
+///```
+/// # use frame_support::generate_storage_alias;
+/// use frame_support::codec;
+/// use frame_support::Twox64Concat;
+/// // generate a storage value with type u32.
+/// generate_storage_alias!(Prefix, StorageName => Value<u32>);
+///
+/// // generate a double map from `(u32, u32)` (with hasher `Twox64Concat`) to `Vec<u8>`
+/// generate_storage_alias!(
+///		OtherPrefix, OtherStorageName => DoubleMap<
+/// 		(T::AccountId, u32),
+/// 		(T::AccountId, u32),
+/// 		Vec<u8>
+///		>
+/// );
+///
+/// // generate a map from `Config::AccountId` (with hasher `Twox64Concat`) to `Vec<u8>`
+/// trait Config { type AccountId: codec::FullCodec; }
+/// generate_storage_alias!(
+///		Prefix, GenericStorage<T: Config> => Map<(Twox64Concat, T::AccountId), Vec<u8>>
+/// );
+/// # fn main() {}
+///```
+#[macro_export]
+macro_rules! generate_storage_alias {
+	// without generic for $name.
+	($pallet:ident, $name:ident => Map<($key:ty, $hasher:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$hasher,
+				$key,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$hasher1,
+				$key1,
+				$hasher2,
+				$key2,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident => Value<$value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageValue<
+				[<$name Instance>],
+				$value,
+			>;
+		}
+	};
+	// with generic for $name.
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Map<($key:ty, $hasher:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$key,
+				$hasher,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$key1,
+				$hasher1,
+				$key2,
+				$hasher2,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Value<$value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageValue<
+				[<$name Instance>],
+				$value,
+				$crate::storage::types::ValueQuery,
+			>;
+		}
+	};
+	// helper used in all arms.
+	(@GENERATE_INSTANCE_STRUCT $pallet:ident, $name:ident) => {
+		$crate::paste::paste! {
+			struct [<$name Instance>];
+			impl $crate::traits::StorageInstance for [<$name Instance>] {
+				fn pallet_prefix() -> &'static str { stringify!($pallet) }
+				const STORAGE_PREFIX: &'static str = stringify!($name);
+			}
+		}
+	}
+}
+
 /// Create new implementations of the [`Get`](crate::traits::Get) trait.
 ///
 /// The so-called parameter type can be created in four different ways:

From fece870f1e7ca126a584ca7810a9137cb5157708 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 29 Mar 2021 09:15:50 +0200
Subject: [PATCH 2/5] Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 frame/support/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d97d7eab2d542..38f630dab5f6c 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -87,7 +87,7 @@ pub const LOG_TARGET: &'static str = "runtime::frame-support";
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
 
-/// Generate a new type aliases for [`storage::types::value::StorageValue`],
+/// Generate a new type alias for [`storage::types::value::StorageValue`],
 /// [`storage::types::value::StorageMap`] and [`storage::types::value::StorageDoubleMap`].
 ///
 /// Useful for creating a *storage-like* struct for test and migrations.

From 90f2a7e388328262fe55e0dee71b8fefc2f70f50 Mon Sep 17 00:00:00 2001
From: kianenigma <kian@parity.io>
Date: Mon, 29 Mar 2021 14:18:20 +0200
Subject: [PATCH 3/5] update lock

---
 Cargo.lock | 528 ++++++-----------------------------------------------
 1 file changed, 60 insertions(+), 468 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 16b6e10674968..5f09da33b79d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2630,22 +2630,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "if-watch"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
-dependencies = [
- "async-io",
- "futures 0.3.13",
- "futures-lite",
- "if-addrs",
- "ipnet",
- "libc",
- "log",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "if-watch"
 version = "0.2.0"
@@ -3125,44 +3109,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
-[[package]]
-name = "libp2p"
-version = "0.35.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
-dependencies = [
- "atomic",
- "bytes 1.0.1",
- "futures 0.3.13",
- "lazy_static",
- "libp2p-core 0.27.1",
- "libp2p-deflate 0.27.1",
- "libp2p-dns 0.27.0",
- "libp2p-floodsub 0.27.0",
- "libp2p-gossipsub 0.28.0",
- "libp2p-identify 0.27.0",
- "libp2p-kad 0.28.1",
- "libp2p-mdns 0.28.1",
- "libp2p-mplex 0.27.1",
- "libp2p-noise 0.29.0",
- "libp2p-ping 0.27.0",
- "libp2p-plaintext 0.27.1",
- "libp2p-pnet",
- "libp2p-request-response 0.9.1",
- "libp2p-swarm 0.27.2",
- "libp2p-swarm-derive",
- "libp2p-tcp 0.27.1",
- "libp2p-uds 0.27.0",
- "libp2p-wasm-ext 0.27.0",
- "libp2p-websocket 0.28.0",
- "libp2p-yamux 0.30.1",
- "parity-multiaddr",
- "parking_lot 0.11.1",
- "pin-project 1.0.5",
- "smallvec 1.6.1",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p"
 version = "0.36.0"
@@ -3173,28 +3119,28 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.13",
  "lazy_static",
- "libp2p-core 0.28.1",
- "libp2p-deflate 0.28.0",
- "libp2p-dns 0.28.0",
- "libp2p-floodsub 0.28.0",
- "libp2p-gossipsub 0.29.0",
- "libp2p-identify 0.28.0",
- "libp2p-kad 0.29.0",
- "libp2p-mdns 0.29.0",
- "libp2p-mplex 0.28.0",
- "libp2p-noise 0.30.0",
- "libp2p-ping 0.28.0",
- "libp2p-plaintext 0.28.0",
+ "libp2p-core",
+ "libp2p-deflate",
+ "libp2p-dns",
+ "libp2p-floodsub",
+ "libp2p-gossipsub",
+ "libp2p-identify",
+ "libp2p-kad",
+ "libp2p-mdns",
+ "libp2p-mplex",
+ "libp2p-noise",
+ "libp2p-ping",
+ "libp2p-plaintext",
  "libp2p-pnet",
  "libp2p-relay",
- "libp2p-request-response 0.10.0",
- "libp2p-swarm 0.28.0",
+ "libp2p-request-response",
+ "libp2p-swarm",
  "libp2p-swarm-derive",
- "libp2p-tcp 0.28.0",
- "libp2p-uds 0.28.0",
- "libp2p-wasm-ext 0.28.0",
- "libp2p-websocket 0.29.0",
- "libp2p-yamux 0.31.0",
+ "libp2p-tcp",
+ "libp2p-uds",
+ "libp2p-wasm-ext",
+ "libp2p-websocket",
+ "libp2p-yamux",
  "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -3202,40 +3148,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-core"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
-dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek",
- "either",
- "fnv",
- "futures 0.3.13",
- "futures-timer 3.0.2",
- "lazy_static",
- "libsecp256k1",
- "log",
- "multihash",
- "multistream-select",
- "parity-multiaddr",
- "parking_lot 0.11.1",
- "pin-project 1.0.5",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "ring",
- "rw-stream-sink",
- "sha2 0.9.3",
- "smallvec 1.6.1",
- "thiserror",
- "unsigned-varint 0.7.0",
- "void",
- "zeroize",
-]
-
 [[package]]
 name = "libp2p-core"
 version = "0.28.1"
@@ -3270,17 +3182,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-deflate"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
-dependencies = [
- "flate2",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
-]
-
 [[package]]
 name = "libp2p-deflate"
 version = "0.28.0"
@@ -3289,18 +3190,7 @@ checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
-]
-
-[[package]]
-name = "libp2p-dns"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
-dependencies = [
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "log",
+ "libp2p-core",
 ]
 
 [[package]]
@@ -3311,30 +3201,12 @@ checksum = "9712eb3e9f7dcc77cc5ca7d943b6a85ce4b1faaf91a67e003442412a26d6d6f8"
 dependencies = [
  "async-std-resolver",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "smallvec 1.6.1",
  "trust-dns-resolver",
 ]
 
-[[package]]
-name = "libp2p-floodsub"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
-dependencies = [
- "cuckoofilter",
- "fnv",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "smallvec 1.6.1",
-]
-
 [[package]]
 name = "libp2p-floodsub"
 version = "0.28.0"
@@ -3344,39 +3216,13 @@ dependencies = [
  "cuckoofilter",
  "fnv",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "smallvec 1.6.1",
-]
-
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
-dependencies = [
- "asynchronous-codec 0.6.0",
- "base64 0.13.0",
- "byteorder",
- "bytes 1.0.1",
- "fnv",
- "futures 0.3.13",
- "hex_fmt",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
- "regex",
- "sha2 0.9.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
- "wasm-timer",
 ]
 
 [[package]]
@@ -3392,8 +3238,8 @@ dependencies = [
  "fnv",
  "futures 0.3.13",
  "hex_fmt",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
@@ -3405,22 +3251,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-identify"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
-dependencies = [
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "prost",
- "prost-build",
- "smallvec 1.6.1",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-identify"
 version = "0.28.0"
@@ -3428,8 +3258,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f88ebc841d744979176ab4b8b294a3e655a7ba4ef26a905d073a52b49ed4dff5"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
@@ -3437,32 +3267,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-kad"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
-dependencies = [
- "arrayvec 0.5.2",
- "asynchronous-codec 0.6.0",
- "bytes 1.0.1",
- "either",
- "fnv",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "sha2 0.9.3",
- "smallvec 1.6.1",
- "uint",
- "unsigned-varint 0.7.0",
- "void",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-kad"
 version = "0.29.0"
@@ -3475,8 +3279,8 @@ dependencies = [
  "either",
  "fnv",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
@@ -3489,27 +3293,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-mdns"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
-dependencies = [
- "async-io",
- "data-encoding",
- "dns-parser",
- "futures 0.3.13",
- "if-watch 0.1.8",
- "lazy_static",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "rand 0.7.3",
- "smallvec 1.6.1",
- "socket2 0.3.19",
- "void",
-]
-
 [[package]]
 name = "libp2p-mdns"
 version = "0.29.0"
@@ -3520,10 +3303,10 @@ dependencies = [
  "data-encoding",
  "dns-parser",
  "futures 0.3.13",
- "if-watch 0.2.0",
+ "if-watch",
  "lazy_static",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "rand 0.8.3",
  "smallvec 1.6.1",
@@ -3531,24 +3314,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "libp2p-mplex"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
-dependencies = [
- "asynchronous-codec 0.6.0",
- "bytes 1.0.1",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "log",
- "nohash-hasher",
- "parking_lot 0.11.1",
- "rand 0.7.3",
- "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
-]
-
 [[package]]
 name = "libp2p-mplex"
 version = "0.28.0"
@@ -3558,7 +3323,7 @@ dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
@@ -3567,28 +3332,6 @@ dependencies = [
  "unsigned-varint 0.7.0",
 ]
 
-[[package]]
-name = "libp2p-noise"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
-dependencies = [
- "bytes 1.0.1",
- "curve25519-dalek 3.0.2",
- "futures 0.3.13",
- "lazy_static",
- "libp2p-core 0.27.1",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "sha2 0.9.3",
- "snow",
- "static_assertions",
- "x25519-dalek",
- "zeroize",
-]
-
 [[package]]
 name = "libp2p-noise"
 version = "0.30.0"
@@ -3599,7 +3342,7 @@ dependencies = [
  "curve25519-dalek 3.0.2",
  "futures 0.3.13",
  "lazy_static",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "prost",
  "prost-build",
@@ -3611,21 +3354,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-ping"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
-dependencies = [
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "rand 0.7.3",
- "void",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-ping"
 version = "0.28.0"
@@ -3633,31 +3361,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea10fc5209260915ea65b78f612d7ff78a29ab288e7aa3250796866af861c45"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "rand 0.7.3",
  "void",
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-plaintext"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
-dependencies = [
- "asynchronous-codec 0.6.0",
- "bytes 1.0.1",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "log",
- "prost",
- "prost-build",
- "unsigned-varint 0.7.0",
- "void",
-]
-
 [[package]]
 name = "libp2p-plaintext"
 version = "0.28.0"
@@ -3667,7 +3378,7 @@ dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "prost",
  "prost-build",
@@ -3699,8 +3410,8 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "pin-project 1.0.5",
  "prost",
@@ -3712,26 +3423,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-request-response"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
-dependencies = [
- "async-trait",
- "bytes 1.0.1",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "libp2p-swarm 0.27.2",
- "log",
- "lru",
- "minicbor 0.7.2",
- "rand 0.7.3",
- "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-request-response"
 version = "0.10.0"
@@ -3741,33 +3432,17 @@ dependencies = [
  "async-trait",
  "bytes 1.0.1",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
- "libp2p-swarm 0.28.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "lru",
- "minicbor 0.8.0",
+ "minicbor",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-swarm"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
-dependencies = [
- "either",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "log",
- "rand 0.7.3",
- "smallvec 1.6.1",
- "void",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-swarm"
 version = "0.28.0"
@@ -3776,7 +3451,7 @@ checksum = "75c26980cadd7c25d89071cb23e1f7f5df4863128cc91d83c6ddc72338cecafa"
 dependencies = [
  "either",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "rand 0.7.3",
  "smallvec 1.6.1",
@@ -3794,23 +3469,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "libp2p-tcp"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
-dependencies = [
- "async-io",
- "futures 0.3.13",
- "futures-timer 3.0.2",
- "if-watch 0.1.8",
- "ipnet",
- "libc",
- "libp2p-core 0.27.1",
- "log",
- "socket2 0.3.19",
-]
-
 [[package]]
 name = "libp2p-tcp"
 version = "0.28.0"
@@ -3820,26 +3478,14 @@ dependencies = [
  "async-io",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "if-watch 0.2.0",
+ "if-watch",
  "ipnet",
  "libc",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "socket2 0.4.0",
 ]
 
-[[package]]
-name = "libp2p-uds"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
-dependencies = [
- "async-std",
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "log",
-]
-
 [[package]]
 name = "libp2p-uds"
 version = "0.28.0"
@@ -3848,24 +3494,10 @@ checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
 ]
 
-[[package]]
-name = "libp2p-wasm-ext"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
-dependencies = [
- "futures 0.3.13",
- "js-sys",
- "libp2p-core 0.27.1",
- "parity-send-wrapper",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "libp2p-wasm-ext"
 version = "0.28.0"
@@ -3874,30 +3506,12 @@ checksum = "6df65fc13f6188edf7e6927b086330448b3ca27af86b49748c6d299d7c8d9040"
 dependencies = [
  "futures 0.3.13",
  "js-sys",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "parity-send-wrapper",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "libp2p-websocket"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
-dependencies = [
- "either",
- "futures 0.3.13",
- "futures-rustls",
- "libp2p-core 0.27.1",
- "log",
- "quicksink",
- "rw-stream-sink",
- "soketto",
- "url 2.2.1",
- "webpki-roots",
-]
-
 [[package]]
 name = "libp2p-websocket"
 version = "0.29.0"
@@ -3907,7 +3521,7 @@ dependencies = [
  "either",
  "futures 0.3.13",
  "futures-rustls",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "log",
  "quicksink",
  "rw-stream-sink",
@@ -3916,19 +3530,6 @@ dependencies = [
  "webpki-roots",
 ]
 
-[[package]]
-name = "libp2p-yamux"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
-dependencies = [
- "futures 0.3.13",
- "libp2p-core 0.27.1",
- "parking_lot 0.11.1",
- "thiserror",
- "yamux",
-]
-
 [[package]]
 name = "libp2p-yamux"
 version = "0.31.0"
@@ -3936,7 +3537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d6144cc94143fb0a8dd1e7c2fbcc32a2808168bcd1d69920635424d5993b7b"
 dependencies = [
  "futures 0.3.13",
- "libp2p-core 0.28.1",
+ "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
  "yamux",
@@ -4193,15 +3794,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "minicbor"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
-dependencies = [
- "minicbor-derive",
-]
-
 [[package]]
 name = "minicbor"
 version = "0.8.0"
@@ -4481,7 +4073,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "jsonrpc-core",
- "libp2p 0.36.0",
+ "libp2p",
  "node-cli",
  "sc-rpc-api",
  "serde",
@@ -4502,7 +4094,7 @@ dependencies = [
  "frame-system",
  "futures 0.3.13",
  "hex-literal",
- "libp2p-wasm-ext 0.28.0",
+ "libp2p-wasm-ext",
  "log",
  "nix",
  "node-executor",
@@ -7306,7 +6898,7 @@ dependencies = [
  "either",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "parity-scale-codec 2.0.1",
  "prost",
@@ -7408,7 +7000,7 @@ dependencies = [
  "fdlimit",
  "futures 0.3.13",
  "hex",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "names",
  "parity-scale-codec 2.0.1",
@@ -8023,7 +7615,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
- "libp2p 0.36.0",
+ "libp2p",
  "linked-hash-map",
  "linked_hash_set",
  "log",
@@ -8069,7 +7661,7 @@ dependencies = [
  "async-std",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "lru",
  "quickcheck",
@@ -8089,7 +7681,7 @@ dependencies = [
  "async-std",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "parking_lot 0.11.1",
  "rand 0.7.3",
@@ -8150,7 +7742,7 @@ name = "sc-peerset"
 version = "3.0.0"
 dependencies = [
  "futures 0.3.13",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "rand 0.7.3",
  "serde_json",
@@ -8406,7 +7998,7 @@ version = "3.0.0"
 dependencies = [
  "chrono",
  "futures 0.3.13",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -9074,7 +8666,7 @@ version = "0.9.0"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "libp2p 0.36.0",
+ "libp2p",
  "log",
  "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
@@ -9806,7 +9398,7 @@ dependencies = [
  "getrandom 0.2.2",
  "js-sys",
  "kvdb-web",
- "libp2p-wasm-ext 0.28.0",
+ "libp2p-wasm-ext",
  "log",
  "rand 0.7.3",
  "sc-chain-spec",

From acca8a73ebd2cbd43e68652ef70f4bc835d8b7c1 Mon Sep 17 00:00:00 2001
From: kianenigma <kian@parity.io>
Date: Mon, 29 Mar 2021 15:46:14 +0200
Subject: [PATCH 4/5] fix test;

---
 frame/support/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 38f630dab5f6c..d91b22b4f6179 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -102,8 +102,8 @@ pub enum Never {}
 /// // generate a double map from `(u32, u32)` (with hasher `Twox64Concat`) to `Vec<u8>`
 /// generate_storage_alias!(
 ///		OtherPrefix, OtherStorageName => DoubleMap<
-/// 		(T::AccountId, u32),
-/// 		(T::AccountId, u32),
+/// 		(u32, u32),
+/// 		(u32, u32),
 /// 		Vec<u8>
 ///		>
 /// );

From 237810b56374eb58edd240ebe151df7461e8c6ec Mon Sep 17 00:00:00 2001
From: kianenigma <kian@parity.io>
Date: Mon, 29 Mar 2021 15:56:45 +0200
Subject: [PATCH 5/5] Fix line width

---
 frame/support/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d91b22b4f6179..362c4c5a0a73b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -164,7 +164,11 @@ macro_rules! generate_storage_alias {
 			>;
 		}
 	};
-	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+	(
+		$pallet:ident,
+		$name:ident<$t:ident : $bounds:tt>
+		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>)
+	=> {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			#[allow(type_alias_bounds)]