wip - proof to Path doesn't work

NethermindEth · Jun 7, 2024 · 0804fab · 0804fab
1 parent 3db1bcd
commit 0804fab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/core/trie/proof.go b/core/trie/proof.go
@@ -242,7 +242,7 @@ func VerifyRangeProof(root *felt.Felt, keys, values []*felt.Felt, proofKeys [2]*
 				return false, fmt.Errorf("invalid proof for key %x", proofKeys[i].String())
 			}
 
-			proofPaths[i], err = ProofToPath(proofs[i], proofKeys[i], hash)
+			proofPaths[i], err = ProofToPath(proofs[i], proofKeys[i], hash) // Todo: incorrect for both paths :(
 			if err != nil {
 				return false, err
 			}
@@ -430,7 +430,7 @@ func BuildTrie(leftProofPath, rightProofPath []StorageNode, keys, values []*felt
 	}
 
 	// merge proof paths
-	for i := range min(len(leftProofPath), len(rightProofPath)) {
+	for i := range min(len(leftProofPath), len(rightProofPath)) { //
 		if leftProofPath[i].key.Equal(rightProofPath[i].key) {
 			leftProofPath[i].node.Right = rightProofPath[i].node.Right
 			rightProofPath[i].node.Left = leftProofPath[i].node.Left
@@ -447,7 +447,7 @@ func BuildTrie(leftProofPath, rightProofPath []StorageNode, keys, values []*felt
 	}
 
 	for _, sNode := range rightProofPath {
-		_, err := tempTrie.PutInner(sNode.key, sNode.node)
+		_, err := tempTrie.PutInner(sNode.key, sNode.node) // Todo: incorrectly sets the proof key
 		if err != nil {
 			return nil, err
 		}

diff --git a/core/trie/proof_test.go b/core/trie/proof_test.go
@@ -194,8 +194,17 @@ func build4KeyTrie(t *testing.T) *trie.Trie {
 	// 		249		\
 	//		/ \		 \
 	//	 250   \	  \
-	//   / \    \	   \
-	//  0   1   2      4
+	//   / \   /\	  /\
+	//  0   1 2	     4
+
+	//			Juno - should be able to reconstruct this from proofs
+	//			248
+	// 			/  \
+	// 		249
+	//		/ \
+	//	 250   \
+	//   / \   /\
+	//  0
 
 	//			Pathfinder (???)
 	//			  0	 Edge
@@ -850,9 +859,9 @@ func TestVerifyRangeProof(t *testing.T) {
 		values := []*felt.Felt{new(felt.Felt).SetUint64(5), new(felt.Felt).SetUint64(6)}
 		proofKeys := [2]*trie.Key{&zeroLeafkey, &threeLeafkey}
 		proofValues := [2]*felt.Felt{new(felt.Felt).SetUint64(4), nil}
-		leftProof, err := trie.GetProof(proofKeys[0], tri)
+		leftProof, err := trie.GetProof(proofKeys[0], tri) // Looks correct in terms of binary and edges
 		require.NoError(t, err)
-		rightProof, err := trie.GetProof(proofKeys[1], tri)
+		rightProof, err := trie.GetProof(proofKeys[1], tri) // Looks correct in terms of binary and edges
 		require.NoError(t, err)
 		proofs := [2][]trie.ProofNode{leftProof, rightProof}
 		rootCommitment, err := tri.Root()