From 87b39765fd29daf779698476dbdeda985f6ac3bc Mon Sep 17 00:00:00 2001
From: Sorin Stanculeanu <sorinstanculeanu26@gmail.com>
Date: Wed, 5 Jun 2024 18:09:09 +0300
Subject: [PATCH] fixes after merge

---
 process/transactionProcessor.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/process/transactionProcessor.go b/process/transactionProcessor.go
index 97d95a5d..2ef984eb 100644
--- a/process/transactionProcessor.go
+++ b/process/transactionProcessor.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"math/big"
 	"net/http"
-	"strings"
 
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
@@ -43,9 +42,7 @@ const (
 	relayedV1TransactionDescriptor  = "RelayedTx"
 	relayedV2TransactionDescriptor  = "RelayedTxV2"
 	relayedV3TransactionDescriptor  = "RelayedTxV3"
-	relayedTxV1DataMarker           = "relayedTx@"
 	relayedTxV2DataMarker           = "relayedTxV2"
-	argumentsSeparator              = "@"
 	emptyDataStr                    = ""
 )
 
@@ -488,7 +485,7 @@ func (tp *TransactionProcessor) computeTransactionStatus(tx *transaction.ApiTran
 		}
 	}
 
-	isRelayedV3, status := checkIfRelayedV3Completed(allLogs, tx)
+	isRelayedV3, status := checkIfRelayedV3Completed(allScrs, allLogs, tx)
 	if isRelayedV3 {
 		return &data.ProcessStatusResponse{
 			Status: status,
@@ -557,7 +554,7 @@ func checkIfCompleted(logs []*transaction.ApiLogs) bool {
 	return found
 }
 
-func checkIfRelayedV3Completed(logs []*transaction.ApiLogs, tx *transaction.ApiTransactionResult) (bool, string) {
+func checkIfRelayedV3Completed(scrs []*transaction.ApiTransactionResult, logs []*transaction.ApiLogs, tx *transaction.ApiTransactionResult) (bool, string) {
 	if len(tx.InnerTransactions) == 0 {
 		return false, string(transaction.TxStatusPending)
 	}
@@ -574,11 +571,16 @@ func checkIfRelayedV3Completed(logs []*transaction.ApiLogs, tx *transaction.ApiT
 
 		completedFound, _ := findIdentifierInSingleLog(logInstance, core.CompletedTxEventIdentifier)
 		deployFound, _ := findIdentifierInSingleLog(logInstance, core.SCDeployIdentifier)
+
 		if completedFound || deployFound {
 			completedCnt++
 		}
 	}
 
+	if checkIfFailedOnReturnMessage(scrs, tx) {
+		return true, string(transaction.TxStatusFail)
+	}
+
 	status := string(transaction.TxStatusPending)
 	if completedCnt == len(tx.InnerTransactions) {
 		status = string(transaction.TxStatusSuccess)