precalculate SipHash constant salt XORs #30442

l0rinc · 2024-07-12T15:01:37Z

This change is part of [IBD] - Tracking PR for speeding up Initial Block Download

Summary

The in-memory representation of the UTXO set uses (salted) SipHash to avoid key collision attacks.

Hashing uint256 keys is performed frequently throughout the codebase. Previously, specialized optimizations existed as standalone functions (SipHashUint256 and SipHashUint256Extra), but the constant salting operations (C0-C3 XOR with keys) were recomputed on every call.

This PR introduces PresaltedSipHasher, a class that caches the initial SipHash state (v0-v3 after XORing constants with keys), eliminating redundant constant computations when hashing multiple values with the same keys. The optimization is applied uniformly across:

All Salted*Hasher classes (SaltedUint256Hasher, SaltedTxidHasher, SaltedWtxidHasher, SaltedOutpointHasher)
CBlockHeaderAndShortTxIDs for compact block short ID computation

Details

The change replaces the standalone SipHashUint256 and SipHashUint256Extra functions with PresaltedSipHasher class methods that cache the constant-salted state. This is particularly beneficial for hash map operations where the same salt is used repeatedly (as suggested by Sipa in #30442 (comment)).

CSipHasher behavior remains unchanged; only the specialized uint256 paths and callers now reuse the cached state instead of recomputing it.

Measurements

Benchmarks were run using local SaltedOutpointHasherBench_* microbenchmarks (not included in this PR) that exercise SaltedOutpointHasher in realistic std::unordered_set scenarios.

Benchmarks

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
--- a/src/bench/crypto_hash.cpp	(revision 9b1a7c3e8dd78d97fbf47c2d056d043b05969176)
+++ b/src/bench/crypto_hash.cpp	(revision e1b4f056b3097e7e34b0eda31f57826d81c9d810)
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-
 #include <bench/bench.h>
 #include <crypto/muhash.h>
 #include <crypto/ripemd160.h>
@@ -12,9 +11,11 @@
 #include <crypto/sha512.h>
 #include <crypto/siphash.h>
 #include <random.h>
-#include <span.h>
 #include <tinyformat.h>
 #include <uint256.h>
+#include <primitives/transaction.h>
+#include <util/hasher.h>
+#include <unordered_set>

 #include <cstdint>
 #include <vector>
@@ -205,6 +206,98 @@
     });
 }

