From debacb02bcf55b6ea5fcbcf1700790695a77d335 Mon Sep 17 00:00:00 2001
From: s2quake <han0210@netsgo.com>
Date: Fri, 22 Nov 2024 10:30:16 +0900
Subject: [PATCH 01/11] Prepare 5.4.2

---
 CHANGES.md            | 6 ++++++
 Directory.Build.props | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d3d66b2be1..2d37137018 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,12 @@
 Libplanet changelog
 ===================
 
+Version 5.4.2
+-------------
+
+To be released.
+
+
 Version 5.4.1
 -------------
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 18a4215814..4716c7f67f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <TargetFrameworks Condition="'$(_IsPacking)'=='true'">net6.0</TargetFrameworks>
     <TargetFramework Condition="'$(_IsPacking)'!='true'">net6.0</TargetFramework>
     <LangVersion>10</LangVersion>
-    <VersionPrefix>5.4.1</VersionPrefix>
+    <VersionPrefix>5.4.2</VersionPrefix>
     <!-- Note: don't be confused by the word "prefix" here.  It's merely a
     version without suffix like "-dev.123".  See the following examples:
     Version: 1.2.3-dev.456

From 415680c3cef91ab7ae7b520b0e1a90734472a8b0 Mon Sep 17 00:00:00 2001
From: s2quake <han0210@netsgo.com>
Date: Tue, 3 Dec 2024 10:51:01 +0900
Subject: [PATCH 02/11] fix: Change graphtype of validatorPower

---
 tools/Libplanet.Explorer/GraphTypes/VoteType.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Libplanet.Explorer/GraphTypes/VoteType.cs b/tools/Libplanet.Explorer/GraphTypes/VoteType.cs
index 2171c4717c..04975126b9 100644
--- a/tools/Libplanet.Explorer/GraphTypes/VoteType.cs
+++ b/tools/Libplanet.Explorer/GraphTypes/VoteType.cs
@@ -30,10 +30,10 @@ public VoteType()
                 "ValidatorPublicKey",
                 description: "Public key of the validator which is subject of the vote.",
                 resolve: ctx => ctx.Source.ValidatorPublicKey);
-            Field<BigIntGraphType>(
+            Field<StringGraphType>(
                 "ValidatorPower",
                 description: "Power of the validator which is subject of the vote.",
-                resolve: ctx => ctx.Source.ValidatorPower);
+                resolve: ctx => ctx.Source.ValidatorPower?.ToString());
             Field<NonNullGraphType<VoteFlagType>>(
                 "Flag",
                 description: "Flag of the vote",

From 6e0fe8446d525bb8e7a012f8fc721bcdfaaa961a Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Thu, 5 Dec 2024 18:37:35 +0900
Subject: [PATCH 03/11] refactor: rename ContextTimeoutOption to ContextOption
 and add some props

---
 .../Consensus/ConsensusContext.cs             |  12 +-
 .../Consensus/ConsensusReactor.cs             |   6 +-
 .../Consensus/ConsensusReactorOption.cs       |   6 +-
 src/Libplanet.Net/Consensus/Context.cs        |  32 ++---
 src/Libplanet.Net/Consensus/ContextOption.cs  | 122 ++++++++++++++++++
 .../Consensus/ContextTimeoutOption.cs         |  86 ------------
 src/Libplanet.Net/Swarm.cs                    |   2 +-
 .../Consensus/ContextNonProposerTest.cs       |  12 +-
 .../Consensus/ContextTest.cs                  |   4 +-
 .../Libplanet.Net.Tests/SwarmTest.Evidence.cs |   2 +-
 test/Libplanet.Net.Tests/SwarmTest.cs         |   2 +-
 test/Libplanet.Net.Tests/TestUtils.cs         |  16 +--
 12 files changed, 169 insertions(+), 133 deletions(-)
 create mode 100644 src/Libplanet.Net/Consensus/ContextOption.cs
 delete mode 100644 src/Libplanet.Net/Consensus/ContextTimeoutOption.cs

diff --git a/src/Libplanet.Net/Consensus/ConsensusContext.cs b/src/Libplanet.Net/Consensus/ConsensusContext.cs
index 38339996e6..b72323d0b5 100644
--- a/src/Libplanet.Net/Consensus/ConsensusContext.cs
+++ b/src/Libplanet.Net/Consensus/ConsensusContext.cs
@@ -32,7 +32,7 @@ namespace Libplanet.Net.Consensus
     public partial class ConsensusContext : IDisposable
     {
         private readonly object _contextLock;
-        private readonly ContextTimeoutOption _contextTimeoutOption;
+        private readonly ContextOption _contextOption;
         private readonly IConsensusMessageCommunicator _consensusMessageCommunicator;
         private readonly BlockChain _blockChain;
         private readonly PrivateKey _privateKey;
@@ -58,14 +58,14 @@ private readonly EvidenceExceptionCollector _evidenceCollector
         /// <param name="newHeightDelay">A time delay in starting the consensus for the next height
         /// block. <seealso cref="OnTipChanged"/>
         /// </param>
-        /// <param name="contextTimeoutOption">A <see cref="ContextTimeoutOption"/> for
-        /// configuring a timeout for each <see cref="Step"/>.</param>
+        /// <param name="contextOption">A <see cref="ContextOption"/> for
+        /// configuring a timeout or delay for each <see cref="Step"/>.</param>
         public ConsensusContext(
             IConsensusMessageCommunicator consensusMessageCommunicator,
             BlockChain blockChain,
             PrivateKey privateKey,
             TimeSpan newHeightDelay,
-            ContextTimeoutOption contextTimeoutOption)
+            ContextOption contextOption)
         {
             _consensusMessageCommunicator = consensusMessageCommunicator;
             _blockChain = blockChain;
@@ -73,7 +73,7 @@ public ConsensusContext(
             Running = false;
             _newHeightDelay = newHeightDelay;
 
-            _contextTimeoutOption = contextTimeoutOption;
+            _contextOption = contextOption;
             _currentContext = CreateContext(
                 _blockChain.Tip.Index + 1,
                 _blockChain.GetBlockCommit(_blockChain.Tip.Index));
@@ -498,7 +498,7 @@ private Context CreateContext(long height, BlockCommit? lastCommit)
                 lastCommit,
                 _privateKey,
                 validatorSet,
-                contextTimeoutOptions: _contextTimeoutOption);
+                contextOption: _contextOption);
             return context;
         }
 
diff --git a/src/Libplanet.Net/Consensus/ConsensusReactor.cs b/src/Libplanet.Net/Consensus/ConsensusReactor.cs
index 8cad857799..4fd97d8f37 100644
--- a/src/Libplanet.Net/Consensus/ConsensusReactor.cs
+++ b/src/Libplanet.Net/Consensus/ConsensusReactor.cs
@@ -43,7 +43,7 @@ public class ConsensusReactor : IReactor
         /// <param name="newHeightDelay">A time delay in starting the consensus for the next height
         /// block.
         /// </param>
-        /// <param name="contextTimeoutOption">A <see cref="ContextTimeoutOption"/> for
+        /// <param name="contextOption">A <see cref="ContextOption"/> for
         /// configuring a timeout for each <see cref="ConsensusStep"/>.</param>
         public ConsensusReactor(
             ITransport consensusTransport,
@@ -52,7 +52,7 @@ public ConsensusReactor(
             ImmutableList<BoundPeer> validatorPeers,
             ImmutableList<BoundPeer> seedPeers,
             TimeSpan newHeightDelay,
-            ContextTimeoutOption contextTimeoutOption)
+            ContextOption contextOption)
         {
             validatorPeers ??= ImmutableList<BoundPeer>.Empty;
             seedPeers ??= ImmutableList<BoundPeer>.Empty;
@@ -71,7 +71,7 @@ public ConsensusReactor(
                 blockChain,
                 privateKey,
                 newHeightDelay,
-                contextTimeoutOption);
+                contextOption);
 
             _logger = Log
                 .ForContext("Tag", "Consensus")
diff --git a/src/Libplanet.Net/Consensus/ConsensusReactorOption.cs b/src/Libplanet.Net/Consensus/ConsensusReactorOption.cs
index f39aa792e3..1b4440463e 100644
--- a/src/Libplanet.Net/Consensus/ConsensusReactorOption.cs
+++ b/src/Libplanet.Net/Consensus/ConsensusReactorOption.cs
@@ -7,7 +7,7 @@
 namespace Libplanet.Net.Consensus
 {
     /// <summary>
-    /// A option struct for initializing <see cref="ConsensusReactor"/>.
+    /// An option struct for initializing <see cref="ConsensusReactor"/>.
     /// </summary>
     public struct ConsensusReactorOption
     {
@@ -42,8 +42,8 @@ public struct ConsensusReactorOption
         public TimeSpan TargetBlockInterval { get; set; }
 
         /// <summary>
-        /// A timeout second and multiplier value for used in <see cref="Context"/>.
+        /// A timeout and delay value for used in <see cref="Context"/> in milliseconds.
         /// </summary>
-        public ContextTimeoutOption ContextTimeoutOptions { get; set; }
+        public ContextOption ContextOption { get; set; }
     }
 }
