diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-16 04:56:10 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-16 04:56:10 +0800 |
| commit | e9a80518c72e0d5b2da7246a865f4dc4baab2cf9 (patch) | |
| tree | 95ff40742241d2d21faff99b95d5f7b35d87a449 | |
| parent | 55bdcfaeac15b5025ecd485f0d9255a86d4de270 (diff) | |
| parent | 321733ab2349c411cb584b0f88d58c01afa7f83b (diff) | |
| download | dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar.gz dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar.bz2 dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar.lz dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar.xz dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.tar.zst dexon-e9a80518c72e0d5b2da7246a865f4dc4baab2cf9.zip | |
Merge pull request #1744 from kobigurk/develop
adds extradata flag
| -rw-r--r-- | cmd/geth/main.go | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ba753a493..f546f89cc 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -58,6 +58,11 @@ var ( gitCommit string // set via linker flagg nodeNameVersion string app *cli.App + + ExtraDataFlag = cli.StringFlag{ + Name: "extradata", + Usage: "Extra data for the miner", + } ) func init() { @@ -331,6 +336,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.GpobaseStepDownFlag, utils.GpobaseStepUpFlag, utils.GpobaseCorrectionFactorFlag, + ExtraDataFlag, } app.Before = func(ctx *cli.Context) error { utils.SetupLogger(ctx) @@ -354,6 +360,14 @@ func main() { } } +// MakeExtra resolves extradata for the miner from a flag or returns a default. +func makeExtra(ctx *cli.Context) []byte { + if ctx.GlobalIsSet(ExtraDataFlag.Name) { + return []byte(ctx.GlobalString(ExtraDataFlag.Name)) + } + return makeDefaultExtra() +} + func makeDefaultExtra() []byte { var clientInfo = struct { Version uint @@ -382,7 +396,7 @@ func run(ctx *cli.Context) { } cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) - cfg.ExtraData = makeDefaultExtra() + cfg.ExtraData = makeExtra(ctx) ethereum, err := eth.New(cfg) if err != nil { |