Refactor interpreter dispatch

VMTests.md

@@ -310,15 +310,15 @@ OK: 11/12 Fail: 1/12 Skip: 0/12
 + calldataload0.json                                              OK
 + calldataload1.json                                              OK
 + calldataload2.json                                              OK
-+ calldataloadSizeTooHigh.json                                    OK
+- calldataloadSizeTooHigh.json                                    Fail
 + calldataloadSizeTooHighPartial.json                             OK
 + calldataload_BigOffset.json                                     OK
 + calldatasize0.json                                              OK
 + calldatasize1.json                                              OK
 + calldatasize2.json                                              OK
 + caller.json                                                     OK
 + callvalue.json                                                  OK
-- codecopy0.json                                                  Fail
++ codecopy0.json                                                  OK
 + codecopyZeroMemExpansion.json                                   OK
 - codecopy_DataIndexTooHigh.json                                  Fail
 + codesize.json                                                   OK
@@ -445,7 +445,7 @@ OK: 26/52 Fail: 11/52 Skip: 15/52
 + jumpi_at_the_end.json                                           OK
 + jumpifInsidePushWithJumpDest.json                               OK
 + jumpifInsidePushWithoutJumpDest.json                            OK
-- kv1.json                                                        Fail
++ kv1.json                                                        OK
 + log1MemExp.json                                                 OK
 + loop_stacklimit_1020.json                                       OK
 + loop_stacklimit_1021.json                                       OK
@@ -461,8 +461,8 @@ OK: 26/52 Fail: 11/52 Skip: 15/52
 + mstore0.json                                                    OK
 + mstore1.json                                                    OK
 + mstore8MemExp.json                                              OK
-- mstore8WordToBigError.json                                      Fail
-- mstore8_0.json                                                  Fail
++ mstore8WordToBigError.json                                      OK
++ mstore8_0.json                                                  OK
 - mstore8_1.json                                                  Fail
 + mstoreMemExp.json                                               OK
 + mstoreWordToBigError.json                                       OK
@@ -483,7 +483,7 @@ OK: 26/52 Fail: 11/52 Skip: 15/52
 + swapAt52becameMstore.json                                       OK
 + when.json                                                       OK
 ```
-OK: 110/145 Fail: 34/145 Skip: 1/145
+OK: 113/145 Fail: 31/145 Skip: 1/145
 ## vmLogTest
 ```diff
 + log0_emptyMem.json                                              OK
@@ -673,10 +673,10 @@ OK: 0/17 Fail: 0/17 Skip: 17/17
 - sha3_memSizeQuadraticCost33.json                                Fail
 - sha3_memSizeQuadraticCost63.json                                Fail
 - sha3_memSizeQuadraticCost64.json                                Fail
-- sha3_memSizeQuadraticCost64_2.json                              Fail
++ sha3_memSizeQuadraticCost64_2.json                              OK
 - sha3_memSizeQuadraticCost65.json                                Fail
 ```
-OK: 4/18 Fail: 14/18 Skip: 0/18
+OK: 5/18 Fail: 13/18 Skip: 0/18
 ## vmSystemOperations
 ```diff
   ABAcalls0.json                                                  Skip
@@ -719,9 +719,9 @@ OK: 4/18 Fail: 14/18 Skip: 0/18
 OK: 0/36 Fail: 0/36 Skip: 36/36
 ## vmTests
 ```diff
-+ arith.json                                                      OK
-+ boolean.json                                                    OK
-+ mktx.json                                                       OK
+- arith.json                                                      Fail
+- boolean.json                                                    Fail
+- mktx.json                                                       Fail
 + suicide.json                                                    OK
 ```
-OK: 4/4 Fail: 0/4 Skip: 0/4
+OK: 1/4 Fail: 3/4 Skip: 0/4

nimbus/constants.nim

@@ -5,85 +5,52 @@ import
 proc default(t: typedesc): t = discard
 
 # constants
