Merge pull request #2667 from planetarium/release/230-to-development

Release/230 to development

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.Executable/appsettings.json

@@ -109,6 +109,11 @@
                 "Endpoint": "*:/graphql/stagetransaction",
                 "Period": "60s",
                 "Limit": 12
+            },
+            {
+                "Endpoint": "*:/graphql/transactionresults",
+                "Period": "60s",
+                "Limit": 60
             }
         ],
         "QuotaExceededResponse": {
@@ -117,6 +122,7 @@
             "StatusCode": 429
         },
         "IpBanThresholdCount": 5,
+        "TransactionResultsBanThresholdCount": 100,
         "IpBanMinute" : 60,
         "IpBanResponse": {
             "Content": "{ \"message\": \"Your Ip has been banned.\" }",

NineChronicles.Headless/BlockChainService.cs

@@ -277,7 +277,7 @@ public UnaryResult<Dictionary<byte[], byte[]>> GetSheets(
             sw.Restart();
             if (addresses.Any())
             {
-                var stateRootHash = new BlockHash(stateRootHashBytes);
+                var stateRootHash = new HashDigest<SHA256>(stateRootHashBytes);
                 IReadOnlyList<IValue> values = _blockChain.GetWorldState(stateRootHash).GetLegacyStates(addresses);
                 sw.Stop();
                 Log.Information("[GetSheets]Get sheet from state: {Count}, Elapsed: {Elapsed}", addresses.Count, sw.Elapsed);

NineChronicles.Headless/GraphQLService.cs

@@ -202,11 +202,14 @@ public void ConfigureServices(IServiceCollection services)
                                         "Admin"));
 
                             // FIXME: Use ConfigurationException after bumping to .NET 8 or later.
-                            options.AddPolicy(
-                                JwtPolicyKey,
-                                p =>
-                                    p.RequireClaim("iss",
-                                        jwtOptions["Issuer"] ?? throw new ArgumentException("jwtOptions[\"Issuer\"] is null.")));
+                            if (Convert.ToBoolean(Configuration.GetSection("Jwt")["EnableJwtAuthentication"]))
+                            {
+                                options.AddPolicy(
+                                    JwtPolicyKey,
+                                    p =>
+                                        p.RequireClaim("iss",
+                                            jwtOptions["Issuer"] ?? throw new ArgumentException("jwtOptions[\"Issuer\"] is null.")));
+                            }
                         });
 
                 services.AddGraphTypes();
@@ -220,6 +223,17 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 }
 
                 // Capture requests
+                app.UseMiddleware<HttpCaptureMiddleware>();
+
+                app.UseRouting();
+                app.UseAuthorization();
+                if (Convert.ToBoolean(Configuration.GetSection("IpRateLimiting")["EnableEndpointRateLimiting"]))
+                {
+                    app.UseMiddleware<CustomRateLimitMiddleware>();
+                    app.UseMiddleware<IpBanMiddleware>();
+                    app.UseMvc();
+                }
+
                 if (Convert.ToBoolean(Configuration.GetSection("MultiAccountManaging")["EnableManaging"]))
                 {
                     ConcurrentDictionary<string, HashSet<Address>> ipSignerList = new();
@@ -229,7 +243,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                         Publisher);
                 }
 
-                app.UseMiddleware<HttpCaptureMiddleware>();
 
                 app.UseMiddleware<LocalAuthenticationMiddleware>();
                 if (Convert.ToBoolean(Configuration.GetSection("Jwt")["EnableJwtAuthentication"]))
@@ -246,15 +259,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                     app.UseCors("AllowAllOrigins");
                 }
 
-                app.UseRouting();
-                app.UseAuthorization();
-                if (Convert.ToBoolean(Configuration.GetSection("IpRateLimiting")["EnableEndpointRateLimiting"]))
-                {
-                    app.UseMiddleware<CustomRateLimitMiddleware>();
-                    app.UseMiddleware<IpBanMiddleware>();
-                    app.UseMvc();
-                }
-
                 app.UseEndpoints(endpoints =>
                 {
                     endpoints.MapControllers();