diff --git a/src/Libplanet.Net/Consensus/Context.cs b/src/Libplanet.Net/Consensus/Context.cs
index 69453b615f..4f0fb2e6c9 100644
--- a/src/Libplanet.Net/Consensus/Context.cs
+++ b/src/Libplanet.Net/Consensus/Context.cs
@@ -78,7 +78,7 @@ namespace Libplanet.Net.Consensus
     /// </remarks>
     public partial class Context : IDisposable
     {
-        private readonly ContextTimeoutOption _contextTimeoutOption;
+        private readonly ContextOption _contextOption;
 
         private readonly BlockChain _blockChain;
         private readonly Codec _codec;
@@ -122,15 +122,15 @@ private readonly EvidenceExceptionCollector _evidenceCollector
         /// </param>
         /// <param name="validators">The <see cref="ValidatorSet"/> for
         /// given <paramref name="height"/>.</param>
-        /// <param name="contextTimeoutOptions">A <see cref="ContextTimeoutOption"/> for
-        /// configuring a timeout for each <see cref="ConsensusStep"/>.</param>
+        /// <param name="contextOption">A <see cref="ContextOption"/> for
+        /// configuring a timeout and delay for each <see cref="ConsensusStep"/>.</param>
         public Context(
             BlockChain blockChain,
             long height,
             BlockCommit? lastCommit,
             PrivateKey privateKey,
             ValidatorSet validators,
-            ContextTimeoutOption contextTimeoutOptions)
+            ContextOption contextOption)
             : this(
                 blockChain,
                 height,
@@ -140,7 +140,7 @@ public Context(
                 ConsensusStep.Default,
                 -1,
                 128,
-                contextTimeoutOptions)
+                contextOption)
         {
         }
 
@@ -153,7 +153,7 @@ private Context(
             ConsensusStep consensusStep,
             int round = -1,
             int cacheSize = 128,
-            ContextTimeoutOption? contextTimeoutOptions = null)
+            ContextOption? contextOption = null)
         {
             if (height < 1)
             {
@@ -191,7 +191,7 @@ private Context(
             _blockValidationCache =
                 new LRUCache<BlockHash, bool>(cacheSize, Math.Max(cacheSize / 64, 8));
 
-            _contextTimeoutOption = contextTimeoutOptions ?? new ContextTimeoutOption();
+            _contextOption = contextOption ?? new ContextOption();
 
             _logger.Information(
                 "Created Context for height #{Height}, round #{Round}",
@@ -379,9 +379,9 @@ public override string ToString()
         /// <returns>A duration in <see cref="TimeSpan"/>.</returns>
         private TimeSpan TimeoutPreVote(long round)
         {
-            return TimeSpan.FromSeconds(
-                _contextTimeoutOption.PreVoteSecondBase +
-                round * _contextTimeoutOption.PreVoteMultiplier);
+            return TimeSpan.FromMilliseconds(
+                _contextOption.PreVoteTimeoutBase +
+                round * _contextOption.PreVoteTimeoutDelta);
         }
 
         /// <summary>
@@ -392,9 +392,9 @@ private TimeSpan TimeoutPreVote(long round)
         /// <returns>A duration in <see cref="TimeSpan"/>.</returns>
         private TimeSpan TimeoutPreCommit(long round)
         {
-            return TimeSpan.FromSeconds(
-                _contextTimeoutOption.PreCommitSecondBase +
-                round * _contextTimeoutOption.PreCommitMultiplier);
+            return TimeSpan.FromMilliseconds(
+                _contextOption.PreCommitTimeoutBase +
+                round * _contextOption.PreCommitTimeoutDelta);
         }
 
         /// <summary>
@@ -405,9 +405,9 @@ private TimeSpan TimeoutPreCommit(long round)
         /// <returns>A duration in <see cref="TimeSpan"/>.</returns>
         private TimeSpan TimeoutPropose(long round)
         {
-            return TimeSpan.FromSeconds(
-                _contextTimeoutOption.ProposeSecondBase +
-                round * _contextTimeoutOption.ProposeMultiplier);
+            return TimeSpan.FromMilliseconds(
+                _contextOption.ProposeTimeoutBase +
+                round * _contextOption.ProposeTimeoutDelta);
         }
 
         /// <summary>
diff --git a/src/Libplanet.Net/Consensus/ContextOption.cs b/src/Libplanet.Net/Consensus/ContextOption.cs
new file mode 100644
index 0000000000..a9be35f9f7
--- /dev/null
+++ b/src/Libplanet.Net/Consensus/ContextOption.cs
@@ -0,0 +1,122 @@
+using System;
+
+namespace Libplanet.Net.Consensus
+{
+    /// <summary>
+    /// An options class to configure <see cref="Context"/> timeout and delay
+    /// for each <see cref="ConsensusStep"/> in milliseconds.
+    /// </summary>
+    public class ContextOption
+    {
+        public ContextOption(
+            int proposeTimeoutBase = 8_000,
+            int preVoteTimeoutBase = 1_000,
+            int preCommitTimeoutBase = 1_000,
+            int proposeTimeoutDelta = 4_000,
+            int preVoteTimeoutDelta = 500,
+            int preCommitTimeoutDelta = 500,
+            int enterPreVoteDelay = 0,
+            int enterPreCommitDelay = 0,
+            int enterEndCommitDelay = 0)
+        {
+            if (proposeTimeoutBase <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(proposeTimeoutBase),
+                    "ProposeSecondBase must be greater than 0.");
+            }
+
+            ProposeTimeoutBase = proposeTimeoutBase;
+
+            if (preVoteTimeoutBase <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(preVoteTimeoutBase),
+                    "PreVoteSecondBase must be greater than 0.");
+            }
+
+            PreVoteTimeoutBase = preVoteTimeoutBase;
+
+            if (preCommitTimeoutBase <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(preCommitTimeoutBase),
+                    "PreCommitSecondBase must be greater than 0.");
+            }
+
+            PreCommitTimeoutBase = preCommitTimeoutBase;
+
+            if (proposeTimeoutDelta <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(proposeTimeoutDelta),
+                    "ProposeMultiplier must be greater than 0.");
+            }
+
+            ProposeTimeoutDelta = proposeTimeoutDelta;
+
+            if (preVoteTimeoutDelta <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(preVoteTimeoutDelta),
+                    "PreVoteMultiplier must be greater than 0.");
+            }
+
+            PreVoteTimeoutDelta = preVoteTimeoutDelta;
+
+            if (preCommitTimeoutDelta <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(preCommitTimeoutDelta),
+                    "PreCommitMultiplier must be greater than 0.");
+            }
+
+            PreCommitTimeoutDelta = preCommitTimeoutDelta;
+
+            if (enterPreVoteDelay <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(enterPreVoteDelay),
+                    "PreCommitMultiplier must be greater than 0.");
+            }
+
+            EnterPreVoteDelay = enterPreVoteDelay;
+
+            if (enterPreCommitDelay <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(enterPreCommitDelay),
+                    "PreCommitMultiplier must be greater than 0.");
+            }
+
+            EnterPreCommitDelay = enterPreCommitDelay;
+
+            if (enterEndCommitDelay <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(enterEndCommitDelay),
+                    "PreCommitMultiplier must be greater than 0.");
+            }
+
+            EnterEndCommitDelay = enterEndCommitDelay;
+        }
+
+        public int ProposeTimeoutBase { get; }
+
+        public int PreVoteTimeoutBase { get; }
+
+        public int PreCommitTimeoutBase { get; }
+
+        public int ProposeTimeoutDelta { get; }
+
+        public int PreVoteTimeoutDelta { get; }
+
+        public int PreCommitTimeoutDelta { get; }
+
+        public int EnterPreVoteDelay { get; }
+
+        public int EnterPreCommitDelay { get; }
+
+        public int EnterEndCommitDelay { get; }
+    }
+}
diff --git a/src/Libplanet.Net/Consensus/ContextTimeoutOption.cs b/src/Libplanet.Net/Consensus/ContextTimeoutOption.cs
deleted file mode 100644
index 78a5515ffd..0000000000
--- a/src/Libplanet.Net/Consensus/ContextTimeoutOption.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-
-namespace Libplanet.Net.Consensus
-{
-    /// <summary>
-    /// A options class to configure <see cref="Context"/> timeout
-    /// for each <see cref="ConsensusStep"/>.
-    /// </summary>
-    public class ContextTimeoutOption
-    {
-        public ContextTimeoutOption(
-            int proposeSecondBase = 8,
-            int preVoteSecondBase = 4,
-            int preCommitSecondBase = 4,
-            int proposeMultiplier = 4,
-            int preVoteMultiplier = 2,
-            int preCommitMultiplier = 2)
-        {
-            if (proposeSecondBase <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(proposeSecondBase),
-                    "ProposeSecondBase must be greater than 0.");
-            }
-
-            ProposeSecondBase = proposeSecondBase;
-
-            if (preVoteSecondBase <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(preVoteSecondBase),
-                    "PreVoteSecondBase must be greater than 0.");
-            }
-
-            PreVoteSecondBase = preVoteSecondBase;
-
-            if (preCommitSecondBase <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(preCommitSecondBase),
-                    "PreCommitSecondBase must be greater than 0.");
-            }
-
-            PreCommitSecondBase = preCommitSecondBase;
-
-            if (proposeMultiplier <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(proposeMultiplier),
-                    "ProposeMultiplier must be greater than 0.");
-            }
-
-            ProposeMultiplier = proposeMultiplier;
-
-            if (preVoteMultiplier <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(preVoteMultiplier),
-                    "PreVoteMultiplier must be greater than 0.");
-            }
-
-            PreVoteMultiplier = preVoteMultiplier;
-
-            if (preCommitMultiplier <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(preCommitMultiplier),
-                    "PreCommitMultiplier must be greater than 0.");
-            }
-
-            PreCommitMultiplier = preCommitMultiplier;
-        }
-
-        public int ProposeSecondBase { get; }
-
-        public int PreVoteSecondBase { get; }
-
-        public int PreCommitSecondBase { get; }
-
-        public int ProposeMultiplier { get; }
-
-        public int PreVoteMultiplier { get; }
-
-        public int PreCommitMultiplier { get; }
-    }
-}
diff --git a/src/Libplanet.Net/Swarm.cs b/src/Libplanet.Net/Swarm.cs
index ca4949609e..aab456222f 100644
--- a/src/Libplanet.Net/Swarm.cs
+++ b/src/Libplanet.Net/Swarm.cs
@@ -124,7 +124,7 @@ public Swarm(
                     consensusReactorOption.ConsensusPeers,
                     consensusReactorOption.SeedPeers,
                     consensusReactorOption.TargetBlockInterval,
-                    consensusReactorOption.ContextTimeoutOptions);
+                    consensusReactorOption.ContextOption);
             }
         }
 
