Byron Hambly
0d6796ec53
Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217 )
2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef
Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254 )
2025-04-12 12:19:09 +02:00
Byron Hambly
a429c96e07
Merge 1bcabe6f2a into merged_master (Bitcoin PR bitcoin-core/gui#697 )
2025-04-05 15:06:43 +02:00
Tom Trevethan
147febdae3
Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752 )
2025-04-01 13:25:03 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Tom Trevethan
3f43afa4b9
Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298 )
2025-03-25 12:09:21 +00:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
09c66ca532
Merge f5e96ecef5 into merged_master (Bitcoin PR bitcoin/bitcoin#25616 )
2024-11-01 13:00:25 +02:00
Byron Hambly
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699 )
2024-10-29 14:19:22 +02:00
Byron Hambly
49d368ea6b
Merge 006740b6f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25721 )
2024-10-25 13:33:19 +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
b81762fcb2
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997 )
2024-10-17 10:15:38 +02:00
James Dorfman
66071a5dbb
Merge 062b9db0cc into merged_master (Bitcoin PR bitcoin/bitcoin#25594 )
2024-10-16 06:40:24 +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
James Dorfman
8667ac6db7
Merge 2642dee136 into merged_master (Bitcoin PR bitcoin/bitcoin#15936 )
2024-09-06 15:45:51 +00:00
Byron Hambly
7d91422a87
Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834 )
2023-07-03 09:33:46 +00:00
Byron Hambly
ccd7b72d79
Merge e30b6ea194 into merged_master (Bitcoin PR bitcoin/bitcoin#24067 )
2023-06-28 14:48:32 +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
01c3d7fbec
Merge f7367b88e1 into merged_master (Bitcoin PR bitcoin/bitcoin#23842 )
2023-06-14 06:43:35 +00:00
Byron Hambly
8886ceae12
Merge 63b5dfac21 into merged_master (Bitcoin PR bitcoin-core/gui#459 )
2023-06-14 05:54:10 +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
858b1793b6
Merge 42b25025fa into merged_master (Bitcoin PR bitcoin/bitcoin#23644 )
2023-06-02 11:28:46 +00:00
Byron Hambly
3e43f34618
Merge 014cae2ee8 into merged_master (Bitcoin PR bitcoin/bitcoin#23591 )
2023-05-31 11:32:20 +00:00
James Dorfman
c134b5a012
Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512 )
2023-05-31 06:23:55 +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
c8c72768d0
Merge 7f0f853373 into merged_master (Bitcoin PR bitcoin/bitcoin#23005 )
2023-05-25 08:59:33 +00:00
Byron Hambly
0b69a1e205
Merge 1ba74123f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23004 )
2023-05-25 08:24:05 +00:00
James Dorfman
4ffc594d4a
Merge a9f6428708 into merged_master (Bitcoin PR bitcoin/bitcoin#23003 )
2023-05-11 05:35:51 +00:00
Byron Hambly
498907a233
Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951 )
2023-05-09 11:50:39 +00:00
Byron Hambly
c96554c071
Merge 09cb5ec6c8 into merged_master (Bitcoin PR bitcoin/bitcoin#23065 )
2023-04-24 10:05:11 +00:00
James Dorfman
7e2135c61c
Merge 488e745560 into merged_master (Bitcoin PR bitcoin/bitcoin#12677 )
2023-04-22 02:01:59 +00:00
Byron Hambly
8d6c4da78c
Merge 528e08119f into merged_master (Bitcoin PR bitcoin/bitcoin#22219 )
2023-04-21 09:23:54 +00:00
Andrew Chow
e83babe3b8
wallet: Replace use of purpose strings with an enum
...
Instead of storing and passing around fixed strings for the purpose of
an address, use an enum.
This also rationalizes the CAddressBookData struct, documenting all fields and
making them public, and simplifying the representation to avoid bugs like
https://github.com/bitcoin/bitcoin/pull/26761#discussion_r1134615114 and make
it not possible to invalid address data like change addresses with labels.
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
2023-04-11 15:55:31 -04:00
Byron Hambly
b70d32b713
Merge e9d6eb1b80 into merged_master (Bitcoin PR bitcoin/bitcoin#22217 )
2023-04-10 13:07:29 +00:00
Byron Hambly
3e078a0566
Merge 638855af63 into merged_master (Bitcoin PR bitcoin/bitcoin#19101 )
2023-04-10 10:37:34 +00:00
James Dorfman
640ebd5e5a
Merge 62cb4009c2 into merged_master (Bitcoin PR bitcoin/bitcoin#22215 )
2023-04-10 02:27:52 +00:00
TheCharlatan
00e9b97f37
refactor: Move fs.* to util/fs.*
...
The fs.* files are already part of the libbitcoin_util library. With the
introduction of the fs_helpers.* it makes sense to move fs.* into the
util/ directory as well.
2023-03-23 12:55:18 +01:00
James Dorfman
4829d3f7e8
Merge ba15ab4990 into merged_master (Bitcoin PR bitcoin/bitcoin#22218 )
2023-03-21 16:55:27 +00:00
MarcoFalke
faff2ba4f8
Remove reindex special case from the progress bar label
2023-02-07 11:02:01 +01:00
glozow
65ecf24b5c
Merge bitcoin/bitcoin#26752 : wallet: Remove mempool_sequence from interface methods
...
55696a0ac3bf19069c53https://github.com/bitcoin/bitcoin/pull/26752/commits/55696a0ac30bcfbd555f71cbc8eac23b725f7dcf
Tree-SHA512: 621e89230bcb6edfed83e2758601a2b093822fc2dc4e9bfb00487e340f2bc4c5ac3bf6df3ca00b7fe55bb3df15858820f2bf698f403d2e48b915dd9eb47b63e0
2023-01-04 17:53:58 +00:00
w0xlt
55696a0ac3
wallet: remove mempool_sequence from transactionRemovedFromMempool
2022-12-26 06:17:05 -03:00
w0xlt
bf19069c53
wallet: remove mempool_sequence from transactionAddedToMempool
2022-12-26 06:14:24 -03:00
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
- 2021: f47dda2c58fa0074e2d8aaaaad6ac9
2022-12-24 23:49:50 +00:00
Ryan Ofsky
b19c4124b3
refactor: Rename ambiguous interfaces::MakeHandler functions
2022-11-29 08:12:24 -04:00
