Skip to content

Commit 16b4f75

Browse files
committed
Merge bitcoin/bitcoin#28923: script/sign: avoid duplicated signature verification after signing (+introduce signing benchmarks)
fe92c15 script/sign: avoid duplicated signature verification after signing (Sebastian Falbesoner) 0800895 bench: add benchmark for `SignTransaction` (Sebastian Falbesoner) Pull request description: This PR is a small performance improvement on the `SignTransaction` function, which is used mostly by the wallet (obviously) and the `signrawtransactionwithkey` RPC. The lower-level function `ProduceSignature` already calls `VerifyScript` internally as last step in order to check whether the signature data is complete: https://github.com/bitcoin/bitcoin/blob/daa56f7f665183bcce3df146f143be37f33c123e/src/script/sign.cpp#L568-L570 If and only if that is the case, the `complete` field of the `SignatureData` is set to `true` accordingly and there is no need then to verify the script after again, as we already know that it would succeed. This leads to a rough ~20% speed-up for `SignTransaction` for single-input ECDSA or Taproot transactions, according to the newly introduced `SignTransaction{ECDSA,Taproot}` benchmarks: ``` $ ./src/bench/bench_bitcoin --filter=SignTransaction.* ``` without commit 18185f4f578b8795fdaa75926630a691e9c8d0d4: | ns/op | op/s | err% | total | benchmark |--------------------:|--------------------:|--------:|----------:|:---------- | 185,597.79 | 5,388.00 | 1.6% | 0.22 | `SignTransactionECDSA` | 141,323.95 | 7,075.94 | 2.1% | 0.17 | `SignTransactionSchnorr` with commit 18185f4f578b8795fdaa75926630a691e9c8d0d4: | ns/op | op/s | err% | total | benchmark |--------------------:|--------------------:|--------:|----------:|:---------- | 149,757.86 | 6,677.45 | 1.4% | 0.18 | `SignTransactionECDSA` | 108,284.40 | 9,234.94 | 2.0% | 0.13 | `SignTransactionSchnorr` Note that there are already signing benchmarks in the secp256k1 library, but `SignTransaction` does much more than just the cryptographical parts, i.e.: * calculate the unsigned tx's `PrecomputedTransactionData` if necessary * apply Solver on the prevout scriptPubKey, fetch the relevant keys from the signing provider * perform the actual signing operation (for ECDSA signatures, that could be more than once due to low-R grinding) * verify if the signatures are correct by calling `VerifyScript` (more than once currently, which is fixed by this PR) so it probably makes sense to also have benchmarks from that higher-level application perspective. ACKs for top commit: achow101: ACK fe92c15 furszy: utACK fe92c15 glozow: light review ACK fe92c15 Tree-SHA512: b7225ff9e8a640ca5222dea5b2a463a0f9b9de704e4330b5b9a7bce2d63a1f4620575c474a8186f4708d7d9534eab55d000393d99db79c0cfc046b35f0a4a778
2 parents ad5579e + fe92c15 commit 16b4f75

File tree

3 files changed

+72
-1
lines changed

3 files changed

+72
-1
lines changed

src/Makefile.bench.include

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ bench_bench_bitcoin_SOURCES = \
5454
bench/rollingbloom.cpp \
5555
bench/rpc_blockchain.cpp \
5656
bench/rpc_mempool.cpp \
57+
bench/sign_transaction.cpp \
5758
bench/streams_findbyte.cpp \
5859
bench/strencodings.cpp \
5960
bench/util_time.cpp \

src/bench/sign_transaction.cpp

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Copyright (c) 2023 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <bench/bench.h>
6+
#include <addresstype.h>
7+
#include <coins.h>
8+
#include <key.h>
9+
#include <primitives/transaction.h>
10+
#include <pubkey.h>
11+
#include <script/interpreter.h>
12+
#include <script/script.h>
13+
#include <script/sign.h>
14+
#include <uint256.h>
15+
#include <util/translation.h>
16+
17+
enum class InputType {
18+
P2WPKH, // segwitv0, witness-pubkey-hash (ECDSA signature)
19+
P2TR, // segwitv1, taproot key-path spend (Schnorr signature)
20+
};
21+
22+
static void SignTransactionSingleInput(benchmark::Bench& bench, InputType input_type)
23+
{
24+
ECC_Context ecc_context{};
25+
26+
FlatSigningProvider keystore;
27+
std::vector<CScript> prev_spks;
28+
29+
// Create a bunch of keys / UTXOs to avoid signing with the same key repeatedly
30+
for (int i = 0; i < 32; i++) {
31+
CKey privkey = GenerateRandomKey();
32+
CPubKey pubkey = privkey.GetPubKey();
33+
CKeyID key_id = pubkey.GetID();
34+
keystore.keys.emplace(key_id, privkey);
35+
keystore.pubkeys.emplace(key_id, pubkey);
36+
37+
// Create specified locking script type
38+
CScript prev_spk;
39+
switch (input_type) {
40+
case InputType::P2WPKH: prev_spk = GetScriptForDestination(WitnessV0KeyHash(pubkey)); break;
41+
case InputType::P2TR: prev_spk = GetScriptForDestination(WitnessV1Taproot(XOnlyPubKey{pubkey})); break;
42+
default: assert(false);
43+
}
44+
prev_spks.push_back(prev_spk);
45+
}
46+
47+
// Simple 1-input tx with artificial outpoint
48+
// (note that for the purpose of signing with SIGHASH_ALL we don't need any outputs)
49+
COutPoint prevout{/*hashIn=*/Txid::FromUint256(uint256::ONE), /*nIn=*/1337};
50+
CMutableTransaction unsigned_tx;
51+
unsigned_tx.vin.emplace_back(prevout);
52+
53+
// Benchmark.
54+
int iter = 0;
55+
bench.minEpochIterations(100).run([&] {
56+
CMutableTransaction tx{unsigned_tx};
57+
std::map<COutPoint, Coin> coins;
58+
CScript prev_spk = prev_spks[(iter++) % prev_spks.size()];
59+
coins[prevout] = Coin(CTxOut(10000, prev_spk), /*nHeightIn=*/100, /*fCoinBaseIn=*/false);
60+
std::map<int, bilingual_str> input_errors;
61+
bool complete = SignTransaction(tx, &keystore, coins, SIGHASH_ALL, input_errors);
62+
assert(complete);
63+
});
64+
}
65+
66+
static void SignTransactionECDSA(benchmark::Bench& bench) { SignTransactionSingleInput(bench, InputType::P2WPKH); }
67+
static void SignTransactionSchnorr(benchmark::Bench& bench) { SignTransactionSingleInput(bench, InputType::P2TR); }
68+
69+
BENCHMARK(SignTransactionECDSA, benchmark::PriorityLevel::HIGH);
70+
BENCHMARK(SignTransactionSchnorr, benchmark::PriorityLevel::HIGH);

src/script/sign.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ bool SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore,
831831
}
832832

833833
ScriptError serror = SCRIPT_ERR_OK;
834-
if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount, txdata, MissingDataBehavior::FAIL), &serror)) {
834+
if (!sigdata.complete && !VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount, txdata, MissingDataBehavior::FAIL), &serror)) {
835835
if (serror == SCRIPT_ERR_INVALID_STACK_OPERATION) {
836836
// Unable to sign input and verification failed (possible attempt to partially sign).
837837
input_errors[i] = Untranslated("Unable to sign input, invalid stack size (possibly missing key)");

0 commit comments

Comments
 (0)