status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-27 20:45:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Moved EthTime to constants, update more timestamps to EthTime"

Browse Source 
This reverts commit a731f59bd39abd2a75a2b5c0e92aa016845f5ef7.
This commit is contained in:
Coffepots 2018-04-06 16:24:39 +01:00
parent a731f59bd3
commit fdcfe5ae2f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chain.nim
View File

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

3
src/constants.nim
View File

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

1
src/utils/header.nim
View File

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

2
src/vm_state.nim
View File

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