0.19: Backports #17792
Merged
0.19: Backports #17792
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
|
I can also include #17621 once it gets more reviews or gets merged. |
b6010dc to
4f895fc
Compare
|
In general I'd prefer if backport PRs weren't opened until the changes they contain are actually all merged into master (I realise there are other similar backport PRs open now, and might close them). Just because a PR has had some review or has an ACK, doesn't mean it wont need additional changes before merge; and having backport PRs open before then just guarantees more changes/noise etc. |
|
Going to reopen this when the PRs it's backporting have been merged. |
Github-Pull: bitcoin#17445 Rebased-From: 3e730bf
Github-Pull: bitcoin#16963 Rebased-From: 81ea66c
The slot BitcoinGUI::addWallet can be invoked twice for the same
WalletModel due to a concurrent wallet being loaded after the first `connect()`:
```cpp
connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet);
connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet);
for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) {
addWallet(wallet_model);
```
Github-Pull: bitcoin#16963
Rebased-From: 6d6a7a8
listsinceblock now checks that returned transactions are not conflicting with any transactions that are filtered out by the given blockhash Co-Authored-By: Michael Chrostowski <michael.chrostowski@gmail.com> Github-Pull: bitcoin#17258 Rebased-From: 436ad43
4f895fc to
d417166
Compare
|
@fanquake done. |
|
@instagibbs @adamjonas Can you check the relevant backports here. |
Github-Pull: bitcoin#17621 Rebased-From: 0950245
d417166 to
a5489c9
Compare
|
@instagibbs note that I had to change a bit because #17300 is not in 0.19 branch. |
|
88729d8 looks good |
|
a5489c9 looks right |
|
@instagibbs any idea why wallet_avoidreuse.py fails? |
|
investigating |
Github-Pull: bitcoin#17924 Rebased-From: 4b8f1e9
…esting computation Github-Pull: bitcoin#17924 Rebased-From: 6dd59d2
|
@instagibbs included #17924. |
This commit fixes build on CentOS 7 with GCC 4.8.5 Github-Pull: bitcoin#17634 Rebased-From: b66861e
Github-Pull: bitcoin#17634 Rebased-From: 98fbd1c
|
@fanquake updated OP, backport is still up to date. |
|
ACK cd67b1d, checked that I got more or less the same result (including conflict resolution) backporting these commits |
laanwj
added a commit
that referenced
this pull request
Jan 20, 2020
cd67b1d Use correct C++11 header for std::swap() (Hennadii Stepanov) b8101fb Fix comparison function signature (Hennadii Stepanov) eac4907 Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation (Gregory Sanders) e2c45d8 IsUsedDestination shouldn't use key id as script id for ScriptHash (Gregory Sanders) a5489c9 IsUsedDestination should count any known single-key address (Gregory Sanders) 88729d8 Fix issue with conflicted mempool tx in listsinceblock (Adam Jonas) eafcea7 gui: Fix duplicate wallet showing up (João Barbosa) 7e66d04 Drop signal CClientUIInterface::LoadWallet (Russell Yanofsky) 179d55f zmq: Fix due to invalid argument and multiple notifiers (João Barbosa) Pull request description: Backports - #16963 - #17445 - #17258 - #17621 - #17924 - #17634 ACKs for top commit: laanwj: ACK cd67b1d, checked that I got more or less the same result (including conflict resolution) backporting these commits Tree-SHA512: 645786267cfb10a01a56f7cfd91ddead5f1475df5714595ae480237e04d40c5cfb7460b40532279cacd83e4b775a4ace68a258ec2184b8ad0e997a690a9245e5
MarkLTZ
added a commit
to litecoinz-core/litecoinz
that referenced
this pull request
Feb 13, 2020
- [0.19] wallet: Reset reused transactions cache bitcoin#18083 - 0.19: Backports bitcoin#17792 - psbt: handle unspendable psbts bitcoin#17524 - qt: Fix comparison function signature bitcoin#17634 - psbt: check that various indexes and amounts are within bounds bitcoin#17156 - [0.19] psbt: check that various indexes and amounts are within bounds bitcoin#18079 - [0.19] Final backports for 0.19.1 bitcoin#17988 - Bug: IsUsedDestination shouldn't use key id as script id for ScriptHash bitcoin#17924 - qt: Fix deprecated QCharRef usage bitcoin#18101 - gui: Throttle GUI update pace when -reindex bitcoin#18121 - gui: Fix race in WalletModel::pollBalanceChanged bitcoin#18123 - gui: Fix unintialized WalletView::progressDialog bitcoin#18062 - Bugfix: GUI: Hide the HD/encrypt icons earlier so they get re-shown if another wallet is open bitcoin#18007 - bug-fix macos: give free bytes to F_PREALLOCATE bitcoin#17887 - test: add missing #include to fix compiler errors bitcoin#17980 - zmq: Fix due to invalid argument and multiple notifiers bitcoin#17445
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backports