[v0.14.0.x] Backport pending PRs from develop into v14 #3202
Conversation
This file contains hidden or 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
* Modify tests to check for instant respends This should fail atm... * Fix SelectCoinsMinConf to allow instant respends Now tests should pass again.
Turned out that this causes SelectCoinsMinConf to (unnecessary) lean towards selecting mempool txes which can cause "too long mempool chain" error even when there are more funds to spend.
* Fix bip69 vs change position issue * Drop `setbip69enabled` rpc
* Use 4-digit version numbers for macOS bundles * Drop deprecated CFBundleGetInfoString and use NSHumanReadableCopyright instead
UdjinM6
previously approved these changes
Nov 18, 2019
* Ignore recent rejects filter for locked txes If we had a conflicting tx in the mempool before the locked tx arrived and the locked one arrived before the corresponding islock (i.e. we don't really know it's the one that should be included yet), the locked one is going to be rejected due to a mempool conflict. The old tx is going to be removed from the mempool by an incoming islock a bit later, however, we won't be able to re-request the locked tx until the tip changes because of the recentRejects filter. This patch fixes it. * Add some explanation
This avoids many false negatives where TXs are announced to us which are already mined and then were spent later.
* Always check for expired queues on masternodes * Check if a queue is too old or too far into the future Instead of only checking that it's to old * Check that no masternode can spam us with dsqs regardless of dsq readiness
* Fix cache usage in SelectCoinsGroupedByAddresses * Reset cache flags in SelectCoinsGroupedByAddresses when a block is (dis)connected * MakeCollateralAmounts should call SelectCoinsGroupedByAddresses with a limited number of inputs
…shpay#3161) a0daea4 [build] depends macOS: point --sysroot to SDK (Sjors Provoost) Pull request description: Fixes errors like `fatal error: 'unistd.h' file not found` when building depends on macOS. Replaces bitcoin#14352 (which doesn't work on Catalina). ACKs for top commit: jonasschnelli: utACK a0daea4 Tree-SHA512: 995b1e1e84e635b32d1d4038bc63730c94a7c318b7240f6d62825977e5c97fe52c5aa5a0f39070beb0df8271dd294b36d6b5cf7f09ad07494fb15d5bd4d77f68
…y#3165) This avoids timeouts on parts of the network
* Update activemn if protx info changed * Add `==` and `!=` operators to CDeterministicMNState * Only re-init active MN if its IP changed, changes to payout, voting etc. can be done without it * Test `masternode status` updates * Don't track mnListEntry anymore and instead get the DMN on demand * Revert "Add `==` and `!=` operators to CDeterministicMNState" This reverts commit fba4687.
…shpay#3184) * From 2 best sets with the same `nTotal` in ApproximateBestSubset prefer the one with less inputs * There is no reason to run ApproximateBestSubset again if nMinChange is 0 * Apply review suggestions
22f816e net: Improve and document SOCKS code (Wladimir J. van der Laan) Pull request description: Make the SOCKS code more consistent, and document the constants used. Tree-SHA512: 1bb04fcd6aacb6bfd2c54989d8298c892036466a895efb88be36fbace041af67c964ae0f5fb76c96f813f20a040109de4e0aac49a20844640e4d7633fcb22f25
"subtractFeeFromOutputs" is applied to the ordering of the input transaction and after that BIP69 sorting is performed. This causes flakiness in tests.
codablock
force-pushed
the
pr_v14_backports
branch
from
def8360 to
c0dda38
Compare
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.
These are all PRs which currently have the
backport-candidate-14.0.xlabel set.