diff --git a/test/Libplanet.Net.Tests/Consensus/ContextNonProposerTest.cs b/test/Libplanet.Net.Tests/Consensus/ContextNonProposerTest.cs
index 9c4e0824ad..9de309e2db 100644
--- a/test/Libplanet.Net.Tests/Consensus/ContextNonProposerTest.cs
+++ b/test/Libplanet.Net.Tests/Consensus/ContextNonProposerTest.cs
@@ -531,7 +531,7 @@ public async void TimeoutPropose()
 
             var (_, context) = TestUtils.CreateDummyContext(
                 privateKey: TestUtils.PrivateKeys[0],
-                contextTimeoutOptions: new ContextTimeoutOption(proposeSecondBase: 1));
+                contextOption: new ContextOption(proposeTimeoutBase: 1_000));
 
             context.StateChanged += (_, eventArgs) =>
             {
@@ -560,9 +560,9 @@ public async Task UponRulesCheckAfterTimeout()
         {
             var (blockChain, context) = TestUtils.CreateDummyContext(
                 privateKey: TestUtils.PrivateKeys[0],
-                contextTimeoutOptions: new ContextTimeoutOption(
-                    preVoteSecondBase: 1,
-                    preCommitSecondBase: 1));
+                contextOption: new ContextOption(
+                    preVoteTimeoutBase: 1_000,
+                    preCommitTimeoutBase: 1_000));
 
             var block1 = blockChain.ProposeBlock(TestUtils.PrivateKeys[1]);
             var block2 = blockChain.ProposeBlock(TestUtils.PrivateKeys[2]);
@@ -642,7 +642,7 @@ public async Task TimeoutPreVote()
         {
             var (blockChain, context) = TestUtils.CreateDummyContext(
                 privateKey: TestUtils.PrivateKeys[0],
-                contextTimeoutOptions: new ContextTimeoutOption(preVoteSecondBase: 1));
+                contextOption: new ContextOption(preVoteTimeoutBase: 1_000));
 
             var block = blockChain.ProposeBlock(TestUtils.PrivateKeys[1]);
             var timeoutProcessed = new AsyncAutoResetEvent();
@@ -693,7 +693,7 @@ public async Task TimeoutPreCommit()
         {
             var (blockChain, context) = TestUtils.CreateDummyContext(
                 privateKey: TestUtils.PrivateKeys[0],
-                contextTimeoutOptions: new ContextTimeoutOption(preCommitSecondBase: 1));
+                contextOption: new ContextOption(preCommitTimeoutBase: 1_000));
 
             var block = blockChain.ProposeBlock(TestUtils.PrivateKeys[1]);
             var timeoutProcessed = new AsyncAutoResetEvent();
diff --git a/test/Libplanet.Net.Tests/Consensus/ContextTest.cs b/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
index 926d0622eb..ec224a1b3d 100644
--- a/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
+++ b/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
@@ -340,7 +340,7 @@ public async Task CanPreCommitOnEndCommit()
                 blockChain
                     .GetNextWorldState(0L)
                     .GetValidatorSet(),
-                contextTimeoutOptions: new ContextTimeoutOption());
+                contextOption: new ContextOption());
             context.MessageToPublish += (sender, message) => context.ProduceMessage(message);
 
             context.StateChanged += (_, eventArgs) =>
@@ -639,7 +639,7 @@ public async Task CanCreateContextWithLastingEvaluation()
                 blockChain,
                 TestUtils.PrivateKeys[0],
                 newHeightDelay,
-                new ContextTimeoutOption());
+                new ContextOption());
             Context context = consensusContext.CurrentContext;
             context.MessageToPublish += (sender, message) => context.ProduceMessage(message);
 
diff --git a/test/Libplanet.Net.Tests/SwarmTest.Evidence.cs b/test/Libplanet.Net.Tests/SwarmTest.Evidence.cs
index 828e44f54e..9914e9fc43 100644
--- a/test/Libplanet.Net.Tests/SwarmTest.Evidence.cs
+++ b/test/Libplanet.Net.Tests/SwarmTest.Evidence.cs
@@ -41,7 +41,7 @@ public async Task DuplicateVote_Test()
                     ConsensusPrivateKey = privateKeys[i],
                     ConsensusWorkers = 100,
                     TargetBlockInterval = TimeSpan.FromSeconds(4),
-                    ContextTimeoutOptions = new ContextTimeoutOption(),
+                    ContextOption = new ContextOption(),
                 }).ToList();
 
             var swarmTasks = privateKeys.Select(
diff --git a/test/Libplanet.Net.Tests/SwarmTest.cs b/test/Libplanet.Net.Tests/SwarmTest.cs
index bd41a0e8fa..83bbf8ce0e 100644
--- a/test/Libplanet.Net.Tests/SwarmTest.cs
+++ b/test/Libplanet.Net.Tests/SwarmTest.cs
@@ -411,7 +411,7 @@ public async Task BootstrapContext()
                     ConsensusPrivateKey = TestUtils.PrivateKeys[i],
                     ConsensusWorkers = 100,
                     TargetBlockInterval = TimeSpan.FromSeconds(10),
-                    ContextTimeoutOptions = new ContextTimeoutOption(),
+                    ContextOption = new ContextOption(),
                 }).ToList();
             var swarms = new List<Swarm>();
             for (int i = 0; i < 4; i++)
diff --git a/test/Libplanet.Net.Tests/TestUtils.cs b/test/Libplanet.Net.Tests/TestUtils.cs
index c73486a3b1..1942d0280c 100644
--- a/test/Libplanet.Net.Tests/TestUtils.cs
+++ b/test/Libplanet.Net.Tests/TestUtils.cs
@@ -252,7 +252,7 @@ public static (BlockChain BlockChain, ConsensusContext ConsensusContext)
                 IBlockPolicy? policy = null,
                 IActionLoader? actionLoader = null,
                 PrivateKey? privateKey = null,
