#7746 jwtfile path correction

src/Nethermind/Nethermind.JsonRpc/IJsonRpcConfig.cs

@@ -128,7 +128,7 @@ public interface IJsonRpcConfig : IConfig
             """)]
     int? EthModuleConcurrentInstances { get; set; }
 
-    [ConfigItem(Description = "The path to the JWT secret file required for the Engine API authentication.", DefaultValue = "keystore/jwt-secret")]
+    [ConfigItem(Description = "The path to the JWT secret file required for the Engine API authentication.", DefaultValue = "null")]
     public string JwtSecretFile { get; set; }
 
     [ConfigItem(Description = "Whether to disable authentication of the Engine API. Should not be used in production environments.", DefaultValue = "false", HiddenFromDocs = true)]

src/Nethermind/Nethermind.JsonRpc/JsonRpcConfig.cs

@@ -38,7 +38,7 @@ public int WebSocketsPort
     public long? MaxRequestBodySize { get; set; } = 30000000;
     public int MaxLogsPerResponse { get; set; } = 20_000;
     public int? EthModuleConcurrentInstances { get; set; } = null;
-    public string JwtSecretFile { get; set; } = "keystore/jwt-secret";
+    public string JwtSecretFile { get; set; } = null;
     public bool UnsecureDevNoRpcAuthentication { get; set; }
     public int? MaxLoggedRequestParametersCharacters { get; set; } = null;
     public string[]? MethodsLoggingFiltering { get; set; } =
@@ -58,4 +58,3 @@ public int WebSocketsPort
     public int EstimateErrorMargin { get; set; } = 150;
     public string[] CorsOrigins { get; set; } = ["*"];
 };
-

src/Nethermind/Nethermind.Runner/Ethereum/Steps/StartRpc.cs

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Linq;
+using System;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Nethermind.Api;
@@ -14,6 +16,7 @@
 using Nethermind.Logging;
 using Nethermind.Runner.JsonRpc;
 using Nethermind.Serialization.Json;
+using Nethermind.KeyStore.Config;
 
 namespace Nethermind.Runner.Ethereum.Steps
 {
@@ -30,8 +33,37 @@ public StartRpc(INethermindApi api)
         public async Task Execute(CancellationToken cancellationToken)
         {
             IJsonRpcConfig jsonRpcConfig = _api.Config<IJsonRpcConfig>();
+            IKeyStoreConfig keyStoreConfig = _api.Config<IKeyStoreConfig>();
             ILogger logger = _api.LogManager.GetClassLogger();
 
+            if (string.IsNullOrEmpty(jsonRpcConfig.JwtSecretFile))
+            {
+                string oldPath = "keystore/jwt-secret";
+                string newPath = Path.Join(keyStoreConfig.KeyStoreDirectory, "jwt-secret");
+                // check if jwt-secret file already exists in previous default directory
+                if (!File.Exists(newPath) && File.Exists(oldPath))
+                {
+                    oldPath = Path.GetFullPath(oldPath);
+                    newPath = Path.GetFullPath(newPath);
+                    try
+                    {
+                        File.Move(oldPath, newPath);
+                        if (logger.IsWarn) {
+                            logger.Warn($"Moved JWT secret from {oldPath} to {newPath}");
+                        }
+                        jsonRpcConfig.JwtSecretFile = newPath;
+                    }
+                    catch (Exception ex)
+                    {
+                        if (logger.IsError) logger.Error($"Failed moving JWT secret to {newPath}.", ex);
+                        jsonRpcConfig.JwtSecretFile = oldPath;
+                    }
+                }
+                else {
+                    jsonRpcConfig.JwtSecretFile = newPath;
+                }  
+            }
+
             if (jsonRpcConfig.Enabled)
             {
                 IInitConfig initConfig = _api.Config<IInitConfig>();