Load local key if MiningConfig.Enabled is true (#7267)

NethermindEth · Jul 17, 2024 · aad6777 · aad6777
1 parent 0315f4a
commit aad6777
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Nethermind/Nethermind.Consensus/IMiningConfig.cs b/src/Nethermind/Nethermind.Consensus/IMiningConfig.cs
@@ -56,5 +56,5 @@ public interface IMiningConfig : IConfig
     Description = "Url for an external signer like clef: https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/tutorial.md",
     HiddenFromDocs = false,
     DefaultValue = "null")]
-    string Signer { get; set; }
+    string? Signer { get; set; }
 }
diff --git a/src/Nethermind/Nethermind.Consensus/MiningConfig.cs b/src/Nethermind/Nethermind.Consensus/MiningConfig.cs
@@ -71,5 +71,5 @@ public IBlocksConfig? BlocksConfig
         }
     }
 
-    public string Signer { get; set; }
+    public string? Signer { get; set; }
 }
diff --git a/src/Nethermind/Nethermind.Init/Steps/SetupKeyStore.cs b/src/Nethermind/Nethermind.Init/Steps/SetupKeyStore.cs
@@ -46,8 +46,8 @@ await Task.Run(() =>
 
                 set.Wallet = get.Config<IInitConfig>() switch
                 {
-                    var config when config.EnableUnsecuredDevWallet && config.KeepDevWalletInMemory => new DevWallet(get.Config<IWalletConfig>(), get.LogManager),
-                    var config when config.EnableUnsecuredDevWallet && !config.KeepDevWalletInMemory => new DevKeyStoreWallet(get.KeyStore, get.LogManager),
+                    { EnableUnsecuredDevWallet: true, KeepDevWalletInMemory: true } => new DevWallet(get.Config<IWalletConfig>(), get.LogManager),
+                    { EnableUnsecuredDevWallet: true, KeepDevWalletInMemory: false } => new DevKeyStoreWallet(get.KeyStore, get.LogManager),
                     _ => new ProtectedKeyStoreWallet(keyStore, new ProtectedPrivateKeyFactory(get.CryptoRandom, get.Timestamper, keyStoreConfig.KeyStoreDirectory),
                         get.Timestamper, get.LogManager),
                 };
@@ -62,9 +62,11 @@ await Task.Run(() =>
                 ProtectedPrivateKey? nodeKey = set.NodeKey = nodeKeyManager.LoadNodeKey();
 
                 IMiningConfig miningConfig = get.Config<IMiningConfig>();
-                //Don't load the local key if an external signer is configured  
-                if (!miningConfig.Enabled && string.IsNullOrEmpty(miningConfig.Signer))
+                //Don't load the local key if an external signer is configured
+                if (string.IsNullOrEmpty(miningConfig.Signer))
+                {
                     set.OriginalSignerKey = nodeKeyManager.LoadSignerKey();
+                }
 
                 IPAddress ipAddress = networkConfig.ExternalIp is not null ? IPAddress.Parse(networkConfig.ExternalIp) : IPAddress.Loopback;
                 IEnode enode = set.Enode = new Enode(nodeKey.PublicKey, ipAddress, networkConfig.P2PPort);
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,5 +71,5 @@ public IBlocksConfig? BlocksConfig @@
             }
         }
-        public string Signer { get; set; }
+        public string? Signer { get; set; }
     }