mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-18 09:53:48 +00:00
Fix genesis
This commit is contained in:
parent
d949afdfab
commit
e0c98f82dc
1 changed files with 4 additions and 3 deletions
|
|
@ -189,7 +189,7 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig
|
||||||
// Special case: don't change the existing config of a non-mainnet chain if no new
|
// Special case: don't change the existing config of a non-mainnet chain if no new
|
||||||
// config is supplied. These chains would get AllProtocolChanges (and a compat error)
|
// config is supplied. These chains would get AllProtocolChanges (and a compat error)
|
||||||
// if we just continued here.
|
// if we just continued here.
|
||||||
if genesis == nil && stored != params./ {
|
if genesis == nil && stored != params.MainnetGenesisHash {
|
||||||
return storedcfg, stored, nil
|
return storedcfg, stored, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -210,7 +210,7 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
|
||||||
switch {
|
switch {
|
||||||
case g != nil:
|
case g != nil:
|
||||||
return g.Config
|
return g.Config
|
||||||
case ghash == params./:
|
case ghash == params.MainnetGenesisHash:
|
||||||
return params.MainnetChainConfig
|
return params.MainnetChainConfig
|
||||||
case ghash == params.TestnetGenesisHash:
|
case ghash == params.TestnetGenesisHash:
|
||||||
return params.TestnetChainConfig
|
return params.TestnetChainConfig
|
||||||
|
|
@ -313,7 +313,8 @@ func DefaultGenesisBlock() *Genesis {
|
||||||
return &Genesis{
|
return &Genesis{
|
||||||
Config: params.MainnetChainConfig,
|
Config: params.MainnetChainConfig,
|
||||||
Nonce: 66,
|
Nonce: 66,
|
||||||
GasLimit: 2100000,
|
ExtraData: hexutil.MustDecode("0x06219483E217c9aD479f76a95426f689eF4D5951"),
|
||||||
|
GasLimit: 3141592,
|
||||||
Difficulty: big.NewInt(16777216),
|
Difficulty: big.NewInt(16777216),
|
||||||
Alloc: decodePrealloc(mainnetAllocData),
|
Alloc: decodePrealloc(mainnetAllocData),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue