Merge branch 'master' into update-some-deps

paritytech · Nov 9, 2022 · 216f1f9 · 216f1f9
2 parents de8f2d1 + 846e6ea
commit 216f1f9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -254,7 +254,6 @@ members = [
 # This list is ordered alphabetically.
 [profile.dev.package]
 blake2 = { opt-level = 3 }
-blake2-rfc = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
 chacha20poly1305 = { opt-level = 3 }
 cranelift-codegen = { opt-level = 3 }

diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
@@ -38,7 +38,7 @@ fs_extra = "1"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.12.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.3" }
+parity-db = "0.4.2"
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.21", features = ["thread-pool"] }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
@@ -22,7 +22,7 @@ kvdb-memorydb = "0.12.0"
 kvdb-rocksdb = { version = "0.16.0", optional = true }
 linked-hash-map = "0.5.4"
 log = "0.4.17"
-parity-db = "0.3.16"
+parity-db = "0.4.2"
 parking_lot = "0.12.1"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-state-db = { version = "0.10.0-dev", path = "../state-db" }

diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
@@ -656,7 +656,7 @@ where
 
 		// Ensure parent chain is finalized to maintain invariant that finality is called
 		// sequentially.
-		if finalized && parent_exists {
+		if finalized && parent_exists && info.finalized_hash != parent_hash {
 			self.apply_finality_with_block_hash(
 				operation,
 				parent_hash,

diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
@@ -277,15 +277,15 @@ pub mod pallet {
 		/// Dispatched some task.
 		Dispatched {
 			task: TaskAddress<T::BlockNumber>,
-			id: Option<[u8; 32]>,
+			id: Option<TaskName>,
 			result: DispatchResult,
 		},
 		/// The call for the provided hash was not found so the task has been aborted.
-		CallUnavailable { task: TaskAddress<T::BlockNumber>, id: Option<[u8; 32]> },
+		CallUnavailable { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
 		/// The given task was unable to be renewed since the agenda is full at that block.
-		PeriodicFailed { task: TaskAddress<T::BlockNumber>, id: Option<[u8; 32]> },
+		PeriodicFailed { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
 		/// The given task can never be executed since it is overweight.
-		PermanentlyOverweight { task: TaskAddress<T::BlockNumber>, id: Option<[u8; 32]> },
+		PermanentlyOverweight { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
 	}
 
 	#[pallet::error]