Skip to content

backport: bitcoin#24836, #25379, #25773, #25957, #25986, #26158, #26294, #26349, #26388, #26404, #26424, #26625, #26920, #27350 #7085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knst wants to merge 16 commits into
base: develop
Choose a base branch
from
+1,136 −932
Open

backport: bitcoin#24836, #25379, #25773, #25957, #25986, #26158, #26294, #26349, #26388, #26404, #26424, #26625, #26920, #27350 #7085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0ee3ae5
Merge bitcoin/bitcoin#25957: wallet: fast rescan with BIP157 block fi…
achow101 Oct 26, 2022
ca4d177
Merge bitcoin/bitcoin#26920: doc: add release note for #25957 (fast w…
fanquake Jan 19, 2023
f5d0e76
Merge bitcoin/bitcoin#26158: bench: add "priority level" to the bench…
achow101 Oct 20, 2022
2ae7dd8
fmt: apply clang-format for blsl_dkg.cpp
knst Dec 31, 2025
7bc9bf3
Merge bitcoin/bitcoin#26388: ci: Use `macos-ventura-xcode:14.1` image…
Oct 27, 2022
3c70cf8
Merge bitcoin/bitcoin#26349: rpc: make `address` field optional `list…
achow101 Oct 27, 2022
2c3e602
Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_ge…
Oct 29, 2022
dbdd55f
Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name
Oct 31, 2022
b8c3fca
Merge bitcoin/bitcoin#26294: build: move util/url to common/url
fanquake Nov 1, 2022
9130986
Merge bitcoin/bitcoin#24836: add RPC (-regtest only) for testing pack…
fanquake Jun 30, 2022
9210e37
Merge bitcoin/bitcoin#25379: test: use MiniWallet to simplify mempool…
Aug 3, 2022
7e8a59c
fix: add missing changes and adjust fee rate to fix bitcoin/bitcoin#2…
knst Jan 4, 2026
d254223
Merge bitcoin/bitcoin#25773: test: Target exact weight in MiniWallet …
Aug 4, 2022
fd77ea5
Merge bitcoin/bitcoin#25986: test: refactor `RPCPackagesTest` to use …
glozow Nov 28, 2022
79d08d8
Merge bitcoin/bitcoin#26625: test: Run mempool_packages.py with MiniW…
fanquake Jan 17, 2023
a0824a7
Merge bitcoin/bitcoin#27350: test: refactor: dedup mempool_package_li…
glozow Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/dash/lint-tidy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ echo "=========================="

cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
iwyu_tool.py \
"src/common/url.cpp" \
"src/compat" \
"src/dbwrapper.cpp" \
"src/init" \
Expand Down Expand Up @@ -110,7 +111,6 @@ iwyu_tool.py \
"src/util/string.cpp" \
"src/util/strencodings.cpp" \
"src/util/syserror.cpp" \
"src/util/url.cpp" \
"src/zmq" \
-p . "${MAKEJOBS}" \
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
Expand Down
6 changes: 3 additions & 3 deletions ci/test/00_setup_env_mac_native_x86_64.sh → ci/test/00_setup_env_mac_native_arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_macos
export HOST=x86_64-apple-darwin
export PIP_PACKAGES="zmq lief"
export HOST=arm64-apple-darwin
export PIP_PACKAGES="zmq"
export GOAL="install"
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner"
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports --disable-miner"
export CI_OS_NAME="macos"
export NO_DEPENDS=1
export OSX_SDK=""
Expand Down
2 changes: 1 addition & 1 deletion ci/test/04_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if [ -n "$PIP_PACKAGES" ]; then
if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade pip
# shellcheck disable=SC2086
IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
else
# shellcheck disable=SC2086
${CI_RETRY_EXE} CI_EXEC pip3 install --user $PIP_PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion doc/descriptors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,6 @@ ones. For larger numbers of errors, or other types of errors, there is a
roughly 1 in a trillion chance of not detecting the errors.