-
-let
-  UINT_256_MAX*: UInt256 =        high(UInt256)
-  INT_256_MAX_AS_UINT256* =       cast[Uint256](high(Int256))
-  NULLBYTE* =                     "\x00"
-  EMPTYWORD* =                    repeat(NULLBYTE, 32)
-  UINT160CEILING*: UInt256 =      2.u256.pow(160)
-  ZERO_ADDRESS* =                 default(EthAddress)
-  CREATE_CONTRACT_ADDRESS* =      ZERO_ADDRESS
-  ZERO_HASH32* =                  Hash256()
-  STACK_DEPTH_LIMIT* =            1024
-
-  GAS_LIMIT_EMA_DENOMINATOR* =    1_024
-  GAS_LIMIT_ADJUSTMENT_FACTOR* =  1_024
-  GAS_LIMIT_USAGE_ADJUSTMENT_NUMERATOR* = 3
+const
+  UINT_256_MAX*: UInt256 =                  high(UInt256)
+  INT_256_MAX_AS_UINT256* =                 high(Uint256) shr 1
+  NULLBYTE* =                               "\x00"
+  EMPTYWORD* =                              repeat(NULLBYTE, 32)
+  UINT160CEILING*: UInt256 =                2.u256.pow(160)
+  ZERO_ADDRESS* =                           default(EthAddress)
+  CREATE_CONTRACT_ADDRESS* =                ZERO_ADDRESS
+  ZERO_HASH32* =                            Hash256()
+  STACK_DEPTH_LIMIT* =                      1024
+
+  GAS_LIMIT_EMA_DENOMINATOR* =              1_024
+  GAS_LIMIT_ADJUSTMENT_FACTOR* =            1_024
+  GAS_LIMIT_USAGE_ADJUSTMENT_NUMERATOR* =   3
   GAS_LIMIT_USAGE_ADJUSTMENT_DENOMINATOR* = 2
 
-  DIFFICULTY_ADJUSTMENT_DENOMINATOR* = 2_048.u256
-  DIFFICULTY_MINIMUM* =           131_072.u256
+  DIFFICULTY_ADJUSTMENT_DENOMINATOR* =      2_048.u256
+  DIFFICULTY_MINIMUM* =                     131_072.u256
   BYZANTIUM_DIFFICULTY_ADJUSTMENT_CUTOFF* = 9
 
-  BOMB_EXPONENTIAL_PERIOD* =      100_000.u256
-  BOMB_EXPONENTIAL_FREE_PERIODS* = 2.u256
-
-  BLOCK_REWARD* =                 5.u256 * 2.u256 # denoms.ether
-
-  UNCLE_DEPTH_PENALTY_FACTOR* =   8.u256
-
-  MAX_UNCLE_DEPTH* =              6.u256
-  MAX_UNCLES* =                   2.u256
-
-  EMPTY_UNCLE_HASH* =             "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347".toDigest
-
-  GENESIS_BLOCK_NUMBER* =         0.u256
-  GENESIS_DIFFICULTY* =           131_072.u256
-  GENESIS_GAS_LIMIT* =            3_141_592
-  GENESIS_PARENT_HASH* =          ZERO_HASH32
-  GENESIS_COINBASE* =             ZERO_ADDRESS
-  GENESIS_NONCE* =                "\x00\x00\x00\x00\x00\x00\x00B"
-  GENESIS_MIX_HASH* =             ZERO_HASH32
-  GENESIS_EXTRA_DATA* =           ""
-  GAS_LIMIT_MINIMUM* =            5000
-
-  BLANK_ROOT_HASH* =              "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421".toDigest
-  EMPTY_SHA3* =                   "883f7328a6c30727a655daff17eba3a86049871bc7839a5b71e2bc26a99c4d4c".toDigest
-
-  GAS_MOD_EXP_QUADRATIC_DENOMINATOR* = 20.u256
+  BOMB_EXPONENTIAL_PERIOD* =                100_000.u256
+  BOMB_EXPONENTIAL_FREE_PERIODS* =          2.u256
 
-  MAX_PREV_HEADER_DEPTH* =        256.toBlockNumber
+  BLOCK_REWARD* =                           5.u256 * 2.u256 # denoms.ether
 
-  FORK_ICEAGE_BLKNUM* =           200_000.u256
-  FORK_HOMESTED_BLKNUM* =         1_150_000.u256
-  FORK_DAO_BLKNUM* =              1_920_000.u256
-  FORK_TANGERINE_WHISTLE_BLKNUM* = 2_463_000.u256
-  FORK_SPURIOUS_DRAGON_BLKNUM* =  2_675_000.u256
-  FORK_BYZANTIUM_BLKNUM* =        4_370_000.u256
+  UNCLE_DEPTH_PENALTY_FACTOR* =             8.u256
 
