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

Fix #414

nimbus/config.nim

@@ -209,7 +209,7 @@ 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 =
@@ -217,7 +217,7 @@ proc processFloat*(v: string, o: var float): ConfigStatus =
   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,7 +296,7 @@ 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 =
@@ -304,7 +304,7 @@ proc processPrivateKey(v: string, o: var PrivateKey): ConfigStatus =
 #   try:
 #     o = fromHex(v)
 #     result = Success
-#   except:
+#   except CatchableError:
 #     result = ErrorParseOption
 
 # proc processHexString(v: string, o: var string): ConfigStatus =
@@ -312,7 +312,7 @@ proc processPrivateKey(v: string, o: var PrivateKey): ConfigStatus =
 #   try:
 #     o = parseHexStr(v)
 #     result = Success
-#   except:
+#   except CatchableError:
 #     result = ErrorParseOption
 
 # proc processJson(v: string, o: var JsonNode): ConfigStatus =
@@ -320,7 +320,7 @@ proc processPrivateKey(v: string, o: var PrivateKey): ConfigStatus =
 #   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

vendor/nim-chronicles

@@ -1 +1 @@
-Subproject commit 743f14cf68f213a0cbead5e6dfc00ee3edc7fe1e
+Subproject commit 81aebe6a8955b9c6c598aaf36d2c3ff8edc0e5fa

vendor/nim-chronos

@@ -1 +1 @@
-Subproject commit d3eac1d64341a45547ad298dcd9fcb34523473b8
+Subproject commit c39c0696806a0ef09bc90e477ea6b177d2824699

vendor/nim-eth

@@ -1 +1 @@
-Subproject commit b1be96269435a9d49c9afed2442042a7c5130eac
+Subproject commit e6164996c8e1ce1a33c17250935fc985b9120830

vendor/nim-faststreams

@@ -1 +1 @@
-Subproject commit 1e85ab9150dd3759c86b2a6c9148f3fad3d1694c
+Subproject commit e7a34b74f298eaabd7bdbe2f080bf9747ed6bfd9

vendor/nim-json-rpc

@@ -1 +1 @@
-Subproject commit 9214b095fb0266e5cac44804663343cd8288a84c
+Subproject commit fc0665f88a4f24e9f51fe059ad4e943f3eed927e

vendor/nim-json-serialization

@@ -1 +1 @@
-Subproject commit 173c7b4a86e6d75a69577166526b0f5840c45003
+Subproject commit 88b79e230005d8301c3ae950abdbf8ad55e37f19

vendor/nim-serialization

@@ -1 +1 @@
-Subproject commit e6c59d86be74ef4a7c4ee28cf61ebb6a9e2e5972
+Subproject commit ae60eef4e8413e49fb0dbcae9a343fb479509fa0

vendor/nim-stew

@@ -1 +1 @@
-Subproject commit 2c9ca5dabbee8f7b1eb6e24722033706f0f650dc
+Subproject commit 1c4293b3e754b5ea68a188b60b192801162cd44e

vendor/nimcrypto

@@ -1 +1 @@
-Subproject commit e50298c7ac4d1bd6a087b38a9c27c2ae16271940
+Subproject commit 71b41764aef41de04348c645b6e7d8bfe227fda2