mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-02 03:31:09 +00:00
7082ce3e88d77456d60a5a66bd38807fbd66f311 scripted-diff: rename and de-globalise g_cs_orphans (Anthony Towns)
733d85f79cde353d8c9b54370f296b1031fa33d9 Move all g_cs_orphans locking to txorphanage (Anthony Towns)
a936f41a5d5f7bb97425f82ec64dfae62e840a56 txorphanage: make m_peer_work_set private (Anthony Towns)
3614819864a84ac32f6d53c6ace79b5e71bc174a txorphange: move orphan workset to txorphanage (Anthony Towns)
6f8e442ba61378489a6e2e2ab5bcfbccca1a29ec net_processing: Localise orphan_work_set handling to ProcessOrphanTx (Anthony Towns)
0027174b396cacbaac5fd52f13be3dca9fcbbfb8 net_processing: move ProcessOrphanTx docs to declaration (Anthony Towns)
9910ed755c3dfd7669707b44d993a20030dd7477 net_processing: Pass a Peer& to ProcessOrphanTx (Anthony Towns)
89e2e0da0bcd0b0757d7b42907e2d2214da9f68b net_processing: move extra transactions to msgproc mutex (Anthony Towns)
ff8d44d1967d8ff9fb9b9ea0b87c0470d8cc2550 Remove unnecessary includes of txorphange.h (Anthony Towns)
Pull request description:
Moves extra transactions to be under the `m_msgproc_mutex` lock rather than `g_cs_orphans` and refactors orphan handling so that the lock can be internal to the `TxOrphange` class.
ACKs for top commit:
dergoegge:
Code review ACK 7082ce3e88d77456d60a5a66bd38807fbd66f311
glozow:
ACK 7082ce3e88d77456d60a5a66bd38807fbd66f311 via code review and some [basic testing](https://github.com/glozow/bitcoin/blob/review-26295/src/test/orphanage_tests.cpp#L150). I think putting txorphanage in charge of handling peer work sets is the right direction.
Tree-SHA512: 1ec454c3a69ebd45ff652770d6a55c6b183db71aba4d12639ed70f525f0035e069a81d06e9b65b66e87929c607080a1c5e5dcd2ca91eaa2cf202dc6c02aa6818
138 lines
4.8 KiB
C++
138 lines
4.8 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 <banman.h>
|
|
#include <chainparams.h>
|
|
#include <consensus/consensus.h>
|
|
#include <net.h>
|
|
#include <net_processing.h>
|
|
#include <protocol.h>
|
|
#include <scheduler.h>
|
|
#include <script/script.h>
|
|
#include <streams.h>
|
|
#include <test/fuzz/FuzzedDataProvider.h>
|
|
#include <test/fuzz/fuzz.h>
|
|
#include <test/fuzz/util.h>
|
|
#include <test/fuzz/util/net.h>
|
|
#include <test/util/mining.h>
|
|
#include <test/util/net.h>
|
|
#include <test/util/setup_common.h>
|
|
#include <test/util/validation.h>
|
|
#include <validationinterface.h>
|
|
#include <version.h>
|
|
|
|
#include <atomic>
|
|
#include <cassert>
|
|
#include <chrono>
|
|
#include <cstdint>
|
|
#include <iosfwd>
|
|
#include <iostream>
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
namespace {
|
|
const TestingSetup* g_setup;
|
|
} // namespace
|
|
|
|
size_t& GetNumMsgTypes()
|
|
{
|
|
static size_t g_num_msg_types{0};
|
|
return g_num_msg_types;
|
|
}
|
|
#define FUZZ_TARGET_MSG(msg_type) \
|
|
struct msg_type##_Count_Before_Main { \
|
|
msg_type##_Count_Before_Main() \
|
|
{ \
|
|
++GetNumMsgTypes(); \
|
|
} \
|
|
} const static g_##msg_type##_count_before_main; \
|
|
FUZZ_TARGET_INIT(process_message_##msg_type, initialize_process_message) \
|
|
{ \
|
|
fuzz_target(buffer, #msg_type); \
|
|
}
|
|
|
|
void initialize_process_message()
|
|
{
|
|
Assert(GetNumMsgTypes() == getAllNetMessageTypes().size()); // If this fails, add or remove the message type below
|
|
|
|
static const auto testing_setup = MakeNoLogFileContext<const TestingSetup>();
|
|
g_setup = testing_setup.get();
|
|
for (int i = 0; i < 2 * COINBASE_MATURITY; i++) {
|
|
MineBlock(g_setup->m_node, CScript() << OP_TRUE);
|
|
}
|
|
SyncWithValidationInterfaceQueue();
|
|
}
|
|
|
|
void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE)
|
|
{
|
|
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
|
|
|
ConnmanTestMsg& connman = *static_cast<ConnmanTestMsg*>(g_setup->m_node.connman.get());
|
|
TestChainState& chainstate = *static_cast<TestChainState*>(&g_setup->m_node.chainman->ActiveChainstate());
|
|
SetMockTime(1610000000); // any time to successfully reset ibd
|
|
chainstate.ResetIbd();
|
|
|
|
LOCK(NetEventsInterface::g_msgproc_mutex);
|
|
|
|
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
|
|
if (!LIMIT_TO_MESSAGE_TYPE.empty() && random_message_type != LIMIT_TO_MESSAGE_TYPE) {
|
|
return;
|
|
}
|
|
CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
|
|
|
|
connman.AddTestNode(p2p_node);
|
|
FillNode(fuzzed_data_provider, connman, p2p_node);
|
|
|
|
const auto mock_time = ConsumeTime(fuzzed_data_provider);
|
|
SetMockTime(mock_time);
|
|
|
|
// fuzzed_data_provider is fully consumed after this call, don't use it
|
|
CDataStream random_bytes_data_stream{fuzzed_data_provider.ConsumeRemainingBytes<unsigned char>(), SER_NETWORK, PROTOCOL_VERSION};
|
|
try {
|
|
g_setup->m_node.peerman->ProcessMessage(p2p_node, random_message_type, random_bytes_data_stream,
|
|
GetTime<std::chrono::microseconds>(), std::atomic<bool>{false});
|
|
} catch (const std::ios_base::failure&) {
|
|
}
|
|
g_setup->m_node.peerman->SendMessages(&p2p_node);
|
|
SyncWithValidationInterfaceQueue();
|
|
g_setup->m_node.connman->StopNodes();
|
|
}
|
|
|
|
FUZZ_TARGET_INIT(process_message, initialize_process_message) { fuzz_target(buffer, ""); }
|
|
FUZZ_TARGET_MSG(addr);
|
|
FUZZ_TARGET_MSG(addrv2);
|
|
FUZZ_TARGET_MSG(block);
|
|
FUZZ_TARGET_MSG(blocktxn);
|
|
FUZZ_TARGET_MSG(cfcheckpt);
|
|
FUZZ_TARGET_MSG(cfheaders);
|
|
FUZZ_TARGET_MSG(cfilter);
|
|
FUZZ_TARGET_MSG(cmpctblock);
|
|
FUZZ_TARGET_MSG(feefilter);
|
|
FUZZ_TARGET_MSG(filteradd);
|
|
FUZZ_TARGET_MSG(filterclear);
|
|
FUZZ_TARGET_MSG(filterload);
|
|
FUZZ_TARGET_MSG(getaddr);
|
|
FUZZ_TARGET_MSG(getblocks);
|
|
FUZZ_TARGET_MSG(getblocktxn);
|
|
FUZZ_TARGET_MSG(getcfcheckpt);
|
|
FUZZ_TARGET_MSG(getcfheaders);
|
|
FUZZ_TARGET_MSG(getcfilters);
|
|
FUZZ_TARGET_MSG(getdata);
|
|
FUZZ_TARGET_MSG(getheaders);
|
|
FUZZ_TARGET_MSG(headers);
|
|
FUZZ_TARGET_MSG(inv);
|
|
FUZZ_TARGET_MSG(mempool);
|
|
FUZZ_TARGET_MSG(merkleblock);
|
|
FUZZ_TARGET_MSG(notfound);
|
|
FUZZ_TARGET_MSG(ping);
|
|
FUZZ_TARGET_MSG(pong);
|
|
FUZZ_TARGET_MSG(sendaddrv2);
|
|
FUZZ_TARGET_MSG(sendcmpct);
|
|
FUZZ_TARGET_MSG(sendheaders);
|
|
FUZZ_TARGET_MSG(sendtxrcncl);
|
|
FUZZ_TARGET_MSG(tx);
|
|
FUZZ_TARGET_MSG(verack);
|
|
FUZZ_TARGET_MSG(version);
|
|
FUZZ_TARGET_MSG(wtxidrelay);
|