aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2016-04-25 18:38:15 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2016-04-25 18:48:31 +0800
commitc1a4dcfc871f21ff1d7b2ce928a8108891cc4820 (patch)
treeae399e27737feba1bfa9169ea8d1405cea416b06
parent18580e152c1a2480b6245ebba4c62c202ed20ac6 (diff)
downloaddexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar.gz
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar.bz2
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar.lz
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar.xz
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.tar.zst
dexon-c1a4dcfc871f21ff1d7b2ce928a8108891cc4820.zip
core, eth: added json tag field for proper unmarshalling
According to our own instructions the genesis config attribute should be "config". The genesis definition in the go code, however, has a field called `ChainConfig`. This field now has a `json:"config"` struct tag so that the json is properly unmarshalled. This fixes #2482
-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