mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 21:12:48 +01:00
bc45a2f87a
* Merge #8068: Compact Blocks48efec8
Fix some minor compact block issues that came up in review (Matt Corallo)ccd06b9
Elaborate bucket size math (Pieter Wuille)0d4cb48
Use vTxHashes to optimize InitData significantly (Matt Corallo)8119026
Provide a flat list of txid/terators to txn in CTxMemPool (Matt Corallo)678ee97
Add BIP 152 to implemented BIPs list (Matt Corallo)56ba516
Add reconstruction debug logging (Matt Corallo)2f34a2e
Get our "best three" peers to announce blocks using cmpctblocks (Matt Corallo)927f8ee
Add ability to fetch CNode by NodeId (Matt Corallo)d25cd3e
Add receiver-side protocol implementation for CMPCTBLOCK stuff (Matt Corallo)9c837d5
Add sender-side protocol implementation for CMPCTBLOCK stuff (Matt Corallo)00c4078
Add protocol messages for short-ids blocks (Matt Corallo)e3b2222
Add some blockencodings tests (Matt Corallo)f4f8f14
Add TestMemPoolEntryHelper::FromTx version for CTransaction (Matt Corallo)85ad31e
Add partial-block block encodings API (Matt Corallo)5249dac
Add COMPACTSIZE wrapper similar to VARINT for serialization (Matt Corallo)cbda71c
Move context-required checks from CheckBlockHeader to Contextual... (Matt Corallo)7c29ec9
If AcceptBlockHeader returns true, pindex will be set. (Matt Corallo)96806c3
Stop trimming when mapTx is empty (Pieter Wuille) * Merge #8408: Prevent fingerprinting, disk-DoS with compact blocks1d06e49
Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)1de2a46
Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar) * Merge #8418: Add tests for compact blocks45c7ddd
Add p2p test for BIP 152 (compact blocks) (Suhas Daftuar)9a22a6c
Add support for compactblocks to mininode (Suhas Daftuar)a8689fd
Tests: refactor compact size serialization in mininode (Suhas Daftuar)9c8593d
Implement SipHash in Python (Pieter Wuille)56c87e9
Allow changing BIP9 parameters on regtest (Suhas Daftuar) * Merge #8505: Trivial: Fix typos in various files1aacfc2
various typos (leijurv) * Merge #8449: [Trivial] Do not shadow local variable, cleanupa159f25
Remove redundand (and shadowing) declaration (Pavel Janík)cce3024
Do not shadow local variable, cleanup (Pavel Janík) * Merge #8739: [qa] Fix broken sendcmpct test in p2p-compactblocks.py157254a
Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar) * Merge #8854: [qa] Fix race condition in p2p-compactblocks testb5fd666
[qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar) * Merge #8393: Support for compact blocks together with segwit27acfc1
[qa] Update p2p-compactblocks.py for compactblocks v2 (Suhas Daftuar)422fac6
[qa] Add support for compactblocks v2 to mininode (Suhas Daftuar)f5b9b8f
[qa] Fix bug in mininode witness deserialization (Suhas Daftuar)6aa28ab
Use cmpctblock type 2 for segwit-enabled transfer (Pieter Wuille)be7555f
Fix overly-prescriptive p2p-segwit test for new fetch logic (Matt Corallo)06128da
Make GetFetchFlags always request witness objects from witness peers (Matt Corallo) * Merge #8882: [qa] Fix race conditions in p2p-compactblocks.py and sendheaders.pyb55d941
[qa] Fix race condition in sendheaders.py (Suhas Daftuar)6976db2
[qa] Another attempt to fix race condition in p2p-compactblocks.py (Suhas Daftuar) * Merge #8904: [qa] Fix compact block shortids for a test case4cdece4
[qa] Fix compact block shortids for a test case (Dagur Valberg Johannsson) * Merge #8637: Compact Block Tweaks (rebase of #8235)3ac6de0
Align constant names for maximum compact block / blocktxn depth (Pieter Wuille)b2e93a3
Add cmpctblock to debug help list (instagibbs)fe998e9
More agressively filter compact block requests (Matt Corallo)02a337d
Dont remove a "preferred" cmpctblock peer if they provide a block (Matt Corallo) * Merge #8975: Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/6f2f639
Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/ (Jorge Timón) * Merge #8968: Don't hold cs_main when calling ProcessNewBlock from a cmpctblock72ca7d9
Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo) * Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processingdfe7906
Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo) * Merge #8515: A few mempool removal optimizations0334430
Add some missing includes (Pieter Wuille)4100499
Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille)51f2783
Make removed and conflicted arguments optional to remove (Pieter Wuille)f48211b
Bypass removeRecursive in removeForReorg (Pieter Wuille) * Merge #9026: Fix handling of invalid compact blocksd4833ff
Bump the protocol version to distinguish new banning behavior. (Suhas Daftuar)88c3549
Fix compact block handling to not ban if block is invalid (Suhas Daftuar)c93beac
[qa] Test that invalid compactblocks don't result in ban (Suhas Daftuar) * Merge #9039: Various serialization simplifcations and optimizationsd59a518
Use fixed preallocation instead of costly GetSerializeSize (Pieter Wuille)25a211a
Add optimized CSizeComputer serializers (Pieter Wuille)a2929a2
Make CSerAction's ForRead() constexpr (Pieter Wuille)a603925
Avoid -Wshadow errors (Pieter Wuille)5284721
Get rid of nType and nVersion (Pieter Wuille)657e05a
Make GetSerializeSize a wrapper on top of CSizeComputer (Pieter Wuille)fad9b66
Make nType and nVersion private and sometimes const (Pieter Wuille)c2c5d42
Make streams' read and write return void (Pieter Wuille)50e8a9c
Remove unused ReadVersion and WriteVersion (Pieter Wuille) * Merge #9058: Fixes for p2p-compactblocks.py test timeouts on travis (#8842)dac53b5
Modify getblocktxn handler not to drop requests for old blocks (Russell Yanofsky)55bfddc
[qa] Fix stale data bug in test_compactblocks_not_at_tip (Russell Yanofsky)47e9659
[qa] Fix bug in compactblocks v2 merge (Russell Yanofsky) * Merge #9160: [trivial] Fix hungarian variable nameec34648
[trivial] Fix hungarian variable name (Russell Yanofsky) * Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocksdfa44d1
[qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky) * Merge #9125: Make CBlock a vector of shared_ptr of CTransactionsb4e4ba4
Introduce convenience type CTransactionRef (Pieter Wuille)1662b43
Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille)da60506
Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille)0e85204
Add serialization for unique_ptr and shared_ptr (Pieter Wuille) * Merge #8872: Remove block-request logic from INV message processing037159c
Remove block-request logic from INV message processing (Matt Corallo)3451203
[qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo)d768f15
[qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews) * Merge #9199: Always drop the least preferred HB peer when adding a new one.ca8549d
Always drop the least preferred HB peer when adding a new one. (Gregory Maxwell) * Merge #9233: Fix some typos15fa95d
Fix some typos (fsb4000) * Merge #9260: Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp})76faa3c
Rename the remaining main.{h,cpp} to validation.{h,cpp} (Matt Corallo)e736772
Move network-msg-processing code out of main to its own file (Matt Corallo)87c35f5
Remove orphan state wipe from UnloadBlockIndex. (Matt Corallo) * Merge #9014: Fix block-connection performance regressiondd0df81
Document ConnectBlock connectTrace postconditions (Matt Corallo)2d6e561
Switch pblock in ProcessNewBlock to a shared_ptr (Matt Corallo)2736c44
Make the optional pblock in ActivateBestChain a shared_ptr (Matt Corallo)ae4db44
Create a shared_ptr for the block we're connecting in ActivateBCS (Matt Corallo)fd9d890
Keep blocks as shared_ptrs, instead of copying txn in ConnectTip (Matt Corallo)6fdd43b
Add struct to track block-connect-time-generated info for callbacks (Matt Corallo) * Merge #9240: Remove txConflicteda874ab5
remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)bf663f8
remove external usage of mempool conflict tracking (Alex Morcos) * Merge #9344: Do not run functions with necessary side-effects in assert()da9cdd2
Do not run functions with necessary side-effects in assert() (Gregory Maxwell) * Merge #9273: Remove unused CDiskBlockPos* argument from ProcessNewBlocka13fa4c
Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo) * Merge #9352: Attempt reconstruction from all compact block announcements813ede9
[qa] Update compactblocks test for multi-peer reconstruction (Suhas Daftuar)7017298
Allow compactblock reconstruction when block is in flight (Suhas Daftuar) * Merge #9252: Release cs_main before calling ProcessNewBlock, or processing headers (cmpctblock handling)bd02bdd
Release cs_main before processing cmpctblock as header (Suhas Daftuar)680b0c0
Release cs_main before calling ProcessNewBlock (cmpctblock handling) (Suhas Daftuar) * Merge #9283: A few more CTransactionRef optimizations91335ba
Remove unused MakeTransactionRef overloads (Pieter Wuille)6713f0f
Make FillBlock consume txn_available to avoid shared_ptr copies (Pieter Wuille)62607d7
Convert COrphanTx to keep a CTransactionRef (Pieter Wuille)c44e4c4
Make AcceptToMemoryPool take CTransactionRef (Pieter Wuille) * Merge #9375: Relay compact block messages prior to full block connection02ee4eb
Make most_recent_compact_block a pointer to a const (Matt Corallo)73666ad
Add comment to describe callers to ActivateBestChain (Matt Corallo)962f7f0
Call ActivateBestChain without cs_main/with most_recent_block (Matt Corallo)0df777d
Use a temp pindex to avoid a const_cast in ProcessNewBlockHeaders (Matt Corallo)c1ae4fc
Avoid holding cs_most_recent_block while calling ReadBlockFromDisk (Matt Corallo)9eb67f5
Ensure we meet the BIP 152 old-relay-types response requirements (Matt Corallo)5749a85
Cache most-recently-connected compact block (Matt Corallo)9eaec08
Cache most-recently-announced block's shared_ptr (Matt Corallo)c802092
Relay compact block messages prior to full block connection (Matt Corallo)6987219
Add a CValidationInterface::NewPoWValidBlock callback (Matt Corallo)180586f
Call AcceptBlock with the block's shared_ptr instead of CBlock& (Matt Corallo)8baaba6
[qa] Avoid race in preciousblock test. (Matt Corallo)9a0b2f4
[qa] Make compact blocks test construction using fetch methods (Matt Corallo)8017547
Make CBlockIndex*es in net_processing const (Matt Corallo) * Merge #9486: Make peer=%d log prints consistente6111b2
Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo) * Merge #9400: Set peers as HB peers upon full block validationd4781ac
Set peers as HB peers upon full block validation (Gregory Sanders) * Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstructionc594580
Add braces around AddToCompactExtraTransactions (Matt Corallo)1ccfe9b
Clarify comment about mempool/extra conflicts (Matt Corallo)fac4c78
Make PartiallyDownloadedBlock::InitData's second param const (Matt Corallo)b55b416
Add extra_count lower bound to compact reconstruction debug print (Matt Corallo)863edb4
Consider all (<100k memusage) txn for compact-block-extra-txn cache (Matt Corallo)7f8c8ca
Consider all orphan txn for compact-block-extra-txn cache (Matt Corallo)93380c5
Use replaced transactions in compact block reconstruction (Matt Corallo)1531652
Keep shared_ptrs to recently-replaced txn for compact blocks (Matt Corallo)edded80
Make ATMP optionally return the CTransactionRefs it replaced (Matt Corallo)c735540
Move ORPHAN constants from validation.h to net_processing.h (Matt Corallo) * Merge #9587: Do not shadow local variable named `tx`.44f2baa
Do not shadow local variable named `tx`. (Pavel Janík) * Merge #9510: [trivial] Fix typos in commentscc16d99
[trivial] Fix typos in comments (practicalswift) * Merge #9604: [Trivial] add comment about setting peer as HB peer.dd5b011
[Trivial] add comment about setting peer as HB peer. (John Newbery) * Fix using of AcceptToMemoryPool in PrivateSend code * add `override` * fSupportsDesiredCmpctVersion * bring back tx ressurection in DisconnectTip * Fix delayed headers * Remove unused CConnman::FindNode overload * Fix typos and comments * Fix minor code differences * Don't use rejection cache for corrupted transactions Partly based on https://github.com/bitcoin/bitcoin/pull/8525 * Backport missed cs_main locking changes Missed from58a215ce8c
* Backport missed comments and mapBlockSource.emplace call Missed from two commits:88c35491ab
7c98ce584e
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
210 lines
6.9 KiB
C++
210 lines
6.9 KiB
C++
// Copyright (c) 2016 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_BLOCK_ENCODINGS_H
|
|
#define BITCOIN_BLOCK_ENCODINGS_H
|
|
|
|
#include "primitives/block.h"
|
|
|
|
#include <memory>
|
|
|
|
class CTxMemPool;
|
|
|
|
// Dumb helper to handle CTransaction compression at serialize-time
|
|
struct TransactionCompressor {
|
|
private:
|
|
CTransactionRef& tx;
|
|
public:
|
|
TransactionCompressor(CTransactionRef& txIn) : tx(txIn) {}
|
|
|
|
ADD_SERIALIZE_METHODS;
|
|
|
|
template <typename Stream, typename Operation>
|
|
inline void SerializationOp(Stream& s, Operation ser_action) {
|
|
READWRITE(tx); //TODO: Compress tx encoding
|
|
}
|
|
};
|
|
|
|
class BlockTransactionsRequest {
|
|
public:
|
|
// A BlockTransactionsRequest message
|
|
uint256 blockhash;
|
|
std::vector<uint16_t> indexes;
|
|
|
|
ADD_SERIALIZE_METHODS;
|
|
|
|
template <typename Stream, typename Operation>
|
|
inline void SerializationOp(Stream& s, Operation ser_action) {
|
|
READWRITE(blockhash);
|
|
uint64_t indexes_size = (uint64_t)indexes.size();
|
|
READWRITE(COMPACTSIZE(indexes_size));
|
|
if (ser_action.ForRead()) {
|
|
size_t i = 0;
|
|
while (indexes.size() < indexes_size) {
|
|
indexes.resize(std::min((uint64_t)(1000 + indexes.size()), indexes_size));
|
|
for (; i < indexes.size(); i++) {
|
|
uint64_t index = 0;
|
|
READWRITE(COMPACTSIZE(index));
|
|
if (index > std::numeric_limits<uint16_t>::max())
|
|
throw std::ios_base::failure("index overflowed 16 bits");
|
|
indexes[i] = index;
|
|
}
|
|
}
|
|
|
|
uint16_t offset = 0;
|
|
for (size_t j = 0; j < indexes.size(); j++) {
|
|
if (uint64_t(indexes[j]) + uint64_t(offset) > std::numeric_limits<uint16_t>::max())
|
|
throw std::ios_base::failure("indexes overflowed 16 bits");
|
|
indexes[j] = indexes[j] + offset;
|
|
offset = indexes[j] + 1;
|
|
}
|
|
} else {
|
|
for (size_t i = 0; i < indexes.size(); i++) {
|
|
uint64_t index = indexes[i] - (i == 0 ? 0 : (indexes[i - 1] + 1));
|
|
READWRITE(COMPACTSIZE(index));
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
class BlockTransactions {
|
|
public:
|
|
// A BlockTransactions message
|
|
uint256 blockhash;
|
|
std::vector<CTransactionRef> txn;
|
|
|
|
BlockTransactions() {}
|
|
BlockTransactions(const BlockTransactionsRequest& req) :
|
|
blockhash(req.blockhash), txn(req.indexes.size()) {}
|
|
|
|
ADD_SERIALIZE_METHODS;
|
|
|
|
template <typename Stream, typename Operation>
|
|
inline void SerializationOp(Stream& s, Operation ser_action) {
|
|
READWRITE(blockhash);
|
|
uint64_t txn_size = (uint64_t)txn.size();
|
|
READWRITE(COMPACTSIZE(txn_size));
|
|
if (ser_action.ForRead()) {
|
|
size_t i = 0;
|
|
while (txn.size() < txn_size) {
|
|
txn.resize(std::min((uint64_t)(1000 + txn.size()), txn_size));
|
|
for (; i < txn.size(); i++)
|
|
READWRITE(REF(TransactionCompressor(txn[i])));
|
|
}
|
|
} else {
|
|
for (size_t i = 0; i < txn.size(); i++)
|
|
READWRITE(REF(TransactionCompressor(txn[i])));
|
|
}
|
|
}
|
|
};
|
|
|
|
// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownloadedBlock
|
|
struct PrefilledTransaction {
|
|
// Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
|
|
// as a proper transaction-in-block-index in PartiallyDownloadedBlock
|
|
uint16_t index;
|
|
CTransactionRef tx;
|
|
|
|
ADD_SERIALIZE_METHODS;
|
|
|
|
template <typename Stream, typename Operation>
|
|
inline void SerializationOp(Stream& s, Operation ser_action) {
|
|
uint64_t idx = index;
|
|
READWRITE(COMPACTSIZE(idx));
|
|
if (idx > std::numeric_limits<uint16_t>::max())
|
|
throw std::ios_base::failure("index overflowed 16-bits");
|
|
index = idx;
|
|
READWRITE(REF(TransactionCompressor(tx)));
|
|
}
|
|
};
|
|
|
|
typedef enum ReadStatus_t
|
|
{
|
|
READ_STATUS_OK,
|
|
READ_STATUS_INVALID, // Invalid object, peer is sending bogus crap
|
|
READ_STATUS_FAILED, // Failed to process object
|
|
READ_STATUS_CHECKBLOCK_FAILED, // Used only by FillBlock to indicate a
|
|
// failure in CheckBlock.
|
|
} ReadStatus;
|
|
|
|
class CBlockHeaderAndShortTxIDs {
|
|
private:
|
|
mutable uint64_t shorttxidk0, shorttxidk1;
|
|
uint64_t nonce;
|
|
|
|
void FillShortTxIDSelector() const;
|
|
|
|
friend class PartiallyDownloadedBlock;
|
|
|
|
static const int SHORTTXIDS_LENGTH = 6;
|
|
protected:
|
|
std::vector<uint64_t> shorttxids;
|
|
std::vector<PrefilledTransaction> prefilledtxn;
|
|
|
|
public:
|
|
CBlockHeader header;
|
|
|
|
// Dummy for deserialization
|
|
CBlockHeaderAndShortTxIDs() {}
|
|
|
|
CBlockHeaderAndShortTxIDs(const CBlock& block);
|
|
|
|
uint64_t GetShortID(const uint256& txhash) const;
|
|
|
|
size_t BlockTxCount() const { return shorttxids.size() + prefilledtxn.size(); }
|
|
|
|
ADD_SERIALIZE_METHODS;
|
|
|
|
template <typename Stream, typename Operation>
|
|
inline void SerializationOp(Stream& s, Operation ser_action) {
|
|
READWRITE(header);
|
|
READWRITE(nonce);
|
|
|
|
uint64_t shorttxids_size = (uint64_t)shorttxids.size();
|
|
READWRITE(COMPACTSIZE(shorttxids_size));
|
|
if (ser_action.ForRead()) {
|
|
size_t i = 0;
|
|
while (shorttxids.size() < shorttxids_size) {
|
|
shorttxids.resize(std::min((uint64_t)(1000 + shorttxids.size()), shorttxids_size));
|
|
for (; i < shorttxids.size(); i++) {
|
|
uint32_t lsb = 0; uint16_t msb = 0;
|
|
READWRITE(lsb);
|
|
READWRITE(msb);
|
|
shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
|
|
static_assert(SHORTTXIDS_LENGTH == 6, "shorttxids serialization assumes 6-byte shorttxids");
|
|
}
|
|
}
|
|
} else {
|
|
for (size_t i = 0; i < shorttxids.size(); i++) {
|
|
uint32_t lsb = shorttxids[i] & 0xffffffff;
|
|
uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
|
|
READWRITE(lsb);
|
|
READWRITE(msb);
|
|
}
|
|
}
|
|
|
|
READWRITE(prefilledtxn);
|
|
|
|
if (ser_action.ForRead())
|
|
FillShortTxIDSelector();
|
|
}
|
|
};
|
|
|
|
class PartiallyDownloadedBlock {
|
|
protected:
|
|
std::vector<CTransactionRef> txn_available;
|
|
size_t prefilled_count = 0, mempool_count = 0, extra_count = 0;
|
|
CTxMemPool* pool;
|
|
public:
|
|
CBlockHeader header;
|
|
PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
|
|
|
|
// extra_txn is a list of extra transactions to look at, in <hash, reference> form
|
|
ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
|
|
bool IsTxAvailable(size_t index) const;
|
|
ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
|
|
};
|
|
|
|
#endif
|