indexer: drop concept of transaction id, hash is now the primary key

 * api: remove endpoint /chain/transactions/reference/index/{index}

api/chain.go

@@ -104,14 +104,6 @@ func (a *API) enableChainHandlers() error {
 	); err != nil {
 		return err
 	}
-	if err := a.Endpoint.RegisterMethod(
-		"/chain/transactions/reference/index/{index}",
-		"GET",
-		apirest.MethodAccessTypePublic,
-		a.chainTxRefByIndexHandler,
-	); err != nil {
-		return err
-	}
 	if err := a.Endpoint.RegisterMethod(
 		"/chain/blocks/{height}/transactions/page/{page}",
 		"GET",
@@ -705,36 +697,6 @@ func (a *API) chainTxHandler(_ *apirest.APIdata, ctx *httprouter.HTTPContext) er
 	return ctx.Send(data, apirest.HTTPstatusOK)
 }
 
-// chainTxRefByIndexHandler
-//
-//	@Summary		Transaction metadata (by db index)
-//	@Description	Get transaction by its internal index. This is not the transaction hash, and neither the block height and block  index. The transaction index is an incremental counter for each transaction.  You could use the transaction `block` and `index` to retrieve full info using [transaction by block and index](transaction-by-block-index).
-//	@Tags			Chain
-//	@Accept			json
-//	@Produce		json
-//	@Param			index	path		int	true	"Index of the transaction"
-//	@Success		200		{object}	indexertypes.Transaction
-//	@Success		204		"See [errors](vocdoni-api#errors) section"
-//	@Router			/chain/transactions/reference/index/{index} [get]
-func (a *API) chainTxRefByIndexHandler(_ *apirest.APIdata, ctx *httprouter.HTTPContext) error {
-	index, err := strconv.ParseUint(ctx.URLParam("index"), 10, 64)
-	if err != nil {
-		return err
-	}
-	ref, err := a.indexer.GetTxMetadataByID(index)
-	if err != nil {
-		if errors.Is(err, indexer.ErrTransactionNotFound) {
-			return ErrTransactionNotFound
-		}
-		return ErrVochainGetTxFailed.WithErr(err)
-	}
-	data, err := json.Marshal(ref)
-	if err != nil {
-		return err
-	}
-	return ctx.Send(data, apirest.HTTPstatusOK)
-}
-
 // chainTxListHandler
 //
 //	@Summary		List transactions

vochain/indexer/bench_test.go

