Merge pull request #2661 from planetarium/release/231

Release/231

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <LibplanetVersion>5.4.1</LibplanetVersion>
+        <LibplanetVersion>5.4.2</LibplanetVersion>
     </PropertyGroup>
 </Project>

Libplanet.Headless/Hosting/LibplanetNodeService.cs

@@ -238,7 +238,7 @@ IActionEvaluator BuildActionEvaluator(IActionEvaluatorConfiguration actionEvalua
                     ConsensusPrivateKey = Properties.ConsensusPrivateKey,
                     ConsensusWorkers = 500,
                     TargetBlockInterval = TimeSpan.FromMilliseconds(Properties.ConsensusTargetBlockIntervalMilliseconds ?? 7000),
-                    ContextTimeoutOptions = Properties.ContextTimeoutOption,
+                    ContextOption = Properties.ContextOption,
                 };
             }
 

Libplanet.Headless/Hosting/LibplanetNodeServiceProperties.cs

@@ -68,7 +68,7 @@ public class LibplanetNodeServiceProperties
 
         public TimeSpan TipTimeout { get; set; } = TimeSpan.FromSeconds(60);
 
-        public ContextTimeoutOption ContextTimeoutOption { get; set; }
+        public ContextOption ContextOption { get; set; }
 
         public int DemandBuffer { get; set; } = 1150;
 

NineChronicles.Headless.Executable/Configuration.cs

@@ -87,7 +87,8 @@ public class Configuration
         public string[]? ConsensusSeedStrings { get; set; }
         public ushort? ConsensusPort { get; set; }
         public double? ConsensusTargetBlockIntervalMilliseconds { get; set; }
-        public int? ConsensusProposeSecondBase { get; set; }
+        public int? ConsensusProposeTimeoutBase { get; set; }
+        public int? ConsensusEnterPreCommitDelay { get; set; }
 
         public int? MaxTransactionPerBlock { get; set; }
 
@@ -139,7 +140,8 @@ public void Overwrite(
             string? consensusPrivateKeyString,
             string[]? consensusSeedStrings,
             double? consensusTargetBlockIntervalMilliseconds,
-            int? consensusProposeSecondBase,
+            int? consensusProposeTimeoutBase,
+            int? consensusEnterPreCommitDelay,
             int? maxTransactionPerBlock,
             bool? remoteKeyValueService
         )
@@ -190,7 +192,8 @@ public void Overwrite(
             ConsensusSeedStrings = consensusSeedStrings ?? ConsensusSeedStrings;
             ConsensusPrivateKeyString = consensusPrivateKeyString ?? ConsensusPrivateKeyString;
             ConsensusTargetBlockIntervalMilliseconds = consensusTargetBlockIntervalMilliseconds ?? ConsensusTargetBlockIntervalMilliseconds;
-            ConsensusProposeSecondBase = consensusProposeSecondBase ?? ConsensusProposeSecondBase;
+            ConsensusProposeTimeoutBase = consensusProposeTimeoutBase ?? ConsensusProposeTimeoutBase;
+            ConsensusEnterPreCommitDelay = consensusEnterPreCommitDelay ?? ConsensusEnterPreCommitDelay;
             MaxTransactionPerBlock = maxTransactionPerBlock ?? MaxTransactionPerBlock;
             RemoteKeyValueService = remoteKeyValueService ?? RemoteKeyValueService;
         }

NineChronicles.Headless.Executable/Program.cs

