status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #17: EthTime break by upstream commit f6df2d9956

This commit is contained in:
mratsim 2018-04-14 11:20:17 +02:00
parent 4da71f76b9
commit 48c389e57c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/logic/block_ops.nim
View File

@ -6,6 +6,7 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
import import
times,
../constants, ../errors, ../computation, ../vm_state, ../types, .. / vm / [stack], ttmath ../constants, ../errors, ../computation, ../vm_state, ../types, .. / vm / [stack], ttmath
{.this: computation.} {.this: computation.}
@ -25,7 +26,7 @@ proc coinbase*(computation) =
proc timestamp*(computation) = proc timestamp*(computation) =
# TODO: EthTime is an alias of Time, which is a distinct int64 so can't use u256(int64) # TODO: EthTime is an alias of Time, which is a distinct int64 so can't use u256(int64)
# This may have implications for different platforms. # This may have implications for different platforms.
stack.push(vmState.timestamp.uint64.u256) stack.push(vmState.timestamp.toUnix.uint64.u256)
proc number*(computation) = proc number*(computation) =
stack.push(vmState.blockNumber) stack.push(vmState.blockNumber)