Merge pull request #35 from EspressoSystems/api-update

Implement FetchBlockMerkleProof

client/client.go

@@ -59,13 +59,13 @@ func (c *Client) FetchRemainingHeadersForWindow(ctx context.Context, from uint64
 	return res, nil
 }
 
-// TODO: This is a stub for now until we have merkle proof snapshots implemented in the query service
-func (c *Client) FetchBlockMerkleProof(l1Height uint64, hotshotHeight uint64) (types.HotShotBlockMerkleProof, error) {
-	mockProof := `{"proof":[]}`
-	return types.HotShotBlockMerkleProof{
-		Proof:    json.RawMessage(mockProof),
-		L1Height: l1Height,
-	}, nil
+// Fetches a block merkle proof at the snapshot rootHeight for the leaf at the provided HotShot height
+func (c *Client) FetchBlockMerkleProof(ctx context.Context, rootHeight uint64, hotshotHeight uint64) (types.HotShotBlockMerkleProof, error) {
+	var res types.HotShotBlockMerkleProof
+	if err := c.get(ctx, &res, "state/blocks/%d+1/%d", rootHeight, hotshotHeight); err != nil {
+		return types.HotShotBlockMerkleProof{}, err
+	}
+	return res, nil
 }
 
 func (c *Client) FetchTransactionsInBlock(ctx context.Context, blockHeight uint64, namespace uint64) (TransactionsInBlock, error) {

types/types.go

@@ -162,10 +162,7 @@ type NamespaceProof = json.RawMessage
 
 type BlockMerkleRoot = Commitment
 
-type HotShotBlockMerkleProof struct {
-	Proof    json.RawMessage
-	L1Height uint64
-}
+type HotShotBlockMerkleProof json.RawMessage
 
 // Validates a block merkle proof, returning the validated HotShot block height. This is mocked until we have real
 // merkle tree snapshot support.