mirror of
https://github.com/kaspanet/kaspad.git
synced 2025-06-07 06:36:46 +00:00
Fix transaction relay not working (#1279)
* Implement HandleGetMempoolEntry. * Fix equality bug in handleRelayedTransactionsFlow.
This commit is contained in:
parent
717914319a
commit
b749b2db0b
@ -168,7 +168,7 @@ func (flow *handleRelayedTransactionsFlow) receiveTransactions(requestedTransact
|
|||||||
}
|
}
|
||||||
tx := appmessage.MsgTxToDomainTransaction(msgTx)
|
tx := appmessage.MsgTxToDomainTransaction(msgTx)
|
||||||
txID := consensushashing.TransactionID(tx)
|
txID := consensushashing.TransactionID(tx)
|
||||||
if txID != expectedID {
|
if !txID.Equal(expectedID) {
|
||||||
return protocolerrors.Errorf(true, "expected transaction %s, but got %s",
|
return protocolerrors.Errorf(true, "expected transaction %s, but got %s",
|
||||||
expectedID, txID)
|
expectedID, txID)
|
||||||
}
|
}
|
||||||
|
@ -3,10 +3,33 @@ package rpchandlers
|
|||||||
import (
|
import (
|
||||||
"github.com/kaspanet/kaspad/app/appmessage"
|
"github.com/kaspanet/kaspad/app/appmessage"
|
||||||
"github.com/kaspanet/kaspad/app/rpc/rpccontext"
|
"github.com/kaspanet/kaspad/app/rpc/rpccontext"
|
||||||
|
"github.com/kaspanet/kaspad/domain/consensus/utils/transactionid"
|
||||||
"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
|
"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HandleGetMempoolEntry handles the respectively named RPC command
|
// HandleGetMempoolEntry handles the respectively named RPC command
|
||||||
func HandleGetMempoolEntry(context *rpccontext.Context, _ *router.Router, request appmessage.Message) (appmessage.Message, error) {
|
func HandleGetMempoolEntry(context *rpccontext.Context, _ *router.Router, request appmessage.Message) (appmessage.Message, error) {
|
||||||
return &appmessage.GetMempoolEntryResponseMessage{}, nil
|
getMempoolEntryRequest := request.(*appmessage.GetMempoolEntryRequestMessage)
|
||||||
|
|
||||||
|
transactionID, err := transactionid.FromString(getMempoolEntryRequest.TxID)
|
||||||
|
if err != nil {
|
||||||
|
errorMessage := &appmessage.GetMempoolEntryResponseMessage{}
|
||||||
|
errorMessage.Error = appmessage.RPCErrorf("Transaction ID could not be parsed: %s", err)
|
||||||
|
return errorMessage, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
transaction, ok := context.Domain.MiningManager().GetTransaction(transactionID)
|
||||||
|
if !ok {
|
||||||
|
errorMessage := &appmessage.GetMempoolEntryResponseMessage{}
|
||||||
|
errorMessage.Error = appmessage.RPCErrorf("Transaction %s was not found", transactionID)
|
||||||
|
return errorMessage, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
transactionVerboseData, err := context.BuildTransactionVerboseData(
|
||||||
|
transaction, getMempoolEntryRequest.TxID, nil, "")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return appmessage.NewGetMempoolEntryResponseMessage(transaction.Fee, transactionVerboseData), nil
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ func TestTxRelay(t *testing.T) {
|
|||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
_, err := payee.rpcClient.GetMempoolEntry(txID)
|
_, err := payee.rpcClient.GetMempoolEntry(txID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "transaction is not in the pool") {
|
if strings.Contains(err.Error(), "not found") {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user