From d744ac4e4f139f7c588777cf796ce5c263092ab7 Mon Sep 17 00:00:00 2001
From: Sorin Stanculeanu <sorinstanculeanu26@gmail.com>
Date: Thu, 5 Dec 2024 11:56:04 +0200
Subject: [PATCH] fix transaction/pool endpoint issues

---
 .../transactionAPI/apiTransactionProcessor.go     |  4 ++--
 .../apiTransactionProcessor_test.go               | 15 ++++++++++++++-
 node/external/transactionAPI/fieldsHandler.go     |  5 ++++-
 .../external/transactionAPI/fieldsHandler_test.go |  2 ++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/node/external/transactionAPI/apiTransactionProcessor.go b/node/external/transactionAPI/apiTransactionProcessor.go
index c67ad1cb445..2bd448829d1 100644
--- a/node/external/transactionAPI/apiTransactionProcessor.go
+++ b/node/external/transactionAPI/apiTransactionProcessor.go
@@ -394,8 +394,8 @@ func (atp *apiTransactionProcessor) getFieldGettersForTx(wrappedTx *txcache.Wrap
 		rcvUsernameField: wrappedTx.Tx.GetRcvUserName(),
 		dataField:        wrappedTx.Tx.GetData(),
 		valueField:       getTxValue(wrappedTx),
-		senderShardID:    wrappedTx.SenderShardID,
-		receiverShardID:  wrappedTx.ReceiverShardID,
+		senderShardID:    atp.shardCoordinator.ComputeId(wrappedTx.Tx.GetSndAddr()),
+		receiverShardID:  atp.shardCoordinator.ComputeId(wrappedTx.Tx.GetRcvAddr()),
 	}
 
 	guardedTx, isGuardedTx := wrappedTx.Tx.(data.GuardedTransactionHandler)
diff --git a/node/external/transactionAPI/apiTransactionProcessor_test.go b/node/external/transactionAPI/apiTransactionProcessor_test.go
index e6a7040fe87..0282a6895ac 100644
--- a/node/external/transactionAPI/apiTransactionProcessor_test.go
+++ b/node/external/transactionAPI/apiTransactionProcessor_test.go
@@ -933,6 +933,9 @@ func TestApiTransactionProcessor_GetTransactionsPoolForSender(t *testing.T) {
 		NumberOfShardsCalled: func() uint32 {
 			return 1
 		},
+		ComputeIdCalled: func(address []byte) uint32 {
+			return 1 // force to return different from 0
+		},
 	}
 	atp, err := NewAPITransactionProcessor(args)
 	require.NoError(t, err)
@@ -945,7 +948,17 @@ func TestApiTransactionProcessor_GetTransactionsPoolForSender(t *testing.T) {
 	for i, tx := range res.Transactions {
 		require.Equal(t, expectedHashes[i], tx.TxFields[hashField])
 		require.Equal(t, expectedValues[i], tx.TxFields[valueField])
-		require.Equal(t, sender, tx.TxFields["sender"])
+		require.Equal(t, sender, tx.TxFields[senderField])
+		require.Equal(t, uint32(1), tx.TxFields[senderShardID])
+		require.Equal(t, uint32(1), tx.TxFields[senderShardID])
+	}
+
+	res, err = atp.GetTransactionsPoolForSender(sender, "sender,value") // no hash, should be by default
+	require.NoError(t, err)
+	for i, tx := range res.Transactions {
+		require.Equal(t, expectedHashes[i], tx.TxFields[hashField])
+		require.Equal(t, expectedValues[i], tx.TxFields[valueField])
+		require.Equal(t, sender, tx.TxFields[senderField])
 	}
 
 	// if no tx is found in pool for a sender, it isn't an error, but return empty slice
diff --git a/node/external/transactionAPI/fieldsHandler.go b/node/external/transactionAPI/fieldsHandler.go
index 4f837968cb7..4102d9ffc61 100644
--- a/node/external/transactionAPI/fieldsHandler.go
+++ b/node/external/transactionAPI/fieldsHandler.go
@@ -38,8 +38,11 @@ func newFieldsHandler(parameters string) fieldsHandler {
 	}
 
 	parameters = strings.ToLower(parameters)
+	fieldsMap := sliceToMap(strings.Split(parameters, separator))
+	fieldsMap[hashField] = struct{}{} // hashField should always be returned
+
 	return fieldsHandler{
-		fieldsMap: sliceToMap(strings.Split(parameters, separator)),
+		fieldsMap: fieldsMap,
 	}
 }
 
diff --git a/node/external/transactionAPI/fieldsHandler_test.go b/node/external/transactionAPI/fieldsHandler_test.go
index fab3b3a41d9..0be9d0124b3 100644
--- a/node/external/transactionAPI/fieldsHandler_test.go
+++ b/node/external/transactionAPI/fieldsHandler_test.go
@@ -20,9 +20,11 @@ func Test_newFieldsHandler(t *testing.T) {
 	for _, field := range splitFields {
 		require.True(t, fh.IsFieldSet(field), fmt.Sprintf("field %s is not set", field))
 	}
+	require.True(t, fh.IsFieldSet(hashField), fmt.Sprintf("hashField should have been returned by default"))
 
 	fh = newFieldsHandler("*")
 	for _, field := range splitFields {
 		require.True(t, fh.IsFieldSet(field))
 	}
+	require.True(t, fh.IsFieldSet(hashField), fmt.Sprintf("hashField should have been returned by default"))
 }