Merge pull request #432 from status-im/fix-#414

Fix #414

nimbus/config.nim

@@ -209,15 +209,15 @@ proc processInteger*(v: string, o: var int): ConfigStatus =
  try:
  o = parseInt(v)
  result = Success
- except:
+ except ValueError:
  result = ErrorParseOption
 
 proc processFloat*(v: string, o: var float): ConfigStatus =
  ## Convert string to float.
  try:
  o = parseFloat(v)
  result = Success
- except:
+ except ValueError:
  result = ErrorParseOption
 
 proc processAddressPortsList(v: string,
@@ -230,11 +230,11 @@ proc processAddressPortsList(v: string,
  var tas6: seq[TransportAddress]
  try:
  tas4 = resolveTAddress(item, IpAddressFamily.IPv4)
- except:
+ except CatchableError:
  discard
  try:
  tas6 = resolveTAddress(item, IpAddressFamily.IPv6)
- except:
+ except CatchableError:
  discard
  if len(tas4) == 0 and len(tas6) == 0:
  result = ErrorParseOption
@@ -296,31 +296,31 @@ proc processPrivateKey(v: string, o: var PrivateKey): ConfigStatus =
  try:
  o = initPrivateKey(v)
  result = Success
- except:
+ except CatchableError:
  result = ErrorParseOption
 
 # proc processHexBytes(v: string, o: var seq[byte]): ConfigStatus =
 # ## Convert hexadecimal string to seq[byte].
 # try:
 # o = fromHex(v)
 # result = Success
-# except:
+# except CatchableError:
 # result = ErrorParseOption
 
 # proc processHexString(v: string, o: var string): ConfigStatus =
 # ## Convert hexadecimal string to string.
 # try:
 # o = parseHexStr(v)
 # result = Success
-# except:
+# except CatchableError:
 # result = ErrorParseOption
 
 # proc processJson(v: string, o: var JsonNode): ConfigStatus =
 # ## Convert string to JSON.
 # try:
 # o = parseJson(v)
 # result = Success
-# except:
+# except CatchableError:
 # result = ErrorParseOption
 
 proc processPruneList(v: string, flags: var PruneMode): ConfigStatus =

nimbus/nimbus.nim

@@ -183,10 +183,8 @@ proc process*() =
  while nimbus.state == Running:
  try:
  poll()
- except CatchableError:
- debug "Exception in poll()",
- exc = getCurrentException().name,
- err = getCurrentExceptionMsg()
+ except CatchableError as e:
+ debug "Exception in poll()", exc = e.name, err = e.msg
 
  # Stop loop
  waitFor stop()

nimbus/rpc/whisper.nim

@@ -59,7 +59,7 @@ proc setupWhisperRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer)
  # this is the general behaviour we want.
  try:
  waitFor node.setPowRequirement(pow)
- except:
+ except CatchableError:
  trace "setPowRequirement error occured"
  result = true
 

nimbus/vm/interpreter_dispatch.nim

@@ -347,9 +347,8 @@ proc executeOpcodes(computation: BaseComputation) =
 
  try:
  computation.selectVM(fork)
- except:
- let msg = getCurrentExceptionMsg()
- computation.setError(&"Opcode Dispatch Error msg={msg}, depth={computation.msg.depth}", true)
+ except CatchableError as e:
+ computation.setError(&"Opcode Dispatch Error msg={e.msg}, depth={computation.msg.depth}", true)
 
  computation.nextProc()
  if computation.isError():

nimbus/vm/precompiles.nim

@@ -358,14 +358,12 @@ proc execPrecompiles*(computation: BaseComputation, fork: Fork): bool {.inline.}
  of paEcMul: bn256ecMul(computation, fork)
  of paPairing: bn256ecPairing(computation, fork)
  of paBlake2bf: blake2bf(computation)
- except OutOfGas:
- let msg = getCurrentExceptionMsg()
+ except OutOfGas as e:
  # cannot use setError here, cyclic dependency
- computation.error = Error(info: msg, burnsGas: true)
- except CatchableError:
- let msg = getCurrentExceptionMsg()
+ computation.error = Error(info: e.msg, burnsGas: true)
+ except CatchableError as e:
  if fork >= FKByzantium and precompile > paIdentity:
- computation.error = Error(info: msg, burnsGas: true)
+ computation.error = Error(info: e.msg, burnsGas: true)
  else:
  # swallow any other precompiles errors
- debug "execPrecompiles validation error", msg=msg
+ debug "execPrecompiles validation error", msg=e.msg

tests/test_generalstate_failing.nim

@@ -28,5 +28,9 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
  "RevertInCreateInInit.json",
  "RevertInCreateInInitCreate2.json",
  "InitCollision.json",
+
+ # Failure once spotted on Travis CI Linux AMD64:
+ # "out of memorysubtest no: 7 failed"
+ # "randomStatetest159.json",
  ]
  result = name in allowedFailingGeneralStateTests