-                ContextTimeoutOption? contextTimeoutOptions = null)
+                ContextOption? contextOption = null)
         {
             policy ??= Policy;
             var blockChain = CreateDummyBlockChain(policy, actionLoader);
@@ -272,7 +272,7 @@ void BroadcastMessage(ConsensusMsg message) =>
                 blockChain,
                 privateKey,
                 newHeightDelay,
-                contextTimeoutOptions ?? new ContextTimeoutOption());
+                contextOption ?? new ContextOption());
 
             return (blockChain, consensusContext);
         }
@@ -282,7 +282,7 @@ public static Context CreateDummyContext(
             long height = 1,
             BlockCommit? lastCommit = null,
             PrivateKey? privateKey = null,
-            ContextTimeoutOption? contextTimeoutOptions = null,
+            ContextOption? contextOption = null,
             ValidatorSet? validatorSet = null)
         {
             Context? context = null;
@@ -295,7 +295,7 @@ public static Context CreateDummyContext(
                 validatorSet ?? blockChain
                     .GetNextWorldState(height - 1)
                     .GetValidatorSet(),
-                contextTimeoutOptions: contextTimeoutOptions ?? new ContextTimeoutOption());
+                contextOption: contextOption ?? new ContextOption());
             context.MessageToPublish += (sender, message) => context.ProduceMessage(message);
             return context;
         }
@@ -307,7 +307,7 @@ public static (BlockChain BlockChain, Context Context)
                 IBlockPolicy? policy = null,
                 IActionLoader? actionLoader = null,
                 PrivateKey? privateKey = null,
-                ContextTimeoutOption? contextTimeoutOptions = null,
+                ContextOption? contextOption = null,
                 ValidatorSet? validatorSet = null)
         {
             Context? context = null;
@@ -323,7 +323,7 @@ public static (BlockChain BlockChain, Context Context)
                 validatorSet ?? blockChain
                     .GetNextWorldState(height - 1)
                     .GetValidatorSet(),
-                contextTimeoutOptions: contextTimeoutOptions ?? new ContextTimeoutOption());
+                contextOption: contextOption ?? new ContextOption());
             context.MessageToPublish += (sender, message) => context.ProduceMessage(message);
 
             return (blockChain, context);
@@ -336,7 +336,7 @@ public static ConsensusReactor CreateDummyConsensusReactor(
             int consensusPort = 5101,
             List<BoundPeer>? validatorPeers = null,
             int newHeightDelayMilliseconds = 10_000,
-            ContextTimeoutOption? contextTimeoutOptions = null)
+            ContextOption? contextOption = null)
         {
             key ??= PrivateKeys[1];
             validatorPeers ??= Peers;
@@ -356,7 +356,7 @@ public static ConsensusReactor CreateDummyConsensusReactor(
                 validatorPeers.ToImmutableList(),
                 new List<BoundPeer>().ToImmutableList(),
                 TimeSpan.FromMilliseconds(newHeightDelayMilliseconds),
-                contextTimeoutOption: contextTimeoutOptions ?? new ContextTimeoutOption());
+                contextOption: contextOption ?? new ContextOption());
         }
 
         public static byte[] GetRandomBytes(int size)

From f1db57df8a163008d27eddb69305d2a461c59112 Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Thu, 5 Dec 2024 18:42:01 +0900
Subject: [PATCH 04/11] refactor: refactor step transition

---
 src/Libplanet.Net/Consensus/Context.Async.cs  |  22 +++
 src/Libplanet.Net/Consensus/Context.Mutate.cs | 139 +++++++++---------
 src/Libplanet.Net/Consensus/Context.cs        |  32 ++--
 3 files changed, 109 insertions(+), 84 deletions(-)

diff --git a/src/Libplanet.Net/Consensus/Context.Async.cs b/src/Libplanet.Net/Consensus/Context.Async.cs
index 790339c335..a2b80acbe5 100644
--- a/src/Libplanet.Net/Consensus/Context.Async.cs
+++ b/src/Libplanet.Net/Consensus/Context.Async.cs
@@ -212,7 +212,18 @@ private async Task OnTimeoutPropose(int round)
         /// <param name="round">A round that the timeout task is scheduled for.</param>
         private async Task OnTimeoutPreVote(int round)
         {
+            if (_preCommitTimeoutFlags.Contains(round) || !_preVoteTimeoutFlags.Add(round))
+            {
+                return;
+            }
+
             TimeSpan timeout = TimeoutPreVote(round);
+            _logger.Debug(
+                "PreVote step in round {Round} is scheduled to be timed out after {Timeout} " +
+                "because 2/3+ PreVotes are collected for the round. (context: {Context})",
+                round,
+                timeout,
+                ToString());
             await Task.Delay(timeout, _cancellationTokenSource.Token);
             _logger.Information(
                 "TimeoutPreVote has occurred in {Timeout}. {Info}",
@@ -228,7 +239,18 @@ private async Task OnTimeoutPreVote(int round)
         /// <param name="round">The round that the timeout task is scheduled for.</param>
         private async Task OnTimeoutPreCommit(int round)
         {
+            if (!_preCommitTimeoutFlags.Add(round))
+            {
+                return;
+            }
+
             TimeSpan timeout = TimeoutPreCommit(round);
+            _logger.Debug(
+                "PreCommit step in round {Round} is scheduled to be timed out in {Timeout} " +
+                "because 2/3+ PreCommits are collected for the round. (context: {Context})",
+                round,
+                timeout,
+                ToString());
             await Task.Delay(timeout, _cancellationTokenSource.Token);
             _logger.Information(
                 "TimeoutPreCommit has occurred in {Timeout}. {Info}",
diff --git a/src/Libplanet.Net/Consensus/Context.Mutate.cs b/src/Libplanet.Net/Consensus/Context.Mutate.cs
index 8b71cfee34..5affc5873c 100644
--- a/src/Libplanet.Net/Consensus/Context.Mutate.cs
+++ b/src/Libplanet.Net/Consensus/Context.Mutate.cs
@@ -29,7 +29,7 @@ private void StartRound(int round)
             RoundStarted?.Invoke(this, Round);
             _heightVoteSet.SetRound(round);
 
-            Proposal = null;
+            SetProposal(null);
             Step = ConsensusStep.Propose;
             if (_validatorSet.GetProposer(Height, Round).PublicKey == _privateKey.PublicKey)
             {
@@ -214,7 +214,7 @@ private void AddProposal(Proposal proposal)
 
             if (Proposal is null)
             {
-                Proposal = proposal;
+                SetProposal(proposal);
                 _logger.Debug("Proposal {BlockHash} is set", proposal.BlockHash);
             }
             else
@@ -245,17 +245,14 @@ private void ProcessGenericUponRules()
                     "Entering PreVote step due to proposal message with " +
                     "valid round -1. (context: {Context})",
                     ToString());
-                Step = ConsensusStep.PreVote;
 
                 if (IsValid(p1.Block) && (_lockedRound == -1 || _lockedValue == p1.Block))
                 {
-                    PublishMessage(
-                        new ConsensusPreVoteMsg(MakeVote(Round, p1.Block.Hash, VoteFlag.PreVote)));
+                    EnterPreVote(Round, p1.Block.Hash);
                 }
                 else
                 {
-                    PublishMessage(
-                        new ConsensusPreVoteMsg(MakeVote(Round, default, VoteFlag.PreVote)));
+                    EnterPreVote(Round, default);
                 }
             }
 
@@ -271,31 +268,20 @@ private void ProcessGenericUponRules()
                     "2/3+ PreVote for valid round {ValidRound}. (context: {Context})",
                     p2.ValidRound,
                     ToString());
-                Step = ConsensusStep.PreVote;
 
                 if (IsValid(p2.Block) &&
                     (_lockedRound <= p2.ValidRound || _lockedValue == p2.Block))
                 {
-                    PublishMessage(
-                        new ConsensusPreVoteMsg(MakeVote(Round, p2.Block.Hash, VoteFlag.PreVote)));
+                    EnterPreVote(Round, p2.Block.Hash);
                 }
                 else
                 {
-                    PublishMessage(
-                        new ConsensusPreVoteMsg(MakeVote(Round, default, VoteFlag.PreVote)));
+                    EnterPreVote(Round, default);
                 }
             }
 
-            if (_heightVoteSet.PreVotes(Round).HasTwoThirdsAny() &&
-                Step == ConsensusStep.PreVote &&
-                !_preVoteTimeoutFlags.Contains(Round))
+            if (_heightVoteSet.PreVotes(Round).HasTwoThirdsAny() && Step == ConsensusStep.PreVote)
             {
-                _logger.Debug(
-                    "PreVote step in round {Round} is scheduled to be timed out because " +
-                    "2/3+ PreVotes are collected for the round. (context: {Context})",
-                    Round,
-                    ToString());
-                _preVoteTimeoutFlags.Add(Round);
                 _ = OnTimeoutPreVote(Round);
             }
 
@@ -319,12 +305,9 @@ private void ProcessGenericUponRules()
                         "2/3+ PreVote for current round {Round}. (context: {Context})",
                         Round,
                         ToString());
