Problem: new version + local nonce key is not supported

add prefix constant

Author: mmsqe

iavl/cli.py

@@ -9,7 +9,8 @@
 from hexbytes import HexBytes
 
 from . import dbm
-from .utils import (decode_fast_node, diff_iterators, encode_stdint,
+from .utils import (METADATA_KEY_PREFIX, ORPHAN_KEY_PREFIX, ROOT_KEY_PREFIX,
+                    decode_fast_node, diff_iterators, encode_stdint,
                     fast_node_key, get_node, get_root_node,
                     iavl_latest_version, iter_fast_nodes, iter_iavl_tree,
                     load_commit_infos, root_key, store_prefix)
@@ -85,7 +86,7 @@ def root_versions(db, store: str, reverse: bool = False):
     """
     iterate all root versions
     """
-    begin = store_prefix(store) + b"r"
+    begin = store_prefix(store) + ROOT_KEY_PREFIX
     end = store_prefix(store) + b"s"  # exclusive
 
     db = dbm.open(str(db), read_only=True)
@@ -155,7 +156,7 @@ def metadata(db, store):
         raise click.UsageError("no store names are provided")
     db = dbm.open(str(db), read_only=True)
     for s in store:
-        bz = db.get(store_prefix(s) + b"m" + b"storage_version")
+        bz = db.get(store_prefix(s) + METADATA_KEY_PREFIX + b"storage_version")
         print(f"{s} storage version: {bz.decode()}")
         print(f"{s} latest version: {iavl_latest_version(db, s)}")
 
@@ -323,7 +324,7 @@ def fast_rollback(
             ver = iavl_latest_version(db, info.name)
 
             print("delete orphan entries created since target version")
-            orphan_prefix = prefix + b"o" + target.to_bytes(8, "big")
+            orphan_prefix = prefix + ORPHAN_KEY_PREFIX + target.to_bytes(8, "big")
             it = db.iterkeys()
             it.seek(orphan_prefix)
             for k in it:

iavl/diff.py

@@ -10,7 +10,7 @@
 
 from . import dbm
 from .iavl import NodeDB, PersistedNode, Tree
-from .utils import GetNode, root_key, visit_iavl_nodes
+from .utils import ROOT_KEY_PREFIX, GetNode, root_key, visit_iavl_nodes
 
 
 class Op(IntEnum):
@@ -197,7 +197,7 @@ def iter_state_changes(
     it = db.iteritems()
     it.seek(prefix + root_key(start_version))
     for k, hash in it:
-        if not k.startswith(prefix + b"r"):
+        if not k.startswith(prefix + ROOT_KEY_PREFIX):
             break
         v = int.from_bytes(k[len(prefix) + 1 :], "big")
         if end_version is not None and v >= end_version:

iavl/iavl.py

@@ -9,8 +9,8 @@
 import cprotobuf
 import rocksdb
 
-from .utils import (GetNode, PersistedNode, encode_bytes, node_key, root_key,
-                    visit_iavl_nodes)
+from .utils import (ROOT_KEY_PREFIX, GetNode, PersistedNode, encode_bytes,
+                    node_key, root_key, visit_iavl_nodes)
 
 NodeRef = Union[bytes, "Node"]
 
@@ -104,7 +104,7 @@ def next_version(self, v: int) -> Optional[int]:
             k = next(it, None)
             if k is None:
                 return
-        if not k.startswith(self.prefix + b"r"):
+        if not k.startswith(self.prefix + ROOT_KEY_PREFIX):
             return
 
         return int.from_bytes(k[len(self.prefix) + 1 :], "big")
@@ -119,7 +119,7 @@ def prev_version(self, v: int) -> Optional[int]:
         key = next(it, None)
         if key == target:
             key = next(it, None)
-        if key is None or not key.startswith(self.prefix + b"r"):
+        if key is None or not key.startswith(self.prefix + ROOT_KEY_PREFIX):
             return
         return int.from_bytes(key[len(self.prefix) + 1 :], "big")
 

iavl/utils.py

@@ -9,6 +9,11 @@
 from .dbm import DBM
 
 EMPTY_HASH = hashlib.sha256().digest()
+FAST_KEY_PREFIX = b"f"
+METADATA_KEY_PREFIX = b"m"
+NODE_KEY_PREFIX = b"n"
+ORPHAN_KEY_PREFIX = b"o"
+ROOT_KEY_PREFIX = b"r"
 GetNode = Callable[bytes, Optional["PersistedNode"]]
 
 
@@ -126,15 +131,15 @@ def prefix_iteritems(
 
 
 def root_key(v: int) -> bytes:
-    return b"r" + v.to_bytes(8, "big")
+    return ROOT_KEY_PREFIX + v.to_bytes(8, "big")
 
 
 def node_key(hash: bytes) -> bytes:
-    return b"n" + hash
+    return NODE_KEY_PREFIX + hash
 
 
 def fast_node_key(key: bytes) -> bytes:
-    return b"f" + key
+    return FAST_KEY_PREFIX + key
 
 
 def store_prefix(s: str) -> bytes:
@@ -157,7 +162,7 @@ def prev_version(db: DBM, store: str, v: int) -> Optional[int]:
         return
     if k >= target:
         k = next(it)
-    if not k.startswith(prefix + b"r"):
+    if not k.startswith(prefix + ROOT_KEY_PREFIX):
         return
     # parse version from key
     return int.from_bytes(k[len(prefix) + 1 :], "big")
@@ -268,7 +273,7 @@ def iter_fast_nodes(db: DBM, store: str, start: Optional[bytes], end: Optional[b
     """
     it = db.iteritems()
 
-    prefix = store_prefix(store) + b"f"
+    prefix = store_prefix(store) + FAST_KEY_PREFIX
     if start is None:
         start = prefix
     else: