diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-09 22:22:38 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-09 22:22:38 +0800 |
| commit | dd140beb73bf70d1b7c78c5a92e5c73586282bb6 (patch) | |
| tree | 5d0adbc2d526ee422f937c2dc253f3b064ebf465 /miner | |
| parent | 06afabb63105cab5ab2360d6a84cbe398b25d8ca (diff) | |
| parent | 5d6d40f329410f20d9ceb92d31985a883d94cb24 (diff) | |
| download | dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar.gz dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar.bz2 dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar.lz dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar.xz dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.tar.zst dexon-dd140beb73bf70d1b7c78c5a92e5c73586282bb6.zip | |
Merge pull request #1443 from Gustav-Simonsson/core_uint64_ts
Core uint64 ts
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 79514b231..085721751 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -427,7 +427,7 @@ func (self *worker) commitNewWork() { header := &types.Header{ ParentHash: parent.Hash(), Number: num.Add(num, common.Big1), - Difficulty: core.CalcDifficulty(int64(tstamp), int64(parent.Time()), parent.Difficulty()), + Difficulty: core.CalcDifficulty(uint64(tstamp), parent.Time(), parent.Difficulty()), GasLimit: core.CalcGasLimit(parent), GasUsed: new(big.Int), Coinbase: self.coinbase, |