All RPCs in Dash Core will include the checksum in their output. Only
certain RPCs require checksums on input, including `deriveaddress` and
certain RPCs require checksums on input, including `deriveaddresses` and
`importmulti`. The checksum for a descriptor without one can be computed
using the `getdescriptorinfo` RPC.
9 changes: 9 additions & 0 deletions doc/release-notes-25957.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Wallet
------

- Rescans for descriptor wallets are now significantly faster if compact
block filters (BIP158) are available. Since those are not constructed
by default, the configuration option "-blockfilterindex=1" has to be
provided to take advantage of the optimization. This improves the
performance of the RPC calls `rescanblockchain`, `importdescriptors`
and `restorewallet`. (#25957)
11 changes: 6 additions & 5 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ BITCOIN_CORE_H = \
coins.h \
common/bloom.h \
common/run_command.h \
common/url.h \
compat/assumptions.h \
compat/byteswap.h \
compat/compat.h \
Expand Down Expand Up @@ -431,7 +432,6 @@ BITCOIN_CORE_H = \
util/translation.h \
util/types.h \
util/ui_change_type.h \
util/url.h \
util/vector.h \
util/wpipe.h \
validation.h \
Expand Down Expand Up @@ -959,6 +959,11 @@ libbitcoin_common_a_SOURCES = \
script/standard.cpp \
warnings.cpp \
$(BITCOIN_CORE_H)

if USE_LIBEVENT
libbitcoin_common_a_CPPFLAGS += $(EVENT_CFLAGS)
libbitcoin_common_a_SOURCES += common/url.cpp
endif
#

# util #
Expand Down Expand Up @@ -1014,10 +1019,6 @@ libbitcoin_util_a_SOURCES = \
util/tokenpipe.cpp \
util/wpipe.cpp \
$(BITCOIN_CORE_H)

if USE_LIBEVENT
libbitcoin_util_a_SOURCES += util/url.cpp
endif
#

# cli #
Expand Down
12 changes: 6 additions & 6 deletions src/bench/addrman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ static void AddrManAddThenGood(benchmark::Bench& bench)
});
}

BENCHMARK(AddrManAdd);
BENCHMARK(AddrManSelect);
BENCHMARK(AddrManSelectFromAlmostEmpty);
BENCHMARK(AddrManSelectByNetwork);
BENCHMARK(AddrManGetAddr);
BENCHMARK(AddrManAddThenGood);
BENCHMARK(AddrManAdd, benchmark::PriorityLevel::HIGH);
BENCHMARK(AddrManSelect, benchmark::PriorityLevel::HIGH);
BENCHMARK(AddrManSelectFromAlmostEmpty, benchmark::PriorityLevel::HIGH);
BENCHMARK(AddrManSelectByNetwork, benchmark::PriorityLevel::HIGH);
BENCHMARK(AddrManGetAddr, benchmark::PriorityLevel::HIGH);
BENCHMARK(AddrManAddThenGood, benchmark::PriorityLevel::HIGH);
6 changes: 3 additions & 3 deletions src/bench/base58.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ static void Base58Decode(benchmark::Bench& bench)
}


BENCHMARK(Base58Encode);
BENCHMARK(Base58CheckEncode);
BENCHMARK(Base58Decode);
BENCHMARK(Base58Encode, benchmark::PriorityLevel::HIGH);
BENCHMARK(Base58CheckEncode, benchmark::PriorityLevel::HIGH);
BENCHMARK(Base58Decode, benchmark::PriorityLevel::HIGH);
4 changes: 2 additions & 2 deletions src/bench/bech32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ static void Bech32Decode(benchmark::Bench& bench)
}


BENCHMARK(Bech32Encode);
BENCHMARK(Bech32Decode);
BENCHMARK(Bech32Encode, benchmark::PriorityLevel::HIGH);
BENCHMARK(Bech32Decode, benchmark::PriorityLevel::HIGH);
4 changes: 2 additions & 2 deletions src/bench/bench.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class BenchRunner
} // namespace benchmark

// BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo", foo, priority_level);
#define BENCHMARK(n) \
benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n, benchmark::PriorityLevel::HIGH);
#define BENCHMARK(n, priority_level) \
benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n, priority_level);

#endif // BITCOIN_BENCH_BENCH_H
2 changes: 1 addition & 1 deletion src/bench/bip324_ecdh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ static void BIP324_ECDH(benchmark::Bench& bench)
ECC_Stop();
}

BENCHMARK(BIP324_ECDH);
BENCHMARK(BIP324_ECDH, benchmark::PriorityLevel::HIGH);
2 changes: 1 addition & 1 deletion src/bench/block_assemble.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ static void AssembleBlock(benchmark::Bench& bench)
});
}

BENCHMARK(AssembleBlock);
BENCHMARK(AssembleBlock, benchmark::PriorityLevel::HIGH);
28 changes: 14 additions & 14 deletions src/bench/bls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,17 +358,17 @@ static void BLS_Verify_BatchedParallel(benchmark::Bench& bench)
blsWorker.Stop();
}

BENCHMARK(BLS_PubKeyAggregate_Normal)
BENCHMARK(BLS_SecKeyAggregate_Normal)
BENCHMARK(BLS_SignatureAggregate_Normal)
BENCHMARK(BLS_Sign_Normal)
BENCHMARK(BLS_Verify_Normal)
BENCHMARK(BLS_Verify_LargeBlock100)
BENCHMARK(BLS_Verify_LargeBlock1000)
BENCHMARK(BLS_Verify_LargeBlockSelfAggregated100)
BENCHMARK(BLS_Verify_LargeBlockSelfAggregated1000)
BENCHMARK(BLS_Verify_LargeAggregatedBlock100)
BENCHMARK(BLS_Verify_LargeAggregatedBlock1000)
BENCHMARK(BLS_Verify_LargeAggregatedBlock1000PreVerified)
BENCHMARK(BLS_Verify_Batched)
BENCHMARK(BLS_Verify_BatchedParallel)
BENCHMARK(BLS_PubKeyAggregate_Normal, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_SecKeyAggregate_Normal, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_SignatureAggregate_Normal, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Sign_Normal, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_Normal, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeBlock100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeBlock1000, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeBlockSelfAggregated100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeBlockSelfAggregated1000, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeAggregatedBlock100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeAggregatedBlock1000, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_LargeAggregatedBlock1000PreVerified, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_Batched, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_Verify_BatchedParallel, benchmark::PriorityLevel::HIGH)
72 changes: 36 additions & 36 deletions src/bench/bls_dkg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ static void BLSDKG_GenerateContributions(benchmark::Bench& bench, uint32_t epoch
blsWorker.Stop();
}

#define BENCH_GenerateContributions(name, quorumSize, epoch_iters) \
#define BENCH_GenerateContributions(name, quorumSize, epoch_iters) \
static void BLSDKG_GenerateContributions_##name##_##quorumSize(benchmark::Bench& bench) \
{ \
BLSDKG_GenerateContributions(bench, epoch_iters, quorumSize); \
} \
BENCHMARK(BLSDKG_GenerateContributions_##name##_##quorumSize)
{ \
BLSDKG_GenerateContributions(bench, epoch_iters, quorumSize); \
} \
BENCHMARK(BLSDKG_GenerateContributions_##name##_##quorumSize, benchmark::PriorityLevel::HIGH)

static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int quorumSize)
{
Expand All @@ -149,42 +149,42 @@ static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int qu
});
}

