include the consensus time into block intervals.

neo-project · Dec 12, 2024 · f016575 · f016575
1 parent 3b52a3c
commit f016575
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Plugins/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs b/src/Plugins/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs
@@ -98,6 +98,9 @@ private void OnPrepareRequestReceived(ExtensiblePayload payload, PrepareRequest
             // around 4*3/M=12.0/5 ~ 80% block time (for M=5)
             ExtendTimerByFactor(4);
 
+            onPrepareReceivedTime = TimeProvider.Current.UtcNow;
+            onPrepareBlockIndex = message.BlockIndex;
+
             context.Block.Header.Timestamp = message.Timestamp;
             context.Block.Header.Nonce = message.Nonce;
             context.TransactionHashes = message.TransactionHashes;

diff --git a/src/Plugins/DBFTPlugin/Consensus/ConsensusService.cs b/src/Plugins/DBFTPlugin/Consensus/ConsensusService.cs
@@ -36,6 +36,8 @@ private class Timer { public uint Height; public byte ViewNumber; }
         private readonly IActorRef blockchain;
         private ICancelable timer_token;
         private DateTime block_received_time;
+        private DateTime onPrepareReceivedTime;
+        private uint onPrepareBlockIndex;
         private uint block_received_index;
         private bool started = false;
 
@@ -95,9 +97,11 @@ private void InitializeConsensus(byte viewNumber)
                 else
                 {
                     TimeSpan span = neoSystem.Settings.TimePerBlock;
-                    if (block_received_index + 1 == context.Block.Index)
+
+                    if (block_received_index + 1 == context.Block.Index && onPrepareBlockIndex + 1 == context.Block.Index)
                     {
-                        var diff = TimeProvider.Current.UtcNow - block_received_time;
+                        // Include the consensus time into the consensus intervals.
+                        var diff = TimeProvider.Current.UtcNow - onPrepareReceivedTime;
                         if (diff >= span)
                             span = TimeSpan.Zero;
                         else