vm2: Remove vm2 `forks_list` everywhere, use common forks list

Remove file vm2 file `forks_list, and divert all imports to the common forks
list outside the EVM.

Signed-off-by: Jamie Lokier <jamie@shareable.org>

nimbus/vm2/computation.nim

@@ -9,11 +9,11 @@
 # according to those terms.
 
 import
-  ../constants,
+  ../constants, ../forks,
   ../db/accounts_cache,
   ../utils,
   ./code_stream,
-  ./interpreter/[forks_list, gas_meter, gas_costs, op_codes],
+  ./interpreter/[gas_meter, gas_costs, op_codes],
   ./memory,
   ./message,
   ./stack,

nimbus/vm2/interpreter/forks_list.nim

@@ -1,2 +0,0 @@
-import ../../forks
-export Fork

nimbus/vm2/interpreter/gas_costs.nim

@@ -8,7 +8,7 @@
 import
   math, eth/common/eth_types,
   ./utils/[macros_gen_opcodes, utils_numeric],
-  ./op_codes, ./forks_list, ../../errors
+  ./op_codes, ../../forks, ../../errors
 
 # Gas Fee Schedule
 # Yellow Paper Appendix G - https://ethereum.github.io/yellowpaper/paper.pdf

nimbus/vm2/interpreter/op_dispatcher.nim

@@ -17,7 +17,7 @@ const
 import
   ../code_stream,
   ../computation,
-  ./forks_list,
+  ../../forks,
   ./gas_costs,
   ./gas_meter,
   ./op_codes,

nimbus/vm2/interpreter/op_handlers.nim

@@ -19,7 +19,7 @@ const
 
 import
   strformat,
-  ./forks_list,
+  ../../forks,
   ./op_codes,
   ./op_handlers/[oph_defs,
                  oph_arithmetic, oph_hash, oph_envinfo, oph_blockdata,

nimbus/vm2/interpreter/op_handlers/oph_call.nim

@@ -16,12 +16,12 @@ import
   ../../../constants,
   ../../../db/accounts_cache,
   ../../../errors,
+  ../../../forks,
   ../../computation,
   ../../memory,
   ../../stack,
   ../../state,
   ../../types,
-  ../forks_list,
   ../gas_costs,
   ../gas_meter,
   ../op_codes,

nimbus/vm2/interpreter/op_handlers/oph_create.nim

@@ -15,12 +15,12 @@
 import
   ../../../constants,
   ../../../errors,
+  ../../../forks,
   ../../computation,
   ../../memory,
   ../../stack,
   ../../state,
   ../../types,
-  ../forks_list,
   ../gas_costs,
   ../gas_meter,
   ../op_codes,

nimbus/vm2/interpreter/op_handlers/oph_defs.nim

@@ -14,7 +14,7 @@
 
 import
   ../../types,
-  ../forks_list,
+  ../../../forks,
   ../op_codes,
   eth/common/eth_types
 

nimbus/vm2/precompiles.nim

@@ -9,8 +9,8 @@
 # according to those terms.
 
 import
-  ./types,
-  ./interpreter/[gas_meter, gas_costs, utils/utils_numeric, forks_list],
+  ./types, ../forks,
+  ./interpreter/[gas_meter, gas_costs, utils/utils_numeric],
   ../errors, stint, eth/[keys, common], chronicles, tables, macros,
   math, nimcrypto, bncurve/[fields, groups], ./blake2b_f, ./blscurve
 

nimbus/vm2/state.nim

@@ -11,7 +11,7 @@
 import
   macros, strformat, tables, sets, options,
   eth/[common, keys, rlp], nimcrypto/keccak,
-  ./interpreter/forks_list, ../errors,
+  ../errors, ../forks,
   ../constants, ../db/[db_chain, accounts_cache],
   ../utils, json, ./transaction_tracer, ./types,
   ../config, ../../stateless/[witness_from_tree, witness_types]

nimbus/vm2/state_transactions.nim

@@ -21,11 +21,12 @@ when not defined(vm2_enabled):
 import
   ../config,
   ../constants,
+  ../forks,
   ../db/accounts_cache,
   ../transaction,
   ./computation,
   ./interpreter_dispatch,
-  ./interpreter/[forks_list, gas_costs, gas_meter],
+  ./interpreter/[gas_costs, gas_meter],
   ./message,
   ./state,
   ./types,

nimbus/vm2/types.nim

@@ -11,8 +11,8 @@
 import
   tables, eth/common,
   options, json, sets,
-  ./stack,  ./memory, ./code_stream,
-  ./interpreter/[gas_costs, op_codes, forks_list],
+  ./stack,  ./memory, ./code_stream, ../forks,
+  ./interpreter/[gas_costs, op_codes],
   # TODO - will be hidden at a lower layer
   ../db/[db_chain, accounts_cache]
 

nimbus/vm_internals.nim

@@ -65,7 +65,6 @@ else:
     ./vm2/code_stream as aCst,
     ./vm2/computation as bChp,
     ./vm2/interpreter_dispatch as cVmc,
-    ./vm2/interpreter/forks_list as dVmf,
     ./vm2/interpreter/gas_meter as eGmt,
     ./vm2/interpreter/op_codes as fVmo,
     ./vm2/message as gVmg,
@@ -129,7 +128,6 @@ else:
     bChp.writeContract,
     cVmc.execCallOrCreate,
     cVmc.executeOpcodes,
-    dVmf.Fork,
     eGmt.consumeGas,
     eGmt.init,
     eGmt.refundGas,