diff options
| author | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
| commit | bac9a94ddf20dc530966cbf6cd384aaf94aedc77 (patch) | |
| tree | 0ced967e60315698cc5056a984d7678c417bc1ce /core/genesis.go | |
| parent | 0e703d92ac9df61e2ededa8c895c70ded101a607 (diff) | |
| parent | 14994fa21bf6f05554ff370d41005d06b68d20a5 (diff) | |
| download | go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.gz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.bz2 go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.lz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.xz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.zst go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.zip | |
Merge branch 'release/0.9.28'v0.9.28
Diffstat (limited to 'core/genesis.go')
| -rw-r--r-- | core/genesis.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/genesis.go b/core/genesis.go index e72834822..dd894e0b0 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -19,8 +19,8 @@ var ZeroHash256 = make([]byte, 32) var ZeroHash160 = make([]byte, 20) var ZeroHash512 = make([]byte, 64) -func GenesisBlock(db common.Database) *types.Block { - genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, params.GenesisDifficulty, 42, nil) +func GenesisBlock(nonce uint64, db common.Database) *types.Block { + genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, params.GenesisDifficulty, nonce, nil) genesis.Header().Number = common.Big0 genesis.Header().GasLimit = params.GenesisGasLimit genesis.Header().GasUsed = common.Big0 @@ -36,7 +36,7 @@ func GenesisBlock(db common.Database) *types.Block { Balance string Code string } - err := json.Unmarshal(GenesisData, &accounts) + err := json.Unmarshal(GenesisAccounts, &accounts) if err != nil { fmt.Println("enable to decode genesis json data:", err) os.Exit(1) @@ -57,7 +57,7 @@ func GenesisBlock(db common.Database) *types.Block { return genesis } -var GenesisData = []byte(`{ +var GenesisAccounts = []byte(`{ "0000000000000000000000000000000000000001": {"balance": "1"}, "0000000000000000000000000000000000000002": {"balance": "1"}, "0000000000000000000000000000000000000003": {"balance": "1"}, |