fix rebase conflict

nimbus/db/accounts_cache.nim

@@ -10,11 +10,9 @@
 
 import
   std/[tables, hashes, sets],
-  eth/[common, rlp], eth/trie/[hexary, db, trie_defs],
-  ../constants, ../utils/[utils, eof], storage_types,
+  eth/[common, rlp],
+  ../constants, ../utils/[utils, eof],
   ../../stateless/multi_keys,
-  ../constants,
-  ../utils/utils,
   ./access_list as ac_access_list,
   "."/[core_db, distinct_tries, storage_types, transient_storage]
 
@@ -384,9 +382,9 @@ proc loadCode(acc: RefAccount, ac: AccountsCache) =
     return
 
   when defined(geth):
-    let data = ac.db.get(acc.account.codeHash.data)
+    let data = ac.kvt.get(acc.account.codeHash.data)
   else:
-    let data = ac.db.get(contractHashKey(acc.account.codeHash).toOpenArray)
+    let data = ac.kvt.get(contractHashKey(acc.account.codeHash).toOpenArray)
 
   acc.code = data
   acc.flags.incl CodeLoaded
@@ -395,10 +393,6 @@ proc getCode*(ac: AccountsCache, address: EthAddress): seq[byte] =
   let acc = ac.getAccount(address, false)
   if acc.isNil:
     return
-<<<<<<< HEAD
-  acc.loadCode(ac)
-  acc.code
-=======
 
   if CodeLoaded in acc.flags or CodeChanged in acc.flags:
     result = acc.code
@@ -411,7 +405,6 @@ proc getCode*(ac: AccountsCache, address: EthAddress): seq[byte] =
     acc.code = data
     acc.flags.incl CodeLoaded
     result = acc.code
->>>>>>> master
 
 proc getCodeSize*(ac: AccountsCache, address: EthAddress): int {.inline.} =
   let acc = ac.getAccount(address, false)

nimbus/evm/computation.nim

@@ -11,7 +11,7 @@
 import
   ".."/[db/accounts_cache, constants],
   "."/[code_stream, memory, message, stack, state],
-  "."/[transaction_tracer, types, validate],
+  "."/[types, validate],
   ./interpreter/[gas_meter, gas_costs, op_codes],
   ../common/[common, evmforks],
   ../utils/[utils, eof],

nimbus/evm/types.nim

@@ -57,25 +57,6 @@ type
     minerAddress*  : EthAddress
     asyncFactory*  : AsyncOperationFactory
 
-<<<<<<< HEAD
-  TracerFlags* {.pure.} = enum
-    EnableTracing
-    DisableStorage
-    DisableMemory
-    DisableStack
-    DisableState
-    DisableStateDiff
-    EnableAccount
-    DisableReturnData
-    GethCompatibility
-
-  TransactionTracer* = object
-    trace*: JsonNode
-    flags*: set[TracerFlags]
-    accounts*: HashSet[EthAddress]
-    storageKeys*: seq[HashSet[UInt256]]
-    gasUsed*: GasInt
-
   # EIP-4750
   ReturnContext* = object
     section*: int

tests/test_eof.nim

@@ -230,7 +230,7 @@ proc initEnv(): TestEnv =
 
   let
     com = CommonRef.new(
-      newMemoryDb(),
+      newCoreDbRef LegacyDbMemory,
       conf.pruneMode == PruneMode.Full,
       conf.networkId,
       conf.networkParams
@@ -315,7 +315,7 @@ proc eofMain*() =
 
     test "check flags and various deployment mechanisms":
       var state = AccountsCache.init(
-        com.db.db,
+        com.db,
         stateRoot,
         com.pruneTrie)