diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-02-20 16:48:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 16:48:12 +0800 |
| commit | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (patch) | |
| tree | cadf68e7206d6de42b1eefc6967214cf86e35ff2 /core/genesis.go | |
| parent | 7fa3509e2eaf1a4ebc12344590e5699406690f15 (diff) | |
| parent | cde35439e058b4f9579830fec9fb65ae0b998346 (diff) | |
| download | go-tangerine-1.8.23.tar go-tangerine-1.8.23.tar.gz go-tangerine-1.8.23.tar.bz2 go-tangerine-1.8.23.tar.lz go-tangerine-1.8.23.tar.xz go-tangerine-1.8.23.tar.zst go-tangerine-1.8.23.zip | |
Merge pull request #19029 from holiman/update1.8v1.8.23
Update1.8
Diffstat (limited to 'core/genesis.go')
| -rw-r--r-- | core/genesis.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/genesis.go b/core/genesis.go index 62cde87b5..cbb6eecd2 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -157,7 +157,6 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, constant if genesis != nil && genesis.Config == nil { return params.AllEthashProtocolChanges, common.Hash{}, errGenesisNoConfig } - // Just commit the new block if there is no stored genesis block. stored := rawdb.ReadCanonicalHash(db, 0) if (stored == common.Hash{}) { @@ -340,6 +339,18 @@ func DefaultRinkebyGenesisBlock() *Genesis { } } +// DefaultGoerliGenesisBlock returns the Görli network genesis block. +func DefaultGoerliGenesisBlock() *Genesis { + return &Genesis{ + Config: params.GoerliChainConfig, + Timestamp: 1548854791, + ExtraData: hexutil.MustDecode("0x22466c6578692069732061207468696e6722202d204166726900000000000000e0a2bd4258d2768837baa26a28fe71dc079f84c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), + GasLimit: 10485760, + Difficulty: big.NewInt(1), + Alloc: decodePrealloc(goerliAllocData), + } +} + // DeveloperGenesisBlock returns the 'geth --dev' genesis block. Note, this must // be seeded with the func DeveloperGenesisBlock(period uint64, faucet common.Address) *Genesis { |