provide vm_gas_costs as import/export wrapper

details:
  moved original vm/interpreter/vm_gas_costs.nim => vm/interpreter/nvm_gas_costs.nim

nimbus/transaction.nim

@@ -6,8 +6,8 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  constants, errors, eth/[common, keys], utils,
-  ./vm_forks, ./vm/interpreter/gas_costs, constants
+  ./constants, ./errors, eth/[common, keys], ./utils,
+  ./vm_forks, ./vm_gas_costs
 
 import eth/common/transaction as common_transaction
 export common_transaction

nimbus/vm/computation.nim

@@ -9,7 +9,7 @@ import
   chronicles, strformat, macros, options, times,
   sets, eth/[common, keys],
   constants, errors,
-  vm/interpreter/[opcode_values, gas_meter, gas_costs, nvm_forks],
+  vm/interpreter/[opcode_values, gas_meter, nvm_gas_costs, nvm_forks],
   vm/[code_stream, memory, message, stack, nvm_types, nvm_state],
   db/[accounts_cache, db_chain],
   utils/header, precompiles,

nimbus/vm/interpreter/opcodes_impl.nim

@@ -9,7 +9,7 @@ import
   strformat, times, sets, sequtils, options,
   chronicles, stint, nimcrypto, stew/ranges/ptr_arith, eth/common,
   vm/interpreter/utils/[macros_procs_opcodes, utils_numeric],
-  vm/interpreter/[gas_meter, gas_costs, opcode_values, nvm_forks],
+  vm/interpreter/[gas_meter, nvm_gas_costs, opcode_values, nvm_forks],
   vm/[memory, stack, code_stream, computation, nvm_state, nvm_types],
   errors, constants,
   db/[db_chain, accounts_cache]

nimbus/vm/interpreter_dispatch.nim

@@ -8,7 +8,7 @@
 import
   tables, macros,
   chronicles,
-  vm/interpreter/[opcode_values, opcodes_impl, nvm_forks, gas_costs, gas_meter, utils/macros_gen_opcodes],
+  vm/interpreter/[opcode_values, opcodes_impl, nvm_forks, nvm_gas_costs, gas_meter, utils/macros_gen_opcodes],
   vm/code_stream, vm/nvm_types, errors, precompiles, vm/stack,
   terminal # Those are only needed for logging
 

nimbus/vm/nvm_state.nim

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

nimbus/vm/nvm_types.nim

@@ -12,7 +12,7 @@ import
   tables, eth/common,
   options, json, sets,
   vm/[memory, stack, code_stream],
-  vm/interpreter/[gas_costs, opcode_values, nvm_forks],
+  vm/interpreter/[nvm_gas_costs, opcode_values, nvm_forks],
   # TODO - will be hidden at a lower layer
   db/[db_chain, accounts_cache]
 

nimbus/vm/precompiles.nim

@@ -1,6 +1,6 @@
 import
   vm/nvm_types,
-  vm/interpreter/[gas_meter, gas_costs, utils/utils_numeric, nvm_forks],
+  vm/interpreter/[gas_meter, nvm_gas_costs, utils/utils_numeric, nvm_forks],
   errors, stint, eth/[keys, common], chronicles, tables, macros,
   math, nimcrypto, bncurve/[fields, groups], vm/blake2b_f, vm/blscurve
 

nimbus/vm_gas_costs.nim

@@ -0,0 +1,49 @@
+# 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.
+
+import
+  ./vm/interpreter/nvm_gas_costs as vmg
+
+export
+  vmg.Bls12381G1AddGas,
+  vmg.Bls12381G1MulGas,
+  vmg.Bls12381G2AddGas,
+  vmg.Bls12381G2MulGas,
+  vmg.Bls12381MapG1Gas,
+  vmg.Bls12381MapG2Gas,
+  vmg.Bls12381PairingBaseGas,
+  vmg.Bls12381PairingPerPairGas,
+  vmg.ColdAccountAccessCost,
+  vmg.ColdSloadCost,
+  vmg.GasCostKind,
+  vmg.GasCosts,
+  vmg.GasECAdd,
+  vmg.GasECAddIstanbul,
+  vmg.GasECMul,
+  vmg.GasECMulIstanbul,
+  vmg.GasECPairingBase,
+  vmg.GasECPairingBaseIstanbul,
+  vmg.GasECPairingPerPoint,
+  vmg.GasECPairingPerPointIstanbul,
+  vmg.GasECRecover,
+  vmg.GasFeeKind,
+  vmg.GasIdentity,
+  vmg.GasIdentityWord,
+  vmg.GasParams,
+  vmg.GasQuadDivisorEIP2565,
+  vmg.GasRIPEMD160,
+  vmg.GasRIPEMD160Word,
+  vmg.GasSHA256,
+  vmg.GasSHA256Word,
+  vmg.WarmStorageReadCost,
+  vmg.forkToSchedule,
+  vmg.gasFees
+
+# End