+static void SaltedOutpointHasherBench_hash(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    constexpr size_t size{1000};
+
+    std::vector<COutPoint> outpoints(size);
+    for (auto& outpoint : outpoints) {
+        outpoint = {Txid::FromUint256(rng.rand256()), rng.rand32()};
+    }
+
+    const SaltedOutpointHasher hasher;
+    bench.batch(size).run([&] {
+        size_t result{0};
+        for (const auto& outpoint : outpoints) {
+            result ^= hasher(outpoint);
+        }
+        ankerl::nanobench::doNotOptimizeAway(result);
+    });
+}
+
+static void SaltedOutpointHasherBench_match(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    constexpr size_t size{1000};
+
+    std::unordered_set<COutPoint, SaltedOutpointHasher> values;
+    std::vector<COutPoint> value_vector;
+    values.reserve(size);
+    value_vector.reserve(size);
+
+    for (size_t i{0}; i < size; ++i) {
+        COutPoint outpoint{Txid::FromUint256(rng.rand256()), rng.rand32()};
+        values.emplace(outpoint);
+        value_vector.push_back(outpoint);
+        assert(values.contains(outpoint));
+    }
+
+    bench.batch(size).run([&] {
+        bool result{true};
+        for (const auto& outpoint : value_vector) {
+            result ^= values.contains(outpoint);
+        }
+        ankerl::nanobench::doNotOptimizeAway(result);
+    });
+}
+
+static void SaltedOutpointHasherBench_mismatch(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    constexpr size_t size{1000};
+
+    std::unordered_set<COutPoint, SaltedOutpointHasher> values;
+    std::vector<COutPoint> missing_value_vector;
+    values.reserve(size);
+    missing_value_vector.reserve(size);
+
+    for (size_t i{0}; i < size; ++i) {
+        values.emplace(Txid::FromUint256(rng.rand256()), rng.rand32());
+        COutPoint missing_outpoint{Txid::FromUint256(rng.rand256()), rng.rand32()};
+        missing_value_vector.push_back(missing_outpoint);
+        assert(!values.contains(missing_outpoint));
+    }
+
+    bench.batch(size).run([&] {
+        bool result{false};
+        for (const auto& outpoint : missing_value_vector) {
+            result ^= values.contains(outpoint);
+        }
+        ankerl::nanobench::doNotOptimizeAway(result);
+    });
+}
+
+static void SaltedOutpointHasherBench_create_set(benchmark::Bench& bench)
+{
+    FastRandomContext rng{/*fDeterministic=*/true};
+    constexpr size_t size{1000};
+
+    std::vector<COutPoint> outpoints(size);
+    for (auto& outpoint : outpoints) {
+        outpoint = {Txid::FromUint256(rng.rand256()), rng.rand32()};
+    }
+
+    bench.batch(size).run([&] {
+        std::unordered_set<COutPoint, SaltedOutpointHasher> set;
+        set.reserve(size);
+        for (const auto& outpoint : outpoints) {
+            set.emplace(outpoint);
+        }
+        ankerl::nanobench::doNotOptimizeAway(set.size());
+    });
+}
+
 static void MuHash(benchmark::Bench& bench)
 {
     MuHash3072 acc;
@@ -276,6 +369,10 @@
 BENCHMARK(SHA256_32b_AVX2, benchmark::PriorityLevel::HIGH);
 BENCHMARK(SHA256_32b_SHANI, benchmark::PriorityLevel::HIGH);
 BENCHMARK(SipHash_32b, benchmark::PriorityLevel::HIGH);
+BENCHMARK(SaltedOutpointHasherBench_hash, benchmark::PriorityLevel::HIGH);
+BENCHMARK(SaltedOutpointHasherBench_match, benchmark::PriorityLevel::HIGH);
+BENCHMARK(SaltedOutpointHasherBench_mismatch, benchmark::PriorityLevel::HIGH);
+BENCHMARK(SaltedOutpointHasherBench_create_set, benchmark::PriorityLevel::HIGH);
 BENCHMARK(SHA256D64_1024_STANDARD, benchmark::PriorityLevel::HIGH);
 BENCHMARK(SHA256D64_1024_SSE4, benchmark::PriorityLevel::HIGH);
 BENCHMARK(SHA256D64_1024_AVX2, benchmark::PriorityLevel::HIGH);

cmake -B build -DBUILD_BENCH=ON -DCMAKE_BUILD_TYPE=Release && cmake --build build -j$(nproc) && build/bin/bench_bitcoin -filter='SaltedOutpointHasherBench' -min-time=10000

Before:

ns/op	op/s	err%	total	benchmark
58.60	17,065,922.04	0.3%	11.02	`SaltedOutpointHasherBench_create_set`
11.97	83,576,684.83	0.1%	11.01	`SaltedOutpointHasherBench_hash`
14.50	68,985,850.12	0.3%	10.96	`SaltedOutpointHasherBench_match`
13.90	71,942,033.47	0.4%	11.03	`SaltedOutpointHasherBench_mismatch`

After:

ns/op	op/s	err%	total	benchmark
57.27	17,462,299.19	0.1%	11.02	`SaltedOutpointHasherBench_create_set`
11.24	88,997,888.48	0.3%	11.04	`SaltedOutpointHasherBench_hash`
13.91	71,902,014.20	0.2%	11.01	`SaltedOutpointHasherBench_match`
13.29	75,230,390.31	0.1%	11.00	`SaltedOutpointHasherBench_mismatch`

compared to master:

create_set - 17,462,299.19 / 17,065,922.04 - 2.3% faster
hash       - 88,997,888.48 / 83,576,684.83 - 6.4% faster
match      - 71,902,014.20 / 68,985,850.12 - 4.2% faster
mismatch   - 75,230,390.31 / 71,942,033.47 - 4.5% faster

C++ compiler .......................... GNU 13.3.0

Before:

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
136.76	7,312,133.16	0.0%	1,086.67	491.12	2.213	119.54	1.1%	11.01	`SaltedOutpointHasherBench_create_set`
23.82	41,978,882.62	0.0%	252.01	85.57	2.945	4.00	0.0%	11.00	`SaltedOutpointHasherBench_hash`
60.42	16,549,695.42	0.1%	460.51	217.04	2.122	21.00	1.4%	10.99	`SaltedOutpointHasherBench_match`
78.66	12,713,595.35	0.1%	555.59	282.52	1.967	20.19	2.2%	10.74	`SaltedOutpointHasherBench_mismatch`

After:

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
135.38	7,386,349.49	0.0%	1,078.19	486.16	2.218	119.56	1.1%	11.00	`SaltedOutpointHasherBench_create_set`
23.67	42,254,558.08	0.0%	247.01	85.01	2.906	4.00	0.0%	11.00	`SaltedOutpointHasherBench_hash`
58.95	16,962,220.14	0.1%	446.55	211.74	2.109	20.86	1.4%	11.01	`SaltedOutpointHasherBench_match`
76.98	12,991,047.69	0.1%	548.93	276.50	1.985	20.25	2.3%	10.72	`SaltedOutpointHasherBench_mismatch`

compared to master:
create_set -  7,386,349.49 / 7,312,133.16  - 1.0% faster
hash       - 42,254,558.08 / 41,978,882.62 - 0.6% faster
match      - 16,962,220.14 / 16,549,695.42 - 2.4% faster
mismatch   - 12,991,047.69 / 12,713,595.35 - 2.1% faster

DrahtBot · 2024-07-12T15:01:40Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/30442.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	vasild, achow101, sipa
Concept ACK	jonatack
Approach ACK	Raimo33
Stale ACK	ismaelsadeeq, ryanofsky, laanwj

If your review is incorrectly listed, please copy-paste  into the comment that the bot should ignore.

Conflicts

No conflicts as of last run.

l0rinc · 2024-07-14T12:40:48Z

@andrewtoth, this is another tiny addition to the coincache speedup, your review would be welcome.

andrewtoth · 2024-07-14T15:36:36Z

I did not see any improvement in the benchmark with this change. Running ./src/bench/bench_bitcoin -filter=.*Out[pP]oint.*

commit 3b7b82b4b0c39a38538aae2cba10bec3907c5cbf

|               ns/op |                op/s |    err% |          ins/op |          cyc/op |         bra/op |   miss% |     total | benchmark
|--------------------:|--------------------:|--------:|----------------:|----------------:|---------------:|--------:|----------:|:----------
|                1.31 |      766,241,272.84 |    0.2% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `COutPoint_equality_match`
|                0.64 |    1,561,309,649.35 |    0.0% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `COutPoint_equality_mismatch`
|              107.62 |        9,292,298.54 |    1.7% |            0.00 |            0.00 |           0.00 |    0.0% |      0.10 | `SaltedOutpointHasherBenchmark_create_set`
|               23.36 |       42,799,791.14 |    0.0% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_hash`
|               48.78 |       20,502,210.98 |    0.1% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_match`
|               69.31 |       14,426,956.77 |    0.3% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_mismatch`

commit 7ac4e3aaf345a06fdde463100c45c4295d730820

|               ns/op |                op/s |    err% |          ins/op |          cyc/op |         bra/op |   miss% |     total | benchmark
|--------------------:|--------------------:|--------:|----------------:|----------------:|---------------:|--------:|----------:|:----------
|                1.30 |      766,440,414.89 |    0.0% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `COutPoint_equality_match`
|                1.02 |      982,018,502.07 |    0.2% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `COutPoint_equality_mismatch`
|              108.92 |        9,180,628.87 |    0.9% |            0.00 |            0.00 |           0.00 |    0.0% |      0.10 | `SaltedOutpointHasherBenchmark_create_set`
|               23.69 |       42,213,365.83 |    0.1% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_hash`
|               47.90 |       20,876,369.10 |    0.1% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_match`
|               70.10 |       14,265,655.03 |    0.1% |            0.00 |            0.00 |           0.00 |    0.0% |      0.01 | `SaltedOutpointHasherBenchmark_mismatch`

l0rinc · 2024-07-14T17:58:18Z

That's disappointing, thanks for checking, something's still off with my compiler, it seems.
After I finish benching #28280 (comment), I'll try this again on the dedicates server instead.
I'm also a bit surprised that the ratios are completely different compared to my measurements, e.g. SaltedOutpointHasherBenchmark_match and _mismatch are 40% off, while in my case they're basically equal. Are compilers this different?
Could you please send me the exact command and compiler versions you've used?
Thanks!

andrewtoth · 2024-07-15T15:55:44Z

Could you please send me the exact command and compiler versions you've used?

gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04)

I ran
./configure --enable-bench
make
./src/bench/bench_bitcoin -filter=.*Out[pP]oint.*

l0rinc · 2024-07-16T10:15:42Z

Now that the other benchmark finished after a few days, I ran this on a gcc (Debian 12.2.0-14) 12.2.0.

Outdated results

After the first run I got a warning of:

Warning, results might be unstable:

CPU frequency scaling enabled: CPU 0 between 800.0 and 4,200.0 MHz

CPU governor is 'powersave' but should be 'performance'

Turbo is enabled, CPU frequency will fluctuate

which I've fixed and also ran pyperf system tune.
Additionally I set a --min-time=10000, otherwise the results weren't consistent between runs. I ran each change twice to make sure they're stable.

before:

./configure --enable-bench
git checkout 7ac4e3aaf345a06fdde463100c45c4295d730820 && git reset --hard
make -j$(nproc) && ./src/bench/bench_bitcoin -filter='.*Out[pP]oint.*' --min-time=10000

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
135.01	7,406,978.51	0.1%	1,060.42	485.49	2.184	120.72	1.1%	11.05	`SaltedOutpointHasherBenchmark_create_set`
23.89	41,860,205.94	0.0%	252.01	85.94	2.932	4.00	0.0%	11.00	`SaltedOutpointHasherBenchmark_hash`
59.81	16,719,701.99	0.1%	451.14	215.16	2.097	20.83	1.5%	11.00	`SaltedOutpointHasherBenchmark_match`
79.21	12,624,726.37	0.0%	566.84	284.97	1.989	20.50	2.3%	10.74	`SaltedOutpointHasherBenchmark_mismatch`

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
133.71	7,479,023.41	0.0%	1,060.38	480.97	2.205	120.72	1.1%	11.03	`SaltedOutpointHasherBenchmark_create_set`
23.87	41,894,947.89	0.0%	252.01	85.88	2.935	4.00	0.0%	11.00	`SaltedOutpointHasherBenchmark_hash`
60.05	16,652,312.90	0.1%	452.20	216.05	2.093	20.86	1.3%	11.00	`SaltedOutpointHasherBenchmark_match`
79.90	12,515,491.22	0.1%	566.85	287.46	1.972	20.50	2.3%	10.74

after:

git checkout 3b7b82b4b0c39a38538aae2cba10bec3907c5cbf && git reset --hard
make -j$(nproc) && ./src/bench/bench_bitcoin -filter='.*Out[pP]oint.*' --min-time=10000

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
132.60	7,541,596.87	0.0%	1,045.84	476.97	2.193	120.72	1.1%	11.03	`SaltedOutpointHasherBenchmark_create_set`
23.43	42,674,820.33	0.0%	246.01	84.29	2.918	4.00	0.0%	11.00	`SaltedOutpointHasherBenchmark_hash`
58.90	16,977,444.58	0.0%	444.45	211.91	2.097	20.92	1.3%	11.00	`SaltedOutpointHasherBenchmark_match`
78.29	12,773,764.99	0.0%	544.01	281.65	1.932	20.29	2.6%	10.73	`SaltedOutpointHasherBenchmark_mismatch`

ns/op	op/s	err%	ins/op	cyc/op	IPC	bra/op	miss%	total	benchmark
132.75	7,533,102.65	0.0%	1,045.87	477.53	2.190	120.72	1.1%	11.02	`SaltedOutpointHasherBenchmark_create_set`
23.44	42,660,977.02	0.0%	246.01	84.33	2.917	4.00	0.0%	11.00	`SaltedOutpointHasherBenchmark_hash`
59.05	16,934,798.45	0.0%	444.96	212.44	2.094	20.93	1.3%	11.01	`SaltedOutpointHasherBenchmark_match`
76.32	13,103,542.96	0.1%	531.55	274.56	1.936	19.99	2.4%	10.71	`SaltedOutpointHasherBenchmark_mismatch`

Resulting in:

SaltedOutpointHasherBenchmark_create_set: Before Avg = 7443000.96, After Avg = 7537349.76, Increase = 1.27%

SaltedOutpointHasherBenchmark_hash: Before Avg = 41877576.91, After Avg = 42667898.67, Increase = 1.89%

SaltedOutpointHasherBenchmark_match: Before Avg = 16686007.45, After Avg = 16956121.52, Increase = 1.62%

SaltedOutpointHasherBenchmark_mismatch: Before Avg = 12570108.79, After Avg = 12938653.98, Increase = 2.93%

@andrewtoth, what do you think, can you try reproducing these results?

andrewtoth · 2024-07-25T03:24:41Z

Based on your benchmark results, I don't think this can be called an optimization. It seems to be worse for one benchmark, better in another, and roughly the same for the rest. The description also notes that this will not be noticeable by users. In light of that, does the motivation for this PR still hold?

l0rinc · 2024-07-26T18:11:05Z

I've removed the COutPoint_equality changes and benchmarks (updated the comments to avoid confusion), the SaltedOutpointHasher speed gains remain.
I'll let you decide if it's worth doing the change or not.

DrahtBot · 2024-08-30T16:18:44Z

🚧 At least one of the CI tasks failed.
_{Debug: https://github.com/bitcoin/bitcoin/runs/27977216903}

Hints

Make sure to run all tests locally, according to the documentation.

The failure may happen due to a number of reasons, for example:

Possibly due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the
affected test.
An intermittent issue.

Leave a comment here, if you need help tracking down a confusing failure.

l0rinc · 2024-10-16T13:15:51Z

@laanwj This is the optimization that relies on #30349, would really appreciate you input on it.

laanwj

re-ACK 1b810390fe51b79c7063966c9722c01cb8a4f7bf

Since last review:

git range-diff  9b1a7c3e8dd78d97fbf47c2d056d043b05969176..89bbbbd257063118e6968c409e52632835b76ce8   17072f70051dc086ef57880cd14e102ed346c350..1b810390fe51b79c7063966c9722c01cb8a4f7bf

test: Rename k1/k2 to k0/k1 in SipHash consistency tests: - Reordering in testcase, no functional change
refactor: Extract SipHash C0-C3 constants to class scope - No changes
optimization: Introduce PresaltedSipHasher for repeated hashing - No changes
optimization: Migrate SipHashUint256 to PresaltedSipHasher- Constructor of SaltedOutpointHasher is no longer explicit (because of clang compiler problem)
optimization: Cache PresaltedSipHasher in CBlockHeaderAndShortTxIDs - using m_hasher.emplace instead of assignment
refactor: extract shared SipHash state into SipSalt - new commit that adds SipSalt

vasild

ACK 1b810390fe51b79c7063966c9722c01cb8a4f7bf

I ran the benchmark locally with Clang 19.1.7, AMD Ryzen 9 7950X 16-Core Processor. Results look like there is no difference between baseline and PR. Some small differences, within noise.

Base (commit 17072f7):

Run1:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               48.97 |       20,418,823.09 |    0.9% |     10.96 | `SaltedOutpointHasherBench_create_set`
|               14.33 |       69,776,056.99 |    0.4% |     11.05 | `SaltedOutpointHasherBench_hash`
|               19.47 |       51,362,607.21 |    0.0% |     11.00 | `SaltedOutpointHasherBench_match`
|               21.25 |       47,053,290.74 |    0.3% |     10.98 | `SaltedOutpointHasherBench_mismatch`

Run2:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               48.81 |       20,487,856.38 |    0.1% |     11.05 | `SaltedOutpointHasherBench_create_set`
|               14.27 |       70,084,347.54 |    0.0% |     11.00 | `SaltedOutpointHasherBench_hash`
|               19.46 |       51,382,170.68 |    0.0% |     11.02 | `SaltedOutpointHasherBench_match`
|               21.43 |       46,669,856.50 |    0.0% |     11.00 | `SaltedOutpointHasherBench_mismatch`

Run3:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               49.36 |       20,260,805.67 |    0.9% |     11.06 | `SaltedOutpointHasherBench_create_set`
|               13.75 |       72,725,254.69 |    0.1% |     10.93 | `SaltedOutpointHasherBench_hash`
|               19.52 |       51,226,387.84 |    0.0% |     11.14 | `SaltedOutpointHasherBench_match`
|               21.60 |       46,305,221.96 |    0.0% |     11.01 | `SaltedOutpointHasherBench_mismatch`

PR (commit 1b810390fe):

Run1:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               48.72 |       20,524,123.94 |    1.2% |     11.06 | `SaltedOutpointHasherBench_create_set`
|               14.01 |       71,380,265.60 |    0.0% |     11.11 | `SaltedOutpointHasherBench_hash`
|               19.47 |       51,370,476.21 |    0.0% |     11.01 | `SaltedOutpointHasherBench_match`
|               21.18 |       47,210,124.11 |    0.0% |     10.97 | `SaltedOutpointHasherBench_mismatch`

Run2:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               49.36 |       20,258,873.40 |    0.0% |     11.04 | `SaltedOutpointHasherBench_create_set`
|               14.01 |       71,378,874.75 |    0.0% |     11.00 | `SaltedOutpointHasherBench_hash`
|               19.62 |       50,965,878.36 |    0.0% |     10.95 | `SaltedOutpointHasherBench_match`
|               21.16 |       47,266,678.01 |    0.5% |     10.96 | `SaltedOutpointHasherBench_mismatch`

Run3:
|               ns/op |                op/s |    err% |     total | benchmark
|--------------------:|--------------------:|--------:|----------:|:----------
|               49.18 |       20,335,225.87 |    0.1% |     11.08 | `SaltedOutpointHasherBench_create_set`
|               13.97 |       71,600,134.68 |    0.1% |     10.97 | `SaltedOutpointHasherBench_hash`
|               19.25 |       51,935,316.71 |    0.0% |     11.00 | `SaltedOutpointHasherBench_match`
|               21.35 |       46,840,509.09 |    0.0% |     11.00 | `SaltedOutpointHasherBench_mismatch`

l0rinc · 2025-12-01T10:21:43Z

Thanks for the review @laanwj and @vasild.

Results look like there is no difference between baseline and PR. Some small differences, within noise.

Your benchmarking machine had quite the fluctuation, I usually try to stabilize the system before measuring these, see:

bitcoin/src/bench/nanobench.h

Line 2078 in fe434a4

    
           recommendations.emplace_back("Use 'pyperf system tune' before benchmarking. See https://github.com/psf/pyperf");

Plotting the result you posted for Clang:

the same with GCC:

The last commit (suggested by @ryanofsky) does seem to introduce an extra indirection that slows Clang down a bit - plotting your results you sent me out of band for the commit before the last one:

Is there anything to do here, should I drop the last commit or do we accept that the the main compiler (GCC) is able to optimize around it and Clang will likely catch up?

vasild · 2025-12-03T09:53:15Z

should I drop the last commit

I am fine either way. Would be interested to see what other reviewers think.

sipa

Approach ACK.

I care more about the code cleanup aspect here than the performance gains, so keeping the last commit seems reasonable to me.

sipa · 2025-12-08T15:58:22Z

src/util/hasher.cpp


-size_t SaltedSipHasher::operator()(const std::span<const unsigned char>& script) const
-{
+size_t SaltedSipHasher::operator()(const std::span<const unsigned char>& script) const {


In commit "optimization: introduce PresaltedSipHasher for repeated hashing"

Unrelated change, which does not match style guide.

Indeed, sounds like a nit - are you okay with doing this in a follow-up?

sipa · 2025-12-08T16:05:11Z

src/crypto/siphash.h

-/** SipHash-2-4 */
-class CSipHasher
+// Shared SipHash internal state v[0..3], initialized from (k0, k1).
+class SipSalt


In commit "refactor: extract shared SipHash state into SipSalt"

Given that instances of this class are apprently used for the internal state in CSipHasher and PresaltedSipHasher, maybe it would be more appropriate to call it SipHashState or so?

I don't mind doing that in a follow up, it's actually closer to what @ryanofsky suggested.

Updated the last commit: 1b810390fe51b79c7063966c9722c01cb8a4f7bf..6eb5ba569141b722a5e27ef36e04994886769c44#diff-66e9563fc5

sipa · 2025-12-08T16:08:00Z

src/crypto/siphash.h


+    // Equivalent to CSipHasher(k0, k1).Write(val).Finalize().


In commit "refactor: extract shared SipHash state into SipSalt"

These could be doxygen comments (/** Equivalent to ... */).

Will do in a follow-up, thanks.

Done throughout the class, thanks: 1b810390fe51b79c7063966c9722c01cb8a4f7bf..6eb5ba569141b722a5e27ef36e04994886769c44#diff-66e9563fc5

l0rinc

Thanks for the review @sipa, are you okay with doing the suggestions in a follow up?

l0rinc · 2025-12-09T10:20:23Z

src/util/hasher.cpp


-size_t SaltedSipHasher::operator()(const std::span<const unsigned char>& script) const
-{
+size_t SaltedSipHasher::operator()(const std::span<const unsigned char>& script) const {


Indeed, sounds like a nit - are you okay with doing this in a follow-up?

l0rinc · 2025-12-09T10:21:25Z

src/crypto/siphash.h

-/** SipHash-2-4 */
-class CSipHasher
+// Shared SipHash internal state v[0..3], initialized from (k0, k1).
+class SipSalt


I don't mind doing that in a follow up, it's actually closer to what @ryanofsky suggested.

l0rinc · 2025-12-09T10:21:40Z

src/crypto/siphash.h


+    // Equivalent to CSipHasher(k0, k1).Write(val).Finalize().


Will do in a follow-up, thanks.

vasild · 2025-12-09T14:17:21Z

I would be happy to re-review and re-ACK.

sipa · 2025-12-09T14:32:51Z

If we're going to make substantial changes here, I'd rather do it properly at once.

Aligns test variable naming with the `k0`/`k1` convention used consistently throughout the codebase for `SipHash` keys. Also splits the single-param `SipHash` test from the one with extra, for clarity.

Moves the `SipHash` initialization constants (C0-C3) from magic numbers to named static constexpr members of `CSipHasher`.

Replaces the `SipHashUint256Extra` function with the `PresaltedSipHasher` class that caches the constant-salted state (v[0-3] after XORing with keys). This avoids redundant XOR operations when hashing multiple values with the same keys, benefiting use cases like `SaltedOutpointHasher`. This essentially brings the precalculations in the `CSipHasher` constructor to the `uint256`-specialized SipHash implementation. > cmake -B build -DBUILD_BENCH=ON -DCMAKE_BUILD_TYPE=Release && cmake --build build -j$(nproc) && build/src/bench/bench_bitcoin -filter='SaltedOutpointHasherBench.*' -min-time=10000 > C++ compiler .......................... AppleClang 16.0.0.16000026 | ns/op | op/s | err% | total | benchmark |--------------------:|--------------------:|--------:|----------:|:---------- | 57.27 | 17,462,299.19 | 0.1% | 11.02 | `SaltedOutpointHasherBench_create_set` | 11.24 | 88,997,888.48 | 0.3% | 11.04 | `SaltedOutpointHasherBench_hash` | 13.91 | 71,902,014.20 | 0.2% | 11.01 | `SaltedOutpointHasherBench_match` | 13.29 | 75,230,390.31 | 0.1% | 11.00 | `SaltedOutpointHasherBench_mismatch` compared to master: create_set - 17,462,299.19/17,065,922.04 - 2.3% faster hash - 88,997,888.48/83,576,684.83 - 6.4% faster match - 71,902,014.20/68,985,850.12 - 4.2% faster mismatch - 75,230,390.31/71,942,033.47 - 4.5% faster > C++ compiler .......................... GNU 13.3.0 | ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 135.38 | 7,386,349.49 | 0.0% | 1,078.19 | 486.16 | 2.218 | 119.56 | 1.1% | 11.00 | `SaltedOutpointHasherBench_create_set` | 23.67 | 42,254,558.08 | 0.0% | 247.01 | 85.01 | 2.906 | 4.00 | 0.0% | 11.00 | `SaltedOutpointHasherBench_hash` | 58.95 | 16,962,220.14 | 0.1% | 446.55 | 211.74 | 2.109 | 20.86 | 1.4% | 11.01 | `SaltedOutpointHasherBench_match` | 76.98 | 12,991,047.69 | 0.1% | 548.93 | 276.50 | 1.985 | 20.25 | 2.3% | 10.72 | `SaltedOutpointHasherBench_mismatch` compared to master: create_set - 7,386,349.49/7,312,133.16 - 1% faster hash - 42,254,558.08/41,978,882.62 - 0.6% faster match - 16,962,220.14/16,549,695.42 - 2.4% faster mismatch - 12,991,047.69/12,713,595.35 - 2% faster Co-authored-by: sipa <[email protected]>

Replaces standalone `SipHashUint256` with an `operator()` overload in `PresaltedSipHasher`. Updates all hasher classes (`SaltedUint256Hasher`, `SaltedTxidHasher`, `SaltedWtxidHasher`) to use `PresaltedSipHasher` internally, enabling the same constant-state caching optimization while keeping behavior unchanged. Benchmark was also adjusted to cache the salting part.

Replaces separate `shorttxidk0`/`shorttxidk1` members with a cached `PresaltedSipHasher`, so `GetShortID()` reuses the precomputed `SipHash` state instead of rebuilding it on every call. `CBlockHeaderAndShortTxIDs` was never intended to be used before `FillShortTxIDSelector()` runs; doing so already relied on indeterminate salt values. The new `Assert(m_hasher)` just makes this invariant explicit and fails fast if the object is used in an uninitialized state.

Split the repeated `SipHash` v[0..3] initialization into a small `SipHashState` helper that is used by both `CSipHasher` and `PresaltedSipHasher`. Added explanatory comments to clarify behavior, documenting the equivalence of `PresaltedSipHasher` `operator()` overloads to `CSipHasher` usage. Co-authored-by: Ryan Ofsky <[email protected]>

vasild

ACK 6eb5ba5

achow101 · 2025-12-10T22:16:20Z

ACK 6eb5ba5

sipa

ACK 6eb5ba5

938d7aacab Merge bitcoin/bitcoin#33657: rest: allow reading partial block data from storage 597b8be223 Merge bitcoin/bitcoin#34025: net: Waste less time in socket handling d155fc12a0 Merge bitcoin/bitcoin#32414: validation: periodically flush dbcache during reindex-chainstate 07135290c1 rest: allow reading partial block data from storage 4e2af1c065 blockstorage: allow reading partial block data from storage f2fd1aa21c blockstorage: return an error code from `ReadRawBlock()` 5be20c380d Merge bitcoin/bitcoin#34033: scripted-diff: Unify error and warning log formatting b31f786695 Merge bitcoin/bitcoin#34045: test: Log IP of download server in get_previous_releases.py b26762bdcb Merge bitcoin/bitcoin#33805: merkle: migrate `path` arg to reference and drop unused args 0f6d8a347a Merge bitcoin/bitcoin#30442: precalculate SipHash constant salt XORs c2975f26d6 Merge bitcoin/bitcoin#33602: [IBD] coins: reduce lookups in dbcache layer propagation cdaf25f9c3 test: Log IP of download server in get_previous_releases.py c1f0a89d9c Merge bitcoin/bitcoin#34040: test: Detect truncated download in get_previous_releases.py fa75480c84 test: Detect truncated download in get_previous_releases.py 56ce78d5f6 Merge bitcoin/bitcoin#34031: net: Remove "tor" as a network specification 500862b2d4 Merge bitcoin/bitcoin#33423: qa: Improvements to debug_assert_log + busy_wait_for_debug_log 5f5c1ea019 net: Cache -capturemessages setting cca113f5b0 Merge bitcoin/bitcoin#34008: log: don't rate-limit "new peer" with -debug=net 2c44c41984 Merge bitcoin/bitcoin#33553: validation: Improve warnings in case of chain corruption 6eb5ba5691 refactor: extract shared `SipHash` state into `SipHashState` 118d22ddb4 optimization: cache `PresaltedSipHasher` in `CBlockHeaderAndShortTxIDs` 9ca52a4cbe optimization: migrate `SipHashUint256` to `PresaltedSipHasher` ec11b9fede optimization: introduce `PresaltedSipHasher` for repeated hashing d23d49ee3f Merge bitcoin/bitcoin#31823: tests: Add witness commitment if we have a witness transaction in `FullBlockTest.update_block()` 20330548cf refactor: extract `SipHash` C0-C3 constants to class scope 9f9eb7fbc0 test: rename k1/k2 to k0/k1 in `SipHash` consistency tests 29ed608dc7 Merge bitcoin/bitcoin#33961: script: Add a separate ScriptError for empty pubkeys encountered in Tapscript d2a199bca7 Merge bitcoin/bitcoin#33909: doc, ci: Make the max number of commits tested explicit dbc8928069 Merge bitcoin/bitcoin#33993: init: point out -stopatheight may be imprecise d4d184eda9 log: don't rate-limit "new peer" with -debug=net e7ac5a133c doc: add release note for 34031 c4c70a256e netbase: Remove "tor" as a network specification fa89f60e31 scripted-diff: LogPrintLevel(*,BCLog::Level::*,*) -> LogError()/LogWarning() fa6c7a1954 scripted-diff: LogPrintLevel(*,BCLog::Level::Debug,*) -> LogDebug() d5c8199b79 Merge bitcoin/bitcoin#34006: Add util::Expected (std::expected) 77248e8496 Merge bitcoin/bitcoin#33771: refactor: C++20 operators 36073d56db Merge bitcoin/bitcoin#33952: depends: update freetype and document remaining `bitcoin-qt` runtime libs f09ae5f96f Merge bitcoin/bitcoin#33950: guix: reduce allowed exported symbols cea443e246 net: Pass time to InactivityChecks fuctions 89dc82295e Merge bitcoin/bitcoin#29641: scripted-diff: Use LogInfo over LogPrintf eb19a2dac5 Merge bitcoin/bitcoin#34017: fuzz: Add a test case for `ParseByteUnits()` faa23738fc refactor: Enable clang-tidy bugprone-unused-return-value fa114be27b Add util::Expected (std::expected) e68517208b Merge bitcoin/bitcoin#33995: depends: Propagate native C compiler to `sqlite` package 091cae6fdf Merge bitcoin/bitcoin#33939: contrib: Count entry differences in asmap-tool diff summary 57b888ce0e fuzz: Add a test case for `ParseByteUnits()` b8e66b901d Merge bitcoin/bitcoin#33858: test: add unit test coverage for the empty leaves path in MerkleComputation 0c9ab0f8f8 Merge bitcoin/bitcoin#33956: net: fix use-after-free with v2->v1 reconnection logic fa4395dffd refactor: Remove unused LogPrintf fa05181d90 scripted-diff: LogPrintf -> LogInfo 9890058b37 Merge bitcoin/bitcoin#33723: chainparams: remove dnsseed.bitcoin.dashjr-list-of-p2p-nodes.us 9e02f78089 Merge bitcoin/bitcoin#33774: cmake: Move IPC tests to `ipc/test` ad452a1e65 Merge bitcoin/bitcoin#33528: wallet: don't consider unconfirmed TRUC coins with ancestors ff06e2468a init: point out -stopatheight may be imprecise 9a29b2d331 Merge bitcoin/bitcoin#33857: doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 69e66efe45 Merge bitcoin/bitcoin#32882: index: remove unnecessary locator cleaning in BaseIndex::Init() 6581ac5d9f Merge bitcoin/bitcoin#33996: contrib: fix manpage generation 39ca015259 Merge bitcoin/bitcoin#33140: test: Avoid shutdown race in NetworkThread e9536faaee contrib: fix manpage generation bcf794d5f3 Merge bitcoin/bitcoin#30455: test: assumeutxo: add missing tests in wallet_assumeutxo.py af0e6a65c9 Merge bitcoin/bitcoin#33702: contrib: Remove brittle, confusing and redundant UTF8 encoding from Python IO 4b47113698 validation: Reword CheckForkWarningConditions and call it also during IBD and at startup 2f51951d03 p2p: Add warning message when receiving headers for blocks cached as invalid 4c784b25c4 Merge bitcoin/bitcoin#33985: fuzz: gate mempool entry based on weight 710031ebef Revert "guix: sqlite wants tcl" 4cf5ea6c3d depends: Propagate native C compiler to `sqlite` package ce771726f3 Merge bitcoin/bitcoin#33960: log: Use more severe log level (warn/err) where appropriate cb7d5bfe4a test, assumeutxo: loading a wallet (backup) on a pruned node 7a365244f8 test, refactor snapshot import and background validation e0ba6bbed9 Merge bitcoin/bitcoin#33591: Cluster mempool followups b8d279a81c doc: add comment to explain correctness of GatherClusters() aba7500a30 Fix parameter name in getmempoolcluster rpc 6c1325a091 Rename weight -> clusterweight in RPC output, and add doc explaining mempool terminology bc2eb931da Require mempool lock to be held when invoking TRUC checks 957ae23241 Improve comments for getTransactionAncestry to reference cluster counts instead of descendants d97d6199ce Fix comment to reference cluster limits, not chain limits a1b341ef98 Sanity check feerate diagram in CTxMemPool::check() 23d6f457c4 rpc: improve getmempoolcluster output d2dcd37aac Avoid using mapTx.modify() to update modified fees d84ffc24d2 doc: add release notes snippet for cluster mempool b0417ba944 doc: Add design notes for cluster mempool and explain new mempool limits 804329400a fuzz: gate mempool entry based on weight 6356041e58 Merge bitcoin/bitcoin#33972: cmake: Make `BUILD_KERNEL_TEST` depend on `BUILD_KERNEL_LIB` 7d7cb1bb48 Merge bitcoin/bitcoin#33971: cmake: Set `WITH_ZMQ` to `ON` in Windows presets 2d88966e43 miner: replace "package" with "chunk" 6f3e8eb300 Add a GetFeePerVSize() accessor to CFeeRate, and use it in the BlockAssembler b5f245f6f2 Remove unused DEFAULT_ANCESTOR_SIZE_LIMIT_KVB and DEFAULT_DESCENDANT_SIZE_LIMIT_KVB 1dac54d506 Use cluster size limit instead of ancestor size limit in txpackage unit test 04f65488ca Use cluster size limit instead of ancestor/descendant size limits when sanity checking TRUC policy limits 634291a7dc Use cluster limits instead of ancestor/descendant limits when sanity checking package policy limits fc18ef1f3f Remove ancestor and descendant vsize limits from MemPoolLimits ed8e819121 Warn user if using -limitancestorsize/-limitdescendantsize that the options have no effect 80d8df2d47 Invoke removeUnchecked() directly in removeForBlock() 9292570f4c Rewrite GetChildren without sets 3e39ea8c30 Rewrite removeForReorg to avoid using sets a3c31dfd71 scripted-diff: rename AddToMempool -> TryAddToMempool a5a7905d83 Simplify removeRecursive 01d8520038 Remove unused argument to RemoveStaged fe1815d48f cmake: Make `BUILD_KERNEL_TEST` depend on `BUILD_KERNEL_LIB` 49c6728535 cmake: Set `WITH_ZMQ` to `ON` in Windows presets ec8eb013a9 doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 48496caa12 ci: Remove redundant `DEP_OPTS` from “Windows-cross UCRT” job f6acbef108 Merge bitcoin/bitcoin#33764: ci: Add Windows + UCRT jobs for cross-compiling and native testing b5a7a685bb ci: Make the max number of commits tested explicit 9d5021a05b script: add SCRIPT_ERR_TAPSCRIPT_EMPTY_PUBKEY 7b90b4f5bb guix: reduce allowed exported symbols 41e657aacf guix: add bitcoin-qt runtime libs doc in symbol-check ef4ce19a15 depends: freetype 2.11.1 808f1d972b Merge bitcoin/bitcoin#32009: contrib: turn off compression of macOS SDK to fix determinism (across distros) 4de26b111f Merge bitcoin/bitcoin#33514: ci: clear out space on CentOS, depends, gui GHA job fa45a1503e log: Use LogWarning for non-critical logs fa0018d011 log: Use LogError for fatal errors 22229de728 doc: Fix typo in init log 38c8474d0d Merge bitcoin/bitcoin#33914: Change Parse descriptor argument to string_view 4b25b274de Merge bitcoin/bitcoin#33951: test: check for output to stdout in `TestShell` test 167df7a98c net: fix use-after-free with v2->v1 reconnection logic 52230a7f69 test: check for output to stdout in `TestShell` test 85d058dc53 Merge bitcoin/bitcoin#33946: interfaces: remove redundant mempool lock in ChainImpl::isInMempool() fd4ce55121 contrib: Count entry differences in asmap-tool diff summary e07e57368e ci: clear out space on centos job 79d6e874e1 Merge bitcoin/bitcoin#32587: test: Fix reorg patterns in tests to use proper fork-based approach e249ea7da6 Merge bitcoin/bitcoin#33945: depends: latest config.guess & config.sub 3e01b5d0e7 contrib: rename gen-sdk to gen-sdk.py c1213a35ab macdeploy: disable compression in macOS gen-sdk script a33d034545 contrib: more selectively pick files for macOS SDK fad6118586 test: Fix "typo" in written invalid content fab085c15f contrib: Use text=True in subprocess over manual encoding handling fa71c15f86 scripted-diff: Bump copyright headers after encoding changes fae612424b contrib: Remove confusing and redundant encoding from IO fa7d72bd1b lint: Drop check to enforce encoding to be specified in Python scripts faf39d8539 test: Clarify that Python UTF-8 mode is the default today for most systems fa83e3a81d lint: Do not allow locale dependent shell scripts 70d9e8f0a1 fix: reorg behaviour in mempool tests to match real one 540ed333f6 Move the create_empty_fork method to the test framework's blocktools.py module to enable reuse across multiple tests. 2909655fba fix: remove redundant mempool lock in ChainImpl::isInMempool() d5ed4ba9d8 Merge bitcoin/bitcoin#33906: depends: Add patch for Windows11Style plugin 3e4355314b depends: latest config.sub 04eb84fe3f depends: latest config.guess b30262dcaa Merge bitcoin/bitcoin#33903: ci: Remove redundant busybox option 1a5f1eb080 Merge bitcoin/bitcoin#33921: doc: clarify and cleanup macOS fuzzing notes 72cb8cef97 Merge bitcoin/bitcoin#33862: txgraph: drop move assignment operator bc64013e6f Remove unused variable (cacheMap) in mempool ade0397f59 txgraph: drop move assignment operator 5336bcd578 Merge bitcoin/bitcoin#33855: kernel: add btck_block_tree_entry_equals 4f65a1c5db Merge bitcoin/bitcoin#33917: clang-format: Set Bitcoin Core IncludeCategories 902717b66d Merge bitcoin/bitcoin#33918: depends: Update Qt download link 68ab2b65bf Merge bitcoin/bitcoin#33919: ci: Run GUI unit tests in cross-Windows task 7e129b644e Merge bitcoin/bitcoin#33893: test: add `-alertnotify` test for large work invalid chain warning 5fe753b56f Merge bitcoin/bitcoin#32655: depends: sqlite 3.50.4; switch to autosetup ff8c2f3749 Merge bitcoin/bitcoin#33932: ci: Use latest Xcode that the minimum macOS version allows fa283d28e2 Merge bitcoin/bitcoin#33629: Cluster mempool 2e27bd9c3a ci: Add Windows + UCRT jobs for cross-compiling and native testing 238c1c8933 Merge bitcoin-core/gui#914: Revert "gui, qt: brintToFront workaround for Wayland" 8343a9ffcc test: add `-alertnotify` test for large work invalid chain warning c34bc01b2f doc: clarify and cleanup macOS fuzzing notes fa9537cde1 ci: Use latest Xcode that the minimum macOS version allows 17cf9ff7ef Use cluster size limit for -maxmempool bound, and allow -maxmempool=0 in general 315e43e5d8 Sanity check `GetFeerateDiagram()` in CTxMemPool::check() de2e9a24c4 test: extend package rbf functional test to larger clusters 4ef4ddb504 doc: update policy/packages.md for new package acceptance logic 79f73ad713 Add check that GetSortedScoreWithTopology() agrees with CompareMiningScoreWithTopology() a86ac11768 Update comments for CTxMemPool class 9567eaa66d Invoke TxGraph::DoWork() at appropriate times bd130db994 ci: Rename items specific to Windows + MSVCRT 0672e727bf Revert "gui, qt: brintToFront workaround for Wayland" fa7ea497c3 ci: Run GUI unit tests in cross-Windows task fa0fee44a8 ci: Remove redundant busybox option fa102ec69f doc: Shorten ci name fa7e222a23 clang-format: Set Bitcoin Core IncludeCategories 2222223780 doc: Remove bash -c wrapper 50cbde3295 depends: Update Qt download link c0bfe72f6e Change Parse descriptor argument to string_view 8558902e57 depends: Add patch for Windows11Style plugin 6c5c44f774 test: add functional test for new cluster mempool RPCs 72f60c877e doc: Update mempool_replacements.md to reflect feerate diagram checks 21693f031a Expose cluster information via rpc 72e74e0d42 fuzz: try to add more code coverage for mempool fuzzing f107417490 bench: add more mempool benchmarks 7976eb1ae7 Avoid violating mempool policy limits in tests 84de685cf7 Stop tracking parents/children outside of txgraph 88672e205b Rewrite GatherClusters to use the txgraph implementation 1ca4f01090 Fix miniminer_tests to work with cluster limits 1902111e0f Eliminate CheckPackageLimits, which no longer does anything 3a646ec462 Rework RBF and TRUC validation 19b8479868 Make getting parents/children a function of the mempool, not a mempool entry 5560913e51 Rework truc_policy to use descendants, not children a4458d6c40 Use txgraph to calculate descendants c8b6f70d64 Use txgraph to calculate ancestors 241a3e666b Simplify ancestor calculation functions b9cec7f0a1 Make removeConflicts private 0402e6c780 Remove unused limits from CalculateMemPoolAncestors 08be765ac2 Remove mempool logic designed to maintain ancestor/descendant state fc4e3e6bc1 Remove unused members from CTxMemPoolEntry ff3b398d12 mempool: eliminate accessors to mempool entry ancestor/descendant cached state b9a2039f51 Eliminate use of cached ancestor data in miniminer_tests and truc_policy ba09fc9774 mempool: Remove unused function CalculateDescendantMaximum 8e49477e86 wallet: Replace max descendant count with cluster_count e031085fd4 Eliminate Single-Conflict RBF Carve Out cf3ab8e1d0 Stop enforcing descendant size/count limits 89ae38f489 test: remove rbf carveout test from mempool_limit.py c0bd04d18f Calculate descendant information for mempool RPC output on-the-fly bdcefb8a8b Use mempool/txgraph to determine if a tx has descendants 69e1eaa6ed Add test case for cluster size limits to TRUC logic 9cda64b86c Stop enforcing ancestor size/count limits 1f93227a84 Remove dependency on cached ancestor data in mini-miner 9fbe0a4ac2 rpc: Calculate ancestor data from scratch for mempool rpc calls 7961496dda Reimplement GetTransactionAncestry() to not rely on cached data feceaa42e8 Remove CTxMemPool::GetSortedDepthAndScore 21b5cea588 Use cluster linearization for transaction relay sort order 6445aa7d97 Remove the ancestor and descendant indices from the mempool 216e693729 Implement new RBF logic for cluster mempool ff8f115dec policy: Remove CPFP carveout rule c3f1afc934 test: rewrite PopulateMempool to not violate mempool policy (cluster size) limits 47ab32fdb1 Select transactions for blocks based on chunk feerate dec138d1dd fuzz: remove comparison between mini_miner block construction and miner 6c2bceb200 bench: rewrite ComplexMemPool to not create oversized clusters 1ad4590f63 Limit mempool size based on chunk feerate b11c89cab2 Rework miner_tests to not require large cluster limit 95a8297d48 Check cluster limits when using -walletrejectlongchains 95762e6759 Do not allow mempool clusters to exceed configured limits edb3e7cdf6 [test] rework/delete feature_rbf tests requiring large clusters 435fd56711 test: update feature_rbf.py replacement test 34e32985e8 Add new (unused) limits for cluster size/count 838d7e3553 Add transactions to txgraph, but without cluster dependencies a7c96f874d tests: Add witness commitment if we have a witness transaction in FullBlockTest.update_block() 096924d39d kernel: add btck_block_tree_entry_equals ffcae82a68 test: exercise TransactionMerklePath with empty block; targets the MerkleComputation empty-leaves path that was only reached by fuzz tests d5ed9cb3eb Add accessor for sigops-adjusted weight 1bf3b51396 Add sigops adjusted weight calculator c18c68a950 Create a txgraph inside CTxMemPool 29a94d5b2f Make CTxMemPoolEntry derive from TxGraph::Ref 92b0079fe3 Allow moving CTxMemPoolEntry objects, disallow copying 24ed820d4f merkle: remove unused `mutated` arg from `BlockWitnessMerkleRoot` 63d640fa6a merkle: remove unused `proot` and `pmutated` args from `MerkleComputation` be270551df merkle: migrate `path` arg of `MerkleComputation` to a reference 866bbb98fd cmake, test: Improve locality of `bitcoin_ipc_test` library description ae2e438b25 cmake: Move IPC tests to `ipc/test` 48840bfc2d refactor: Prefer `<=>` over multiple relational operators 5a0f49bd26 refactor: Remove all `operator!=` definitions 0ac969cddf validation: don't reallocate cache for short-lived CCoinsViewCache c8f5e446dc coins: reduce lookups in dbcache layer propagation 1db7491470 depends: sqlite 3.50.4 286f3e49c8 guix: sqlite wants tcl b0c706795c Remove unreliable seed from chainparams.cpp, and the associated README 6c73e47448 mempool: Store iterators into mapTx in mapNextTx 51430680ec Allow moving an Epoch::Marker dcd42d6d8f [test] wallet send 3 generation TRUC e753fadfd0 [wallet] never try to spend from unconfirmed TRUC that already has ancestors fa6db79302 test: Avoid shutdown race in NetworkThread a1f7623020 qa: Only complain about expected messages that were not found 1e54125e2e refactor(qa): Avoid unnecessary string operations a9021101dc qa: Replace always-escaped regexps with "X in Y" 5c16e4631c doc: Remove no longer correct comment facd01e6ff refactor: remove redundant locator cleanup in BaseIndex::Init() c1e554d3e5 refactor: consolidate 3 separate locks into one block 41479ed1d2 test: add test for periodic flush inside ActivateBestChain 84820561dc validation: periodically flush dbcache during reindex-chainstate git-subtree-dir: depend/bitcoin git-subtree-split: 938d7aacabd0bb3784bb3e529b1ed06bb2891864

…4ddc2dced57 94ddc2dced57 Merge bitcoin/bitcoin#34113: refactor: [rpc] Remove confusing and brittle integral casts c575990651d6 Merge bitcoin/bitcoin#34147: scripted-diff: refactor: wallet: Delete duplicate IsCrypted() eb0594e23f0c Merge bitcoin/bitcoin#33891: kernel: Expose reusable `PrecomputedTransactionData` in script validation e7033605775c Merge bitcoin/bitcoin#32997: index: Deduplicate HashKey / HeightKey handling ec4ff99a22b1 Merge bitcoin/bitcoin#33892: policy: allow <minrelay txns in package context if paid for by cpfp 48c9ba1e974b Merge bitcoin/bitcoin#34137: test: Avoid hard time.sleep(1) in feature_init.py 11ce5cf7997e scripted-diff: refactor: wallet: Delete IsCrypted 44e006d43831 [kernel] Expose reusable PrecomputedTransactionData in script valid fa727e3ec984 test: Avoid hard time.sleep(1) in feature_init.py d861c3820528 Merge bitcoin/bitcoin#33636: wallet: Expand MuSig test coverage and follow-ups 25636500c232 Merge bitcoin/bitcoin#32737: rpc, doc: clarify the response of listtransactions RPC d018876696cf Merge bitcoin/bitcoin#34039: test: address self-announcement 5bbc7c8cc1f2 Merge bitcoin/bitcoin#33810: ci: Add IWYU job 695e2b94ecd9 Merge bitcoin/bitcoin#33353: log: show reindex progress in `ImportBlocks` 1f151e73c00a Merge bitcoin/bitcoin#32929: qa: Clarify assert_start_raises_init_error output 315fdb406658 Merge bitcoin/bitcoin#34079: kernel: Remove non-kernel module includes d3a479cb077d kernel: Move BlockInfo to a kernel file d69a582e72ea kernel: Remove some unnecessary non-kernel includes e44dec027cee add release note about supporing non-TRUC <minrelay txns 7f295e1d9b44 Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers 5e7931af3573 Merge bitcoin/bitcoin#34095: refactor: enable `readability-container-contains` clang-tidy rule c80fd910f96c Merge bitcoin/bitcoin#33732: ci: Call docker exec from Python script to fix word splitting acba51101bbc Merge bitcoin/bitcoin#34107: build: Update minimum required Boost version fa66e2d07a4b refactor: [rpc] Remove confusing and brittle integral casts 74d6efe9c28b Merge bitcoin/bitcoin#34106: doc: add missing copyright headers 0c862bc7ea28 Merge bitcoin/bitcoin#32545: Replace cluster linearization algorithm with SFL 1e94e562f76e refactor: enable `readability-container-contains` clang-tidy rule fd9f1accbda9 Fix compilation for old Boost versions 75bdb925f404 clusterlin: drop support for improvable chunking (simplification) 91399a79122c clusterlin: remove unused MergeLinearizations (cleanup) 5ce280074512 clusterlin: randomize equal-feerate parts of linearization (privacy) 13aad26b7848 clusterlin: randomize various decisions in SFL (feature) ddbfa4dfac7b clusterlin: keep FIFO queue of improvable chunks (preparation) 3efc94d6564d clusterlin: replace cluster linearization with SFL (feature) 6a8fa821b80c clusterlin: add support for loading existing linearization (feature) da48ed9f348a clusterlin: ReadLinearization for non-topological (tests) c461259fb629 clusterlin: add class implementing SFL state (preparation) f480c1e71777 build: Update minimum required Boost version 95bfe7d574cf clusterlin: replace benchmarks with SFL-hard ones (bench) 86dd550a9b70 clusterlin: add known-correct optimal linearization tests (tests) aeb7ccb937bb doc: add missing copyright headers 68a7cb8f8be8 contrib: output copyright in generate-seeds.py 516ae5ede44a Merge bitcoin/bitcoin#31533: fuzz: Add fuzz target for block index tree and related validation events 9272fd517fd3 Merge bitcoin/bitcoin#34105: kernel: revert accidentally removed copyright header 85314dc0bf87 kernel: revert accidentally removed copyright header fa4cb13b5203 test: [doc] Manually unify stale headers 1841bf9cb67b test: address self-announcement 1ed8e7616527 rpc, doc: clarify the response of listtransactions RPC 09a1fa190ea3 Merge bitcoin/bitcoin#34094: chore: bump checkout to v6 80b1b5917dd1 Merge bitcoin/bitcoin#34088: log: Use `__func__` for -logsourcelocations 3a2807ad953c Merge bitcoin/bitcoin#33875: qa: Account for unset errno in ConnectionResetError 8d38b6f5f10b Merge bitcoin/bitcoin#34091: fuzz: doc: remove any mention to `address_deserialize_v2` cd98caea438a Update ci.yml ab513103df8d Merge bitcoin/bitcoin#33192: refactor: unify container presence checks 56750c4f87d0 iwyu, clang-format: Sort includes 2c78814e0e18 ci: Add IWYU job 94e4f04d7cf4 cmake: Fix target name 0f81e005197f cmake: Make `codegen` target dependent on `generate_build_info` 73f7844cdb1e iwyu: Add patch to prefer C++ headers over C counterparts 7a65437e2370 iwyu: Add patch to prefer angled brackets over quotes for includes facd3d56ccbe log: Use `__func__` for -logsourcelocations fe0e31f1efca Merge bitcoin/bitcoin#34053: lint: Remove confusing, redundant, and brittle lint-spelling e5c600dc0e06 Merge bitcoin/bitcoin#34063: Make `transaction_indentifier` hex string constructor evaluated at comptime 41f2cc6d3d59 Merge bitcoin-core/gui#919: move-only: MAX_BLOCK_TIME_GAP to src/qt 7c7cd8c296a5 Merge bitcoin/bitcoin#34089: contrib: asmap-tool.py - Don't write binary to TTY e3a4cb127f0d Merge bitcoin/bitcoin#34080: ci: Pin native tests on cross-builds to same commit a005fdff6c7a Merge bitcoin/bitcoin#34074: A few followups after introducing `/rest/blockpart/` endpoint caf4843a59a9 fuzz: doc: remove any mention to address_deserialize_v2 fa5ed16aa4d9 move-only: MAX_BLOCK_TIME_GAP to src/qt 356883f0e48b qa-tests: Log expected output in debug 7427a03b5ac9 qa-tests: Add test for timeouts due to missing init errors d7f703c1f1a8 refactor(qa-tests): Extract InternalDurationTestMixin for use in next commit 69bcfcad8c3d fix(qa-tests): Bring back decoding of exception field fb43b2f8cc4c qa: Improve assert_start_raises_init_error output 59b93f11e860 rest: print also HTTP response reason in case of an error 7fe94a04934a rest: add a test for unsuported `/blockpart/` request type fa5f29774872 scripted-diff: [doc] Unify stale copyright headers faa8ee62f5c1 ci: Pin native tests on cross-builds to same commit db2d39f64297 fuzz: add subtest for re-downloading a previously pruned block 45f5b2dac330 fuzz: Add fuzzer for block index c011e3aa5426 test: Wrap validation functions with TestChainstateManager 13891a8a685d Merge bitcoin/bitcoin#34050: fuzz: exercise `ComputeMerkleRoot` without `mutated` parameter ab643efc0a70 Merge bitcoin/bitcoin#34003: test: interface_ipc.py minor fixes and cleanup 4f11ef058b08 Merge bitcoin/bitcoin#30214: refactor: Improve assumeutxo state representation cbafd3ddf8a2 Merge bitcoin/bitcoin#34060: test: fix race condition in p2p_v2_misbehaving.py peerid assertion 55d0d19b5c02 rest: deduplicate `interface_rest.py` negative tests 89eb531024d9 rest: update release notes for `/blockpart/` endpoint 41bf8f2d5ece Merge bitcoin-core/gui#877: Add a menu action to restore then migrate a legacy wallet 2210feb4466e Merge bitcoin/bitcoin#34051: log: Remove brittle and confusing LogPrintLevel 58251bf9fa4b Merge bitcoin/bitcoin#34061: fuzz: Fix bugs in `clusterlin_postlinearize_tree` target 41118e17f875 blockstorage: simplify partial block read validation 599effdeab4d rest: reformat `uri_prefixes` initializer list 5ac35795206d refactor: Add compile-time-checked hex txid fa8a5d215c5a log: Remove brittle and confusing LogPrintLevel fac24bbec85f test: Clarify logging_SeverityLevels test f2731676619d ipc: separate log statements per level 94c51ae54072 libevent: separate log statements per level a70a14a3f4f4 refactor: Separate out logic for building a tree-shaped dependency graph ce29d7d6262c fuzz: Fix variable in `clusterlin_postlinearize_tree` check 876e2849b4ec fuzz: Fix incorrect loop bounds in `clusterlin_postlinearize_tree` 09dfa4d3f8df test: fix race condition in p2p_v2_misbehaving.py peerid assertion 938d7aacabd0 Merge bitcoin/bitcoin#33657: rest: allow reading partial block data from storage 82be652e40ec doc: Improve ChainstateManager documentation, use consistent terms 597b8be223d4 Merge bitcoin/bitcoin#34025: net: Waste less time in socket handling af455dcb39db refactor: Simplify pruning functions ae85c495f1b5 refactor: Delete ChainstateManager::GetAll() method 6a572dbda92c refactor: Add ChainstateManager::ActivateBestChains() method 491d827d5284 refactor: Add ChainstateManager::m_chainstates member e514fe611681 refactor: Delete ChainstateManager::SnapshotBlockhash() method ee35250683ab refactor: Delete ChainstateManager::IsSnapshotValidated() method d9e82299fc4e refactor: Delete ChainstateManager::IsSnapshotActive() method 4dfe38391276 refactor: Convert ChainstateRole enum to struct 352ad27fc1b1 refactor: Add ChainstateManager::ValidatedChainstate() method a229cb9477e6 refactor: Add ChainstateManager::CurrentChainstate() method a9b7f5614c24 refactor: Add Chainstate::StoragePath() method 840bd2ef230e refactor: Pass chainstate parameters to MaybeCompleteSnapshotValidation 1598a15aedb9 refactor: Deduplicate Chainstate activation code 9fe927b6d654 refactor: Add Chainstate m_assumeutxo and m_target_utxohash members 6082c84713f4 refactor: Add Chainstate::m_target_blockhash member de00e87548f7 test: Fix broken chainstatemanager_snapshot_init check fa904fc683c0 lint: Remove confusing, redundant, and brittle lint-spelling 14371fd1fca5 gui: Add a menu item to restore then migrate a wallet file f11a7d248cf5 gui: Add restore_and_migrate function to restore then migrate a wallet 16ab6dfc1074 gui: Move actual migration part of migrate() to its own function 4ec2d18a0734 wallet, interfaces, gui: Expose load_after_restore parameter d155fc12a0c7 Merge bitcoin/bitcoin#32414: validation: periodically flush dbcache during reindex-chainstate 07135290c172 rest: allow reading partial block data from storage 4e2af1c06547 blockstorage: allow reading partial block data from storage f2fd1aa21c76 blockstorage: return an error code from `ReadRawBlock()` 5be20c380dcb Merge bitcoin/bitcoin#34033: scripted-diff: Unify error and warning log formatting b31f7866952a Merge bitcoin/bitcoin#34045: test: Log IP of download server in get_previous_releases.py 7e9de20c0c14 fuzz: exercise `ComputeMerkleRoot` without mutated parameter b26762bdcb94 Merge bitcoin/bitcoin#33805: merkle: migrate `path` arg to reference and drop unused args 0f6d8a347aec Merge bitcoin/bitcoin#30442: precalculate SipHash constant salt XORs c2975f26d69f Merge bitcoin/bitcoin#33602: [IBD] coins: reduce lookups in dbcache layer propagation cdaf25f9c3e5 test: Log IP of download server in get_previous_releases.py c1f0a89d9cae Merge bitcoin/bitcoin#34040: test: Detect truncated download in get_previous_releases.py fa75480c84ff test: Detect truncated download in get_previous_releases.py 56ce78d5f62c Merge bitcoin/bitcoin#34031: net: Remove "tor" as a network specification 500862b2d4a1 Merge bitcoin/bitcoin#33423: qa: Improvements to debug_assert_log + busy_wait_for_debug_log 5f5c1ea01955 net: Cache -capturemessages setting cca113f5b022 Merge bitcoin/bitcoin#34008: log: don't rate-limit "new peer" with -debug=net 2c44c41984e0 Merge bitcoin/bitcoin#33553: validation: Improve warnings in case of chain corruption 6eb5ba569141 refactor: extract shared `SipHash` state into `SipHashState` 118d22ddb4ba optimization: cache `PresaltedSipHasher` in `CBlockHeaderAndShortTxIDs` 9ca52a4cbece optimization: migrate `SipHashUint256` to `PresaltedSipHasher` ec11b9fede2a optimization: introduce `PresaltedSipHasher` for repeated hashing d23d49ee3f23 Merge bitcoin/bitcoin#31823: tests: Add witness commitment if we have a witness transaction in `FullBlockTest.update_block()` 20330548cf5f refactor: extract `SipHash` C0-C3 constants to class scope 9f9eb7fbc053 test: rename k1/k2 to k0/k1 in `SipHash` consistency tests 29ed608dc75e Merge bitcoin/bitcoin#33961: script: Add a separate ScriptError for empty pubkeys encountered in Tapscript d2a199bca73b Merge bitcoin/bitcoin#33909: doc, ci: Make the max number of commits tested explicit dbc892806912 Merge bitcoin/bitcoin#33993: init: point out -stopatheight may be imprecise d4d184eda9c0 log: don't rate-limit "new peer" with -debug=net e7ac5a133cc3 doc: add release note for 34031 c4c70a256ed8 netbase: Remove "tor" as a network specification fa89f60e31d1 scripted-diff: LogPrintLevel(*,BCLog::Level::*,*) -> LogError()/LogWarning() fa6c7a1954ea scripted-diff: LogPrintLevel(*,BCLog::Level::Debug,*) -> LogDebug() d8fe5f0326c5 test: improve interface_ipc.py waitNext tests a5e61b1917af test: interface_ipc.py minor fixes and cleanup d5c8199b7904 Merge bitcoin/bitcoin#34006: Add util::Expected (std::expected) 77248e849699 Merge bitcoin/bitcoin#33771: refactor: C++20 operators 36073d56db0d Merge bitcoin/bitcoin#33952: depends: update freetype and document remaining `bitcoin-qt` runtime libs f09ae5f96fe8 Merge bitcoin/bitcoin#33950: guix: reduce allowed exported symbols cea443e24618 net: Pass time to InactivityChecks fuctions 89dc82295ebd Merge bitcoin/bitcoin#29641: scripted-diff: Use LogInfo over LogPrintf eb19a2dac5c7 Merge bitcoin/bitcoin#34017: fuzz: Add a test case for `ParseByteUnits()` faa23738fc25 refactor: Enable clang-tidy bugprone-unused-return-value fa114be27b17 Add util::Expected (std::expected) e68517208b4c Merge bitcoin/bitcoin#33995: depends: Propagate native C compiler to `sqlite` package 091cae6fdf89 Merge bitcoin/bitcoin#33939: contrib: Count entry differences in asmap-tool diff summary 57b888ce0ebd fuzz: Add a test case for `ParseByteUnits()` b8e66b901d56 Merge bitcoin/bitcoin#33858: test: add unit test coverage for the empty leaves path in MerkleComputation 0c9ab0f8f8c8 Merge bitcoin/bitcoin#33956: net: fix use-after-free with v2->v1 reconnection logic fa4395dffd43 refactor: Remove unused LogPrintf fa05181d904d scripted-diff: LogPrintf -> LogInfo 5646e6c0d358 index: restrict index helper function to namespace 032f3503e3fe index, refactor: deduplicate LookUpOne a67d3eb91d5e index: deduplicate Hash / Height handling 9890058b37b8 Merge bitcoin/bitcoin#33723: chainparams: remove dnsseed.bitcoin.dashjr-list-of-p2p-nodes.us 9e02f7808909 Merge bitcoin/bitcoin#33774: cmake: Move IPC tests to `ipc/test` ad452a1e655e Merge bitcoin/bitcoin#33528: wallet: don't consider unconfirmed TRUC coins with ancestors ff06e2468a5d init: point out -stopatheight may be imprecise ded11fb04d82 test: fix interface_ipc.py template destruction 9a29b2d331ee Merge bitcoin/bitcoin#33857: doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 69e66efe45a0 Merge bitcoin/bitcoin#32882: index: remove unnecessary locator cleaning in BaseIndex::Init() d9319b06cf82 refactor: unify container presence checks - non-trivial counts 039307554eb3 refactor: unify container presence checks - trivial counts 8bb9219b6301 refactor: unify container presence checks - find 6581ac5d9f93 Merge bitcoin/bitcoin#33996: contrib: fix manpage generation 39ca01525977 Merge bitcoin/bitcoin#33140: test: Avoid shutdown race in NetworkThread e9536faaee2b contrib: fix manpage generation bcf794d5f35b Merge bitcoin/bitcoin#30455: test: assumeutxo: add missing tests in wallet_assumeutxo.py af0e6a65c928 Merge bitcoin/bitcoin#33702: contrib: Remove brittle, confusing and redundant UTF8 encoding from Python IO 4b4711369880 validation: Reword CheckForkWarningConditions and call it also during IBD and at startup 2f51951d03cc p2p: Add warning message when receiving headers for blocks cached as invalid 4c784b25c478 Merge bitcoin/bitcoin#33985: fuzz: gate mempool entry based on weight 710031ebef83 Revert "guix: sqlite wants tcl" 4cf5ea6c3d2a depends: Propagate native C compiler to `sqlite` package ce771726f3e7 Merge bitcoin/bitcoin#33960: log: Use more severe log level (warn/err) where appropriate cb7d5bfe4a59 test, assumeutxo: loading a wallet (backup) on a pruned node 7a365244f839 test, refactor snapshot import and background validation e0ba6bbed97b Merge bitcoin/bitcoin#33591: Cluster mempool followups b8d279a81c16 doc: add comment to explain correctness of GatherClusters() aba7500a30ee Fix parameter name in getmempoolcluster rpc 6c1325a0913e Rename weight -> clusterweight in RPC output, and add doc explaining mempool terminology bc2eb931da30 Require mempool lock to be held when invoking TRUC checks 957ae232414b Improve comments for getTransactionAncestry to reference cluster counts instead of descendants d97d6199ce50 Fix comment to reference cluster limits, not chain limits a1b341ef9875 Sanity check feerate diagram in CTxMemPool::check() 23d6f457c4c0 rpc: improve getmempoolcluster output d2dcd37aac1e Avoid using mapTx.modify() to update modified fees d84ffc24d2dc doc: add release notes snippet for cluster mempool b0417ba94437 doc: Add design notes for cluster mempool and explain new mempool limits 804329400a73 fuzz: gate mempool entry based on weight 2d88966e43c6 miner: replace "package" with "chunk" 6f3e8eb3001a Add a GetFeePerVSize() accessor to CFeeRate, and use it in the BlockAssembler b5f245f6f219 Remove unused DEFAULT_ANCESTOR_SIZE_LIMIT_KVB and DEFAULT_DESCENDANT_SIZE_LIMIT_KVB 1dac54d506b5 Use cluster size limit instead of ancestor size limit in txpackage unit test 04f65488ca3e Use cluster size limit instead of ancestor/descendant size limits when sanity checking TRUC policy limits 634291a7dc44 Use cluster limits instead of ancestor/descendant limits when sanity checking package policy limits fc18ef1f3f33 Remove ancestor and descendant vsize limits from MemPoolLimits ed8e819121d7 Warn user if using -limitancestorsize/-limitdescendantsize that the options have no effect 80d8df2d47c2 Invoke removeUnchecked() directly in removeForBlock() 9292570f4cb8 Rewrite GetChildren without sets 3e39ea8c3070 Rewrite removeForReorg to avoid using sets a3c31dfd71de scripted-diff: rename AddToMempool -> TryAddToMempool a5a7905d83df Simplify removeRecursive 01d8520038ea Remove unused argument to RemoveStaged ec8eb013a9bf doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 48496caa1235 ci: Remove redundant `DEP_OPTS` from “Windows-cross UCRT” job b5a7a685bba3 ci: Make the max number of commits tested explicit 9d5021a05bd3 script: add SCRIPT_ERR_TAPSCRIPT_EMPTY_PUBKEY 7b90b4f5bb10 guix: reduce allowed exported symbols 41e657aacfa6 guix: add bitcoin-qt runtime libs doc in symbol-check ef4ce19a1545 depends: freetype 2.11.1 fa45a1503eee log: Use LogWarning for non-critical logs fa0018d01102 log: Use LogError for fatal errors e7e51952dc24 contrib: Avoid outputting binary data to TTY 22229de7288f doc: Fix typo in init log 167df7a98c85 net: fix use-after-free with v2->v1 reconnection logic fd4ce55121e7 contrib: Count entry differences in asmap-tool diff summary 1488315d76ee policy: Allow any transaction version with < minrelay fad61185861a test: Fix "typo" in written invalid content fab085c15f72 contrib: Use text=True in subprocess over manual encoding handling fa71c15f8610 scripted-diff: Bump copyright headers after encoding changes fae612424b3e contrib: Remove confusing and redundant encoding from IO fa7d72bd1be9 lint: Drop check to enforce encoding to be specified in Python scripts faf39d8539c9 test: Clarify that Python UTF-8 mode is the default today for most systems fa83e3a81ddb lint: Do not allow locale dependent shell scripts 217dbbbb5e38 test: Add musig failure scenarios fa336053aada Move ci_exec to the Python script fa83555d163f ci: Require rsync to pass eeee02ea53dd ci: Untangle CI_EXEC bash function fa21fd1dc2e5 ci: Move macos snippet under DANGER_RUN_CI_ON_HOST fa37559ac5b7 ci: Document the retry script in PATH 666675e95fe8 ci: Move folder creation and docker kill to Python script bc64013e6fad Remove unused variable (cacheMap) in mempool c9519c260b7a musig: Check session id reuse e755614be586 sign: Remove duplicate sigversion check 0f7f0692ca1e musig: Move MUSIG_CHAINCODE to musig.cpp a7c96f874de1 tests: Add witness commitment if we have a witness transaction in FullBlockTest.update_block() 76e0e6087d03 qa: Account for errno not always being set for ConnectionResetError ffcae82a6810 test: exercise TransactionMerklePath with empty block; targets the MerkleComputation empty-leaves path that was only reached by fuzz tests 24ed820d4f0d merkle: remove unused `mutated` arg from `BlockWitnessMerkleRoot` 63d640fa6a70 merkle: remove unused `proot` and `pmutated` args from `MerkleComputation` be270551df30 merkle: migrate `path` arg of `MerkleComputation` to a reference 866bbb98fd36 cmake, test: Improve locality of `bitcoin_ipc_test` library description ae2e438b257f cmake: Move IPC tests to `ipc/test` 48840bfc2d7b refactor: Prefer `<=>` over multiple relational operators 5a0f49bd2661 refactor: Remove all `operator!=` definitions 0ac969cddfdb validation: don't reallocate cache for short-lived CCoinsViewCache c8f5e446dc95 coins: reduce lookups in dbcache layer propagation b0c706795ce6 Remove unreliable seed from chainparams.cpp, and the associated README dcd42d6d8f16 [test] wallet send 3 generation TRUC e753fadfd01c [wallet] never try to spend from unconfirmed TRUC that already has ancestors fa6db79302d2 test: Avoid shutdown race in NetworkThread a1f762302096 qa: Only complain about expected messages that were not found 1e54125e2e00 refactor(qa): Avoid unnecessary string operations a9021101dc63 qa: Replace always-escaped regexps with "X in Y" 5c16e4631c00 doc: Remove no longer correct comment facd01e6ffbb refactor: remove redundant locator cleanup in BaseIndex::Init() d7de5b109f69 logs: show reindex progress in `ImportBlocks` c1e554d3e583 refactor: consolidate 3 separate locks into one block 41479ed1d23e test: add test for periodic flush inside ActivateBestChain 84820561dcb2 validation: periodically flush dbcache during reindex-chainstate git-subtree-dir: libbitcoinkernel-sys/bitcoin git-subtree-split: 94ddc2dced5736612e358a3b80f2bc718fbd8161

…dc2dced 94ddc2dced Merge bitcoin/bitcoin#34113: refactor: [rpc] Remove confusing and brittle integral casts c575990651 Merge bitcoin/bitcoin#34147: scripted-diff: refactor: wallet: Delete duplicate IsCrypted() eb0594e23f Merge bitcoin/bitcoin#33891: kernel: Expose reusable `PrecomputedTransactionData` in script validation e703360577 Merge bitcoin/bitcoin#32997: index: Deduplicate HashKey / HeightKey handling ec4ff99a22 Merge bitcoin/bitcoin#33892: policy: allow <minrelay txns in package context if paid for by cpfp 48c9ba1e97 Merge bitcoin/bitcoin#34137: test: Avoid hard time.sleep(1) in feature_init.py 11ce5cf799 scripted-diff: refactor: wallet: Delete IsCrypted 44e006d438 [kernel] Expose reusable PrecomputedTransactionData in script valid fa727e3ec9 test: Avoid hard time.sleep(1) in feature_init.py d861c38205 Merge bitcoin/bitcoin#33636: wallet: Expand MuSig test coverage and follow-ups 25636500c2 Merge bitcoin/bitcoin#32737: rpc, doc: clarify the response of listtransactions RPC d018876696 Merge bitcoin/bitcoin#34039: test: address self-announcement 5bbc7c8cc1 Merge bitcoin/bitcoin#33810: ci: Add IWYU job 695e2b94ec Merge bitcoin/bitcoin#33353: log: show reindex progress in `ImportBlocks` 1f151e73c0 Merge bitcoin/bitcoin#32929: qa: Clarify assert_start_raises_init_error output 315fdb4066 Merge bitcoin/bitcoin#34079: kernel: Remove non-kernel module includes d3a479cb07 kernel: Move BlockInfo to a kernel file d69a582e72 kernel: Remove some unnecessary non-kernel includes e44dec027c add release note about supporing non-TRUC <minrelay txns 7f295e1d9b Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers 5e7931af35 Merge bitcoin/bitcoin#34095: refactor: enable `readability-container-contains` clang-tidy rule c80fd910f9 Merge bitcoin/bitcoin#33732: ci: Call docker exec from Python script to fix word splitting acba51101b Merge bitcoin/bitcoin#34107: build: Update minimum required Boost version fa66e2d07a refactor: [rpc] Remove confusing and brittle integral casts 74d6efe9c2 Merge bitcoin/bitcoin#34106: doc: add missing copyright headers 0c862bc7ea Merge bitcoin/bitcoin#32545: Replace cluster linearization algorithm with SFL 1e94e562f7 refactor: enable `readability-container-contains` clang-tidy rule fd9f1accbd Fix compilation for old Boost versions 75bdb925f4 clusterlin: drop support for improvable chunking (simplification) 91399a7912 clusterlin: remove unused MergeLinearizations (cleanup) 5ce2800745 clusterlin: randomize equal-feerate parts of linearization (privacy) 13aad26b78 clusterlin: randomize various decisions in SFL (feature) ddbfa4dfac clusterlin: keep FIFO queue of improvable chunks (preparation) 3efc94d656 clusterlin: replace cluster linearization with SFL (feature) 6a8fa821b8 clusterlin: add support for loading existing linearization (feature) da48ed9f34 clusterlin: ReadLinearization for non-topological (tests) c461259fb6 clusterlin: add class implementing SFL state (preparation) f480c1e717 build: Update minimum required Boost version 95bfe7d574 clusterlin: replace benchmarks with SFL-hard ones (bench) 86dd550a9b clusterlin: add known-correct optimal linearization tests (tests) aeb7ccb937 doc: add missing copyright headers 68a7cb8f8b contrib: output copyright in generate-seeds.py 516ae5ede4 Merge bitcoin/bitcoin#31533: fuzz: Add fuzz target for block index tree and related validation events 9272fd517f Merge bitcoin/bitcoin#34105: kernel: revert accidentally removed copyright header 85314dc0bf kernel: revert accidentally removed copyright header fa4cb13b52 test: [doc] Manually unify stale headers 1841bf9cb6 test: address self-announcement 1ed8e76165 rpc, doc: clarify the response of listtransactions RPC 09a1fa190e Merge bitcoin/bitcoin#34094: chore: bump checkout to v6 80b1b5917d Merge bitcoin/bitcoin#34088: log: Use `__func__` for -logsourcelocations 3a2807ad95 Merge bitcoin/bitcoin#33875: qa: Account for unset errno in ConnectionResetError 8d38b6f5f1 Merge bitcoin/bitcoin#34091: fuzz: doc: remove any mention to `address_deserialize_v2` cd98caea43 Update ci.yml ab513103df Merge bitcoin/bitcoin#33192: refactor: unify container presence checks 56750c4f87 iwyu, clang-format: Sort includes 2c78814e0e ci: Add IWYU job 94e4f04d7c cmake: Fix target name 0f81e00519 cmake: Make `codegen` target dependent on `generate_build_info` 73f7844cdb iwyu: Add patch to prefer C++ headers over C counterparts 7a65437e23 iwyu: Add patch to prefer angled brackets over quotes for includes facd3d56cc log: Use `__func__` for -logsourcelocations fe0e31f1ef Merge bitcoin/bitcoin#34053: lint: Remove confusing, redundant, and brittle lint-spelling e5c600dc0e Merge bitcoin/bitcoin#34063: Make `transaction_indentifier` hex string constructor evaluated at comptime 41f2cc6d3d Merge bitcoin-core/gui#919: move-only: MAX_BLOCK_TIME_GAP to src/qt 7c7cd8c296 Merge bitcoin/bitcoin#34089: contrib: asmap-tool.py - Don't write binary to TTY e3a4cb127f Merge bitcoin/bitcoin#34080: ci: Pin native tests on cross-builds to same commit a005fdff6c Merge bitcoin/bitcoin#34074: A few followups after introducing `/rest/blockpart/` endpoint caf4843a59 fuzz: doc: remove any mention to address_deserialize_v2 fa5ed16aa4 move-only: MAX_BLOCK_TIME_GAP to src/qt 356883f0e4 qa-tests: Log expected output in debug 7427a03b5a qa-tests: Add test for timeouts due to missing init errors d7f703c1f1 refactor(qa-tests): Extract InternalDurationTestMixin for use in next commit 69bcfcad8c fix(qa-tests): Bring back decoding of exception field fb43b2f8cc qa: Improve assert_start_raises_init_error output 59b93f11e8 rest: print also HTTP response reason in case of an error 7fe94a0493 rest: add a test for unsuported `/blockpart/` request type fa5f297748 scripted-diff: [doc] Unify stale copyright headers faa8ee62f5 ci: Pin native tests on cross-builds to same commit db2d39f642 fuzz: add subtest for re-downloading a previously pruned block 45f5b2dac3 fuzz: Add fuzzer for block index c011e3aa54 test: Wrap validation functions with TestChainstateManager 13891a8a68 Merge bitcoin/bitcoin#34050: fuzz: exercise `ComputeMerkleRoot` without `mutated` parameter ab643efc0a Merge bitcoin/bitcoin#34003: test: interface_ipc.py minor fixes and cleanup 4f11ef058b Merge bitcoin/bitcoin#30214: refactor: Improve assumeutxo state representation cbafd3ddf8 Merge bitcoin/bitcoin#34060: test: fix race condition in p2p_v2_misbehaving.py peerid assertion 55d0d19b5c rest: deduplicate `interface_rest.py` negative tests 89eb531024 rest: update release notes for `/blockpart/` endpoint 41bf8f2d5e Merge bitcoin-core/gui#877: Add a menu action to restore then migrate a legacy wallet 2210feb446 Merge bitcoin/bitcoin#34051: log: Remove brittle and confusing LogPrintLevel 58251bf9fa Merge bitcoin/bitcoin#34061: fuzz: Fix bugs in `clusterlin_postlinearize_tree` target 41118e17f8 blockstorage: simplify partial block read validation 599effdeab rest: reformat `uri_prefixes` initializer list 5ac3579520 refactor: Add compile-time-checked hex txid fa8a5d215c log: Remove brittle and confusing LogPrintLevel fac24bbec8 test: Clarify logging_SeverityLevels test f273167661 ipc: separate log statements per level 94c51ae540 libevent: separate log statements per level a70a14a3f4 refactor: Separate out logic for building a tree-shaped dependency graph ce29d7d626 fuzz: Fix variable in `clusterlin_postlinearize_tree` check 876e2849b4 fuzz: Fix incorrect loop bounds in `clusterlin_postlinearize_tree` 09dfa4d3f8 test: fix race condition in p2p_v2_misbehaving.py peerid assertion 938d7aacab Merge bitcoin/bitcoin#33657: rest: allow reading partial block data from storage 82be652e40 doc: Improve ChainstateManager documentation, use consistent terms 597b8be223 Merge bitcoin/bitcoin#34025: net: Waste less time in socket handling af455dcb39 refactor: Simplify pruning functions ae85c495f1 refactor: Delete ChainstateManager::GetAll() method 6a572dbda9 refactor: Add ChainstateManager::ActivateBestChains() method 491d827d52 refactor: Add ChainstateManager::m_chainstates member e514fe6116 refactor: Delete ChainstateManager::SnapshotBlockhash() method ee35250683 refactor: Delete ChainstateManager::IsSnapshotValidated() method d9e82299fc refactor: Delete ChainstateManager::IsSnapshotActive() method 4dfe383912 refactor: Convert ChainstateRole enum to struct 352ad27fc1 refactor: Add ChainstateManager::ValidatedChainstate() method a229cb9477 refactor: Add ChainstateManager::CurrentChainstate() method a9b7f5614c refactor: Add Chainstate::StoragePath() method 840bd2ef23 refactor: Pass chainstate parameters to MaybeCompleteSnapshotValidation 1598a15aed refactor: Deduplicate Chainstate activation code 9fe927b6d6 refactor: Add Chainstate m_assumeutxo and m_target_utxohash members 6082c84713 refactor: Add Chainstate::m_target_blockhash member de00e87548 test: Fix broken chainstatemanager_snapshot_init check fa904fc683 lint: Remove confusing, redundant, and brittle lint-spelling 14371fd1fc gui: Add a menu item to restore then migrate a wallet file f11a7d248c gui: Add restore_and_migrate function to restore then migrate a wallet 16ab6dfc10 gui: Move actual migration part of migrate() to its own function 4ec2d18a07 wallet, interfaces, gui: Expose load_after_restore parameter d155fc12a0 Merge bitcoin/bitcoin#32414: validation: periodically flush dbcache during reindex-chainstate 07135290c1 rest: allow reading partial block data from storage 4e2af1c065 blockstorage: allow reading partial block data from storage f2fd1aa21c blockstorage: return an error code from `ReadRawBlock()` 5be20c380d Merge bitcoin/bitcoin#34033: scripted-diff: Unify error and warning log formatting b31f786695 Merge bitcoin/bitcoin#34045: test: Log IP of download server in get_previous_releases.py 7e9de20c0c fuzz: exercise `ComputeMerkleRoot` without mutated parameter b26762bdcb Merge bitcoin/bitcoin#33805: merkle: migrate `path` arg to reference and drop unused args 0f6d8a347a Merge bitcoin/bitcoin#30442: precalculate SipHash constant salt XORs c2975f26d6 Merge bitcoin/bitcoin#33602: [IBD] coins: reduce lookups in dbcache layer propagation cdaf25f9c3 test: Log IP of download server in get_previous_releases.py c1f0a89d9c Merge bitcoin/bitcoin#34040: test: Detect truncated download in get_previous_releases.py fa75480c84 test: Detect truncated download in get_previous_releases.py 56ce78d5f6 Merge bitcoin/bitcoin#34031: net: Remove "tor" as a network specification 500862b2d4 Merge bitcoin/bitcoin#33423: qa: Improvements to debug_assert_log + busy_wait_for_debug_log 5f5c1ea019 net: Cache -capturemessages setting cca113f5b0 Merge bitcoin/bitcoin#34008: log: don't rate-limit "new peer" with -debug=net 2c44c41984 Merge bitcoin/bitcoin#33553: validation: Improve warnings in case of chain corruption 6eb5ba5691 refactor: extract shared `SipHash` state into `SipHashState` 118d22ddb4 optimization: cache `PresaltedSipHasher` in `CBlockHeaderAndShortTxIDs` 9ca52a4cbe optimization: migrate `SipHashUint256` to `PresaltedSipHasher` ec11b9fede optimization: introduce `PresaltedSipHasher` for repeated hashing d23d49ee3f Merge bitcoin/bitcoin#31823: tests: Add witness commitment if we have a witness transaction in `FullBlockTest.update_block()` 20330548cf refactor: extract `SipHash` C0-C3 constants to class scope 9f9eb7fbc0 test: rename k1/k2 to k0/k1 in `SipHash` consistency tests 29ed608dc7 Merge bitcoin/bitcoin#33961: script: Add a separate ScriptError for empty pubkeys encountered in Tapscript d2a199bca7 Merge bitcoin/bitcoin#33909: doc, ci: Make the max number of commits tested explicit dbc8928069 Merge bitcoin/bitcoin#33993: init: point out -stopatheight may be imprecise d4d184eda9 log: don't rate-limit "new peer" with -debug=net e7ac5a133c doc: add release note for 34031 c4c70a256e netbase: Remove "tor" as a network specification fa89f60e31 scripted-diff: LogPrintLevel(*,BCLog::Level::*,*) -> LogError()/LogWarning() fa6c7a1954 scripted-diff: LogPrintLevel(*,BCLog::Level::Debug,*) -> LogDebug() d8fe5f0326 test: improve interface_ipc.py waitNext tests a5e61b1917 test: interface_ipc.py minor fixes and cleanup d5c8199b79 Merge bitcoin/bitcoin#34006: Add util::Expected (std::expected) 77248e8496 Merge bitcoin/bitcoin#33771: refactor: C++20 operators 36073d56db Merge bitcoin/bitcoin#33952: depends: update freetype and document remaining `bitcoin-qt` runtime libs f09ae5f96f Merge bitcoin/bitcoin#33950: guix: reduce allowed exported symbols cea443e246 net: Pass time to InactivityChecks fuctions 89dc82295e Merge bitcoin/bitcoin#29641: scripted-diff: Use LogInfo over LogPrintf eb19a2dac5 Merge bitcoin/bitcoin#34017: fuzz: Add a test case for `ParseByteUnits()` faa23738fc refactor: Enable clang-tidy bugprone-unused-return-value fa114be27b Add util::Expected (std::expected) e68517208b Merge bitcoin/bitcoin#33995: depends: Propagate native C compiler to `sqlite` package 091cae6fdf Merge bitcoin/bitcoin#33939: contrib: Count entry differences in asmap-tool diff summary 57b888ce0e fuzz: Add a test case for `ParseByteUnits()` b8e66b901d Merge bitcoin/bitcoin#33858: test: add unit test coverage for the empty leaves path in MerkleComputation 0c9ab0f8f8 Merge bitcoin/bitcoin#33956: net: fix use-after-free with v2->v1 reconnection logic fa4395dffd refactor: Remove unused LogPrintf fa05181d90 scripted-diff: LogPrintf -> LogInfo 5646e6c0d3 index: restrict index helper function to namespace 032f3503e3 index, refactor: deduplicate LookUpOne a67d3eb91d index: deduplicate Hash / Height handling 9890058b37 Merge bitcoin/bitcoin#33723: chainparams: remove dnsseed.bitcoin.dashjr-list-of-p2p-nodes.us 9e02f78089 Merge bitcoin/bitcoin#33774: cmake: Move IPC tests to `ipc/test` ad452a1e65 Merge bitcoin/bitcoin#33528: wallet: don't consider unconfirmed TRUC coins with ancestors ff06e2468a init: point out -stopatheight may be imprecise ded11fb04d test: fix interface_ipc.py template destruction 9a29b2d331 Merge bitcoin/bitcoin#33857: doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 69e66efe45 Merge bitcoin/bitcoin#32882: index: remove unnecessary locator cleaning in BaseIndex::Init() d9319b06cf refactor: unify container presence checks - non-trivial counts 039307554e refactor: unify container presence checks - trivial counts 8bb9219b63 refactor: unify container presence checks - find 6581ac5d9f Merge bitcoin/bitcoin#33996: contrib: fix manpage generation 39ca015259 Merge bitcoin/bitcoin#33140: test: Avoid shutdown race in NetworkThread e9536faaee contrib: fix manpage generation bcf794d5f3 Merge bitcoin/bitcoin#30455: test: assumeutxo: add missing tests in wallet_assumeutxo.py af0e6a65c9 Merge bitcoin/bitcoin#33702: contrib: Remove brittle, confusing and redundant UTF8 encoding from Python IO 4b47113698 validation: Reword CheckForkWarningConditions and call it also during IBD and at startup 2f51951d03 p2p: Add warning message when receiving headers for blocks cached as invalid 4c784b25c4 Merge bitcoin/bitcoin#33985: fuzz: gate mempool entry based on weight 710031ebef Revert "guix: sqlite wants tcl" 4cf5ea6c3d depends: Propagate native C compiler to `sqlite` package ce771726f3 Merge bitcoin/bitcoin#33960: log: Use more severe log level (warn/err) where appropriate cb7d5bfe4a test, assumeutxo: loading a wallet (backup) on a pruned node 7a365244f8 test, refactor snapshot import and background validation e0ba6bbed9 Merge bitcoin/bitcoin#33591: Cluster mempool followups b8d279a81c doc: add comment to explain correctness of GatherClusters() aba7500a30 Fix parameter name in getmempoolcluster rpc 6c1325a091 Rename weight -> clusterweight in RPC output, and add doc explaining mempool terminology bc2eb931da Require mempool lock to be held when invoking TRUC checks 957ae23241 Improve comments for getTransactionAncestry to reference cluster counts instead of descendants d97d6199ce Fix comment to reference cluster limits, not chain limits a1b341ef98 Sanity check feerate diagram in CTxMemPool::check() 23d6f457c4 rpc: improve getmempoolcluster output d2dcd37aac Avoid using mapTx.modify() to update modified fees d84ffc24d2 doc: add release notes snippet for cluster mempool b0417ba944 doc: Add design notes for cluster mempool and explain new mempool limits 804329400a fuzz: gate mempool entry based on weight 2d88966e43 miner: replace "package" with "chunk" 6f3e8eb300 Add a GetFeePerVSize() accessor to CFeeRate, and use it in the BlockAssembler b5f245f6f2 Remove unused DEFAULT_ANCESTOR_SIZE_LIMIT_KVB and DEFAULT_DESCENDANT_SIZE_LIMIT_KVB 1dac54d506 Use cluster size limit instead of ancestor size limit in txpackage unit test 04f65488ca Use cluster size limit instead of ancestor/descendant size limits when sanity checking TRUC policy limits 634291a7dc Use cluster limits instead of ancestor/descendant limits when sanity checking package policy limits fc18ef1f3f Remove ancestor and descendant vsize limits from MemPoolLimits ed8e819121 Warn user if using -limitancestorsize/-limitdescendantsize that the options have no effect 80d8df2d47 Invoke removeUnchecked() directly in removeForBlock() 9292570f4c Rewrite GetChildren without sets 3e39ea8c30 Rewrite removeForReorg to avoid using sets a3c31dfd71 scripted-diff: rename AddToMempool -> TryAddToMempool a5a7905d83 Simplify removeRecursive 01d8520038 Remove unused argument to RemoveStaged ec8eb013a9 doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` 48496caa12 ci: Remove redundant `DEP_OPTS` from “Windows-cross UCRT” job b5a7a685bb ci: Make the max number of commits tested explicit 9d5021a05b script: add SCRIPT_ERR_TAPSCRIPT_EMPTY_PUBKEY 7b90b4f5bb guix: reduce allowed exported symbols 41e657aacf guix: add bitcoin-qt runtime libs doc in symbol-check ef4ce19a15 depends: freetype 2.11.1 fa45a1503e log: Use LogWarning for non-critical logs fa0018d011 log: Use LogError for fatal errors e7e51952dc contrib: Avoid outputting binary data to TTY 22229de728 doc: Fix typo in init log 167df7a98c net: fix use-after-free with v2->v1 reconnection logic fd4ce55121 contrib: Count entry differences in asmap-tool diff summary 1488315d76 policy: Allow any transaction version with < minrelay fad6118586 test: Fix "typo" in written invalid content fab085c15f contrib: Use text=True in subprocess over manual encoding handling fa71c15f86 scripted-diff: Bump copyright headers after encoding changes fae612424b contrib: Remove confusing and redundant encoding from IO fa7d72bd1b lint: Drop check to enforce encoding to be specified in Python scripts faf39d8539 test: Clarify that Python UTF-8 mode is the default today for most systems fa83e3a81d lint: Do not allow locale dependent shell scripts 217dbbbb5e test: Add musig failure scenarios fa336053aa Move ci_exec to the Python script fa83555d16 ci: Require rsync to pass eeee02ea53 ci: Untangle CI_EXEC bash function fa21fd1dc2 ci: Move macos snippet under DANGER_RUN_CI_ON_HOST fa37559ac5 ci: Document the retry script in PATH 666675e95f ci: Move folder creation and docker kill to Python script bc64013e6f Remove unused variable (cacheMap) in mempool c9519c260b musig: Check session id reuse e755614be5 sign: Remove duplicate sigversion check 0f7f0692ca musig: Move MUSIG_CHAINCODE to musig.cpp a7c96f874d tests: Add witness commitment if we have a witness transaction in FullBlockTest.update_block() 76e0e6087d qa: Account for errno not always being set for ConnectionResetError ffcae82a68 test: exercise TransactionMerklePath with empty block; targets the MerkleComputation empty-leaves path that was only reached by fuzz tests 24ed820d4f merkle: remove unused `mutated` arg from `BlockWitnessMerkleRoot` 63d640fa6a merkle: remove unused `proot` and `pmutated` args from `MerkleComputation` be270551df merkle: migrate `path` arg of `MerkleComputation` to a reference 866bbb98fd cmake, test: Improve locality of `bitcoin_ipc_test` library description ae2e438b25 cmake: Move IPC tests to `ipc/test` 48840bfc2d refactor: Prefer `<=>` over multiple relational operators 5a0f49bd26 refactor: Remove all `operator!=` definitions 0ac969cddf validation: don't reallocate cache for short-lived CCoinsViewCache c8f5e446dc coins: reduce lookups in dbcache layer propagation b0c706795c Remove unreliable seed from chainparams.cpp, and the associated README dcd42d6d8f [test] wallet send 3 generation TRUC e753fadfd0 [wallet] never try to spend from unconfirmed TRUC that already has ancestors fa6db79302 test: Avoid shutdown race in NetworkThread a1f7623020 qa: Only complain about expected messages that were not found 1e54125e2e refactor(qa): Avoid unnecessary string operations a9021101dc qa: Replace always-escaped regexps with "X in Y" 5c16e4631c doc: Remove no longer correct comment facd01e6ff refactor: remove redundant locator cleanup in BaseIndex::Init() d7de5b109f logs: show reindex progress in `ImportBlocks` c1e554d3e5 refactor: consolidate 3 separate locks into one block 41479ed1d2 test: add test for periodic flush inside ActivateBestChain 84820561dc validation: periodically flush dbcache during reindex-chainstate git-subtree-dir: libbitcoinkernel-sys/bitcoin git-subtree-split: 94ddc2dced5736612e358a3b80f2bc718fbd8161

l0rinc force-pushed the paplorinc/siphash branch from ef4a436 to 3b7b82b Compare July 12, 2024 16:39

l0rinc changed the title ~~Precalculate SipHash constant XOR with k0 and k1 in SaltedOutpointHasher~~ optimization: Precalculate SipHash constant XOR with k0 and k1 in SaltedOutpointHasher Jul 12, 2024

l0rinc marked this pull request as ready for review July 13, 2024 09:01

l0rinc marked this pull request as draft July 15, 2024 15:17

l0rinc marked this pull request as ready for review July 18, 2024 11:46

l0rinc closed this Jul 25, 2024

l0rinc reopened this Jul 26, 2024

l0rinc force-pushed the paplorinc/siphash branch 2 times, most recently from 0dc224b to 8d6c6bd Compare July 26, 2024 18:14

DrahtBot mentioned this pull request Aug 30, 2024

siphash improvement #30759

Closed

DrahtBot added the CI failed label Aug 30, 2024

l0rinc force-pushed the paplorinc/siphash branch from 8d6c6bd to 44098fe Compare August 31, 2024 14:52

l0rinc changed the title ~~optimization: Precalculate SipHash constant XOR with k0 and k1 in SaltedOutpointHasher~~ optimization: precalculate SipHash constant XOR with k0 and k1 in SaltedOutpointHasher Aug 31, 2024

DrahtBot removed the CI failed label Aug 31, 2024

DrahtBot added the CI failed label Oct 13, 2024

l0rinc force-pushed the paplorinc/siphash branch from 44098fe to 183052f Compare October 15, 2024 15:27

achow101 requested a review from josibake October 15, 2024 15:35

l0rinc force-pushed the paplorinc/siphash branch from 183052f to bc959f5 Compare October 16, 2024 13:14

DrahtBot removed the CI failed label Oct 16, 2024

laanwj self-requested a review October 17, 2024 08:00

DrahtBot removed the CI failed label Nov 21, 2025

laanwj approved these changes Nov 26, 2025

View reviewed changes

DrahtBot requested review from achow101, ryanofsky and vasild November 26, 2025 17:38

vasild approved these changes Nov 28, 2025

View reviewed changes

sipa reviewed Dec 8, 2025

View reviewed changes

l0rinc commented Dec 9, 2025

View reviewed changes

l0rinc and others added 6 commits December 9, 2025 17:03

test: rename k1/k2 to k0/k1 in SipHash consistency tests

9f9eb7f

Aligns test variable naming with the `k0`/`k1` convention used consistently throughout the codebase for `SipHash` keys. Also splits the single-param `SipHash` test from the one with extra, for clarity.

refactor: extract SipHash C0-C3 constants to class scope

2033054

Moves the `SipHash` initialization constants (C0-C3) from magic numbers to named static constexpr members of `CSipHasher`.

l0rinc force-pushed the paplorinc/siphash branch from 1b81039 to 6eb5ba5 Compare December 9, 2025 16:20

vasild approved these changes Dec 9, 2025

View reviewed changes

DrahtBot requested review from laanwj and sipa December 9, 2025 17:47

sipa reviewed Dec 10, 2025

View reviewed changes

achow101 merged commit 0f6d8a3 into bitcoin:master Dec 10, 2025
25 checks passed

kevkevinpal mentioned this pull request Dec 11, 2025

precalculate SipHash constant salt XORs kevkevinpal/bitcoin#227

Closed

l0rinc mentioned this pull request Jan 14, 2026

Coins Cache Cleanup checklist #34280

Open

23 tasks

precalculate SipHash constant salt XORs #30442

precalculate SipHash constant salt XORs #30442

Uh oh!

Conversation

l0rinc commented Jul 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Measurements

Uh oh!

DrahtBot commented Jul 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage & Benchmarks

Reviews

Conflicts

Uh oh!

l0rinc commented Jul 14, 2024

Uh oh!

andrewtoth commented Jul 14, 2024

Uh oh!

l0rinc commented Jul 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrewtoth commented Jul 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

l0rinc commented Jul 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrewtoth commented Jul 25, 2024

Uh oh!

l0rinc commented Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Aug 30, 2024

Uh oh!

l0rinc commented Oct 16, 2024

Uh oh!

laanwj left a comment

Choose a reason for hiding this comment

Uh oh!

vasild left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

l0rinc commented Dec 1, 2025

Uh oh!

vasild commented Dec 3, 2025

Uh oh!

sipa left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

l0rinc Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

l0rinc Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

l0rinc left a comment

Choose a reason for hiding this comment

Uh oh!

l0rinc Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

l0rinc commented Jul 12, 2024 •

edited

Loading

DrahtBot commented Jul 12, 2024 •

edited

Loading

l0rinc commented Jul 14, 2024 •

edited

Loading

andrewtoth commented Jul 15, 2024 •

edited

Loading

l0rinc commented Jul 16, 2024 •

edited

Loading

l0rinc commented Jul 26, 2024 •

edited

Loading

vasild left a comment •

edited

Loading

sipa left a comment •

edited

Loading

l0rinc Dec 9, 2025 •

edited

Loading

l0rinc Dec 9, 2025 •

edited

Loading

l0rinc Dec 9, 2025 •

edited

Loading