Merge branch 'master' into dp-jsonrpsee-integration-2

* master: fix staking version in genesis (#9280) fix storage info for decl_storage (#9274) Authority_discovery: expose assimilate_storage with GenesisBuild (#9279) Update CODEOWNERS (#9278) Remove in-tree `max-encoded-len` and use the new SCALE codec crate instead (#9163) bump a bunch of deps in parity-common (#9263) Bump linregress due to security vulnerability (#9262) pallet macro: always generate storage info on pallet struct (#9246) Less duplication in test code (#9270) Add `Chilled` event to staking chill extrinsics (#9250)
paritytech · Jul 6, 2021 · 3cb6181 · 3cb6181
2 parents 1b61b1a + 8c868a2
commit 3cb6181
Show file tree

Hide file tree

Showing 102 changed files with 688 additions and 1,444 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -206,9 +206,6 @@ members = [
 	"utils/frame/rpc/system",
 	"utils/prometheus",
 	"utils/wasm-builder",
-	# temp deps
-	"max-encoded-len",
-	"max-encoded-len/derive",
 ]
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates

diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
@@ -21,8 +21,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
-kvdb = "0.9.0"
-kvdb-rocksdb = "0.11.0"
+kvdb = "0.10.0"
+kvdb-rocksdb = "0.12.0"
 sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.4" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
@@ -19,3 +19,7 @@ futures = "0.3.9"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "2.0.0"}
 sc-rpc-api = { path = "../../../client/rpc-api", version = "0.9.0"}
+
+# This is a HACK to make browser tests pass.
+# enables [`instant/wasm_bindgen`]
+parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] }
diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
@@ -56,7 +56,6 @@ fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
 #[wasm_bindgen_test]
 async fn runs() {
 	let mut client = node_cli::start_client(None, "info".into())
-			.await
 			.unwrap();
 
 	// Check that the node handles rpc calls.

diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
@@ -26,13 +26,12 @@ use browser_utils::{
 
 /// Starts the client.
 #[wasm_bindgen]
-pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
+pub fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
 	start_inner(chain_spec, log_level)
-		.await
 		.map_err(|err| JsValue::from_str(&err.to_string()))
 }
 
-async fn start_inner(
+fn start_inner(
 	chain_spec: Option<String>,
 	log_directives: String,
 ) -> Result<Client, Box<dyn std::error::Error>> {
@@ -44,7 +43,7 @@ async fn start_inner(
 		None => crate::chain_spec::development_config(),
 	};
 
-	let config = browser_configuration(chain_spec).await?;
+	let config = browser_configuration(chain_spec)?;
 
 	info!("Substrate browser node");
 	info!("✌️  version {}", config.impl_version);

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
@@ -90,8 +90,6 @@ pallet-transaction-storage = { version = "3.0.0", default-features = false, path
 pallet-uniques = { version = "3.0.0", default-features = false, path = "../../../frame/uniques" }
 pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../../max-encoded-len", features = [ "derive" ] }
-
 [build-dependencies]
 substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
@@ -166,7 +164,6 @@ std = [
 	"log/std",
 	"frame-try-runtime/std",
 	"sp-npos-elections/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -33,15 +33,15 @@ use frame_support::{
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
-		U128CurrencyToVote, MaxEncodedLen,
+		U128CurrencyToVote,
 	},
 };
 use frame_system::{
 	EnsureRoot, EnsureOneOf,
 	limits::{BlockWeights, BlockLength}
 };
 use frame_support::{traits::InstanceFilter, PalletId};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 use sp_core::{
 	crypto::KeyTypeId,
 	u32_trait::{_1, _2, _3, _4, _5},

diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
@@ -24,7 +24,7 @@ futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.9.0"
+kvdb = "0.10.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
@@ -43,7 +43,7 @@ sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.9.0"
+kvdb-memorydb = "0.10.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
 thiserror = "1.0.21"
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 parking_lot = "0.11.1"
 log = "0.4.8"
-kvdb = "0.9.0"
-kvdb-rocksdb = { version = "0.11.0", optional = true }
-kvdb-memorydb = "0.9.0"
+kvdb = "0.10.0"
+kvdb-rocksdb = { version = "0.12.0", optional = true }
+kvdb-memorydb = "0.10.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["std"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["std"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
@@ -43,7 +43,7 @@ sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
-kvdb-rocksdb = "0.11.0"
+kvdb-rocksdb = "0.12.0"
 tempfile = "3"
 
 [features]

diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
@@ -17,7 +17,7 @@ ansi_term = "0.12.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "3.0.0", path = "../api" }
 sc-network = { version = "0.9.0", path = "../network" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }

diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
@@ -79,7 +79,7 @@ sc-tracing = { version = "3.0.0", path = "../tracing" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 async-trait = "0.1.42"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]

diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
@@ -19,5 +19,5 @@ log = "0.4.11"
 sc-client-api = { version = "3.0.0", path = "../api" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
@@ -18,7 +18,7 @@ thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
 intervalier = "0.4.0"
 log = "0.4.8"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-client-api = { version = "3.0.0", path = "../api" }

diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
@@ -25,7 +25,7 @@ sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.3"