diff options
| author | Felix Lange <fjl@twurst.com> | 2015-09-18 01:25:32 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-09-18 01:25:32 +0800 |
| commit | bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319 (patch) | |
| tree | cfc9d76463fea1617d970b0416f27948143f0533 | |
| parent | 69f48e468902ab4f1b96dba0e2f3c8f480772d2e (diff) | |
| parent | 1a1a1ee4ff1b664a5f14599e0e57da892c187855 (diff) | |
| download | go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar.gz go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar.bz2 go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar.lz go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar.xz go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.tar.zst go-tangerine-bdf4fd6091c6e0d5259928b3d4b1280a3f0e4319.zip | |
Merge pull request #1813 from kobigurk/develop
cmd/geth: extradata is correcly initialized with console
| -rw-r--r-- | cmd/geth/main.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index f546f89cc..b54d85c22 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -360,7 +360,7 @@ func main() { } } -// MakeExtra resolves extradata for the miner from a flag or returns a default. +// 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)) @@ -444,6 +444,8 @@ func console(ctx *cli.Context) { utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name)) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) + cfg.ExtraData = makeExtra(ctx) + ethereum, err := eth.New(cfg) if err != nil { utils.Fatalf("%v", err) |