Merge pull request #7 from status-im/EthTime

Use separate EthTime type for timestamps
This commit is contained in:
coffeepots 2018-04-10 19:18:07 +01:00 committed by GitHub
commit 20a9c4903d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 7 deletions

View File

@ -38,7 +38,7 @@ type
nonce*: string
mixHash*: string
extraData*: string
timestamp*: int
timestamp*: EthTime
stateRoot*: string
FundedAddress* = ref object

View File

@ -1,11 +1,13 @@
import
ttmath, math, strutils, tables, utils/padding, rlp
ttmath, math, strutils, tables, utils/padding, rlp, times
# rlpFields UInt256, table
type
TypeHint* {.pure.} = enum UInt256, Bytes, Any
EthTime* = Time
#Bytes* = seq[byte]

View File

@ -6,7 +6,7 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms.
import
../constants, ../errors, ../computation, ../vm_state, ../types, .. / vm / [stack]
../constants, ../errors, ../computation, ../vm_state, ../types, .. / vm / [stack], ttmath
{.this: computation.}
{.experimental.}
@ -23,7 +23,9 @@ proc coinbase*(computation) =
stack.push(vmState.coinbase)
proc timestamp*(computation) =
stack.push(vmState.timestamp.u256)
# 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.
stack.push(vmState.timestamp.uint64.u256)
proc number*(computation) =
stack.push(vmState.blockNumber)

View File

@ -9,7 +9,6 @@
import ../constants, ttmath, strformat, times, ../validation
type
EthTime = Time
Header* = ref object
timestamp*: EthTime
difficulty*: UInt256

View File

@ -13,4 +13,3 @@ template keccak*(value: string): string =
template keccak*(value: cstring): string =
($value).keccak

View File

@ -51,7 +51,7 @@ method blockhash*(vmState: BaseVMState): string =
method coinbase*(vmState: BaseVMState): string =
vmState.blockHeader.coinbase
method timestamp*(vmState: BaseVMState): int =
method timestamp*(vmState: BaseVMState): EthTime =
vmState.blockHeader.timestamp
method blockNumber*(vmState: BaseVMState): UInt256 =