re-named v2gas_costs.nim to its original name v2gas_costs.nim

why:
  the v2 prefix of the file name was used as a visual aid when
  comparing vm2 against vm sources

nimbus/vm2/interpreter/gas_costs.nim

@@ -5,9 +5,6 @@
 #  * 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
   math, eth/common/eth_types,
   ./utils/[macros_gen_opcodes, v2utils_numeric],

nimbus/vm2/interpreter/op_handlers/oph_arithmetic.nim

@@ -30,9 +30,9 @@ when not breakCircularDependency:
     ../../compu_helper,
     ../../stack,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     chronicles,
     eth/common,
     options,
@@ -64,7 +64,7 @@ else:
   # function stubs from gas_meter.nim
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   proc d_handler(x: int; value: Uint256): int = result
 
 # ------------------------------------------------------------------------------

nimbus/vm2/interpreter/op_handlers/oph_call.nim

@@ -36,9 +36,9 @@ when not breakCircularDependency:
     ../../v2memory,
     ../../v2state,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -98,7 +98,7 @@ else:
   # function stubs from v2utils_numeric.nim
   func cleanMemRef(x: UInt256): int = result
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   type GasParams = object
     case kind*: Op
     of Call, CallCode, DelegateCall, StaticCall:

nimbus/vm2/interpreter/op_handlers/oph_create.nim

@@ -37,9 +37,9 @@ when not breakCircularDependency:
     ../../v2memory,
     ../../v2state,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -81,7 +81,7 @@ else:
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
   proc returnGas(gasMeter: var GasMeter; amount: GasInt) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   type GasParams = object
     case kind*: Op
     of Create:

nimbus/vm2/interpreter/op_handlers/oph_envinfo.nim

@@ -35,9 +35,9 @@ when not breakCircularDependency:
     ../../stack,
     ../../v2memory,
     ../../v2state,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -85,7 +85,7 @@ else:
   # function stubs from gas_meter.nim
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   proc m_handler(x: int; curMemSize, memOffset, memLen: int64): int = 0
 
 # ------------------------------------------------------------------------------

nimbus/vm2/interpreter/op_handlers/oph_hash.nim

@@ -31,9 +31,9 @@ when not breakCircularDependency:
     ../../compu_helper,
     ../../stack,
     ../../v2memory,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common,
     nimcrypto
 
@@ -71,7 +71,7 @@ else:
   const keccak256 = 0xfeedbeef
   proc digest(dummy: int64, data: openarray[byte]): UInt256 = EMPTY_SHA3
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   proc m_handler(x: int; curMemSize, memOffset, memLen: int64): int = 0
 
 # ------------------------------------------------------------------------------

nimbus/vm2/interpreter/op_handlers/oph_helpers.nim

@@ -39,8 +39,8 @@ when not breakCircularDependency:
     ../../../db/accounts_cache,
     ../../v2state,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
-    ../v2gas_costs,
     eth/common
 
 else:

nimbus/vm2/interpreter/op_handlers/oph_log.nim

@@ -37,9 +37,9 @@ when not breakCircularDependency:
     ../../stack,
     ../../v2memory,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -75,7 +75,7 @@ else:
   # function stubs from gas_meter.nim
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   proc m_handler(x: int; curMemSize, memOffset, memLen: int64): int = 0
 
 # ------------------------------------------------------------------------------

nimbus/vm2/interpreter/op_handlers/oph_memory.nim

@@ -36,9 +36,9 @@ when not breakCircularDependency:
     ../../v2memory,
     ../../v2state,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -89,7 +89,7 @@ else:
   proc refundGas(gasMeter: var GasMeter; amount: int) = discard
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   type GasParams = object
     case kind*: Op
     of Sstore:

nimbus/vm2/interpreter/op_handlers/oph_sysops.nim

@@ -34,9 +34,9 @@ when not breakCircularDependency:
     ../../v2memory,
     ../../v2state,
     ../../v2types,
+    ../gas_costs,
     ../gas_meter,
     ../utils/v2utils_numeric,
-    ../v2gas_costs,
     eth/common
 
 else:
@@ -82,7 +82,7 @@ else:
   # function stubs from gas_meter.nim
   proc consumeGas(gasMeter: var GasMeter; amount: int; reason: string) = discard
 
-  # stubs from v2gas_costs.nim
+  # stubs from gas_costs.nim
   type GasParams = object
     case kind*: Op
     of SelfDestruct:

nimbus/vm2/interpreter_dispatch.nim

@@ -10,7 +10,7 @@
 
 import
   ./compu_helper,
-  ./interpreter/[gas_meter, op_handlers, op_handlers/oph_defs, v2gas_costs],
+  ./interpreter/[gas_meter, op_handlers, op_handlers/oph_defs, gas_costs],
   ./code_stream,
   ./v2types,
   chronicles

nimbus/vm2/v2computation.nim

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

nimbus/vm2/v2precompiles.nim

@@ -13,7 +13,7 @@ when defined(evmc_enabled):
 
 import
   ./v2types,
-  ./interpreter/[gas_meter, v2gas_costs, utils/v2utils_numeric, forks_list],
+  ./interpreter/[gas_meter, gas_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/[forks_list, v2gas_costs], ../errors,
+  ./interpreter/[forks_list, gas_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, op_codes, forks_list],
+  ./interpreter/[gas_costs, op_codes, forks_list],
   # TODO - will be hidden at a lower layer
   ../db/[db_chain, accounts_cache]
 

nimbus/vm_gas_costs.nim

@@ -13,7 +13,7 @@ when defined(evmc_enabled) or not defined(vm2_enabled):
     ./vm/interpreter/gas_costs as vmg
 else:
   import
-    ./vm2/interpreter/v2gas_costs as vmg
+    ./vm2/interpreter/gas_costs as vmg
 
 export
   vmg.Bls12381G1AddGas,