diff options
| author | Felix Lange <fjl@twurst.com> | 2015-08-25 21:49:36 +0800 |
|---|---|---|
| committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-08-25 21:54:57 +0800 |
| commit | fd512fa12c59657d9e47cc3411e6e24bd1af89cb (patch) | |
| tree | 16ddada3b6ecbf26e53bb9eaf0c8b03812f7cab8 /core/chain_makers.go | |
| parent | dc3fb69dce674069479313837a5612045303c418 (diff) | |
| download | go-tangerine-1.1.0.tar go-tangerine-1.1.0.tar.gz go-tangerine-1.1.0.tar.bz2 go-tangerine-1.1.0.tar.lz go-tangerine-1.1.0.tar.xz go-tangerine-1.1.0.tar.zst go-tangerine-1.1.0.zip | |
Merge pull request #1711 from Gustav-Simonsson/timestamp_big_intv1.1.0
Add tests for uncle timestamps and refactor timestamp type
(cherry picked from commit abce09954b6901b446c004ee06b389c338922f28)
Diffstat (limited to 'core/chain_makers.go')
| -rw-r--r-- | core/chain_makers.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/chain_makers.go b/core/chain_makers.go index 0bb1df95a..b009e0c28 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -166,16 +166,21 @@ func GenerateChain(parent *types.Block, db common.Database, n int, gen func(int, } func makeHeader(parent *types.Block, state *state.StateDB) *types.Header { - time := parent.Time() + 10 // block time is fixed at 10 seconds + var time *big.Int + if parent.Time() == nil { + time = big.NewInt(10) + } else { + time = new(big.Int).Add(parent.Time(), big.NewInt(10)) // block time is fixed at 10 seconds + } return &types.Header{ Root: state.Root(), ParentHash: parent.Hash(), Coinbase: parent.Coinbase(), - Difficulty: CalcDifficulty(time, parent.Time(), parent.Number(), parent.Difficulty()), + Difficulty: CalcDifficulty(time.Uint64(), new(big.Int).Sub(time, big.NewInt(10)).Uint64(), parent.Number(), parent.Difficulty()), GasLimit: CalcGasLimit(parent), GasUsed: new(big.Int), Number: new(big.Int).Add(parent.Number(), common.Big1), - Time: uint64(time), + Time: time, } } |