Commit graph

37087 commits

Author SHA1 Message Date
Byron Hambly
e6cdd99eec Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206) 2023-05-31 09:12:07 +00:00
Byron Hambly
1f15f80bcd Merge 681b25e3cd into merged_master (Bitcoin PR bitcoin/bitcoin#23152) 2023-05-31 08:21:29 +00:00
Byron Hambly
eabd7f95ac Merge 0d7ecd5bef into merged_master (Bitcoin PR bitcoin/bitcoin#23583) 2023-05-31 08:13:48 +00:00
Byron Hambly
1d3d2f94f6 Merge 76392b042e into merged_master (Bitcoin PR bitcoin/bitcoin#22829) 2023-05-31 07:59:10 +00:00
James Dorfman
d6b64dd58b Merge 791dd1f41e into merged_master (Bitcoin PR bitcoin/bitcoin#23538) 2023-05-31 07:04:30 +00:00
James Dorfman
4e3aa4b8ea Merge 9facad0da6 into merged_master (Bitcoin PR bitcoin-core/gui#477) 2023-05-31 06:52:27 +00:00
James Dorfman
7778d6ada6 Merge 4cc998ce9d into merged_master (Bitcoin PR bitcoin/bitcoin#23580) 2023-05-31 06:44:16 +00:00
James Dorfman
c134b5a012 Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512) 2023-05-31 06:23:55 +00:00
James Dorfman
143277771e Merge 64059b78f5 into merged_master (Bitcoin PR bitcoin/bitcoin#21943) 2023-05-31 06:00:02 +00:00
James Dorfman
3f7655eb32 Merge 9394964f6b into merged_master (Bitcoin PR bitcoin/bitcoin#23451) 2023-05-30 20:46:28 +00:00
Byron Hambly
3f0bf16b6a Merge 73ac195e29 into merged_master (Bitcoin PR bitcoin/bitcoin#23249) 2023-05-30 15:47:52 +00:00
Byron Hambly
002abaf5a3 Merge 4018e23aa7 into merged_master (Bitcoin PR bitcoin/bitcoin#23573) 2023-05-30 15:39:59 +00:00
Byron Hambly
eee64b5289 Merge 95d19f8c1a into merged_master (Bitcoin PR bitcoin/bitcoin#16807)
I did not do a great job with this merge, and it could use some
improvement. Commented out some of the assertions in
rpc_invalid_address_message.py
2023-05-30 15:27:30 +00:00
Byron Hambly
df90beee7d Merge ee7e061563 into merged_master (Bitcoin PR bitcoin/bitcoin#23557) 2023-05-29 13:25:34 +00:00
Byron Hambly
b50c367ff6 Merge 3a36ec83d0 into merged_master (Bitcoin PR bitcoin/bitcoin#23521) 2023-05-29 13:17:22 +00:00
Byron Hambly
00f2e32c8e Merge 47fe7445e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22364)
- some fixmes in this commit, related to invalid schnorr signatures
  which need investigation
2023-05-29 12:58:36 +00:00
James Dorfman
0057352195 Merge a2ed33b23b into merged_master (Bitcoin PR bitcoin/bitcoin#23564) 2023-05-26 16:53:57 +00:00
James Dorfman
9077ed4666 Merge a42923ce21 into merged_master (Bitcoin PR bitcoin/bitcoin#23348) 2023-05-26 16:43:18 +00:00
James Dorfman
29f60a0773 Merge 79e64a053d into merged_master (Bitcoin PR bitcoin-core/gui#319) 2023-05-26 16:28:03 +00:00
James Dorfman
71cbece82e Merge 06782cf8e7 into merged_master (Bitcoin PR bitcoin-core/gui#449) 2023-05-26 16:17:08 +00:00
James Dorfman
d94c120f97 Merge 19815b096c into merged_master (Bitcoin PR bitcoin/bitcoin#23535) 2023-05-26 16:09:27 +00:00
James Dorfman
995c3a627b Merge 368831371d into merged_master (Bitcoin PR bitcoin/bitcoin#23558) 2023-05-26 15:58:59 +00:00
James Dorfman
0a7c717019 Merge cf06c9b35c into merged_master (Bitcoin PR bitcoin/bitcoin#23555) 2023-05-26 15:07:47 +00:00
James Dorfman
a51894bd5d Merge 80ae64db6b into merged_master (Bitcoin PR bitcoin/bitcoin#23553) 2023-05-26 14:59:42 +00:00
Byron Hambly
02b4c59511 Merge fe03f7a37f into merged_master (Bitcoin PR bitcoin/bitcoin#23540) 2023-05-26 13:57:11 +00:00
Byron Hambly
8250bf53d2 Merge 606e306277 into merged_master (Bitcoin PR bitcoin/bitcoin#22981) 2023-05-26 13:47:21 +00:00
Byron Hambly
2311c2cd81 Merge 2ef186a140 into merged_master (Bitcoin PR bitcoin/bitcoin#22881) 2023-05-26 13:29:32 +00:00
Byron Hambly
6279c58b1a Merge d94dc69ee4 into merged_master (Bitcoin PR bitcoin/bitcoin#23501) 2023-05-26 13:18:58 +00:00
Byron Hambly
6a650c1a67 Merge 398fd63356 into merged_master (Bitcoin PR bitcoin/bitcoin#23525) 2023-05-26 13:06:05 +00:00
Byron Hambly
3ef6ac14a9 Merge cb2392c5fb into merged_master (Bitcoin PR bitcoin/bitcoin#23496) 2023-05-26 12:50:36 +00:00
Byron Hambly
2302b5b485 Merge b869a784ef into merged_master (Bitcoin PR bitcoin/bitcoin#23522) 2023-05-26 12:34:02 +00:00
Byron Hambly
ec6377a5a9 Merge 7be37ee850 into merged_master (Bitcoin PR bitcoin/bitcoin#23520) 2023-05-26 12:25:52 +00:00
Byron Hambly
74f2207551 Merge 6bde42e29e into merged_master (Bitcoin PR bitcoin/bitcoin#23511) 2023-05-26 12:16:49 +00:00
Byron Hambly
3eabe469a8 Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524) 2023-05-26 11:18:18 +00:00
Byron Hambly
2cf78f4b15 Merge ad09c287cb into merged_master (Bitcoin PR bitcoin/bitcoin#23504) 2023-05-26 11:10:20 +00:00
Byron Hambly
433090862e Merge d0923098c6 into merged_master (Bitcoin PR bitcoin/bitcoin#23491) 2023-05-26 11:00:12 +00:00
Byron Hambly
61e7d675db Merge cf63d635b1 into merged_master (Bitcoin PR bitcoin/bitcoin#23499) 2023-05-26 10:39:53 +00:00
Byron Hambly
bd68371fb6 Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474) 2023-05-26 10:32:04 +00:00
Byron Hambly
33b01e3a26 Merge 0475a2378b into merged_master (Bitcoin PR bitcoin/bitcoin#23349) 2023-05-26 09:49:05 +00:00
Byron Hambly
af1eede229 Merge 6780759a01 into merged_master (Bitcoin PR bitcoin/bitcoin#23478) 2023-05-26 09:39:59 +00:00
Byron Hambly
1ca7d86b81 Merge 41e6909c07 into merged_master (Bitcoin PR bitcoin/bitcoin#23516) 2023-05-26 09:32:13 +00:00
Byron Hambly
acd5824106 Merge caf8b26b52 into merged_master (Bitcoin PR bitcoin/bitcoin#23175) 2023-05-26 09:24:30 +00:00
Byron Hambly
1beaa601b4 Merge 5ccab7187b into merged_master (Bitcoin PR bitcoin/bitcoin#23394)
- commented out some script tests that need to be fixed
 - commented out feature_taproot.py since it needs significant updates
2023-05-26 09:14:20 +00:00
Byron Hambly
c8c72768d0 Merge 7f0f853373 into merged_master (Bitcoin PR bitcoin/bitcoin#23005) 2023-05-25 08:59:33 +00:00
Byron Hambly
6779ec0f05 Merge 15d109802a into merged_master (Bitcoin PR bitcoin/bitcoin#23513) 2023-05-25 08:51:39 +00:00
Byron Hambly
2a6a83b69b Merge fa2303989b into merged_master (Bitcoin PR bitcoin/bitcoin#23515) 2023-05-25 08:43:30 +00:00
Byron Hambly
9189a19022 Merge 024e4debc5 into merged_master (Bitcoin PR bitcoin/bitcoin#23408) 2023-05-25 08:34:33 +00:00
Byron Hambly
0b69a1e205 Merge 1ba74123f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23004) 2023-05-25 08:24:05 +00:00
Byron Hambly
5c6f2e0a35 Merge 36d184d0c8 into merged_master (Bitcoin PR bitcoin/bitcoin#22508) 2023-05-25 08:15:02 +00:00
Byron Hambly
2f15858d25 Merge c82284cfdc into merged_master (Bitcoin PR bitcoin/bitcoin#23345) 2023-05-25 07:54:10 +00:00