#define BENCH_InitDKG(name, quorumSize, epoch_iters) \
#define BENCH_InitDKG(name, quorumSize, epoch_iters) \
static void BLSDKG_InitDKG_##name##_##quorumSize(benchmark::Bench& bench) \
{ \
BLSDKG_InitDKG(bench, epoch_iters, quorumSize); \
} \
BENCHMARK(BLSDKG_InitDKG_##name##_##quorumSize)
{ \
BLSDKG_InitDKG(bench, epoch_iters, quorumSize); \
} \
BENCHMARK(BLSDKG_InitDKG_##name##_##quorumSize, benchmark::PriorityLevel::HIGH)

#define BENCH_BuildQuorumVerificationVectors(name, quorumSize, epoch_iters) \
#define BENCH_BuildQuorumVerificationVectors(name, quorumSize, epoch_iters) \
static void BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize(benchmark::Bench& bench) \
{ \
if (!bench.output()) { \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(1); \
ptr->Bench_BuildQuorumVerificationVectors(bench, 1); \
ptr.reset(); \
return; \
} \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(quorumSize); \
ptr->Bench_BuildQuorumVerificationVectors(bench, epoch_iters); \
ptr.reset(); \
} \
BENCHMARK(BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize)
{ \
if (!bench.output()) { \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(1); \
ptr->Bench_BuildQuorumVerificationVectors(bench, 1); \
ptr.reset(); \
return; \
} \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(quorumSize); \
ptr->Bench_BuildQuorumVerificationVectors(bench, epoch_iters); \
ptr.reset(); \
} \
BENCHMARK(BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize, benchmark::PriorityLevel::HIGH)

#define BENCH_VerifyContributionShares(name, quorumSize, invalidCount, aggregated, epoch_iters) \
static void BLSDKG_VerifyContributionShares_##name##_##quorumSize(benchmark::Bench& bench) \
{ \
if (!bench.output()) { \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(1); \
ptr->Bench_VerifyContributionShares(bench, invalidCount, aggregated, 1); \
ptr.reset(); \
return; \
} \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(quorumSize); \
ptr->Bench_VerifyContributionShares(bench, invalidCount, aggregated, epoch_iters); \
ptr.reset(); \
} \
BENCHMARK(BLSDKG_VerifyContributionShares_##name##_##quorumSize)
static void BLSDKG_VerifyContributionShares_##name##_##quorumSize(benchmark::Bench& bench) \
{ \
if (!bench.output()) { \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(1); \
ptr->Bench_VerifyContributionShares(bench, invalidCount, aggregated, 1); \
ptr.reset(); \
return; \
} \
std::unique_ptr<DKG> ptr = std::make_unique<DKG>(quorumSize); \
ptr->Bench_VerifyContributionShares(bench, invalidCount, aggregated, epoch_iters); \
ptr.reset(); \
} \
BENCHMARK(BLSDKG_VerifyContributionShares_##name##_##quorumSize, benchmark::PriorityLevel::HIGH)

BENCH_GenerateContributions(simple, 50, 50);
BENCH_GenerateContributions(simple, 100, 5);
Expand Down
20 changes: 10 additions & 10 deletions src/bench/bls_pubkey_agg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ static void BLS_PubKeyAggregate_Iterative_200(benchmark::Bench& bench) { BLS_Pub
static void BLS_PubKeyAggregate_Batch_200(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(200, bench); }

// Register all benchmarks
BENCHMARK(BLS_PubKeyAggregate_Iterative_5)
BENCHMARK(BLS_PubKeyAggregate_Batch_5)
BENCHMARK(BLS_PubKeyAggregate_Iterative_25)
BENCHMARK(BLS_PubKeyAggregate_Batch_25)
BENCHMARK(BLS_PubKeyAggregate_Iterative_50)
BENCHMARK(BLS_PubKeyAggregate_Batch_50)
BENCHMARK(BLS_PubKeyAggregate_Iterative_100)
BENCHMARK(BLS_PubKeyAggregate_Batch_100)
BENCHMARK(BLS_PubKeyAggregate_Iterative_200)
BENCHMARK(BLS_PubKeyAggregate_Batch_200)
BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH)
Comment on lines +90 to +99
Copy link

@coderabbitai coderabbitai bot Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Missing semicolons after BENCHMARK macro invocations.

The BENCHMARK macro invocations on lines 90-99 are missing trailing semicolons. Comparing with other benchmark files in this PR (e.g., examples.cpp line 21, bech32.cpp lines 35-36, checkqueue.cpp line 73), all use semicolons after the macro call.

🔎 Proposed fix 
-BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH)
-BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH)
+BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH);
+BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH);

