Byron Hambly
cd652e5472
Merge a697a3fc91 into merged_master (Bitcoin PR bitcoin/bitcoin#24653 )
2024-02-02 14:50:04 +02:00
Byron Hambly
4ab553e1b3
Merge 65e9ca2278 into merged_master (Bitcoin PR bitcoin/bitcoin#24555 )
2024-02-02 12:12:43 +02:00
Byron Hambly
9f081a556e
Merge 0a14a16efe into merged_master (Bitcoin PR bitcoin/bitcoin#24625 )
2024-02-02 12:01:42 +02:00
Byron Hambly
7629e72362
Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626 )
2024-02-02 11:54:04 +02:00
Byron Hambly
43771f7217
Merge 7d0e42abce into merged_master (Bitcoin PR bitcoin/bitcoin#24658 )
2024-02-02 11:46:40 +02:00
Byron Hambly
e117c9b8ea
Merge 053499f371 into merged_master (Bitcoin PR bitcoin/bitcoin#24639 )
2024-02-02 11:39:17 +02:00
Byron Hambly
9af9536b24
Merge 213e98ca82 into merged_master (Bitcoin PR bitcoin/bitcoin#24169 )
2024-02-02 11:12:43 +02:00
James Dorfman
5e7204072c
Merge e7b6272b30 into merged_master (Bitcoin PR bitcoin/bitcoin#24636 )
2024-02-02 10:35:55 +02:00
James Dorfman
2aef7af5b6
Merge 26d98d51f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24574 )
2024-01-17 21:09:55 +00:00
James Dorfman
c3629a2443
Merge 864fb89b2f into merged_master (Bitcoin PR bitcoin/bitcoin#24637 )
2024-01-17 21:00:59 +00:00
James Dorfman
f92ae4ed86
Merge e40327d3bb into merged_master (Bitcoin PR bitcoin/bitcoin#24599 )
2024-01-17 01:48:25 +00:00
James Dorfman
92481c3833
Merge 8234cdaf62 into merged_master (Bitcoin PR bitcoin/bitcoin#24587 )
2024-01-17 01:39:36 +00:00
James Dorfman
9a80b5b628
Merge 6fee9de542 into merged_master (Bitcoin PR bitcoin/bitcoin#24508 )
2024-01-11 19:15:59 +00:00
James Dorfman
5e859b8403
Merge cea2ce09de into merged_master (Bitcoin PR bitcoin/bitcoin#24650 )
2024-01-11 19:08:04 +00:00
James Dorfman
5082ed04fd
Merge 98e9d8e8e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23732 )
2024-01-11 18:05:49 +00:00
James Dorfman
e8e87a7639
Merge cea230eec4 into merged_master (Bitcoin PR bitcoin/bitcoin#24562 )
2024-01-11 17:57:30 +00:00
James Dorfman
127a28e813
Merge ce05f838f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24635 )
2024-01-11 17:38:16 +00:00
James Dorfman
3215693c0c
Merge 30041261a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24582 )
2024-01-11 16:51:34 +00:00
James Dorfman
cc32b91393
Merge 3ab96f2945 into merged_master (Bitcoin PR bitcoin/bitcoin#24560 )
2024-01-11 16:36:11 +00:00
James Dorfman
621c6503ef
Merge f9ed0aec1b into merged_master (Bitcoin PR bitcoin-core/gui#568 )
2024-01-09 00:23:33 +00:00
James Dorfman
2c60bb8c38
Merge bc562b9ef8 into merged_master (Bitcoin PR bitcoin/bitcoin#24646 )
2024-01-09 00:15:24 +00:00
James Dorfman
a0093e2760
Merge d6f225f5c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24462 )
2024-01-09 00:06:54 +00:00
James Dorfman
fc82acc77c
Merge f05cf59d91 into merged_master (Bitcoin PR bitcoin/bitcoin#24624 )
2024-01-08 21:35:36 +00:00
James Dorfman
cb7f5f56f3
Merge 2948d6dea0 into merged_master (Bitcoin PR bitcoin/bitcoin#15423 )
2024-01-08 21:22:59 +00:00
James Dorfman
ca4e1d45b3
Merge 44dbf918d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24627 )
2024-01-08 21:14:52 +00:00
James Dorfman
82b188df34
Merge 138d55e6a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24579 )
...
In blockchain.cpp: set optional=true for 'softforks' argument in getblockchaininfo
docs.
Also removed two levels of indentation from that function (to match the associated
formatting fix in upstream).
2024-01-08 21:05:37 +00:00
James Dorfman
0ea088b896
Merge b8f498f80d into merged_master (Bitcoin PR bitcoin/bitcoin#24535 )
2024-01-08 19:52:28 +00:00
James Dorfman
aa80572b01
Merge e3206c9445 into merged_master (Bitcoin PR bitcoin/bitcoin#24605 )
...
Please review my changes in test/functional/test_framework/wallet.py.
Confirm that my change of the return value from 1 --> 2 was correct.
That fixed a failing test. I think it's needed because in elements we
have an extra fee output.
2024-01-08 19:45:18 +00:00
Byron Hambly
93ade4baa3
Merge e66630cc87 into merged_master (Bitcoin PR bitcoin/bitcoin#13226 )
2023-10-16 13:12:42 +00:00
Byron Hambly
985db294cb
Merge 91d12344b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24613 )
2023-10-16 13:03:58 +00:00
Byron Hambly
6768c48aee
Merge 6c72f3192a into merged_master (Bitcoin PR bitcoin/bitcoin#23880 )
2023-10-16 12:54:38 +00:00
Byron Hambly
4b7ad19bcb
Merge 75e34ed718 into merged_master (Bitcoin PR bitcoin/bitcoin#24601 )
2023-10-16 12:41:29 +00:00
Byron Hambly
e6077411e8
Merge ae005a647f into merged_master (Bitcoin PR bitcoin-core/gui#554 )
2023-10-16 12:31:55 +00:00
Byron Hambly
e4f868fb3a
Merge 2320d31aaa into merged_master (Bitcoin PR bitcoin/bitcoin#24608 )
2023-10-16 12:23:18 +00:00
Byron Hambly
13a3eadcc0
Merge 66e2d21ef2 into merged_master (Bitcoin PR bitcoin/bitcoin#24578 )
2023-10-16 11:55:39 +00:00
Byron Hambly
51288f4f73
Merge a7b3123fea into merged_master (Bitcoin PR bitcoin/bitcoin#24609 )
2023-10-16 11:46:33 +00:00
Byron Hambly
b2ee18db0a
Merge a17df4e876 into merged_master (Bitcoin PR bitcoin/bitcoin#24603 )
2023-10-16 11:37:55 +00:00
Byron Hambly
4edf51d8da
Merge e09cf64c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24585 )
2023-10-16 11:29:11 +00:00
Byron Hambly
4ae6b79c8f
Merge 8435d7f11a into merged_master (Bitcoin PR bitcoin/bitcoin#24597 )
2023-10-16 11:18:58 +00:00
Byron Hambly
fbd708bbca
Merge bf2c0fb2a2 into merged_master (Bitcoin PR bitcoin/bitcoin#24472 )
2023-10-16 11:10:36 +00:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
Byron Hambly
ec293ef76f
Merge aece566249 into merged_master (Bitcoin PR bitcoin-core/gui#555 )
...
This merge had a conflict in the send coins dialog, so it should be
confirmed during review that it still works correctly.
2023-10-16 10:54:11 +00:00
Byron Hambly
5f4ffe85a0
Merge 74f8c551e9 into merged_master (Bitcoin PR bitcoin/bitcoin#24553 )
2023-10-16 09:36:59 +00:00
Byron Hambly
426c048ee6
Merge d6cb4e8ff0 into merged_master (Bitcoin PR bitcoin/bitcoin#24549 )
2023-10-16 09:28:15 +00:00
Byron Hambly
8710c36d13
Merge 9b56b2e2a7 into merged_master (Bitcoin PR bitcoin/bitcoin#24588 )
2023-10-16 09:19:33 +00:00
Byron Hambly
6ac1fdb569
Merge 114754adf4 into merged_master (Bitcoin PR bitcoin/bitcoin#24519 )
2023-10-16 09:05:55 +00:00
Byron Hambly
8a8b029f97
Merge b8992f2d4a into merged_master (Bitcoin PR bitcoin/bitcoin#24592 )
2023-10-16 08:57:05 +00:00
Byron Hambly
e592d94373
Merge 3617d22562 into merged_master (Bitcoin PR bitcoin/bitcoin#14752 )
2023-10-16 08:38:28 +00:00
Byron Hambly
5255689011
Merge 4bdc990daf into merged_master (Bitcoin PR bitcoin/bitcoin#24573 )
2023-10-16 08:29:50 +00:00
Byron Hambly
f32c2f4e73
Merge e4d61d9759 into merged_master (Bitcoin PR bitcoin/bitcoin#18815 )
2023-10-16 08:21:11 +00:00
