Added transaction processed status

api/groups/interface.go

@@ -3,7 +3,6 @@ package groups
 import (
 	"math/big"
 
-	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/data/vm"
 	"github.com/multiversx/mx-chain-proxy-go/common"
 	"github.com/multiversx/mx-chain-proxy-go/data"
@@ -97,8 +96,9 @@ type TransactionFacadeHandler interface {
 	SendUserFunds(receiver string, value *big.Int) error
 	TransactionCostRequest(tx *data.Transaction) (*data.TxCostResponseData, error)
 	GetTransactionStatus(txHash string, sender string) (string, error)
-	GetTransaction(txHash string, withResults bool) (*transaction.ApiTransactionResult, error)
-	GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error)
+	GetProcessedTransactionStatus(txHash string, sender string) (string, error)
+	GetTransaction(txHash string, withResults bool) (*data.ExtendedApiTransactionResult, error)
+	GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error)
 	GetTransactionsPool(fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForShard(shardID uint32, fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForSender(sender, fields string) (*data.TransactionsPoolForSender, error)

api/mock/facadeStub.go

@@ -4,7 +4,6 @@ import (
 	"math/big"
 
 	"github.com/multiversx/mx-chain-core-go/core"
-	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/data/vm"
 	"github.com/multiversx/mx-chain-proxy-go/common"
 	"github.com/multiversx/mx-chain-proxy-go/data"
@@ -23,7 +22,7 @@ type FacadeStub struct {
 	GetNFTTokenIDsRegisteredByAddressCalled      func(address string, options common.AccountQueryOptions) (*data.GenericAPIResponse, error)
 	GetAllESDTTokensCalled                       func(address string, options common.AccountQueryOptions) (*data.GenericAPIResponse, error)
 	GetTransactionsHandler                       func(address string) ([]data.DatabaseTransaction, error)
-	GetTransactionHandler                        func(txHash string, withResults bool) (*transaction.ApiTransactionResult, error)
+	GetTransactionHandler                        func(txHash string, withResults bool) (*data.ExtendedApiTransactionResult, error)
 	GetTransactionsPoolHandler                   func(fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForShardHandler           func(shardID uint32, fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForSenderHandler          func(sender, fields string) (*data.TransactionsPoolForSender, error)
@@ -38,6 +37,7 @@ type FacadeStub struct {
 	ValidatorStatisticsHandler                   func() (map[string]*data.ValidatorApiResponse, error)
 	TransactionCostRequestHandler                func(tx *data.Transaction) (*data.TxCostResponseData, error)
 	GetTransactionStatusHandler                  func(txHash string, sender string) (string, error)
+	GetProcessedTransactionStatusHandler         func(txHash string, sender string) (string, error)
 	GetConfigMetricsHandler                      func() (*data.GenericAPIResponse, error)
 	GetNetworkMetricsHandler                     func(shardID uint32) (*data.GenericAPIResponse, error)
 	GetAllIssuedESDTsHandler                     func(tokenType string) (*data.GenericAPIResponse, error)
@@ -47,7 +47,7 @@ type FacadeStub struct {
 	GetDelegatedInfoCalled                       func() (*data.GenericAPIResponse, error)
 	GetRatingsConfigCalled                       func() (*data.GenericAPIResponse, error)
 	GetBlockByShardIDAndNonceHandler             func(shardID uint32, nonce uint64) (data.AtlasBlock, error)
-	GetTransactionByHashAndSenderAddressHandler  func(txHash string, sndAddr string, withResults bool) (*transaction.ApiTransactionResult, int, error)
+	GetTransactionByHashAndSenderAddressHandler  func(txHash string, sndAddr string, withResults bool) (*data.ExtendedApiTransactionResult, int, error)
 	GetBlockByHashCalled                         func(shardID uint32, hash string, options common.BlockQueryOptions) (*data.BlockApiResponse, error)
 	GetBlockByNonceCalled                        func(shardID uint32, nonce uint64, options common.BlockQueryOptions) (*data.BlockApiResponse, error)
 	GetBlocksByRoundCalled                       func(round uint64, options common.BlockQueryOptions) (*data.BlocksApiResponse, error)
@@ -316,12 +316,12 @@ func (f *FacadeStub) GetTransactions(address string) ([]data.DatabaseTransaction
 }
 
 // GetTransactionByHashAndSenderAddress -
-func (f *FacadeStub) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error) {
+func (f *FacadeStub) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error) {
 	return f.GetTransactionByHashAndSenderAddressHandler(txHash, sndAddr, withEvents)
 }
 
 // GetTransaction -
-func (f *FacadeStub) GetTransaction(txHash string, withResults bool) (*transaction.ApiTransactionResult, error) {
+func (f *FacadeStub) GetTransaction(txHash string, withResults bool) (*data.ExtendedApiTransactionResult, error) {
 	return f.GetTransactionHandler(txHash, withResults)
 }
 
@@ -400,6 +400,11 @@ func (f *FacadeStub) GetTransactionStatus(txHash string, sender string) (string,
 	return f.GetTransactionStatusHandler(txHash, sender)
 }
 
+// GetProcessedTransactionStatus -
+func (f *FacadeStub) GetProcessedTransactionStatus(txHash string, sender string) (string, error) {
+	return f.GetProcessedTransactionStatusHandler(txHash, sender)
+}
+
 // SendUserFunds -
 func (f *FacadeStub) SendUserFunds(receiver string, value *big.Int) error {
 	return f.SendUserFundsCalled(receiver, value)

data/constants.go

@@ -0,0 +1,6 @@
+package data
+
+import "github.com/multiversx/mx-chain-core-go/data/transaction"
+
+// TxStatusUnknown defines the response that should be received from an observer when transaction status is unknown
+const TxStatusUnknown transaction.TxStatus = "unknown"

data/transaction.go

@@ -165,6 +165,13 @@ type ExtendedApiSmartContractResult struct {
 	Used bool `json:"-"`
 }
 
+// ExtendedApiTransactionResult extends the original transaction.ApiTransactionResult with extra fields
+//   ProcessedStatus: will contain the transaction status after local processing
+type ExtendedApiTransactionResult struct {
+	*transaction.ApiTransactionResult
+	ProcessedStatus transaction.TxStatus `json:"processingStatus,omitempty"`
+}
+
 // ResponseTxCost defines a response from the node holding the transaction cost
 type ResponseTxCost struct {
 	Data  TxCostResponseData `json:"data"`

facade/baseFacade.go

@@ -5,7 +5,6 @@ import (
 	"math/big"
 
 	"github.com/multiversx/mx-chain-core-go/core"
-	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/data/vm"
 	"github.com/multiversx/mx-chain-proxy-go/api/groups"
 	"github.com/multiversx/mx-chain-proxy-go/common"
@@ -216,8 +215,13 @@ func (epf *ProxyFacade) GetTransactionStatus(txHash string, sender string) (stri
 	return epf.txProc.GetTransactionStatus(txHash, sender)
 }
 
+// GetProcessedTransactionStatus should return transaction status after internal processing of the transaction results
+func (epf *ProxyFacade) GetProcessedTransactionStatus(txHash string, sender string) (string, error) {
+	return epf.txProc.GetProcessedTransactionStatus(txHash, sender)
+}
+
 // GetTransaction should return a transaction by hash
-func (epf *ProxyFacade) GetTransaction(txHash string, withResults bool) (*transaction.ApiTransactionResult, error) {
+func (epf *ProxyFacade) GetTransaction(txHash string, withResults bool) (*data.ExtendedApiTransactionResult, error) {
 	return epf.txProc.GetTransaction(txHash, withResults)
 }
 
@@ -232,7 +236,7 @@ func (epf *ProxyFacade) ReloadFullHistoryObservers() data.NodesReloadResponse {
 }
 
 // GetTransactionByHashAndSenderAddress should return a transaction by hash and sender address
-func (epf *ProxyFacade) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error) {
+func (epf *ProxyFacade) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error) {
 	return epf.txProc.GetTransactionByHashAndSenderAddress(txHash, sndAddr, withEvents)
 }
 

facade/interface.go

@@ -3,7 +3,6 @@ package facade
 import (
 	"math/big"
 
-	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/data/vm"
 	crypto "github.com/multiversx/mx-chain-crypto-go"
 	"github.com/multiversx/mx-chain-proxy-go/common"
@@ -40,8 +39,9 @@ type TransactionProcessor interface {
 	SimulateTransaction(tx *data.Transaction, checkSignature bool) (*data.GenericAPIResponse, error)
 	TransactionCostRequest(tx *data.Transaction) (*data.TxCostResponseData, error)
 	GetTransactionStatus(txHash string, sender string) (string, error)
-	GetTransaction(txHash string, withEvents bool) (*transaction.ApiTransactionResult, error)
-	GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error)
+	GetTransaction(txHash string, withEvents bool) (*data.ExtendedApiTransactionResult, error)
+	GetProcessedTransactionStatus(txHash string, sender string) (string, error)
+	GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error)
 	ComputeTransactionHash(tx *data.Transaction) (string, error)
 	GetTransactionsPool(fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForShard(shardID uint32, fields string) (*data.TransactionsPool, error)

facade/mock/transactionProcessorStub.go

@@ -1,22 +1,25 @@
 package mock
 
 import (
+	"errors"
 	"math/big"
 
-	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-proxy-go/data"
 )
 
+var errNotImplemented = errors.New("not implement")
+
 // TransactionProcessorStub -
 type TransactionProcessorStub struct {
 	SendTransactionCalled                       func(tx *data.Transaction) (int, string, error)
 	SendMultipleTransactionsCalled              func(txs []*data.Transaction) (data.MultipleTransactionsResponseData, error)
 	SimulateTransactionCalled                   func(tx *data.Transaction, checkSignature bool) (*data.GenericAPIResponse, error)
 	SendUserFundsCalled                         func(receiver string, value *big.Int) error
-	TransactionCostRequestHandler               func(tx *data.Transaction) (*data.TxCostResponseData, error)
-	GetTransactionStatusHandler                 func(txHash string, sender string) (string, error)
-	GetTransactionCalled                        func(txHash string, withEvents bool) (*transaction.ApiTransactionResult, error)
-	GetTransactionByHashAndSenderAddressCalled  func(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error)
+	TransactionCostRequestCalled                func(tx *data.Transaction) (*data.TxCostResponseData, error)
+	GetTransactionStatusCalled                  func(txHash string, sender string) (string, error)
+	GetProcessedTransactionStatusCalled         func(txHash string, sender string) (string, error)
+	GetTransactionCalled                        func(txHash string, withEvents bool) (*data.ExtendedApiTransactionResult, error)
+	GetTransactionByHashAndSenderAddressCalled  func(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error)
 	ComputeTransactionHashCalled                func(tx *data.Transaction) (string, error)
 	GetTransactionsPoolCalled                   func(fields string) (*data.TransactionsPool, error)
 	GetTransactionsPoolForShardCalled           func(shardID uint32, fields string) (*data.TransactionsPool, error)
@@ -27,47 +30,92 @@ type TransactionProcessorStub struct {
 
 // SimulateTransaction -
 func (tps *TransactionProcessorStub) SimulateTransaction(tx *data.Transaction, checkSignature bool) (*data.GenericAPIResponse, error) {
-	return tps.SimulateTransactionCalled(tx, checkSignature)
+	if tps.SimulateTransactionCalled != nil {
+		return tps.SimulateTransactionCalled(tx, checkSignature)
+	}
+
+	return nil, errNotImplemented
 }
 
 // SendTransaction -
 func (tps *TransactionProcessorStub) SendTransaction(tx *data.Transaction) (int, string, error) {
-	return tps.SendTransactionCalled(tx)
+	if tps.SendTransactionCalled != nil {
+		return tps.SendTransactionCalled(tx)
+	}
+
+	return 0, "", errNotImplemented
 }
 
 // SendMultipleTransactions -
 func (tps *TransactionProcessorStub) SendMultipleTransactions(txs []*data.Transaction) (data.MultipleTransactionsResponseData, error) {
-	return tps.SendMultipleTransactionsCalled(txs)
+	if tps.SendMultipleTransactionsCalled != nil {
+		return tps.SendMultipleTransactionsCalled(txs)
+	}
+
+	return data.MultipleTransactionsResponseData{}, errNotImplemented
 }
 
 // ComputeTransactionHash -
 func (tps *TransactionProcessorStub) ComputeTransactionHash(tx *data.Transaction) (string, error) {
-	return tps.ComputeTransactionHashCalled(tx)
+	if tps.ComputeTransactionHashCalled != nil {
+		return tps.ComputeTransactionHashCalled(tx)
+	}
+
+	return "", errNotImplemented
 }
 
 // SendUserFunds -
 func (tps *TransactionProcessorStub) SendUserFunds(receiver string, value *big.Int) error {
-	return tps.SendUserFundsCalled(receiver, value)
+	if tps.SendUserFundsCalled != nil {
+		return tps.SendUserFundsCalled(receiver, value)
+	}
+
+	return errNotImplemented
 }
 
 // GetTransactionStatus -
 func (tps *TransactionProcessorStub) GetTransactionStatus(txHash string, sender string) (string, error) {
-	return tps.GetTransactionStatusHandler(txHash, sender)
+	if tps.GetTransactionStatusCalled != nil {
+		return tps.GetTransactionStatusCalled(txHash, sender)
+	}
+
+	return "", errNotImplemented
+}
+
+// GetProcessedTransactionStatus -
+func (tps *TransactionProcessorStub) GetProcessedTransactionStatus(txHash string, sender string) (string, error) {
+	if tps.GetProcessedTransactionStatusCalled != nil {
+		return tps.GetProcessedTransactionStatusCalled(txHash, sender)
+	}
+
+	return "", errNotImplemented
 }
 
 // GetTransaction -
-func (tps *TransactionProcessorStub) GetTransaction(txHash string, withEvents bool) (*transaction.ApiTransactionResult, error) {
-	return tps.GetTransactionCalled(txHash, withEvents)
+func (tps *TransactionProcessorStub) GetTransaction(txHash string, withEvents bool) (*data.ExtendedApiTransactionResult, error) {
+	if tps.GetTransactionCalled != nil {
+		return tps.GetTransactionCalled(txHash, withEvents)
+	}
+
+	return nil, errNotImplemented
 }
 
 // GetTransactionByHashAndSenderAddress -
-func (tps *TransactionProcessorStub) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*transaction.ApiTransactionResult, int, error) {
-	return tps.GetTransactionByHashAndSenderAddressCalled(txHash, sndAddr, withEvents)
+func (tps *TransactionProcessorStub) GetTransactionByHashAndSenderAddress(txHash string, sndAddr string, withEvents bool) (*data.ExtendedApiTransactionResult, int, error) {
+	if tps.GetTransactionByHashAndSenderAddressCalled != nil {
+		return tps.GetTransactionByHashAndSenderAddressCalled(txHash, sndAddr, withEvents)
+	}
+
+	return nil, 0, errNotImplemented
 }
 
 // TransactionCostRequest -
 func (tps *TransactionProcessorStub) TransactionCostRequest(tx *data.Transaction) (*data.TxCostResponseData, error) {
-	return tps.TransactionCostRequestHandler(tx)
+	if tps.TransactionCostRequestCalled != nil {
+		return tps.TransactionCostRequestCalled(tx)
+	}
+
+	return nil, errNotImplemented
 }
 
 // GetTransactionsPool -
@@ -76,7 +124,7 @@ func (tps *TransactionProcessorStub) GetTransactionsPool(fields string) (*data.T
 		return tps.GetTransactionsPoolCalled(fields)
 	}
 
-	return nil, nil
+	return nil, errNotImplemented
 }
 
 // GetTransactionsPoolForShard -
@@ -85,7 +133,7 @@ func (tps *TransactionProcessorStub) GetTransactionsPoolForShard(shardID uint32,
 		return tps.GetTransactionsPoolForShardCalled(shardID, fields)
 	}
 
-	return nil, nil
+	return nil, errNotImplemented
 }
 
 // GetTransactionsPoolForSender -
@@ -94,7 +142,7 @@ func (tps *TransactionProcessorStub) GetTransactionsPoolForSender(sender, fields
 		return tps.GetTransactionsPoolForSenderCalled(sender, fields)
 	}
 
-	return nil, nil
+	return nil, errNotImplemented
 }
 
 // GetLastPoolNonceForSender -
@@ -103,7 +151,7 @@ func (tps *TransactionProcessorStub) GetLastPoolNonceForSender(sender string) (u
 		return tps.GetLastPoolNonceForSenderCalled(sender)
 	}
 
-	return 0, nil
+	return 0, errNotImplemented
 }
 
 // GetTransactionsPoolNonceGapsForSender -
@@ -112,5 +160,5 @@ func (tps *TransactionProcessorStub) GetTransactionsPoolNonceGapsForSender(sende
 		return tps.GetTransactionsPoolNonceGapsForSenderCalled(sender)
 	}
 
-	return nil, nil
+	return nil, errNotImplemented
 }

process/export_test.go

@@ -3,6 +3,7 @@ package process
 import (
 	"time"
 
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	proxyData "github.com/multiversx/mx-chain-proxy-go/data"
 )
 
@@ -25,3 +26,8 @@ func ComputeTokenStorageKey(tokenID string, nonce uint64) string {
 func GetShortHashSize() int {
 	return shortHashSize
 }
+
+// ComputeTransactionStatus -
+func (tp *TransactionProcessor) ComputeTransactionStatus(tx *transaction.ApiTransactionResult, withResults bool) transaction.TxStatus {
+	return tp.computeTransactionStatus(tx, withResults)
+}