availproject · MiguelDD1 · Nov 25, 2021 · Nov 14, 2021 · Nov 21, 2021 · Nov 21, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -194,6 +194,9 @@ members = [
 	"utils/wasm-builder",
 ]
 
+[patch.crates-io]
+dusk-plonk = { git = "https://github.com/maticnetwork/plonk.git", tag = "v0.8.2-polygon-1" }
+
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
 # their debug info might be missing) or to require to be frequently recompiled. We compile these
@@ -210,8 +213,6 @@ members = [
 #
 # This list is ordered alphabetically.
 [profile.dev.package]
-aes-soft = { opt-level = 3 }
-aesni = { opt-level = 3 }
 blake2 = { opt-level = 3 }
 blake2-rfc = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }

diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
@@ -17,7 +17,7 @@ name = "node-template"
 
 [dependencies]
 structopt = "0.3.8"
-rand = "0.8.2"
+rand = "0.8.4"
 hex-literal = "0.3.1"
 futures = { version = "0.3.9", features = ["compat"] }
 sc-cli = { version = "0.9.0", path = "../../../client/cli", features = ["wasmtime"] }
@@ -51,12 +51,13 @@ sc-network = { version = "0.9.0", path = "../../../client/network" }
 sc-sync-state-rpc = { version = "0.9.0", path = "../../../client/sync-state-rpc" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 
-dusk-plonk = { path = "../../../client/plonk" }
+# dusk-plonk = { path = "../../../client/plonk" }
+dusk-plonk = { version = "0.8.2", default-features = false }
 kate = { path = "../../../client/kate", default-features = false }
 log = "0.4.8"
 lru = { version = "0.6.4"}
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-serde = { version = "1.0.102", features = ["derive"] }
+serde = { version = "1.0.121", features = ["derive"] }
 frame-system = { package = "frame-system", path = "../../../frame/system"}
 frame-support = { package = "frame-support", path = "../../../frame/support"}
 

diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
@@ -28,7 +28,7 @@ version = "3.0.0"
 path = "../../../../frame/system"
 
 [dev-dependencies]
-serde = { version = "1.0.101" }
+serde = { version = "1.0.121" }
 
 [dependencies.sp-core]
 default-features = false

diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -43,7 +43,7 @@ pallet-bounties = { version = "3.0.0", default-features = false, path = "../../.
 
 pallet-tips = { version = "3.0.0", default-features = false, path = "../../../frame/tips" }
 pallet-scheduler = { version = "3.0.0", default-features = false, path = "../../../frame/scheduler" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.121", optional = true, features = ["derive"] }
 sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
 sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
 sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/babe" }
@@ -67,6 +67,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-featur
 # Used for runtime benchmarking
 frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+pallet-session-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/session/benchmarking", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 da = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "polygon-data-availability" }
@@ -129,8 +130,15 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking",
+	"pallet-session-benchmarking",
 	"hex-literal",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-collective/runtime-benchmarks",
+	"pallet-babe/runtime-benchmarks",
+	"pallet-elections-phragmen/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-im-online/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 ]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -1011,7 +1011,10 @@ impl_runtime_apis! {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
 
 			use frame_system_benchmarking::Module as SystemBench;
+			use pallet_session_benchmarking::Module as SessionBench;
+
 			impl frame_system_benchmarking::Config for Runtime {}
+			impl pallet_session_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number

diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
@@ -17,7 +17,7 @@ sc-cli = { version = "0.9.0", path = "../../../client/cli" }
 sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
-serde = "1.0.101"
+serde = "1.0.121"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
@@ -35,7 +35,7 @@ hash-db = "0.15.2"
 tempfile = "3.1.0"
 fs_extra = "1"
 hex = "0.4.0"
-rand = { version = "0.7.2", features = ["small_rng"] }
+rand = { version = "0.8.4", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.2" }

diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
@@ -8,9 +8,9 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 jsonrpc-core = "15.0.0"
-serde = "1.0.106"
+serde = "1.0.121"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -35,11 +35,11 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-serde = { version = "1.0.102", features = ["derive"] }
+serde = { version = "1.0.121", features = ["derive"] }
 futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"
 log = "0.4.8"
-rand = "0.7.2"
+rand = "0.8.4"
 structopt = { version = "0.3.8", optional = true }
 parking_lot = "0.11.1"
 kate = { path = "../../../client/kate", default-features = false }

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
@@ -437,7 +437,7 @@ fn full_native_block_import_works() {
 	});
 }
 
-/// TODO - Disabled until wasm be fixed.
+/// TODO @polygon Disabled until wasm be fixed.
 #[ignore]
 #[test]
 fn full_wasm_block_import_works() {
@@ -579,7 +579,7 @@ const CODE_TRANSFER: &str = r#"
 )
 "#;
 
-/// TODO - Disabled until wasm be fixed.
+/// TODO @polygon - Disabled until wasm be fixed.
 #[ignore]
 #[test]
 fn deploying_wasm_contract_should_work() {
@@ -651,7 +651,7 @@ fn deploying_wasm_contract_should_work() {
 	});
 }
 
-/// TODO - Disabled until wasm be fixed.
+/// TODO @polygon - Disabled until wasm be fixed.
 #[ignore]
 #[test]
 fn wasm_big_block_import_fails() {
@@ -793,7 +793,7 @@ fn full_native_block_import_works_with_changes_trie() {
 	assert!(t.ext().storage_changes_root(&GENESIS_HASH).unwrap().is_some());
 }
 
-/// TODO - Disabled until wasm be fixed.
+/// TODO @polygon - Disabled until wasm be fixed.
 #[ignore]
 #[test]
 fn full_wasm_block_import_works_with_changes_trie() {

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.102", optional = true }
+serde = { version = "1.0.121", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 

diff --git a/bin/utils/chain-spec-builder/Cargo.toml b/bin/utils/chain-spec-builder/Cargo.toml
@@ -19,5 +19,5 @@ sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
 node-cli = { version = "2.0.0", path = "../../node/cli" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-rand = "0.7.2"
+rand = "0.8.4"
 structopt = "0.3.8"
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
@@ -233,10 +233,11 @@ fn main() -> Result<(), String> {
 	let (authority_seeds, endowed_accounts, sudo_account) = match builder {
 		ChainSpecBuilder::Generate { authorities, endowed, keystore_path, .. } => {
 			let authorities = authorities.max(1);
-			let rand_str = || -> String {
+			let rand_str = || {
 				OsRng.sample_iter(&Alphanumeric)
 					.take(32)
-					.collect()
+					.map(char::from)
+					.collect::<String>()
 			};
 
 			let authority_seeds = (0..authorities).map(|_| rand_str()).collect::<Vec<_>>();

diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
@@ -23,11 +23,11 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.34.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.36.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.8"
-rand = "0.7.2"
+rand = "0.8.4"
 sc-client-api = { version = "3.0.0", path = "../api" }
 sc-network = { version = "0.9.0", path = "../network" }
 serde_json = "1.0.41"

diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
@@ -17,7 +17,7 @@ sc-chain-spec-derive = { version = "3.0.0", path = "./derive" }
 impl-trait-for-tuples = "0.2.1"
 sc-network = { version = "0.9.0", path = "../network" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.121", features = ["derive"] }
 serde_json = "1.0.41"
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-chain-spec = { version = "3.0.0", path = "../../primitives/chain-spec" }

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -18,10 +18,10 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.34.0"
+libp2p = "0.36.0"
 parity-scale-codec = "2.0.0"
 hex = "0.4.2"
-rand = "0.7.3"
+rand = "0.8.4"
 tiny-bip39 = "0.8.0"
 serde_json = "1.0.41"
 sc-keystore = { version = "3.0.0", path = "../keystore" }
@@ -41,7 +41,7 @@ names = "0.11.0"
 structopt = "0.3.8"
 sc-tracing = { version = "3.0.0", path = "../tracing" }
 chrono = "0.4.10"
-serde = "1.0.111"
+serde = "1.0.121"
 thiserror = "1.0.21"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]

diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
@@ -22,7 +22,7 @@ sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.121", features = ["derive"] }
 sp-version = { version = "3.0.0", path = "../../../primitives/version" }
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
@@ -48,7 +48,7 @@ futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 log = "0.4.8"
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
-rand = "0.7.2"
+rand = "0.8.4"
 merlin = "2.0"
 pdqselect = "0.1.0"
 derive_more = "0.99.2"

diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
@@ -19,7 +19,7 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 sp-consensus-babe = { version = "0.9.0", path = "../../../../primitives/consensus/babe" }
-serde = { version = "1.0.104", features=["derive"] }
+serde = { version = "1.0.121", features=["derive"] }
 sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
 sc-consensus-epochs = { version = "0.9.0", path = "../../epochs" }

diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
@@ -42,9 +42,8 @@ use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
 use sc_client_api::{BlockchainEvents, backend::TransactionFor};
 use log::debug;
 use std::{time::Duration, cell::RefCell, task::Poll};
-use rand::RngCore;
 use rand_chacha::{
-	rand_core::SeedableRng,
+	rand_core::{SeedableRng,RngCore},
 	ChaChaRng,
 };
 use sc_keystore::LocalKeystore;

diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
@@ -21,7 +21,7 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
-rand = "0.7.2"
+rand = "0.8.4"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }

diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 jsonrpc-pubsub = "15.1.0"
 futures = { version = "0.3.4", features = ["compat"] }
-serde = { version = "1.0.105", features = ["derive"] }
+serde = { version = "1.0.121", features = ["derive"] }
 serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"