Merge pull request #40 from code-monad/fix-shortcut-merkle-path-zero-forkheight-

fix: shortcut into merkle_path insertion should be MergeValue::Value

Author: quake

src/merge.rs

@@ -80,8 +80,8 @@ impl MergeValue {
 #[cfg(feature = "trie")]
 pub fn into_merge_value<H: Hasher + Default>(key: H256, value: H256, height: u8) -> MergeValue {
     // try keep hash same with MergeWithZero
-    if value.is_zero() {
-        MergeValue::from_h256(H256::zero())
+    if value.is_zero() || height == 0 {
+        MergeValue::from_h256(value)
     } else {
         let base_key = key.parent_path(0);
         let base_node = hash_base_node::<H>(0, &base_key, &value);

src/tests/tree.rs

@@ -794,6 +794,136 @@ fn test_trie_broken_sample_02() {
     assert_eq!(smt.root(), &root1);
 }
 
+#[test]
+fn test_trie_broken_sample_03() {
+    let mut smt = SMT::default();
+    smt.update(
+        [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            231, 17, 197, 236, 8, 0, 141, 194, 15, 253, 234, 189, 224, 53, 255, 173, 117, 8, 221,
+            5, 34, 5, 198, 250, 99, 32, 229, 13, 222, 40, 203, 90,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            231, 17, 197, 236, 8, 0, 141, 194, 15, 253, 234, 189, 224, 53, 255, 173, 117, 8, 221,
+            5, 34, 5, 198, 250, 99, 32, 229, 13, 222, 40, 203, 90,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            105, 112, 48, 175, 83, 217, 158, 108, 243, 136, 9, 21, 192, 91, 211, 190, 218, 240, 89,
+            241, 63, 137, 128, 133, 65, 169, 51, 33, 49, 123, 118, 132,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            189, 150, 22, 8, 143, 248, 180, 169, 68, 195, 31, 28, 34, 180, 182, 223, 195, 37, 117,
+            197, 229, 144, 229, 64, 230, 250, 21, 205, 225, 32, 135, 195,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            153, 75, 31, 235, 146, 228, 224, 228, 237, 250, 34, 227, 139, 8, 213, 118, 25, 114, 82,
+            242, 215, 172, 184, 100, 205, 85, 47, 116, 140, 238, 175, 190,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            242, 174, 6, 108, 205, 74, 137, 57, 15, 248, 35, 35, 255, 58, 93, 74, 183, 47, 194, 40,
+            134, 3, 215, 100, 80, 51, 28, 251, 96, 19, 201, 170,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            88, 83, 226, 107, 201, 255, 207, 189, 197, 145, 113, 95, 209, 238, 110, 9, 82, 215,
+            232, 183, 203, 220, 194, 167, 21, 189, 239, 238, 178, 149, 153, 44,
+        ]
+        .into(),
+    )
+    .unwrap();
+    smt.update(
+        [
+            6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]
+        .into(),
+        [
+            80, 177, 52, 81, 182, 121, 67, 120, 77, 19, 201, 42, 75, 136, 19, 238, 112, 23, 204,
+            103, 20, 157, 53, 235, 80, 70, 126, 79, 9, 35, 11, 158,
+        ]
+        .into(),
+    )
+    .unwrap();
+    let key7 = H256::from([
+        7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
+    ]);
+    let v7 = H256::from([
+        103, 245, 93, 107, 47, 213, 28, 173, 216, 92, 109, 17, 151, 57, 101, 4, 44, 145, 116, 215,
+        185, 218, 144, 244, 131, 160, 148, 58, 247, 226, 240, 55,
+    ]);
+    let proof = smt
+        .merkle_proof(vec![key7])
+        .unwrap()
+        .compile(vec![key7])
+        .unwrap();
+    // Compute root with different value than actually in smt.
+    let root = proof
+        .compute_root::<Blake2bHasher>(vec![(key7, v7)])
+        .unwrap();
+    // Compute root by updating smt.
+    smt.update(key7, v7).unwrap();
+    // Expect them to be the same.
+    assert_eq!(*smt.root(), root);
+}
+
 #[test]
 fn test_replay_to_pass_proof() {
     let key1: H256 = [

src/trie_tree.rs

@@ -373,9 +373,6 @@ impl<H: Hasher + Default, V: Value, S: StoreReadOps<V>> SparseMerkleTree<H, V, S
                                         fork_height,
                                     ))
                                 }
-                                if fork_height == 1 && leaves_bitmap[leaf_index].get_bit(0) {
-                                    proof_result.push(MergeValue::from_h256(value));
-                                }
                             }
                             break;
                         }