From 66860261b9f2e5d80e86520c08b2a46ebd38c6af Mon Sep 17 00:00:00 2001
From: David Palm <dvdplm@gmail.com>
Date: Sun, 5 Apr 2020 22:32:25 +0200
Subject: [PATCH] Fix Goerli syncing

The Clique engine changes the header during the call to `check_and_lock_block()` and so when the block is committed we need to use the original header from the `PreverifiedBlock`, so we're back to cloning the `Header`.

Fixes https://github.com/openethereum/openethereum/issues/11603
---
 ethcore/src/client/client.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index bbda24b4e16..06b08e969bd 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -297,6 +297,12 @@ impl Importer {
 			let start = Instant::now();
 
 			for (block, block_bytes) in blocks {
+				// Some engines may change the header such that the header hash
+				// is different in the LockedBlock from what it was in the
+				// PreverifiedBlock. When committing the block we need the
+				// header from the Preverified block and not the one from the
+				// LockedBlock. See https://github.com/openethereum/openethereum/issues/11603
+				let preverified_header = block.header.clone();
 				let hash = block.header.hash();
 
 				let is_invalid = invalid_blocks.contains(block.header.parent_hash());
@@ -310,7 +316,13 @@ impl Importer {
 						imported_blocks.push(hash);
 						let transactions_len = locked_block.transactions.len();
 						let gas_used = *locked_block.header.gas_used();
-						let route = self.commit_block(locked_block, encoded::Block::new(block_bytes), pending, client);
+						let route = self.commit_block(
+							locked_block,
+							&preverified_header,
+							encoded::Block::new(block_bytes),
+							pending,
+							client
+						);
 						import_results.push(route);
 						client.report.write().accrue_block(gas_used, transactions_len);
 					}
@@ -488,6 +500,7 @@ impl Importer {
 	fn commit_block<B>(
 		&self,
 		block: B,
+		header: &Header,
 		block_data: encoded::Block,
 		pending: Option<PendingTransition>,
 		client: &Client
@@ -495,7 +508,6 @@ impl Importer {
 		where B: Drain
 	{
 		let block = block.drain();
-		let header = block.header;
 		let hash = &header.hash();
 		let number = header.number();
 		let parent = header.parent_hash();
@@ -2412,6 +2424,7 @@ impl ImportSealedBlock for Client {
 			)?;
 			let route = self.importer.commit_block(
 				block,
+				&header,
 				encoded::Block::new(block_bytes),
 				pending,
 				self