Proof generation panic bug (#398)

* proof generation panic Signed-off-by: Ignacio Hagopian <[email protected]> * extra test Signed-off-by: Ignacio Hagopian <[email protected]> * rebase fixes Signed-off-by: Ignacio Hagopian <[email protected]> * add the fix Signed-off-by: Ignacio Hagopian <[email protected]> * make linter happy Signed-off-by: Ignacio Hagopian <[email protected]> --------- Signed-off-by: Ignacio Hagopian <[email protected]>
ethereum · Oct 4, 2023 · 0a4e93e · 0a4e93e
1 parent 1a60d22
commit 0a4e93e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 8 deletions.
diff --git a/proof_ipa.go b/proof_ipa.go
@@ -60,14 +60,10 @@ func (vp *VerkleProof) Copy() *VerkleProof {
 		IPAProof:              &IPAProof{},
 	}
 
-	for i := range vp.OtherStems {
-		ret.OtherStems[i] = vp.OtherStems[i]
-	}
-
+	copy(ret.OtherStems, vp.OtherStems)
 	copy(ret.DepthExtensionPresent, vp.DepthExtensionPresent)
-	for i := range vp.CommitmentsByPath {
-		ret.CommitmentsByPath[i] = vp.CommitmentsByPath[i]
-	}
+	copy(ret.CommitmentsByPath, vp.CommitmentsByPath)
+
 	ret.D = vp.D
 
 	if vp.IPAProof != nil {

diff --git a/proof_test.go b/proof_test.go
@@ -902,3 +902,43 @@ func TestProofVerificationWithPostState(t *testing.T) {
 		})
 	}
 }
+func TestProofOfAbsenceBorderCase(t *testing.T) {
+	root := New()
+
+	key1, _ := hex.DecodeString("0000000000000000000000000000000000000000000000000000000000000001")
+	key2, _ := hex.DecodeString("0001000000000000000000000000000000000000000000000000000000000001")
+
+	// Insert an arbitrary value at key 0000000000000000000000000000000000000000000000000000000000000001
+	if err := root.Insert(key1, fourtyKeyTest, nil); err != nil {
+		t.Fatalf("could not insert key: %v", err)
+	}
+
+	// Generate a proof for the following keys:
+	// - key1, which is present.
+	// - key2, which isn't present.
+	// Note that all three keys will land on the same leaf value.
+	proof, _, _, _, _ := MakeVerkleMultiProof(root, nil, keylist{key1, key2}, nil)
+
+	serialized, statediff, err := SerializeProof(proof)
+	if err != nil {
+		t.Fatalf("could not serialize proof: %v", err)
+	}
+
+	dproof, err := DeserializeProof(serialized, statediff)
+	if err != nil {
+		t.Fatalf("error deserializing proof: %v", err)
+	}
+
+	droot, err := PreStateTreeFromProof(dproof, root.Commit())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !droot.Commit().Equal(root.Commit()) {
+		t.Fatal("differing root commitments")
+	}
+
+	if !droot.(*InternalNode).children[0].Commit().Equal(root.(*InternalNode).children[0].Commit()) {
+		t.Fatal("differing commitment for child #0")
+	}
+}
diff --git a/tree.go b/tree.go
@@ -1410,8 +1410,8 @@ func (n *LeafNode) GetProofItems(keys keylist, _ NodeResolverFn) (*ProofElements
 			if len(esses) == 0 {
 				esses = append(esses, extStatusAbsentOther|(n.depth<<3))
 				poass = append(poass, n.stem)
-				pe.Vals = append(pe.Vals, nil)
 			}
+			pe.Vals = append(pe.Vals, nil)
 			continue
 		}