add "--threads:on" to tests and main binary

- some "funcs" were no longer considered side-effect free, so I made
  them procs
- added {.base.} to some base methods to avoid a deprecation warning

nimbus/config.nim

@@ -533,7 +533,8 @@ proc initConfiguration(): NimbusConfiguration =
   result.net.maxPendingPeers = 0
   result.net.bindPort = 30303'u16
   result.net.discPort = 30303'u16
-  result.net.ident = NimbusIdent
+  {.gcsafe.}:
+    result.net.ident = NimbusIdent
 
   const dataDir = getDefaultDataDir()
 

nimbus/nim.cfg

@@ -1,4 +1,5 @@
 -d:chronicles_line_numbers
 -d:"chronicles_sinks=textblocks"
 -d:nimDebugDlOpen
+--threads:on
 

nimbus/p2p/chain.nim

@@ -10,20 +10,20 @@ proc newChain*(db: BaseChainDB): Chain =
   result.new
   result.db = db
 
-method genesisHash*(c: Chain): KeccakHash =
+method genesisHash*(c: Chain): KeccakHash {.gcsafe.} =
   c.db.getBlockHash(0.toBlockNumber)
 
-method getBlockHeader*(c: Chain, b: HashOrNum, output: var BlockHeader): bool =
+method getBlockHeader*(c: Chain, b: HashOrNum, output: var BlockHeader): bool {.gcsafe.} =
   case b.isHash
   of true:
     c.db.getBlockHeader(b.hash, output)
   else:
     c.db.getBlockHeader(b.number, output)
 
-method getBestBlockHeader*(c: Chain): BlockHeader =
+method getBestBlockHeader*(c: Chain): BlockHeader {.gcsafe.} =
   c.db.getCanonicalHead()
 
-method getSuccessorHeader*(c: Chain, h: BlockHeader, output: var BlockHeader): bool =
+method getSuccessorHeader*(c: Chain, h: BlockHeader, output: var BlockHeader): bool {.gcsafe.} =
   let n = h.blockNumber + 1
   c.db.getBlockHeader(n, output)
 

nimbus/rpc/common.nim

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

nimbus/rpc/p2p.nim

@@ -85,7 +85,7 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
     let vmState = newBaseVMState(header, chain)
     result = vmState.readOnlyStateDB()
 
-  func accountDbFromTag(tag: string, readOnly = true): ReadOnlyStateDB =
+  proc accountDbFromTag(tag: string, readOnly = true): ReadOnlyStateDB =
     result = getAccountDb(chain.headerFromTag(tag))
 
   proc getBlockBody(hash: KeccakHash): BlockBody =

nimbus/rpc/rpc_utils.nim

@@ -19,7 +19,7 @@ func toHash*(value: array[32, byte]): Hash256 {.inline.} =
 func toHash*(value: EthHashStr): Hash256 {.inline.} =
   result = hexToPaddedByteArray[32](value.string).toHash
 
-func headerFromTag*(chain: BaseChainDB, blockTag: string): BlockHeader =
+proc headerFromTag*(chain: BaseChainDB, blockTag: string): BlockHeader =
   let tag = blockTag.toLowerAscii
   case tag
   of "latest": result = chain.getCanonicalHead()
@@ -31,4 +31,4 @@ func headerFromTag*(chain: BaseChainDB, blockTag: string): BlockHeader =
     # Raises are trapped and wrapped in JSON when returned to the user.
     tag.validateHexQuantity
     let blockNum = stint.fromHex(UInt256, tag)
-    result = chain.getBlockHeader(blockNum)
+    result = chain.getBlockHeader(blockNum)

nimbus/vm_state.nim

@@ -39,25 +39,25 @@ proc newBaseVMState*(header: BlockHeader, chainDB: BaseChainDB, tracerFlags: set
 proc stateRoot*(vmState: BaseVMState): Hash256 =
   vmState.blockHeader.stateRoot
 
-method blockhash*(vmState: BaseVMState): Hash256 =
+method blockhash*(vmState: BaseVMState): Hash256 {.base, gcsafe.} =
   vmState.blockHeader.hash
 
-method coinbase*(vmState: BaseVMState): EthAddress =
+method coinbase*(vmState: BaseVMState): EthAddress {.base, gcsafe.} =
   vmState.blockHeader.coinbase
 
-method timestamp*(vmState: BaseVMState): EthTime =
+method timestamp*(vmState: BaseVMState): EthTime {.base, gcsafe.} =
   vmState.blockHeader.timestamp
 
-method blockNumber*(vmState: BaseVMState): BlockNumber =
+method blockNumber*(vmState: BaseVMState): BlockNumber {.base, gcsafe.} =
   vmState.blockHeader.blockNumber
 
-method difficulty*(vmState: BaseVMState): UInt256 =
+method difficulty*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =
   vmState.blockHeader.difficulty
 
-method gasLimit*(vmState: BaseVMState): GasInt =
+method gasLimit*(vmState: BaseVMState): GasInt {.base, gcsafe.} =
   vmState.blockHeader.gasLimit
 
-method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 =
+method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 {.base, gcsafe.} =
   var ancestorDepth = vmState.blockHeader.blockNumber - blockNumber - 1
   if ancestorDepth >= constants.MAX_PREV_HEADER_DEPTH or ancestorDepth < 0:
     return

tests/nim.cfg

@@ -1,3 +1,4 @@
 -d:chronicles_line_numbers
 -d:"chronicles_sinks=textblocks"
+--threads:on