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
eth/handler.go
View File

@ -117,7 +117,7 @@ func NewProtocolManager(networkId int, mux *event.TypeMux, txpool txPool, pow po
manager.downloader = downloader.New(manager.eventMux, manager.chainman.HasBlock, manager.chainman.GetBlock, manager.chainman.CurrentBlock, manager.chainman.InsertChain, manager.removePeer)
validator := func(block *types.Block, parent *types.Block) error {
return core.ValidateHeader(pow, block.Header(), parent, true)
return core.ValidateHeader(pow, block.Header(), parent, true, false)
}
heighter := func() uint64 {
return manager.chainman.CurrentBlock().NumberU64()