remove the need for gcsafe overrides

This commit is contained in:
Zahary Karadjov 2019-01-15 17:25:14 +02:00 committed by zah
parent a431ceed11
commit c98e337090
2 changed files with 10 additions and 11 deletions

View File

@ -13,13 +13,10 @@ import
./db/select_backend,
./vm/interpreter/vm_forks
let
const
NimbusName* = "Nimbus"
## project name string
NimbusCopyright* = "Copyright (C) 2018-" & $(now().utc.year) & " Status Research & Development GmbH"
## copyright string
NimbusMajor*: int = 0
## is the major number of Nimbus' version.
@ -32,14 +29,18 @@ let
NimbusVersion* = $NimbusMajor & "." & $NimbusMinor & "." & $NimbusPatch
## is the version of Nimbus as a string.
NimbusIdent* = "$1/$2 ($3/$4)" % [NimbusName, NimbusVersion, hostCPU, hostOS]
## project ident name for networking services
let
NimbusCopyright* = "Copyright (C) 2018-" & $(now().utc.year) & " Status Research & Development GmbH"
## copyright string
NimbusHeader* = NimbusName & " Version " & NimbusVersion &
" [" & hostOS & ": " & hostCPU & ", " & nimbus_db_backend & "]\r\n" &
NimbusCopyright
## is the header which printed, when nimbus binary got executed
NimbusIdent* = "$1/$2 ($3/$4)" % [NimbusName, NimbusVersion, hostCPU, hostOS]
## project ident name for networking services
const
MainnetBootnodes = [
"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303" , # IE
@ -533,7 +534,6 @@ proc initConfiguration(): NimbusConfiguration =
result.net.maxPendingPeers = 0
result.net.bindPort = 30303'u16
result.net.discPort = 30303'u16
{.gcsafe.}:
result.net.ident = NimbusIdent
const dataDir = getDefaultDataDir()

View File

@ -14,7 +14,6 @@ import
proc setupCommonRPC*(server: RpcServer) =
server.rpc("web3_clientVersion") do() -> string:
{.gcsafe.}:
result = NimbusIdent
server.rpc("web3_sha3") do(data: HexDataStr) -> string: