eliminated v2opcode_values, v2forks in favour of op_codes, forks_list

nimbus/vm2/code_stream.nim

@@ -8,7 +8,7 @@
 import
   chronicles, strformat, strutils, sequtils, parseutils, sets, macros,
   eth/common,
-  ./interpreter/v2opcode_values
+  ./interpreter/op_codes
 
 logScope:
   topics = "vm code_stream"

nimbus/vm2/interpreter/v2forks.nim

@@ -1,14 +0,0 @@
-# Nimbus
-# Copyright (c) 2018 Status Research & Development GmbH
-# Licensed under either of
-#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-# at your option. This file may not be copied, modified, or distributed except according to those terms.
-
-when defined(evmc_enabled):
-  {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"}
-
-import forks_list
-export Fork
-
-# End

nimbus/vm2/interpreter/v2gas_costs.nim

@@ -11,7 +11,7 @@ when defined(evmc_enabled):
 import
   math, eth/common/eth_types,
   ./utils/[macros_gen_opcodes, v2utils_numeric],
-  ./v2opcode_values, ./v2forks, ../../errors
+  ./op_codes, ./forks_list, ../../errors
 
 # Gas Fee Schedule
 # Yellow Paper Appendix G - https://ethereum.github.io/yellowpaper/paper.pdf

nimbus/vm2/interpreter/v2opcode_values.nim

@@ -1,12 +0,0 @@
-# Nimbus
-# Copyright (c) 2018 Status Research & Development GmbH
-# Licensed under either of
-#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-# at your option. This file may not be copied, modified, or distributed except according to those terms.
-
-when defined(evmc_enabled):
-  {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"}
-
-import ./op_codes
-export Op

nimbus/vm2/transaction_tracer.nim

@@ -3,7 +3,7 @@ import
   chronicles, nimcrypto, eth/common, stint,
   ./v2types, ./v2memory, ./stack, ../db/accounts_cache,
   eth/trie/hexary,
-  ./interpreter/v2opcode_values
+  ./interpreter/op_codes
 
 logScope:
   topics = "vm opcode"

nimbus/vm2/v2computation.nim

@@ -13,7 +13,7 @@ import
   sets, eth/[common, keys],
   ../constants,
   ./compu_helper,
-  ./interpreter/[op_codes, gas_meter, v2gas_costs, v2forks],
+  ./interpreter/[op_codes, gas_meter, v2gas_costs, forks_list],
   ./code_stream, ./memory_defs, ./v2message, ./stack, ./v2types, ./v2state,
   ../db/accounts_cache,
   ./v2precompiles,

nimbus/vm2/v2interpreter.nim

@@ -11,22 +11,20 @@
 when defined(evmc_enabled):
   {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"}
 
+# see vm_internals
 
-# see vm_opcode_value
 import
-  ./interpreter/v2opcode_values as vmo
+  ./interpreter/op_codes as vmo
 export
   vmo.Op
 
 
-# see v2forks
 import
-  ./interpreter/v2forks as vmf
+  ./interpreter/forks_list as vmf
 export
   vmf.Fork
 
 
-# see vm_message
 import
   ./v2message as vmm
 export
@@ -34,7 +32,6 @@ export
 
 # Used in vm_types. Beware of recursive dependencies
 
-# see vm_computation
 import
   ./compu_helper as xmc
 export

nimbus/vm2/v2precompiles.nim

@@ -13,7 +13,7 @@ when defined(evmc_enabled):
 
 import
   ./v2types,
-  ./interpreter/[gas_meter, v2gas_costs, utils/v2utils_numeric, v2forks],
+  ./interpreter/[gas_meter, v2gas_costs, utils/v2utils_numeric, forks_list],
   ../errors, stint, eth/[keys, common], chronicles, tables, macros,
   math, nimcrypto, bncurve/[fields, groups], ./blake2b_f, ./blscurve
 

nimbus/vm2/v2state.nim

@@ -14,7 +14,7 @@ when defined(evmc_enabled):
 import
   macros, strformat, tables, sets, options,
   eth/[common, keys, rlp], nimcrypto/keccak,
-  ./interpreter/[v2forks, v2gas_costs], ../errors,
+  ./interpreter/[forks_list, v2gas_costs], ../errors,
   ../constants, ../db/[db_chain, accounts_cache],
   ../utils, json, ./transaction_tracer, ./v2types,
   ../config, ../../stateless/[witness_from_tree, witness_types]

nimbus/vm2/v2types.nim

@@ -15,7 +15,7 @@ import
   tables, eth/common,
   options, json, sets,
   ./stack_defs,  ./memory_defs, ./code_stream,
-  ./interpreter/[v2gas_costs, v2opcode_values, v2forks],
+  ./interpreter/[v2gas_costs, op_codes, forks_list],
   # TODO - will be hidden at a lower layer
   ../db/[db_chain, accounts_cache]
 

nimbus/vm_types2.nim

@@ -16,7 +16,7 @@ when defined(evmc_enabled) or not defined(vm2_enabled):
     ./vm/interpreter/vm_forks as vmf
 else:
   import
-    ./vm2/interpreter/v2forks as vmf
+    ./vm2/interpreter/forks_list as vmf
 
 export
   vmf.Fork
@@ -26,7 +26,7 @@ when defined(evmc_enabled) or not defined(vm2_enabled):
     ./vm/interpreter/opcode_values as vmo
 else:
   import
-    ./vm2/interpreter/v2opcode_values as vmo
+    ./vm2/interpreter/op_codes as vmo
 
 export
   vmo.Op