2022-08-15 15:51:50 +00:00
|
|
|
# nimbus-eth1
|
|
|
|
# Copyright (c) 2021 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
|
2022-09-16 07:24:12 +00:00
|
|
|
std/[algorithm, hashes, sequtils, sets, strutils, tables],
|
2022-10-20 16:59:54 +00:00
|
|
|
eth/[common, p2p, trie/nibbles],
|
2022-08-15 15:51:50 +00:00
|
|
|
stint,
|
2022-10-14 16:40:32 +00:00
|
|
|
../../range_desc,
|
|
|
|
./hexary_error
|
2022-08-15 15:51:50 +00:00
|
|
|
|
|
|
|
{.push raises: [Defect].}
|
|
|
|
|
|
|
|
type
|
|
|
|
HexaryPpFn* = proc(key: RepairKey): string {.gcsafe.}
|
|
|
|
## For testing/debugging: key pretty printer function
|
|
|
|
|
|
|
|
ByteArray33* = array[33,byte]
|
|
|
|
## Used for 31 byte database keys, i.e. <marker> + <32-byte-key>
|
|
|
|
|
|
|
|
RepairKey* = distinct ByteArray33
|
|
|
|
## Byte prefixed `NodeKey` for internal DB records
|
|
|
|
|
|
|
|
# Example trie from https://eth.wiki/en/fundamentals/patricia-tree
|
|
|
|
#
|
|
|
|
# lookup data:
|
|
|
|
# "do": "verb"
|
|
|
|
# "dog": "puppy"
|
|
|
|
# "dodge": "coin"
|
|
|
|
# "horse": "stallion"
|
|
|
|
#
|
|
|
|
# trie DB:
|
|
|
|
# root: [16 A]
|
|
|
|
# A: [* * * * B * * * [20+"orse" "stallion"] * * * * * * * *]
|
|
|
|
# B: [00+"o" D]
|
|
|
|
# D: [* * * * * * E * * * * * * * * * "verb"]
|
|
|
|
# E: [17 [* * * * * * [35 "coin"] * * * * * * * * * "puppy"]]
|
|
|
|
#
|
|
|
|
# with first nibble of two-column rows:
|
|
|
|
# hex bits | node type length
|
|
|
|
# ---------+------------------
|
|
|
|
# 0 0000 | extension even
|
|
|
|
# 1 0001 | extension odd
|
|
|
|
# 2 0010 | leaf even
|
|
|
|
# 3 0011 | leaf odd
|
|
|
|
#
|
|
|
|
# and key path:
|
|
|
|
# "do": 6 4 6 f
|
|
|
|
# "dog": 6 4 6 f 6 7
|
|
|
|
# "dodge": 6 4 6 f 6 7 6 5
|
|
|
|
# "horse": 6 8 6 f 7 2 7 3 6 5
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
NodeKind* = enum
|
|
|
|
Branch
|
|
|
|
Extension
|
|
|
|
Leaf
|
|
|
|
|
|
|
|
RNodeState* = enum
|
|
|
|
Static = 0 ## Inserted as proof record
|
|
|
|
Locked ## Like `Static`, only added on-the-fly
|
|
|
|
Mutable ## Open for modification
|
2022-09-02 18:16:09 +00:00
|
|
|
TmpRoot ## Mutable root node
|
2022-08-24 13:44:18 +00:00
|
|
|
|
2022-08-15 15:51:50 +00:00
|
|
|
RNodeRef* = ref object
|
2022-08-24 13:44:18 +00:00
|
|
|
## Node for building a temporary hexary trie coined `repair tree`.
|
|
|
|
state*: RNodeState ## `Static` if added from proof data set
|
|
|
|
case kind*: NodeKind
|
2022-08-15 15:51:50 +00:00
|
|
|
of Leaf:
|
2022-08-24 13:44:18 +00:00
|
|
|
lPfx*: NibblesSeq ## Portion of path segment
|
2022-08-15 15:51:50 +00:00
|
|
|
lData*: Blob
|
|
|
|
of Extension:
|
2022-08-24 13:44:18 +00:00
|
|
|
ePfx*: NibblesSeq ## Portion of path segment
|
|
|
|
eLink*: RepairKey ## Single down link
|
2022-08-15 15:51:50 +00:00
|
|
|
of Branch:
|
2022-08-24 13:44:18 +00:00
|
|
|
bLink*: array[16,RepairKey] ## Down links
|
|
|
|
#
|
|
|
|
# Paraphrased comment from Andri's `stateless/readme.md` file in chapter
|
|
|
|
# `Deviation from yellow paper`, (also found here
|
|
|
|
# github.com/status-im/nimbus-eth1
|
|
|
|
# /tree/master/stateless#deviation-from-yellow-paper)
|
|
|
|
# [..] In the Yellow Paper, the 17th elem of the branch node can contain
|
|
|
|
# a value. But it is always empty in a real Ethereum state trie. The
|
|
|
|
# block witness spec also ignores this 17th elem when encoding or
|
|
|
|
# decoding a branch node. This can happen because in a Ethereum secure
|
|
|
|
# hexary trie, every keys have uniform length of 32 bytes or 64 nibbles.
|
|
|
|
# With the absence of the 17th element, a branch node will never contain
|
|
|
|
# a leaf value.
|
2022-08-15 15:51:50 +00:00
|
|
|
bData*: Blob
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
XNodeObj* = object
|
|
|
|
## Simplified version of `RNodeRef` to be used as a node for `XPathStep`
|
|
|
|
case kind*: NodeKind
|
|
|
|
of Leaf:
|
|
|
|
lPfx*: NibblesSeq ## Portion of path segment
|
|
|
|
lData*: Blob
|
|
|
|
of Extension:
|
|
|
|
ePfx*: NibblesSeq ## Portion of path segment
|
|
|
|
eLink*: Blob ## Single down link
|
|
|
|
of Branch:
|
|
|
|
bLink*: array[17,Blob] ## Down links followed by data
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
RPathStep* = object
|
|
|
|
## For constructing a repair tree traversal path `RPath`
|
|
|
|
key*: RepairKey ## Tree label, node hash
|
|
|
|
node*: RNodeRef ## Referes to data record
|
|
|
|
nibble*: int8 ## Branch node selector (if any)
|
2022-08-15 15:51:50 +00:00
|
|
|
|
|
|
|
RPath* = object
|
|
|
|
path*: seq[RPathStep]
|
2022-08-24 13:44:18 +00:00
|
|
|
tail*: NibblesSeq ## Stands for non completed leaf path
|
|
|
|
|
|
|
|
XPathStep* = object
|
|
|
|
## Similar to `RPathStep` for an arbitrary (sort of transparent) trie
|
|
|
|
key*: Blob ## Node hash implied by `node` data
|
|
|
|
node*: XNodeObj
|
|
|
|
nibble*: int8 ## Branch node selector (if any)
|
|
|
|
|
|
|
|
XPath* = object
|
|
|
|
path*: seq[XPathStep]
|
|
|
|
tail*: NibblesSeq ## Stands for non completed leaf path
|
|
|
|
depth*: int ## May indicate path length (typically 64)
|
2022-08-15 15:51:50 +00:00
|
|
|
|
|
|
|
RLeafSpecs* = object
|
|
|
|
## Temporarily stashed leaf data (as for an account.) Proper records
|
|
|
|
## have non-empty payload. Records with empty payload are administrative
|
|
|
|
## items, e.g. lower boundary records.
|
2022-08-24 13:44:18 +00:00
|
|
|
pathTag*: NodeTag ## Equivalent to account hash
|
|
|
|
nodeKey*: RepairKey ## Leaf hash into hexary repair table
|
|
|
|
payload*: Blob ## Data payload
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-11-16 23:51:06 +00:00
|
|
|
TrieNodeStatCtxRef* = ref object
|
|
|
|
## Context to resume searching for dangling links
|
|
|
|
case persistent*: bool
|
|
|
|
of true:
|
|
|
|
hddCtx*: seq[(NodeKey,NibblesSeq)]
|
|
|
|
else:
|
|
|
|
memCtx*: seq[(RepairKey,NibblesSeq)]
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
TrieNodeStat* = object
|
|
|
|
## Trie inspection report
|
Prep for full sync after snap make 4 (#1282)
* Re-arrange fetching storage slots in batch module
why;
Previously, fetching partial slot ranges first has a chance of
terminating the worker peer 9due to network error) while there were
many inheritable storage slots on the queue.
Now, inheritance is checked first, then full slot ranges and finally
partial ranges.
* Update logging
* Bundled node information for healing into single object `NodeSpecs`
why:
Previously, partial paths and node keys were kept in separate variables.
This approach was error prone due to copying/reassembling function
argument objects.
As all partial paths, keys, and node data types are more or less handled
as `Blob`s over the network (using Eth/6x, or Snap/1) it makes sense to
hold these `Blob`s as named field in a single object (even if not all
fields are active for the current purpose.)
* For good housekeeping, using `NodeKey` type only for account keys
why:
previously, a mixture of `NodeKey` and `Hash256` was used. Now, only
state or storage root keys use the `Hash256` type.
* Always accept latest pivot (and not a slightly older one)
why;
For testing it was tried to use a slightly older pivot state root than
available. Some anecdotal tests seemed to suggest an advantage so that
more peers are willing to serve on that older pivot. But this could not
be confirmed in subsequent tests (still anecdotal, though.)
As a side note, the distance of the latest pivot to its predecessor is
at least 128 (or whatever the constant `minPivotBlockDistance` is
assigned to.)
* Reshuffle name components for some file and function names
why:
Clarifies purpose:
"storages" becomes: "storage slots"
"store" becomes: "range fetch"
* Stash away currently unused modules in sub-folder named "notused"
2022-10-27 13:49:28 +00:00
|
|
|
dangling*: seq[NodeSpecs] ## Referes to nodes with incomplete refs
|
2022-11-16 23:51:06 +00:00
|
|
|
level*: int ## Maximum nesting depth of dangling nodes
|
2022-09-30 08:22:14 +00:00
|
|
|
stopped*: bool ## Potential loop detected if `true`
|
2022-11-16 23:51:06 +00:00
|
|
|
resumeCtx*: TrieNodeStatCtxRef ## Context for resuming inspection
|
2022-09-16 07:24:12 +00:00
|
|
|
|
|
|
|
HexaryTreeDbRef* = ref object
|
|
|
|
## Hexary trie plus helper structures
|
2022-09-02 18:16:09 +00:00
|
|
|
tab*: Table[RepairKey,RNodeRef] ## key-value trie table, in-memory db
|
2022-08-24 13:44:18 +00:00
|
|
|
repairKeyGen*: uint64 ## Unique tmp key generator
|
2022-09-02 18:16:09 +00:00
|
|
|
keyPp*: HexaryPpFn ## For debugging, might go away
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-10-19 10:04:06 +00:00
|
|
|
HexaryGetFn* = proc(key: openArray[byte]): Blob {.gcsafe.}
|
|
|
|
## Persistent database `get()` function. For read-only cases, this function
|
|
|
|
## can be seen as the persistent alternative to ``tab[]` on a
|
|
|
|
## `HexaryTreeDbRef` descriptor.
|
2022-09-16 07:24:12 +00:00
|
|
|
|
2022-10-14 16:40:32 +00:00
|
|
|
HexaryNodeReport* = object
|
|
|
|
## Return code for single node operations
|
|
|
|
slot*: Option[int] ## May refer to indexed argument slots
|
|
|
|
kind*: Option[NodeKind] ## Node type (if any)
|
2022-11-08 18:56:04 +00:00
|
|
|
dangling*: seq[NodeSpecs] ## Missing inner sub-tries
|
2022-11-28 09:03:23 +00:00
|
|
|
error*: HexaryError ## Error code, or `NothingSerious`
|
2022-09-16 07:24:12 +00:00
|
|
|
|
2022-08-15 15:51:50 +00:00
|
|
|
const
|
|
|
|
EmptyNodeBlob* = seq[byte].default
|
2022-08-24 13:44:18 +00:00
|
|
|
EmptyNibbleRange* = EmptyNodeBlob.initNibbleRange
|
2022-08-15 15:51:50 +00:00
|
|
|
|
|
|
|
static:
|
|
|
|
# Not that there is no doubt about this ...
|
|
|
|
doAssert NodeKey.default.ByteArray32.initNibbleRange.len == 64
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
var
|
2022-09-02 18:16:09 +00:00
|
|
|
disablePrettyKeys* = false ## Degugging, print raw keys if `true`
|
2022-08-24 13:44:18 +00:00
|
|
|
|
2022-08-15 15:51:50 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Private helpers
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
proc initImpl(key: var RepairKey; data: openArray[byte]): bool =
|
|
|
|
key.reset
|
2022-09-16 07:24:12 +00:00
|
|
|
if 0 < data.len and data.len <= 33:
|
|
|
|
let trg = addr key.ByteArray33[33 - data.len]
|
|
|
|
trg.copyMem(unsafeAddr data[0], data.len)
|
2022-08-24 13:44:18 +00:00
|
|
|
return true
|
2022-08-15 15:51:50 +00:00
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
2022-08-24 13:44:18 +00:00
|
|
|
# Private debugging helpers
|
2022-08-15 15:51:50 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
2022-09-02 18:16:09 +00:00
|
|
|
proc to*(key: NodeKey; T: type RepairKey): T {.gcsafe.}
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
proc toPfx(indent: int): string =
|
|
|
|
"\n" & " ".repeat(indent)
|
|
|
|
|
|
|
|
proc ppImpl(s: string; hex = false): string =
|
2022-08-15 15:51:50 +00:00
|
|
|
## For long strings print `begin..end` only
|
|
|
|
if hex:
|
|
|
|
let n = (s.len + 1) div 2
|
|
|
|
(if s.len < 20: s else: s[0 .. 5] & ".." & s[s.len-8 .. s.len-1]) &
|
|
|
|
"[" & (if 0 < n: "#" & $n else: "") & "]"
|
|
|
|
elif s.len <= 30:
|
|
|
|
s
|
|
|
|
else:
|
|
|
|
(if (s.len and 1) == 0: s[0 ..< 8] else: "0" & s[0 ..< 7]) &
|
|
|
|
"..(" & $s.len & ").." & s[s.len-16 ..< s.len]
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(key: RepairKey; db: HexaryTreeDbRef): string =
|
2022-08-15 15:51:50 +00:00
|
|
|
try:
|
2022-08-24 13:44:18 +00:00
|
|
|
if not disablePrettyKeys and not db.keyPp.isNil:
|
2022-08-15 15:51:50 +00:00
|
|
|
return db.keyPp(key)
|
|
|
|
except:
|
|
|
|
discard
|
2022-08-24 13:44:18 +00:00
|
|
|
key.ByteArray33.toSeq.mapIt(it.toHex(2)).join.toLowerAscii
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(key: NodeKey; db: HexaryTreeDbRef): string =
|
2022-09-02 18:16:09 +00:00
|
|
|
key.to(RepairKey).ppImpl(db)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(w: openArray[RepairKey]; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
w.mapIt(it.ppImpl(db)).join(",")
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(w: openArray[Blob]; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
var q: seq[RepairKey]
|
|
|
|
for a in w:
|
|
|
|
var key: RepairKey
|
|
|
|
discard key.initImpl(a)
|
|
|
|
q.add key
|
|
|
|
q.ppImpl(db)
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
proc ppStr(blob: Blob): string =
|
|
|
|
if blob.len == 0: ""
|
|
|
|
else: blob.mapIt(it.toHex(2)).join.toLowerAscii.ppImpl(hex = true)
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(n: RNodeRef; db: HexaryTreeDbRef): string =
|
2022-08-15 15:51:50 +00:00
|
|
|
let so = n.state.ord
|
|
|
|
case n.kind:
|
|
|
|
of Leaf:
|
2022-09-02 18:16:09 +00:00
|
|
|
["l","ł","L","R"][so] & "(" & $n.lPfx & "," & n.lData.ppStr & ")"
|
2022-08-24 13:44:18 +00:00
|
|
|
of Extension:
|
2022-09-02 18:16:09 +00:00
|
|
|
["e","€","E","R"][so] & "(" & $n.ePfx & "," & n.eLink.ppImpl(db) & ")"
|
2022-08-24 13:44:18 +00:00
|
|
|
of Branch:
|
2022-09-02 18:16:09 +00:00
|
|
|
["b","þ","B","R"][so] & "(" & n.bLink.ppImpl(db) & "," & n.bData.ppStr & ")"
|
2022-08-24 13:44:18 +00:00
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(n: XNodeObj; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
case n.kind:
|
|
|
|
of Leaf:
|
|
|
|
"l(" & $n.lPfx & "," & n.lData.ppStr & ")"
|
2022-08-15 15:51:50 +00:00
|
|
|
of Extension:
|
2022-08-24 13:44:18 +00:00
|
|
|
var key: RepairKey
|
|
|
|
discard key.initImpl(n.eLink)
|
|
|
|
"e(" & $n.ePfx & "," & key.ppImpl(db) & ")"
|
2022-08-15 15:51:50 +00:00
|
|
|
of Branch:
|
2022-08-24 13:44:18 +00:00
|
|
|
"b(" & n.bLink[0..15].ppImpl(db) & "," & n.bLink[16].ppStr & ")"
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(w: RPathStep; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
let
|
|
|
|
nibble = if 0 <= w.nibble: w.nibble.toHex(1).toLowerAscii else: "ø"
|
|
|
|
key = w.key.ppImpl(db)
|
|
|
|
"(" & key & "," & nibble & "," & w.node.ppImpl(db) & ")"
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(w: XPathStep; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
let nibble = if 0 <= w.nibble: w.nibble.toHex(1).toLowerAscii else: "ø"
|
|
|
|
var key: RepairKey
|
|
|
|
discard key.initImpl(w.key)
|
|
|
|
"(" & key.ppImpl(db) & "," & $nibble & "," & w.node.ppImpl(db) & ")"
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppImpl(db: HexaryTreeDbRef; root: NodeKey): seq[string] =
|
2022-09-02 18:16:09 +00:00
|
|
|
## Dump the entries from the a generic repair tree. This function assumes
|
|
|
|
## that mapped keys are printed `$###` if a node is locked or static, and
|
|
|
|
## some substitute for the first letter `$` otherwise (if they are mutable.)
|
|
|
|
proc toKey(s: string): uint64 =
|
|
|
|
try:
|
|
|
|
result = s[1 ..< s.len].parseUint
|
|
|
|
except ValueError as e:
|
|
|
|
raiseAssert "Ooops ppImpl(s=" & s & "): name=" & $e.name & " msg=" & e.msg
|
|
|
|
if s[0] != '$':
|
|
|
|
result = result or (1u64 shl 63)
|
|
|
|
proc cmpIt(x, y: (uint64,string)): int =
|
|
|
|
cmp(x[0],y[0])
|
|
|
|
try:
|
|
|
|
var accu: seq[(uint64,string)]
|
|
|
|
if root.ByteArray32 != ByteArray32.default:
|
|
|
|
accu.add @[(0u64, "($0" & "," & root.ppImpl(db) & ")")]
|
|
|
|
for key,node in db.tab.pairs:
|
|
|
|
accu.add (
|
|
|
|
key.ppImpl(db).tokey,
|
|
|
|
"(" & key.ppImpl(db) & "," & node.ppImpl(db) & ")")
|
|
|
|
result = accu.sorted(cmpIt).mapIt(it[1])
|
|
|
|
except Exception as e:
|
|
|
|
result &= " ! Ooops ppImpl(): name=" & $e.name & " msg=" & e.msg
|
|
|
|
|
Prep for full sync after snap make 4 (#1282)
* Re-arrange fetching storage slots in batch module
why;
Previously, fetching partial slot ranges first has a chance of
terminating the worker peer 9due to network error) while there were
many inheritable storage slots on the queue.
Now, inheritance is checked first, then full slot ranges and finally
partial ranges.
* Update logging
* Bundled node information for healing into single object `NodeSpecs`
why:
Previously, partial paths and node keys were kept in separate variables.
This approach was error prone due to copying/reassembling function
argument objects.
As all partial paths, keys, and node data types are more or less handled
as `Blob`s over the network (using Eth/6x, or Snap/1) it makes sense to
hold these `Blob`s as named field in a single object (even if not all
fields are active for the current purpose.)
* For good housekeeping, using `NodeKey` type only for account keys
why:
previously, a mixture of `NodeKey` and `Hash256` was used. Now, only
state or storage root keys use the `Hash256` type.
* Always accept latest pivot (and not a slightly older one)
why;
For testing it was tried to use a slightly older pivot state root than
available. Some anecdotal tests seemed to suggest an advantage so that
more peers are willing to serve on that older pivot. But this could not
be confirmed in subsequent tests (still anecdotal, though.)
As a side note, the distance of the latest pivot to its predecessor is
at least 128 (or whatever the constant `minPivotBlockDistance` is
assigned to.)
* Reshuffle name components for some file and function names
why:
Clarifies purpose:
"storages" becomes: "storage slots"
"store" becomes: "range fetch"
* Stash away currently unused modules in sub-folder named "notused"
2022-10-27 13:49:28 +00:00
|
|
|
proc ppDangling(a: seq[NodeSpecs]; maxItems = 30): string =
|
2022-09-16 07:24:12 +00:00
|
|
|
proc ppBlob(w: Blob): string =
|
|
|
|
w.mapIt(it.toHex(2)).join.toLowerAscii
|
|
|
|
let
|
Prep for full sync after snap make 4 (#1282)
* Re-arrange fetching storage slots in batch module
why;
Previously, fetching partial slot ranges first has a chance of
terminating the worker peer 9due to network error) while there were
many inheritable storage slots on the queue.
Now, inheritance is checked first, then full slot ranges and finally
partial ranges.
* Update logging
* Bundled node information for healing into single object `NodeSpecs`
why:
Previously, partial paths and node keys were kept in separate variables.
This approach was error prone due to copying/reassembling function
argument objects.
As all partial paths, keys, and node data types are more or less handled
as `Blob`s over the network (using Eth/6x, or Snap/1) it makes sense to
hold these `Blob`s as named field in a single object (even if not all
fields are active for the current purpose.)
* For good housekeeping, using `NodeKey` type only for account keys
why:
previously, a mixture of `NodeKey` and `Hash256` was used. Now, only
state or storage root keys use the `Hash256` type.
* Always accept latest pivot (and not a slightly older one)
why;
For testing it was tried to use a slightly older pivot state root than
available. Some anecdotal tests seemed to suggest an advantage so that
more peers are willing to serve on that older pivot. But this could not
be confirmed in subsequent tests (still anecdotal, though.)
As a side note, the distance of the latest pivot to its predecessor is
at least 128 (or whatever the constant `minPivotBlockDistance` is
assigned to.)
* Reshuffle name components for some file and function names
why:
Clarifies purpose:
"storages" becomes: "storage slots"
"store" becomes: "range fetch"
* Stash away currently unused modules in sub-folder named "notused"
2022-10-27 13:49:28 +00:00
|
|
|
q = a.mapIt(it.partialPath.ppBlob)[0 ..< min(maxItems,a.len)]
|
2022-10-08 17:20:50 +00:00
|
|
|
andMore = if maxItems < a.len: ", ..[#" & $a.len & "].." else: ""
|
|
|
|
"{" & q.join(",") & andMore & "}"
|
|
|
|
|
2022-08-24 13:44:18 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Public debugging helpers
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
proc pp*(s: string; hex = false): string =
|
|
|
|
## For long strings print `begin..end` only
|
|
|
|
s.ppImpl(hex)
|
|
|
|
|
|
|
|
proc pp*(w: NibblesSeq): string =
|
|
|
|
$w
|
|
|
|
|
2022-09-02 18:16:09 +00:00
|
|
|
proc pp*(key: RepairKey): string =
|
|
|
|
## Raw key, for referenced key dump use `key.pp(db)` below
|
|
|
|
key.ByteArray33.toSeq.mapIt(it.toHex(2)).join.tolowerAscii
|
|
|
|
|
|
|
|
proc pp*(key: NodeKey): string =
|
|
|
|
## Raw key, for referenced key dump use `key.pp(db)` below
|
|
|
|
key.ByteArray32.toSeq.mapIt(it.toHex(2)).join.tolowerAscii
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(key: NodeKey|RepairKey; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
key.ppImpl(db)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(w: RNodeRef|XNodeObj|RPathStep; db: HexaryTreeDbRef): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
w.ppImpl(db)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(w:openArray[RPathStep|XPathStep];db:HexaryTreeDbRef;indent=4): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
w.toSeq.mapIt(it.ppImpl(db)).join(indent.toPfx)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(w: RPath; db: HexaryTreeDbRef; indent=4): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
w.path.pp(db,indent) & indent.toPfx & "(" & $w.tail & ")"
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(w: XPath; db: HexaryTreeDbRef; indent=4): string =
|
2022-08-24 13:44:18 +00:00
|
|
|
w.path.pp(db,indent) & indent.toPfx & "(" & $w.tail & "," & $w.depth & ")"
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(db: HexaryTreeDbRef; root: NodeKey; indent=4): string =
|
2022-09-02 18:16:09 +00:00
|
|
|
## Dump the entries from the a generic repair tree.
|
|
|
|
db.ppImpl(root).join(indent.toPfx)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(db: HexaryTreeDbRef; indent=4): string =
|
2022-09-02 18:16:09 +00:00
|
|
|
## varinat of `pp()` above
|
|
|
|
db.ppImpl(NodeKey.default).join(indent.toPfx)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc pp*(a: TrieNodeStat; db: HexaryTreeDbRef; maxItems = 30): string =
|
2022-10-08 17:20:50 +00:00
|
|
|
result = "(" & $a.level
|
2022-09-30 08:22:14 +00:00
|
|
|
if a.stopped:
|
|
|
|
result &= "stopped,"
|
2022-10-08 17:20:50 +00:00
|
|
|
result &= $a.dangling.len & "," &
|
2022-10-14 16:40:32 +00:00
|
|
|
a.dangling.ppDangling(maxItems) & ")"
|
2022-09-16 07:24:12 +00:00
|
|
|
|
2022-08-15 15:51:50 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Public constructor (or similar)
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
proc init*(key: var RepairKey; data: openArray[byte]): bool =
|
2022-08-24 13:44:18 +00:00
|
|
|
key.initImpl(data)
|
2022-08-15 15:51:50 +00:00
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc newRepairKey*(db: HexaryTreeDbRef): RepairKey =
|
2022-08-15 15:51:50 +00:00
|
|
|
db.repairKeyGen.inc
|
|
|
|
var src = db.repairKeyGen.toBytesBE
|
|
|
|
(addr result.ByteArray33[25]).copyMem(addr src[0], 8)
|
|
|
|
result.ByteArray33[0] = 1
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Public functions
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
proc hash*(a: RepairKey): Hash =
|
|
|
|
## Tables mixin
|
|
|
|
a.ByteArray33.hash
|
|
|
|
|
|
|
|
proc `==`*(a, b: RepairKey): bool =
|
|
|
|
## Tables mixin
|
|
|
|
a.ByteArray33 == b.ByteArray33
|
|
|
|
|
|
|
|
proc to*(key: NodeKey; T: type NibblesSeq): T =
|
|
|
|
key.ByteArray32.initNibbleRange
|
|
|
|
|
|
|
|
proc to*(key: NodeKey; T: type RepairKey): T =
|
|
|
|
(addr result.ByteArray33[1]).copyMem(unsafeAddr key.ByteArray32[0], 32)
|
|
|
|
|
|
|
|
proc isZero*[T: NodeTag|NodeKey|RepairKey](a: T): bool =
|
|
|
|
a == T.default
|
|
|
|
|
|
|
|
proc isNodeKey*(a: RepairKey): bool =
|
|
|
|
a.ByteArray33[0] == 0
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc convertTo*(data: Blob; T: type NodeKey): T =
|
2022-08-15 15:51:50 +00:00
|
|
|
## Probably lossy conversion, use `init()` for safe conversion
|
|
|
|
discard result.init(data)
|
|
|
|
|
2022-09-16 07:24:12 +00:00
|
|
|
proc convertTo*(data: Blob; T: type RepairKey): T =
|
|
|
|
## Probably lossy conversion, use `init()` for safe conversion
|
|
|
|
discard result.initImpl(data)
|
|
|
|
|
2022-08-15 15:51:50 +00:00
|
|
|
proc convertTo*(node: RNodeRef; T: type Blob): T =
|
|
|
|
## Write the node as an RLP-encoded blob
|
|
|
|
var writer = initRlpWriter()
|
|
|
|
|
|
|
|
proc appendOk(writer: var RlpWriter; key: RepairKey): bool =
|
|
|
|
if key.isZero:
|
|
|
|
writer.append(EmptyNodeBlob)
|
|
|
|
elif key.isNodeKey:
|
|
|
|
var hash: Hash256
|
|
|
|
(addr hash.data[0]).copyMem(unsafeAddr key.ByteArray33[1], 32)
|
|
|
|
writer.append(hash)
|
|
|
|
else:
|
|
|
|
return false
|
|
|
|
true
|
|
|
|
|
|
|
|
case node.kind:
|
|
|
|
of Branch:
|
|
|
|
writer.startList(17)
|
|
|
|
for n in 0 ..< 16:
|
|
|
|
if not writer.appendOk(node.bLink[n]):
|
|
|
|
return # empty `Blob`
|
|
|
|
writer.append(node.bData)
|
|
|
|
of Extension:
|
|
|
|
writer.startList(2)
|
|
|
|
writer.append(node.ePfx.hexPrefixEncode(isleaf = false))
|
|
|
|
if not writer.appendOk(node.eLink):
|
|
|
|
return # empty `Blob`
|
|
|
|
of Leaf:
|
|
|
|
writer.startList(2)
|
|
|
|
writer.append(node.lPfx.hexPrefixEncode(isleaf = true))
|
|
|
|
writer.append(node.lData)
|
|
|
|
|
|
|
|
writer.finish()
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# End
|
|
|
|
# ------------------------------------------------------------------------------
|