Skip to content

fix: reversed root->leaf to leaf->root #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sabotagebeats wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: reversed root->leaf to leaf->root #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d8af0
fix: reversed root->leaf to leaf->root
sabotagebeats Mar 10, 2022
67b28bf
fix: fixes 129 self.get(key) return True
sabotagebeats Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions trie/smt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def calc_root(key: bytes, value: bytes, branch: Sequence[Hash32]) -> Hash32:
path = to_int(key)
target_bit = 1
# traverse the path in leaf->root order
# branch is in root->leaf order (key is in MSB to LSB order)
# branch is in leaf->root order (key is in MSB to LSB order)
node_hash = keccak(value)
for sibling_node in reversed(branch):
for sibling_node in branch:
if path & target_bit:
node_hash = keccak(sibling_node + node_hash)
else:
Expand Down Expand Up @@ -147,7 +147,7 @@ def update(self, key: bytes, value: bytes, node_updates: Sequence[Hash32]):

:param key: keypath of the update we are processing
:param value: value of the update we are processing
:param node_updates: sequence of sibling nodes (in root->leaf order)
:param node_updates: sequence of sibling nodes (in leaf->root order)
must be at least as large as the first diverging
key in the keypath

Expand All @@ -166,10 +166,10 @@ def update(self, key: bytes, value: bytes, node_updates: Sequence[Hash32]):
# Find the first mismatched bit between keypaths. This is
# where the branch point occurs, and we should update the
# sibling node in the source branch at the branch point.
# NOTE: Keys are in MSB->LSB (root->leaf) order.
# Node lists are in root->leaf order.
# NOTE: Keys are in MSB->LSB (leaf->root) order.
# Node lists are in leaf->root order.
# Be sure to convert between them effectively.
for bit in reversed(range(self._branch_size)):
for bit in range(self._branch_size):
if path_diff & (1 << bit) > 0:
branch_point = (self._branch_size - 1) - bit
break
Expand Down Expand Up @@ -270,7 +270,7 @@ def branch(self, key: bytes) -> Tuple[Hash32]:

def _get(self, key: bytes) -> Tuple[bytes, Tuple[Hash32]]:
"""
Returns db value and branch in root->leaf order
Returns db value and branch in leaf->root order
"""
validate_is_bytes(key)
validate_length(key, self._key_size)
Expand Down Expand Up @@ -298,7 +298,7 @@ def _get(self, key: bytes) -> Tuple[bytes, Tuple[Hash32]]:

def set(self, key: bytes, value: bytes) -> Tuple[Hash32]:
"""
Returns all updated hashes in root->leaf order
Returns all updated hashes in leaf->root order
"""
validate_is_bytes(key)
validate_length(key, self._key_size)
Expand All @@ -310,8 +310,7 @@ def set(self, key: bytes, value: bytes) -> Tuple[Hash32]:
proof_update = [] # Keep track of proof updates

target_bit = 1
# branch is in root->leaf order, so flip
for sibling_node in reversed(branch):
for sibling_node in branch:
# Set
node_hash = keccak(node)
proof_update.append(node_hash)
Expand All @@ -329,23 +328,22 @@ def set(self, key: bytes, value: bytes) -> Tuple[Hash32]:
self.root_hash = keccak(node)
self.db[self.root_hash] = node

# updates need to be in root->leaf order, so flip back
return tuple(reversed(proof_update))
# updates need to be in leaf->root order, so flip back
return tuple(proof_update)

def exists(self, key: bytes) -> bool:
validate_is_bytes(key)
validate_length(key, self._key_size)

try:
self.get(key)
return True
return self.get(key) == self._default
except KeyError:
return False

def delete(self, key: bytes) -> Tuple[Hash32]:
"""
Equals to setting the value to None
Returns all updated hashes in root->leaf order
Returns all updated hashes in leaf->root order
"""
validate_is_bytes(key)
validate_length(key, self._key_size)
Expand Down