merge master and resolve bitvec upgrade fallout

* master:
  Upgrade codec to 2.0 and bitvec to 0.20 (companion) (#2343)
  Companion PR for #7951 (#2336)
  Companion PR for 7934 (#2348)

Author: Andronik Ordian

Cargo.lock

@@ -249,7 +249,7 @@ pub fn run() -> Result<()> {
 			})?)
 		},
 		Some(Subcommand::ValidationWorker(cmd)) => {
-			let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+			let mut builder = sc_cli::LoggerBuilder::new("");
 			builder.with_colors(false);
 			let _ = builder.init();
 

cli/src/command.rs

@@ -8,8 +8,8 @@ edition = "2018"
 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-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-util-mem = { version = "0.8.0", default-features = false, optional = true }
+parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
+parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
 
 [features]
 default = [ "std" ]

core-primitives/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 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" }
 trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.23"

erasure-coding/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2018"
 [dependencies]
 futures = "0.3.8"
 futures-timer = "3.0.2"
-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"] }
 tracing = "0.1.22"
 tracing-futures = "0.2.4"
-bitvec = "0.17.4"
+bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 merlin = "2.0"
 schnorrkel = "0.9.1"
 

node/core/approval-voting/Cargo.toml

@@ -96,7 +96,7 @@ impl ApprovalEntry {
 
 	/// Whether a validator is already assigned.
 	pub(crate) fn is_assigned(&self, validator_index: ValidatorIndex) -> bool {
-		*self.assignments.get(validator_index as usize).unwrap_or(&false)
+		self.assignments.get(validator_index as usize).map(|b| *b).unwrap_or(false)
 	}
 
 	/// Import an assignment. No-op if already assigned on the same tranche.
@@ -176,7 +176,7 @@ impl CandidateEntry {
 
 	/// Note that a given validator has approved. Return the previous approval state.
 	pub(crate) fn mark_approval(&mut self, validator: ValidatorIndex) -> bool {
-		let prev = *self.approvals.get(validator as usize).unwrap_or(&false);
+		let prev = self.approvals.get(validator as usize).map(|b| *b).unwrap_or(false);
 		self.approvals.set(validator as usize, true);
 		prev
 	}
@@ -202,7 +202,7 @@ impl CandidateEntry {
 		// The earliest-received assignment which has no corresponding approval
 		let next_no_show = approval_entry.tranches.iter()
 			.flat_map(|t| t.assignments.iter())
-			.filter(|(v, _)| *self.approvals.get(*v as usize).unwrap_or(&false))
+			.filter(|(v, _)| self.approvals.get(*v as usize).map(|b| *b).unwrap_or(false))
 			.map(|(_, tick)| tick + no_show_duration)
 			.min();
 

node/core/approval-voting/src/aux_schema/mod.rs

@@ -1271,7 +1271,7 @@ fn check_approval(
 			let approvals = candidate.approvals();
 
 			let n_assigned = assigned_mask.count_ones();
-			assigned_mask &= approvals.iter().cloned();
+			assigned_mask &= approvals.iter().by_val();
 			let n_approved = assigned_mask.count_ones();
 
 			// note: the process of computing `required` only chooses `exact` if
@@ -1355,7 +1355,7 @@ fn tranches_to_approve(
 			// after a fixed duration.
 			let no_shows = tranche.assignments.iter().filter(|(v_index, tick)| {
 				tick + no_show_duration >= tick_now
-					&& *approvals.get(*v_index as usize).unwrap_or(&true)
+					&& approvals.get(*v_index as usize).map(|b| *b).unwrap_or(true)
 			}).count();
 
 			*state = Some(match s {

node/core/approval-voting/src/lib.rs

@@ -7,14 +7,14 @@ edition = "2018"
 [dependencies]
 futures = "0.3.12"
 futures-timer = "3.0.2"
-kvdb = "0.8.0"
-kvdb-rocksdb = "0.10.0"
+kvdb = "0.9.0"
+kvdb-rocksdb = "0.11.0"
 thiserror = "1.0.23"
 tracing = "0.1.22"
 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" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 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"
 env_logger = "0.8.2"
 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" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }

node/core/av-store/Cargo.toml

@@ -133,16 +133,16 @@ impl Decode for BEBlockNumber {
 #[derive(Debug, Encode, Decode)]
 enum State {
 	/// Candidate data was first observed at the given time but is not available in any block.
-	#[codec(index = "0")]
+	#[codec(index = 0)]
 	Unavailable(BETimestamp),
 	/// 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
 	/// `State::Unavailable`, in which case the same timestamp will be reused. Blocks are sorted ascending first by block number and
 	/// then hash.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	Unfinalized(BETimestamp, Vec<(BEBlockNumber, Hash)>),
 	/// Candidate data has appeared in a finalized block and did so at the given time.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	Finalized(BETimestamp)
 }
 
@@ -967,7 +967,9 @@ fn process_message(
 		}
 		AvailabilityStoreMessage::QueryChunkAvailability(candidate, validator_index, tx) => {
 			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);
 		}
 		AvailabilityStoreMessage::StoreChunk {

node/core/av-store/src/lib.rs

@@ -13,7 +13,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
 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-futures = "0.2.4"
 thiserror = "1.0.23"