-                    Step = ConsensusStep.PreCommit;
                     _lockedValue = p3.Block;
                     _lockedRound = Round;
-                    PublishMessage(
-                        new ConsensusPreCommitMsg(
-                            MakeVote(Round, p3.Block.Hash, VoteFlag.PreCommit)));
+                    EnterPreCommit(Round, p3.Block.Hash);
 
                     // Maybe need to broadcast periodically?
                     PublishMessage(
@@ -346,9 +329,7 @@ private void ProcessGenericUponRules()
                         "were collected. (context: {Context})",
                         Round,
                         ToString());
-                    Step = ConsensusStep.PreCommit;
-                    PublishMessage(
-                        new ConsensusPreCommitMsg(MakeVote(Round, default, VoteFlag.PreCommit)));
+                    EnterPreCommit(Round, default);
                 }
                 else if (Proposal is { } proposal && !proposal.BlockHash.Equals(hash3))
                 {
@@ -360,7 +341,7 @@ private void ProcessGenericUponRules()
                         Round,
                         hash3,
                         ToString());
-                    Proposal = null;
+                    SetProposal(null);
                     PublishMessage(
                         new ConsensusProposalClaimMsg(
                             new ProposalClaimMetadata(
@@ -372,15 +353,8 @@ private void ProcessGenericUponRules()
                 }
             }
 
-            if (_heightVoteSet.PreCommits(Round).HasTwoThirdsAny() &&
-                !_preCommitTimeoutFlags.Contains(Round))
+            if (_heightVoteSet.PreCommits(Round).HasTwoThirdsAny())
             {
-                _logger.Debug(
-                    "PreCommit step in round {Round} is scheduled to be timed out because " +
-                    "2/3+ PreCommits are collected for the round. (context: {Context})",
-                    Round,
-                    ToString());
-                _preCommitTimeoutFlags.Add(Round);
                 _ = OnTimeoutPreCommit(Round);
             }
         }
@@ -406,7 +380,6 @@ private void ProcessHeightOrRoundUponRules(ConsensusMsg message)
                 block4.Hash.Equals(hash) &&
                 IsValid(block4))
             {
-                Step = ConsensusStep.EndCommit;
                 _decision = block4;
                 _committedRound = round;
 
@@ -414,34 +387,7 @@ private void ProcessHeightOrRoundUponRules(ConsensusMsg message)
                 PublishMessage(
                     new ConsensusMaj23Msg(
                         MakeMaj23(round, block4.Hash, VoteFlag.PreCommit)));
-
-                try
-                {
-                    _logger.Information(
-                        "Committing block #{Index} {Hash} (context: {Context})",
-                        block4.Index,
-                        block4.Hash,
-                        ToString());
-
-                    IsValid(block4);
-
-                    AppendBlock(block4);
-                }
-                catch (Exception e)
-                {
-                    _logger.Error(
-                        e,
-                        "Failed to commit block #{Index} {Hash}",
-                        block4.Index,
-                        block4.Hash);
-                    ExceptionOccurred?.Invoke(this, e);
-                    return;
-                }
-
-                _logger.Information(
-                    "Committed block #{Index} {Hash}",
-                    block4.Index,
-                    block4.Hash);
+                EnterEndCommit(Round);
                 return;
             }
 
@@ -461,6 +407,57 @@ private void ProcessHeightOrRoundUponRules(ConsensusMsg message)
             }
         }
 
+        private void EnterPreVote(int round, BlockHash hash)
+        {
+            Step = ConsensusStep.PreVote;
+            PublishMessage(
+                new ConsensusPreVoteMsg(MakeVote(round, hash, VoteFlag.PreVote)));
+        }
+
+        private void EnterPreCommit(int round, BlockHash hash)
+        {
+            Step = ConsensusStep.PreCommit;
+            PublishMessage(
+                new ConsensusPreCommitMsg(MakeVote(round, hash, VoteFlag.PreCommit)));
+        }
+
+        private void EnterEndCommit(int round)
+        {
+            Step = ConsensusStep.EndCommit;
+            if (_decision is not { } block)
+            {
+                StartRound(Round + 1);
+                return;
+            }
+
+            try
+            {
+                _logger.Information(
+                    "Committing block #{Index} {Hash} (context: {Context})",
+                    block.Index,
+                    block.Hash,
+                    ToString());
+
+                IsValid(block);
+                AppendBlock(block);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(
+                    e,
+                    "Failed to commit block #{Index} {Hash}",
+                    block.Index,
+                    block.Hash);
+                ExceptionOccurred?.Invoke(this, e);
+                return;
+            }
+
+            _logger.Information(
+                "Committed block #{Index} {Hash}",
+                block.Index,
+                block.Hash);
+        }
+
         /// <summary>
         /// A timeout mutation to run if no <see cref="ConsensusProposalMsg"/> is received in
         /// <see cref="TimeoutPropose"/> and is still in <see cref="ConsensusStep.Propose"/> step.
@@ -470,9 +467,7 @@ private void ProcessTimeoutPropose(int round)
         {
             if (round == Round && Step == ConsensusStep.Propose)
             {
-                PublishMessage(
-                    new ConsensusPreVoteMsg(MakeVote(Round, default, VoteFlag.PreVote)));
-                Step = ConsensusStep.PreVote;
+                EnterPreVote(round, default);
                 TimeoutProcessed?.Invoke(this, (round, ConsensusStep.Propose));
             }
         }
@@ -487,9 +482,7 @@ private void ProcessTimeoutPreVote(int round)
         {
             if (round == Round && Step == ConsensusStep.PreVote)
             {
-                PublishMessage(
-                    new ConsensusPreCommitMsg(MakeVote(Round, default, VoteFlag.PreCommit)));
-                Step = ConsensusStep.PreCommit;
+                EnterPreCommit(round, default);
                 TimeoutProcessed?.Invoke(this, (round, ConsensusStep.PreVote));
             }
         }
@@ -510,7 +503,7 @@ private void ProcessTimeoutPreCommit(int round)
 
             if (round == Round)
             {
-                StartRound(Round + 1);
+                EnterEndCommit(round);
                 TimeoutProcessed?.Invoke(this, (round, ConsensusStep.PreCommit));
             }
         }
diff --git a/src/Libplanet.Net/Consensus/Context.cs b/src/Libplanet.Net/Consensus/Context.cs
index 4f0fb2e6c9..3ef10eaa30 100644
--- a/src/Libplanet.Net/Consensus/Context.cs
+++ b/src/Libplanet.Net/Consensus/Context.cs
@@ -98,6 +98,7 @@ private readonly EvidenceExceptionCollector _evidenceCollector
         private readonly ILogger _logger;
         private readonly LRUCache<BlockHash, bool> _blockValidationCache;
 
+        private Block? _proposalBlock;
         private Block? _lockedValue;
         private int _lockedRound;
         private Block? _validValue;
@@ -585,21 +586,30 @@ private Maj23 MakeMaj23(int round, BlockHash hash, VoteFlag flag)
         }
 
         /// <summary>
-        /// Gets the proposed block and valid round of the given round.
+        /// Sets the proposal for the round.
         /// </summary>
-        /// <returns>Returns a tuple of proposer and valid round.  If proposal for the round
-        /// does not exist, returns <see langword="null"/> instead.
-        /// </returns>
-        private (Block, int)? GetProposal()
+        private void SetProposal(Proposal? proposal)
         {
-            if (Proposal is { } p)
+            if (proposal is { } p)
             {
-                var block = BlockMarshaler.UnmarshalBlock(
-                    (Dictionary)_codec.Decode(p.MarshaledBlock));
-                return (block, p.ValidRound);
+                Proposal = proposal;
+                _proposalBlock =
+                    BlockMarshaler.UnmarshalBlock((Dictionary)_codec.Decode(p.MarshaledBlock));
+            }
+            else
+            {
+                Proposal = null;
+                _proposalBlock = null;
             }
-
-            return null;
         }
