Commit graph

23872 commits

Author SHA1 Message Date
James Dorfman
4e3aa4b8ea Merge 9facad0da6 into merged_master (Bitcoin PR bitcoin-core/gui#477) 2023-05-31 06:52:27 +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
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
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
0a7c717019 Merge cf06c9b35c into merged_master (Bitcoin PR bitcoin/bitcoin#23555) 2023-05-26 15:07:47 +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
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
3eabe469a8 Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524) 2023-05-26 11:18:18 +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
33b01e3a26 Merge 0475a2378b into merged_master (Bitcoin PR bitcoin/bitcoin#23349) 2023-05-26 09:49:05 +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
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
James Dorfman
4a713e72bb Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462) 2023-05-24 20:35:27 +00:00
Byron Hambly
3bb33ac420 Merge 9d2895157e into merged_master (Bitcoin PR bitcoin/bitcoin#23500) 2023-05-24 14:00:43 +00:00
Byron Hambly
8c41f191f4 Merge 6d83b02619 into merged_master (Bitcoin PR bitcoin/bitcoin#23493) 2023-05-24 13:50:34 +00:00
Byron Hambly
f40e3c6107 Merge c9dd5c8d6e into merged_master (Bitcoin PR bitcoin/bitcoin#23492) 2023-05-24 13:21:40 +00:00
Byron Hambly
c08f90d222 Merge 1ff265a20c into merged_master (Bitcoin PR bitcoin/bitcoin#23477) 2023-05-24 13:10:47 +00:00
Byron Hambly
81d5607ec8 Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114) 2023-05-24 12:58:57 +00:00
Byron Hambly
0f48ba8cd4 Merge f63bf05e73 into merged_master (Bitcoin PR bitcoin/bitcoin#22928) 2023-05-24 12:17:35 +00:00
Byron Hambly
3830688efb Merge e7feb73f07 into merged_master (Bitcoin PR bitcoin/bitcoin#22805) 2023-05-24 12:01:42 +00:00
Byron Hambly
efdff97eb0 Merge 4a8707741d into merged_master (Bitcoin PR bitcoin/bitcoin#22872) 2023-05-24 11:46:09 +00:00
Byron Hambly
2da8f66309 Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173) 2023-05-24 11:45:57 +00:00
Byron Hambly
c6412b29d2 Merge ed479497bd into merged_master (Bitcoin PR bitcoin/bitcoin#23398) 2023-05-24 10:35:24 +00:00
Byron Hambly
f0dbb7fe1f Merge 8ae4ba481c into merged_master (Bitcoin PR bitcoin/bitcoin#23400) 2023-05-18 09:39:07 +00:00
Byron Hambly
b0ba2f97e2 Merge e70fb87a4f into merged_master (Bitcoin PR bitcoin/bitcoin#23381) 2023-05-18 09:30:53 +00:00
Byron Hambly
32f69113b5 Merge cb4adbd8ab into merged_master (Bitcoin PR bitcoin/bitcoin#22934) 2023-05-17 13:59:50 +00:00
Byron Hambly
cf1c76b7d3 Merge 55dd385524 into merged_master (Bitcoin PR bitcoin/bitcoin#23414) 2023-05-17 13:52:15 +00:00
Byron Hambly
b951f8d198 Merge 8346004ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#23077) 2023-05-17 12:13:27 +00:00
Byron Hambly
120f8cad78 Merge aecc08f62e into merged_master (Bitcoin PR bitcoin/bitcoin#23409) 2023-05-17 12:01:23 +00:00
Byron Hambly
ee6bb04061 Merge f075e83b81 into merged_master (Bitcoin PR bitcoin/bitcoin#23439) 2023-05-17 11:16:00 +00:00
Byron Hambly
cb08328fbf Merge ed40f37e00 into merged_master (Bitcoin PR bitcoin/bitcoin#22076) 2023-05-17 11:15:32 +00:00
Byron Hambly
0cad2862de Merge 77a2f5d30c into merged_master (Bitcoin PR bitcoin/bitcoin#23334) 2023-05-17 09:41:17 +00:00
Byron Hambly
14a31b99b1 Merge 24abd8312e into merged_master (Bitcoin PR bitcoin/bitcoin#22949) 2023-05-17 08:32:34 +00:00
James Dorfman
a63119985d Merge e2b5192d1c into merged_master (Bitcoin PR bitcoin/bitcoin#23211) 2023-05-17 00:31:26 +00:00