Commit graph

4611 commits

Author SHA1 Message Date
Byron Hambly
93c280b105 Merge d648bbb0a7 into merged_master (Bitcoin PR bitcoin/bitcoin#23124) 2023-04-28 10:53:05 +00:00
James Dorfman
b582aaadb4 Merge 33e31f8df9 into merged_master (Bitcoin PR bitcoin/bitcoin#23079) 2023-04-28 10:07:15 +00:00
James Dorfman
203ee3f248 Merge 7d4ea7c7ef into merged_master (Bitcoin PR bitcoin/bitcoin#23120) 2023-04-27 20:08:05 +00:00
James Dorfman
2aed101cd6 Merge 6a5381a06b into merged_master (Bitcoin PR bitcoin/bitcoin#20591) 2023-04-27 06:03:18 +00:00
James Dorfman
434565be81 Merge b55232a337 into merged_master (Bitcoin PR bitcoin/bitcoin#22722) 2023-04-27 05:19:44 +00:00
James Dorfman
ff57e1e65f Merge d6492d4ed0 into merged_master (Bitcoin PR bitcoin/bitcoin#22650) 2023-04-27 04:55:34 +00:00
Byron Hambly
e49e0232f9 Merge efa227f5df into merged_master (Bitcoin PR bitcoin/bitcoin#23097) 2023-04-26 13:17:13 +00:00
Byron Hambly
b26646d9a7 Merge dccf3d25f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23117) 2023-04-26 13:09:03 +00:00
Byron Hambly
ea5edc8e05 Merge a9d0cec499 into merged_master (Bitcoin PR bitcoin/bitcoin#23106) 2023-04-26 13:07:48 +00:00
Byron Hambly
a93fce1f01 fixup! FIXME commented out failing tests for wallet_groups, taphash_pegins, tapscript_opcodes 2023-04-26 11:26:10 +00:00
Byron Hambly
f522e9232b FIXME commented out failing tests for wallet_groups, taphash_pegins, tapscript_opcodes 2023-04-26 11:03:02 +00:00
James Dorfman
a28e1a34b5 Merge d5d0a5c604 into merged_master (Bitcoin PR bitcoin/bitcoin#17526) 2023-04-26 04:23:36 +00:00
Byron Hambly
a6c2f3fa4b Merge eabc2c482a into merged_master (Bitcoin PR bitcoin/bitcoin#23102) 2023-04-24 11:01:44 +00:00
Byron Hambly
14a2c59839 Merge 632be5514c into merged_master (Bitcoin PR bitcoin/bitcoin#23061) 2023-04-24 10:40:48 +00:00
Byron Hambly
10b5206170 Merge 58c25bdcea into merged_master (Bitcoin PR bitcoin/bitcoin#23092) 2023-04-24 10:32:18 +00:00
Byron Hambly
c25d65479b Merge ba3f0b2c48 into merged_master (Bitcoin PR bitcoin/bitcoin#23084) 2023-04-24 10:15:42 +00:00
Byron Hambly
c96554c071 Merge 09cb5ec6c8 into merged_master (Bitcoin PR bitcoin/bitcoin#23065) 2023-04-24 10:05:11 +00:00
Byron Hambly
940004ef4e Merge 16ccb3a1cd into merged_master (Bitcoin PR bitcoin/bitcoin#23086) 2023-04-24 10:03:55 +00:00
Byron Hambly
ae797e1b5a Merge 442e32e117 into merged_master (Bitcoin PR bitcoin/bitcoin#22817) 2023-04-24 09:07:43 +00:00
Byron Hambly
04a9784dae Merge 01b5cfb951 into merged_master (Bitcoin PR bitcoin/bitcoin#23047) 2023-04-24 08:39:22 +00:00
Byron Hambly
7856df2733 test: elements fixes for Bitcoin PR bitcoin/bitcoin#22818 2023-04-24 08:30:36 +00:00
Byron Hambly
13fb374543 Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818) 2023-04-24 07:13:42 +00:00
Byron Hambly
3d243eab9e Merge 86c3b84388 into merged_master (Bitcoin PR bitcoin/bitcoin#23036) 2023-04-23 09:38:53 +00:00
Byron Hambly
b145f52cab Merge a8a272ac32 into merged_master (Bitcoin PR bitcoin/bitcoin#22734) 2023-04-23 07:16:28 +00:00
Byron Hambly
73ff8d7d61 FIXME commented out rbf tests 2023-04-23 07:15:22 +00:00
Byron Hambly
8b51bd1072 Merge ae674a0198 into merged_master (Bitcoin PR bitcoin/bitcoin#22998) 2023-04-22 08:12:34 +00:00
Byron Hambly
5266da82db Merge 223ad2fd0d into merged_master (Bitcoin PR bitcoin/bitcoin#22831) 2023-04-22 07:46:27 +00:00
Byron Hambly
bed252471a Merge 0c1a39390f into merged_master (Bitcoin PR bitcoin/bitcoin#23041) 2023-04-22 07:38:10 +00:00
Byron Hambly
787dbf524e Merge 89447a63b9 into merged_master (Bitcoin PR bitcoin/bitcoin#23017) 2023-04-22 07:35:38 +00:00
James Dorfman
3a4b8b4c29 Merge 1260b7e483 into merged_master (Bitcoin PR bitcoin/bitcoin#23001) 2023-04-22 02:33:35 +00:00
James Dorfman
7e2135c61c Merge 488e745560 into merged_master (Bitcoin PR bitcoin/bitcoin#12677) 2023-04-22 02:01:59 +00:00
James Dorfman
0508c357e9 Merge d809d8bf12 into merged_master (Bitcoin PR bitcoin/bitcoin#22959) 2023-04-21 18:56:41 +00:00
James Dorfman
39992beced Merge 226731ac11 into merged_master (Bitcoin PR bitcoin/bitcoin#23037) 2023-04-21 18:44:14 +00:00
James Dorfman
e55a95a3a8 Merge de2af19dc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22987) 2023-04-21 15:39:51 +00:00
Byron Hambly
965ac7c53b Merge 58e02395ba into merged_master (Bitcoin PR bitcoin/bitcoin#22955) 2023-04-21 11:43:16 +00:00
Byron Hambly
56c954f2c0 Merge 6d76b57ca0 into merged_master (Bitcoin PR bitcoin/bitcoin#22960) 2023-04-21 11:35:05 +00:00
Byron Hambly
a9590b4f18 Merge 2b264971ad into merged_master (Bitcoin PR bitcoin/bitcoin#22543) 2023-04-21 08:09:07 +00:00
Byron Hambly
6382bb18e8 Merge 053a5fc7d9 into merged_master (Bitcoin PR bitcoin/bitcoin#22762) 2023-04-21 07:24:43 +00:00
Byron Hambly
ea40ed72d4 Merge 60881158c8 into merged_master (Bitcoin PR bitcoin/bitcoin#22907) 2023-04-21 06:56:56 +00:00
James Dorfman
0a09f0ce7e Merge fac7181091 into merged_master (Bitcoin PR bitcoin/bitcoin#22582) 2023-04-21 04:56:19 +00:00
James Dorfman
4181c95ce0 Merge b05d3e76e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22079) 2023-04-21 04:11:00 +00:00
James Dorfman
ae89c4bc51 Merge a5d00d4baf into merged_master (Bitcoin PR bitcoin/bitcoin#22788) 2023-04-21 04:02:55 +00:00
James Dorfman
2912cffa12 Merge e4aa9b15b9 into merged_master (Bitcoin PR bitcoin/bitcoin#22922) 2023-04-21 02:37:07 +00:00
James Dorfman
82d02480bd Merge 7d7d5e8efd into merged_master (Bitcoin PR bitcoin/bitcoin#22879) 2023-04-21 01:37:33 +00:00
James Dorfman
d0023d747b Merge fa92777448 into merged_master (Bitcoin PR bitcoin/bitcoin#22736) 2023-04-20 21:30:28 +00:00
James Dorfman
103069c46c fixes for Bitcoin PR bitcoin/bitcoin#22100
comments out one failing assertion in wallet_tests unit test
and one failing assertion in rpc_fundrawtransaction.py
2023-04-20 12:27:33 +00:00
James Dorfman
3e939cca81 Merge 629c4ab2e3 into merged_master (Bitcoin PR bitcoin/bitcoin#22100) 2023-04-14 06:13:01 +00:00
Byron Hambly
01372df8d5 Merge b997dd211e into merged_master (Bitcoin PR bitcoin/bitcoin#22809) 2023-04-13 12:18:40 +00:00
James Dorfman
a6c8382161 Merge 7e75400bb5 into merged_master (Bitcoin PR bitcoin/bitcoin#22437) 2023-04-13 10:19:44 +00:00
Byron Hambly
1acda7580c Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862) 2023-04-11 08:09:30 +00:00