Upgrade codec to 2.0 and bitvec to 0.20 (companion) (#2343)

* upgrade codec and bitvec

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Guillaume Thiolliere
2021-01-29 14:35:45 +01:00
committed by GitHub
parent 6efeb1ee13
commit 29f12f3f48
44 changed files with 297 additions and 272 deletions
+196 -176
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -8,8 +8,8 @@ edition = "2018"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
parity-scale-codec = { version = "1.3.6", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
parity-util-mem = { version = "0.8.0", default-features = false, optional = true } parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
[features] [features]
default = [ "std" ] default = [ "std" ]
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
primitives = { package = "polkadot-primitives", path = "../primitives" } primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" } reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.23" thiserror = "1.0.23"
@@ -6,13 +6,13 @@ edition = "2018"
[dependencies] [dependencies]
futures = "0.3.8" futures = "0.3.8"
parity-scale-codec = { version = "1.3.5", default-features = false, features = ["bit-vec", "derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-overseer = { path = "../../overseer" } polkadot-overseer = { path = "../../overseer" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../../primitives" }
bitvec = "0.17.4" bitvec = "0.20.1"
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+5 -5
View File
@@ -7,14 +7,14 @@ edition = "2018"
[dependencies] [dependencies]
futures = "0.3.12" futures = "0.3.12"
futures-timer = "3.0.2" futures-timer = "3.0.2"
kvdb = "0.8.0" kvdb = "0.9.0"
kvdb-rocksdb = "0.10.0" kvdb-rocksdb = "0.11.0"
thiserror = "1.0.23" thiserror = "1.0.23"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
bitvec = "0.17.4" bitvec = "0.20.1"
parity-scale-codec = { version = "1.3.6", features = ["derive"] } parity-scale-codec = { version = "2.0.0", features = ["derive"] }
erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -27,7 +27,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
log = "0.4.13" log = "0.4.13"
env_logger = "0.8.2" env_logger = "0.8.2"
assert_matches = "1.4.0" assert_matches = "1.4.0"
kvdb-memorydb = "0.8.0" kvdb-memorydb = "0.9.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
+6 -4
View File
@@ -133,16 +133,16 @@ impl Decode for BEBlockNumber {
#[derive(Debug, Encode, Decode)] #[derive(Debug, Encode, Decode)]
enum State { enum State {
/// Candidate data was first observed at the given time but is not available in any block. /// Candidate data was first observed at the given time but is not available in any block.
#[codec(index = "0")] #[codec(index = 0)]
Unavailable(BETimestamp), Unavailable(BETimestamp),
/// The candidate was first observed at the given time and was included in the given list of unfinalized blocks, which may be /// The candidate was first observed at the given time and was included in the given list of unfinalized blocks, which may be
/// empty. The timestamp here is not used for pruning. Either one of these blocks will be finalized or the state will regress to /// empty. The timestamp here is not used for pruning. Either one of these blocks will be finalized or the state will regress to
/// `State::Unavailable`, in which case the same timestamp will be reused. Blocks are sorted ascending first by block number and /// `State::Unavailable`, in which case the same timestamp will be reused. Blocks are sorted ascending first by block number and
/// then hash. /// then hash.
#[codec(index = "1")] #[codec(index = 1)]
Unfinalized(BETimestamp, Vec<(BEBlockNumber, Hash)>), Unfinalized(BETimestamp, Vec<(BEBlockNumber, Hash)>),
/// Candidate data has appeared in a finalized block and did so at the given time. /// Candidate data has appeared in a finalized block and did so at the given time.
#[codec(index = "2")] #[codec(index = 2)]
Finalized(BETimestamp) Finalized(BETimestamp)
} }
@@ -967,7 +967,9 @@ fn process_message(
} }
AvailabilityStoreMessage::QueryChunkAvailability(candidate, validator_index, tx) => { AvailabilityStoreMessage::QueryChunkAvailability(candidate, validator_index, tx) => {
let a = load_meta(&subsystem.db, &candidate)? let a = load_meta(&subsystem.db, &candidate)?
.map_or(false, |m| *m.chunks_stored.get(validator_index as usize).unwrap_or(&false)); .map_or(false, |m|
*m.chunks_stored.get(validator_index as usize).as_deref().unwrap_or(&false)
);
let _ = tx.send(a); let _ = tx.send(a);
} }
AvailabilityStoreMessage::StoreChunk { AvailabilityStoreMessage::StoreChunk {
+1 -1
View File
@@ -13,7 +13,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" } statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
thiserror = "1.0.23" thiserror = "1.0.23"
+4 -1
View File
@@ -1794,7 +1794,10 @@ mod tests {
assert!(candidates[0].validity_votes.contains( assert!(candidates[0].validity_votes.contains(
&ValidityAttestation::Explicit(signed_c.signature().clone()) &ValidityAttestation::Explicit(signed_c.signature().clone())
)); ));
assert_eq!(candidates[0].validator_indices, bitvec::bitvec![Lsb0, u8; 1, 0, 1, 1]); assert_eq!(
candidates[0].validator_indices,
bitvec::bitvec![bitvec::order::Lsb0, u8; 1, 0, 1, 1],
);
virtual_overseer.send(FromOverseer::Signal( virtual_overseer.send(FromOverseer::Signal(
OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::stop_work(test_state.relay_parent))) OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::stop_work(test_state.relay_parent)))
@@ -10,7 +10,7 @@ tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["bit-vec", "derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-parachain = { path = "../../../parachain" } polkadot-parachain = { path = "../../../parachain" }
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
futures = "0.3.12" futures = "0.3.12"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
+1 -1
View File
@@ -367,7 +367,7 @@ fn select_availability_bitfields(
for (idx, _) in cores.iter().enumerate().filter(|v| !v.1.is_occupied()) { for (idx, _) in cores.iter().enumerate().filter(|v| !v.1.is_occupied()) {
// Bit is set for an unoccupied core - invalid // Bit is set for an unoccupied core - invalid
if *bitfield.payload().0.get(idx).unwrap_or(&false) { if *bitfield.payload().0.get(idx).as_deref().unwrap_or(&false) {
continue 'a continue 'a
} }
} }
+1 -1
View File
@@ -9,7 +9,7 @@ futures = "0.3.12"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
memory-lru = "0.1.0" memory-lru = "0.1.0"
parity-util-mem = { version = "0.8.0", default-features = false } parity-util-mem = { version = "0.9.0", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -8,7 +8,7 @@ edition = "2018"
futures = "0.3.12" futures = "0.3.12"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
parity-scale-codec = { version = "1.3.6", features = ["std"] } parity-scale-codec = { version = "2.0.0", features = ["std"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-erasure-coding = { path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -8,7 +8,7 @@ edition = "2018"
futures = "0.3.12" futures = "0.3.12"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -16,7 +16,7 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
[dev-dependencies] [dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+1 -1
View File
@@ -10,7 +10,7 @@ futures = "0.3.12"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
+2 -2
View File
@@ -82,10 +82,10 @@ const LOG_TARGET: &'static str = "network_bridge";
#[derive(Debug, Encode, Decode, Clone)] #[derive(Debug, Encode, Decode, Clone)]
pub enum WireMessage<M> { pub enum WireMessage<M> {
/// A message from a peer on a specific protocol. /// A message from a peer on a specific protocol.
#[codec(index = "1")] #[codec(index = 1)]
ProtocolMessage(M), ProtocolMessage(M),
/// A view update from a peer. /// A view update from a peer.
#[codec(index = "2")] #[codec(index = 2)]
ViewUpdate(View), ViewUpdate(View),
} }
+1 -1
View File
@@ -9,7 +9,7 @@ description = "Primitives types for the Node-side"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-jaeger = { path = "../../jaeger" } polkadot-node-jaeger = { path = "../../jaeger" }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
strum = { version = "0.20", features = ["derive"] } strum = { version = "0.20", features = ["derive"] }
thiserror = "1.0.23" thiserror = "1.0.23"
+18 -18
View File
@@ -296,7 +296,7 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum AvailabilityDistributionMessage { pub enum AvailabilityDistributionMessage {
/// An erasure chunk for a given candidate hash. /// An erasure chunk for a given candidate hash.
#[codec(index = "0")] #[codec(index = 0)]
Chunk(CandidateHash, ErasureChunk), Chunk(CandidateHash, ErasureChunk),
} }
@@ -314,7 +314,7 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum BitfieldDistributionMessage { pub enum BitfieldDistributionMessage {
/// A signed availability bitfield for a given relay-parent hash. /// A signed availability bitfield for a given relay-parent hash.
#[codec(index = "0")] #[codec(index = 0)]
Bitfield(Hash, SignedAvailabilityBitfield), Bitfield(Hash, SignedAvailabilityBitfield),
} }
@@ -323,11 +323,11 @@ pub mod v1 {
pub enum PoVDistributionMessage { pub enum PoVDistributionMessage {
/// Notification that we are awaiting the given PoVs (by hash) against a /// Notification that we are awaiting the given PoVs (by hash) against a
/// specific relay-parent hash. /// specific relay-parent hash.
#[codec(index = "0")] #[codec(index = 0)]
Awaiting(Hash, Vec<Hash>), Awaiting(Hash, Vec<Hash>),
/// Notification of an awaited PoV, in a given relay-parent context. /// Notification of an awaited PoV, in a given relay-parent context.
/// (relay_parent, pov_hash, compressed_pov) /// (relay_parent, pov_hash, compressed_pov)
#[codec(index = "1")] #[codec(index = 1)]
SendPoV(Hash, Hash, CompressedPoV), SendPoV(Hash, Hash, CompressedPoV),
} }
@@ -335,7 +335,7 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum StatementDistributionMessage { pub enum StatementDistributionMessage {
/// A signed full statement under a given relay-parent. /// A signed full statement under a given relay-parent.
#[codec(index = "0")] #[codec(index = 0)]
Statement(Hash, SignedFullStatement) Statement(Hash, SignedFullStatement)
} }
@@ -345,10 +345,10 @@ pub mod v1 {
/// Assignments for candidates in recent, unfinalized blocks. /// Assignments for candidates in recent, unfinalized blocks.
/// ///
/// Actually checking the assignment may yield a different result. /// Actually checking the assignment may yield a different result.
#[codec(index = "0")] #[codec(index = 0)]
Assignments(Vec<(IndirectAssignmentCert, CandidateIndex)>), Assignments(Vec<(IndirectAssignmentCert, CandidateIndex)>),
/// Approvals for candidates in some recent, unfinalized block. /// Approvals for candidates in some recent, unfinalized block.
#[codec(index = "1")] #[codec(index = 1)]
Approvals(Vec<IndirectSignedApprovalVote>), Approvals(Vec<IndirectSignedApprovalVote>),
} }
@@ -417,17 +417,17 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum CollatorProtocolMessage { pub enum CollatorProtocolMessage {
/// Declare the intent to advertise collations under a collator ID. /// Declare the intent to advertise collations under a collator ID.
#[codec(index = "0")] #[codec(index = 0)]
Declare(CollatorId), Declare(CollatorId),
/// Advertise a collation to a validator. Can only be sent once the peer has declared /// Advertise a collation to a validator. Can only be sent once the peer has declared
/// that they are a collator with given ID. /// that they are a collator with given ID.
#[codec(index = "1")] #[codec(index = 1)]
AdvertiseCollation(Hash, ParaId), AdvertiseCollation(Hash, ParaId),
/// Request the advertised collation at that relay-parent. /// Request the advertised collation at that relay-parent.
#[codec(index = "2")] #[codec(index = 2)]
RequestCollation(RequestId, Hash, ParaId), RequestCollation(RequestId, Hash, ParaId),
/// A requested collation. /// A requested collation.
#[codec(index = "3")] #[codec(index = 3)]
Collation(RequestId, CandidateReceipt, CompressedPoV), Collation(RequestId, CandidateReceipt, CompressedPoV),
} }
@@ -435,22 +435,22 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum ValidationProtocol { pub enum ValidationProtocol {
/// Availability distribution messages /// Availability distribution messages
#[codec(index = "0")] #[codec(index = 0)]
AvailabilityDistribution(AvailabilityDistributionMessage), AvailabilityDistribution(AvailabilityDistributionMessage),
/// Bitfield distribution messages /// Bitfield distribution messages
#[codec(index = "1")] #[codec(index = 1)]
BitfieldDistribution(BitfieldDistributionMessage), BitfieldDistribution(BitfieldDistributionMessage),
/// PoV Distribution messages /// PoV Distribution messages
#[codec(index = "2")] #[codec(index = 2)]
PoVDistribution(PoVDistributionMessage), PoVDistribution(PoVDistributionMessage),
/// Statement distribution messages /// Statement distribution messages
#[codec(index = "3")] #[codec(index = 3)]
StatementDistribution(StatementDistributionMessage), StatementDistribution(StatementDistributionMessage),
/// Availability recovery messages /// Availability recovery messages
#[codec(index = "4")] #[codec(index = 4)]
AvailabilityRecovery(AvailabilityRecoveryMessage), AvailabilityRecovery(AvailabilityRecoveryMessage),
/// Approval distribution messages /// Approval distribution messages
#[codec(index = "5")] #[codec(index = 5)]
ApprovalDistribution(ApprovalDistributionMessage), ApprovalDistribution(ApprovalDistributionMessage),
} }
@@ -464,7 +464,7 @@ pub mod v1 {
#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)] #[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
pub enum CollationProtocol { pub enum CollationProtocol {
/// Collator protocol messages /// Collator protocol messages
#[codec(index = "0")] #[codec(index = 0)]
CollatorProtocol(CollatorProtocolMessage), CollatorProtocol(CollatorProtocolMessage),
} }
+1 -1
View File
@@ -9,7 +9,7 @@ description = "Primitives types for the Node-side"
futures = "0.3.12" futures = "0.3.12"
polkadot-primitives = { path = "../../primitives" } polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" } polkadot-statement-table = { path = "../../statement-table" }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" }
+3 -3
View File
@@ -44,13 +44,13 @@ pub mod approval;
#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)] #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
pub enum Statement { pub enum Statement {
/// A statement that a validator seconds a candidate. /// A statement that a validator seconds a candidate.
#[codec(index = "1")] #[codec(index = 1)]
Seconded(CommittedCandidateReceipt), Seconded(CommittedCandidateReceipt),
/// A statement that a validator has deemed a candidate valid. /// A statement that a validator has deemed a candidate valid.
#[codec(index = "2")] #[codec(index = 2)]
Valid(CandidateHash), Valid(CandidateHash),
/// A statement that a validator has deemed a candidate invalid. /// A statement that a validator has deemed a candidate invalid.
#[codec(index = "3")] #[codec(index = 3)]
Invalid(CandidateHash), Invalid(CandidateHash),
} }
@@ -11,7 +11,7 @@ futures = "0.3.12"
futures-timer = "3.0.2" futures-timer = "3.0.2"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
parking_lot = "0.11.1" parking_lot = "0.11.1"
pin-project = "1.0.4" pin-project = "1.0.4"
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
+1 -1
View File
@@ -9,7 +9,7 @@ description = "Subsystem traits and message definitions"
async-trait = "0.1.42" async-trait = "0.1.42"
futures = "0.3.12" futures = "0.3.12"
futures-timer = "3.0.2" futures-timer = "3.0.2"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
parking_lot = { version = "0.11.1", optional = true } parking_lot = { version = "0.11.1", optional = true }
pin-project = "1.0.4" pin-project = "1.0.4"
streamunordered = "0.5.1" streamunordered = "0.5.1"
+1 -1
View File
@@ -15,7 +15,7 @@ mick-jaeger = "0.1.2"
lazy_static = "1.4" lazy_static = "1.4"
tracing = "0.1.22" tracing = "0.1.22"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
parking_lot = "0.11.1" parking_lot = "0.11.1"
pin-project = "1.0.4" pin-project = "1.0.4"
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
# Polkadot dependencies # Polkadot dependencies
polkadot-test-runtime = { path = "../../../runtime/test-runtime" } polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
+2 -2
View File
@@ -9,8 +9,8 @@ edition = "2018"
# note: special care is taken to avoid inclusion of `sp-io` externals when compiling # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
# this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
# various unnecessary Substrate-specific endpoints. # various unnecessary Substrate-specific endpoints.
parity-scale-codec = { version = "1.3.6", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
parity-util-mem = { version = "0.8.0", optional = true } parity-util-mem = { version = "0.9.0", optional = true }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
tiny-keccak = "2.0.2" tiny-keccak = "2.0.2"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
parachain = { package = "polkadot-parachain", path = ".." } parachain = { package = "polkadot-parachain", path = ".." }
adder = { package = "test-parachain-adder", path = "adder" } adder = { package = "test-parachain-adder", path = "adder" }
@@ -8,7 +8,7 @@ build = "build.rs"
[dependencies] [dependencies]
parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
tiny-keccak = { version = "2.0.2", features = ["keccak"] } tiny-keccak = { version = "2.0.2", features = ["keccak"] }
dlmalloc = { version = "0.2.1", features = [ "global" ] } dlmalloc = { version = "0.2.1", features = [ "global" ] }
@@ -10,7 +10,7 @@ name = "adder-collator"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
futures = "0.3.12" futures = "0.3.12"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.13" log = "0.4.13"
+3 -3
View File
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
serde = { version = "1.0.123", optional = true, features = ["derive"] } serde = { version = "1.0.123", optional = true, features = ["derive"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["bit-vec", "derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -22,10 +22,10 @@ runtime_primitives = { package = "sp-runtime", git = "https://github.com/parityt
polkadot-parachain = { path = "../parachain", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false }
polkadot-core-primitives = { path = "../core-primitives", default-features = false } polkadot-core-primitives = { path = "../core-primitives", default-features = false }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
hex-literal = "0.3.1" hex-literal = "0.3.1"
parity-util-mem = { version = "0.8.0", default-features = false, optional = true } parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
[dev-dependencies] [dev-dependencies]
sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
+5 -5
View File
@@ -674,13 +674,13 @@ pub struct ErasureChunk {
#[cfg_attr(feature = "std", derive(Debug, Hash))] #[cfg_attr(feature = "std", derive(Debug, Hash))]
pub enum CompactStatement { pub enum CompactStatement {
/// Proposal of a parachain candidate. /// Proposal of a parachain candidate.
#[codec(index = "1")] #[codec(index = 1)]
Candidate(CandidateHash), Candidate(CandidateHash),
/// State that a parachain candidate is valid. /// State that a parachain candidate is valid.
#[codec(index = "2")] #[codec(index = 2)]
Valid(CandidateHash), Valid(CandidateHash),
/// State that a parachain candidate is invalid. /// State that a parachain candidate is invalid.
#[codec(index = "3")] #[codec(index = 3)]
Invalid(CandidateHash), Invalid(CandidateHash),
} }
@@ -705,11 +705,11 @@ pub type SignedStatement = Signed<CompactStatement>;
pub enum ValidityAttestation { pub enum ValidityAttestation {
/// Implicit validity attestation by issuing. /// Implicit validity attestation by issuing.
/// This corresponds to issuance of a `Candidate` statement. /// This corresponds to issuance of a `Candidate` statement.
#[codec(index = "1")] #[codec(index = 1)]
Implicit(ValidatorSignature), Implicit(ValidatorSignature),
/// An explicit attestation. This corresponds to issuance of a /// An explicit attestation. This corresponds to issuance of a
/// `Valid` statement. /// `Valid` statement.
#[codec(index = "2")] #[codec(index = 2)]
Explicit(ValidatorSignature), Explicit(ValidatorSignature),
} }
+9 -9
View File
@@ -677,18 +677,18 @@ pub struct ScheduledCore {
#[cfg_attr(feature = "std", derive(Debug, PartialEq, MallocSizeOf))] #[cfg_attr(feature = "std", derive(Debug, PartialEq, MallocSizeOf))]
pub enum CoreState<H = Hash, N = BlockNumber> { pub enum CoreState<H = Hash, N = BlockNumber> {
/// The core is currently occupied. /// The core is currently occupied.
#[codec(index = "0")] #[codec(index = 0)]
Occupied(OccupiedCore<H, N>), Occupied(OccupiedCore<H, N>),
/// The core is currently free, with a para scheduled and given the opportunity /// The core is currently free, with a para scheduled and given the opportunity
/// to occupy. /// to occupy.
/// ///
/// If a particular Collator is required to author this block, that is also present in this /// If a particular Collator is required to author this block, that is also present in this
/// variant. /// variant.
#[codec(index = "1")] #[codec(index = 1)]
Scheduled(ScheduledCore), Scheduled(ScheduledCore),
/// The core is currently free and there is nothing scheduled. This can be the case for parathread /// The core is currently free and there is nothing scheduled. This can be the case for parathread
/// cores when there are no parathread blocks queued. Parachain cores will never be left idle. /// cores when there are no parathread blocks queued. Parachain cores will never be left idle.
#[codec(index = "2")] #[codec(index = 2)]
Free, Free,
} }
@@ -713,13 +713,13 @@ impl<N> CoreState<N> {
#[cfg_attr(feature = "std", derive(PartialEq, Eq, Hash, Debug))] #[cfg_attr(feature = "std", derive(PartialEq, Eq, Hash, Debug))]
pub enum OccupiedCoreAssumption { pub enum OccupiedCoreAssumption {
/// The candidate occupying the core was made available and included to free the core. /// The candidate occupying the core was made available and included to free the core.
#[codec(index = "0")] #[codec(index = 0)]
Included, Included,
/// The candidate occupying the core timed out and freed the core without advancing the para. /// The candidate occupying the core timed out and freed the core without advancing the para.
#[codec(index = "1")] #[codec(index = 1)]
TimedOut, TimedOut,
/// The core was not occupied to begin with. /// The core was not occupied to begin with.
#[codec(index = "2")] #[codec(index = 2)]
Free, Free,
} }
@@ -728,13 +728,13 @@ pub enum OccupiedCoreAssumption {
#[cfg_attr(feature = "std", derive(PartialEq, Debug, MallocSizeOf))] #[cfg_attr(feature = "std", derive(PartialEq, Debug, MallocSizeOf))]
pub enum CandidateEvent<H = Hash> { pub enum CandidateEvent<H = Hash> {
/// This candidate receipt was backed in the most recent block. /// This candidate receipt was backed in the most recent block.
#[codec(index = "0")] #[codec(index = 0)]
CandidateBacked(CandidateReceipt<H>, HeadData), CandidateBacked(CandidateReceipt<H>, HeadData),
/// This candidate receipt was included and became a parablock at the most recent block. /// This candidate receipt was included and became a parablock at the most recent block.
#[codec(index = "1")] #[codec(index = 1)]
CandidateIncluded(CandidateReceipt<H>, HeadData), CandidateIncluded(CandidateReceipt<H>, HeadData),
/// This candidate receipt was not made available in time and timed out. /// This candidate receipt was not made available in time and timed out.
#[codec(index = "2")] #[codec(index = 2)]
CandidateTimedOut(CandidateReceipt<H>, HeadData), CandidateTimedOut(CandidateReceipt<H>, HeadData),
} }
+1 -1
View File
@@ -26,5 +26,5 @@ sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch =
txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
parity-scale-codec = { version = "1.3.6", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+2 -2
View File
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.13", optional = true } log = { version = "0.4.13", optional = true }
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
+2 -2
View File
@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.13", optional = true } log = { version = "0.4.13", optional = true }
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
+2 -2
View File
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = "0.4.13" log = "0.4.13"
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", features = [ "derive" ], optional = true } serde = { version = "1.0.123", features = [ "derive" ], optional = true }
+2 -2
View File
@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.13", optional = true } log = { version = "0.4.13", optional = true }
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
+1 -1
View File
@@ -6,7 +6,7 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
serde_derive = { version = "1.0.117", optional = true } serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.6.1" smallvec = "1.6.1"
+2 -2
View File
@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.13", optional = true } log = { version = "0.4.13", optional = true }
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
+2 -2
View File
@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.13", optional = true } log = { version = "0.4.13", optional = true }
rustc-hex = { version = "2.1.0", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.123", default-features = false } serde = { version = "1.0.123", default-features = false }
+1 -1
View File
@@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
primitives = { package = "polkadot-primitives", path = "../primitives" } primitives = { package = "polkadot-primitives", path = "../primitives" }
+3 -3
View File
@@ -65,13 +65,13 @@ pub enum Statement<Candidate, Digest> {
/// Broadcast by an authority to indicate that this is its candidate for inclusion. /// Broadcast by an authority to indicate that this is its candidate for inclusion.
/// ///
/// Broadcasting two different candidate messages per round is not allowed. /// Broadcasting two different candidate messages per round is not allowed.
#[codec(index = "1")] #[codec(index = 1)]
Candidate(Candidate), Candidate(Candidate),
/// Broadcast by a authority to attest that the candidate with given digest is valid. /// Broadcast by a authority to attest that the candidate with given digest is valid.
#[codec(index = "2")] #[codec(index = 2)]
Valid(Digest), Valid(Digest),
/// Broadcast by a authority to attest that the candidate with given digest is invalid. /// Broadcast by a authority to attest that the candidate with given digest is invalid.
#[codec(index = "3")] #[codec(index = 3)]
Invalid(Digest), Invalid(Digest),
} }
+1 -1
View File
@@ -6,7 +6,7 @@ description = "The basic XCM datastructures."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
[features] [features]
default = ["std"] default = ["std"]
+1 -1
View File
@@ -6,7 +6,7 @@ description = "Tools & types for building with XCM and its executor."
version = "0.8.22" version = "0.8.22"
[dependencies] [dependencies]
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
xcm = { path = "..", default-features = false } xcm = { path = "..", default-features = false }
xcm-executor = { path = "../xcm-executor", default-features = false } xcm-executor = { path = "../xcm-executor", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+1 -1
View File
@@ -7,7 +7,7 @@ version = "0.8.22"
[dependencies] [dependencies]
impl-trait-for-tuples = "0.2.0" impl-trait-for-tuples = "0.2.0"
parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
xcm = { path = "..", default-features = false } xcm = { path = "..", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }