Commit graph

2978 commits

Author SHA1 Message Date
James Dorfman
02895ee128 Merge e4478d312f into merged_master (Bitcoin PR bitcoin/bitcoin#25006) 2024-08-09 05:36:09 +00:00
James Dorfman
b6df20eb34 Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235) 2024-08-09 04:52:58 +00:00
James Dorfman
249473e319 Merge 260ede1d99 into merged_master (Bitcoin PR bitcoin/bitcoin#24644) 2024-08-02 20:43:21 +00:00
James Dorfman
18909ea7d9 Merge e88a52e9a2 into merged_master (Bitcoin PR bitcoin/bitcoin#24973) 2024-08-01 23:48:53 +00:00
James Dorfman
8733f8df12 Merge 7a4ac713aa into merged_master (Bitcoin PR bitcoin/bitcoin#24936) 2024-08-01 20:56:46 +00:00
James Dorfman
2c353d6e42 Merge 1c6fcea205 into merged_master (Bitcoin PR bitcoin/bitcoin#24586) 2024-08-01 18:15:38 +00:00
James Dorfman
8a90920f2e Merge ff78833d3c into merged_master (Bitcoin PR bitcoin/bitcoin#24776) 2024-08-01 06:16:31 +00:00
James Dorfman
46162b40bd Merge 333a41882c into merged_master (Bitcoin PR bitcoin/bitcoin#24172) 2024-07-30 17:50:20 +00:00
James Dorfman
df428b0489 Merge 87c7dcc60d into merged_master (Bitcoin PR bitcoin/bitcoin#24808) 2024-07-30 03:09:29 +00:00
James Dorfman
3ef748701c Merge c1059c9fef into merged_master (Bitcoin PR bitcoin/bitcoin#24770) 2024-07-30 02:08:55 +00:00
James Dorfman
e17aba0c07 Merge 38d3d0bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#24796) 2024-07-30 01:52:26 +00:00
James Dorfman
cc18b00783 Merge d844b5e799 into merged_master (Bitcoin PR bitcoin/bitcoin#24152) 2024-07-29 22:42:33 +00:00
James Dorfman
5499524906 Merge d906329c28 into merged_master (Bitcoin PR bitcoin/bitcoin#24681) 2024-07-29 19:05:12 +00:00
James Dorfman
e169d13984 Merge f3e3563369 into merged_master (Bitcoin PR bitcoin/bitcoin#24652) 2024-07-29 16:28:15 +00:00
James Dorfman
18d0ebdd77 Merge 27cfaeed1e into merged_master (Bitcoin PR bitcoin/bitcoin#24098) 2024-07-09 02:27:59 +00:00
James Dorfman
404eee671f Merge fe66dad8a7 into merged_master (Bitcoin PR bitcoin/bitcoin#24710) 2024-07-08 20:21:29 +00:00
James Dorfman
5e757d2d2c Merge 24c6b20c14 into merged_master (Bitcoin PR bitcoin/bitcoin#24583) 2024-07-08 16:45:55 +00:00
James Dorfman
fd72f4863c Merge 52f0f7a1bb into merged_master (Bitcoin PR bitcoin/bitcoin#24668) 2024-07-08 15:28:11 +00:00
James Dorfman
792b17f5c2 Merge 03251b6b93 into merged_master (Bitcoin PR bitcoin/bitcoin#24594) 2024-07-08 08:03:03 +00:00
James Dorfman
d5b8d28d07 Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118) 2024-05-24 18:21:12 +00:00
James Dorfman
c5ad188893 Merge 2f0f056e08 into merged_master (Bitcoin PR bitcoin/bitcoin#24665) 2024-04-10 05:22:49 +00:00
James Dorfman
641df02a8d Merge 6d5771ba07 into merged_master (Bitcoin PR bitcoin/bitcoin#24494)
Please review carefully: this touches the wallet code, and I'm not sure
I adapted the new change metrics to work correctly for multi-asset.
2024-04-10 05:12:50 +00:00
James Dorfman
7cc6e81337 Merge 95cac21615 into merged_master (Bitcoin PR bitcoin/bitcoin#24600) 2024-03-19 06:47:51 +00:00
James Dorfman
e2f9ba794f Merge 56c8658700 into merged_master (Bitcoin PR bitcoin/bitcoin#24663) 2024-03-19 06:39:38 +00:00
Byron Hambly
4ab553e1b3 Merge 65e9ca2278 into merged_master (Bitcoin PR bitcoin/bitcoin#24555) 2024-02-02 12:12:43 +02:00
Byron Hambly
43771f7217 Merge 7d0e42abce into merged_master (Bitcoin PR bitcoin/bitcoin#24658) 2024-02-02 11:46:40 +02:00
James Dorfman
2c60bb8c38 Merge bc562b9ef8 into merged_master (Bitcoin PR bitcoin/bitcoin#24646) 2024-01-09 00:15:24 +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
4edf51d8da Merge e09cf64c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24585) 2023-10-16 11:29:11 +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
James Dorfman
8a8d08237e Merge ee4780028d into merged_master (Bitcoin PR bitcoin/bitcoin#23565) 2023-10-16 04:28:29 +00:00
Byron Hambly
35e8c6d908 Merge e7db4e245a into merged_master (Bitcoin PR bitcoin/bitcoin#24164) 2023-10-14 19:42:34 +00:00
Byron Hambly
ccc03f15d3 Merge bb0b39ce6f into merged_master (Bitcoin PR bitcoin/bitcoin#24524) 2023-10-14 13:06:28 +00:00
Byron Hambly
1c43dde820 Merge 9d22dbe2e1 into merged_master (Bitcoin PR bitcoin/bitcoin#24198) 2023-10-13 13:20:16 +00:00
Byron Hambly
8a41122601 Merge c9ed9927bb into merged_master (Bitcoin PR bitcoin/bitcoin#24132) 2023-10-13 12:23:51 +00:00
Byron Hambly
0e30699e09 Merge f6d335e828 into merged_master (Bitcoin PR bitcoin/bitcoin#24468) 2023-10-13 10:12:42 +00:00
Byron Hambly
45f83fd396 Merge bada9636d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24043) 2023-10-13 07:53:59 +00:00
Byron Hambly
3eaccae830
lint: fix codespell warnings 2023-09-27 15:56:20 +02:00
Pablo Greco
0a1b02a9d6 Fix placeholder manpages 2023-09-25 18:39:03 -07:00
Pablo Greco
62b6988786 Update manpage Makefile 2023-09-25 18:34:28 -07:00
Pablo Greco
33f2f6b1fd
Merge pull request #1262 from delta1/merged-master
Merges up to Bitcoin Core v23 branch point
2023-09-21 12:34:32 -07:00
Pablo Greco
ae023ea98d
Merge pull request #1217 from delta1/block-header-format
docs: add block header serialization doc and examples
2023-09-14 15:00:23 -07:00
Byron Hambly
1af35c21de
fixup! docs: add block header serialization doc and examples 2023-09-06 16:35:26 +02:00
James Dorfman
3843f6f724 Merge c30f30b6da into merged_master (Elements PR #1260) 2023-08-29 04:21:47 +00:00
Pablo Greco
7923ea782f Fix linter issues 2023-08-23 09:57:01 -07:00
Byron Hambly
3cae95260a Merge ad12d31e29 into merged_master (Elements PR #1228) 2023-07-03 12:57:05 +00:00
Byron Hambly
b6d963eea1 Merge 619f8a27ad into merged_master (Bitcoin PR bitcoin/bitcoin#24304) 2023-07-03 11:19:58 +00:00
Byron Hambly
1dc6ad6ea9 Merge ba11eb354b into merged_master (Bitcoin PR bitcoin/bitcoin#23542) 2023-07-03 09:44:18 +00:00
Byron Hambly
7d91422a87 Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834) 2023-07-03 09:33:46 +00:00