+
+        /// <summary>
+        /// Gets the proposed block and valid round of the given round.
+        /// </summary>
+        /// <returns>Returns a tuple of proposer and valid round.  If proposal for the round
+        /// does not exist, returns <see langword="null"/> instead.
+        /// </returns>
+        private (Block, int)? GetProposal() =>
+            Proposal is { } p && _proposalBlock is { } b ? (b, p.ValidRound) : null;
     }
 }

From ef8bf7c6c974261f8b3df586e8612bf9c0e9f9cc Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Fri, 6 Dec 2024 19:00:24 +0900
Subject: [PATCH 05/11] feat: delayed consensus step transition

---
 src/Libplanet.Net/Consensus/Context.Async.cs  | 34 +++++++++++++++++++
 src/Libplanet.Net/Consensus/Context.Mutate.cs | 28 ++++++++++++---
 src/Libplanet.Net/Consensus/Context.cs        |  8 +++--
 src/Libplanet.Net/Consensus/ContextOption.cs  | 24 ++++++-------
 4 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/Libplanet.Net/Consensus/Context.Async.cs b/src/Libplanet.Net/Consensus/Context.Async.cs
index a2b80acbe5..a3d73b2974 100644
--- a/src/Libplanet.Net/Consensus/Context.Async.cs
+++ b/src/Libplanet.Net/Consensus/Context.Async.cs
@@ -189,6 +189,40 @@ private void AppendBlock(Block block)
             _ = Task.Run(() => _blockChain.Append(block, GetBlockCommit()));
         }
 
+        private async Task EnterPreCommitWait(int round, BlockHash hash)
+        {
+            if (!_preCommitWaitFlags.Add(round))
+            {
+                return;
+            }
+
+            if (_contextOption.EnterPreCommitDelay > 0)
+            {
+                await Task.Delay(
+                    _contextOption.EnterPreCommitDelay,
+                    _cancellationTokenSource.Token);
+            }
+
+            ProduceMutation(() => EnterPreCommit(round, hash));
+        }
+
+        private async Task EnterEndCommitWait(int round)
+        {
+            if (!_endCommitWaitFlags.Add(round))
+            {
+                return;
+            }
+
+            if (_contextOption.EnterEndCommitDelay > 0)
+            {
+                await Task.Delay(
+                    _contextOption.EnterEndCommitDelay,
+                    _cancellationTokenSource.Token);
+            }
+
+            ProduceMutation(() => EnterEndCommit(round));
+        }
+
         /// <summary>
         /// Schedules <see cref="ProcessTimeoutPropose"/> to be queued after
         /// <see cref="TimeoutPropose"/> amount of time.
diff --git a/src/Libplanet.Net/Consensus/Context.Mutate.cs b/src/Libplanet.Net/Consensus/Context.Mutate.cs
index 5affc5873c..13d6724a92 100644
--- a/src/Libplanet.Net/Consensus/Context.Mutate.cs
+++ b/src/Libplanet.Net/Consensus/Context.Mutate.cs
@@ -307,7 +307,7 @@ private void ProcessGenericUponRules()
                         ToString());
                     _lockedValue = p3.Block;
                     _lockedRound = Round;
-                    EnterPreCommit(Round, p3.Block.Hash);
+                    _ = EnterPreCommitWait(Round, p3.Block.Hash);
 
                     // Maybe need to broadcast periodically?
                     PublishMessage(
@@ -329,7 +329,7 @@ private void ProcessGenericUponRules()
                         "were collected. (context: {Context})",
                         Round,
                         ToString());
-                    EnterPreCommit(Round, default);
+                    _ = EnterPreCommitWait(Round, default);
                 }
                 else if (Proposal is { } proposal && !proposal.BlockHash.Equals(hash3))
                 {
@@ -387,12 +387,12 @@ private void ProcessHeightOrRoundUponRules(ConsensusMsg message)
                 PublishMessage(
                     new ConsensusMaj23Msg(
                         MakeMaj23(round, block4.Hash, VoteFlag.PreCommit)));
-                EnterEndCommit(Round);
+                _ = EnterEndCommitWait(Round);
                 return;
             }
 
             // NOTE: +1/3 prevote received, skip round
-            // FIXME: Tendermint uses +2/3, should fixed?
+            // FIXME: Tendermint uses +2/3, should be fixed?
             if (round > Round &&
                 _heightVoteSet.PreVotes(round).HasOneThirdsAny())
             {
@@ -409,6 +409,12 @@ private void ProcessHeightOrRoundUponRules(ConsensusMsg message)
 
         private void EnterPreVote(int round, BlockHash hash)
         {
+            if (Round != round || Step >= ConsensusStep.PreVote)
+            {
+                // Round and step mismatch
+                return;
+            }
+
             Step = ConsensusStep.PreVote;
             PublishMessage(
                 new ConsensusPreVoteMsg(MakeVote(round, hash, VoteFlag.PreVote)));
@@ -416,6 +422,12 @@ private void EnterPreVote(int round, BlockHash hash)
 
         private void EnterPreCommit(int round, BlockHash hash)
         {
+            if (Round != round || Step >= ConsensusStep.PreCommit)
+            {
+                // Round and step mismatch
+                return;
+            }
+
             Step = ConsensusStep.PreCommit;
             PublishMessage(
                 new ConsensusPreCommitMsg(MakeVote(round, hash, VoteFlag.PreCommit)));
@@ -423,6 +435,14 @@ private void EnterPreCommit(int round, BlockHash hash)
 
         private void EnterEndCommit(int round)
         {
+            if (Round != round ||
+                Step == ConsensusStep.Default ||
+                Step == ConsensusStep.EndCommit)
+            {
+                // Round and step mismatch
+                return;
+            }
+
             Step = ConsensusStep.EndCommit;
             if (_decision is not { } block)
             {
diff --git a/src/Libplanet.Net/Consensus/Context.cs b/src/Libplanet.Net/Consensus/Context.cs
index 3ef10eaa30..982ae153d7 100644
--- a/src/Libplanet.Net/Consensus/Context.cs
+++ b/src/Libplanet.Net/Consensus/Context.cs
@@ -87,9 +87,11 @@ public partial class Context : IDisposable
         private readonly Channel<System.Action> _mutationRequests;
         private readonly HeightVoteSet _heightVoteSet;
         private readonly PrivateKey _privateKey;
-        private readonly HashSet<int> _preVoteTimeoutFlags;
         private readonly HashSet<int> _hasTwoThirdsPreVoteFlags;
+        private readonly HashSet<int> _preVoteTimeoutFlags;
         private readonly HashSet<int> _preCommitTimeoutFlags;
+        private readonly HashSet<int> _preCommitWaitFlags;
+        private readonly HashSet<int> _endCommitWaitFlags;
         private readonly EvidenceExceptionCollector _evidenceCollector
             = new EvidenceExceptionCollector();
 
@@ -184,9 +186,11 @@ private Context(
             _messageRequests = Channel.CreateUnbounded<ConsensusMsg>();
             _mutationRequests = Channel.CreateUnbounded<System.Action>();
             _heightVoteSet = new HeightVoteSet(height, validators);
-            _preVoteTimeoutFlags = new HashSet<int>();
             _hasTwoThirdsPreVoteFlags = new HashSet<int>();
+            _preVoteTimeoutFlags = new HashSet<int>();
             _preCommitTimeoutFlags = new HashSet<int>();
+            _preCommitWaitFlags = new HashSet<int>();
+            _endCommitWaitFlags = new HashSet<int>();
             _validatorSet = validators;
             _cancellationTokenSource = new CancellationTokenSource();
             _blockValidationCache =
diff --git a/src/Libplanet.Net/Consensus/ContextOption.cs b/src/Libplanet.Net/Consensus/ContextOption.cs
index a9be35f9f7..95ef6022cf 100644
--- a/src/Libplanet.Net/Consensus/ContextOption.cs
+++ b/src/Libplanet.Net/Consensus/ContextOption.cs
@@ -23,7 +23,7 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(proposeTimeoutBase),
-                    "ProposeSecondBase must be greater than 0.");
+                    "ProposeTimeoutBase must be greater than 0.");
             }
 
             ProposeTimeoutBase = proposeTimeoutBase;
@@ -32,7 +32,7 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(preVoteTimeoutBase),
-                    "PreVoteSecondBase must be greater than 0.");
+                    "PreVoteTimeoutBase must be greater than 0.");
             }
 
             PreVoteTimeoutBase = preVoteTimeoutBase;
@@ -41,7 +41,7 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(preCommitTimeoutBase),
-                    "PreCommitSecondBase must be greater than 0.");
+                    "PreCommitTimeoutBase must be greater than 0.");
             }
 
             PreCommitTimeoutBase = preCommitTimeoutBase;
