cmd/utils: not set Etherbase when flag --unlock is set

gzliudan · gzliudan · commit 77f577a388c3 · 2025-02-21T15:59:09.000+08:00
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1095,7 +1095,10 @@ func setEtherbase(ctx *cli.Context, ks *keystore.KeyStore, cfg *ethconfig.Config
 		}
 		cfg.Etherbase = account.Address
 	} else {
-		cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name))
+		if !ctx.IsSet(UnlockedAccountFlag.Name) {
+			cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name))
+			log.Info("Set etherbase", "address", cfg.Etherbase.Hex())
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,10 @@ func setEtherbase(ctx cli.Context, ks keystore.KeyStore, cfg *ethconfig.Config`
`1095`	`1095`	`}`
`1096`	`1096`	`cfg.Etherbase = account.Address`
`1097`	`1097`	`} else {`
`1098`		`- cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name))`
	`1098`	`+ if !ctx.IsSet(UnlockedAccountFlag.Name) {`
	`1099`	`+ cfg.Etherbase = common.HexToAddress(ctx.String(MinerEtherbaseFlag.Name))`
	`1100`	`+ log.Info("Set etherbase", "address", cfg.Etherbase.Hex())`
	`1101`	`+ }`
`1099`	`1102`	`}`
`1100`	`1103`	`}`
`1101`	`1104`