@@ -152,10 +152,10 @@ func BenchmarkFetchTx(b *testing.B) {
 
 		startTime := time.Now()
 		for j := 0; j < numTxs; j++ {
-			_, err = idx.GetTxMetadataByID(uint64((i * numTxs) + j + 1))
+			_, err = idx.GetTransactionByHeightAndIndex(int64(i), int64(j))
 			qt.Assert(b, err, qt.IsNil)
 		}
-		log.Infof("fetched %d transactions (out of %d total) by index, took %s",
+		log.Infof("fetched %d transactions (out of %d total) by height+index, took %s",
 			numTxs, (i+1)*numTxs, time.Since(startTime))
 		startTime = time.Now()
 		for j := 0; j < numTxs; j++ {

vochain/indexer/indexer_test.go

@@ -1405,7 +1405,7 @@ func TestTxIndexer(t *testing.T) {
 
 	for i := 0; i < totalBlocks; i++ {
 		for j := 0; j < txsPerBlock; j++ {
-			ref, err := idx.GetTxMetadataByID(uint64(i*txsPerBlock + j + 1))
+			ref, err := idx.GetTransactionByHeightAndIndex(int64(i), int64(j))
 			qt.Assert(t, err, qt.IsNil)
 			qt.Assert(t, ref.BlockHeight, qt.Equals, uint32(i))
 			qt.Assert(t, ref.TxBlockIndex, qt.Equals, int32(j))
@@ -1423,8 +1423,6 @@ func TestTxIndexer(t *testing.T) {
 	txs, _, err := idx.SearchTransactions(15, 0, 0, "", "", "")
 	qt.Assert(t, err, qt.IsNil)
 	for i, tx := range txs {
-		// Index is between 1 and totalCount.
-		qt.Assert(t, tx.Index, qt.Equals, uint64(totalTxs-i))
 		// BlockIndex and TxBlockIndex start at 0, so subtract 1.
 		qt.Assert(t, tx.BlockHeight, qt.Equals, uint32(totalTxs-i-1)/txsPerBlock)
 		qt.Assert(t, tx.TxBlockIndex, qt.Equals, int32(totalTxs-i-1)%txsPerBlock)
@@ -1434,7 +1432,6 @@ func TestTxIndexer(t *testing.T) {
 	txs, _, err = idx.SearchTransactions(1, 5, 0, "", "", "")
 	qt.Assert(t, err, qt.IsNil)
 	qt.Assert(t, txs, qt.HasLen, 1)
-	qt.Assert(t, txs[0].Index, qt.Equals, uint64(95))
 }
 
 func TestCensusUpdate(t *testing.T) {

vochain/indexer/indexertypes/types.go

@@ -178,7 +178,6 @@ type TxPackage struct {
 
 // TransactionMetadata contains tx information for the TransactionList api
 type TransactionMetadata struct {
-	Index        uint64         `json:"transactionNumber" format:"int64" example:"944"`
 	Hash         types.HexBytes `json:"transactionHash" swaggertype:"string" example:"75e8f822f5dd13973ac5158d600f0a2a5fea4bfefce9712ab5195bf17884cfad"`
 	BlockHeight  uint32         `json:"blockHeight" format:"int32" example:"64924"`
 	TxBlockIndex int32          `json:"transactionIndex" format:"int32" example:"0"`
@@ -189,7 +188,6 @@ type TransactionMetadata struct {
 
 func TransactionMetadataFromDB(dbtx *indexerdb.Transaction) *TransactionMetadata {
 	return &TransactionMetadata{
-		Index:        uint64(dbtx.ID),
 		Hash:         dbtx.Hash,
 		BlockHeight:  uint32(dbtx.BlockHeight),
 		TxBlockIndex: int32(dbtx.BlockIndex),
@@ -201,7 +199,6 @@ func TransactionMetadataFromDB(dbtx *indexerdb.Transaction) *TransactionMetadata
 
 func TransactionMetadataFromDBRow(dbtx *indexerdb.SearchTransactionsRow) *TransactionMetadata {
 	return &TransactionMetadata{
-		Index:        uint64(dbtx.ID),
 		Hash:         dbtx.Hash,
 		BlockHeight:  uint32(dbtx.BlockHeight),
 		TxBlockIndex: int32(dbtx.BlockIndex),

vochain/indexer/migrations/0015_recreate_table_transactions.sql

@@ -0,0 +1,62 @@
+-- +goose Up
+PRAGMA foreign_keys = OFF;
+
+-- Create a new table with hash as primary key
+CREATE TABLE transactions_new (
+  hash         BLOB NOT NULL PRIMARY KEY,
+  block_height INTEGER NOT NULL,
+  block_index  INTEGER NOT NULL,
+  type         TEXT NOT NULL
+);
+
+-- Copy data from the old table to the new table
+INSERT INTO transactions_new (hash, block_height, block_index, type)
+SELECT hash, block_height, block_index, type
+FROM transactions;
+
+-- Drop the old table
+DROP TABLE transactions;
+
+-- Rename the new table to the old table name
+ALTER TABLE transactions_new RENAME TO transactions;
+
+-- Recreate necessary indexes
+CREATE INDEX transactions_block_height_index
+ON transactions(block_height, block_index);
+
+-- Add new columns
+ALTER TABLE transactions ADD COLUMN subtype TEXT NOT NULL DEFAULT '';
+ALTER TABLE transactions ADD COLUMN raw_tx BLOB NOT NULL DEFAULT x'';
+ALTER TABLE transactions ADD COLUMN signature BLOB NOT NULL DEFAULT x'';
+ALTER TABLE transactions ADD COLUMN signer BLOB NOT NULL DEFAULT x'';
+
+PRAGMA foreign_keys = ON;
+
+-- +goose Down
+PRAGMA foreign_keys = OFF;
+
+-- Recreate the old table structure
+CREATE TABLE transactions (
+  id           INTEGER NOT NULL PRIMARY KEY,
+  hash         BLOB NOT NULL,
+  block_height INTEGER NOT NULL,
+  block_index  INTEGER NOT NULL,
+  type         TEXT NOT NULL
+);
+
+-- Copy data back from the new table to the old table
+INSERT INTO transactions (hash, block_height, block_index, type)
+SELECT hash, block_height, block_index, type
+FROM transactions_new;
+
+-- Drop the new table
+DROP TABLE transactions_new;
+
+-- Recreate the old indexes
+CREATE INDEX transactions_hash
+ON transactions(hash);
+
+CREATE INDEX transactions_block_height_index
+ON transactions(block_height, block_index);
+
+PRAGMA foreign_keys = ON;

vochain/indexer/queries/blocks.sql

@@ -5,11 +5,11 @@ INSERT INTO blocks(
 	?, ?, ?, ?, ?, ?
 )
 ON CONFLICT(height) DO UPDATE
-SET chain_id         = sqlc.arg(chain_id),
-	time             = sqlc.arg(time),
-	hash             = sqlc.arg(hash),
-	proposer_address = sqlc.arg(proposer_address),
-	last_block_hash  = sqlc.arg(last_block_hash);
+SET chain_id         = excluded.chain_id,
+    time             = excluded.time,
+    hash             = excluded.hash,
+    proposer_address = excluded.proposer_address,
+    last_block_hash  = excluded.last_block_hash;
 
 -- name: GetBlockByHeight :one
 SELECT * FROM blocks