Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 7061e23

Browse files
joepetrowskijoepetrowski
committed
merge master
2 parents 60b48f0 + 17ef410 commit 7061e23

File tree

29 files changed

+509
-561
lines changed

29 files changed

+509
-561
lines changed

‎Cargo.lock‎

Lines changed: 423 additions & 526 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/cli/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

77
[dependencies]
8-
clap = { version = "3.2.6", features = ["derive", "deprecated"] }
8+
clap = { version = "3.2.13", features = ["derive", "deprecated"] }
99
codec = { package = "parity-scale-codec", version = "3.0.0" }
1010
url = "2.2.2"
1111

‎client/cli/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ pub fn generate_genesis_block<Block: BlockT>(
189189

190190
let extrinsics_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
191191
Vec::new(),
192-
sp_runtime::StateVersion::V0,
192+
genesis_state_version,
193193
);
194194

195195
Ok(Block::new(

‎client/collator/src/lib.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ pub async fn start_collator<Block, RA, BS, Spawner>(
359359
#[cfg(test)]
360360
mod tests {
361361
use super::*;
362+
use async_trait::async_trait;
362363
use cumulus_client_consensus_common::ParachainCandidate;
363364
use cumulus_test_client::{
364365
Client, ClientBlockImportExt, DefaultTestClientBuilderExt, InitBlockBuilder,
@@ -374,8 +375,10 @@ mod tests {
374375
use sp_state_machine::Backend;
375376

376377
struct AlwaysSupportsParachains;
378+
379+
#[async_trait]
377380
impl HeadSupportsParachains for AlwaysSupportsParachains {
378-
fn head_supports_parachains(&self, _head: &PHash) -> bool {
381+
async fn head_supports_parachains(&self, _head: &PHash) -> bool {
379382
true
380383
}
381384
}

‎client/consensus/common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
async-trait = "0.1.56"
1010
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
11-
dyn-clone = "1.0.6"
11+
dyn-clone = "1.0.8"
1212
futures = "0.3.21"
1313
tracing = "0.1.34"
1414

‎pallets/aura-ext/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "AURA consensus extension pallet for parachains"
88
[dependencies]
99
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
1010
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
11-
serde = { version = "1.0.137", optional = true, features = ["derive"] }
11+
serde = { version = "1.0.139", optional = true, features = ["derive"] }
1212

1313
# Substrate
1414
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

‎pallets/collator-selection/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ log = { version = "0.4.17", default-features = false }
1717
codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
1818
rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
1919
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
20-
serde = { version = "1.0.137", default-features = false }
20+
serde = { version = "1.0.139", default-features = false }
2121

2222
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
2323
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }

‎pallets/parachain-system/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environmental = { version = "1.1.2", default-features = false }
1111
impl-trait-for-tuples = "0.2.1"
1212
log = { version = "0.4.17", default-features = false }
1313
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
14-
serde = { version = "1.0.137", optional = true, features = ["derive"] }
14+
serde = { version = "1.0.139", optional = true, features = ["derive"] }
1515

1616
# Substrate
1717
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

‎pallets/xcm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version = "0.1.0"
77
[dependencies]
88
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
99
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
10-
serde = { version = "1.0.137", optional = true, features = ["derive"] }
10+
serde = { version = "1.0.139", optional = true, features = ["derive"] }
1111

1212
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
1313
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

‎parachain-template/node/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ edition = "2021"
1010
build = "build.rs"
1111

1212
[dependencies]
13-
clap = { version = "3.2.6", features = ["derive"] }
13+
clap = { version = "3.2.13", features = ["derive"] }
1414
derive_more = "0.99.2"
1515
log = "0.4.17"
1616
codec = { package = "parity-scale-codec", version = "3.0.0" }
17-
serde = { version = "1.0.137", features = ["derive"] }
17+
serde = { version = "1.0.139", features = ["derive"] }
1818
hex-literal = "0.3.4"
1919
jsonrpsee = { version = "0.14.0", features = ["server"] }
2020

0 commit comments

Comments
 (0)