Commit graph

362 commits

Author SHA1 Message Date
ikripaka
cfa0e467f1
Merge 0c90fc6443 into merged_master (Bitcoin PR bitcoin/bitcoin#30731) 2026-03-20 13:46:31 +00:00
ikripaka
0aeebb2137 Fix /src/wallet/test/psbt_wallet_tests.cpp#L71 FIXME
chore:
* return psbt_wallet_tests.cpp to compilation and testing process
* change encoded psbt values into pset ones
2026-03-20 00:31:09 +00:00
ivanlele
95ebd4c750
Merge d7333ece15 into merged_master (Bitcoin PR bitcoin/bitcoin#30590) 2026-03-11 14:14:53 +00:00
ivanlele
543b143a1f
Merge 357f195391 into merged_master (Bitcoin PR bitcoin/bitcoin#30567) 2026-03-10 17:03:29 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494) 2026-02-19 16:14:46 +00:00
ivanlele
7af5f05f9f
Merge fdb41e08c4 into merged_master (Bitcoin PR bitcoin/bitcoin#29773) 2026-02-19 15:46:24 +00:00
ivanlele
a4911b7535
Merge f7b81c7e1e into merged_master (Bitcoin PR bitcoin/bitcoin#30031) 2026-02-19 15:34:28 +00:00
ivanlele
da6c76a09b
Merge 70e4d6ff1d into merged_master (Bitcoin PR bitcoin/bitcoin#30026) 2026-02-19 14:34:51 +00:00
ivanlele
f6fc03cf8f
Merge 5127844cab into merged_master (Bitcoin PR bitcoin/bitcoin#30017) 2026-02-19 14:20:06 +00:00
ivanlele
acdbe2d912
Merge 4df2d0c4ce into merged_master (Bitcoin PR bitcoin/bitcoin#29983) 2026-02-19 12:51:09 +00:00
ivanlele
0cf164e807
Merge 3aaf7328eb into merged_master (Bitcoin PR bitcoin/bitcoin#29774) 2026-02-19 09:39:53 +00:00
ivanlele
c11945b3a0
Merge 7fee0ca014 into merged_master (Bitcoin PR bitcoin/bitcoin#29976) 2026-02-19 09:37:48 +00:00
ivanlele
c8b1dfc103
Merge 948ecf181e into merged_master (Bitcoin PR bitcoin/bitcoin#29648) 2026-02-17 13:09:58 +00:00
Byron Hambly
f92413bfed
Merge 1cd2e29870 into merged_master (Bitcoin PR #29600) 2026-02-12 14:13:08 +02:00
Byron Hambly
6b2d33f64a
Merge 98f57cd198 into merged_master (Bitcoin PR bitcoin/bitcoin#29533) 2025-12-04 15:25:49 +02:00
Byron Hambly
552716245d
Merge 2f218c664b into merged_master (Bitcoin PR bitcoin/bitcoin#28921) 2025-11-18 15:12:49 +02:00
Byron Hambly
04786c72fd
Merge 019ec8a601 into merged_master (Bitcoin PR bitcoin/bitcoin#29075) 2025-11-17 15:27:31 +02:00
Byron Hambly
77b0b2dc87
Merge f0e829022a into merged_master (Bitcoin PR bitcoin/bitcoin#28967) 2025-11-17 15:27:25 +02:00
Byron Hambly
aae85bf31e
Merge ba5f16e4a1 into merged_master (Bitcoin PR bitcoin/bitcoin#29044) 2025-11-11 15:49:39 +02:00
Byron Hambly
f7993c3703
Merge 41e378a0a1 into merged_master (Bitcoin PR bitcoin/bitcoin#29045) 2025-11-11 15:49:30 +02:00
Byron Hambly
14e1699124
Merge 84bbee7b74 into merged_master (Bitcoin PR bitcoin/bitcoin#29048) 2025-11-11 15:49:26 +02:00
Byron Hambly
d19d0bbd75
Merge c7f0e97383 into merged_master (Bitcoin PR bitcoin/bitcoin#28938) 2025-11-11 11:26:20 +02:00
Byron Hambly
acb5109093
Merge f2cc718e69 into merged_master (Bitcoin PR bitcoin/bitcoin#28798) 2025-11-06 09:03:00 +02:00
Byron Hambly
64b51fed27
Merge 023e8c2001 into merged_master (Bitcoin PR bitcoin/bitcoin#28769) 2025-11-05 19:19:09 +02:00
Byron Hambly
648c1081e7
Merge 30b3477507 into merged_master (Bitcoin PR bitcoin/bitcoin#28561) 2025-08-06 15:10:15 +02:00
Byron Hambly
833114cc24 Merge b379bb2465 into merged_master (Elements PR #1459) 2025-07-18 11:45:30 +02:00
Byron Hambly
3af734391e Merge 8aa77a77e6 into merged_master (Bitcoin PR bitcoin/bitcoin#28168) 2025-07-03 12:29:20 +02:00
Byron Hambly
2a1d79e0f0 Merge 679f825ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#27479) 2025-06-28 09:46:07 +02:00
Russell O'Connor
0a0a69f315 Update Simplicity integeration
This Simplicity update has
- renamed a few types
- moved some files around
- added a minCost parameter, currently set to 0
- added a new error code
2025-06-24 11:38:08 -04:00
Byron Hambly
dfbd5fc4d5 Merge a106a86c46 into merged_master (Bitcoin PR bitcoin/bitcoin#27696) 2025-06-20 21:48:29 +02:00
Byron Hambly
ab2c05e2a1 Merge fc4bee3f19 into merged_master (Bitcoin PR bitcoin/bitcoin#27687) 2025-06-20 21:31:35 +02:00
Byron Hambly
552e758437 Merge 87d6f6c29d into merged_master (Bitcoin PR bitcoin/bitcoin#27615) 2025-06-20 16:28:12 +02:00
Byron Hambly
8b9efdd41d Merge d02df7db6b into merged_master (Bitcoin PR bitcoin/bitcoin#26715) 2025-06-20 15:44:24 +02:00
Byron Hambly
d42ed18d6e Merge 26cb32c02d into merged_master (Bitcoin PR bitcoin/bitcoin#27580) 2025-05-16 11:10:14 +02:00
Byron Hambly
80eade60f7 Merge 06fb95b51b into merged_master (Bitcoin PR bitcoin/bitcoin#27335) 2025-04-12 13:30:54 +02:00
Tom Trevethan
8a132ad63c Merge 2ec97825e7 into merged_master (Bitcoin PR bitcoin/bitcoin#26771) 2025-04-01 10:09:32 +00:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Pavol Rusnak
7470961fb0 build, qt: bump Qt5 version to 5.15.3
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch
release, Qt 5.15.3 does not add any new functionality but provides bug fixes
and other improvements.

https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md

* dropped patches:
  - patches/qt/dont_use_avx_android_x86_64.patch
  - patches/qt/fix_bigsur_style.patch
* adjusted patches:
  - patches/qt/fix_android_jni_static.patch
  - patches/qt/fix_limits_header.patch
  - patches/qt/use_android_ndk23.patch

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>

Github-Pull: bitcoin/bitcoin#24668
Rebased-From: ef20add4c9
2025-03-10 15:37:34 +00:00
Ryan Ofsky
7e7dbadf44 test: Add tests for GetArg methods / settings.json type coercion
Just add tests. No changes to application behavior. Tests will be
updated in the next commit changing & improving current behavior.

Include a Qt test for GUI startup crash reported by Rspigler in
https://github.com/bitcoin/bitcoin/issues/24457 caused by GetArg
behavior that happens if settings.json contains an integer value for any
of the configuration options which GUI settings can currently clash with
(-dbcache, -par, -spendzeroconfchange, -signer, -upnp, -natpmp, -listen,
-server, -proxy, -proxy, -onion, -onion, -lang, and -prune).

Github-Pull: bitcoin/bitcoin#24498
Rebased-From: 84b0973e35
2025-03-10 11:49:53 +00:00
Byron Hambly
7041b83eea Merge 19baf0178b into merged_master (Bitcoin PR bitcoin/bitcoin#26498) 2025-03-03 15:12:05 +02:00
Byron Hambly
5c10c048e6
Merge 7ed2768dca into merged_master (Elements PR #1421) 2025-02-28 15:02:20 +02:00
Byron Hambly
b83abdf89a
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448)
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448: test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443: doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445: .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248: refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417: test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396: net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437: test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548: gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360: build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294: build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387: p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051: Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402: doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408: test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409: refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377: test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Pablo Greco
d973e36ffa Win64 Native: Fix PACKAGE_NAME and bug report url 2025-02-23 14:34:19 -08:00
Byron Hambly
caa50f1920
Merge 077ae2d91a into merged_master (Elements PR #1408) 2025-02-13 11:10:23 +02:00
Pablo Greco
e3011270b8 Win64: set the right TargetName in native builds 2025-02-12 11:16:14 -08:00
Byron Hambly
c8eb5b8cc1
Merge bd551ad186 into merged_master (Elements PR #1393) 2025-02-11 15:50:38 +02:00
Pablo Greco
d1a9ff3478 Win64 native: fix build with simplicity 2025-02-07 13:09:38 -08:00
Pablo Greco
0b40e25beb Win64 native: fix build before simplicity 2025-02-07 13:09:24 -08:00
Pablo Greco
5194a62393 Win64 native: disable psbt_wallet_test just like in Makefile 2025-02-07 05:03:14 -08:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00