Tom Trevethan
|
69157e67bf
|
Merge a653f4bb1f into merged_master (Bitcoin PR bitcoin/bitcoin#25934)
|
2025-03-25 14:14:08 +00:00 |
|
Tom Trevethan
|
14ed50186b
|
Merge 9052d869c9 into merged_master (Bitcoin PR bitcoin/bitcoin#26517)
|
2025-03-25 12:47:43 +00:00 |
|
Tom Trevethan
|
387af571cd
|
Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609)
|
2025-03-24 23:33:59 +00:00 |
|
Tom Trevethan
|
0dcc75c6ae
|
Merge ef744c03e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25729)
|
2025-03-24 15:11:44 +00:00 |
|
Tom Trevethan
|
bf45fb4395
|
Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238)
|
2025-03-18 11:09:37 +00:00 |
|
Tom Trevethan
|
2897263ebf
|
Merge 5d9b5305af into merged_master (Bitcoin PR bitcoin/bitcoin#19888)
|
2025-03-17 13:04:28 +00:00 |
|
Tom Trevethan
|
edf22a74f8
|
Merge 2ce3d26757 into merged_master (Bitcoin PR bitcoin/bitcoin#26462)
|
2025-03-13 18:02:44 +00:00 |
|
Tom Trevethan
|
24c7805b7d
|
Merge 7734a0160d into merged_master (Bitcoin PR bitcoin/bitcoin#26640)
|
2025-03-13 16:44:09 +00:00 |
|
Tom Trevethan
|
9d59cc40da
|
Merge f0c4807a6a into merged_master (Bitcoin PR bitcoin/bitcoin#26560)
|
2025-03-13 14:07:01 +00:00 |
|
Byron Hambly
|
4f17f28214
|
Merge 38cbf43dee into merged_master (Bitcoin PR bitcoin/bitcoin#26414)
|
2025-03-05 09:36:38 +02:00 |
|
Byron Hambly
|
033dc14522
|
Merge fe8d15c907 into merged_master (Bitcoin PR bitcoin/bitcoin#26630)
|
2025-03-04 13:22:09 +02:00 |
|
Byron Hambly
|
0252ee8a86
|
Merge cac29f5cd6 into merged_master (Bitcoin PR bitcoin/bitcoin#26622)
|
2025-03-04 13:00:57 +02:00 |
|
Byron Hambly
|
da0e8310ca
|
Merge 78aee0fe2c into merged_master (Bitcoin PR bitcoin/bitcoin#26569)
|
2025-03-04 12:20:20 +02:00 |
|
Byron Hambly
|
158545ff87
|
Merge 4037478114 into merged_master (Bitcoin PR bitcoin/bitcoin#26610)
|
2025-03-04 11:51:47 +02:00 |
|
Byron Hambly
|
721ceef869
|
Merge 02515117dc into merged_master (Bitcoin PR bitcoin/bitcoin#26620)
|
2025-03-04 11:19:41 +02:00 |
|
Byron Hambly
|
92327d7b65
|
Merge a04121bdf9 into merged_master (Bitcoin PR bitcoin/bitcoin#26617)
|
2025-03-04 11:18:54 +02:00 |
|
Byron Hambly
|
073316ddaf
|
Merge e334f7a545 into merged_master (Bitcoin PR bitcoin/bitcoin#26594)
|
2025-03-04 11:18:49 +02:00 |
|
Byron Hambly
|
6274a3e6a7
|
Merge bcee94d107 into merged_master (Bitcoin PR bitcoin/bitcoin#26359)
|
2025-03-04 11:18:33 +02:00 |
|
Byron Hambly
|
809ca1e546
|
Merge 3be21060d6 into merged_master (Bitcoin PR bitcoin/bitcoin#26600)
|
2025-03-04 11:08:18 +02:00 |
|
Byron Hambly
|
b735ecc00d
|
Merge a63192afb8 into merged_master (Bitcoin PR bitcoin/bitcoin#19762)
|
2025-03-04 10:44:34 +02:00 |
|
Byron Hambly
|
98dd521b76
|
Merge d415b7261c into merged_master (Bitcoin PR bitcoin/bitcoin#26588)
|
2025-03-04 10:43:16 +02:00 |
|
Byron Hambly
|
0b0d5d214e
|
Merge 8597260872 into merged_master (Bitcoin PR bitcoin/bitcoin#26480)
|
2025-03-04 10:42:21 +02:00 |
|
Byron Hambly
|
81786bce18
|
Merge 5939794940 into merged_master (Bitcoin PR bitcoin/bitcoin#26589)
|
2025-03-03 16:39:09 +02:00 |
|
Byron Hambly
|
3ed5ae03ca
|
Merge 00c323610a into merged_master (Bitcoin PR bitcoin/bitcoin#25986)
|
2025-03-03 16:38:50 +02:00 |
|
Byron Hambly
|
f0478dd601
|
Merge 38d06e1561 into merged_master (Bitcoin PR bitcoin/bitcoin#26383)
|
2025-03-03 13:44:12 +02:00 |
|
Byron Hambly
|
8b9d41f8e7
|
Merge 1ef498f75b into merged_master (Bitcoin PR bitcoin/bitcoin#26520)
|
2025-03-03 13:37:59 +02:00 |
|
Byron Hambly
|
2ff59e9636
|
Merge 7eeae5c023 into merged_master (Bitcoin PR bitcoin/bitcoin#26553)
|
2025-03-03 13:37:53 +02:00 |
|
Byron Hambly
|
194211ebe7
|
Merge 60a00889b0 into merged_master (Bitcoin PR bitcoin/bitcoin#26545)
|
2025-03-03 12:10:32 +02:00 |
|
Byron Hambly
|
8e3be5f7b4
|
Merge 01a66e21ef into merged_master (Bitcoin PR bitcoin/bitcoin#26546)
|
2025-03-03 12:10:30 +02:00 |
|
Byron Hambly
|
483d59e533
|
Merge df2f16666c into merged_master (Bitcoin PR bitcoin/bitcoin#26508)
|
2025-03-03 12:10:24 +02:00 |
|
Byron Hambly
|
da8b6f2f7f
|
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786)
|
2025-03-03 11:12:31 +02:00 |
|
Byron Hambly
|
e7850e19b3
|
Merge aeb395dcdb into merged_master (Bitcoin PR bitcoin/bitcoin#25315)
|
2025-03-03 09:50:21 +02:00 |
|
Byron Hambly
|
b1c4442e53
|
Merge 256120d2da into merged_master (Bitcoin PR bitcoin/bitcoin#26519)
|
2025-03-03 09:49:24 +02:00 |
|
Byron Hambly
|
5c10c048e6
|
Merge 7ed2768dca into merged_master (Elements PR #1421)
|
2025-02-28 15:02:20 +02:00 |
|
Byron Hambly
|
d97db2851f
|
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730)
|
2025-02-28 14:25:06 +02:00 |
|
Byron Hambly
|
014fe79a37
|
Merge 5602cc7ccf into merged_master (Bitcoin PR bitcoin/bitcoin#16981)
|
2025-02-28 14:24:51 +02:00 |
|
Byron Hambly
|
7ea69ff0d8
|
Merge UP TO 48174c0f28 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26240)
FIXME in wallet_taproot.py functional test
1668424146 2022-11-14T12:09:06+01:00 48174c0f28 Bitcoin Merge bitcoin/bitcoin#26240: rpc: Adjust RPCTypeCheckObj error string
1668417474 2022-11-14T10:17:54+01:00 59e00c7e03 Bitcoin Merge bitcoin/bitcoin#25714: univalue: Avoid std::string copies
1668111238 2022-11-10T15:13:58-05:00 7ef730ca84 Bitcoin Merge bitcoin/bitcoin#26483: test: Don't pass add_to_wallet option to walletcreatefundedpsbt
1668004459 2022-11-09T15:34:19+01:00 9dce30194b Bitcoin Merge bitcoin/bitcoin#26472: test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py
1667992471 2022-11-09T12:14:31+01:00 44ca5d5e87 Bitcoin Merge bitcoin/bitcoin#26473: test: Avoid collision with valid path names in `getarg_tests/logargs`
1667640759 2022-11-05T10:32:39+01:00 50422b770a Bitcoin Merge bitcoin/bitcoin#26419: log: mempool: log removal reason in validation interface
1667636699 2022-11-05T09:24:59+01:00 ce57dbac90 Bitcoin Merge bitcoin/bitcoin#26449: rpc: doc: add missing option "bech32m" for `change_type` parameters
1667577253 2022-11-04T15:54:13+00:00 ae6bb6e71e Bitcoin Merge bitcoin/bitcoin#26418: Fix signing of multi_a and rawtr scripts with wallets that only have corresponding keys
|
2025-02-27 15:15:49 +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 |
|
Byron Hambly
|
7c5f4914fb
|
Merge f37bd15d47 into merged_master (Bitcoin PR bitcoin/bitcoin#25685)
FIXME introduces a new regression test to reproduce the issue commented
out in the confidential transaction functional test
|
2025-02-27 09:55:45 +02:00 |
|
Pablo Greco
|
258d9d3c87
|
feature_fedpeg: Use os.join instead of hardcoded separator
|
2025-02-23 10:19:51 -08:00 |
|
Pablo Greco
|
305de6d265
|
feature_confidential_transactions: Use system temp dir instead of hardcoded /tmp
|
2025-02-23 09:24:05 -08:00 |
|
Pablo Greco
|
cd67236c12
|
feature_discount_ct: some txs can return 2 different weights, adapt the test to it
|
2025-02-22 09:05:56 -08:00 |
|
Jon Atack
|
7f56623441
|
Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive
|
2025-02-15 00:22:57 -08:00 |
|
Byron Hambly
|
07aebbf505
|
lint: fixes
|
2025-02-14 15:54:27 +02:00 |
|
Byron Hambly
|
2f1b86e84a
|
lint: fix shellcheck, spelling, and locale
|
2025-02-13 16:08:39 +02:00 |
|
Byron Hambly
|
6f984c79ec
|
Merge 5cb3acef29 into merged_master (Elements PR #1310)
|
2025-02-13 11:10:29 +02:00 |
|
Byron Hambly
|
5cb3acef29
|
Merge pull request #1310 from GoodDaisy/master
Fix typos
|
2025-02-13 09:47:55 +02:00 |
|
Byron Hambly
|
4a8546600d
|
Merge e41b225107 into merged_master (Elements PR #1384)
|
2025-02-13 08:48:21 +02:00 |
|
Byron Hambly
|
bd5177c57a
|
Merge a259bc3693 into merged_master (Elements PR #1341)
|
2025-02-12 16:04:00 +02:00 |
|
Byron Hambly
|
1ba6aeea51
|
Merge 99c2ee7f9a into merged_master (Elements PR #1399)
|
2025-02-12 14:47:53 +02:00 |
|