refactor: add tx_index to account transactions

AstraProtocol · Sep 6, 2023 · af64cb9 · af64cb9
1 parent 2a75303
commit af64cb9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/infrastructure/httpapi/handlers/account_transactions.go b/infrastructure/httpapi/handlers/account_transactions.go
@@ -595,7 +595,7 @@ func (handler *AccountTransactions) SyncAccountInternalTxsByTxHash(ctx *fasthttp
 		}
 		tx.Messages = append(tx.Messages, tmpMessage)
 		txs = append(txs, tx)
-		accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTx()...)
+		accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTxOrTokenTransfer(index)...)
 	}
 	err = handler.accountTransactionsView.InsertAll(accountTransactionRows)
 	if err == nil {

diff --git a/infrastructure/kafka/consumer/worker/internal_txs_consumer.go b/infrastructure/kafka/consumer/worker/internal_txs_consumer.go
@@ -182,7 +182,7 @@ func RunInternalTxsConsumer(rdbHandle *rdb.Handle, config *config.Config, logger
 					}
 					tx.Messages = append(tx.Messages, tmpMessage)
 					txs = append(txs, tx)
-					accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTx()...)
+					accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTxOrTokenTransfer(int(internalTx.Index))...)
 				}
 				if len(txs) == 0 {
 					// commit offset when no internal txs are valid

diff --git a/infrastructure/kafka/consumer/worker/token_transfers_consumer.go b/infrastructure/kafka/consumer/worker/token_transfers_consumer.go
@@ -158,7 +158,7 @@ func RunTokenTransfersConsumer(rdbHandle *rdb.Handle, config *config.Config, log
 						}
 						tx.Messages = append(tx.Messages, tmpMessage)
 						txs = append(txs, tx)
-						accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTx()...)
+						accountTransactionRows = append(accountTransactionRows, transactionInfo.ToRowsIncludingInternalTxOrTokenTransfer(int(tokenTransfer.LogIndex))...)
 
 						err = rdbAccountTransactionsView.InsertAll(accountTransactionRows)
 						if err == nil {

diff --git a/projection/account_transaction/account_transaction.go b/projection/account_transaction/account_transaction.go
@@ -628,20 +628,22 @@ func (info *TransactionInfo) ToRows() []view.AccountTransactionBaseRow {
 		clonedRow := info.Row
 		clonedRow.Account = account
 		clonedRow.IsInternalTx = false
+		clonedRow.TxIndex = 0
 		rows = append(rows, clonedRow)
 	}
 
 	return rows
 }
 
-func (info *TransactionInfo) ToRowsIncludingInternalTx() []view.AccountTransactionBaseRow {
+func (info *TransactionInfo) ToRowsIncludingInternalTxOrTokenTransfer(index int) []view.AccountTransactionBaseRow {
 	info.FillMessageTypes()
 
 	rows := make([]view.AccountTransactionBaseRow, 0)
 	for account := range info.involvedAccounts {
 		clonedRow := info.Row
 		clonedRow.Account = account
 		clonedRow.IsInternalTx = true
+		clonedRow.TxIndex = index
 		rows = append(rows, clonedRow)
 	}
 

diff --git a/...action/migrations/20230617231243_view_account_transactions_unique_constraint_index.up.sql b/...action/migrations/20230617231243_view_account_transactions_unique_constraint_index.up.sql
@@ -1,3 +1,3 @@
 ALTER TABLE view_account_transactions
     ADD CONSTRAINT account_transactions_unique
-    UNIQUE (block_height, account, transaction_hash, success, from_address, to_address, is_internal_tx);
+    UNIQUE (block_height, account, transaction_hash, success, from_address, to_address, is_internal_tx, tx_index);
diff --git a/...saction/migrations/20230906193424_alter_view_account_transaction_data_add_tx_index.up.sql b/...saction/migrations/20230906193424_alter_view_account_transaction_data_add_tx_index.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE view_account_transaction_data
+    ADD COLUMN tx_index SMALLINT NOT NULL DEFAULT 0;
diff --git a/...transaction/migrations/20230906193424_alter_view_account_transactions_add_tx_index.up.sql b/...transaction/migrations/20230906193424_alter_view_account_transactions_add_tx_index.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE view_account_transactions
+    ADD COLUMN tx_index SMALLINT NOT NULL DEFAULT 0;
diff --git a/projection/account_transaction/view/account_transactions.go b/projection/account_transaction/view/account_transactions.go
@@ -62,6 +62,7 @@ func (accountMessagesView *AccountTransactions) InsertAll(
 				"from_address",
 				"to_address",
 				"is_internal_tx",
+				"tx_index",
 			)
 		}
 
@@ -77,6 +78,7 @@ func (accountMessagesView *AccountTransactions) InsertAll(
 			row.FromAddress,
 			row.ToAddress,
 			row.IsInternalTx,
+			row.TxIndex,
 		)
 		pendingRowCount += 1
 
@@ -433,6 +435,7 @@ type AccountTransactionBaseRow struct {
 	FromAddress  string          `json:"from_address,omitempty"`
 	ToAddress    string          `json:"to_address,omitempty"`
 	IsInternalTx bool            `json:"is_internal_tx,omitempty"`
+	TxIndex      int             `json:"tx_index,omitempty"`
 }
 
 type AccountTransactionReadRow struct {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE view_account_transaction_data
		ADD COLUMN tx_index SMALLINT NOT NULL DEFAULT 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE view_account_transactions
		ADD COLUMN tx_index SMALLINT NOT NULL DEFAULT 0;