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 /core/vm | |
| parent | cb2c10d8627d253192bf9af74070b62810d76b31 (diff) | |
| parent | 4c490db6afeb5a48d3e8d1d65ea8ddc9811d0a6d (diff) | |
| download | go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.gz go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.bz2 go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.lz go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.xz go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.tar.zst go-tangerine-2e5242f9bbbf8412fa5b6e94da942e69570d860d.zip | |
Merge pull request #1355 from Gustav-Simonsson/block_header_ts_uint64
Use uint64 for block header timestamp
Diffstat (limited to 'core/vm')
| -rw-r--r-- | core/vm/environment.go | 2 | ||||
| -rw-r--r-- | core/vm/vm.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/vm/environment.go b/core/vm/environment.go index c103049a2..0a5891f5c 100644 --- a/core/vm/environment.go +++ b/core/vm/environment.go @@ -17,7 +17,7 @@ type Environment interface { BlockNumber() *big.Int GetHash(n uint64) common.Hash Coinbase() common.Address - Time() int64 + Time() uint64 Difficulty() *big.Int GasLimit() *big.Int Transfer(from, to Account, amount *big.Int) error diff --git a/core/vm/vm.go b/core/vm/vm.go index 9e092300d..ba803683b 100644 --- a/core/vm/vm.go +++ b/core/vm/vm.go @@ -444,7 +444,7 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) { case TIMESTAMP: time := self.env.Time() - stack.push(big.NewInt(time)) + stack.push(new(big.Int).SetUint64(time)) case NUMBER: number := self.env.BlockNumber() |