GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
41820 commits 49 branches 359 tags 252 MiB
Commit graph

1508 commits

Author SHA1 Message Date
Byron Hambly
8e5b356a85 Merge 36c83b40bd into merged_master (Bitcoin PR bitcoin/bitcoin#25023) 2024-10-25 11:11:26 +02:00
Byron Hambly
79d275ea14 Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527) 2024-10-25 11:03:47 +02:00
Byron Hambly
12dbf6cb9d Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648) 2024-10-24 20:20:13 +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
e33f17092c Merge 5057adf22f into merged_master (Bitcoin PR bitcoin/bitcoin#25349) 2024-10-18 14:18:20 +02:00
Byron Hambly
ad4ecee6c0 Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285) 2024-10-17 17:33:20 +02:00
Byron Hambly
ad90efac48 Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466) 2024-10-17 10:54:37 +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
dbab4c012c Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353) 2024-10-13 18:06:13 +00:00
James Dorfman
1ab6187071 Bug fix: when CheckChallenge(...) is called on a trimmed header, temporarily 
untrim it in order to extract the proof.

Without this fix, there would be an exception in this scenario, because a trimmed
header no longer has any proof information attached to it.

This scenario was occuring when a pre-dynafed node with trimmed blocks would receive
a new block header from its peer. The pre-dynafed node would try to validate the header
by comparing its proof to the previous block's proof, and this would cause an exception
if the previous block had pruned.

New headers are not pruned as soon as they're received. Rather, they are pruned whenever the block index
is flushed to disk. So, this behavior was only being observed in functional tests, when a pre-dynafed trimmed
node was restarted.
 2024-10-08 04:50:58 +00: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
17851700b4 Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290) 2024-09-19 18:56:19 +00:00
James Dorfman
438cb545b7 Merge 2364d17a31 into merged_master (Bitcoin PR bitcoin/bitcoin#25480) 2024-09-19 15:22:38 +00:00
James Dorfman
f28609b3de Merge 57a491bee1 into merged_master (Bitcoin PR bitcoin/bitcoin#25388) 2024-09-16 00:47:14 +00:00
James Dorfman
c6fee1dac3 Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338) 2024-09-10 18:55:20 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +00:00
James Dorfman
caa3ef8844 Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254) 
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
 2024-09-09 18:21:18 +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
95ee604f8e Merge c324b07a54 into merged_master (Bitcoin PR bitcoin/bitcoin#25210) 2024-09-06 15:45:39 +00:00
James Dorfman
db3aa6dd4a Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410) 2024-09-06 06:21:07 +00:00
James Dorfman
bfb0f5d1e1 Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064) 2024-08-13 21:57:29 +00:00
James Dorfman
31df518140 Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108) 2024-08-13 04:20:55 +00:00
James Dorfman
5854eae590 Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595) 2024-08-12 02:29:42 +00:00
James Dorfman
ce0d1a8e32 Merge 2709ffb9da into merged_master (Bitcoin PR bitcoin/bitcoin#25115) 2024-08-09 21:38:07 +00:00
James Dorfman
3361822d32 Merge 59ac8bacd5 into merged_master (Bitcoin PR bitcoin/bitcoin#24804) 2024-08-09 16:39:33 +00:00
James Dorfman
fcd2946158 Merge 74d9f4bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25068) 2024-08-09 05:37:14 +00:00
James Dorfman
23e6602afe Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470) 2024-08-08 21:07:52 +00:00
James Dorfman
391f8b8639 Merge 91a6736136 into merged_master (Bitcoin PR bitcoin/bitcoin#25009) 2024-08-08 16:51:48 +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
James Dorfman
d3eb9580ec Fix bug introduced in merge of bitcoin/bitcoin#24152 in d844b5e799 2024-07-30 04:06:48 +00:00
James Dorfman
cc18b00783 Merge d844b5e799 into merged_master (Bitcoin PR bitcoin/bitcoin#24152) 2024-07-29 22:42:33 +00:00
James Dorfman
38cf680443 Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786) 2024-07-29 19:42:59 +00:00
James Dorfman
0c4e15c4fd Merge 9ce1c506a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24216) 2024-07-08 20:40:13 +00:00
James Dorfman
9c1d4cc8ff Merge a4d7ac7bbe into merged_master (Elements PR #1317) 2024-05-24 16:13:46 +00:00
James Dorfman
b4185c7008 CI: fix asan lock issues 2024-05-21 16:56:01 +00:00
James Dorfman
c6aba4ac06 CI: fix integer underflow bug 2024-05-21 16:56:01 +00:00
Pablo Greco
c28c5ce619 Allow untrimming headers when needed 2024-05-21 05:34:30 +00:00
Pablo Greco
afc16e8f84 Allow gaps while trimming headers 2024-05-21 05:34:30 +00:00
Pablo Greco
d8e1fe7fac Avoid trimming on shutdown 2024-05-21 05:34:30 +00:00
Pablo Greco
423715b048 Avoid pruning headers that have not been saved to disk yet 2024-05-21 05:34:30 +00:00
Pablo Greco
283f47b38d Move initialization of setTrimmableBlockIndex 2024-05-21 05:34:30 +00:00
Byron Hambly
b7b2288a74
discount: implement mempool logic 2024-05-14 19:03:36 +02:00
James Dorfman
087b2f13f4 Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536) 2024-03-19 19:58:32 +00:00
Byron Hambly
fa21dc5b5d Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515) 2023-10-16 10:58:18 +00:00
James Dorfman
3f110a3fe4 Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080) 2023-10-15 22:22:18 +00:00
Byron Hambly
755a0686e5 Merge 6c37eae0ad into merged_master (Bitcoin PR bitcoin/bitcoin#24404) 2023-10-14 12:09:09 +00:00
Byron Hambly
b7ad3576f5 Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050) 2023-10-13 12:02:55 +00:00