Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix removing of orphan transactions #5985

Merged
merged 1 commit into from
Jun 10, 2015
Merged

Conversation

morcos
Copy link
Contributor

@morcos morcos commented Apr 8, 2015

The transaction thats being accepted can't be an orphan otherwise it would have previously been accepted, so doesn't need to be added to the erase queue. We also don't want to erase orphans that still have missing inputs.

@dgenr8
Copy link
Contributor

dgenr8 commented Apr 13, 2015

utACK

@@ -4028,6 +4027,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
}
// too-little-fee orphan
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This (pre-existing) comment is too specific to be correct.

@laanwj laanwj added the Bug label Apr 29, 2015
We don't want to erase orphans that still have missing inputs, they should still be tracked as orphans.  Also, the transaction thats being accepted can't be an orphan otherwise it would have previously been accepted, so doesn't need to be added to the erase queue.
@morcos
Copy link
Contributor Author

morcos commented May 12, 2015

Fixed comment nit and clarified commit message

@mrbandrews
Copy link
Contributor

Tested ACK

@laanwj
Copy link
Member

laanwj commented Jun 10, 2015

utACK

@laanwj laanwj merged commit 14d4eef into bitcoin:master Jun 10, 2015
laanwj added a commit that referenced this pull request Jun 10, 2015
14d4eef Fix removing of orphan transactions (Alex Morcos)
laanwj pushed a commit that referenced this pull request Jun 10, 2015
We don't want to erase orphans that still have missing inputs, they should still be tracked as orphans.  Also, the transaction thats being accepted can't be an orphan otherwise it would have previously been accepted, so doesn't need to be added to the erase queue.

Github-Pull: #5985
Rebased-From: 14d4eef
@laanwj
Copy link
Member

laanwj commented Jun 10, 2015

Cherry-picked to 0.11 branch as 37b4e42

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants