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

Update parity-codec version #2855

Merged
gavofyork merged 12 commits into from
Jun 25, 2019
Merged

Update parity-codec version #2855

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4527f54
Update parity-codec version
stanislav-tkach Jun 12, 2019
8363848
Update grandpa, rhododendron and trie-bench
stanislav-tkach Jun 13, 2019
ccda962
Merge branch 'master' into stas-codec-4-0
stanislav-tkach Jun 13, 2019
37a0509
Use primitive-types from crates.io
stanislav-tkach Jun 13, 2019
c5d997c
Bump impl version
stanislav-tkach Jun 13, 2019
791b2d1
Merge branch 'master' into stas-codec-4-0
stanislav-tkach Jun 14, 2019
d8864ac
Fix trie-bench version
stanislav-tkach Jun 14, 2019
1849804
Merge branch 'master' into stas-codec-4-0
stanislav-tkach Jun 18, 2019
f6641e1
Fix lock files
stanislav-tkach Jun 18, 2019
7d585b2
Fix versions
stanislav-tkach Jun 18, 2019
16336c3
Merge branch 'master' into stas-codec-4-0
stanislav-tkach Jun 24, 2019
3806a5e
Update codec to 4.1
stanislav-tkach Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
302 changes: 198 additions & 104 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/basic-authorship/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
log = "0.4"
codec = { package = "parity-codec", version = "3.2" }
codec = { package = "parity-codec", version = "4.0" }
runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" }
client = { package = "substrate-client", path = "../../core/client" }
aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../core/consensus/aura/primitives" }
Expand Down
2 changes: 1 addition & 1 deletion core/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ trie = { package = "substrate-trie", path = "../trie", optional = true }
substrate-telemetry = { path = "../telemetry", optional = true }
hash-db = { version = "0.12.2", default-features = false }
kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
parity-codec = { version = "3.3", default-features = false, features = ["derive"] }
parity-codec = { version = "4.0", default-features = false, features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../primitives", default-features = false }
runtime-primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false }
runtime-version = { package = "sr-version", path = "../sr-version", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion core/client/db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ primitives = { package = "substrate-primitives", path = "../../primitives" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
client = { package = "substrate-client", path = "../../client" }
state-machine = { package = "substrate-state-machine", path = "../../state-machine" }
parity-codec = { version = "3.3", features = ["derive"] }
parity-codec = { version = "4.0", features = ["derive"] }
executor = { package = "substrate-executor", path = "../../executor" }
state_db = { package = "substrate-state-db", path = "../../state-db" }
trie = { package = "substrate-trie", path = "../../trie" }
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/aura/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Aura consensus algorithm for substrate"
edition = "2018"

[dependencies]
parity-codec = "3.4"
parity-codec = "4.0"
primitives = { package = "substrate-primitives", path = "../../primitives" }
runtime_support = { package = "srml-support", path = "../../../srml/support" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/authorities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Primitives for Aura consensus"
edition = "2018"

[dependencies]
parity-codec = { version = "3.3", default-features = false }
parity-codec = { version = "4.0", default-features = false }
substrate-client = { path = "../../client", default-features = false }
primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false }
runtime_support = { package = "srml-support", path = "../../../srml/support", default-features = false }
Expand Down
3 changes: 1 addition & 2 deletions core/consensus/babe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ description = "BABE consensus algorithm for substrate"
edition = "2018"

[dependencies]
parity-codec = "3.4.0"
parity-codec-derive = "3.3.0"
parity-codec = { version = "4.0", features = ["derive"] }
babe_primitives = { package = "substrate-consensus-babe-primitives", path = "primitives" }
primitives = { package = "substrate-primitives", path = "../../primitives" }
runtime_support = { package = "srml-support", path = "../../../srml/support" }
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/babe/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2018"
substrate-client = { path = "../../../client", default-features = false }
runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false }
slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true }
parity-codec = { version = "3.5.1", default-features = false }
parity-codec = { version = "4.0", default-features = false }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rstd = { package = "sr-std", path = "../../sr-std" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
tokio-timer = "0.2"
parity-codec = { version = "3.3", features = ["derive"] }
parity-codec = { version = "4.0", features = ["derive"] }
parking_lot = "0.8.0"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions core/consensus/rhd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
derive_more = "0.14.0"
futures = "0.1.17"
codec = { package = "parity-codec", version = "3.2", features = ["derive"] }
codec = { package = "parity-codec", version = "4.0", features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../../primitives" }
consensus = { package = "substrate-consensus-common", path = "../common" }
client = { package = "substrate-client", path = "../../client" }
Expand All @@ -22,7 +22,7 @@ runtime_io = { package = "sr-io", path = "../../sr-io" }
tokio = "0.1.7"
parking_lot = "0.8.0"
log = "0.4"
rhododendron = { version = "0.5.0", features = ["codec"] }
rhododendron = { version = "0.6.0", features = ["codec"], git = "https://github.com/paritytech/rhododendron", branch = "stas-codec-4-0" }
exit-future = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/slots/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Generic slots-based utilities for consensus"
edition = "2018"

[dependencies]
codec = { package = "parity-codec", version = "3.2" }
codec = { package = "parity-codec", version = "4.0" }
client = { package = "substrate-client", path = "../../client" }
primitives = { package = "substrate-primitives", path = "../../primitives" }
runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
Expand Down
2 changes: 1 addition & 1 deletion core/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
derive_more = "0.14.0"
parity-codec = "3.3"
parity-codec = "4.0"
runtime_io = { package = "sr-io", path = "../sr-io" }
primitives = { package = "substrate-primitives", path = "../primitives" }
trie = { package = "substrate-trie", path = "../trie" }
Expand Down
44 changes: 22 additions & 22 deletions core/executor/wasm/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/finality-grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ log = "0.4"
parking_lot = "0.8.0"
tokio = "0.1.7"
rand = "0.6"
parity-codec = { version = "3.3", features = ["derive"] }
parity-codec = { version = "4.0", features = ["derive"] }
runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" }
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" }
substrate-primitives = { path = "../primitives" }
Expand All @@ -23,7 +23,7 @@ network = { package = "substrate-network", path = "../network" }
service = { package = "substrate-service", path = "../service", optional = true }
srml-finality-tracker = { path = "../../srml/finality-tracker" }
fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "primitives" }
grandpa = { package = "finality-grandpa", version = "0.7.2", features = ["derive-codec"] }
grandpa = { package = "finality-grandpa", version = "0.8.0", features = ["derive-codec"], git = "https://github.com/paritytech/finality-grandpa", branch = "stas-codec-4-0" }

[dev-dependencies]
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common", features = ["test-helpers"] }
Expand Down
2 changes: 1 addition & 1 deletion core/finality-grandpa/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
client = { package = "substrate-client", path = "../../client", default-features = false }
substrate-primitives = { path = "../../primitives", default-features = false }
parity-codec = { version = "3.3", default-features = false, features = ["derive"] }
parity-codec = { version = "4.0", default-features = false, features = ["derive"] }
sr-primitives = { path = "../../sr-primitives", default-features = false }
rstd = { package = "sr-std", path = "../../sr-std", default-features = false }

Expand Down
6 changes: 3 additions & 3 deletions core/finality-grandpa/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use client::{
};
use grandpa::{
BlockNumberOps, Equivocation, Error as GrandpaError, round::State as RoundState,
voter, voter_set::VoterSet,
voter, voter_set::VoterSet, HistoricalVotes,
};
use runtime_primitives::generic::BlockId;
use runtime_primitives::traits::{
Expand Down Expand Up @@ -637,7 +637,7 @@ where
round: u64,
state: RoundState<Block::Hash, NumberFor<Block>>,
base: (Block::Hash, NumberFor<Block>),
votes: Vec<SignedMessage<Block>>,
votes: &HistoricalVotes<Block::Hash, NumberFor<Block>, Self::Signature, Self::Id>,
Comment thread
bkchr marked this conversation as resolved.
) -> Result<(), Self::Error> {
debug!(
target: "afg", "Voter {} completed round {} in set {}. Estimate = {:?}, Finalized in round = {:?}",
Expand All @@ -656,7 +656,7 @@ where
number: round,
state: state.clone(),
base,
votes,
votes: votes.seen().to_owned(),
}) {
let msg = "Voter completed round that is older than the last completed round.";
return Err(Error::Safety(msg.to_string()));
Expand Down
2 changes: 1 addition & 1 deletion core/inherents/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
parking_lot = { version = "0.8.0", optional = true }
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
parity-codec = { version = "3.3", default-features = false, features = ["derive"] }
parity-codec = { version = "4.0", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false }

[features]
Expand Down
2 changes: 1 addition & 1 deletion core/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ primitives = { package = "substrate-primitives", path = "../../core/primitives"
consensus = { package = "substrate-consensus-common", path = "../../core/consensus/common" }
client = { package = "substrate-client", path = "../../core/client" }
runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" }
parity-codec = { version = "3.3", features = ["derive"] }
parity-codec = { version = "4.0", features = ["derive"] }
peerset = { package = "substrate-peerset", path = "../../core/peerset" }
serde = { version = "1.0.70", features = ["derive"] }
serde_json = "1.0.24"
Expand Down
2 changes: 1 addition & 1 deletion core/offchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ consensus = { package = "substrate-consensus-common", path = "../../core/consens
futures = "0.1.25"
log = "0.4"
offchain-primitives = { package = "substrate-offchain-primitives", path = "./primitives" }
parity-codec = { version = "3.3", features = ["derive"] }
parity-codec = { version = "4.0", features = ["derive"] }
parking_lot = "0.8.0"
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" }
Expand Down
5 changes: 2 additions & 3 deletions core/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ edition = "2018"

[dependencies]
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
parity-codec = { version = "3.4.0", default-features = false, features = ["derive"] }
parity-codec = { version = "4.0", default-features = false, features = ["derive"] }
rustc-hex = { version = "2.0", default-features = false }
serde = { version = "1.0", optional = true, features = ["derive"] }
twox-hash = { version = "1.2.0", optional = true }
byteorder = { version = "1.3.1", default-features = false }
primitive-types = { version = "0.2.3", default-features = false, features = ["codec"] }
primitive-types = { version = "0.4.0", default-features = false, features = ["codec"] }
impl-serde = { version = "0.1", optional = true }
wasmi = { version = "0.4.3", optional = true }
hash-db = { version = "0.12", default-features = false }
Expand Down Expand Up @@ -48,7 +48,6 @@ std = [
"wasmi",
"primitive-types/std",
"primitive-types/serde",
"primitive-types/heapsize",
"primitive-types/byteorder",
"primitive-types/rustc-hex",
"primitive-types/libc",
Expand Down
2 changes: 1 addition & 1 deletion core/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jsonrpc-pubsub = "12.0.0"
jsonrpc-derive = "12.0.0"
log = "0.4"
parking_lot = "0.8.0"
parity-codec = "3.3"
parity-codec = "4.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
client = { package = "substrate-client", path = "../client" }
Expand Down
2 changes: 1 addition & 1 deletion core/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ consensus_common = { package = "substrate-consensus-common", path = "../../core/
network = { package = "substrate-network", path = "../../core/network" }
client = { package = "substrate-client", path = "../../core/client" }
client_db = { package = "substrate-client-db", path = "../../core/client/db", features = ["kvdb-rocksdb"] }
parity-codec = "3.3"
parity-codec = "4.0"
substrate-executor = { path = "../../core/executor" }
transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
rpc = { package = "substrate-rpc-servers", path = "../../core/rpc-servers" }
Expand Down
Loading