mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-01-28 04:55:33 +00:00
6d132811ba
* Split `core_db/base.nim` into several sources * Rename `core_db/legacy.nim` => `core_db/legacy_db.nim` * Update `CoreDb` API, dual methods returning `Result[]` or plain value detail: Plain value methods implemet the legacy API, they defect on error results * Redesign `CoreDB` direct backend access why: Made the `backend` directive integral part of the API * Discontinue providing unused or otherwise available functions details: + setTransactionID() removed, not used and not easily replicable in Aristo + maybeGet() removed, available via direct backend access + newPhk() removed, never used & was experimental anyway * Update/reorg backend API why: + Added error print function `$$()` + General descriptor completion (and optional validation) via `bless()` * Update `Aristo`/`Kvt` exception handling why: Avoid `CatchableError` exceptions, rather pass them as error code where appropriate. * More `CoreDB` compliant `Aristo` and `Kvt` methods details: + Providing functions like `contains()`, `getVtxRc()` (returns `Result[]`). + Additional error code: `NotImplemented` * Rewrite/reorg of Aristo DB constructor why: Previously used global object `DefaultQidLayoutRef` as default initialiser. This object was created at compile time which lead to non-gc safe functions. * Update nimbus/db/core_db/legacy_db.nim Co-authored-by: Kim De Mey <kim.demey@gmail.com> * Update nimbus/db/aristo/aristo_transcode.nim Co-authored-by: Kim De Mey <kim.demey@gmail.com> * Update nimbus/db/core_db/legacy_db.nim Co-authored-by: Kim De Mey <kim.demey@gmail.com> --------- Co-authored-by: Kim De Mey <kim.demey@gmail.com>
96 lines
3.7 KiB
Nim
96 lines
3.7 KiB
Nim
# The point of this file is just to give a little more type-safety
|
|
# and clarity to our use of SecureHexaryTrie, by having distinct
|
|
# types for the big trie containing all the accounts and the little
|
|
# tries containing the storage for an individual account.
|
|
#
|
|
# It's nice to have all the accesses go through "getAccountBytes"
|
|
# rather than just "get" (which is hard to search for). Plus we
|
|
# may want to put in assertions to make sure that the nodes for
|
|
# the account are all present (in stateless mode), etc.
|
|
|
|
import
|
|
eth/[common, trie/hexary],
|
|
./core_db
|
|
|
|
type
|
|
DB = CoreDbRef
|
|
AccountsTrie* = distinct CoreDbPhkRef
|
|
StorageTrie* = distinct CoreDbPhkRef
|
|
DistinctTrie* = AccountsTrie | StorageTrie
|
|
|
|
func toBase(t: DistinctTrie): CoreDbPhkRef =
|
|
## Note that `CoreDbPhkRef` is a distinct variant of `CoreDxPhkRef`
|
|
t.CoreDbPhkRef
|
|
|
|
# I don't understand why "borrow" doesn't work here. --Adam
|
|
proc rootHash* (t: DistinctTrie): KeccakHash = t.toBase.rootHash()
|
|
proc rootHashHex*(t: DistinctTrie): string = $t.toBase.rootHash()
|
|
proc db* (t: DistinctTrie): DB = t.toBase.parent()
|
|
proc isPruning* (t: DistinctTrie): bool = t.toBase.isPruning()
|
|
proc mpt* (t: DistinctTrie): CoreDbMptRef = t.toBase.toMpt()
|
|
func phk* (t: DistinctTrie): CoreDbPhkRef = t.toBase
|
|
|
|
|
|
template initAccountsTrie*(db: DB, rootHash: KeccakHash, isPruning = true): AccountsTrie =
|
|
AccountsTrie(db.phkPrune(rootHash, isPruning))
|
|
|
|
template initAccountsTrie*(db: DB, isPruning = true): AccountsTrie =
|
|
AccountsTrie(db.phkPrune(isPruning))
|
|
|
|
proc getAccountBytes*(trie: AccountsTrie, address: EthAddress): seq[byte] =
|
|
CoreDbPhkRef(trie).get(address)
|
|
|
|
proc maybeGetAccountBytes*(trie: AccountsTrie, address: EthAddress): Option[seq[byte]] =
|
|
let phk = CoreDbPhkRef(trie)
|
|
if phk.parent.isLegacy:
|
|
phk.backend.toLegacy.SecureHexaryTrie.maybeGet(address)
|
|
else:
|
|
some(phk.get(address))
|
|
|
|
proc putAccountBytes*(trie: var AccountsTrie, address: EthAddress, value: openArray[byte]) =
|
|
CoreDbPhkRef(trie).put(address, value)
|
|
|
|
proc delAccountBytes*(trie: var AccountsTrie, address: EthAddress) =
|
|
CoreDbPhkRef(trie).del(address)
|
|
|
|
|
|
|
|
template initStorageTrie*(db: DB, rootHash: KeccakHash, isPruning = true): StorageTrie =
|
|
StorageTrie(db.phkPrune(rootHash, isPruning))
|
|
|
|
template initStorageTrie*(db: DB, isPruning = true): StorageTrie =
|
|
StorageTrie(db.phkPrune(isPruning))
|
|
|
|
template createTrieKeyFromSlot*(slot: UInt256): auto =
|
|
# XXX: This is too expensive. Similar to `createRangeFromAddress`
|
|
# Converts a number to hex big-endian representation including
|
|
# prefix and leading zeros:
|
|
slot.toBytesBE
|
|
# Original py-evm code:
|
|
# pad32(int_to_big_endian(slot))
|
|
# morally equivalent to toByteRange_Unnecessary but with different types
|
|
|
|
proc getSlotBytes*(trie: StorageTrie, slotAsKey: openArray[byte]): seq[byte] =
|
|
CoreDbPhkRef(trie).get(slotAsKey)
|
|
|
|
proc maybeGetSlotBytes*(trie: StorageTrie, slotAsKey: openArray[byte]): Option[seq[byte]] =
|
|
let phk = CoreDbPhkRef(trie)
|
|
if phk.parent.isLegacy:
|
|
phk.backend.toLegacy.SecureHexaryTrie.maybeGet(slotAsKey)
|
|
else:
|
|
some(phk.get(slotAsKey))
|
|
|
|
proc putSlotBytes*(trie: var StorageTrie, slotAsKey: openArray[byte], value: openArray[byte]) =
|
|
CoreDbPhkRef(trie).put(slotAsKey, value)
|
|
|
|
proc delSlotBytes*(trie: var StorageTrie, slotAsKey: openArray[byte]) =
|
|
CoreDbPhkRef(trie).del(slotAsKey)
|
|
|
|
proc storageTrieForAccount*(trie: AccountsTrie, account: Account, isPruning = true): StorageTrie =
|
|
# TODO: implement `prefix-db` to solve issue #228 permanently.
|
|
# the `prefix-db` will automatically insert account address to the
|
|
# underlying-db key without disturb how the trie works.
|
|
# it will create virtual container for each account.
|
|
# see nim-eth#9
|
|
initStorageTrie(trie.db, account.storageRoot, isPruning)
|