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

Commit f3cd1fc

Browse files
rphmeierrphmeier
committed
update to substrate master
1 parent 6d48897 commit f3cd1fc

17 files changed

Lines changed: 931 additions & 862 deletions

File tree

‎Cargo.lock‎

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

‎availability-store/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parking_lot = "0.4"
1010
log = "0.3"
1111
parity-codec = "3.0"
1212
parity-codec-derive = "3.0"
13-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
13+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
1414
kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1515
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1616
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }

‎cli/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ log = "0.3"
99
tokio = "0.1.7"
1010
futures = "0.1.17"
1111
exit-future = "0.1"
12-
substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
12+
substrate-cli = { git = "https://github.com/paritytech/substrate" }
1313
polkadot-service = { path = "../service" }

‎collator/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ description = "Collator node implementation"
66

77
[dependencies]
88
futures = "0.1.17"
9-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
9+
substrate-client = { git = "https://github.com/paritytech/substrate" }
1010
parity-codec = "2.1"
11-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
11+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
1212
polkadot-runtime = { path = "../runtime", version = "0.1" }
1313
polkadot-primitives = { path = "../primitives", version = "0.1" }
1414
polkadot-cli = { path = "../cli" }

‎consensus/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ tokio = "0.1.7"
1010
error-chain = "0.12"
1111
log = "0.3"
1212
exit-future = "0.1"
13-
parity-codec = "3.0"
13+
parity-codec = "3.1"
1414
polkadot-availability-store = { path = "../availability-store" }
1515
polkadot-parachain = { path = "../parachain" }
1616
polkadot-primitives = { path = "../primitives" }
1717
polkadot-runtime = { path = "../runtime" }
1818
polkadot-statement-table = { path = "../statement-table" }
19-
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
20-
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
21-
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
22-
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
23-
substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
24-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
25-
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
26-
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
27-
srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
28-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
29-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
19+
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate" }
20+
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate" }
21+
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate" }
22+
substrate-inherents = { git = "https://github.com/paritytech/substrate" }
23+
substrate-consensus-common = { git = "https://github.com/paritytech/substrate" }
24+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
25+
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate" }
26+
srml-aura = { git = "https://github.com/paritytech/substrate" }
27+
srml-support = { git = "https://github.com/paritytech/substrate" }
28+
substrate-client = { git = "https://github.com/paritytech/substrate" }
29+
sr-primitives = { git = "https://github.com/paritytech/substrate" }
3030

3131
[dev-dependencies]
32-
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
32+
substrate-keyring = { git = "https://github.com/paritytech/substrate" }

‎executor/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot node implementation in Rust."
66

77
[dependencies]
8-
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
9-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
8+
substrate-executor = { git = "https://github.com/paritytech/substrate" }
9+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
1010
polkadot-runtime = { path = "../runtime" }

‎network/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ polkadot-consensus = { path = "../consensus" }
1212
polkadot-primitives = { path = "../primitives" }
1313
parity-codec = "3.0"
1414
parity-codec-derive = "3.0"
15-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
16-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
17-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
15+
substrate-network = { git = "https://github.com/paritytech/substrate" }
16+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
17+
sr-primitives = { git = "https://github.com/paritytech/substrate" }
1818
futures = "0.1"
1919
tokio = "0.1.7"
2020
log = "0.4"

‎primitives/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ serde = { version = "1.0", default-features = false }
88
serde_derive = { version = "1.0", optional = true }
99
parity-codec = { version = "3.0", default-features = false }
1010
parity-codec-derive = { version = "3.0", default-features = false}
11-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
12-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
13-
sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
14-
sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
15-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
11+
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
12+
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false }
13+
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false }
14+
sr-std = { git = "https://github.com/paritytech/substrate", default-features = false }
15+
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
1616

1717
[dev-dependencies]
18-
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
18+
substrate-serializer = { git = "https://github.com/paritytech/substrate" }
1919
pretty_assertions = "0.4"
2020

2121
[features]

‎runtime/Cargo.toml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,36 @@ safe-mix = { version = "1.0", default-features = false}
1313
polkadot-primitives = { path = "../primitives", default-features = false }
1414
parity-codec = "3.0"
1515
parity-codec-derive = "3.0"
16-
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
17-
sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
18-
sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
19-
srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
20-
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
21-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
22-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
23-
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
24-
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
25-
srml-balances = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
26-
srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
27-
srml-council = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
28-
srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
29-
srml-executive = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
30-
srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
31-
srml-indices = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
32-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
33-
srml-session = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
34-
srml-staking = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
35-
srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
36-
srml-system = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
37-
srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
38-
srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
39-
srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
40-
sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
16+
substrate-serializer = { git = "https://github.com/paritytech/substrate" }
17+
sr-std = { git = "https://github.com/paritytech/substrate" }
18+
sr-io = { git = "https://github.com/paritytech/substrate" }
19+
srml-support = { git = "https://github.com/paritytech/substrate" }
20+
substrate-inherents = { git = "https://github.com/paritytech/substrate" }
21+
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
22+
substrate-client = { git = "https://github.com/paritytech/substrate" }
23+
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
24+
srml-aura = { git = "https://github.com/paritytech/substrate" }
25+
srml-balances = { git = "https://github.com/paritytech/substrate" }
26+
srml-consensus = { git = "https://github.com/paritytech/substrate" }
27+
srml-council = { git = "https://github.com/paritytech/substrate" }
28+
srml-democracy = { git = "https://github.com/paritytech/substrate" }
29+
srml-executive = { git = "https://github.com/paritytech/substrate" }
30+
srml-fees = { git = "https://github.com/paritytech/substrate" }
31+
srml-grandpa = { git = "https://github.com/paritytech/substrate" }
32+
srml-indices = { git = "https://github.com/paritytech/substrate" }
33+
sr-primitives = { git = "https://github.com/paritytech/substrate" }
34+
srml-session = { git = "https://github.com/paritytech/substrate" }
35+
srml-staking = { git = "https://github.com/paritytech/substrate" }
36+
srml-sudo = { git = "https://github.com/paritytech/substrate" }
37+
srml-system = { git = "https://github.com/paritytech/substrate" }
38+
srml-timestamp = { git = "https://github.com/paritytech/substrate" }
39+
srml-treasury = { git = "https://github.com/paritytech/substrate" }
40+
srml-upgrade-key = { git = "https://github.com/paritytech/substrate" }
41+
sr-version = { git = "https://github.com/paritytech/substrate" }
4142

4243
[dev-dependencies]
4344
hex-literal = "0.1.0"
44-
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
45+
substrate-keyring = { git = "https://github.com/paritytech/substrate" }
4546

4647
[features]
4748
default = ["std"]

‎runtime/src/curated_grandpa.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ decl_module! {
3838
/// Changes the GRANDPA voter set.
3939
fn set_voters(origin, voters: Vec<(T::SessionKey, u64)>) {
4040
system::ensure_root(origin)?;
41-
grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero())?;
41+
grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None)?;
4242
}
4343

4444
fn on_finalise(block_number: T::BlockNumber) {
@@ -75,7 +75,7 @@ decl_module! {
7575
voters.swap(remaining - 1, voter_index);
7676
}
7777

78-
let _ = grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero());
78+
let _ = grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None);
7979
}
8080
}
8181
}

0 commit comments

Comments
 (0)