aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-08-05 19:26:57 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-08-05 19:26:57 +0800
commitf12e0161ca7ed2bc5034a7b4904e1b5032e41fe7 (patch)
tree540f55c20664974f909a94990874d8082b1ae6ba /miner
parent1f4ac6b05ae218b86100cdfbd87929624a29d2e2 (diff)
parent71d32f54f70917c53fd3a691cface3bc73ffa1b7 (diff)
downloadgo-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 'miner')
-rw-r--r--miner/worker.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go
index a703baada..269219ba0 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -445,7 +445,7 @@ func (self *worker) commitNewWork() {
header := &types.Header{
ParentHash: parent.Hash(),
Number: num.Add(num, common.Big1),
- Difficulty: core.CalcDifficulty(uint64(tstamp), parent.Time(), parent.Difficulty()),
+ Difficulty: core.CalcDifficulty(uint64(tstamp), parent.Time(), parent.Number(), parent.Difficulty()),
GasLimit: core.CalcGasLimit(parent),
GasUsed: new(big.Int),
Coinbase: self.coinbase,