diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-05 19:26:57 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-05 19:26:57 +0800 |
| commit | f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7 (patch) | |
| tree | 540f55c20664974f909a94990874d8082b1ae6ba /core/block_processor.go | |
| parent | 1f4ac6b05ae218b86100cdfbd87929624a29d2e2 (diff) | |
| parent | 71d32f54f70917c53fd3a691cface3bc73ffa1b7 (diff) | |
| download | go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar.gz go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar.bz2 go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar.lz go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar.xz go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.tar.zst go-tangerine-f12e0161ca7ed2bc5034a7b4904e1b5032e41fe7.zip | |
Merge pull request #1588 from obscuren/diff-bomb
core, miner: added difficulty bomb
Diffstat (limited to 'core/block_processor.go')
| -rw-r--r-- | core/block_processor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index 6687cd000..5a2ad8377 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -386,7 +386,7 @@ func ValidateHeader(pow pow.PoW, block *types.Header, parent *types.Block, check return BlockEqualTSErr } - expd := CalcDifficulty(block.Time, parent.Time(), parent.Difficulty()) + expd := CalcDifficulty(block.Time, parent.Time(), parent.Number(), parent.Difficulty()) if expd.Cmp(block.Difficulty) != 0 { return fmt.Errorf("Difficulty check failed for block %v, %v", block.Difficulty, expd) } |