Merge branch 'dev' into nep-25

shargon · web-flow · commit 35229d4e556e · 2025-10-03T10:55:43.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -156,6 +156,7 @@ jobs:
           ${{ github.workspace }}/TestResults/Neo.Plugins.RpcServer.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Plugins.Storage.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Plugins.ApplicationLogs.Tests/coverage.info
+          ${{ github.workspace }}/TestResults/Neo.Plugins.StateService.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Extensions.Tests/coverage.info
 
   PublishPackage:
diff --git a/src/Neo.CLI/CLI/CommandLineOption.cs b/src/Neo.CLI/CLI/CommandLineOption.cs
@@ -21,6 +21,7 @@ public class CommandLineOptions
         public string? DBPath { get; init; }
         public LogLevel Verbose { get; init; } = LogLevel.Info;
         public bool? NoVerify { get; init; }
+        public bool Background { get; init; }
 
         /// <summary>
         /// Check if CommandLineOptions was configured
diff --git a/src/Neo.CLI/CLI/MainService.CommandLine.cs b/src/Neo.CLI/CLI/MainService.CommandLine.cs
@@ -21,11 +21,12 @@ public partial class MainService
     {
         public int OnStartWithCommandLine(string[] args)
         {
-            RootCommand rootCommand = new(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyTitleAttribute>()!.Title)
+            var rootCommand = new RootCommand(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyTitleAttribute>()!.Title)
             {
                 new Option<string>(["-c", "--config","/config"], "Specifies the config file."),
                 new Option<string>(["-w", "--wallet","/wallet"], "The path of the neo3 wallet [*.json]."),
                 new Option<string>(["-p", "--password" ,"/password"], "Password to decrypt the wallet, either from the command line or config file."),
+                new Option<bool>(["--background","/background"], "Run the service in background."),
                 new Option<string>(["--db-engine","/db-engine"], "Specify the db engine."),
                 new Option<string>(["--db-path","/db-path"], "Specify the db path."),
                 new Option<string>(["--noverify","/noverify"], "Indicates whether the blocks need to be verified when importing."),
@@ -39,6 +40,7 @@ public int OnStartWithCommandLine(string[] args)
 
         private void Handle(RootCommand command, CommandLineOptions options, InvocationContext context)
         {
+            IsBackground = options.Background;
             Start(options);
         }
 
@@ -72,7 +74,9 @@ private static void CustomProtocolSettings(CommandLineOptions options, ProtocolS
 
         private static void CustomApplicationSettings(CommandLineOptions options, Settings settings)
         {
-            var tempSetting = string.IsNullOrEmpty(options.Config) ? settings : new Settings(new ConfigurationBuilder().AddJsonFile(options.Config, optional: true).Build().GetSection("ApplicationConfiguration"));
+            var tempSetting = string.IsNullOrEmpty(options.Config)
+                ? settings
+                : new Settings(new ConfigurationBuilder().AddJsonFile(options.Config, optional: true).Build().GetSection("ApplicationConfiguration"));
             var customSetting = new Settings
             {
                 Logger = tempSetting.Logger,
diff --git a/src/Neo.CLI/Settings.cs b/src/Neo.CLI/Settings.cs
@@ -13,6 +13,7 @@
 using Neo.Network.P2P;
 using Neo.Persistence.Providers;
 using System;
+using System.IO;
 using System.Reflection;
 using System.Threading;
 
@@ -46,7 +47,8 @@ public static Settings Default
             {
                 if (s_default == null)
                 {
-                    var config = new ConfigurationBuilder().AddJsonFile("config.json", optional: true).Build();
+                    var configFile = ProtocolSettings.FindFile("config.json", Environment.CurrentDirectory);
+                    var config = new ConfigurationBuilder().AddJsonFile(configFile, optional: true).Build();
                     Initialize(config);
                 }
                 return Custom ?? s_default!;
diff --git a/src/Neo.ConsoleService/ConsoleHelper.cs b/src/Neo.ConsoleService/ConsoleHelper.cs
@@ -103,7 +103,7 @@ public static string ReadUserInput(string prompt, bool password = false)
                 do
                 {
                     key = Console.ReadKey(true);
-                    if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)
+                    if (PrintableASCIIChars.Contains(key.KeyChar))
                     {
                         sb.Append(key.KeyChar);
                         Console.Write(password ? '*' : key.KeyChar);
@@ -138,7 +138,7 @@ public static SecureString ReadSecureString(string prompt)
             do
             {
                 key = Console.ReadKey(true);
-                if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)
+                if (PrintableASCIIChars.Contains(key.KeyChar))
                 {
                     securePwd.AppendChar(key.KeyChar);
                     Console.Write('*');
diff --git a/src/Neo.ConsoleService/ConsoleServiceBase.cs b/src/Neo.ConsoleService/ConsoleServiceBase.cs
@@ -35,6 +35,8 @@ public abstract class ConsoleServiceBase
 
         protected bool ShowPrompt { get; set; } = true;
 
+        protected bool IsBackground { get; set; } = false;
+
         private bool _running;
         private readonly CancellationTokenSource _shutdownTokenSource = new();
         private readonly CountdownEvent _shutdownAcknowledged = new(1);
@@ -522,7 +524,7 @@ private void OnScCommand(string action)
             }
 
             string arguments;
-            if (action == "/install")
+            if (action == "install")
             {
                 var fileName = Process.GetCurrentProcess().MainModule!.FileName;
                 arguments = $"create {ServiceName} start= auto binPath= \"{fileName}\"";
@@ -551,17 +553,39 @@ private void OnScCommand(string action)
             }
         }
 
+        private void WaitForShutdown()
+        {
+            _running = true;
+            try
+            {
+                _shutdownTokenSource.Token.WaitHandle.WaitOne();
+            }
+            catch (OperationCanceledException)
+            {
+                // Expected when shutdown is triggered
+            }
+            _running = false;
+        }
+
         public void Run(string[] args)
         {
             if (Environment.UserInteractive)
             {
-                if (args.Length == 1 && (args[0] == "/install" || args[0] == "/uninstall"))
+                if (args.Length == 1 && (args[0] == "--install" || args[0] == "/install"))
                 {
-                    OnScCommand(args[0]);
+                    OnScCommand("install");
+                }
+                else if (args.Length == 1 && (args[0] == "--uninstall" || args[0] == "/uninstall"))
+                {
+                    OnScCommand("uninstall");
                 }
                 else
                 {
-                    if (OnStart(args)) RunConsole();
+                    if (OnStart(args))
+                    {
+                        if (IsBackground) WaitForShutdown();
+                        else RunConsole();
+                    }
                     OnStop();
                 }
             }
diff --git a/src/Neo/Ledger/MemoryPool.cs b/src/Neo/Ledger/MemoryPool.cs
@@ -447,7 +447,7 @@ private void RemoveConflictsOfVerified(PoolItem item)
                 if (_conflicts.TryGetValue(h, out var conflicts))
                 {
                     conflicts.Remove(item.Tx.Hash);
-                    if (conflicts.Count() == 0)
+                    if (conflicts.Count == 0)
                     {
                         _conflicts.Remove(h);
                     }
diff --git a/src/Plugins/OracleService/OracleSettings.cs b/src/Plugins/OracleService/OracleSettings.cs
@@ -63,7 +63,7 @@ private OracleSettings(IConfigurationSection section)
             AllowPrivateHost = section.GetValue("AllowPrivateHost", false);
             AllowedContentTypes = section.GetSection("AllowedContentTypes").GetChildren().Select(p => p.Get<string>()).ToArray();
             ExceptionPolicy = section.GetValue("UnhandledExceptionPolicy", UnhandledExceptionPolicy.Ignore);
-            if (AllowedContentTypes.Count() == 0)
+            if (AllowedContentTypes.Length == 0)
                 AllowedContentTypes = AllowedContentTypes.Concat("application/json").ToArray();
             Https = new HttpsSettings(section.GetSection("Https"));
             NeoFS = new NeoFSSettings(section.GetSection("NeoFS"));
diff --git a/src/Plugins/RestServer/RestWebServer.cs b/src/Plugins/RestServer/RestWebServer.cs
@@ -166,7 +166,7 @@ public void Start()
                             options.OnRejected = async (context, token) =>
                             {
                                 context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                                context.HttpContext.Response.Headers["Retry-After"] = _settings.RateLimitWindowSeconds.ToString();
+                                context.HttpContext.Response.Headers.RetryAfter = _settings.RateLimitWindowSeconds.ToString();
                                 context.HttpContext.Response.ContentType = "text/plain";
 
                                 if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
diff --git a/src/Plugins/RpcServer/RpcServer.Wallet.cs b/src/Plugins/RpcServer/RpcServer.Wallet.cs
@@ -710,8 +710,8 @@ private JObject GetVerificationResult(UInt160 scriptHash, ContractParameter[] ar
             var contract = NativeContract.ContractManagement.GetContract(snapshot, scriptHash)
                 .NotNull_Or(RpcError.UnknownContract);
 
-            var md = contract.Manifest.Abi.GetMethod(ContractBasicMethod.Verify, args.Count())
-                .NotNull_Or(RpcErrorFactory.InvalidContractVerification(contract.Hash, args.Count()));
+            var md = contract.Manifest.Abi.GetMethod(ContractBasicMethod.Verify, args.Length)
+                .NotNull_Or(RpcErrorFactory.InvalidContractVerification(contract.Hash, args.Length));
 
             (md.ReturnType == ContractParameterType.Boolean)
                 .True_Or(RpcErrorFactory.InvalidContractVerification("The verify method doesn't return boolean value."));
diff --git a/src/Plugins/RpcServer/RpcServer.cs b/src/Plugins/RpcServer/RpcServer.cs
@@ -81,10 +81,10 @@ internal bool CheckAuth(HttpContext context)
         {
             if (string.IsNullOrEmpty(settings.RpcUser)) return true;
 
-            string? reqauth = context.Request.Headers["Authorization"];
+            string? reqauth = context.Request.Headers.Authorization;
             if (string.IsNullOrEmpty(reqauth))
             {
-                context.Response.Headers["WWW-Authenticate"] = "Basic realm=\"Restricted\"";
+                context.Response.Headers.WWWAuthenticate = "Basic realm=\"Restricted\"";
                 context.Response.StatusCode = 401;
                 return false;
             }
diff --git a/tests/Neo.Json.UnitTests/UT_JArray.cs b/tests/Neo.Json.UnitTests/UT_JArray.cs
@@ -168,13 +168,13 @@ public void TestInsert()
             };
 
             jArray.Insert(1, bob);
-            Assert.AreEqual(5, jArray.Count());
+            Assert.AreEqual(5, jArray.Count);
             Assert.AreEqual(alice, jArray[0]);
             Assert.AreEqual(bob, jArray[1]);
             Assert.AreEqual(alice, jArray[2]);
 
             jArray.Insert(5, bob);
-            Assert.AreEqual(6, jArray.Count());
+            Assert.AreEqual(6, jArray.Count);
             Assert.AreEqual(bob, jArray[5]);
         }
 
@@ -208,15 +208,15 @@ public void TestRemove()
             {
                 alice
             };
-            Assert.AreEqual(1, jArray.Count());
+            Assert.AreEqual(1, jArray.Count);
             jArray.Remove(alice);
-            Assert.AreEqual(0, jArray.Count());
+            Assert.AreEqual(0, jArray.Count);
 
             jArray.Add(alice);
             jArray.Add(alice);
-            Assert.AreEqual(2, jArray.Count());
+            Assert.AreEqual(2, jArray.Count);
             jArray.Remove(alice);
-            Assert.AreEqual(1, jArray.Count());
+            Assert.AreEqual(1, jArray.Count);
         }
 
         [TestMethod]
@@ -229,7 +229,7 @@ public void TestRemoveAt()
                 alice
             };
             jArray.RemoveAt(1);
-            Assert.AreEqual(2, jArray.Count());
+            Assert.AreEqual(2, jArray.Count);
             Assert.DoesNotContain(bob, jArray);
         }
 
diff --git a/tests/Neo.Plugins.ApplicationLogs.Tests/UT_LogReader.cs b/tests/Neo.Plugins.ApplicationLogs.Tests/UT_LogReader.cs
@@ -196,7 +196,7 @@ public async Task Test_Commands()
             {
                 Assert.AreEqual(VMState.HALT, log.VmState);
                 Assert.IsTrue(log.Stack[0].GetBoolean());
-                Assert.AreEqual(2, log.Notifications.Count());
+                Assert.AreEqual(2, log.Notifications.Length);
                 Assert.AreEqual("Transfer", log.Notifications[0].EventName);
                 Assert.AreEqual(log.Notifications[0].ScriptHash, NativeContract.NEO.Hash);
                 Assert.AreEqual(1, log.Notifications[0].State[2]);
diff --git a/tests/Neo.Plugins.RestServer.Tests/ControllerRateLimitingTests.cs b/tests/Neo.Plugins.RestServer.Tests/ControllerRateLimitingTests.cs
@@ -53,7 +53,7 @@ public void Initialize()
                         options.OnRejected = async (context, token) =>
                         {
                             context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                            context.HttpContext.Response.Headers["Retry-After"] = "10";
+                            context.HttpContext.Response.Headers.RetryAfter = "10";
                             await context.HttpContext.Response.WriteAsync("Too many requests. Please try again later.", token);
                         };
                     });
diff --git a/tests/Neo.Plugins.RestServer.Tests/RateLimitingIntegrationTests.cs b/tests/Neo.Plugins.RestServer.Tests/RateLimitingIntegrationTests.cs
@@ -114,7 +114,7 @@ private void SetupTestServer(int permitLimit, int windowSeconds, int queueLimit,
                             options.OnRejected = async (context, token) =>
                             {
                                 context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                                context.HttpContext.Response.Headers["Retry-After"] = windowSeconds.ToString();
+                                context.HttpContext.Response.Headers.RetryAfter = windowSeconds.ToString();
 
                                 if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
                                 {
diff --git a/tests/Neo.Plugins.RestServer.Tests/TestUtility.cs b/tests/Neo.Plugins.RestServer.Tests/TestUtility.cs
@@ -42,7 +42,7 @@ public static void ConfigureRateLimiter(IServiceCollection services, RestServerS
                 options.OnRejected = async (context, token) =>
                 {
                     context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                    context.HttpContext.Response.Headers["Retry-After"] = settings.RateLimitWindowSeconds.ToString();
+                    context.HttpContext.Response.Headers.RetryAfter = settings.RateLimitWindowSeconds.ToString();
 
                     if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
                     {
diff --git a/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.cs b/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.cs
@@ -80,7 +80,7 @@ public void TestCheckAuth_ValidCredentials_ReturnsTrue()
         {
             // Arrange
             var context = new DefaultHttpContext();
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
             // Act
             var result = _rpcServer.CheckAuth(context);
             // Assert
@@ -104,27 +104,27 @@ public void TestCheckAuth()
             var rpcServer = new RpcServer(neoSystem, rpcServerSettings);
 
             var context = new DefaultHttpContext();
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
             var result = rpcServer.CheckAuth(context);
             Assert.IsTrue(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:wrongpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:wrongpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("wronguser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("wronguser:testpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(":testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(":testpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(""));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(""));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
         }
diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs
@@ -718,7 +718,7 @@ public void Check_OnPersist_NotaryRewards()
             // Check that proper amount of GAS was minted to block's Primary and the rest
             // is evenly devided between designated Notary nodes as a reward.
             // burn tx1 and tx2 network fee + mint primary reward + transfer reward to Notary1 and Notary2
-            Assert.AreEqual(2 + 1 + 2, engine.Notifications.Count());
+            Assert.AreEqual(2 + 1 + 2, engine.Notifications.Count);
             Assert.AreEqual(netFee1 + netFee2 - expectedNotaryReward, engine.Notifications[2].State[2]);
             Assert.AreEqual(netFee1 + netFee2 - expectedNotaryReward, NativeContract.GAS.BalanceOf(engine.SnapshotCache, primary));
             Assert.AreEqual(expectedNotaryReward / 2, engine.Notifications[3].State[2]);
diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs
@@ -453,5 +453,28 @@ public void TestHexEncodeDecode()
                 Assert.AreEqual(expectedString, engine.ResultStack.Pop<ByteString>());
             }
         }
+
+        [TestMethod]
+        public void TestMemorySearch()
+        {
+            var snapshotCache = TestBlockchain.GetTestSnapshotCache();
+            var expectedBytes = new byte[] { 0x00, 0x01, 0x02, 0x03 };
+            var expectedValue = new byte[] { 0x03 };
+
+            using var sb = new ScriptBuilder()
+                .EmitDynamicCall(NativeContract.StdLib.Hash, "memorySearch", expectedBytes, expectedValue, 0, false)
+                .EmitDynamicCall(NativeContract.StdLib.Hash, "memorySearch", expectedBytes, expectedValue, expectedBytes.Length - 1, false)
+                .EmitDynamicCall(NativeContract.StdLib.Hash, "memorySearch", expectedBytes, expectedValue, expectedBytes.Length, true);
+
+            using var engine = ApplicationEngine.Create(TriggerType.Application, null, snapshotCache, settings: TestProtocolSettings.Default);
+            engine.LoadScript(sb.ToArray());
+
+            Assert.AreEqual(VMState.HALT, engine.Execute());
+            Assert.HasCount(3, engine.ResultStack);
+
+            Assert.AreEqual(3, engine.ResultStack.Pop<Integer>());
+            Assert.AreEqual(3, engine.ResultStack.Pop<Integer>());
+            Assert.AreEqual(3, engine.ResultStack.Pop<Integer>());
+        }
     }
 }
diff --git a/tests/Neo.UnitTests/SmartContract/UT_InteropService.NEO.cs b/tests/Neo.UnitTests/SmartContract/UT_InteropService.NEO.cs
@@ -163,7 +163,7 @@ public void TestContract_Update()
             Assert.AreEqual(0, state.UpdateCounter);
             snapshotCache.UpdateContract(state.Hash, nef.ToArray(), manifest.ToJson().ToByteArray(false));
             var ret = NativeContract.ContractManagement.GetContract(snapshotCache, state.Hash);
-            Assert.AreEqual(1, snapshotCache.Find(BitConverter.GetBytes(state.Id)).ToList().Count());
+            Assert.AreEqual(1, snapshotCache.Find(BitConverter.GetBytes(state.Id)).ToList().Count);
             Assert.AreEqual(1, ret.UpdateCounter);
             Assert.AreEqual(state.Id, ret.Id);
             Assert.AreEqual(manifest.ToJson().ToString(), ret.Manifest.ToJson().ToString());

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,12 @@ public partial class MainService`
`21`	`21`	`{`
`22`	`22`	`public int OnStartWithCommandLine(string[] args)`
`23`	`23`	`{`
`24`		`- RootCommand rootCommand = new(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyTitleAttribute>()!.Title)`
	`24`	`+ var rootCommand = new RootCommand(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyTitleAttribute>()!.Title)`
`25`	`25`	`{`
`26`	`26`	`new Option<string>(["-c", "--config","/config"], "Specifies the config file."),`
`27`	`27`	`new Option<string>(["-w", "--wallet","/wallet"], "The path of the neo3 wallet [*.json]."),`
`28`	`28`	`new Option<string>(["-p", "--password" ,"/password"], "Password to decrypt the wallet, either from the command line or config file."),`
	`29`	`+ new Option<bool>(["--background","/background"], "Run the service in background."),`
`29`	`30`	`new Option<string>(["--db-engine","/db-engine"], "Specify the db engine."),`
`30`	`31`	`new Option<string>(["--db-path","/db-path"], "Specify the db path."),`
`31`	`32`	`new Option<string>(["--noverify","/noverify"], "Indicates whether the blocks need to be verified when importing."),`
`@@ -39,6 +40,7 @@ public int OnStartWithCommandLine(string[] args)`
`39`	`40`
`40`	`41`	`private void Handle(RootCommand command, CommandLineOptions options, InvocationContext context)`
`41`	`42`	`{`
	`43`	`+ IsBackground = options.Background;`
`42`	`44`	`Start(options);`
`43`	`45`	`}`
`44`	`46`
`@@ -72,7 +74,9 @@ private static void CustomProtocolSettings(CommandLineOptions options, ProtocolS`
`72`	`74`
`73`	`75`	`private static void CustomApplicationSettings(CommandLineOptions options, Settings settings)`
`74`	`76`	`{`
`75`		`- var tempSetting = string.IsNullOrEmpty(options.Config) ? settings : new Settings(new ConfigurationBuilder().AddJsonFile(options.Config, optional: true).Build().GetSection("ApplicationConfiguration"));`
	`77`	`+ var tempSetting = string.IsNullOrEmpty(options.Config)`
	`78`	`+ ? settings`
	`79`	`+ : new Settings(new ConfigurationBuilder().AddJsonFile(options.Config, optional: true).Build().GetSection("ApplicationConfiguration"));`
`76`	`80`	`var customSetting = new Settings`
`77`	`81`	`{`
`78`	`82`	`Logger = tempSetting.Logger,`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using Neo.Network.P2P;`
`14`	`14`	`using Neo.Persistence.Providers;`
`15`	`15`	`using System;`
	`16`	`+using System.IO;`
`16`	`17`	`using System.Reflection;`
`17`	`18`	`using System.Threading;`
`18`	`19`
`@@ -46,7 +47,8 @@ public static Settings Default`
`46`	`47`	`{`
`47`	`48`	`if (s_default == null)`
`48`	`49`	`{`
`49`		`- var config = new ConfigurationBuilder().AddJsonFile("config.json", optional: true).Build();`
	`50`	`+ var configFile = ProtocolSettings.FindFile("config.json", Environment.CurrentDirectory);`
	`51`	`+ var config = new ConfigurationBuilder().AddJsonFile(configFile, optional: true).Build();`
`50`	`52`	`Initialize(config);`
`51`	`53`	`}`
`52`	`54`	`return Custom ?? s_default!;`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public static string ReadUserInput(string prompt, bool password = false)`
`103`	`103`	`do`
`104`	`104`	`{`
`105`	`105`	`key = Console.ReadKey(true);`
`106`		`- if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)`
	`106`	`+ if (PrintableASCIIChars.Contains(key.KeyChar))`
`107`	`107`	`{`
`108`	`108`	`sb.Append(key.KeyChar);`
`109`	`109`	`Console.Write(password ? '*' : key.KeyChar);`
`@@ -138,7 +138,7 @@ public static SecureString ReadSecureString(string prompt)`
`138`	`138`	`do`
`139`	`139`	`{`
`140`	`140`	`key = Console.ReadKey(true);`
`141`		`- if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)`
	`141`	`+ if (PrintableASCIIChars.Contains(key.KeyChar))`
`142`	`142`	`{`
`143`	`143`	`securePwd.AppendChar(key.KeyChar);`
`144`	`144`	`Console.Write('*');`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public abstract class ConsoleServiceBase`
`35`	`35`
`36`	`36`	`protected bool ShowPrompt { get; set; } = true;`
`37`	`37`
	`38`	`+ protected bool IsBackground { get; set; } = false;`
	`39`	`+`
`38`	`40`	`private bool _running;`
`39`	`41`	`private readonly CancellationTokenSource _shutdownTokenSource = new();`
`40`	`42`	`private readonly CountdownEvent _shutdownAcknowledged = new(1);`
`@@ -522,7 +524,7 @@ private void OnScCommand(string action)`
`522`	`524`	`}`
`523`	`525`
`524`	`526`	`string arguments;`
`525`		`- if (action == "/install")`
	`527`	`+ if (action == "install")`
`526`	`528`	`{`
`527`	`529`	`var fileName = Process.GetCurrentProcess().MainModule!.FileName;`
`528`	`530`	`arguments = $"create {ServiceName} start= auto binPath= \"{fileName}\"";`
`@@ -551,17 +553,39 @@ private void OnScCommand(string action)`
`551`	`553`	`}`
`552`	`554`	`}`
`553`	`555`
	`556`	`+ private void WaitForShutdown()`
	`557`	`+ {`
	`558`	`+ _running = true;`
	`559`	`+ try`
	`560`	`+ {`
	`561`	`+ _shutdownTokenSource.Token.WaitHandle.WaitOne();`
	`562`	`+ }`
	`563`	`+ catch (OperationCanceledException)`
	`564`	`+ {`
	`565`	`+ // Expected when shutdown is triggered`
	`566`	`+ }`
	`567`	`+ _running = false;`
	`568`	`+ }`
	`569`	`+`
`554`	`570`	`public void Run(string[] args)`
`555`	`571`	`{`
`556`	`572`	`if (Environment.UserInteractive)`
`557`	`573`	`{`
`558`		`- if (args.Length == 1 && (args[0] == "/install" \|\| args[0] == "/uninstall"))`
	`574`	`+ if (args.Length == 1 && (args[0] == "--install" \|\| args[0] == "/install"))`
`559`	`575`	`{`
`560`		`- OnScCommand(args[0]);`
	`576`	`+ OnScCommand("install");`
	`577`	`+ }`
	`578`	`+ else if (args.Length == 1 && (args[0] == "--uninstall" \|\| args[0] == "/uninstall"))`
	`579`	`+ {`
	`580`	`+ OnScCommand("uninstall");`
`561`	`581`	`}`
`562`	`582`	`else`
`563`	`583`	`{`
`564`		`- if (OnStart(args)) RunConsole();`
	`584`	`+ if (OnStart(args))`
	`585`	`+ {`
	`586`	`+ if (IsBackground) WaitForShutdown();`
	`587`	`+ else RunConsole();`
	`588`	`+ }`
`565`	`589`	`OnStop();`
`566`	`590`	`}`
`567`	`591`	`}`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ private void RemoveConflictsOfVerified(PoolItem item)`
`447`	`447`	`if (_conflicts.TryGetValue(h, out var conflicts))`
`448`	`448`	`{`
`449`	`449`	`conflicts.Remove(item.Tx.Hash);`
`450`		`- if (conflicts.Count() == 0)`
	`450`	`+ if (conflicts.Count == 0)`
`451`	`451`	`{`
`452`	`452`	`_conflicts.Remove(h);`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public void Start()`
`166`	`166`	`options.OnRejected = async (context, token) =>`
`167`	`167`	`{`
`168`	`168`	`context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;`
`169`		`- context.HttpContext.Response.Headers["Retry-After"] = _settings.RateLimitWindowSeconds.ToString();`
	`169`	`+ context.HttpContext.Response.Headers.RetryAfter = _settings.RateLimitWindowSeconds.ToString();`
`170`	`170`	`context.HttpContext.Response.ContentType = "text/plain";`
`171`	`171`
`172`	`172`	`if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))`