2023-05-30 11:47:47 +00:00
|
|
|
# nimbus-eth1
|
Core db update storage root management for sub tries (#1964)
* Aristo: Re-phrase `LayerDelta` and `LayerFinal` as object references
why:
Avoids copying in some cases
* Fix copyright header
* Aristo: Verify `leafTie.root` function argument for `merge()` proc
why:
Zero root will lead to inconsistent DB entry
* Aristo: Update failure condition for hash labels compiler `hashify()`
why:
Node need not be rejected as long as links are on the schedule. In
that case, `redo[]` is to become `wff.base[]` at a later stage.
This amends an earlier fix, part of #1952 by also testing against
the target nodes of the `wff.base[]` sets.
* Aristo: Add storage root glue record to `hashify()` schedule
why:
An account leaf node might refer to a non-resolvable storage root ID.
Storage root node chains will end up at the storage root. So the link
`storage-root->account-leaf` needs an extra item in the schedule.
* Aristo: fix error code returned by `fetchPayload()`
details:
Final error code is implied by the error code form the `hikeUp()`
function.
* CoreDb: Discard `createOk` argument in API `getRoot()` function
why:
Not needed for the legacy DB. For the `Arsto` DB, a lazy approach is
implemented where a stprage root node is created on-the-fly.
* CoreDb: Prevent `$$` logging in some cases
why:
Logging the function `$$` is not useful when it is used for internal
use, i.e. retrieving an an error text for logging.
* CoreDb: Add `tryHashFn()` to API for pretty printing
why:
Pretty printing must not change the hashification status for the
`Aristo` DB. So there is an independent API wrapper for getting the
node hash which never updated the hashes.
* CoreDb: Discard `update` argument in API `hash()` function
why:
When calling the API function `hash()`, the latest state is always
wanted. For a version that uses the current state as-is without checking,
the function `tryHash()` was added to the backend.
* CoreDb: Update opaque vertex ID objects for the `Aristo` backend
why:
For `Aristo`, vID objects encapsulate a numeric `VertexID`
referencing a vertex (rather than a node hash as used on the
legacy backend.) For storage sub-tries, there might be no initial
vertex known when the descriptor is created. So opaque vertex ID
objects are supported without a valid `VertexID` which will be
initalised on-the-fly when the first item is merged.
* CoreDb: Add pretty printer for opaque vertex ID objects
* Cosmetics, printing profiling data
* CoreDb: Fix segfault in `Aristo` backend when creating MPT descriptor
why:
Missing initialisation error
* CoreDb: Allow MPT to inherit shared context on `Aristo` backend
why:
Creates descriptors with different storage roots for the same
shared `Aristo` DB descriptor.
* Cosmetics, update diagnostic message items for `Aristo` backend
* Fix Copyright year
2024-01-11 19:11:38 +00:00
|
|
|
# Copyright (c) 2023-2023 Status Research & Development GmbH
|
2023-05-30 11:47:47 +00:00
|
|
|
# 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.
|
|
|
|
|
|
|
|
{.push raises: [].}
|
|
|
|
|
|
|
|
import
|
|
|
|
eth/[common, trie/nibbles],
|
2023-09-12 18:45:12 +00:00
|
|
|
results,
|
2023-06-12 18:16:03 +00:00
|
|
|
"."/[aristo_desc, aristo_get]
|
2023-05-30 11:47:47 +00:00
|
|
|
|
|
|
|
type
|
|
|
|
Leg* = object
|
|
|
|
## For constructing a `VertexPath`
|
|
|
|
wp*: VidVtxPair ## Vertex ID and data ref
|
|
|
|
nibble*: int8 ## Next vertex selector for `Branch` (if any)
|
|
|
|
|
|
|
|
Hike* = object
|
|
|
|
## Trie traversal path
|
|
|
|
root*: VertexID ## Handy for some fringe cases
|
|
|
|
legs*: seq[Leg] ## Chain of vertices and IDs
|
|
|
|
tail*: NibblesSeq ## Portion of non completed path
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Private functions
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
func getNibblesImpl(hike: Hike; start = 0; maxLen = high(int)): NibblesSeq =
|
|
|
|
## May be needed for partial rebuild, as well
|
|
|
|
for n in start ..< min(hike.legs.len, maxLen):
|
|
|
|
let leg = hike.legs[n]
|
|
|
|
case leg.wp.vtx.vType:
|
|
|
|
of Branch:
|
|
|
|
result = result & @[leg.nibble.byte].initNibbleRange.slice(1)
|
|
|
|
of Extension:
|
|
|
|
result = result & leg.wp.vtx.ePfx
|
|
|
|
of Leaf:
|
|
|
|
result = result & leg.wp.vtx.lPfx
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Public functions
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
2023-09-15 15:23:53 +00:00
|
|
|
func to*(rc: Result[Hike,(Hike,AristoError)]; T: type Hike): T =
|
|
|
|
## Extract `Hike` from either ok ot error part of argument `rc`.
|
|
|
|
if rc.isOk: rc.value else: rc.error[0]
|
|
|
|
|
2023-05-30 11:47:47 +00:00
|
|
|
func to*(hike: Hike; T: type NibblesSeq): T =
|
|
|
|
## Convert back
|
|
|
|
hike.getNibblesImpl() & hike.tail
|
|
|
|
|
|
|
|
func legsTo*(hike: Hike; T: type NibblesSeq): T =
|
|
|
|
## Convert back
|
|
|
|
hike.getNibblesImpl()
|
|
|
|
|
2023-12-04 20:39:26 +00:00
|
|
|
func legsTo*(hike: Hike; numLegs: int; T: type NibblesSeq): T =
|
|
|
|
## variant of `legsTo()`
|
|
|
|
hike.getNibblesImpl(0, numLegs)
|
|
|
|
|
2023-05-30 11:47:47 +00:00
|
|
|
# --------
|
|
|
|
|
|
|
|
proc hikeUp*(
|
|
|
|
path: NibblesSeq; # Partial path
|
|
|
|
root: VertexID; # Start vertex
|
2023-07-04 18:24:03 +00:00
|
|
|
db: AristoDbRef; # Database
|
2023-09-15 15:23:53 +00:00
|
|
|
): Result[Hike,(Hike,AristoError)] =
|
2023-05-30 11:47:47 +00:00
|
|
|
## For the argument `path`, find and return the logest possible path in the
|
|
|
|
## argument database `db`.
|
2023-09-15 15:23:53 +00:00
|
|
|
var hike = Hike(
|
2023-05-30 11:47:47 +00:00
|
|
|
root: root,
|
|
|
|
tail: path)
|
|
|
|
|
2023-06-12 13:48:47 +00:00
|
|
|
if not root.isValid:
|
2023-09-15 15:23:53 +00:00
|
|
|
return err((hike,HikeRootMissing))
|
2023-10-27 21:36:51 +00:00
|
|
|
if path.len == 0:
|
|
|
|
return err((hike,HikeEmptyPath))
|
2023-09-15 15:23:53 +00:00
|
|
|
|
|
|
|
var vid = root
|
|
|
|
while vid.isValid:
|
|
|
|
var leg = Leg(wp: VidVtxPair(vid: vid), nibble: -1)
|
|
|
|
|
2023-12-19 12:39:23 +00:00
|
|
|
# Fetch next vertex
|
|
|
|
leg.wp.vtx = db.getVtxRc(vid).valueOr:
|
|
|
|
if error != GetVtxNotFound:
|
|
|
|
return err((hike,error))
|
|
|
|
if hike.legs.len == 0:
|
|
|
|
return err((hike,HikeEmptyPath))
|
|
|
|
break
|
2023-09-15 15:23:53 +00:00
|
|
|
|
|
|
|
case leg.wp.vtx.vType:
|
|
|
|
of Leaf:
|
|
|
|
if hike.tail.len == hike.tail.sharedPrefixLen(leg.wp.vtx.lPfx):
|
|
|
|
# Bingo, got full path
|
|
|
|
hike.legs.add leg
|
|
|
|
hike.tail = EmptyNibbleSeq
|
|
|
|
break
|
|
|
|
|
Core db update storage root management for sub tries (#1964)
* Aristo: Re-phrase `LayerDelta` and `LayerFinal` as object references
why:
Avoids copying in some cases
* Fix copyright header
* Aristo: Verify `leafTie.root` function argument for `merge()` proc
why:
Zero root will lead to inconsistent DB entry
* Aristo: Update failure condition for hash labels compiler `hashify()`
why:
Node need not be rejected as long as links are on the schedule. In
that case, `redo[]` is to become `wff.base[]` at a later stage.
This amends an earlier fix, part of #1952 by also testing against
the target nodes of the `wff.base[]` sets.
* Aristo: Add storage root glue record to `hashify()` schedule
why:
An account leaf node might refer to a non-resolvable storage root ID.
Storage root node chains will end up at the storage root. So the link
`storage-root->account-leaf` needs an extra item in the schedule.
* Aristo: fix error code returned by `fetchPayload()`
details:
Final error code is implied by the error code form the `hikeUp()`
function.
* CoreDb: Discard `createOk` argument in API `getRoot()` function
why:
Not needed for the legacy DB. For the `Arsto` DB, a lazy approach is
implemented where a stprage root node is created on-the-fly.
* CoreDb: Prevent `$$` logging in some cases
why:
Logging the function `$$` is not useful when it is used for internal
use, i.e. retrieving an an error text for logging.
* CoreDb: Add `tryHashFn()` to API for pretty printing
why:
Pretty printing must not change the hashification status for the
`Aristo` DB. So there is an independent API wrapper for getting the
node hash which never updated the hashes.
* CoreDb: Discard `update` argument in API `hash()` function
why:
When calling the API function `hash()`, the latest state is always
wanted. For a version that uses the current state as-is without checking,
the function `tryHash()` was added to the backend.
* CoreDb: Update opaque vertex ID objects for the `Aristo` backend
why:
For `Aristo`, vID objects encapsulate a numeric `VertexID`
referencing a vertex (rather than a node hash as used on the
legacy backend.) For storage sub-tries, there might be no initial
vertex known when the descriptor is created. So opaque vertex ID
objects are supported without a valid `VertexID` which will be
initalised on-the-fly when the first item is merged.
* CoreDb: Add pretty printer for opaque vertex ID objects
* Cosmetics, printing profiling data
* CoreDb: Fix segfault in `Aristo` backend when creating MPT descriptor
why:
Missing initialisation error
* CoreDb: Allow MPT to inherit shared context on `Aristo` backend
why:
Creates descriptors with different storage roots for the same
shared `Aristo` DB descriptor.
* Cosmetics, update diagnostic message items for `Aristo` backend
* Fix Copyright year
2024-01-11 19:11:38 +00:00
|
|
|
return err((hike,HikeLeafUnexpected))
|
2023-09-15 15:23:53 +00:00
|
|
|
|
|
|
|
of Branch:
|
|
|
|
if hike.tail.len == 0:
|
|
|
|
hike.legs.add leg
|
|
|
|
return err((hike,HikeBranchTailEmpty))
|
|
|
|
|
|
|
|
let
|
|
|
|
nibble = hike.tail[0].int8
|
|
|
|
nextVid = leg.wp.vtx.bVid[nibble]
|
|
|
|
|
|
|
|
if not nextVid.isValid:
|
|
|
|
return err((hike,HikeBranchBlindEdge))
|
|
|
|
|
|
|
|
leg.nibble = nibble
|
|
|
|
hike.legs.add leg
|
|
|
|
hike.tail = hike.tail.slice(1)
|
|
|
|
vid = nextVid
|
|
|
|
|
|
|
|
of Extension:
|
|
|
|
if hike.tail.len == 0:
|
|
|
|
hike.legs.add leg
|
|
|
|
hike.tail = EmptyNibbleSeq
|
|
|
|
return err((hike,HikeExtTailEmpty)) # Well, somehow odd
|
|
|
|
|
|
|
|
if leg.wp.vtx.ePfx.len != hike.tail.sharedPrefixLen(leg.wp.vtx.ePfx):
|
|
|
|
return err((hike,HikeExtTailMismatch)) # Need to branch from here
|
|
|
|
|
|
|
|
hike.legs.add leg
|
|
|
|
hike.tail = hike.tail.slice(leg.wp.vtx.ePfx.len)
|
|
|
|
vid = leg.wp.vtx.eVid
|
|
|
|
|
|
|
|
ok hike
|
|
|
|
|
|
|
|
proc hikeUp*(lty: LeafTie; db: AristoDbRef): Result[Hike,(Hike,AristoError)] =
|
2023-05-30 11:47:47 +00:00
|
|
|
## Variant of `hike()`
|
2023-06-12 18:16:03 +00:00
|
|
|
lty.path.to(NibblesSeq).hikeUp(lty.root, db)
|
2023-05-30 11:47:47 +00:00
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# End
|
|
|
|
# ------------------------------------------------------------------------------
|