Commit graph

181 commits

Author SHA1 Message Date
Byron Hambly
bef3aeb383 Merge ecab855838 into merged_master (Bitcoin PR bitcoin/bitcoin#28195) 2025-07-07 09:45:43 +02:00
Byron Hambly
8bc9cd62fb Merge be44332803 into merged_master (Bitcoin PR bitcoin/bitcoin#28191) 2025-07-03 15:53:03 +02:00
Byron Hambly
3e027c6bd4 Merge f4f1d6d230 into merged_master (Bitcoin PR bitcoin/bitcoin#27746) 2025-07-03 12:59:45 +02:00
Byron Hambly
61ecd1fa45 Merge e253568da8 into merged_master (Bitcoin PR bitcoin/bitcoin#28053) 2025-07-01 11:52:36 +02:00
Byron Hambly
f61ec91393 Merge ef29d5d7e2 into merged_master (Bitcoin PR bitcoin/bitcoin#27607) 2025-07-01 11:32:01 +02:00
Byron Hambly
a8a9ae2ae1 Merge 75135c673e into merged_master (Bitcoin PR bitcoin/bitcoin#27861) 2025-07-01 10:39:46 +02:00
Byron Hambly
e999ab6070 Merge caff95a023 into merged_master (Bitcoin PR bitcoin/bitcoin#27896) 2025-06-28 11:08:01 +02:00
Byron Hambly
38c95b75e9 Merge e4bbfb2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#27632) 2025-06-27 15:10:29 +02:00
Byron Hambly
30814e6064 Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708) 2025-06-27 14:01:27 +02:00
Byron Hambly
edc585d157 Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636) 2025-06-25 11:40:46 +02:00
Byron Hambly
73663a4c89 Merge 4e8a7654f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25193) 2025-06-20 16:01:14 +02:00
Byron Hambly
b1d470027d Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125) 2025-06-20 10:46:05 +02:00
Byron Hambly
e22e1b9509 Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570) 2025-05-16 10:32:57 +02:00
Byron Hambly
16f1169009 Merge 8a373a5c7f into merged_master (Bitcoin PR bitcoin/bitcoin#27191) 2025-05-15 13:11:32 +02:00
Byron Hambly
5ac82e15a9 Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419) 2025-05-09 11:47:45 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Thomas Trevethan
9406f21187 Merge e695d8536e into merged_master (Bitcoin PR bitcoin/bitcoin#26177) 2025-04-11 12:02:49 +01:00
Byron Hambly
59a4dcb178 Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781) 2025-04-10 09:10:09 +02:00
Byron Hambly
e24c402fac Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238) 2025-04-10 08:26:17 +02:00
Byron Hambly
6ec7ce1641 Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533) 2025-04-09 12:28:27 +02:00
Tom Trevethan
669ddecaca Merge 0a1d372ad0 into merged_master (Bitcoin PR bitcoin/bitcoin#26649) 2025-04-04 15:50:36 +00:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02: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
b80b3aeff4 Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513) 2024-11-26 14:42:49 +02:00
Byron Hambly
1006327a13 Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707) 2024-11-04 11:26:40 +02:00
Byron Hambly
52148abe10 Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571) 2024-10-24 12:30:38 +02:00
Byron Hambly
28d35f619e Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331) 2024-10-18 13:14:02 +02:00
Byron Hambly
076e809b74 Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487) 2024-10-17 09:16:23 +02:00
James Dorfman
413a175b53 Fixes for Elements PR #1270 2024-09-23 21:22:11 +00:00
James Dorfman
61b0543ba7 Merge cdcc74bbcc into merged_master (Elements PR #1270) 2024-09-23 16:51:13 +00:00
James Dorfman
841caf1c0f Merge 45d8b1e94a into merged_master (Bitcoin PR bitcoin/bitcoin#25286) 2024-09-09 19:19:33 +00:00
James Dorfman
ae633bfd3b Merge 636991d0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25264) 2024-09-06 19:31:45 +00:00
James Dorfman
387cfbcfe8 Merge 194b414697 into merged_master (Bitcoin PR bitcoin/bitcoin#25016) 2024-08-08 17:30:27 +00:00
James Dorfman
628a1506e1 Merge b51e60f914 into merged_master (Bitcoin PR bitcoin/bitcoin#22564) 2024-08-06 19:02:09 +00:00
James Dorfman
01e944c8aa Merge 34ae04d775 into merged_master (Bitcoin PR bitcoin/bitcoin#21726)
This changed the node pruning logic and moved test/functional/feature_blockfilterindex_prune.py
to test/functional/feature_index_prune.py.

Please verify that:
1. I migrated the test correctly
2. The magic numbers in the test look fine

With respect to #2: I believe the magic numbers are wrong. I previously had to tweak them heavily
in commit 1278b31. I don't think I did it correctly then, and so I don't believe them to be correct now.

To summarize what this tweaking was: I changed the magic numbers in the test to work properly,
but I suspect that in changing them, I may have nullified what the test was testing.

It's very possible that the reason the test was failing was because of an underlying bug with the pruning
in elements which we have to fix, rather than just being an issue with the test itself.
2024-08-06 16:43:47 +00:00
James Dorfman
d4aa6eba2f Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909) 2024-08-01 18:03:20 +00:00
Pablo Greco
5a409265ef Extreme trimming on startup 2024-05-21 05:34:30 +00:00
Pablo Greco
4259278ff5 Reload trimmed header from index instead of block, block may have been pruned 2024-05-21 05:34:30 +00:00
Byron Hambly
fa21dc5b5d Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515) 2023-10-16 10:58:18 +00:00
Byron Hambly
b7ad3576f5 Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050) 2023-10-13 12:02:55 +00:00
fanquake
ecab855838
Merge bitcoin/bitcoin#28195: blockstorage: Drop legacy -txindex check
fae405556d scripted-diff: Rename CBlockTreeDB -> BlockTreeDB (MarcoFalke)
faf63039cc Fixup style of moved code (MarcoFalke)
fa65111b99 move-only: Move CBlockTreeDB to node/blockstorage (MarcoFalke)
fa8685597e index: Drop legacy -txindex check (MarcoFalke)
fa69148a0a scripted-diff: Use blocks_path where possible (MarcoFalke)

Pull request description:

  The only reason for the check was to print a warning about an increase in storage use. Now that 22.x is EOL and everyone should have migrated (or decided to not care about storage use), remove the check.

  Also, a move-only commit is included. (Rebased from https://github.com/bitcoin/bitcoin/pull/22242)

ACKs for top commit:
  TheCharlatan:
    ACK fae405556d, though I lack historical context to really judge the second commit fa8685597e.
  stickies-v:
    ACK fae405556d

Tree-SHA512: 9da8f48767ae52d8e8e21c09a40c949cc0838794f1856cc5f58a91acd3f00a3bca818c8082242b3fdc9ca5badb09059570bb3870850d3807b75a8e23b5222da1
2023-09-05 11:37:35 +01:00
Byron Hambly
591749d9f1
build: fix issues from ASAN in CI 2023-09-01 17:17:44 +02:00
fanquake
be44332803
Merge bitcoin/bitcoin#28191: refactor: Remove unused MessageStartChars parameters from BlockManager methods
fa69e3a95c Remove unused MessageStartChars parameters from BlockManager methods (MarcoFalke)

Pull request description:

  Seems odd to expose these for mocking, when it is not needed.

  Fix this by removing the the unused parameters and use the already existing member field instead.

ACKs for top commit:
  Empact:
    utACK fa69e3a95c
  dergoegge:
    utACK fa69e3a95c

Tree-SHA512: 7814e9560abba8d9c0926bcffc70f92e502d22f543af43671248f6fcd1433f35238553c0f05123fde6d8e0f80261af0ab0500927548115153bd68d57fe2da746
2023-08-07 10:57:39 +02:00
MarcoFalke
fae405556d
scripted-diff: Rename CBlockTreeDB -> BlockTreeDB
-BEGIN VERIFY SCRIPT-
 sed -i 's|CBlockTreeDB|BlockTreeDB|g' $( git grep -l CBlockTreeDB )
-END VERIFY SCRIPT-
2023-08-02 07:49:32 +02:00
MarcoFalke
faf63039cc
Fixup style of moved code
Can be reviewed with --word-diff-regex=.
2023-08-01 15:27:51 +02:00
MarcoFalke
fa65111b99
move-only: Move CBlockTreeDB to node/blockstorage
The block index (CBlockTreeDB) is required to write and read blocks, so
move it to blockstorage. This allows to drop the txdb.h include from
`node/blockstorage.h`.

Can be reviewed with:

--color-moved=dimmed-zebra  --color-moved-ws=ignore-all-space
2023-08-01 15:27:33 +02:00
MarcoFalke
fa69e3a95c
Remove unused MessageStartChars parameters from BlockManager methods 2023-07-31 14:32:57 +02:00
Suhas Daftuar
d0d40ea9a6 Move block-storage-related logic to ChainstateManager
Separate the notion of which blocks are stored on disk, and what data is in our
block index, from what tip a chainstate might be able to get to. We can use
chainstate-agnostic data to determine when to store a block on disk (primarily,
an anti-DoS set of criteria) and let the chainstates figure out for themselves
when a block is of interest for being a candidate tip.

Note: some of the invariants in CheckBlockIndex are modified, but more work is
needed (ie to move CheckBlockIndex to ChainstateManager, as most of what
CheckBlockIndex is doing is checking the consistency of the block index, which
is outside of Chainstate).
2023-07-21 10:09:44 -04:00
Suhas Daftuar
1cfc887d00 Remove CChain dependency in node/blockstorage 2023-07-14 14:54:57 -04:00