Commit graph

1763 commits

Author SHA1 Message Date
Byron Hambly
cefc4804f5 Merge de3c46c938 into merged_master (Bitcoin PR bitcoin/bitcoin#25272) 2024-10-24 16:53:05 +02:00
Byron Hambly
2081703f71 Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494) 2024-10-17 17:06:13 +02:00
Byron Hambly
e1add57650 Merge 1b285b7807 into merged_master (Bitcoin PR bitcoin/bitcoin#25590) 2024-10-17 14:15:20 +02:00
Byron Hambly
b81762fcb2 Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997) 2024-10-17 10:15:38 +02:00
Byron Hambly
6742dac5d2 Merge 4aaa3b5200 into merged_master (Bitcoin PR bitcoin/bitcoin#25351) 2024-10-17 10:12:52 +02:00
James Dorfman
8195abbd21 Merge 7d258ee8bc into merged_master (Bitcoin PR bitcoin/bitcoin#25489) 2024-10-16 05:04:06 +00:00
James Dorfman
e22bfb3011 Merge 316afb1eca into merged_master (Bitcoin PR bitcoin/bitcoin#25218) 2024-10-16 04:56:53 +00:00
James Dorfman
f6f9f6b155 Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036) 2024-10-15 17:03:37 +00:00
James Dorfman
d72be3f6b9 Merge b9f9ed4640 into merged_master (Bitcoin PR bitcoin/bitcoin#25337) 2024-10-13 18:07:54 +00:00
Byron Hambly
2d07ef8fc1
Merge 5bf65ec66e into merged_master (Bitcoin PR bitcoin/bitcoin#22558) 2024-09-19 13:24:19 +02:00
James Dorfman
055d7ba185 Merge 174b821e64 into merged_master (Bitcoin PR bitcoin/bitcoin#25427) 2024-09-16 04:09:24 +00:00
James Dorfman
8ebf20fe8e Merge 8be652e439 into merged_master (Bitcoin PR bitcoin/bitcoin#25005)
These changes affect the wallet. Please double check them, since I'm not
confident that I merged them correctly.
2024-09-15 22:01:42 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +00:00
James Dorfman
aaf41fec40 Merge 79cabe3a5b into merged_master (Bitcoin PR bitcoin/bitcoin#25239) 2024-09-09 19:39:28 +00:00
James Dorfman
e060074c3f Merge 629e250cbd into merged_master (Bitcoin PR bitcoin/bitcoin#25148) 2024-08-13 03:59:44 +00:00
James Dorfman
ac98bf499c Merge 98f4db3305 into merged_master (Bitcoin PR bitcoin/bitcoin#25088) 2024-08-12 04:23:15 +00:00
James Dorfman
2ba1ea256d Merge cca900e382 into merged_master (Bitcoin PR bitcoin/bitcoin#25104) 2024-08-09 17:58:32 +00:00
James Dorfman
fcd2946158 Merge 74d9f4bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25068) 2024-08-09 05:37:14 +00:00
James Dorfman
56a93102e0 Merge 606ce05ec2 into merged_master (Bitcoin PR bitcoin/bitcoin#18554) 2024-08-08 16:40:09 +00:00
James Dorfman
7667ddd21c Merge 4cf9fa0b66 into merged_master (Bitcoin PR bitcoin/bitcoin#24984) 2024-08-06 20:19:05 +00:00
James Dorfman
a7cc4620eb Merge cc3877f831 into merged_master (Bitcoin PR bitcoin/bitcoin#24971) 2024-08-02 17:53:53 +00:00
James Dorfman
f86857195f Merge 43bb106613 into merged_master (Bitcoin PR bitcoin/bitcoin#24213) 2024-08-01 20:20:30 +00:00
James Dorfman
530c5ea7e6 Merge 2095f19db9 into merged_master (Bitcoin PR bitcoin/bitcoin#24859) 2024-08-01 01:18:15 +00:00
James Dorfman
ff2a2e72c9 Merge b7d78e6244 into merged_master (Bitcoin PR bitcoin/bitcoin#24711) 2024-07-08 07:14:19 +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
f3ee905625 Merge e0881aa5f0 into merged_master (Bitcoin PR bitcoin/bitcoin#24505) 2023-10-15 21:39:09 +00:00
Byron Hambly
3eaccae830
lint: fix codespell warnings 2023-09-27 15:56:20 +02:00
Byron Hambly
860b2c3e4b
fix: move BlindDetails and IssuanceDetails to wallet.h
resolves the newly introduced circular dependencies correctly
2023-09-05 14:38:03 +02:00
Byron Hambly
4fbfb0ccbe Merge 8d6f9210d9 into merged_master (Bitcoin PR bitcoin/bitcoin#24401) 2023-07-02 15:10:19 +00:00
Byron Hambly
cde0f7744b Merge 4acf2332d4 into merged_master (Bitcoin PR bitcoin/bitcoin#24376) 2023-07-01 07:47:21 +00:00
Byron Hambly
4988afcbc2 Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744) 2023-06-30 07:38:29 +00:00
Byron Hambly
999b6ac80b Merge 02e1d8d06f into merged_master (Bitcoin PR bitcoin/bitcoin#24083) 2023-06-30 06:11:44 +00:00
Byron Hambly
7878ba47b9 Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497) 2023-06-19 09:28:31 +00:00
James Dorfman
81119e6161 Merge fa74718414 into merged_master (Bitcoin PR bitcoin/bitcoin#24026) 2023-06-15 20:36:05 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
Byron Hambly
fa3c0f4eaa Merge 3ac38058ce into merged_master (Bitcoin PR bitcoin/bitcoin#23789) 2023-06-14 05:39:34 +00:00
Byron Hambly
8bff356855 Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721) 2023-06-13 13:41:22 +00:00
Byron Hambly
b80f2e6593 Merge 09ad512369 into merged_master (Bitcoin PR bitcoin/bitcoin#23628) 2023-06-12 12:43:53 +00:00
Byron Hambly
858b1793b6 Merge 42b25025fa into merged_master (Bitcoin PR bitcoin/bitcoin#23644) 2023-06-02 11:28:46 +00:00
Byron Hambly
ee125b1ac7 Merge bce58bbb3d into merged_master (Bitcoin PR bitcoin/bitcoin#22929)
The test failures in wallet_listtransactions.py are fixed by #23659
2023-06-01 13:30:17 +00:00
Byron Hambly
e9be7bfc96 Merge 383d350bd5 into merged_master (Bitcoin PR bitcoin/bitcoin#22513) 2023-05-31 13:50:36 +00:00
Byron Hambly
97c269b920 Merge 200d97faf2 into merged_master (Bitcoin PR bitcoin/bitcoin#22868) 2023-05-31 10:07:29 +00:00
Byron Hambly
e6cdd99eec Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206) 2023-05-31 09:12:07 +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
Byron Hambly
0f48ba8cd4 Merge f63bf05e73 into merged_master (Bitcoin PR bitcoin/bitcoin#22928) 2023-05-24 12:17:35 +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
0cad2862de Merge 77a2f5d30c into merged_master (Bitcoin PR bitcoin/bitcoin#23334) 2023-05-17 09:41:17 +00:00
Byron Hambly
4deea21a7f Merge baa9fc941c into merged_master (Bitcoin PR bitcoin/bitcoin#22787) 2023-05-16 11:26:08 +00:00
Byron Hambly
6a3f41ea38 Merge af4275e8db into merged_master (Bitcoin PR bitcoin/bitcoin#23332) 2023-05-16 09:55:15 +00:00