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
Fabian Jahr
f08c9fb0c6
Index: Use prune locks for blockfilterindex
...
Prior to this change blocks could be pruned up to the last block before the blockfilterindex current best block.
2022-04-25 23:22:00 +02:00
Fabian Jahr
2561823531
blockstorage: Add prune locks to BlockManager
...
This change also introduces an aditional buffer of 10 blocks (PRUNE_LOCK_BUFFER) that will not be pruned before the best block.
Co-authored-by: Luke Dashjr <luke-jr+git@utopios.org>
2022-04-25 23:21:58 +02:00
Glenn Willen
dea074b88a
Merge b707a6f00f into merged_master (Elements PR ElementsProject/elements#1069 )
2022-04-20 20:51:37 -07:00
Glenn Willen
04fd3d8dab
Fix dropped '&' from merge of #1022
...
When PR 1022 was merged, an & got dropped from the declarations of the two
"fStall" out-parameters, rendering them unused (and triggering a compiler
warning.) Restore them, restoring the functionality of #1022 .
2022-04-20 18:35:06 -07:00
Carl Dong
f0a2fb3c5d
scripted-diff: Rename pindexBestHeader, fHavePruned
...
...to m_best_header and m_have_pruned
-BEGIN VERIFY SCRIPT-
find_regex="\bpindexBestHeader\b" \
&& git grep -l -E "$find_regex" -- src \
| xargs sed -i -E "s@$find_regex@m_best_header@g"
find_regex="\bfHavePruned\b" \
&& git grep -l -E "$find_regex" -- src \
| xargs sed -i -E "s@$find_regex@m_have_pruned@g"
-END VERIFY SCRIPT-
2022-04-19 14:36:18 -04:00
Carl Dong
a401402125
Clear fHavePruned in BlockManager::Unload()
...
-----
Code Reviewer Notes
Call graph of relevant functions:
UnloadBlockIndex() <-- Moved from
calls ChainstateManager::Unload()
which calls BlockManager::Unload() <-- Moved to
So calling UnloadBlockIndex() would still run this moved code. The code
will also now run when ~BlockManager gets called, which makes sense.
2022-04-19 14:34:56 -04:00
Carl Dong
3308ecd3fc
move-mostly: Make fHavePruned a BlockMan member
...
[META] In the next commit, we move the clearing of fHavePruned to
BlockManager::Unload()
2022-04-19 14:34:56 -04:00
Carl Dong
c96524113c
Clear pindexBestHeader in ChainstateManager::Unload()
...
-----
Code Reviewer Notes
Call graph of relevant functions:
UnloadBlockIndex() <-- Moved from
calls ChainstateManager::Unload() <-- Moved to
Safe because ChainstateManager::Unload() is called only by
UnloadBlockIndex() and no other callers.
2022-04-19 14:34:56 -04:00
Carl Dong
0d567daf23
move-mostly: Make pindexBestHeader a ChainMan member
...
[META] In the next commit, we move the clearing of pindexBestHeader to
ChainstateManager::Unload()
2022-04-19 14:34:55 -04:00
Carl Dong
5d670173a3
validation: Load pindexBestHeader in ChainMan
...
Now BlockManager::LoadBlockIndex() will ACTUALLY only load BlockMan
members.
[META] In a later commit, pindexBestHeader will be moved to ChainMan as
a member
-----
Code Reviewer Notes
Call graph of relevant functions:
ChainstateManager::LoadBlockIndex() <-- Moved to
calls BlockManager::LoadBlockIndexDB()
which calls BlockManager::LoadBlockIndex() <-- Moved from
There is only one call to each of inner functions, meaning that no
behavior is changing.
2022-04-12 14:37:27 -04:00
fanquake
d844b5e799
Merge bitcoin/bitcoin#24152 : policy / validation: CPFP fee bumping within packages
...
9bebf35e26 [validation] don't package validate if not policy or missing inputs (glozow)
51edcffa0e [unit test] package feerate and package cpfp (glozow)
1b93748c93 [validation] try individual validation before package validation (glozow)
17a8ffd802 [packages/policy] use package feerate in package validation (glozow)
09f32cffa6 [docs] package feerate (glozow)
Pull request description:
Part of #22290 , aka [Package Mempool Accept](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a ).
This enables CPFP fee bumping in child-with-unconfirmed-parents packages by introducing [package feerate](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a#fee-related-checks-use-package-feerate ) (total modified fees divided by total virtual size) and using it in place of individual feerate. We also always [validate individual transactions first](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a#always-try-individual-submission-first ) to avoid incentive-incompatible policies like "parents pay for children" or "siblings pay for siblings" behavior.
ACKs for top commit:
instagibbs:
reACK https://github.com/bitcoin/bitcoin/pull/24152/commits/9bebf35e269b2a918df27708565ecd0c5bd3f116
mzumsande:
Code review ACK 9bebf35e26
t-bast:
ACK https://github.com/bitcoin/bitcoin/pull/24152/commits/9bebf35e269b2a918df27708565ecd0c5bd3f116
Tree-SHA512: 5117cfcc3ce55c00384d9e8003a0589ceac1e6f738b1c299007d9cd9cdd2d7c530d31cfd23658b041a6604d39073bcc6e81f0639a300082a92097682a6ea8c8f
2022-04-07 10:05:43 +01:00
MarcoFalke
ffffb7a25a
doc: Convert remaining comments to clang-tidy format
2022-04-06 15:37:07 +02:00