-# TODO: Move the below to a new utils unit?
+  MAX_UNCLE_DEPTH* =                        6.u256
+  MAX_UNCLES* =                             2.u256
 
-type
-  Fork = enum fkUnknown, fkFrontier, fkIceAge, fkHomested, fkDao, fkTangerineWhistle, fkSpuriousDragon, fkByzantium
-  UInt256Pair = tuple[a: Uint256, b: Uint256]
+  EMPTY_UNCLE_HASH* =                       "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347".toDigest
 
-proc `..`*(a, b: Uint256): UInt256Pair = (a, b)
+  GENESIS_BLOCK_NUMBER* =                   0.u256
+  GENESIS_DIFFICULTY* =                     131_072.u256
+  GENESIS_GAS_LIMIT* =                      3_141_592
+  GENESIS_PARENT_HASH* =                    ZERO_HASH32
+  GENESIS_COINBASE* =                       ZERO_ADDRESS
+  GENESIS_NONCE* =                          "\x00\x00\x00\x00\x00\x00\x00B"
+  GENESIS_MIX_HASH* =                       ZERO_HASH32
+  GENESIS_EXTRA_DATA* =                     ""
+  GAS_LIMIT_MINIMUM* =                      5000
 
-proc contains*(ab: UInt256Pair, v: UInt256): bool =
-  return v >= ab[0] and v <= ab[1]
+  BLANK_ROOT_HASH* =                        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421".toDigest
+  EMPTY_SHA3* =                             "883f7328a6c30727a655daff17eba3a86049871bc7839a5b71e2bc26a99c4d4c".toDigest
 
-proc toFork*(blockNumber: UInt256): Fork =
-  # TODO - Refactoring: superseded by newNimbusVM for the time being #https://github.com/status-im/nimbus/pull/37
-  # TODO - Refactoring: redundant with `chain.nim` getVM
-  result = fkUnknown
-  let one = u256(1)
-  if blockNumber in u256(0)..FORK_ICEAGE_BLKNUM - one: result = fkFrontier
-  elif blockNumber in FORK_ICEAGE_BLKNUM..FORK_HOMESTED_BLKNUM - one: result = fkIceAge
-  elif blockNumber in FORK_HOMESTED_BLKNUM..FORK_DAO_BLKNUM - one: result = fkHomested
-  elif blockNumber in FORK_DAO_BLKNUM..FORK_TANGERINE_WHISTLE_BLKNUM - one: result = fkDao
-  elif blockNumber in FORK_TANGERINE_WHISTLE_BLKNUM..FORK_SPURIOUS_DRAGON_BLKNUM - one: result = fkTangerineWhistle
-  elif blockNumber in FORK_SPURIOUS_DRAGON_BLKNUM..FORK_BYZANTIUM_BLKNUM - one: result = fkSpuriousDragon
-  else:
-    if blockNumber >= FORK_BYZANTIUM_BLKNUM: result = fkByzantium # Update for constantinople when announced
+  GAS_MOD_EXP_QUADRATIC_DENOMINATOR* =      20.u256
 
+  MAX_PREV_HEADER_DEPTH* =                  256.toBlockNumber
+  MaxCallDepth* =                           1024

nimbus/db/state_db.nim

@@ -119,10 +119,12 @@ proc setNonce*(db: var AccountStateDB, address: EthAddress, nonce: UInt256) =
   db.setAccount(address, account)
 
 proc getNonce*(db: AccountStateDB, address: EthAddress): UInt256 =
+  # TODO it is very strange that we require a var param here
+
   validateCanonicalAddress(address, title="Storage Address")
 
   let account = db.getAccount(address)
-  return account.nonce
+  account.nonce
 
 proc toByteRange_Unnecessary*(h: KeccakHash): ByteRange =
   ## XXX: Another proc used to mark unnecessary conversions it the code

nimbus/errors.nim

@@ -9,9 +9,6 @@ type
   EVMError* = object of Exception
     ## Base error class for all evm errors.
 
