mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-20 07:09:15 +01:00
6c7a17a8e0psbt: support externally provided preimages for Miniscript satisfaction (Antoine Poinsot)840a396029qa: add a "smart" Miniscript fuzz target (Antoine Poinsot)17e3547241qa: add a fuzz target generating random nodes from a binary encoding (Antoine Poinsot)611e12502aqa: functional test Miniscript signing with key and timelocks (Antoine Poinsot)d57b7f2021refactor: make descriptors in Miniscript functional test more readable (Antoine Poinsot)0a8fc9e200wallet: check solvability using descriptor in AvailableCoins (Antoine Poinsot)560e62b1e2script/sign: signing support for Miniscripts with hash preimage challenges (Antoine Poinsot)a2f81b6a8fscript/sign: signing support for Miniscript with timelocks (Antoine Poinsot)61c6d1a844script/sign: basic signing support for Miniscript descriptors (Antoine Poinsot)4242c1c521Align 'e' property of or_d and andor with website spec (Pieter Wuille)f5deb41780Various additional explanations of the satisfaction logic from Pieter (Pieter Wuille)22c5b00345miniscript: satisfaction support (Antoine Poinsot) Pull request description: This makes the Miniscript descriptors solvable. Note this introduces signing support for much more complex scripts than the wallet was previously able to solve, and the whole tooling isn't provided for a complete Miniscript integration in the wallet. Particularly, the PSBT<->Miniscript integration isn't entirely covered in this PR. ACKs for top commit: achow101: ACK6c7a17a8e0sipa: utACK6c7a17a8e0(to the extent that it's not my own code). Tree-SHA512: a71ec002aaf66bd429012caa338fc58384067bcd2f453a46e21d381ed1bacc8e57afb9db57c0fb4bf40de43b30808815e9ebc0ae1fbd9e61df0e7b91a17771cc
153 lines
6.6 KiB
C++
153 lines
6.6 KiB
C++
// Copyright (c) 2020-2021 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <chainparams.h>
|
|
#include <chainparamsbase.h>
|
|
#include <key.h>
|
|
#include <psbt.h>
|
|
#include <pubkey.h>
|
|
#include <script/keyorigin.h>
|
|
#include <script/sign.h>
|
|
#include <script/signingprovider.h>
|
|
#include <streams.h>
|
|
#include <test/fuzz/FuzzedDataProvider.h>
|
|
#include <test/fuzz/fuzz.h>
|
|
#include <test/fuzz/util.h>
|
|
#include <util/translation.h>
|
|
|
|
#include <cassert>
|
|
#include <cstdint>
|
|
#include <iostream>
|
|
#include <map>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
void initialize_script_sign()
|
|
{
|
|
ECC_Start();
|
|
SelectParams(CBaseChainParams::REGTEST);
|
|
}
|
|
|
|
FUZZ_TARGET_INIT(script_sign, initialize_script_sign)
|
|
{
|
|
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
|
const std::vector<uint8_t> key = ConsumeRandomLengthByteVector(fuzzed_data_provider, 128);
|
|
|
|
{
|
|
CDataStream random_data_stream = ConsumeDataStream(fuzzed_data_provider);
|
|
std::map<CPubKey, KeyOriginInfo> hd_keypaths;
|
|
try {
|
|
DeserializeHDKeypaths(random_data_stream, key, hd_keypaths);
|
|
} catch (const std::ios_base::failure&) {
|
|
}
|
|
CDataStream serialized{SER_NETWORK, PROTOCOL_VERSION};
|
|
SerializeHDKeypaths(serialized, hd_keypaths, CompactSizeWriter(fuzzed_data_provider.ConsumeIntegral<uint8_t>()));
|
|
}
|
|
|
|
{
|
|
std::map<CPubKey, KeyOriginInfo> hd_keypaths;
|
|
LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
|
|
const std::optional<CPubKey> pub_key = ConsumeDeserializable<CPubKey>(fuzzed_data_provider);
|
|
if (!pub_key) {
|
|
break;
|
|
}
|
|
const std::optional<KeyOriginInfo> key_origin_info = ConsumeDeserializable<KeyOriginInfo>(fuzzed_data_provider);
|
|
if (!key_origin_info) {
|
|
break;
|
|
}
|
|
hd_keypaths[*pub_key] = *key_origin_info;
|
|
}
|
|
CDataStream serialized{SER_NETWORK, PROTOCOL_VERSION};
|
|
try {
|
|
SerializeHDKeypaths(serialized, hd_keypaths, CompactSizeWriter(fuzzed_data_provider.ConsumeIntegral<uint8_t>()));
|
|
} catch (const std::ios_base::failure&) {
|
|
}
|
|
std::map<CPubKey, KeyOriginInfo> deserialized_hd_keypaths;
|
|
try {
|
|
DeserializeHDKeypaths(serialized, key, hd_keypaths);
|
|
} catch (const std::ios_base::failure&) {
|
|
}
|
|
assert(hd_keypaths.size() >= deserialized_hd_keypaths.size());
|
|
}
|
|
|
|
{
|
|
SignatureData signature_data_1{ConsumeScript(fuzzed_data_provider)};
|
|
SignatureData signature_data_2{ConsumeScript(fuzzed_data_provider)};
|
|
signature_data_1.MergeSignatureData(signature_data_2);
|
|
}
|
|
|
|
FillableSigningProvider provider;
|
|
CKey k;
|
|
const std::vector<uint8_t> key_data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
|
|
k.Set(key_data.begin(), key_data.end(), fuzzed_data_provider.ConsumeBool());
|
|
if (k.IsValid()) {
|
|
provider.AddKey(k);
|
|
}
|
|
|
|
{
|
|
const std::optional<CMutableTransaction> mutable_transaction = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider);
|
|
const std::optional<CTxOut> tx_out = ConsumeDeserializable<CTxOut>(fuzzed_data_provider);
|
|
const unsigned int n_in = fuzzed_data_provider.ConsumeIntegral<unsigned int>();
|
|
if (mutable_transaction && tx_out && mutable_transaction->vin.size() > n_in) {
|
|
SignatureData signature_data_1 = DataFromTransaction(*mutable_transaction, n_in, *tx_out);
|
|
CTxIn input;
|
|
UpdateInput(input, signature_data_1);
|
|
const CScript script = ConsumeScript(fuzzed_data_provider);
|
|
SignatureData signature_data_2{script};
|
|
signature_data_1.MergeSignatureData(signature_data_2);
|
|
}
|
|
if (mutable_transaction) {
|
|
CTransaction tx_from{*mutable_transaction};
|
|
CMutableTransaction tx_to;
|
|
const std::optional<CMutableTransaction> opt_tx_to = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider);
|
|
if (opt_tx_to) {
|
|
tx_to = *opt_tx_to;
|
|
}
|
|
CMutableTransaction script_tx_to = tx_to;
|
|
CMutableTransaction sign_transaction_tx_to = tx_to;
|
|
if (n_in < tx_to.vin.size() && tx_to.vin[n_in].prevout.n < tx_from.vout.size()) {
|
|
SignatureData empty;
|
|
(void)SignSignature(provider, tx_from, tx_to, n_in, fuzzed_data_provider.ConsumeIntegral<int>(), empty);
|
|
}
|
|
if (n_in < script_tx_to.vin.size()) {
|
|
SignatureData empty;
|
|
(void)SignSignature(provider, ConsumeScript(fuzzed_data_provider), script_tx_to, n_in, ConsumeMoney(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int>(), empty);
|
|
MutableTransactionSignatureCreator signature_creator{tx_to, n_in, ConsumeMoney(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int>()};
|
|
std::vector<unsigned char> vch_sig;
|
|
CKeyID address;
|
|
if (fuzzed_data_provider.ConsumeBool()) {
|
|
if (k.IsValid()) {
|
|
address = k.GetPubKey().GetID();
|
|
}
|
|
} else {
|
|
address = CKeyID{ConsumeUInt160(fuzzed_data_provider)};
|
|
}
|
|
(void)signature_creator.CreateSig(provider, vch_sig, address, ConsumeScript(fuzzed_data_provider), fuzzed_data_provider.PickValueInArray({SigVersion::BASE, SigVersion::WITNESS_V0}));
|
|
}
|
|
std::map<COutPoint, Coin> coins;
|
|
LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
|
|
const std::optional<COutPoint> outpoint = ConsumeDeserializable<COutPoint>(fuzzed_data_provider);
|
|
if (!outpoint) {
|
|
break;
|
|
}
|
|
const std::optional<Coin> coin = ConsumeDeserializable<Coin>(fuzzed_data_provider);
|
|
if (!coin) {
|
|
break;
|
|
}
|
|
coins[*outpoint] = *coin;
|
|
}
|
|
std::map<int, bilingual_str> input_errors;
|
|
(void)SignTransaction(sign_transaction_tx_to, &provider, coins, fuzzed_data_provider.ConsumeIntegral<int>(), input_errors);
|
|
}
|
|
}
|
|
|
|
{
|
|
SignatureData signature_data_1;
|
|
(void)ProduceSignature(provider, DUMMY_SIGNATURE_CREATOR, ConsumeScript(fuzzed_data_provider), signature_data_1);
|
|
SignatureData signature_data_2;
|
|
(void)ProduceSignature(provider, DUMMY_MAXIMUM_SIGNATURE_CREATOR, ConsumeScript(fuzzed_data_provider), signature_data_2);
|
|
}
|
|
}
|