Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't swallow orphan errors (#1581)

Browse Source 
Co-authored-by: Svarog <feanorr@gmail.com>
This commit is contained in:
Ori Newman 2021-03-09 12:30:35 +02:00 committed by GitHub
parent 53781eed4d
commit c084c69771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
domain/miningmanager/mempool/mempool.go
View File

@ -771,7 +771,7 @@ func (mp *mempool) maybeAcceptTransaction(tx *consensusexternalapi.DomainTransac
// no transactions were moved from the orphan pool to the mempool.
//
// This function MUST be called with the mempool lock held (for writes).
func (mp *mempool) processOrphans(acceptedTx *consensusexternalapi.DomainTransaction) []*txDescriptor {
func (mp *mempool) processOrphans(acceptedTx *consensusexternalapi.DomainTransaction) ([]*txDescriptor, error) {
var acceptedTxns []*txDescriptor
// Start with processing at least the passed transaction.
@ -806,6 +806,11 @@ func (mp *mempool) processOrphans(acceptedTx *consensusexternalapi.DomainTransac
missing, txD, err := mp.maybeAcceptTransaction(
tx, false)
if err != nil {
if !errors.As(err, &RuleError{}) {
return nil, err
}
log.Warnf("Invalid orphan transaction: %s", err)
// The orphan is now invalid, so there
// is no way any other orphans which
// redeem any of its outputs can be
@ -847,7 +852,7 @@ func (mp *mempool) processOrphans(acceptedTx *consensusexternalapi.DomainTransac
mp.removeOrphanDoubleSpends(txDescriptor.DomainTransaction)
}
return acceptedTxns
return acceptedTxns, nil
}
// ProcessTransaction is the main workhorse for handling insertion of new
@ -879,7 +884,11 @@ func (mp *mempool) ValidateAndInsertTransaction(tx *consensusexternalapi.DomainT
// transaction (they may no longer be orphans if all inputs
// are now available) and repeat for those accepted
// transactions until there are no more.
newTxs := mp.processOrphans(tx)
newTxs, err := mp.processOrphans(tx)
if err != nil {
return err
}
acceptedTxs := make([]*txDescriptor, len(newTxs)+1)
// Add the parent transaction first so remote nodes
@ -980,7 +989,11 @@ func (mp *mempool) HandleNewBlockTransactions(txs []*consensusexternalapi.Domain
return nil, errors.Wrapf(err, "Failed removing tx from mempool: %s", consensushashing.TransactionID(tx))
}
mp.removeOrphan(tx, false)
acceptedOrphans := mp.processOrphans(tx)
acceptedOrphans, err := mp.processOrphans(tx)
if err != nil {
return nil, err
}
for _, acceptedOrphan := range acceptedOrphans {
acceptedTxs = append(acceptedTxs, acceptedOrphan.DomainTransaction)
}