add --consensus-propose-second-base cli parameter

planetarium · May 7, 2024 · a2c3811 · a2c3811
1 parent 333d6a2
commit a2c3811
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/Libplanet.Headless/Hosting/LibplanetNodeService.cs b/Libplanet.Headless/Hosting/LibplanetNodeService.cs
@@ -235,6 +235,7 @@ IActionEvaluator BuildActionEvaluator(IActionEvaluatorConfiguration actionEvalua
                     ConsensusPrivateKey = Properties.ConsensusPrivateKey,
                     ConsensusWorkers = 500,
                     TargetBlockInterval = TimeSpan.FromMilliseconds(Properties.ConsensusTargetBlockIntervalMilliseconds ?? 7000),
+                    ContextTimeoutOptions = Properties.ContextTimeoutOption,
                 };
             }
 

diff --git a/Libplanet.Headless/Hosting/LibplanetNodeServiceProperties.cs b/Libplanet.Headless/Hosting/LibplanetNodeServiceProperties.cs
@@ -5,6 +5,7 @@
 using Libplanet.Types.Blocks;
 using Libplanet.Crypto;
 using Libplanet.Net;
+using Libplanet.Net.Consensus;
 
 namespace Libplanet.Headless.Hosting
 {
@@ -67,6 +68,8 @@ public class LibplanetNodeServiceProperties
 
         public TimeSpan TipTimeout { get; set; } = TimeSpan.FromSeconds(60);
 
+        public ContextTimeoutOption ContextTimeoutOption { get; set; }
+
         public int DemandBuffer { get; set; } = 1150;
 
         public ImmutableList<BoundPeer> ConsensusSeeds { get; set; }

diff --git a/NineChronicles.Headless.Executable/Configuration.cs b/NineChronicles.Headless.Executable/Configuration.cs
@@ -84,6 +84,7 @@ 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? MaxTransactionPerBlock { get; set; }
 
@@ -143,6 +144,7 @@ public void Overwrite(
             string? consensusPrivateKeyString,
             string[]? consensusSeedStrings,
             double? consensusTargetBlockIntervalMilliseconds,
+            int? consensusProposeSecondBase,
             int? maxTransactionPerBlock,
             string? sentryDsn,
             double? sentryTraceSampleRate,
@@ -195,6 +197,7 @@ public void Overwrite(
             ConsensusSeedStrings = consensusSeedStrings ?? ConsensusSeedStrings;
             ConsensusPrivateKeyString = consensusPrivateKeyString ?? ConsensusPrivateKeyString;
             ConsensusTargetBlockIntervalMilliseconds = consensusTargetBlockIntervalMilliseconds ?? ConsensusTargetBlockIntervalMilliseconds;
+            ConsensusProposeSecondBase = consensusProposeSecondBase ?? ConsensusProposeSecondBase;
             MaxTransactionPerBlock = maxTransactionPerBlock ?? MaxTransactionPerBlock;
             SentryDsn = sentryDsn ?? SentryDsn;
             SentryTraceSampleRate = sentryTraceSampleRate ?? SentryTraceSampleRate;

diff --git a/NineChronicles.Headless.Executable/Program.cs b/NineChronicles.Headless.Executable/Program.cs
@@ -205,6 +205,9 @@ public async Task Run(
             [Option("consensus-target-block-interval",
                 Description = "A target block interval used in consensus context. The unit is millisecond.")]
             double? consensusTargetBlockIntervalMilliseconds = null,
+            [Option("consensus-propose-second-base",
+                Description = "A propose second base for consensus context timeout. The unit is second.")]
+            int? consensusProposeSecondBase = null,
             [Option("maximum-transaction-per-block",
                 Description = "Maximum transactions allowed in a block. null by default.")]
             int? maxTransactionPerBlock = null,
@@ -304,7 +307,7 @@ public async Task Run(
                 logActionRenders, confirmations,
                 txLifeTime, messageTimeout, tipTimeout, demandBuffer, skipPreload,
                 minimumBroadcastTarget, bucketSize, chainTipStaleBehaviorType, txQuotaPerSigner, maximumPollPeers,
-                consensusPort, consensusPrivateKeyString, consensusSeedStrings, consensusTargetBlockIntervalMilliseconds,
+                consensusPort, consensusPrivateKeyString, consensusSeedStrings, consensusTargetBlockIntervalMilliseconds, consensusProposeSecondBase,
                 maxTransactionPerBlock, sentryDsn, sentryTraceSampleRate, arenaParticipantsSyncInterval
             );
 
@@ -406,6 +409,7 @@ public async Task Run(
                         consensusPrivateKeyString: headlessConfig.ConsensusPrivateKeyString,
                         consensusSeedStrings: headlessConfig.ConsensusSeedStrings,
                         consensusTargetBlockIntervalMilliseconds: headlessConfig.ConsensusTargetBlockIntervalMilliseconds,
+                        consensusProposeSecondBase: headlessConfig.ConsensusProposeSecondBase,
                         maximumPollPeers: headlessConfig.MaximumPollPeers,
                         actionEvaluatorConfiguration: actionEvaluatorConfiguration
                     );

diff --git a/NineChronicles.Headless/Properties/NineChroniclesNodeServiceProperties.cs b/NineChronicles.Headless/Properties/NineChroniclesNodeServiceProperties.cs
@@ -7,6 +7,7 @@
 using Libplanet.Net;
 using Libplanet.Headless.Hosting;
 using Libplanet.Headless;
+using Libplanet.Net.Consensus;
 using Nekoyume;
 
 namespace NineChronicles.Headless.Properties
@@ -93,6 +94,7 @@ public static LibplanetNodeServiceProperties
                 string? consensusPrivateKeyString = null,
                 string[]? consensusSeedStrings = null,
                 double? consensusTargetBlockIntervalMilliseconds = null,
+                int? consensusProposeSecondBase = null,
                 IActionEvaluatorConfiguration? actionEvaluatorConfiguration = null)
         {
             var swarmPrivateKey = string.IsNullOrEmpty(swarmPrivateKeyString)
@@ -109,6 +111,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();
+
             return new LibplanetNodeServiceProperties
             {
                 Host = swarmHost,
@@ -144,6 +150,7 @@ public static LibplanetNodeServiceProperties
                 ConsensusSeeds = consensusSeeds,
                 ConsensusPrivateKey = consensusPrivateKey,
                 ConsensusTargetBlockIntervalMilliseconds = consensusTargetBlockIntervalMilliseconds,
+                ContextTimeoutOption = consensusContextTimeoutOption,
                 ActionEvaluatorConfiguration = actionEvaluatorConfiguration ?? new DefaultActionEvaluatorConfiguration(),
             };
         }