@@ -50,7 +50,7 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(proposeTimeoutDelta),
-                    "ProposeMultiplier must be greater than 0.");
+                    "ProposeTimeoutDelta must be greater than 0.");
             }
 
             ProposeTimeoutDelta = proposeTimeoutDelta;
@@ -59,7 +59,7 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(preVoteTimeoutDelta),
-                    "PreVoteMultiplier must be greater than 0.");
+                    "PreVoteTimeoutDelta must be greater than 0.");
             }
 
             PreVoteTimeoutDelta = preVoteTimeoutDelta;
@@ -68,34 +68,34 @@ public ContextOption(
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(preCommitTimeoutDelta),
-                    "PreCommitMultiplier must be greater than 0.");
+                    "PreCommitTimeoutDelta must be greater than 0.");
             }
 
             PreCommitTimeoutDelta = preCommitTimeoutDelta;
 
-            if (enterPreVoteDelay <= 0)
+            if (enterPreVoteDelay < 0)
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(enterPreVoteDelay),
-                    "PreCommitMultiplier must be greater than 0.");
+                    "EnterPreVoteDelay must be greater than or equal to 0.");
             }
 
             EnterPreVoteDelay = enterPreVoteDelay;
 
-            if (enterPreCommitDelay <= 0)
+            if (enterPreCommitDelay < 0)
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(enterPreCommitDelay),
-                    "PreCommitMultiplier must be greater than 0.");
+                    "EnterPreCommitDelay must be greater than or equal to 0.");
             }
 
             EnterPreCommitDelay = enterPreCommitDelay;
 
-            if (enterEndCommitDelay <= 0)
+            if (enterEndCommitDelay < 0)
             {
                 throw new ArgumentOutOfRangeException(
                     nameof(enterEndCommitDelay),
-                    "PreCommitMultiplier must be greater than 0.");
+                    "EnterEndCommitDelay must be greater than or equal to 0.");
             }
 
             EnterEndCommitDelay = enterEndCommitDelay;

From 9a5e48a963c0a486ed3e1d8f841b61f35b8f1f9f Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Sat, 7 Dec 2024 15:02:19 +0900
Subject: [PATCH 06/11] test: add unit test for delayed consensus

---
 .../Consensus/ContextTest.cs                  | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/test/Libplanet.Net.Tests/Consensus/ContextTest.cs b/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
index ec224a1b3d..703d5e2b60 100644
--- a/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
+++ b/test/Libplanet.Net.Tests/Consensus/ContextTest.cs
@@ -28,6 +28,7 @@
 using Serilog;
 using Xunit;
 using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace Libplanet.Net.Tests.Consensus
 {
@@ -715,6 +716,91 @@ public async Task CanCreateContextWithLastingEvaluation()
             Assert.Equal(2, consensusContext.Height);
         }
 
+        [Theory(Timeout = Timeout)]
+        [InlineData(0)]
+        [InlineData(100)]
+        [InlineData(500)]
+        public async Task CanCollectPreVoteAfterMajority(int delay)
+        {
+            var stepChangedToPreVote = new AsyncAutoResetEvent();
+            var stepChangedToPreCommit = new AsyncAutoResetEvent();
+            Block? proposedBlock = null;
+            int numPreVotes = 0;
+            var (_, context) = TestUtils.CreateDummyContext(
+                contextOption: new ContextOption(
+                    enterPreCommitDelay: delay));
+            context.StateChanged += (_, eventArgs) =>
+            {
+                if (eventArgs.Step == ConsensusStep.PreVote)
+                {
+                    stepChangedToPreVote.Set();
+                }
+                else if (eventArgs.Step == ConsensusStep.PreCommit)
+                {
+                    stepChangedToPreCommit.Set();
+                }
+            };
+            context.MessageToPublish += (_, message) =>
+            {
+                if (message is ConsensusProposalMsg proposalMsg)
+                {
+                    proposedBlock = BlockMarshaler.UnmarshalBlock(
+                        (Dictionary)new Codec().Decode(proposalMsg!.Proposal.MarshaledBlock));
+                }
+            };
+            context.VoteSetModified += (_, tuple) =>
+            {
+                if (tuple.Flag == VoteFlag.PreVote)
+                {
+                    numPreVotes = tuple.Votes.Count();
+                }
+            };
+            context.Start();
+            await stepChangedToPreVote.WaitAsync();
+            Assert.Equal(ConsensusStep.PreVote, context.Step);
+            if (proposedBlock is not { } block)
+            {
+                throw new XunitException("No proposal is made");
+            }
+
+            for (int i = 0; i < 3; i++)
+            {
+                context.ProduceMessage(
+                    new ConsensusPreVoteMsg(
+                        new VoteMetadata(
+                            block.Index,
+                            0,
+                            block.Hash,
+                            DateTimeOffset.UtcNow,
+                            TestUtils.PrivateKeys[i].PublicKey,
+                            TestUtils.ValidatorSet[i].Power,
+                            VoteFlag.PreVote).Sign(TestUtils.PrivateKeys[i])));
+            }
+
+            // Send delayed PreVote message after sending preCommit message
+            var cts = new CancellationTokenSource();
+            const int preVoteDelay = 300;
+            _ = Task.Run(
+                async () =>
+                {
+                    await Task.Delay(preVoteDelay, cts.Token);
+                    context.ProduceMessage(
+                        new ConsensusPreVoteMsg(
+                            new VoteMetadata(
+                                block.Index,
+                                0,
+                                block.Hash,
+                                DateTimeOffset.UtcNow,
+                                TestUtils.PrivateKeys[3].PublicKey,
+                                TestUtils.ValidatorSet[3].Power,
+                                VoteFlag.PreVote).Sign(TestUtils.PrivateKeys[3])));
+                }, cts.Token);
+
+            await stepChangedToPreCommit.WaitAsync();
+            cts.Cancel();
+            Assert.Equal(delay < preVoteDelay ? 3 : 4, numPreVotes);
+        }
+
         public struct ContextJson
         {
 #pragma warning disable SA1300

From b2712b94cafcba4c955071229a8f6359e502d817 Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Mon, 9 Dec 2024 14:14:16 +0900
Subject: [PATCH 07/11] chore: add logging

---
 src/Libplanet.Net/Consensus/Context.Mutate.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Libplanet.Net/Consensus/Context.Mutate.cs b/src/Libplanet.Net/Consensus/Context.Mutate.cs
index 13d6724a92..fa5b6892b2 100644
--- a/src/Libplanet.Net/Consensus/Context.Mutate.cs
+++ b/src/Libplanet.Net/Consensus/Context.Mutate.cs
@@ -301,8 +301,8 @@ private void ProcessGenericUponRules()
                 if (Step == ConsensusStep.PreVote)
                 {
                     _logger.Debug(
-                        "Entering PreCommit step due to proposal message and have collected " +
-                        "2/3+ PreVote for current round {Round}. (context: {Context})",
+                        "Schedule to enter PreCommit step due to proposal message and have " +
+                        "collected 2/3+ PreVote for current round {Round}. (context: {Context})",
                         Round,
                         ToString());
                     _lockedValue = p3.Block;
@@ -428,6 +428,10 @@ private void EnterPreCommit(int round, BlockHash hash)
                 return;
             }
 
+            _logger.Debug(
+                "Entering PreCommit step current round {Round}. (context: {Context})",
+                Round,
+                ToString());
             Step = ConsensusStep.PreCommit;
             PublishMessage(
                 new ConsensusPreCommitMsg(MakeVote(round, hash, VoteFlag.PreCommit)));

From 750b011b4d6f426e969fb0387948acb26955105d Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Wed, 11 Dec 2024 14:55:49 +0900
Subject: [PATCH 08/11] chore: rebuild connection via seed peer

---
 src/Libplanet.Net/Consensus/Gossip.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Libplanet.Net/Consensus/Gossip.cs b/src/Libplanet.Net/Consensus/Gossip.cs
index 3e0a0031eb..9ec93da2d7 100644
--- a/src/Libplanet.Net/Consensus/Gossip.cs
+++ b/src/Libplanet.Net/Consensus/Gossip.cs
@@ -542,7 +542,21 @@ private async Task RebuildTableAsync(CancellationToken ctx)
                     "{FName}: Updating peer table from seed(s) {Seeds}...",
                     nameof(RebuildTableAsync),
                     _seeds.Select(s => s.Address.ToHex()));