@@ -209,6 +209,9 @@ public async Task Run(
             [Option("consensus-propose-second-base",
                 Description = "A propose second base for consensus context timeout. The unit is second.")]
             int? consensusProposeSecondBase = null,
+            [Option("consensus-enter-precommit-delay",
+                Description = "A precommit delay manually set. The unit is millisecond.")]
+            int? consensusEnterPreCommitDelay = null,
             [Option("maximum-transaction-per-block",
                 Description = "Maximum transactions allowed in a block. null by default.")]
             int? maxTransactionPerBlock = null,
@@ -290,16 +293,55 @@ public async Task Run(
                 GetActionEvaluatorConfiguration(configuration.GetSection("Headless").GetSection("ActionEvaluator"));
 
             headlessConfig.Overwrite(
-                appProtocolVersionToken, trustedAppProtocolVersionSigners, genesisBlockPath, host, port,
-                swarmPrivateKeyString, storeType, storePath, noReduceStore, noMiner, minerCount,
-                minerPrivateKeyString, minerBlockIntervalMilliseconds, planet, iceServerStrings, peerStrings, rpcServer, rpcListenHost,
-                rpcListenPort, rpcRemoteServer, rpcHttpServer, graphQLServer, graphQLHost, graphQLPort,
-                graphQLSecretTokenPath, noCors, nonblockRenderer, nonblockRendererQueue, strictRendering,
-                logActionRenders, confirmations,
-                txLifeTime, messageTimeout, tipTimeout, demandBuffer, skipPreload,
-                minimumBroadcastTarget, bucketSize, chainTipStaleBehaviorType, txQuotaPerSigner, maximumPollPeers,
-                consensusPort, consensusPrivateKeyString, consensusSeedStrings, consensusTargetBlockIntervalMilliseconds, consensusProposeSecondBase,
-                maxTransactionPerBlock, remoteKeyValueService
+                appProtocolVersionToken,
+                trustedAppProtocolVersionSigners,
+                genesisBlockPath,
+                host,
+                port,
+                swarmPrivateKeyString,
+                storeType,
+                storePath,
+                noReduceStore,
+                noMiner,
+                minerCount,
+                minerPrivateKeyString,
+                minerBlockIntervalMilliseconds,
+                planet,
+                iceServerStrings,
+                peerStrings,
+                rpcServer,
+                rpcListenHost,
+                rpcListenPort,
+                rpcRemoteServer,
+                rpcHttpServer,
+                graphQLServer,
+                graphQLHost,
+                graphQLPort,
+                graphQLSecretTokenPath,
+                noCors,
+                nonblockRenderer,
+                nonblockRendererQueue,
+                strictRendering,
+                logActionRenders,
+                confirmations,
+                txLifeTime,
+                messageTimeout,
+                tipTimeout,
+                demandBuffer,
+                skipPreload,
+                minimumBroadcastTarget,
+                bucketSize,
+                chainTipStaleBehaviorType,
+                txQuotaPerSigner,
+                maximumPollPeers,
+                consensusPort,
+                consensusPrivateKeyString,
+                consensusSeedStrings,
+                consensusTargetBlockIntervalMilliseconds,
+                consensusProposeSecondBase * 1_000,
+                consensusEnterPreCommitDelay,
+                maxTransactionPerBlock,
+                remoteKeyValueService
             );
 
             // Clean-up previous temporary log files.
@@ -367,7 +409,8 @@ public async Task Run(
                         consensusPrivateKeyString: headlessConfig.ConsensusPrivateKeyString,
                         consensusSeedStrings: headlessConfig.ConsensusSeedStrings,
                         consensusTargetBlockIntervalMilliseconds: headlessConfig.ConsensusTargetBlockIntervalMilliseconds,
-                        consensusProposeSecondBase: headlessConfig.ConsensusProposeSecondBase,
+                        consensusProposeTimeoutBase: headlessConfig.ConsensusProposeTimeoutBase,
+                        consensusEnterPreCommitDelay: headlessConfig.ConsensusEnterPreCommitDelay,
                         maximumPollPeers: headlessConfig.MaximumPollPeers,
                         actionEvaluatorConfiguration: actionEvaluatorConfiguration
                     );

NineChronicles.Headless/Properties/NineChroniclesNodeServiceProperties.cs

@@ -91,7 +91,8 @@ public static LibplanetNodeServiceProperties
                 string? consensusPrivateKeyString = null,
                 string[]? consensusSeedStrings = null,
                 double? consensusTargetBlockIntervalMilliseconds = null,
-                int? consensusProposeSecondBase = null,
+                int? consensusProposeTimeoutBase = null,
+                int? consensusEnterPreCommitDelay = null,
                 IActionEvaluatorConfiguration? actionEvaluatorConfiguration = null)
         {
             var swarmPrivateKey = string.IsNullOrEmpty(swarmPrivateKeyString)
@@ -108,9 +109,10 @@ public static LibplanetNodeServiceProperties
             var peers = peerStrings.Select(PropertyParser.ParsePeer).ToImmutableArray();
             var consensusSeeds = consensusSeedStrings?.Select(PropertyParser.ParsePeer).ToImmutableList();
 
-            var consensusContextTimeoutOption = consensusProposeSecondBase.HasValue
-                ? new ContextTimeoutOption(consensusProposeSecondBase.Value)
-                : new ContextTimeoutOption();
+            var defaultContextOption = new ContextOption();
+            var consensusContextOption = new ContextOption(
+                proposeTimeoutBase: consensusProposeTimeoutBase ?? defaultContextOption.ProposeTimeoutBase,
+                enterPreCommitDelay: consensusEnterPreCommitDelay ?? defaultContextOption.EnterPreCommitDelay);
 
             return new LibplanetNodeServiceProperties
             {
@@ -147,7 +149,7 @@ public static LibplanetNodeServiceProperties
                 ConsensusSeeds = consensusSeeds,
                 ConsensusPrivateKey = consensusPrivateKey,
                 ConsensusTargetBlockIntervalMilliseconds = consensusTargetBlockIntervalMilliseconds,
-                ContextTimeoutOption = consensusContextTimeoutOption,
+                ContextOption = consensusContextOption,
                 ActionEvaluatorConfiguration = actionEvaluatorConfiguration ?? new DefaultActionEvaluatorConfiguration(),
             };
         }