Sync with the main repo#110
Merged
Merged
Conversation
Instead of having different buttons or changing button behavior for making a PSBT, just have SendConfirmationDialog return whether the user wants a PSBT or a broadcasted transaction. Since this dialog is used by both the bumpFeeAction and the SendCoinsDialog, changes to both to support the different behavior is needed. They will check the return value of the SendConfirmationDialog for whether a PSBT needs to be created instead of checking whether private keys are disabled. Strings used in this dialog are being slightly modified to work with both private keys enabled and disabled wallets.
* fix English in release notes * Simplify `switch` to `if`.
This will help to increase `Sock` usage and make more code mockable.
Change `CConnman::ListenSocket` to use a pointer to `Sock` instead of a bare `SOCKET` and use `Sock::Accept()` instead of bare `accept()`. This will help mocking / testing / fuzzing more code.
Change `CConnman::CreateNodeFromAcceptedSocket()` to take a `Sock` argument instead of `SOCKET`. This makes the method mockable and also a little bit shorter as some `CloseSocket()` calls are removed (the socket will be closed automatically by the `Sock` destructor on early return).
During a reorg, we re-check timelocks on all mempool entries using CheckSequenceLocks(useExistingLockPoints=false) and remove any now-invalid entries. CheckSequenceLocks() also mutates the LockPoints passed in, and we update valid entries' LockPoints using update_lock_points. Thus, update_lock_points(lp) needs to be called right after CheckSequenceLocks(lp), otherwise we lose the data in lp. commit bedf246 introduced a bug by separating those two loops.
Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
Using 2 different scripts is unnecessary complication Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
This simplifies the code, and slightly speeds up the test.
Running `./test/functional/test_runner.py -j15 $(printf 'feature_fee_estimation %.0s' {1..15})`
on master 3 times gives:
- Before:
ALL | ✓ Passed | 788 s (accumulated)
ALL | ✓ Passed | 818 s (accumulated)
ALL | ✓ Passed | 873 s (accumulated)
- After:
ALL | ✓ Passed | 763 s (accumulated)
ALL | ✓ Passed | 798 s (accumulated)
ALL | ✓ Passed | 731 s (accumulated)
Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
We don't need dust outputs anymore. Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
Followups to #22539 Co-Authored-By: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
Goal along with namespacing PR #23497 is to have src/node/ code in
node:: namespace in libbitcoin_node.a library
-BEGIN VERIFY SCRIPT-
bash -c ' # Bash shell needed for brace expansion {a,b}
git mv build_msvc/libbitcoin_{server,node}
git mv build_msvc/libbitcoin_node/libbitcoin_{server,node}.vcxproj.in
ren() { git grep -l "$1" src build_msvc | xargs sed -i "s/$1/$2/g"; }
ren LIBBITCOIN_{SERVER,NODE}
ren libbitcoin_{server,node}
'
-END VERIFY SCRIPT-
This was forgotten in commit 3ac3805
This reverts commit 08cb175.
This reverts commit 56c2ae3.
This reverts commit 96dd04d.
This reverts commit e850e51.
This reverts commit 9a1f924.
This reverts commit d3dc7ca.
QML features are mentioned in the `qt.mk` file explicitly for easy reference. The only exception is the qml-jit feature, the availability of which depends on the host platform.
To use the `QStringLiteral` macro, the `QString` header should be included, that is done already.
This incorporates the new bitcoin-qt init implementation into the qml-gui.
-BEGIN VERIFY SCRIPT- QML_FILES=$(git ls-files '*.qml') sed -i -e 's/import QtQuick 2.12/import QtQuick 2.15/' -- $QML_FILES sed -i -e 's/import QtQuick.Controls 2.12/import QtQuick.Controls 2.15/' -- $QML_FILES sed -i -e 's/import QtQuick.Layouts 1.11/import QtQuick.Layouts 1.15/' -- $QML_FILES -END VERIFY SCRIPT-
- This commit uses the function added in previous commit to display the working progress bar in GUI - This commit also removes the tempory mouseClick event which used to change the progress meter when clicked.
Contributor
|
Guix hashes, mine match @hebasto |
jarolrod
reviewed
Jan 11, 2022
Contributor
jarolrod
left a comment
jarolrod
left a comment
There was a problem hiding this comment.
ACK dbf77f2
Performed my own sync as well as tested this sync. Additionally hashes are reproducible
johnny9
pushed a commit
to johnny9/bitcoin-core-app
that referenced
this pull request
Jul 4, 2025
Pull request description: Sync with the main repo up to bitcoin/bitcoin@2e01b69. The only merge conflict observed was for the _"build, qml: Add qtdeclarative module"_ commit. The 4b0dbda9be63de7fdf91ca5b40dcb6c0239b6ccf commit from bitcoin-core/gui-qml#104 has been dropped as the same commit already present in main repo. #### Guix builds: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum b8be4bdd1326934dfee95c33de66c21e67b28e47467f83d424697580d5fbf5bd guix-build-c1085593bce4/output/aarch64-linux-gnu/SHA256SUMS.part e2f9e24ae43239c1fd28457f37d899cabc390111b801c614f02370be79e6ad81 guix-build-c1085593bce4/output/aarch64-linux-gnu/bitcoin-c1085593bce4-aarch64-linux-gnu-debug.tar.gz 02e2dc8ae5e5ef1dff3ebe846bc9a31b504eab6a50f8c94eaddf5d9b3b6f901c guix-build-c1085593bce4/output/aarch64-linux-gnu/bitcoin-c1085593bce4-aarch64-linux-gnu.tar.gz ab2e34cd50e1c451acf08adfb534c9ce79c80a16f4e8ccc216fb1e76a9339970 guix-build-c1085593bce4/output/arm-linux-gnueabihf/SHA256SUMS.part 448e15da6ea237a872f86658c323bd183f1e6abfb4fc76083c6aa05337ba14e0 guix-build-c1085593bce4/output/arm-linux-gnueabihf/bitcoin-c1085593bce4-arm-linux-gnueabihf-debug.tar.gz 6e90c732e780d342dc27976d22dd9ece48acfbb55636b4e1e75932b7f4e33115 guix-build-c1085593bce4/output/arm-linux-gnueabihf/bitcoin-c1085593bce4-arm-linux-gnueabihf.tar.gz 1505c27a5d9da2c8b36c8119e4d67349b63d45712d9d013243fb896554a0d3dc guix-build-c1085593bce4/output/dist-archive/bitcoin-c1085593bce4.tar.gz 39f6d6dfa7d8cba68d9d5864bbbf9b6f23c5edc57042c2d8368bc964582cd046 guix-build-c1085593bce4/output/powerpc64-linux-gnu/SHA256SUMS.part 90c11353950ef9094c9114f4a07e33c0bcfd5f326365c34a2252d33a2b645310 guix-build-c1085593bce4/output/powerpc64-linux-gnu/bitcoin-c1085593bce4-powerpc64-linux-gnu-debug.tar.gz 48cbf845bc642ad9890d6850802c47c2635de4ebc1183f6fc41348c07d75834d guix-build-c1085593bce4/output/powerpc64-linux-gnu/bitcoin-c1085593bce4-powerpc64-linux-gnu.tar.gz edeca7c90c376f391a7705d0ba6062abe0b81b1d10447ce86b553d7f85e542e6 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/SHA256SUMS.part d78cef566e68a09881556953f140440cd2493807aa7e3a341bb399fdf2c35ee0 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/bitcoin-c1085593bce4-powerpc64le-linux-gnu-debug.tar.gz 8050ec4e63679463429a54b719230f2e23919665748657398fc458c27db0fa80 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/bitcoin-c1085593bce4-powerpc64le-linux-gnu.tar.gz 2e9833c8bc465353c03640d7ed5c0d0de1bbeb0745b76cd1c52547ad23303316 guix-build-c1085593bce4/output/riscv64-linux-gnu/SHA256SUMS.part 07a8fafcaba6edaf4943cbf6fcbf70e9da45bc0e8031e0007c7cb565c3e259be guix-build-c1085593bce4/output/riscv64-linux-gnu/bitcoin-c1085593bce4-riscv64-linux-gnu-debug.tar.gz ee030ef4bad501ebdf50f374738d8c0b83145d7f7f6f11ec1d86ca267351624a guix-build-c1085593bce4/output/riscv64-linux-gnu/bitcoin-c1085593bce4-riscv64-linux-gnu.tar.gz 1d9226bbe044dd7b979d3766184e89d87a49b4ef60a5e8ac8a2f3d21c1384db1 guix-build-c1085593bce4/output/x86_64-apple-darwin/SHA256SUMS.part 75bc738c81906518ce48a52256c7f386fee34424aec79078ea071fbba52e2ae3 guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx-unsigned.dmg cdeccdb89e6795eec492b5e698b5a8de6f99e0f8ec1440a5999b18bcf231311c guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx-unsigned.tar.gz 01cb5e622f108becfa67339f38fb39ff364a799a8a330c3ca15b787eb450c7ad guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx64.tar.gz cdf362f3b81e6abdefa27b3f34432cbf074ea385c3ddb9f1eef29a41a3c0a1e4 guix-build-c1085593bce4/output/x86_64-linux-gnu/SHA256SUMS.part fe79636424053475ce37a6cce54459de0797e6631d0e2e800f7082b676b8b79d guix-build-c1085593bce4/output/x86_64-linux-gnu/bitcoin-c1085593bce4-x86_64-linux-gnu-debug.tar.gz 506b570dda87af0f7f65c94b3ad87ca57adef7e8ed6dcbb0f37d01613b8b12c7 guix-build-c1085593bce4/output/x86_64-linux-gnu/bitcoin-c1085593bce4-x86_64-linux-gnu.tar.gz 250dc27da195d66779e0fea02afb7eb82c7befbeaa8bef5d33e3a58a18d954f8 guix-build-c1085593bce4/output/x86_64-w64-mingw32/SHA256SUMS.part 1c1b8d51220128372b89f68a9a2e47d2cd24701438496fb4620c6ff54c02c1f9 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win-unsigned.tar.gz 80527e47bd5a79cc44cd0da75bb6419fe1ced235685c8ee6325bca84f6107d96 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64-debug.zip 690663654a462b5b3e38d56c5c8152e007cd182d5ed91248bcedba442333a822 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64-setup-unsigned.exe 1b7527af4d69db1a23b0ecb976196bf877b50bb69caaa325ba13ea579e2574fb guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64.zip ``` [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/110) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/110) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/110) ACKs for top commit: jarolrod: ACK c108559 Tree-SHA512: 4e8de639071d5a53087794c6ff832134659cfa5689cee5b54280e9b8f6f7bbc44ea2c1cf9be852fb4319d8d0f43af3b2d4478126c98500b7e406432db92787a9
tx-signer450
added a commit
to tx-signer450/gui-qml
that referenced
this pull request
Oct 20, 2025
Pull request description: Sync with the main repo up to bitcoin/bitcoin@2e01b69. The only merge conflict observed was for the _"build, qml: Add qtdeclarative module"_ commit. The 4b0dbda9be63de7fdf91ca5b40dcb6c0239b6ccf commit from bitcoin-core/gui-qml#104 has been dropped as the same commit already present in main repo. #### Guix builds: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum b8be4bdd1326934dfee95c33de66c21e67b28e47467f83d424697580d5fbf5bd guix-build-c1085593bce4/output/aarch64-linux-gnu/SHA256SUMS.part e2f9e24ae43239c1fd28457f37d899cabc390111b801c614f02370be79e6ad81 guix-build-c1085593bce4/output/aarch64-linux-gnu/bitcoin-c1085593bce4-aarch64-linux-gnu-debug.tar.gz 02e2dc8ae5e5ef1dff3ebe846bc9a31b504eab6a50f8c94eaddf5d9b3b6f901c guix-build-c1085593bce4/output/aarch64-linux-gnu/bitcoin-c1085593bce4-aarch64-linux-gnu.tar.gz ab2e34cd50e1c451acf08adfb534c9ce79c80a16f4e8ccc216fb1e76a9339970 guix-build-c1085593bce4/output/arm-linux-gnueabihf/SHA256SUMS.part 448e15da6ea237a872f86658c323bd183f1e6abfb4fc76083c6aa05337ba14e0 guix-build-c1085593bce4/output/arm-linux-gnueabihf/bitcoin-c1085593bce4-arm-linux-gnueabihf-debug.tar.gz 6e90c732e780d342dc27976d22dd9ece48acfbb55636b4e1e75932b7f4e33115 guix-build-c1085593bce4/output/arm-linux-gnueabihf/bitcoin-c1085593bce4-arm-linux-gnueabihf.tar.gz 1505c27a5d9da2c8b36c8119e4d67349b63d45712d9d013243fb896554a0d3dc guix-build-c1085593bce4/output/dist-archive/bitcoin-c1085593bce4.tar.gz 39f6d6dfa7d8cba68d9d5864bbbf9b6f23c5edc57042c2d8368bc964582cd046 guix-build-c1085593bce4/output/powerpc64-linux-gnu/SHA256SUMS.part 90c11353950ef9094c9114f4a07e33c0bcfd5f326365c34a2252d33a2b645310 guix-build-c1085593bce4/output/powerpc64-linux-gnu/bitcoin-c1085593bce4-powerpc64-linux-gnu-debug.tar.gz 48cbf845bc642ad9890d6850802c47c2635de4ebc1183f6fc41348c07d75834d guix-build-c1085593bce4/output/powerpc64-linux-gnu/bitcoin-c1085593bce4-powerpc64-linux-gnu.tar.gz edeca7c90c376f391a7705d0ba6062abe0b81b1d10447ce86b553d7f85e542e6 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/SHA256SUMS.part d78cef566e68a09881556953f140440cd2493807aa7e3a341bb399fdf2c35ee0 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/bitcoin-c1085593bce4-powerpc64le-linux-gnu-debug.tar.gz 8050ec4e63679463429a54b719230f2e23919665748657398fc458c27db0fa80 guix-build-c1085593bce4/output/powerpc64le-linux-gnu/bitcoin-c1085593bce4-powerpc64le-linux-gnu.tar.gz 2e9833c8bc465353c03640d7ed5c0d0de1bbeb0745b76cd1c52547ad23303316 guix-build-c1085593bce4/output/riscv64-linux-gnu/SHA256SUMS.part 07a8fafcaba6edaf4943cbf6fcbf70e9da45bc0e8031e0007c7cb565c3e259be guix-build-c1085593bce4/output/riscv64-linux-gnu/bitcoin-c1085593bce4-riscv64-linux-gnu-debug.tar.gz ee030ef4bad501ebdf50f374738d8c0b83145d7f7f6f11ec1d86ca267351624a guix-build-c1085593bce4/output/riscv64-linux-gnu/bitcoin-c1085593bce4-riscv64-linux-gnu.tar.gz 1d9226bbe044dd7b979d3766184e89d87a49b4ef60a5e8ac8a2f3d21c1384db1 guix-build-c1085593bce4/output/x86_64-apple-darwin/SHA256SUMS.part 75bc738c81906518ce48a52256c7f386fee34424aec79078ea071fbba52e2ae3 guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx-unsigned.dmg cdeccdb89e6795eec492b5e698b5a8de6f99e0f8ec1440a5999b18bcf231311c guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx-unsigned.tar.gz 01cb5e622f108becfa67339f38fb39ff364a799a8a330c3ca15b787eb450c7ad guix-build-c1085593bce4/output/x86_64-apple-darwin/bitcoin-c1085593bce4-osx64.tar.gz cdf362f3b81e6abdefa27b3f34432cbf074ea385c3ddb9f1eef29a41a3c0a1e4 guix-build-c1085593bce4/output/x86_64-linux-gnu/SHA256SUMS.part fe79636424053475ce37a6cce54459de0797e6631d0e2e800f7082b676b8b79d guix-build-c1085593bce4/output/x86_64-linux-gnu/bitcoin-c1085593bce4-x86_64-linux-gnu-debug.tar.gz 506b570dda87af0f7f65c94b3ad87ca57adef7e8ed6dcbb0f37d01613b8b12c7 guix-build-c1085593bce4/output/x86_64-linux-gnu/bitcoin-c1085593bce4-x86_64-linux-gnu.tar.gz 250dc27da195d66779e0fea02afb7eb82c7befbeaa8bef5d33e3a58a18d954f8 guix-build-c1085593bce4/output/x86_64-w64-mingw32/SHA256SUMS.part 1c1b8d51220128372b89f68a9a2e47d2cd24701438496fb4620c6ff54c02c1f9 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win-unsigned.tar.gz 80527e47bd5a79cc44cd0da75bb6419fe1ced235685c8ee6325bca84f6107d96 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64-debug.zip 690663654a462b5b3e38d56c5c8152e007cd182d5ed91248bcedba442333a822 guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64-setup-unsigned.exe 1b7527af4d69db1a23b0ecb976196bf877b50bb69caaa325ba13ea579e2574fb guix-build-c1085593bce4/output/x86_64-w64-mingw32/bitcoin-c1085593bce4-win64.zip ``` [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/110) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/110) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/110) ACKs for top commit: jarolrod: ACK c1085593bce4 Tree-SHA512: 4e8de639071d5a53087794c6ff832134659cfa5689cee5b54280e9b8f6f7bbc44ea2c1cf9be852fb4319d8d0f43af3b2d4478126c98500b7e406432db92787a9
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Sync with the main repo up to bitcoin/bitcoin@2e01b69.
The only merge conflict observed was for the "build, qml: Add qtdeclarative module" commit.
The 4b0dbda commit from #104 has been dropped as the same commit already present in main repo.
Guix builds: