forked from bitcoin/bitcoin
-
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
Backport "candidates" from develop to v0.15.x #3282
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o long in SleepBeforePhase (dashpay#3245) * Do not sleep at the last block of the phase, it's not safe * Refactor it a bit to make it clearer what's going on here * Stop sleeping if blocks came faster than we expected
… txes (dashpay#3246) * Move PS mixing entry verification on masternodes into `AddEntry()` Also streamline logic a bit and drop unused/excessive parts. * Unify PS checks among masternodes and clients * No need to re-check outputs over and over again * No need to count, fail early if any output is missing * No need to look any further once we found the input we expected A tx with duplicate inputs would be considered invalid anyway and we also know there are no duplicates because we just verified the final tx above. Also drop an unused variable. * Unify LogPrint-s * Drop human-readable strings for unused PoolMessage-s * Apply suggestions from code review Co-Authored-By: PastaPastaPasta <[email protected]> * Re-introduce zero-fee checks * fix log * Move all txin/txout verification logic shared by CPrivateSendClientSession::SignFinalTransaction() and CPrivateSendServer::AddEntry() into CPrivateSendBaseSession::IsValidInOuts() * fix nit * Add missing return * Use CCoinsViewMemPool instead of doing it manually Co-authored-by: PastaPastaPasta <[email protected]> Co-authored-by: Alexander Block <[email protected]>
* Push islock invs when syncing mempool * Send islock invs right away instead of stacking them for later
* Sync mempool from other nodes on start * Add `-syncmempool` cmd-line option to be able to disable mempool sync if needed * Only sync mempool with outbound peers Co-authored-by: Alexander Block <[email protected]>
…tesend.cpp (dashpay#3253) * move privatesend rpc methods from masternode.cpp to new privatesend.cpp Signed-off-by: Pasta <[email protected]> * add ifdef ENABLE_WALLET check for wallet.h import Signed-off-by: Pasta <[email protected]> * actually register privatesend rpc Signed-off-by: Pasta <[email protected]> * add dropped help text and change some weird spacing below Signed-off-by: Pasta <[email protected]>
…sired amount of outbound nodes (dashpay#3255)
* Fix pull request detection on Gitlab CI * Fix CI_COMMIT_BEFORE_SHA
…3258) * build: use osslsigncode 2.0 in gitian The original osslsigncode project (https://sourceforge.net/projects/osslsigncode/) has been marked as abandonware, "This is now - and has been for a long while - abandonware. Feel free to create your own forks etc.". However, a fork at https://github.com/mtrojnar/osslsigncode has emerged that has incorporated theuni's patches, updated the tool to work with OpenSSL 1.1 and made other improvements. This commit switches the windows signer descriptor to use this new version of osslsigncode. * Fixed wget call in gitian-build.py Co-authored-by: Michael <[email protected]> Co-authored-by: willyk <[email protected]>
This should have been "> 4" as otherwise it bails out when the height is specified.
* Wait a little bit longer in wallet-encryption.py The timed wallet locking is happening by an asynchronous task internally, which means that it might need a little bit longer then the specified timeout. * Add workaround for p2p-versionbits-warnings.py until we backport bitcoin#12264
This avoids spamming logs with "note: parameter passing for argument of type " warnings.
* Tweak few more strings re mixing and balances * "Fully mixed"/"mixed" -> "PrivateSend" * Apply suggestions from code review Co-Authored-By: PastaPastaPasta <[email protected]> Co-authored-by: PastaPastaPasta <[email protected]>
…ested at some point (dashpay#3267) This fixes crashes e.g. when user decided to shutdown while rescanning the wallet
…old caches (dashpay#3280) * Don't load caches when blocks/chainstate was not present * Delete old cache files when we decided to not load them * Make sure cache files are of the exact format we expected them to be, flush empty objects into them instead of deleting files naively * Streamline logic a bit, rename fIgnoreCacheFiles to fLoadCacheFiles Co-authored-by: UdjinM6 <[email protected]>
codablock
approved these changes
Jan 10, 2020
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
FYI, removed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/dashpay/dash/pulls?q=is%3Apr+label%3Abackport-candidate-15.x+is%3Aclosed