Improve TryDecodeEntireState output

substrate/frame/support/Cargo.toml

@@ -34,6 +34,7 @@ sp-weights = { path = "../../primitives/weights", default-features = false }
 sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false }
 sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false }
 tt-call = "1.0.8"
+hex = { default-features = false, version = "0.4.3", features = ["alloc"] }
 macro_magic = "0.5.0"
 frame-support-procedural = { path = "procedural", default-features = false }
 paste = "1.0"

substrate/frame/support/src/traits/try_runtime/decode_entire_state.rs

@@ -67,7 +67,7 @@ impl TryDecodeEntireStorage for Tuple {
 }
 
 /// A value could not be decoded.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct TryDecodeEntireStorageError {
 	/// The key of the undecodable value.
 	pub key: Vec<u8>,
@@ -81,9 +81,22 @@ impl core::fmt::Display for TryDecodeEntireStorageError {
 	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
 		write!(
 			f,
-			"Failed to decode storage item `{}::{}`",
+			"`{}::{}` key `{}` is undecodable",
 			&sp_std::str::from_utf8(&self.info.pallet_name).unwrap_or("<invalid>"),
 			&sp_std::str::from_utf8(&self.info.storage_name).unwrap_or("<invalid>"),
+			hex::encode(&self.key)
+		)
+	}
+}
+
+impl core::fmt::Debug for TryDecodeEntireStorageError {
+	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+		write!(
+			f,
+			"key: {} value: {} info: {:?}",
+			hex::encode(&self.key),
+			hex::encode(self.raw.clone().unwrap_or_default()),
+			self.info
 		)
 	}
 }
@@ -104,29 +117,38 @@ fn decode_storage_info<V: Decode>(
 		Some(bytes) => {
 			let len = bytes.len();
 			let _ = <V as DecodeAll>::decode_all(&mut bytes.as_ref()).map_err(|_| {
-				vec![TryDecodeEntireStorageError {
+				TryDecodeEntireStorageError {
 					key: key.to_vec(),
 					raw: Some(bytes.to_vec()),
 					info: info.clone(),
-				}]
+				}
 			})?;
 
-			Ok::<usize, Vec<_>>(len)
+			Ok::<usize, _>(len)
 		},
 	};
 
-	decoded += decode_key(&next_key)?;
+	let mut errors = vec![];
 	loop {
 		match sp_io::storage::next_key(&next_key) {
 			Some(key) if key.starts_with(&info.prefix) => {
-				decoded += decode_key(&key)?;
+				match decode_key(&key) {
+					Ok(bytes) => {
+						decoded += bytes;
+					},
+					Err(e) => errors.push(e),
+				}
 				next_key = key;
 			},
 			_ => break,
 		}
 	}
 
-	Ok(decoded)
+	if errors.is_empty() {
+		Ok(decoded)
+	} else {
+		Err(errors)
+	}
 }
 
 impl<Prefix, Value, QueryKind, OnEmpty> TryDecodeEntireStorage