indexer: add raw_tx in transactions table, to index the raw proto.Mar…

…shal(tx.Tx)
vocdoni · Jul 8, 2024 · fae0ff0 · fae0ff0
1 parent 5da65a6
commit fae0ff0
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 9 deletions.
diff --git a/vochain/indexer/bench_test.go b/vochain/indexer/bench_test.go
@@ -85,6 +85,7 @@ func BenchmarkIndexer(b *testing.B) {
 				tx := &vochaintx.Tx{
 					TxID:        rnd.Random32(),
 					TxModelType: "vote",
+					Tx:          &models.Tx{Payload: &models.Tx_Vote{}},
 				}
 				idx.OnNewTx(tx, height, txBlockIndex)
 				curTxs = append(curTxs, tx)
@@ -138,7 +139,11 @@ func BenchmarkFetchTx(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		for j := 0; j < numTxs; j++ {
-			idx.OnNewTx(&vochaintx.Tx{TxID: util.Random32()}, uint32(i), int32(j))
+			idx.OnNewTx(&vochaintx.Tx{
+				TxID:        util.Random32(),
+				TxModelType: "vote",
+				Tx:          &models.Tx{Payload: &models.Tx_Vote{}},
+			}, uint32(i), int32(j))
 		}
 		err := idx.Commit(uint32(i))
 		qt.Assert(b, err, qt.IsNil)

diff --git a/vochain/indexer/db/models.go b/vochain/indexer/db/models.go
diff --git a/vochain/indexer/db/transactions.sql.go b/vochain/indexer/db/transactions.sql.go
diff --git a/vochain/indexer/indexer_test.go b/vochain/indexer/indexer_test.go
@@ -1346,6 +1346,7 @@ func TestTxIndexer(t *testing.T) {
 			idx.OnNewTx(&vochaintx.Tx{
 				TxID:        getTxID(i, j),
 				TxModelType: "setAccount",
+				Tx:          &models.Tx{Payload: &models.Tx_SetAccount{}},
 			}, uint32(i), int32(j))
 		}
 	}

diff --git a/vochain/indexer/migrations/0014_alter_columns_table_transactions.sql b/vochain/indexer/migrations/0014_alter_columns_table_transactions.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE transactions ADD COLUMN raw_tx BLOB NOT NULL DEFAULT x'';
+
+-- +goose Down
+ALTER TABLE transactions DROP COLUMN raw_tx;
diff --git a/vochain/indexer/queries/transactions.sql b/vochain/indexer/queries/transactions.sql
@@ -1,8 +1,8 @@
 -- name: CreateTransaction :execresult
 INSERT INTO transactions (
-	hash, block_height, block_index, type
+	hash, block_height, block_index, type, raw_tx
 ) VALUES (
-	?, ?, ?, ?
+	?, ?, ?, ?, ?
 );
 
 -- name: GetTransaction :one

diff --git a/vochain/indexer/transaction.go b/vochain/indexer/transaction.go
@@ -11,6 +11,7 @@ import (
 	indexerdb "go.vocdoni.io/dvote/vochain/indexer/db"
 	"go.vocdoni.io/dvote/vochain/indexer/indexertypes"
 	"go.vocdoni.io/dvote/vochain/transaction/vochaintx"
+	"google.golang.org/protobuf/proto"
 )
 
 // ErrTransactionNotFound is returned if the transaction is not found.
@@ -84,12 +85,20 @@ func (idx *Indexer) GetLastTransactions(limit, offset int32) ([]*indexertypes.Tr
 func (idx *Indexer) OnNewTx(tx *vochaintx.Tx, blockHeight uint32, txIndex int32) {
 	idx.blockMu.Lock()
 	defer idx.blockMu.Unlock()
+
+	rawtx, err := proto.Marshal(tx.Tx)
+	if err != nil {
+		log.Errorw(err, "indexer cannot marshal new transaction")
+		return
+	}
+
 	queries := idx.blockTxQueries()
 	if _, err := queries.CreateTransaction(context.TODO(), indexerdb.CreateTransactionParams{
 		Hash:        tx.TxID[:],
 		BlockHeight: int64(blockHeight),
 		BlockIndex:  int64(txIndex),
 		Type:        tx.TxModelType,
+		RawTx:       rawtx,
 	}); err != nil {
 		log.Errorw(err, "cannot index new transaction")
 	}