From 8da6c1cbf4f586d3b95d063636c3e1b2975bc798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Fri, 22 Sep 2017 17:36:43 +0200 Subject: [PATCH] Client/Nonce: also reveal the last block of cycle. Fix small delay in nonce revelations when the current head is the last block of a cycle. --- src/client/embedded/alpha/baker/client_mining_blocks.ml | 6 +++++- src/client/embedded/alpha/baker/client_mining_main.ml | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/embedded/alpha/baker/client_mining_blocks.ml b/src/client/embedded/alpha/baker/client_mining_blocks.ml index a3a72ae5e..403641c2b 100644 --- a/src/client/embedded/alpha/baker/client_mining_blocks.ml +++ b/src/client/embedded/alpha/baker/client_mining_blocks.ml @@ -74,4 +74,8 @@ let blocks_from_cycle cctxt block cycle = let blocks = Utils.remove_elem_from_list (length - (1 + Int32.to_int (Raw_level.diff last first))) blocks in - return blocks + if Raw_level.(level.level = last) then + Client_node_rpcs.Blocks.hash cctxt block >>=? fun last -> + return (last :: blocks) + else + return blocks diff --git a/src/client/embedded/alpha/baker/client_mining_main.ml b/src/client/embedded/alpha/baker/client_mining_main.ml index 1f2834288..fc262601d 100644 --- a/src/client/embedded/alpha/baker/client_mining_main.ml +++ b/src/client/embedded/alpha/baker/client_mining_main.ml @@ -87,8 +87,9 @@ let reveal_block_nonces cctxt ?force block_hashes = do_reveal cctxt ?force cctxt.config.block blocks let reveal_nonces cctxt ?force () = + let block = Client_rpcs.last_mined_block cctxt.config.block in Client_mining_forge.get_unrevealed_nonces - cctxt ?force cctxt.config.block >>=? fun nonces -> + cctxt ?force block >>=? fun nonces -> do_reveal cctxt ?force cctxt.config.block nonces open Client_proto_args