fix: honor payment tx id if present (#1790)

Signed-off-by: Rado M <radkomih@gmail.com>

Author: radkomih

sdk/contract_info_query_unit_test.go

@@ -113,7 +113,6 @@ func TestUnitContractInfoQueryMock(t *testing.T) {
 }
 
 func TestUnitContractInfoQueryGetTransactionIDMock(t *testing.T) {
-	t.Skip("Skipping test as it is currently broken with the addition of generating new payment transactions for queries")
 	t.Parallel()
 
 	transactionID := TransactionIDGenerate(AccountID{Account: 123})

sdk/query.go

@@ -262,7 +262,14 @@ func (q *Query) generatePayments(client *Client, cost Hbar) (*services.Transacti
 	var tx *services.Transaction
 	var err error
 	nodeID := q.nodeAccountIDs._GetCurrent()
-	txnID := TransactionIDGenerate(client.operator.accountID)
+
+	var txnID TransactionID
+	if !q.paymentTransactionIDs._IsEmpty() {
+		txnID = q.paymentTransactionIDs._GetCurrent().(TransactionID)
+	} else {
+		txnID = TransactionIDGenerate(client.operator.accountID)
+	}
+
 	tx, err = _QueryMakePaymentTransaction(
 		txnID,
 		nodeID.(AccountID),