Commit graph

1418 commits

Author SHA1 Message Date
Byron Hambly
b0b2f3deff Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295) 2023-06-06 09:10:04 +00:00
Byron Hambly
f97b7f0c64 Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465) 2023-06-06 09:00:13 +00:00
Byron Hambly
6089b0123d Merge dca9ab48b8 into merged_master (Bitcoin PR bitcoin/bitcoin#23661) 2023-06-02 08:54:50 +00:00
James Dorfman
71f8040ba1 Merge 345c8180d7 into merged_master (Bitcoin PR bitcoin/bitcoin#23630) 2023-06-02 04:58:15 +00:00
Byron Hambly
1aedc97366 Merge ffe414bd9a into merged_master (Bitcoin PR bitcoin/bitcoin#23649) 2023-06-01 13:32:01 +00:00
Byron Hambly
2da6d2363d Merge 4633199cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22677) 2023-06-01 09:42:34 +00:00
Byron Hambly
5a723e538b Merge 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437) 2023-06-01 09:15:23 +00:00
James Dorfman
ec627f4ef0 Merge 9174bcf7da into merged_master (Bitcoin PR bitcoin/bitcoin#23590) 2023-06-01 06:08:36 +00:00
Byron Hambly
936a252fea Merge 913b7148a2 into merged_master (Bitcoin PR bitcoin/bitcoin#22902) 2023-05-31 11:50:48 +00:00
Byron Hambly
1ff9a8afda Merge 4aa06f9447 into merged_master (Bitcoin PR bitcoin/bitcoin#23600) 2023-05-31 10:16:38 +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
2da8f66309 Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173) 2023-05-24 11:45:57 +00:00
Byron Hambly
b0ba2f97e2 Merge e70fb87a4f into merged_master (Bitcoin PR bitcoin/bitcoin#23381) 2023-05-18 09:30:53 +00:00
James Dorfman
df8f97d63b Merge 1847ce2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#23157) 2023-05-16 09:04:56 +00:00
Byron Hambly
7925c2a451 Merge 224e90d9fd into merged_master (Bitcoin PR bitcoin/bitcoin#23336) 2023-05-15 12:27:08 +00:00
Byron Hambly
8299bec8a2 Merge c001da306b into merged_master (Bitcoin PR bitcoin/bitcoin#23325) 2023-05-14 10:52:15 +00:00
James Dorfman
664122467c Merge 0ccf9b2e55 into merged_master (Bitcoin PR bitcoin/bitcoin#23258) 2023-05-14 00:57:27 +00:00
Byron Hambly
4d11268e6a Merge 4b24f6bbb5 into merged_master (Bitcoin PR bitcoin/bitcoin#23302) 2023-05-12 10:40:11 +00:00
Byron Hambly
a4b97d5a9b Merge ec4e43c21c into merged_master (Bitcoin PR #23235) 2023-05-11 10:44:10 +00:00
Byron Hambly
94fc4e9706 Merge 6f0cbc75be into merged_master (Bitcoin PR bitcoin/bitcoin#22539) 2023-05-10 11:14:12 +00:00
Byron Hambly
498907a233 Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951) 2023-05-09 11:50:39 +00:00
Andrew Poelstra
ccffeba3b2
testmempoolaccept: feed genesis hash into sighash computation 2023-05-04 20:30:06 +00:00
Byron Hambly
eea9829aa6 Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976) 2023-04-24 11:40:49 +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
070c52dcef Merge b7e3600815 into merged_master (Bitcoin PR bitcoin/bitcoin#21526) 2023-04-23 10:59:59 +00:00
Byron Hambly
e619febc41 Merge 95b16e70a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23072) 2023-04-23 09:55:51 +00:00
Byron Hambly
f21f92ba69 Merge 8bda5e0988 into merged_master (Bitcoin PR bitcoin/bitcoin#22855) 2023-04-23 09:29:14 +00:00
Byron Hambly
98d921235f Merge 971cad475f into merged_master (Bitcoin PR bitcoin/bitcoin#23044) 2023-04-23 07:40:20 +00:00
Byron Hambly
8d89f4e102 Merge 71bdf0bff1 into merged_master (Bitcoin PR bitcoin/bitcoin#22626) 2023-04-21 12:36:24 +00:00
Byron Hambly
2a48cc4c59 Merge b8336b22d3 into merged_master (Bitcoin PR bitcoin/bitcoin#22675) 2023-04-21 06:41:50 +00:00
James Dorfman
d625266215 Merge da67b75c5c into merged_master (Bitcoin PR bitcoin/bitcoin#22903) 2023-04-21 02:04:22 +00:00
Byron Hambly
162e1f24bd Merge 81f4a3e84d into merged_master (Bitcoin PR bitcoin/bitcoin#22796) 2023-04-11 09:13:05 +00:00
Byron Hambly
cb71563589 Merge 7be143a960 into merged_master (Bitcoin PR bitcoin/bitcoin#22824) 2023-04-11 08:37:41 +00:00
Byron Hambly
8599606ab3 Merge 21438d55d5 into merged_master (Bitcoin PR bitcoin/bitcoin#21800) 2023-04-09 05:08:13 +00:00
James Dorfman
ea7450b099 Merge 4b1fb50def into merged_master (Bitcoin PR bitcoin/bitcoin#22528) 2023-03-31 18:53:21 +00:00
Glenn Willen
4334fce793 Merge 61cefde7a7 into merged_master (Bitcoin PR bitcoin/bitcoin#22006) 2023-03-28 00:12:41 +00:00
Glenn Willen
7050d04a75 Merge 7925f3aba8 into merged_master (Bitcoin PR bitcoin/bitcoin#22383) 2023-03-22 03:54:56 +00:00
James Dorfman
17e6efe7fe Merge 5d83e7d714 into merged_master (Bitcoin PR bitcoin/bitcoin#21090)
We comment out a newly-added assert from the Bitcoin
side, because it's unclear how to replicate it
correctly in Elements.

Co-authored-by: Glenn Willen <gwillen@nerdnet.org>
2023-03-22 01:11:20 +00:00
James Dorfman
44df9bbb73 Merge 951850bebf into merged_master (Bitcoin PR #22371) 2023-03-16 14:23:27 +00:00
Glenn Willen
b9b7f6543a Apply suggestions from code review
Co-authored-by: Byron Hambly <byron@hambly.dev>
2023-01-04 15:32:04 -08:00
Glenn Willen
4f0da3ce3d Trim headers when flushing to disk, and reduce flush interval from 1h to 5min. 2022-12-12 09:46:07 -08:00
Glenn Willen
eff6be337f Trim headers when loading block index from disk. 2022-12-12 09:46:07 -08:00
Glenn Willen
68eb0864cb Refactor CBlockIndex to make proof and dynafed fields optional. 2022-12-12 09:46:04 -08:00
Glenn Willen
3cef73b46c Fix redundant assignment added by bad merge in dea074b88a 2022-06-27 13:36:12 -07:00
Sebastian Falbesoner
672d49c863 scripted-diff: replace non-standard fixed width integer types (u_int... -> uint`...)
-BEGIN VERIFY SCRIPT-
sed -i 's/u_int/uint/g' $(git grep -l u_int)
-END VERIFY SCRIPT-
2022-05-12 15:44:24 +02:00
MacroFake
59ac8bacd5
Merge bitcoin/bitcoin#24804: Sanity assert GetAncestor() != nullptr where appropriate
308dd2e93e Sanity assert GetAncestor() != nullptr where appropriate (Adam Jonas)

Pull request description:

  Re-opening #17232. I have rebased the PR and addressed jonatack's nit suggestions.

  Add sanity asserts for return value of `CBlockIndex::GetAncestor()` where appropriate.

  In validation.cpp `CheckSequenceLocks`, check the return value of `tip->GetAncestor(maxInputHeight)` stored into `lp->maxInputBlock`. If it ever returns `nullptr` because the ancestor isn't found, it's going to be a bad bug to keep going, since a `LockPoints` object with the `maxInputBlock` member set to `nullptr` signifies no relative lock time.

  In the other places, the added asserts would prevent accidental dereferencing of a null pointer which is undefined behavior.

  Co-Authored-By: Adam Jonas <jonas@chaincode.com>
  Co-Authored-By: danra <danra@users.noreply.github.com>

ACKs for top commit:
  jonatack:
    ACK 308dd2e93e

Tree-SHA512: 5bfdaab1499607ae2c3cd3e2e9e8c37850bfd0e327e680f4e36c81f9c6d98a543af78ecfac1ab0e06325d264412615a04d52005875780c7db2a4d81bd2d2259a
2022-05-06 11:46:20 +02:00
MacroFake
fa2deae2a8
Wrap boost::replace_all 2022-05-05 20:50:24 +02:00
Adam Jonas
308dd2e93e Sanity assert GetAncestor() != nullptr where appropriate
Add sanity asserts for return value of `CBlockIndex::GetAncestor()` where appropriate.

In validation.cpp `CheckSequenceLocks`, check the return value of `tip->GetAncestor(maxInputHeight)` stored into `lp->maxInputBlock`. If it ever returns `nullptr` because the ancestor isn't found, it's going to be a bad bug to keep going, since a `LockPoints` object with the `maxInputBlock` member set to `nullptr` signifies no relative lock time.

In the other places, the added asserts would prevent accidental dereferencing of a null pointer which is undefined behavior.

Co-Authored-By: Aurèle Oulès <aurele@oules.com>
Co-Authored-By: danra <danra@users.noreply.github.com>
2022-05-05 15:55:44 +02:00
MacroFake
12455acca2
Merge bitcoin/bitcoin#24470: Disallow more unsafe string->path conversions allowed by path append operators
f64aa9c411 Disallow more unsafe string->path conversions allowed by path append operators (Ryan Ofsky)

Pull request description:

  Add more `fs::path` `operator/` and `operator+` overloads to prevent unsafe string->path conversions on Windows that would cause strings to be decoded according to the current Windows locale & code page instead of the correct string encoding.

  Update application code to deal with loss of implicit string->path conversions by calling `fs::u8path` or `fs::PathFromString` explicitly, or by just changing variable types from `std::string` to `fs::path` to avoid conversions altogether, or make them happen earlier.

  In all cases, there's no change in behavior either (1) because strings only contained ASCII characters and would be decoded the same regardless of what encoding was used, or (2) because of the 1:1 mapping between paths and strings using the `PathToString` and `PathFromString` functions.

  Motivation for this PR was just that I was experimenting with #24469 and noticed that operations like `fs::path / std::string` were allowed, and I thought it would be better not to allow them.

ACKs for top commit:
  hebasto:
    ACK f64aa9c411

Tree-SHA512: 944cce49ed51537ee7a35ea4ea7f5feaf0c8fff2fa67ee81ec5adebfd3dcbaf41b73eb35e49973d5f852620367f13506fd12a7a9b5ae3a7a0007414d5c9df50f
2022-05-03 10:39:42 +02:00
MacroFake
91a6736136
Merge bitcoin/bitcoin#25009: Crash debug builds on PCKG_MEMPOOL_ERROR
fa10c9f5a1 Crash debug builds on PCKG_MEMPOOL_ERROR (MacroFake)

Pull request description:

  Would be nice to allow fuzz targets to meaningfully cover this code

ACKs for top commit:
  glozow:
    utACK fa10c9f5a1
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/25009/commits/fa10c9f5a1c9f8b37d51f43f98254feb9a8f9c53

Tree-SHA512: 68efacedbf72f67cf3dc0bb9927a698492cdc1b08df91ef6af863ad8828b78058a64e52d64d244a5b2966cb9e63797b2647d1bb222677bf83b26fca6e4b1dbf0
2022-04-29 08:20:04 +02:00