pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-23 06:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make on_slot return the block with the post header (#8188)

Browse Source 
* Make `on_slot` return the block with the post header

Before this pr `on_slot` returned the pre block. However this is wrong,
because adding some post digest changes the hash of the header. Thus,
we need to make sure to return the correct block that uses the post
header.

* Update primitives/consensus/common/src/block_import.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
This commit is contained in:
Bastian Köcher
2021-02-24 08:03:05 +01:00
committed by GitHub
parent 3e3b5f9cba
commit 76d3814e90
3 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/slots/src/lib.rs
+4 -3
View File
@@ -334,7 +334,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
proposal_work.and_then(move |(proposal, claim)| async move {
let (block, storage_proof) = (proposal.block, proposal.proof);
let (header, body) = block.clone().deconstruct();
let (header, body) = block.deconstruct();
let header_num = *header.number();
let header_hash = header.hash();
let parent_hash = *header.parent_hash();
@@ -342,7 +342,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
let block_import_params = block_import_params_maker(
header,
&header_hash,
body,
body.clone(),
proposal.storage_changes,
claim,
epoch_data,
@@ -361,6 +361,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
"hash_previously" => ?header_hash,
);
let header = block_import_params.post_header();
if let Err(err) = block_import.lock().import_block(block_import_params, Default::default()) {
warn!(
target: logging_target,
@@ -376,7 +377,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
);
}
Ok(SlotResult { block, storage_proof })
Ok(SlotResult { block: B::new(header, body), storage_proof })
}).then(|r| async move {
r.map_err(|e| warn!(target: "slots", "Encountered consensus error: {:?}", e)).ok()
}).boxed()