Note: The Cppcheck static analysis error is likely a false positive caused by its inability to resolve the macro expansion context.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH)
BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH);
BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH);
🧰 Tools
🪛 Cppcheck (2.19.0)

[error] 95-95: failed to evaluate #if condition, undefined function-like macro invocation

(syntaxError)

🤖 Prompt for AI Agents 
In @src/bench/bls_pubkey_agg.cpp around lines 90 - 99, Each BENCHMARK macro
invocation in this snippet is missing the trailing semicolon; update every
BENCHMARK line (e.g., BENCHMARK(BLS_PubKeyAggregate_Iterative_5,
benchmark::PriorityLevel::HIGH), BENCHMARK(BLS_PubKeyAggregate_Batch_5, ...),
BENCHMARK(BLS_PubKeyAggregate_Iterative_25, ...), etc.) to end with a semicolon
so the macros are treated as statements and match the style used elsewhere.

2 changes: 1 addition & 1 deletion src/bench/ccoins_caching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ static void CCoinsCaching(benchmark::Bench& bench)
ECC_Stop();
}

BENCHMARK(CCoinsCaching);
BENCHMARK(CCoinsCaching, benchmark::PriorityLevel::HIGH);
12 changes: 6 additions & 6 deletions src/bench/chacha20.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static void FSCHACHA20POLY1305_1MB(benchmark::Bench& bench)
FSCHACHA20POLY1305(bench, BUFFER_SIZE_LARGE);
}

BENCHMARK(CHACHA20_64BYTES);
BENCHMARK(CHACHA20_256BYTES);
BENCHMARK(CHACHA20_1MB);
BENCHMARK(FSCHACHA20POLY1305_64BYTES);
BENCHMARK(FSCHACHA20POLY1305_256BYTES);
BENCHMARK(FSCHACHA20POLY1305_1MB);
BENCHMARK(CHACHA20_64BYTES, benchmark::PriorityLevel::HIGH);
BENCHMARK(CHACHA20_256BYTES, benchmark::PriorityLevel::HIGH);
BENCHMARK(CHACHA20_1MB, benchmark::PriorityLevel::HIGH);
BENCHMARK(FSCHACHA20POLY1305_64BYTES, benchmark::PriorityLevel::HIGH);
BENCHMARK(FSCHACHA20POLY1305_256BYTES, benchmark::PriorityLevel::HIGH);
BENCHMARK(FSCHACHA20POLY1305_1MB, benchmark::PriorityLevel::HIGH);
4 changes: 2 additions & 2 deletions src/bench/checkblock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ static void DeserializeAndCheckBlockTest(benchmark::Bench& bench)
});
}

BENCHMARK(DeserializeBlockTest);
BENCHMARK(DeserializeAndCheckBlockTest);
BENCHMARK(DeserializeBlockTest, benchmark::PriorityLevel::HIGH);
BENCHMARK(DeserializeAndCheckBlockTest, benchmark::PriorityLevel::HIGH);
2 changes: 1 addition & 1 deletion src/bench/checkqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
queue.StopWorkerThreads();
ECC_Stop();
}
BENCHMARK(CCheckQueueSpeedPrevectorJob);
BENCHMARK(CCheckQueueSpeedPrevectorJob, benchmark::PriorityLevel::HIGH);
4 changes: 2 additions & 2 deletions src/bench/coin_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,5 @@ static void BnBExhaustion(benchmark::Bench& bench)
});
}

BENCHMARK(CoinSelection);
BENCHMARK(BnBExhaustion);
BENCHMARK(CoinSelection, benchmark::PriorityLevel::HIGH);
BENCHMARK(BnBExhaustion, benchmark::PriorityLevel::HIGH);
Loading
Loading