gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1711 from Gustav-Simonsson/timestamp_big_int

Browse Source 
Add tests for uncle timestamps and refactor timestamp type
(cherry picked from commit abce09954b)

(cherry picked from commit fd512fa12c)

Conflicts:
	core/vm/instructions.go
	core/vm/jit_test.go
This commit is contained in:
Felix Lange
2015-08-25 15:49:36 +02:00
committed by Gustav Simonsson
parent 5c11d1033d
commit 2d1ea1a66d
19 changed files with 378 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/genesis.go
View File

@ -73,7 +73,7 @@ func WriteGenesisBlock(stateDb, blockDb common.Database, reader io.Reader) (*typ
difficulty := common.String2Big(genesis.Difficulty)
block := types.NewBlock(&types.Header{
Nonce: types.EncodeNonce(common.String2Big(genesis.Nonce).Uint64()),
Time: common.String2Big(genesis.Timestamp).Uint64(),
Time: common.String2Big(genesis.Timestamp),
ParentHash: common.HexToHash(genesis.ParentHash),
Extra: common.FromHex(genesis.ExtraData),
GasLimit: common.String2Big(genesis.GasLimit),