-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Also consider txindex for transactions in AlreadyHave() #3126
Also consider txindex for transactions in AlreadyHave() #3126
Conversation
This avoids many false negatives where TXs are announced to us which are already mined and then were spent later.
d0eb676
to
82b81d8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
@@ -240,6 +240,10 @@ bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockF | |||
return WriteBatch(batch, true); | |||
} | |||
|
|||
bool CBlockTreeDB::HasTxIndex(const uint256& txid) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the {
down to the next line)
@@ -121,6 +121,7 @@ class CBlockTreeDB : public CDBWrapper | |||
bool ReadLastBlockFile(int &nFile); | |||
bool WriteReindexing(bool fReindex); | |||
bool ReadReindexing(bool &fReindex); | |||
bool HasTxIndex(const uint256 &txid); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, I understand you are replicating surrounding code, but according to clang, it should be:
bool HasTxIndex(const uint256 &txid); | |
bool HasTxIndex(const uint256& txid); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
After some discussion on Slack I'm leaning towards merging it as is in this specific case. |
This avoids many false negatives where TXs are announced to us which are already mined and then were spent later.
This avoids many false negatives where TXs are announced to us which are already mined and then were spent later.
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits) [v0.14.0.x] Update release notes with change log (dashpay#3213) [v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203) Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100) Fix compile issues Merge bitcoin#11397: net: Improve and document SOCKS code Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184) Update activemn if protx info changed (dashpay#3176) Actually update spent index on DisconnectBlock (dashpay#3167) Only track last seen time instead of first and last seen time (dashpay#3165) Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161) Simulate BlockConnected/BlockDisconnected for PS caches Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144) Various fixes for mixing queues (dashpay#3138) Also consider txindex for transactions in AlreadyHave() (dashpay#3126) Ignore recent rejects filter for locked txes (dashpay#3124) Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121) Update/modernize macOS plist (dashpay#3074) Fix bip69 vs change position issue (dashpay#3063) Partially revert 3061 (dashpay#3150) Fix SelectCoinsMinConf to allow instant respends (dashpay#3061) ... # Conflicts: # configure.ac # doc/man/biblepay-cli.1 # doc/man/biblepay-qt.1 # doc/man/biblepay-tx.1 # doc/man/biblepayd.1 # doc/release-notes.md # src/clientversion.h # src/wallet/wallet.cpp
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.