Unify environment variables

src/Nethermind/Nethermind.Config.Test/ConfigProvider_FindIncorrectSettings_Tests.cs

@@ -46,9 +46,6 @@ public void NoCategorySettings()
             { "NETHERMIND_CLI_SWITCH_LOCAL", "http://localhost:80" },
             { "NETHERMIND_MONITORING_JOB", "nethermindJob" },
             { "NETHERMIND_MONITORING_GROUP", "nethermindGroup" },
-            { "NETHERMIND_ENODE_IPADDRESS", "1.2.3.4" },
-            { "NETHERMIND_URL", "http://test:80" },
-            { "NETHERMIND_CORS_ORIGINS", "*" },
             { "NETHERMIND_CONFIG", "test2.json" },
             { "NETHERMIND_XYZ", "xyz" },    // not existing, should get error
             { "QWER", "qwerty" }    // not Nethermind setting, no error

src/Nethermind/Nethermind.Config/EnvConfigSource.cs

@@ -43,7 +43,7 @@ public EnvConfigSource(IEnvironment environmentWrapper)
                     return (null, null);
                 }
 
-                // variables like "NETHERMIND_URL", "NETHERMIND_CONFIG" ...
+                // variables like "NETHERMIND_CONFIG"
                 if (a.Length == 2)
                 {
                     return (null, a[1]);

src/Nethermind/Nethermind.Config/INoCategoryConfig.cs

@@ -15,15 +15,6 @@ public interface INoCategoryConfig : IConfig
     [ConfigItem(Description = "Sets the default group name for metrics monitoring.", EnvironmentVariable = "NETHERMIND_MONITORING_GROUP")]
     public string MonitoringGroup { get; set; }
 
-    [ConfigItem(Description = "Sets the external IP for the node.", EnvironmentVariable = "NETHERMIND_ENODE_IPADDRESS")]
-    public string EnodeIpAddress { get; set; }
-
-    [ConfigItem(Description = "Defines default URL for JSON RPC.", EnvironmentVariable = "NETHERMIND_URL")]
-    public string Url { get; set; }
-
-    [ConfigItem(Description = "Defines CORS origins for JSON RPC.", DefaultValue = "*", EnvironmentVariable = "NETHERMIND_CORS_ORIGINS")]
-    public string CorsOrigins { get; set; }
-
     [ConfigItem(Description = "Defines host value for CLI function \"switchLocal\".", DefaultValue = "http://localhost", EnvironmentVariable = "NETHERMIND_CLI_SWITCH_LOCAL")]
     public string CliSwitchLocal { get; set; }
 }

src/Nethermind/Nethermind.Config/NoCategoryConfig.cs

@@ -8,8 +8,5 @@ public class NoCategoryConfig : INoCategoryConfig
     public string Config { get; set; } = null;
     public string MonitoringJob { get; set; }
     public string MonitoringGroup { get; set; }
-    public string EnodeIpAddress { get; set; }
-    public string Url { get; set; }
-    public string CorsOrigins { get; set; }
     public string CliSwitchLocal { get; set; }
 }

src/Nethermind/Nethermind.JsonRpc.Test/JsonRpcUrlCollectionTests.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System;
 using System.Collections.Generic;
 using Nethermind.Logging;
 using Nethermind.JsonRpc.Modules;
@@ -20,12 +19,6 @@ public void Initialize()
 
     private string[] _enabledModules = null!;
 
-    [TearDown]
-    public void TearDown()
-    {
-        Environment.SetEnvironmentVariable("NETHERMIND_URL", null, EnvironmentVariableTarget.Process);
-    }
-
     [Test]
     public void Empty_when_disabled()
     {
@@ -50,24 +43,6 @@ public void Contains_single_default_url()
         }, Is.EquivalentTo(urlCollection));
     }
 
-    [Test]
-    public void Contains_single_default_url_overridden_by_environment_variable()
-    {
-        Environment.SetEnvironmentVariable("NETHERMIND_URL", "http://localhost:1234", EnvironmentVariableTarget.Process);
-
-        JsonRpcConfig jsonRpcConfig = new JsonRpcConfig()
-        {
-            Enabled = true,
-            EnabledModules = _enabledModules
-        };
-
-        JsonRpcUrlCollection urlCollection = new JsonRpcUrlCollection(Substitute.For<ILogManager>(), jsonRpcConfig, true);
-        Assert.That(new Dictionary<int, JsonRpcUrl>()
-        {
-            { 1234, new JsonRpcUrl("http", "localhost", 1234, RpcEndpoint.Http | RpcEndpoint.Ws, false, _enabledModules) }
-        }, Is.EquivalentTo(urlCollection));
-    }
-
     [Test]
     public void Contains_multiple_default_urls_with_different_ws_port()
     {

src/Nethermind/Nethermind.JsonRpc/IJsonRpcConfig.cs

@@ -166,4 +166,7 @@ public interface IJsonRpcConfig : IConfig
 
     [ConfigItem(Description = "The error margin used in the `eth_estimateGas` JSON-RPC method, in basis points.", DefaultValue = "150")]
     int EstimateErrorMargin { get; set; }
+
+    [ConfigItem(Description = "The JSON-RPC server CORS origins.", DefaultValue = "*")]
+    string[] CorsOrigins { get; set; }
 }

src/Nethermind/Nethermind.JsonRpc/JsonRpcConfig.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Nethermind.Core.Extensions;
 using Nethermind.JsonRpc.Modules;
@@ -57,6 +58,7 @@ public int WebSocketsPort
         public long? MaxBatchResponseBodySize { get; set; } = 32.MiB();
         public long? MaxSimulateBlocksCap { get; set; } = 256;
         public int EstimateErrorMargin { get; set; } = 150;
+        public string[] CorsOrigins { get; set; } = ["*"];
     };
 };
 

src/Nethermind/Nethermind.JsonRpc/JsonRpcUrlCollection.cs

@@ -12,8 +12,6 @@ namespace Nethermind.JsonRpc
 {
     public class JsonRpcUrlCollection : Dictionary<int, JsonRpcUrl>, IJsonRpcUrlCollection
     {
-        private const string NethermindUrlVariable = "NETHERMIND_URL";
-
         private readonly ILogger _logger;
         private readonly IJsonRpcConfig _jsonRpcConfig;
 
@@ -34,20 +32,6 @@ private void BuildUrls(bool includeWebSockets)
         {
             bool HasEngineApi = _jsonRpcConfig.EnabledModules.Any(m => m.Equals(ModuleType.Engine, StringComparison.InvariantCultureIgnoreCase));
             JsonRpcUrl defaultUrl = new(Uri.UriSchemeHttp, _jsonRpcConfig.Host, _jsonRpcConfig.Port, RpcEndpoint.Http, HasEngineApi, _jsonRpcConfig.EnabledModules, HasEngineApi ? SocketClient<WebSocketMessageStream>.MAX_REQUEST_BODY_SIZE_FOR_ENGINE_API : _jsonRpcConfig.MaxRequestBodySize);
-            string environmentVariableUrl = Environment.GetEnvironmentVariable(NethermindUrlVariable);
-            if (!string.IsNullOrWhiteSpace(environmentVariableUrl))
-            {
-                if (Uri.TryCreate(environmentVariableUrl, UriKind.Absolute, out Uri? uri))
-                {
-                    defaultUrl.Scheme = uri.Scheme;
-                    defaultUrl.Host = uri.Host;
-                    defaultUrl.Port = !uri.IsDefaultPort ? uri.Port : defaultUrl.Port;
-                }
-                else
-                {
-                    if (_logger.IsWarn) _logger.Warn($"Environment variable '{NethermindUrlVariable}' value '{environmentVariableUrl}' is not valid JSON RPC URL, using default url : '{defaultUrl}'");
-                }
-            }
 
             Add(defaultUrl.Port, defaultUrl);
 

src/Nethermind/Nethermind.Network/IPResolver.cs

@@ -54,7 +54,6 @@ private async Task<IPAddress> InitializeExternalIp()
         {
             IEnumerable<IIPSource> GetIPSources()
             {
-                yield return new EnvironmentVariableIPSource();
                 yield return new NetworkConfigExternalIPSource(_networkConfig, _logManager);
                 yield return new WebIPSource("http://ipv4.icanhazip.com", _logManager);
                 yield return new WebIPSource("http://ipv4bot.whatismyipaddress.com", _logManager);

src/Nethermind/Nethermind.Runner/JsonRpc/Startup.cs

@@ -22,7 +22,6 @@
 using Nethermind.Api;
 using Nethermind.Config;
 using Nethermind.Core.Authentication;
-using Nethermind.Core.Extensions;
 using Nethermind.Core.Resettables;
 using Nethermind.HealthChecks;
 using Nethermind.JsonRpc;
@@ -57,9 +56,10 @@ public void ConfigureServices(IServiceCollection services)
         });
         Bootstrap.Instance.RegisterJsonRpcServices(services);
 
-        string corsOrigins = Environment.GetEnvironmentVariable("NETHERMIND_CORS_ORIGINS") ?? "*";
-        services.AddCors(c => c.AddPolicy("Cors",
-            p => p.AllowAnyMethod().AllowAnyHeader().WithOrigins(corsOrigins)));
+        services.AddCors(options => options.AddDefaultPolicy(builder => builder
+            .AllowAnyMethod()
+            .AllowAnyHeader()
+            .WithOrigins(jsonRpcConfig.CorsOrigins)));
 
         services.AddResponseCompression(options =>
         {
@@ -79,8 +79,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IJsonRpc
             app.UseDeveloperExceptionPage();
         }
 
-        app.UseCors("Cors");
         app.UseRouting();
+        app.UseCors();
         app.UseResponseCompression();
 
         IConfigProvider? configProvider = app.ApplicationServices.GetService<IConfigProvider>();