Merge branch 'feat/index-blocks' into dev

vocdoni · Sep 4, 2024 · a62a5cd · a62a5cd
2 parents 5d511a9 + 5c9a045
commit a62a5cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/api/api_types.go b/api/api_types.go
@@ -297,6 +297,7 @@ type TransfersList struct {
 type GenericTransactionWithInfo struct {
 	TxContent json.RawMessage           `json:"tx"`
 	TxInfo    *indexertypes.Transaction `json:"txInfo"`
+	Signature types.HexBytes            `json:"signature"`
 }
 
 type ChainInfo struct {

diff --git a/api/chain.go b/api/chain.go
@@ -670,6 +670,8 @@ func (a *API) chainTxRefByHashHandler(_ *apirest.APIdata, ctx *httprouter.HTTPCo
 //
 //	@Summary		Transaction by block height and index
 //	@Description	Get transaction full information by block height and index. It returns JSON transaction protobuf encoded. Depending of transaction type will return different types of objects. Current transaction types can be found calling `/chain/transactions/cost`
+//	@Deprecated
+//	@Description	(deprecated, in favor of /chain/transactions/{hash})
 //	@Tags			Chain
 //	@Accept			json
 //	@Produce		json

diff --git a/vochain/indexer/indexertypes/types.go b/vochain/indexer/indexertypes/types.go
@@ -212,7 +212,7 @@ func TransactionMetadataFromDBRow(dbtx *indexerdb.SearchTransactionsRow) *Transa
 type Transaction struct {
 	*TransactionMetadata
 	RawTx     types.HexBytes `json:"-"`
-	Signature types.HexBytes `json:"signature,omitempty"`
+	Signature types.HexBytes `json:"-"`
 }
 
 // TransactionFromDB converts an indexerdb.Transaction into a Transaction