aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-04-28 18:58:56 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-04-28 18:58:56 +0800
commite62c2aeb1bb25d2f6ac6e7413321200ef19ea727 (patch)
tree9a9e1af0f08ce007e38721e2e7931a10a4b15211
parent123aa659e4e2bdb9121f787ee8cd68acc9a4fe4c (diff)
parentc1a4dcfc871f21ff1d7b2ce928a8108891cc4820 (diff)
downloaddexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar.gz
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar.bz2
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar.lz
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar.xz
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.tar.zst
dexon-e62c2aeb1bb25d2f6ac6e7413321200ef19ea727.zip
Merge pull request #2491 from obscuren/genesis-config-fix
core, eth: added json tag field for proper unmarshalling
-rw-r--r--core/genesis.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/genesis.go b/core/genesis.go
index 5c69b216c..40d799621 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -43,7 +43,7 @@ func WriteGenesisBlock(chainDb ethdb.Database, reader io.Reader) (*types.Block,
}
var genesis struct {
- ChainConfig *ChainConfig
+ ChainConfig *ChainConfig `json:"config"`
Nonce string
Timestamp string
ParentHash string