-  VMNotFound* = object of EVMError
-    ## No VM available for the provided block number.
-
   BlockNotFound* = object of EVMError
     ## The block with the given number/hash does not exist.
 
@@ -24,9 +21,6 @@ type
   ValidationError* = object of EVMError
     ## Error to signal something does not pass a validation check.
 
-  Halt* = object of EVMError
-    ## Raised by opcode function to halt vm execution.
-
   VMError* = object of EVMError
     ## Class of errors which can be raised during VM execution.
     erasesReturnData*: bool
@@ -57,9 +51,6 @@ type
   ContractCreationCollision* = object of VMError
     ## Error signaling that there was an address collision during contract creation.
 
-  Revert* = object of VMError
-    ##     Error used by the REVERT opcode
-
   WriteProtection* = object of VMError
     ## Error raised if an attempt to modify the state database is made while
     ## operating inside of a STATICCALL context.
@@ -78,8 +69,3 @@ proc makeVMError*: ref VMError =
   new(result)
   result.burnsGas = true
   result.erasesReturnData = true
-
-proc makeRevert*(): ref Revert =
-  new(result)
-  result.burnsGas = false
-  result.erasesReturnData = false

nimbus/logging.nim

@@ -32,7 +32,7 @@ template trace*(l: Logger, msg: string) =
   when DEBUG:
     l.log(msg, fgBlue)
 
-proc getLogger*(name: string): Logger =
+proc getLogger*(name: string): Logger {.inline.}=
   result = Logger(name: name)
 
 # proc disableLogging* =

nimbus/validation.nim

@@ -43,7 +43,7 @@ proc validateStackItem*(value: string) =
     raise newException(ValidationError,
       &"Invalid stack item: expected 32 bytes, got {value.len}: value is {value}")
 
-proc validateStackItem*(value: string | seq[byte]) =
+proc validateStackItem*(value: openarray[byte]) =
   if value.len > 32:
     raise newException(ValidationError,
       &"Invalid stack item: expected 32 bytes, got {value.len}: value is {value}")

nimbus/vm/code_stream.nim

@@ -45,6 +45,7 @@ proc newCodeStreamFromUnescaped*(code: string): CodeStream =
   newCodeStream(codeBytes)
 
 proc read*(c: var CodeStream, size: int): seq[byte] =
+  # TODO: use openarray[bytes]
   if c.pc + size - 1 < c.bytes.len:
     result = c.bytes[c.pc .. c.pc + size - 1]
     c.pc += size
@@ -60,18 +61,17 @@ proc readVmWord*(c: var CodeStream, n: int): UInt256 =
   let last = min(c.pc + n, c.bytes.len)
   let toWrite = last - c.pc
   for i in 0 ..< toWrite : result_bytes[i] = c.bytes[last - i - 1]
-  for j in toWrite ..< 32: result_bytes[j] = 0
   c.pc = last
 
 proc len*(c: CodeStream): int =
   len(c.bytes)
 
 proc next*(c: var CodeStream): Op =
-  var nextOpcode = c.read(1)
-  if nextOpcode.len != 0:
-    return Op(nextOpcode[0])
+  if c.pc != c.bytes.len:
+    result = Op(c.bytes[c.pc])
+    inc c.pc
   else:
-    return Op.STOP
+    result = Stop
 
 iterator items*(c: var CodeStream): Op =
   var nextOpcode = c.next()
@@ -83,9 +83,10 @@ proc `[]`*(c: CodeStream, offset: int): Op =
   Op(c.bytes[offset])
 
 proc peek*(c: var CodeStream): Op =
-  var currentPc = c.pc
-  result = c.next()
-  c.pc = currentPc
+  if c.pc <= c.bytes.len:
+    result = Op(c.bytes[c.pc])
+  else:
+    result = Stop
 
 proc updatePc*(c: var CodeStream, value: int) =
   c.pc = min(value, len(c))
@@ -100,7 +101,7 @@ when false:
     finally:
       cs.pc = anchorPc
 
-proc isValidOpcode*(c: var CodeStream, position: int): bool =
+proc isValidOpcode*(c: CodeStream, position: int): bool =
   if position >= len(c):
     return false
   if position in c.invalidPositions: