diff --git a/app/rpc/rpchandlers/get_mempool_entry.go b/app/rpc/rpchandlers/get_mempool_entry.go index a0c54da5c..9bd5878d8 100644 --- a/app/rpc/rpchandlers/get_mempool_entry.go +++ b/app/rpc/rpchandlers/get_mempool_entry.go @@ -26,7 +26,7 @@ func HandleGetMempoolEntry(context *rpccontext.Context, _ *router.Router, reques mempoolTransaction, isOrphan, found := context.Domain.MiningManager().GetTransaction(transactionID, !getMempoolEntryRequest.FilterTransactionPool, getMempoolEntryRequest.IncludeOrphanPool) - if !found || isOrphan && !getMempoolEntryRequest.IncludeOrphanPool || !isOrphan && !getMempoolEntryRequest.FilterTransactionPool { + if !found || isOrphan && !getMempoolEntryRequest.IncludeOrphanPool || !isOrphan && !getMempoolEntryRequest.FilterTransactionPool { errorMessage := &appmessage.GetMempoolEntryResponseMessage{} errorMessage.Error = appmessage.RPCErrorf("Transaction %s was not found", transactionID) return errorMessage, nil diff --git a/domain/miningmanager/mempool/handle_new_block_transactions.go b/domain/miningmanager/mempool/handle_new_block_transactions.go index 96b7edaa1..344043138 100644 --- a/domain/miningmanager/mempool/handle_new_block_transactions.go +++ b/domain/miningmanager/mempool/handle_new_block_transactions.go @@ -6,7 +6,7 @@ import ( "github.com/kaspanet/kaspad/domain/consensus/utils/transactionhelper" ) -func (mp *mempool) handleNewBlockTransactions(blockTransactions []*externalapi.DomainTransaction,) ( +func (mp *mempool) handleNewBlockTransactions(blockTransactions []*externalapi.DomainTransaction) ( []*externalapi.DomainTransaction, error) { // Skip the coinbase transaction diff --git a/domain/miningmanager/mempool/mempool.go b/domain/miningmanager/mempool/mempool.go index 434673f74..6d2d7b35a 100644 --- a/domain/miningmanager/mempool/mempool.go +++ b/domain/miningmanager/mempool/mempool.go @@ -64,7 +64,7 @@ func (mp *mempool) GetTransaction(transactionID *externalapi.DomainTransactionID isOrphan = true } - return transaction, isOrphan, transactionfound + return transaction, isOrphan, transactionfound } func (mp *mempool) GetTransactionsByAddresses(includeTransactionPool bool, includeOrphanPool bool) ( diff --git a/domain/miningmanager/mempool/validate_and_insert_transaction.go b/domain/miningmanager/mempool/validate_and_insert_transaction.go index 9fb2a2c62..d06a19cea 100644 --- a/domain/miningmanager/mempool/validate_and_insert_transaction.go +++ b/domain/miningmanager/mempool/validate_and_insert_transaction.go @@ -49,12 +49,12 @@ func (mp *mempool) validateAndInsertTransaction(transaction *externalapi.DomainT return nil, err } - acceptedOrphans, err := mp.orphansPool.processOrphansAfterAcceptedTransaction(mempoolTransaction.Transaction(),) + acceptedOrphans, err := mp.orphansPool.processOrphansAfterAcceptedTransaction(mempoolTransaction.Transaction()) if err != nil { return nil, err } - acceptedTransactions = append([]*externalapi.DomainTransaction{transaction.Clone()}, acceptedOrphans...) + acceptedTransactions = append([]*externalapi.DomainTransaction{transaction.Clone()}, acceptedOrphans...) //these pointer leave the mempool, hence we clone. err = mp.transactionsPool.limitTransactionCount() if err != nil {