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
Byron Hambly
43b9288c25
Merge 6182e5086f into merged_master (Bitcoin PR bitcoin/bitcoin#24002 )
2023-06-15 14:17:40 +00:00
Byron Hambly
78a8032c1e
Merge 4ada74206a into merged_master (Bitcoin PR bitcoin/bitcoin#23974 )
2023-06-15 13:21:10 +00:00
Byron Hambly
a14e05aac7
Merge 3917dff732 into merged_master (Bitcoin PR bitcoin/bitcoin#23855 )
2023-06-15 11:07:17 +00:00
Byron Hambly
4c85b4e490
Merge 847cf7690d into merged_master (Bitcoin PR bitcoin/bitcoin#23981 )
2023-06-15 07:53:04 +00:00
Byron Hambly
b8e9358d8c
Merge e31cdb0238 into merged_master (Bitcoin PR bitcoin/bitcoin#23411 )
2023-06-15 07:42:35 +00:00
Byron Hambly
72bd6c92e7
Merge 2f37b221d1 into merged_master (Bitcoin PR bitcoin/bitcoin#23581 )
2023-06-14 19:21: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
413786c613
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785 )
2023-06-13 14:30:53 +00:00
Byron Hambly
0bb272ba16
Merge aaaceb7fb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23766 )
2023-06-13 09:50:10 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
Byron Hambly
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
James Dorfman
9ff4b8e6d6
Merge eaf1c56502 into merged_master (Bitcoin PR bitcoin/bitcoin#23692 )
2023-06-02 15:51:00 +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
9b87adeca8
Merge df562d698a into merged_master (Bitcoin PR bitcoin/bitcoin#23637 )
2023-06-01 10:00:47 +00:00
Byron Hambly
5a723e538b
Merge 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437 )
2023-06-01 09:15:23 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +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
002abaf5a3
Merge 4018e23aa7 into merged_master (Bitcoin PR bitcoin/bitcoin#23573 )
2023-05-30 15:39:59 +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
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
Byron Hambly
2da8f66309
Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173 )
2023-05-24 11:45:57 +00:00
Byron Hambly
8299bec8a2
Merge c001da306b into merged_master (Bitcoin PR bitcoin/bitcoin#23325 )
2023-05-14 10:52:15 +00:00
Byron Hambly
2b8eef42dd
Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937 )
2023-05-11 12:38:50 +00:00
Byron Hambly
a4b97d5a9b
Merge ec4e43c21c into merged_master (Bitcoin PR #23235 )
2023-05-11 10:44:10 +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
9b7c9154fe
Merge c4fc899442 into merged_master (Bitcoin PR bitcoin/bitcoin#22950 )
2023-05-09 12:21:13 +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
cca3f919f8
Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487 )
2023-05-09 11:22:04 +00:00
Byron Hambly
d1a87496d0
Merge cdb4dfcbf1 into merged_master (Bitcoin PR bitcoin/bitcoin#20452 )
2023-05-09 10:47:06 +00:00
Byron Hambly
eea9829aa6
Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976 )
2023-04-24 11:40:49 +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
c942f6af15
Merge cdf12c7b3d into merged_master (Bitcoin PR bitcoin/bitcoin#22895 )
2023-04-21 12:03:29 +00:00
Byron Hambly
8d6c4da78c
Merge 528e08119f into merged_master (Bitcoin PR bitcoin/bitcoin#22219 )
2023-04-21 09:23:54 +00:00
Byron Hambly
b70d32b713
Merge e9d6eb1b80 into merged_master (Bitcoin PR bitcoin/bitcoin#22217 )
2023-04-10 13:07:29 +00:00
James Dorfman
640ebd5e5a
Merge 62cb4009c2 into merged_master (Bitcoin PR bitcoin/bitcoin#22215 )
2023-04-10 02:27:52 +00:00
Byron Hambly
9768c23819
Merge eaf09bda4a into merged_master (Bitcoin PR bitcoin/bitcoin#22609 )
2023-04-06 13:04:44 +00:00
James Dorfman
ea7450b099
Merge 4b1fb50def into merged_master (Bitcoin PR bitcoin/bitcoin#22528 )
2023-03-31 18:53:21 +00:00
Byron Hambly
d60b269083
Merge 31fef69c03 into merged_master (Bitcoin PR bitcoin/bitcoin#22047 )
2023-03-31 18:32:13 +00:00
James Dorfman
44df9bbb73
Merge 951850bebf into merged_master (Bitcoin PR #22371 )
2023-03-16 14:23:27 +00:00
Pablo Greco
e7fea1d50b
Fix underflow when blocks are ahead of headers
2023-02-21 06:22:25 -03:00
Glenn Willen
f5c79950a1
When people ask us for headers we do not have (over REST or RPC), do something reasonable.
2022-12-12 09:53:42 -08:00
Glenn Willen
7c555578b7
Add a flag for header-trimming; clear P2P network feature bits when enabled.
2022-12-12 09:46:07 -08:00
MarcoFalke
fac8165443
Remove unused checkFinalTx
2022-01-25 10:16:06 +01:00
MarcoFalke
c561f2f06e
Merge bitcoin/bitcoin#23497 : Add src/node/ and src/wallet/ code to node:: and wallet:: namespaces
...
e5b6aef612 Move CBlockFileInfo::ToString method where class is declared (Russell Yanofsky)
f7086fd8ff Add src/wallet/* code to wallet:: namespace (Russell Yanofsky)
90fc8b089d Add src/node/* code to node:: namespace (Russell Yanofsky)
Pull request description:
There are no code changes, this is just adding `namespace` and `using` declarations and `node::` or `wallet::` qualifiers in some places.
Motivations for this change are:
- To make it easier to see when node and wallet code is being accessed places where it shouldn't be. For example if GUI code is accessing node and wallet internals or if wallet and node code are referencing each other.
- To make source code organization clearer ([#15732 ](https://github.com/bitcoin/bitcoin/issues/15732 )), being able to know that `wallet::` code is in `src/wallet/`, `node::` code is in `src/node/`, `init::` code is in `src/init/`, `util::` code is in `src/util/`, etc.
Reviewing with `git log -p -n1 -U0 --word-diff-regex=.` can be helpful to verify this is only updating declarations, not changing code.
ACKs for top commit:
achow101:
ACK e5b6aef612
MarcoFalke:
Concept ACK e5b6aef612 🍨
Tree-SHA512: 3797745c90246794e2d55a2ee6e8b0ad5c811e4e03a242d3fdfeb68032f8787f0d48ed4097f6b7730f540220c0af99ef423cd9dbe7f76b2ec12e769a757a2c8d
2022-01-11 11:11:00 +01:00
Jon Atack
1823766fc6
refactor: add thread safety lock assertion to WriteBlockIndexDB()
...
The new helper function, BlockManager::WriteBlockIndexDB(),
has a thread safety lock annotation in its declaration but is
missing the corresponding run-time lock assertion in its definition.
Per doc/developer-notes.md: "Combine annotations in function
declarations with run-time asserts in function definitions."
2022-01-07 13:12:17 +01:00