retrieve merkle proof for outputs, v2 contracts

Author: chris124567

persist/sqlite/addresses.go

@@ -173,6 +173,11 @@ func (s *Store) SiacoinElements(ids []types.SiacoinOutputID) (result []explorer.
 			if err != nil {
 				return fmt.Errorf("failed to scan siacoin output: %w", err)
 			}
+			sco.StateElement.MerkleProof, err = s.MerkleProof(sco.StateElement.LeafIndex)
+			if err != nil {
+				return fmt.Errorf("failed to get output merkle proof: %w", err)
+			}
+
 			result = append(result, sco)
 		}
 		return nil
@@ -199,6 +204,10 @@ func (s *Store) SiafundElements(ids []types.SiafundOutputID) (result []explorer.
 			if err != nil {
 				return fmt.Errorf("failed to scan siafund output: %w", err)
 			}
+			sfo.StateElement.MerkleProof, err = s.MerkleProof(sfo.StateElement.LeafIndex)
+			if err != nil {
+				return fmt.Errorf("failed to get output merkle proof: %w", err)
+			}
 			result = append(result, sfo)
 		}
 		return nil

persist/sqlite/v2consensus_test.go

@@ -23,14 +23,7 @@ func getSCE(t *testing.T, db explorer.Store, scid types.SiacoinOutputID) types.S
 	} else if len(sces) == 0 {
 		t.Fatal("can't find sce")
 	}
-	sce := sces[0]
-
-	sce.SiacoinElement.StateElement.MerkleProof, err = db.MerkleProof(sce.StateElement.LeafIndex)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return sce.SiacoinElement
+	return sces[0].SiacoinElement
 }
 
 func getSFE(t *testing.T, db explorer.Store, sfid types.SiafundOutputID) types.SiafundElement {
@@ -42,14 +35,7 @@ func getSFE(t *testing.T, db explorer.Store, sfid types.SiafundOutputID) types.S
 	} else if len(sfes) == 0 {
 		t.Fatal("can't find sfe")
 	}
-	sfe := sfes[0]
-
-	sfe.SiafundElement.StateElement.MerkleProof, err = db.MerkleProof(sfe.StateElement.LeafIndex)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return sfe.SiafundElement
+	return sfes[0].SiafundElement
 }
 
 func getFCE(t *testing.T, db explorer.Store, fcid types.FileContractID) types.V2FileContractElement {
@@ -61,14 +47,7 @@ func getFCE(t *testing.T, db explorer.Store, fcid types.FileContractID) types.V2
 	} else if len(fces) == 0 {
 		t.Fatal("can't find fces")
 	}
-	fce := fces[0]
-
-	fce.V2FileContractElement.StateElement.MerkleProof, err = db.MerkleProof(fce.V2FileContractElement.StateElement.LeafIndex)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return fce.V2FileContractElement
+	return fces[0].V2FileContractElement
 }
 
 func getCIE(t *testing.T, db explorer.Store, bid types.BlockID) types.ChainIndexElement {

persist/sqlite/v2contracts.go

@@ -50,6 +50,10 @@ WHERE rev.contract_id = ?
 			if err != nil && !errors.Is(err, sql.ErrNoRows) {
 				return fmt.Errorf("failed to scan file contract: %w", err)
 			} else if err == nil {
+				fc.V2FileContractElement.StateElement.MerkleProof, err = s.MerkleProof(fc.V2FileContractElement.StateElement.LeafIndex)
+				if err != nil {
+					return fmt.Errorf("failed to get contract merkle proof: %w", err)
+				}
 				result = append(result, fc)
 			}
 		}