Merge branch 'rebase-1.5.9' of https://github.com/expanse-org/go-expanse into rebase-1.5.9

This commit is contained in:
Christopher Franko 2017-03-28 07:48:03 -04:00
commit 37d12a743b

View file

@ -258,10 +258,11 @@ func GenesisBlockForTesting(db ethdb.Database, addr common.Address, balance *big
func DefaultGenesisBlock() *Genesis {
return &Genesis{
Config: params.MainnetChainConfig,
Nonce: 2397694292061277985,
Nonce: 0x214652414e4b4f21,
ExtraData: hexutil.MustDecode("0x4672616e6b6f497346726565646f6d"),
GasLimit: 5000,
Difficulty: big.NewInt(1073741824),
Coinbase: common.HexToAddress("0x93decab0cd745598860f782ac1e8f046cb99e898"),
Alloc: decodePrealloc(mainnetAllocData),
}
}