diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 18:57:02 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 18:57:02 +0800 |
| commit | 2e5242f9bbbf8412fa5b6e94da942e69570d860d (patch) | |
| tree | 2a5d22c767fb61b4da3e5ad55cd97e2826699f09 /miner | |
| parent | cb2c10d8627d253192bf9af74070b62810d76b31 (diff) | |
| parent | 4c490db6afeb5a48d3e8d1d65ea8ddc9811d0a6d (diff) | |
| download | dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.gz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.bz2 dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.lz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.xz dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.zst dexon-2e5242f9bbbf8412fa5b6e94da942e69570d860d.zip | |
Merge pull request #1355 from Gustav-Simonsson/block_header_ts_uint64
Use uint64 for block header timestamp
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/miner/worker.go b/miner/worker.go index f06b6afa1..90914ddcb 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -368,8 +368,8 @@ func (self *worker) commitNewWork() { tstart := time.Now() parent := self.chain.CurrentBlock() tstamp := tstart.Unix() - if tstamp <= parent.Time() { - tstamp = parent.Time() + 1 + if tstamp <= int64(parent.Time()) { + tstamp = int64(parent.Time()) + 1 } // this will ensure we're not going off too far in the future if now := time.Now().Unix(); tstamp > now+4 { @@ -382,7 +382,7 @@ func (self *worker) commitNewWork() { header := &types.Header{ ParentHash: parent.Hash(), Number: num.Add(num, common.Big1), - Difficulty: core.CalcDifficulty(tstamp, parent.Time(), parent.Difficulty()), + Difficulty: core.CalcDifficulty(int64(tstamp), int64(parent.Time()), parent.Difficulty()), GasLimit: core.CalcGasLimit(parent), GasUsed: new(big.Int), Coinbase: self.coinbase, |