fix: read a block's event metadata from its parent state

node/src/synthetic_logs/metadata_events.rs

@@ -259,12 +259,6 @@ pub struct Decoded {
 	pub trailing: usize,
 }
 
-impl Decoded {
-	pub fn is_complete(&self) -> bool {
-		self.dropped.is_empty() && self.trailing == 0 && self.records.len() == self.expected
-	}
-}
-
 /// The chain's event encoding at some block, paired with this node's, and the machinery to
 /// move records from one to the other.
 pub struct EventLayout {
@@ -879,6 +873,14 @@ mod tests {
 	/// hydration wormhole core bridge
 	const CORE_BRIDGE: [u8; 20] = hex_literal::hex!("3792a6d63c31941B2805181771795D9176fA82A1");
 
+	/// Nothing lost: every record the blob claims decoded, none dropped, no trailing bytes.
+	/// A test-local predicate rather than a method on `Decoded` — production code decides what
+	/// to do from the individual fields, so a method here would be dead code, and `-D warnings`
+	/// in the Makefile turns dead code into a build failure.
+	fn complete(d: &Decoded) -> bool {
+		d.dropped.is_empty() && d.trailing == 0 && d.records.len() == d.expected
+	}
+
 	fn layout_433() -> EventLayout {
 		EventLayout::new(CHAIN_METADATA_433).expect("the checked-in mainnet metadata must build a layout")
 	}
@@ -1177,7 +1179,7 @@ mod tests {
 		let layout = EventLayout::new(&encoded(chain)).expect("layout");
 		assert_eq!(layout.verdict(), Verdict::Divergent);
 		let decoded = layout.decode(&raw);
-		assert!(decoded.is_complete(), "dropped {:?}", decoded.dropped);
+		assert!(complete(&decoded), "dropped {:?}", decoded.dropped);
 		assert_eq!(decoded.records, vec![record]);
 	}
 
@@ -1208,7 +1210,7 @@ mod tests {
 
 		let layout = EventLayout::new(&encoded(chain)).expect("layout");
 		let decoded = layout.decode(&raw);
-		assert!(decoded.is_complete(), "dropped {:?}", decoded.dropped);
+		assert!(complete(&decoded), "dropped {:?}", decoded.dropped);
 		assert_eq!(
 			decoded.records,
 			vec![balances_record(BalancesEvent::Transfer { from, to, amount })]
@@ -1290,7 +1292,7 @@ mod tests {
 			&vec![0xaa; 512][..],
 		] {
 			let decoded = layout.decode(raw);
-			assert!(decoded.records.is_empty() || !decoded.is_complete());
+			assert!(decoded.records.is_empty() || !complete(&decoded));
 		}
 		// every truncation of a real blob.
 		for cut in (1..MAINNET_EVENTS_SEQ2.len()).step_by(37) {

node/src/synthetic_logs/storage_override.rs

@@ -36,7 +36,7 @@ use sc_client_api::{backend::Backend, BlockBackend, StorageProvider};
 use sp_api::{Metadata as MetadataApi, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::{hashing::twox_128, H160, H256, U256};
-use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Hash as HashT};
+use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT};
 use sp_storage::StorageKey;
 
 type Hash = <Block as BlockT>::Hash;
@@ -60,6 +60,40 @@ fn names(missing: &[Missing]) -> String {
 	missing.iter().map(|m| m.name.as_str()).collect::<Vec<_>>().join(", ")
 }
 
+/// Which block's state to read the metadata out of, to describe the runtime that *executed*
+/// `at`.
+///
+/// The parent's, not `at`'s. A runtime api call at `at` runs whatever `:code` sits in `at`'s
+/// post-state, and on the block where an upgrade is applied cumulus has already written the
+/// NEW code there while the block itself was executed by the OLD one. Reading metadata at
+/// `at` would then cache the new runtime's layout under the old runtime's spec version and
+/// mis-decode every later old-spec block. The parent's post-state holds the code that
+/// actually ran, in every case:
+///
+/// ```text
+/// block N-1 ─┬─ :code = old
+/// block N    ├─ executed by old; on_initialize writes :code = new; LastRuntimeUpgrade = old
+/// block N+1  └─ executed by new; LastRuntimeUpgrade = new
+///
+///   layout for N   → spec old (from N)   + metadata from N-1 (old code)   ✓
+///   layout for N+1 → spec new (from N+1) + metadata from N   (new code)   ✓
+/// ```
+///
+/// Falls back to `at` at genesis, or when the parent is unknown — no worse than before, and
+/// the odds of the oldest block this node retains being an upgrade block are negligible.
+fn metadata_source<C>(client: &C, at: Hash) -> Hash
+where
+	C: HeaderBackend<Block>,
+{
+	client
+		.header(at)
+		.ok()
+		.flatten()
+		.map(|header| *header.parent_hash())
+		.filter(|parent| *parent != Hash::default())
+		.unwrap_or(at)
+}
+
 /// Log the first occurrence, then back off by powers of two, so persistent loss stays
 /// visible without flooding one line per block.
 fn should_report(counter: &AtomicUsize) -> usize {
@@ -132,14 +166,16 @@ where
 		if let Some(known) = layouts.get(&spec) {
 			return known.clone();
 		}
-		let layout = self.build_layout(at, spec);
+		let layout = self.build_layout(metadata_source(self.client.as_ref(), at), spec);
 		layouts.insert(spec, layout.clone());
 		layout
 	}
 
-	/// The spec version running at `at`, out of state rather than the runtime api: no wasm
-	/// call, and `frame_executive` keeps `System::LastRuntimeUpgrade` equal to the current
-	/// runtime's version at every block after an upgrade. Only the leading `Compact<u32>` of
+	/// The spec version of the runtime that *executed* `at`, out of state rather than the
+	/// runtime api: no wasm call, and `frame_executive` only bumps
+	/// `System::LastRuntimeUpgrade` when a new runtime runs for the first time, so the value
+	/// in a block's post-state names the runtime that produced that block's events — which is
+	/// exactly the layout needed to decode them. Only the leading `Compact<u32>` of
 	/// `LastRuntimeUpgradeInfo` is read, so the `spec_name` type moving between sdks cannot
 	/// break it. A missing entry just shares one cache slot.
 	fn spec_version(&self, at: Hash) -> u32 {
@@ -449,3 +485,69 @@ where
 		self.inner.is_eip1559(at)
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sp_runtime::generic::Header as GenericHeader;
+	use sp_runtime::traits::BlakeTwo256 as Hashing;
+
+	type Header = GenericHeader<u32, Hashing>;
+
+	/// Just enough of a header backend to answer "what is this block's parent".
+	struct Headers(Vec<(Hash, Hash)>);
+
+	impl HeaderBackend<Block> for Headers {
+		fn header(&self, hash: Hash) -> sp_blockchain::Result<Option<Header>> {
+			Ok(self.0.iter().find(|(h, _)| *h == hash).map(|(_, parent)| Header {
+				parent_hash: *parent,
+				number: 1,
+				state_root: Default::default(),
+				extrinsics_root: Default::default(),
+				digest: Default::default(),
+			}))
+		}
+		fn info(&self) -> sp_blockchain::Info<Block> {
+			unimplemented!("not read by metadata_source")
+		}
+		fn status(&self, _: Hash) -> sp_blockchain::Result<sp_blockchain::BlockStatus> {
+			unimplemented!("not read by metadata_source")
+		}
+		fn number(&self, _: Hash) -> sp_blockchain::Result<Option<u32>> {
+			unimplemented!("not read by metadata_source")
+		}
+		fn hash(&self, _: u32) -> sp_blockchain::Result<Option<Hash>> {
+			unimplemented!("not read by metadata_source")
+		}
+	}
+
+	/// The upgrade-block regression: metadata has to come from the parent's state, because a
+	/// runtime api call at the upgrade block itself would run the NEW `:code` cumulus has
+	/// already written there, and cache the new layout under the old runtime's spec version.
+	#[test]
+	fn metadata_comes_from_the_parent_state() {
+		let (parent, upgrade) = (Hash::repeat_byte(1), Hash::repeat_byte(2));
+		let headers = Headers(vec![(upgrade, parent)]);
+		assert_eq!(
+			metadata_source(&headers, upgrade),
+			parent,
+			"a block's events were produced by the runtime in its PARENT's post-state"
+		);
+	}
+
+	/// Genesis has no parent, and an unknown block cannot offer one: fall back to the block
+	/// itself rather than reading state at the zero hash.
+	#[test]
+	fn genesis_and_unknown_blocks_fall_back_to_themselves() {
+		let genesis = Hash::repeat_byte(3);
+		let headers = Headers(vec![(genesis, Hash::default())]);
+		assert_eq!(metadata_source(&headers, genesis), genesis, "genesis has no parent");
+
+		let orphan = Hash::repeat_byte(9);
+		assert_eq!(
+			metadata_source(&Headers(Vec::new()), orphan),
+			orphan,
+			"an unknown header must not send us to the zero hash"
+		);
+	}
+}