From 6207af2ec46937db76c9e2ee20e482340035ffe6 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Fri, 11 Jan 2019 13:51:26 +0100 Subject: [PATCH 1/2] Properly log sealing and the newly created proposal hash from aura --- core/basic-authorship/src/basic_authorship.rs | 19 ++++++++++--------- core/consensus/aura/src/lib.rs | 9 ++++++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/basic-authorship/src/basic_authorship.rs b/core/basic-authorship/src/basic_authorship.rs index d4d39c4541f65..e524b6aa9e15d 100644 --- a/core/basic-authorship/src/basic_authorship.rs +++ b/core/basic-authorship/src/basic_authorship.rs @@ -232,15 +232,16 @@ impl Proposer where self.transaction_pool.remove_invalid(&unqueue_invalid); })?; - info!("Proposing block [number: {}; hash: {}; parent_hash: {}; extrinsics: [{}]]", - block.header().number(), - <::Block as BlockT>::Hash::from(block.header().hash()), - block.header().parent_hash(), - block.extrinsics().iter() - .map(|xt| format!("{}", BlakeTwo256::hash_of(xt))) - .collect::>() - .join(", ") - ); + info!("Prepared block for proposing at {} [hash: {:?}; parent_hash: {}; extrinsics: [{}]]", + block.header().number(), + <::Block as BlockT>::Hash::from(block.header().hash()), + block.header().parent_hash(), + block.extrinsics() + .iter() + .map(|xt| format!("{}", BlakeTwo256::hash_of(xt))) + .collect::>() + .join(", ") + ); let substrate_block = Decode::decode(&mut block.encode().as_slice()) .expect("blocks are defined to serialize to substrate blocks correctly; qed"); diff --git a/core/consensus/aura/src/lib.rs b/core/consensus/aura/src/lib.rs index f544c2f0e7357..ca01919516471 100644 --- a/core/consensus/aura/src/lib.rs +++ b/core/consensus/aura/src/lib.rs @@ -304,6 +304,7 @@ pub fn start_aura( } let (header, body) = b.deconstruct(); + let header_num = header.number().clone(); let pre_hash = header.hash(); let parent_hash = header.parent_hash().clone(); @@ -316,7 +317,7 @@ pub fn start_aura( signature, ); - let import_block = ImportBlock { + let import_block : ImportBlock = ImportBlock { origin: BlockOrigin::Own, header, justification: None, @@ -327,6 +328,12 @@ pub fn start_aura( fork_choice: ForkChoiceStrategy::LongestChain, }; + info!("Pre-sealed block for proposal at {}. Hash now {:?}, previously {:?}.", + header_num, + import_block.post_header().hash(), + pre_hash + ); + if let Err(e) = block_import.import_block(import_block, None) { warn!(target: "aura", "Error with block built on {:?}: {:?}", parent_hash, e); From 7f62d90b6fc8b74a41af80ccdfc0768fdd24774d Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Fri, 11 Jan 2019 15:20:25 +0100 Subject: [PATCH 2/2] Update lib.rs --- core/consensus/aura/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/consensus/aura/src/lib.rs b/core/consensus/aura/src/lib.rs index ca01919516471..5906c267b3737 100644 --- a/core/consensus/aura/src/lib.rs +++ b/core/consensus/aura/src/lib.rs @@ -317,7 +317,7 @@ pub fn start_aura( signature, ); - let import_block : ImportBlock = ImportBlock { + let import_block: ImportBlock = ImportBlock { origin: BlockOrigin::Own, header, justification: None,