-                await _protocol.RebuildConnectionAsync(Kademlia.MaxDepth, ctx);
+                try
+                {
+                    await _protocol.BootstrapAsync(
+                        _seeds,
+                        TimeSpan.FromSeconds(1),
+                        Kademlia.MaxDepth,
+                        ctx);
+                }
+                catch (Exception e)
+                {
+                    _logger.Error(
+                        e,
+                        "Peer discovery exception occurred during {FName}.",
+                        nameof(RebuildTableAsync));
+                }
             }
         }
 

From 1f4e1c99d1172dc8b13aaa7897bf9f0488bef421 Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Thu, 12 Dec 2024 19:29:35 +0900
Subject: [PATCH 09/11] docs: update CHANGES.md

---
 CHANGES.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2d37137018..fae28c6bed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,13 +6,31 @@ Version 5.4.2
 
 To be released.
 
+### Backward-incompatible API changes
+
+ -  Removed `ContextTimeoutOption` class. Instead, added `ContextOption` class.
+    The unit of the time-related options in `ContextOption` is millisecond,
+    whereas `ContextTimeoutOption` was second.  [[#4007]]
+ -  Removed `ConsensusReactorOption.ContextTimeoutOptions` property.
+    Instead, added `ConsensusReactorOption.ContextOption` property.  [[#4007]]
+ -  `ConsensusReactor` constructor requires `ContextOption` parameter
+    instead of the `ContextTimeoutOption` parameter.  [[#4007]]
+
+### Behavioral changes
+
+ -  `Gossip.RebuildTableAsync()` now bootstrap peers from the seed peers.
+    [[#4007]]
+
+
+[#4007]: https://github.com/planetarium/libplanet/pull/4007
+
 
 Version 5.4.1
 -------------
 
 Released on November 22, 2024.
 
--  Ported changes from [Libplanet 5.3.2] release.  [[#3973]]
+ -  Ported changes from [Libplanet 5.3.2] release.  [[#3973]]
 
 [#3973]: https://github.com/planetarium/libplanet/pull/3973
 [Libplanet 5.3.2]: https://www.nuget.org/packages/Libplanet/5.3.2

From c1a205dcda815dbc48f332674fd5610c1ca40e1b Mon Sep 17 00:00:00 2001
From: Chanhyuck Ko <limeelbee@gmail.com>
Date: Thu, 12 Dec 2024 19:35:52 +0900
Subject: [PATCH 10/11] refactor: apply suggestions from the review

---
 src/Libplanet.Net/Consensus/Context.Mutate.cs |  6 +--
 src/Libplanet.Net/Consensus/Context.cs        | 38 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Libplanet.Net/Consensus/Context.Mutate.cs b/src/Libplanet.Net/Consensus/Context.Mutate.cs
index fa5b6892b2..6417befbe8 100644
--- a/src/Libplanet.Net/Consensus/Context.Mutate.cs
+++ b/src/Libplanet.Net/Consensus/Context.Mutate.cs
@@ -29,7 +29,7 @@ private void StartRound(int round)
             RoundStarted?.Invoke(this, Round);
             _heightVoteSet.SetRound(round);
 
-            SetProposal(null);
+            Proposal = null;
             Step = ConsensusStep.Propose;
             if (_validatorSet.GetProposer(Height, Round).PublicKey == _privateKey.PublicKey)
             {
@@ -214,7 +214,7 @@ private void AddProposal(Proposal proposal)
 
             if (Proposal is null)
             {
-                SetProposal(proposal);
+                Proposal = proposal;
                 _logger.Debug("Proposal {BlockHash} is set", proposal.BlockHash);
             }
             else
@@ -341,7 +341,7 @@ private void ProcessGenericUponRules()
                         Round,
                         hash3,
                         ToString());
-                    SetProposal(null);
+                    Proposal = null;
                     PublishMessage(
                         new ConsensusProposalClaimMsg(
                             new ProposalClaimMetadata(
diff --git a/src/Libplanet.Net/Consensus/Context.cs b/src/Libplanet.Net/Consensus/Context.cs
index 982ae153d7..daa7f0063e 100644
--- a/src/Libplanet.Net/Consensus/Context.cs
+++ b/src/Libplanet.Net/Consensus/Context.cs
@@ -100,6 +100,7 @@ private readonly EvidenceExceptionCollector _evidenceCollector
         private readonly ILogger _logger;
         private readonly LRUCache<BlockHash, bool> _blockValidationCache;
 
+        private Proposal? _proposal;
         private Block? _proposalBlock;
         private Block? _lockedValue;
         private int _lockedRound;
@@ -219,7 +220,24 @@ private Context(
         /// </summary>
         public ConsensusStep Step { get; private set; }
 
-        public Proposal? Proposal { get; private set; }
+        public Proposal? Proposal
+        {
+            get => _proposal;
+            private set
+            {
+                if (value is { } p)
+                {
+                    _proposal = p;
+                    _proposalBlock =
+                        BlockMarshaler.UnmarshalBlock((Dictionary)_codec.Decode(p.MarshaledBlock));
+                }
+                else
+                {
+                    _proposal = null;
+                    _proposalBlock = null;
+                }
+            }
+        }
 
         /// <inheritdoc cref="IDisposable.Dispose()"/>
         public void Dispose()
@@ -589,24 +607,6 @@ private Maj23 MakeMaj23(int round, BlockHash hash, VoteFlag flag)
                 flag).Sign(_privateKey);
         }
 
-        /// <summary>
-        /// Sets the proposal for the round.
-        /// </summary>
-        private void SetProposal(Proposal? proposal)
-        {
-            if (proposal is { } p)
-            {
-                Proposal = proposal;
-                _proposalBlock =
-                    BlockMarshaler.UnmarshalBlock((Dictionary)_codec.Decode(p.MarshaledBlock));
-            }
-            else
-            {
-                Proposal = null;
-                _proposalBlock = null;
-            }
-        }
-
         /// <summary>
         /// Gets the proposed block and valid round of the given round.
         /// </summary>

From b17d8aaa556ee4710c1660d5233b29ca4c388c8a Mon Sep 17 00:00:00 2001
From: s2quake <han0210@netsgo.com>
Date: Thu, 12 Dec 2024 20:17:19 +0900
Subject: [PATCH 11/11] test: Fix query test failure for validator power

---
 test/Libplanet.Explorer.Tests/GraphTypes/BlockTypeTest.cs | 2 +-
 test/Libplanet.Explorer.Tests/GraphTypes/VoteTypeTest.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Libplanet.Explorer.Tests/GraphTypes/BlockTypeTest.cs b/test/Libplanet.Explorer.Tests/GraphTypes/BlockTypeTest.cs
index 1c47d06289..772c4cfc06 100644
--- a/test/Libplanet.Explorer.Tests/GraphTypes/BlockTypeTest.cs
+++ b/test/Libplanet.Explorer.Tests/GraphTypes/BlockTypeTest.cs
@@ -122,7 +122,7 @@ public async void Query()
                             { "blockHash", lastVotes[0].BlockHash.ToString() },
                             { "timestamp", new DateTimeOffsetGraphType().Serialize(lastVotes[0].Timestamp) },
                             { "validatorPublicKey", lastVotes[0].ValidatorPublicKey.ToString() },
-                            { "validatorPower", lastVotes[0].ValidatorPower },
+                            { "validatorPower", lastVotes[0].ValidatorPower?.ToString() },
                             { "flag", lastVotes[0].Flag.ToString() },
                             { "signature", ByteUtil.Hex(lastVotes[0].Signature) },
                         }
diff --git a/test/Libplanet.Explorer.Tests/GraphTypes/VoteTypeTest.cs b/test/Libplanet.Explorer.Tests/GraphTypes/VoteTypeTest.cs
index 475928c556..16968d0f8c 100644
--- a/test/Libplanet.Explorer.Tests/GraphTypes/VoteTypeTest.cs
+++ b/test/Libplanet.Explorer.Tests/GraphTypes/VoteTypeTest.cs
@@ -57,7 +57,7 @@ public async void Query()
             Assert.Equal(vote.BlockHash.ToString(), resultData["blockHash"]);
             Assert.Equal(new DateTimeOffsetGraphType().Serialize(vote.Timestamp), resultData["timestamp"]);
             Assert.Equal(vote.ValidatorPublicKey.ToString(), resultData["validatorPublicKey"]);
-            Assert.Equal(vote.ValidatorPower, resultData["validatorPower"]);
+            Assert.Equal(vote.ValidatorPower?.ToString(), resultData["validatorPower"]);
             Assert.Equal(vote.Flag.ToString(), resultData["flag"]);
             Assert.Equal(ByteUtil.Hex(vote.Signature), resultData["signature"]);
         }