initial implementation

data/logs.go

@@ -24,12 +24,20 @@ type Event struct {
 	Order      int      `json:"order"`
 }
 
+// StatusInfo holds the fields for the transaction status
+type StatusInfo struct {
+	CompletedEvent bool   `json:"completedEvent"`
+	ErrorEvent     bool   `json:"errorEvent"`
+	Status         string `json:"status"`
+}
+
 // PreparedLogsResults is the DTO that holds all the results after processing
 type PreparedLogsResults struct {
 	Tokens                  TokensHandler
 	TokensSupply            TokensHandler
 	ScDeploys               map[string]*ScDeployInfo
 	Delegators              map[string]*Delegator
+	TxHashStatusInfo        map[string]*StatusInfo
 	TokensInfo              []*TokenInfo
 	NFTsDataUpdates         []*NFTDataUpdate
 	TokenRolesAndProperties *tokeninfo.TokenRolesAndProperties

data/transaction.go

@@ -46,6 +46,8 @@ type Transaction struct {
 	Version              uint32        `json:"version,omitempty"`
 	GuardianAddress      string        `json:"guardian,omitempty"`
 	GuardianSignature    string        `json:"guardianSignature,omitempty"`
+	ErrorEvent           bool          `json:"errorEvent,omitempty"`
+	CompletedEvent       bool          `json:"completedEvent,omitempty"`
 	SmartContractResults []*ScResult   `json:"-"`
 	Hash                 string        `json:"-"`
 	BlockHash            string        `json:"-"`
@@ -67,7 +69,6 @@ type PreparedResults struct {
 	Transactions []*Transaction
 	ScResults    []*ScResult
 	Receipts     []*Receipt
-	TxHashStatus map[string]string
 	TxHashFee    map[string]*FeeData
 }
 

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/elastic/go-elasticsearch/v7 v7.12.0
 	github.com/multiversx/mx-chain-communication-go v1.0.3
-	github.com/multiversx/mx-chain-core-go v1.2.7
+	github.com/multiversx/mx-chain-core-go v1.2.8-0.20230630085500-96880f1bce4c
 	github.com/multiversx/mx-chain-logger-go v1.0.11
 	github.com/multiversx/mx-chain-vm-common-go v1.4.1
 	github.com/stretchr/testify v1.8.2

go.sum

@@ -476,8 +476,8 @@ github.com/multiversx/mx-chain-communication-go v1.0.3/go.mod h1:7oTI77XfWmRWwVE
 github.com/multiversx/mx-chain-core-go v1.1.30/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-core-go v1.2.1/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-core-go v1.2.5/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
-github.com/multiversx/mx-chain-core-go v1.2.7 h1:cP4h/B4Arnz0K6ieRd1OAf+z5gBejiMA6lzcWewR7kk=
-github.com/multiversx/mx-chain-core-go v1.2.7/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
+github.com/multiversx/mx-chain-core-go v1.2.8-0.20230630085500-96880f1bce4c h1:UfPvZLUYZUsI+ZtxHFroyr3q+CDPgkT0n3eqKNdrJuM=
+github.com/multiversx/mx-chain-core-go v1.2.8-0.20230630085500-96880f1bce4c/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
 github.com/multiversx/mx-chain-crypto-go v1.2.6/go.mod h1:rOj0Rr19HTOYt9YTeym7RKxlHt91NXln3LVKjHKVmA0=
 github.com/multiversx/mx-chain-logger-go v1.0.11 h1:DFsHa+sc5fKwhDR50I8uBM99RTDTEW68ESyr5ALRDwE=
 github.com/multiversx/mx-chain-logger-go v1.0.11/go.mod h1:1srDkP0DQucWQ+rYfaq0BX2qLnULsUdRPADpYUTM6dA=

mock/dbTransactionsHandlerStub.go

@@ -43,7 +43,7 @@ func (tps *DBTransactionProcessorStub) SerializeReceipts(recs []*data.Receipt, b
 }
 
 // SerializeTransactions -
-func (tps *DBTransactionProcessorStub) SerializeTransactions(_ []*data.Transaction, _ map[string]string, _ uint32, _ *data.BufferSlice, _ string) error {
+func (tps *DBTransactionProcessorStub) SerializeTransactions(_ []*data.Transaction, _ map[string]*data.StatusInfo, _ uint32, _ *data.BufferSlice, _ string) error {
 	return nil
 }
 

process/elasticproc/elasticProcessor.go

@@ -414,12 +414,12 @@ func (ei *elasticProcessor) SaveTransactions(obh *outport.OutportBlockWithHeader
 	logsData := ei.logsAndEventsProc.ExtractDataFromLogs(obh.TransactionPool.Logs, preparedResults, headerTimestamp, obh.Header.GetShardID(), obh.NumberOfShards)
 
 	buffers := data.NewBufferSlice(ei.bulkRequestMaxSize)
-	err := ei.indexTransactions(preparedResults.Transactions, preparedResults.TxHashStatus, obh.Header, buffers)
+	err := ei.indexTransactions(preparedResults.Transactions, logsData.TxHashStatusInfo, obh.Header, buffers)
 	if err != nil {
 		return err
 	}
 
-	err = ei.prepareAndIndexOperations(preparedResults.Transactions, preparedResults.TxHashStatus, obh.Header, preparedResults.ScResults, buffers, ei.isImportDB())
+	err = ei.prepareAndIndexOperations(preparedResults.Transactions, logsData.TxHashStatusInfo, obh.Header, preparedResults.ScResults, buffers, ei.isImportDB())
 	if err != nil {
 		return err
 	}
@@ -539,17 +539,17 @@ func (ei *elasticProcessor) indexScDeploys(deployData map[string]*data.ScDeployI
 	return ei.logsAndEventsProc.SerializeSCDeploys(deployData, buffSlice, elasticIndexer.SCDeploysIndex)
 }
 
-func (ei *elasticProcessor) indexTransactions(txs []*data.Transaction, txHashStatus map[string]string, header coreData.HeaderHandler, bytesBuff *data.BufferSlice) error {
+func (ei *elasticProcessor) indexTransactions(txs []*data.Transaction, txHashStatusInfo map[string]*data.StatusInfo, header coreData.HeaderHandler, bytesBuff *data.BufferSlice) error {
 	if !ei.isIndexEnabled(elasticIndexer.TransactionsIndex) {
 		return nil
 	}
 
-	return ei.transactionsProc.SerializeTransactions(txs, txHashStatus, header.GetShardID(), bytesBuff, elasticIndexer.TransactionsIndex)
+	return ei.transactionsProc.SerializeTransactions(txs, txHashStatusInfo, header.GetShardID(), bytesBuff, elasticIndexer.TransactionsIndex)
 }
 
 func (ei *elasticProcessor) prepareAndIndexOperations(
 	txs []*data.Transaction,
-	txHashStatus map[string]string,
+	txHashStatusInfo map[string]*data.StatusInfo,
 	header coreData.HeaderHandler,
 	scrs []*data.ScResult,
 	buffSlice *data.BufferSlice,
@@ -561,7 +561,7 @@ func (ei *elasticProcessor) prepareAndIndexOperations(
 
 	processedTxs, processedSCRs := ei.operationsProc.ProcessTransactionsAndSCRs(txs, scrs, isImportDB, header.GetShardID())
 
-	err := ei.transactionsProc.SerializeTransactions(processedTxs, txHashStatus, header.GetShardID(), buffSlice, elasticIndexer.OperationsIndex)
+	err := ei.transactionsProc.SerializeTransactions(processedTxs, txHashStatusInfo, header.GetShardID(), buffSlice, elasticIndexer.OperationsIndex)
 	if err != nil {
 		return err
 	}

process/elasticproc/interface.go

@@ -66,7 +66,7 @@ type DBTransactionsHandler interface {
 	GetHexEncodedHashesForRemove(header coreData.HeaderHandler, body *block.Body) ([]string, []string)
 
 	SerializeReceipts(receipts []*data.Receipt, buffSlice *data.BufferSlice, index string) error
-	SerializeTransactions(transactions []*data.Transaction, txHashStatus map[string]string, selfShardID uint32, buffSlice *data.BufferSlice, index string) error
+	SerializeTransactions(transactions []*data.Transaction, txHashStatusInfo map[string]*data.StatusInfo, selfShardID uint32, buffSlice *data.BufferSlice, index string) error
 	SerializeTransactionsFeeData(txHashRefund map[string]*data.FeeData, buffSlice *data.BufferSlice, index string) error
 	SerializeScResults(scResults []*data.ScResult, buffSlice *data.BufferSlice, index string) error
 }

process/elasticproc/logsevents/informativeLogsProcessor.go

@@ -1,12 +1,9 @@
 package logsevents
 
 import (
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
-)
-
-const (
-	writeLogOperation    = "writeLog"
-	signalErrorOperation = "signalError"
+	"github.com/multiversx/mx-chain-es-indexer-go/data"
 )
 
 type informativeLogsProcessor struct {
@@ -16,8 +13,10 @@ type informativeLogsProcessor struct {
 func newInformativeLogsProcessor() *informativeLogsProcessor {
 	return &informativeLogsProcessor{
 		operations: map[string]struct{}{
-			writeLogOperation:    {},
-			signalErrorOperation: {},
+			core.WriteLogIdentifier:         {},
+			core.SignalErrorOperation:       {},
+			core.CompletedTxEventIdentifier: {},
+			core.InternalVMErrorsOperation:  {},
 		},
 	}
 }
@@ -31,23 +30,54 @@ func (ilp *informativeLogsProcessor) processEvent(args *argsProcessEvent) argOut
 
 	tx, ok := args.txs[args.txHashHexEncoded]
 	if !ok {
-		return argOutputProcessEvent{
-			processed: true,
-		}
+		return processEventNoTx(args)
 	}
 
 	switch identifier {
-	case writeLogOperation:
+	case core.CompletedTxEventIdentifier:
+		{
+			tx.CompletedEvent = true
+		}
+	case core.WriteLogIdentifier:
 		{
 			tx.Status = transaction.TxStatusSuccess.String()
 		}
-	case signalErrorOperation:
+	case core.SignalErrorOperation, core.InternalVMErrorsOperation:
 		{
 			tx.Status = transaction.TxStatusFail.String()
+			tx.ErrorEvent = true
 		}
 	}
 
 	return argOutputProcessEvent{
 		processed: true,
 	}
 }
+
+func processEventNoTx(args *argsProcessEvent) argOutputProcessEvent {
+	scr, ok := args.scrs[args.txHashHexEncoded]
+	if !ok {
+		return argOutputProcessEvent{
+			processed: true,
+		}
+	}
+
+	record := &data.StatusInfo{}
+	switch string(args.event.GetIdentifier()) {
+	case core.CompletedTxEventIdentifier:
+		{
+			record.CompletedEvent = true
+		}
+	case core.SignalErrorOperation, core.InternalVMErrorsOperation:
+		{
+			record.Status = transaction.TxStatusFail.String()
+			record.ErrorEvent = true
+		}
+	}
+
+	args.txHashStatusInfoProc.addRecord(scr.OriginalTxHash, record)
+
+	return argOutputProcessEvent{
+		processed: true,
+	}
+}

process/elasticproc/logsevents/informativeLogsProcessor_test.go

@@ -3,6 +3,7 @@ package logsevents
 import (
 	"testing"
 
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-es-indexer-go/data"
 	"github.com/stretchr/testify/require"
@@ -40,7 +41,7 @@ func TestInformativeLogsProcessorWriteLog(t *testing.T) {
 
 	event := &transaction.Event{
 		Address:    []byte("addr"),
-		Identifier: []byte(writeLogOperation),
+		Identifier: []byte(core.WriteLogIdentifier),
 	}
 	args := &argsProcessEvent{
 		timestamp:        1234,
@@ -73,7 +74,7 @@ func TestInformativeLogsProcessorSignalError(t *testing.T) {
 
 	event := &transaction.Event{
 		Address:    []byte("addr"),
-		Identifier: []byte(signalErrorOperation),
+		Identifier: []byte(core.SignalErrorOperation),
 	}
 	args := &argsProcessEvent{
 		timestamp:        1234,

process/elasticproc/logsevents/interface.go

@@ -10,10 +10,12 @@ type argsProcessEvent struct {
 	txHashHexEncoded        string
 	scDeploys               map[string]*data.ScDeployInfo
 	txs                     map[string]*data.Transaction
+	scrs                    map[string]*data.ScResult
 	event                   coreData.EventHandler
 	tokens                  data.TokensHandler
 	tokensSupply            data.TokensHandler
 	tokenRolesAndProperties *tokeninfo.TokenRolesAndProperties
+	txHashStatusInfoProc    txHashStatusInfoHandler
 	timestamp               uint64
 	logAddress              []byte
 	selfShardID             uint32
@@ -30,3 +32,8 @@ type argOutputProcessEvent struct {
 type eventsProcessor interface {
 	processEvent(args *argsProcessEvent) argOutputProcessEvent
 }
+
+type txHashStatusInfoHandler interface {
+	addRecord(hash string, statusInfo *data.StatusInfo)
+	getAllRecords() map[string]*data.StatusInfo
+}

process/elasticproc/logsevents/logsAndEventsProcessor.go

@@ -123,6 +123,7 @@ func (lep *logsAndEventsProcessor) ExtractDataFromLogs(
 		Delegators:              lep.logsData.delegators,
 		NFTsDataUpdates:         lep.logsData.nftsDataUpdates,
 		TokenRolesAndProperties: lep.logsData.tokenRolesAndProperties,
+		TxHashStatusInfo:        lep.logsData.txHashStatusInfoProc.getAllRecords(),
 	}
 }
 

process/elasticproc/logsevents/logsData.go

@@ -8,6 +8,7 @@ import (
 
 type logsData struct {
 	timestamp               uint64
+	txHashStatusInfoProc    txHashStatusInfoHandler
 	tokens                  data.TokensHandler
 	tokensSupply            data.TokensHandler
 	txsMap                  map[string]*data.Transaction
@@ -36,6 +37,7 @@ func newLogsData(
 	ld.delegators = make(map[string]*data.Delegator)
 	ld.nftsDataUpdates = make([]*data.NFTDataUpdate, 0)
 	ld.tokenRolesAndProperties = tokeninfo.NewTokenRolesAndProperties()
+	ld.txHashStatusInfoProc = newTxHashStatusInfo()
 
 	return ld
 }

process/elasticproc/logsevents/statusInfo.go

@@ -0,0 +1,37 @@
+package logsevents
+
+import (
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
+	"github.com/multiversx/mx-chain-es-indexer-go/data"
+)
+
+type txHashStatusInfoProc struct {
+	hashStatusInfo map[string]*data.StatusInfo
+}
+
+// NewTxHashStatusInfo will create a new instance of TxHashStatusInfo
+func newTxHashStatusInfo() *txHashStatusInfoProc {
+	return &txHashStatusInfoProc{
+		hashStatusInfo: make(map[string]*data.StatusInfo),
+	}
+}
+
+// AddRecord will add a new record for the given hash
+func (ths *txHashStatusInfoProc) addRecord(hash string, statusInfo *data.StatusInfo) {
+	statusInfoFromMap, found := ths.hashStatusInfo[hash]
+	if !found {
+		ths.hashStatusInfo[hash] = statusInfo
+	}
+
+	if statusInfoFromMap.Status != transaction.TxStatusFail.String() {
+		statusInfoFromMap.Status = statusInfo.Status
+	}
+
+	statusInfoFromMap.ErrorEvent = statusInfoFromMap.ErrorEvent || statusInfo.ErrorEvent
+	statusInfoFromMap.CompletedEvent = statusInfoFromMap.CompletedEvent || statusInfo.CompletedEvent
+}
+
+// GetAllRecords will return all the records
+func (ths *txHashStatusInfoProc) getAllRecords() map[string]*data.StatusInfo {
+	return ths.hashStatusInfo
+}

process/elasticproc/logsevents/statusInfo_test.go

@@ -0,0 +1 @@
+package logsevents