api: fetch blocks from indexer rather than app BlockStore

api/api_types.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"time"
 
-	comettypes "github.com/cometbft/cometbft/types"
 	"github.com/google/uuid"
 	"go.vocdoni.io/dvote/types"
 	"go.vocdoni.io/dvote/vochain/indexer/indexertypes"
@@ -358,6 +357,5 @@ func CensusTypeToOrigin(ctype CensusTypeDescription) (models.CensusOrigin, []byt
 }
 
 type Block struct {
-	comettypes.Block `json:",inline"`
-	Hash             types.HexBytes `json:"hash" `
+	*indexertypes.Block
 }

api/chain.go

@@ -9,11 +9,9 @@ import (
 	"strconv"
 	"time"
 
-	comettypes "github.com/cometbft/cometbft/types"
 	"go.vocdoni.io/dvote/crypto/zk/circuit"
 	"go.vocdoni.io/dvote/httprouter"
 	"go.vocdoni.io/dvote/httprouter/apirest"
-	"go.vocdoni.io/dvote/types"
 	"go.vocdoni.io/dvote/util"
 	"go.vocdoni.io/dvote/vochain"
 	"go.vocdoni.io/dvote/vochain/genesis"
@@ -818,20 +816,14 @@ func (a *API) chainBlockHandler(_ *apirest.APIdata, ctx *httprouter.HTTPContext)
 	if err != nil {
 		return err
 	}
-	tmblock := a.vocapp.GetBlockByHeight(int64(height))
-	if tmblock == nil {
-		return ErrBlockNotFound
-	}
-	block := &Block{
-		Block: comettypes.Block{
-			Header:     tmblock.Header,
-			Data:       tmblock.Data,
-			Evidence:   tmblock.Evidence,
-			LastCommit: tmblock.LastCommit,
-		},
-		Hash: types.HexBytes(tmblock.Hash()),
+	block, err := a.indexer.BlockByHeight(int64(height))
+	if err != nil {
+		if errors.Is(err, indexer.ErrBlockNotFound) {
+			return ErrBlockNotFound
+		}
+		return ErrBlockNotFound.WithErr(err)
 	}
-	data, err := json.Marshal(block)
+	data, err := json.Marshal(&Block{block})
 	if err != nil {
 		return err
 	}
@@ -853,20 +845,14 @@ func (a *API) chainBlockByHashHandler(_ *apirest.APIdata, ctx *httprouter.HTTPCo
 	if err != nil {
 		return err
 	}
-	tmblock := a.vocapp.GetBlockByHash(hash)
-	if tmblock == nil {
-		return ErrBlockNotFound
-	}
-	block := &Block{
-		Block: comettypes.Block{
-			Header:     tmblock.Header,
-			Data:       tmblock.Data,
-			Evidence:   tmblock.Evidence,
-			LastCommit: tmblock.LastCommit,
-		},
-		Hash: types.HexBytes(tmblock.Hash()),
+	block, err := a.indexer.BlockByHash(hash)
+	if err != nil {
+		if errors.Is(err, indexer.ErrBlockNotFound) {
+			return ErrBlockNotFound
+		}
+		return ErrBlockNotFound.WithErr(err)
 	}
-	data, err := json.Marshal(block)
+	data, err := json.Marshal(&Block{block})
 	if err != nil {
 		return err
 	}