diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
| commit | 118ad22ee59658ec8ff476999e48d9bffb0c7db6 (patch) | |
| tree | b60422477450918993bdce27f22cd45d81952bd8 /core/genesis.go | |
| parent | 81de8ed0912f767b2e3104aaad5c7f31920aaf2a (diff) | |
| parent | 79828531b1e6a1d5073f45e0e672c54a019de7c0 (diff) | |
| download | dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.gz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.bz2 dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.lz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.xz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.zst dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.zip | |
Merge branch 'develop' into rpcfabian
Diffstat (limited to 'core/genesis.go')
| -rw-r--r-- | core/genesis.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/genesis.go b/core/genesis.go index 7958157a4..13656c40c 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -3,12 +3,12 @@ package core import ( "encoding/json" "fmt" - "math/big" "os" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/params" ) /* @@ -18,13 +18,11 @@ import ( var ZeroHash256 = make([]byte, 32) var ZeroHash160 = make([]byte, 20) var ZeroHash512 = make([]byte, 64) -var GenesisDiff = big.NewInt(131072) -var GenesisGasLimit = big.NewInt(3141592) func GenesisBlock(db common.Database) *types.Block { - genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, GenesisDiff, 42, "") + genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, params.GenesisDifficulty, 42, "") genesis.Header().Number = common.Big0 - genesis.Header().GasLimit = GenesisGasLimit + genesis.Header().GasLimit = params.GenesisGasLimit genesis.Header().GasUsed = common.Big0 genesis.Header().Time = 0 |