fix: hash difference to previous version

Taraxa-project · Nov 28, 2023 · c447316 · c447316
1 parent f852fc1
commit c447316
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/taraxa/trie/layout.go b/taraxa/trie/layout.go
@@ -20,7 +20,7 @@ type node interface {
 	String() string
 }
 
-const full_node_child_cnt = 17
+const full_node_child_cnt = 16
 
 type full_node struct {
 	children [full_node_child_cnt]node

diff --git a/taraxa/trie/node_enc.go b/taraxa/trie/node_enc.go
@@ -41,6 +41,7 @@ func (n *full_node) encode(w rlp.EncoderBuffer, res *Resolver) {
 			w.Write(rlp.EmptyString)
 		}
 	}
+	w.Write(rlp.EmptyString)
 	w.ListEnd(offset)
 }
 

diff --git a/taraxa/trie/writer.go b/taraxa/trie/writer.go
@@ -111,6 +111,7 @@ func (w *Writer) commit(db_tx IO, ctx *commit_context, full_nodes_above byte, ke
 			}
 		}
 		ctx.enc_storage.ListEnd(storage_list_start)
+		ctx.enc_hash.AppendString(nil)
 		ctx.enc_hash.ListEnd(hash_list_start, is_root, &n.hash)
 		if n.hash != nil {
 			db_tx.PutNode(n.get_hash().common_hash(), ctx.enc_storage.ToBytes(storage_list_start))
-Original file line number
+Diff line change
@@ Expand Up @@
     			w.Write(rlp.EmptyString)
     		}
     	}
+    	w.Write(rlp.EmptyString)
     	w.ListEnd(offset)
     }
@@ Expand Down @@