2016-05-06 11:23:48 +02:00
|
|
|
#!/usr/bin/env python3
|
|
|
|
# Copyright (c) 2010 ArtForz -- public domain half-a-node
|
|
|
|
# Copyright (c) 2012 Jeff Garzik
|
|
|
|
# Copyright (c) 2010-2016 The Bitcoin Core developers
|
|
|
|
# Distributed under the MIT software license, see the accompanying
|
2015-04-28 18:36:15 +02:00
|
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
2016-05-06 11:23:48 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# mininode.py - Dash P2P network half-a-node
|
2015-04-28 18:36:15 +02:00
|
|
|
#
|
|
|
|
# This python code was modified from ArtForz' public domain half-a-node, as
|
|
|
|
# found in the mini-node branch of http://github.com/jgarzik/pynode.
|
|
|
|
#
|
2016-03-06 16:14:39 +01:00
|
|
|
# NodeConn: an object which manages p2p connectivity to a dash node
|
2015-04-28 18:36:15 +02:00
|
|
|
# NodeConnCB: a base class that describes the interface for receiving
|
|
|
|
# callbacks with network messages from a NodeConn
|
|
|
|
# CBlock, CTransaction, CBlockHeader, CTxIn, CTxOut, etc....:
|
|
|
|
# data structures that should map to corresponding structures in
|
2016-03-06 16:14:39 +01:00
|
|
|
# dash/primitives
|
2015-04-28 18:36:15 +02:00
|
|
|
# msg_block, msg_tx, msg_headers, etc.:
|
|
|
|
# data structures that represent network messages
|
|
|
|
# ser_*, deser_*: functions that handle serialization/deserialization
|
|
|
|
|
|
|
|
|
|
|
|
import struct
|
|
|
|
import socket
|
|
|
|
import asyncore
|
|
|
|
import time
|
|
|
|
import sys
|
|
|
|
import random
|
2017-12-29 14:23:27 +01:00
|
|
|
from .util import hex_str_to_bytes, bytes_to_hex_str
|
2016-03-19 21:36:32 +01:00
|
|
|
from io import BytesIO
|
|
|
|
from codecs import encode
|
2015-04-28 18:36:15 +02:00
|
|
|
import hashlib
|
2015-05-01 20:47:21 +02:00
|
|
|
from threading import RLock
|
2015-04-28 18:36:15 +02:00
|
|
|
from threading import Thread
|
|
|
|
import logging
|
|
|
|
import copy
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
from test_framework.siphash import siphash256
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-03-06 16:14:39 +01:00
|
|
|
import dash_hash
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
BIP0031_VERSION = 60000
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
MY_VERSION = 70209 # SHORT_IDS_BLOCKS_VERSION to support cmpct blocks
|
2016-05-06 11:23:48 +02:00
|
|
|
MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
|
2016-11-09 22:06:37 +01:00
|
|
|
MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
MAX_INV_SZ = 50000
|
2015-12-15 21:53:10 +01:00
|
|
|
MAX_BLOCK_SIZE = 1000000
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-05-06 11:23:48 +02:00
|
|
|
COIN = 100000000 # 1 btc in satoshis
|
2016-01-19 17:47:55 +01:00
|
|
|
|
2017-12-29 14:23:27 +01:00
|
|
|
NODE_NETWORK = (1 << 0)
|
|
|
|
NODE_GETUTXO = (1 << 1)
|
|
|
|
NODE_BLOOM = (1 << 2)
|
|
|
|
|
2015-04-30 22:40:22 +02:00
|
|
|
# Keep our own socket map for asyncore, so that we can track disconnects
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
# ourselves (to workaround an issue with closing an asyncore socket when
|
2015-04-30 22:40:22 +02:00
|
|
|
# using select)
|
|
|
|
mininode_socket_map = dict()
|
|
|
|
|
2015-05-01 20:47:21 +02:00
|
|
|
# One lock for synchronizing all data access between the networking thread (see
|
|
|
|
# NetworkThread below) and the thread running the test logic. For simplicity,
|
|
|
|
# NodeConn acquires this lock whenever delivering a message to to a NodeConnCB,
|
|
|
|
# and whenever adding anything to the send buffer (in send_message()). This
|
|
|
|
# lock should be acquired in the thread running the test logic to synchronize
|
|
|
|
# access to any data shared with the NodeConnCB or NodeConn.
|
|
|
|
mininode_lock = RLock()
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
# Serialization/deserialization tools
|
|
|
|
def sha256(s):
|
|
|
|
return hashlib.new('sha256', s).digest()
|
|
|
|
|
|
|
|
|
|
|
|
def hash256(s):
|
|
|
|
return sha256(sha256(s))
|
|
|
|
|
2016-03-06 16:14:39 +01:00
|
|
|
def dashhash(s):
|
|
|
|
return dash_hash.getPoWHash(s)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-06-18 03:17:25 +02:00
|
|
|
def ser_compact_size(l):
|
|
|
|
r = b""
|
|
|
|
if l < 253:
|
|
|
|
r = struct.pack("B", l)
|
|
|
|
elif l < 0x10000:
|
|
|
|
r = struct.pack("<BH", 253, l)
|
|
|
|
elif l < 0x100000000:
|
|
|
|
r = struct.pack("<BI", 254, l)
|
|
|
|
else:
|
|
|
|
r = struct.pack("<BQ", 255, l)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def deser_compact_size(f):
|
2015-04-28 18:36:15 +02:00
|
|
|
nit = struct.unpack("<B", f.read(1))[0]
|
|
|
|
if nit == 253:
|
|
|
|
nit = struct.unpack("<H", f.read(2))[0]
|
|
|
|
elif nit == 254:
|
|
|
|
nit = struct.unpack("<I", f.read(4))[0]
|
|
|
|
elif nit == 255:
|
|
|
|
nit = struct.unpack("<Q", f.read(8))[0]
|
2016-06-18 03:17:25 +02:00
|
|
|
return nit
|
|
|
|
|
|
|
|
def deser_string(f):
|
|
|
|
nit = deser_compact_size(f)
|
2015-04-28 18:36:15 +02:00
|
|
|
return f.read(nit)
|
|
|
|
|
|
|
|
def ser_string(s):
|
2016-06-18 03:17:25 +02:00
|
|
|
return ser_compact_size(len(s)) + s
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deser_uint256(f):
|
2016-05-06 11:23:48 +02:00
|
|
|
r = 0
|
|
|
|
for i in range(8):
|
2015-04-28 18:36:15 +02:00
|
|
|
t = struct.unpack("<I", f.read(4))[0]
|
|
|
|
r += t << (i * 32)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def ser_uint256(u):
|
2016-04-23 14:35:52 +02:00
|
|
|
rs = b""
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(8):
|
|
|
|
rs += struct.pack("<I", u & 0xFFFFFFFF)
|
2015-04-28 18:36:15 +02:00
|
|
|
u >>= 32
|
|
|
|
return rs
|
|
|
|
|
|
|
|
|
|
|
|
def uint256_from_str(s):
|
2016-05-06 11:23:48 +02:00
|
|
|
r = 0
|
2015-04-28 18:36:15 +02:00
|
|
|
t = struct.unpack("<IIIIIIII", s[:32])
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(8):
|
2015-04-28 18:36:15 +02:00
|
|
|
r += t[i] << (i * 32)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def uint256_from_compact(c):
|
|
|
|
nbytes = (c >> 24) & 0xFF
|
2016-05-06 11:23:48 +02:00
|
|
|
v = (c & 0xFFFFFF) << (8 * (nbytes - 3))
|
2015-04-28 18:36:15 +02:00
|
|
|
return v
|
|
|
|
|
|
|
|
|
|
|
|
def deser_vector(f, c):
|
2016-06-18 03:17:25 +02:00
|
|
|
nit = deser_compact_size(f)
|
2015-04-28 18:36:15 +02:00
|
|
|
r = []
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(nit):
|
2015-04-28 18:36:15 +02:00
|
|
|
t = c()
|
|
|
|
t.deserialize(f)
|
|
|
|
r.append(t)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def ser_vector(l):
|
2016-06-18 03:17:25 +02:00
|
|
|
r = ser_compact_size(len(l))
|
2015-04-28 18:36:15 +02:00
|
|
|
for i in l:
|
|
|
|
r += i.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def deser_uint256_vector(f):
|
2016-06-18 03:17:25 +02:00
|
|
|
nit = deser_compact_size(f)
|
2015-04-28 18:36:15 +02:00
|
|
|
r = []
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(nit):
|
2015-04-28 18:36:15 +02:00
|
|
|
t = deser_uint256(f)
|
|
|
|
r.append(t)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def ser_uint256_vector(l):
|
2016-06-18 03:17:25 +02:00
|
|
|
r = ser_compact_size(len(l))
|
2015-04-28 18:36:15 +02:00
|
|
|
for i in l:
|
|
|
|
r += ser_uint256(i)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def deser_string_vector(f):
|
2016-06-18 03:17:25 +02:00
|
|
|
nit = deser_compact_size(f)
|
2015-04-28 18:36:15 +02:00
|
|
|
r = []
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(nit):
|
2015-04-28 18:36:15 +02:00
|
|
|
t = deser_string(f)
|
|
|
|
r.append(t)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def ser_string_vector(l):
|
2016-06-18 03:17:25 +02:00
|
|
|
r = ser_compact_size(len(l))
|
2015-04-28 18:36:15 +02:00
|
|
|
for sv in l:
|
|
|
|
r += ser_string(sv)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def deser_int_vector(f):
|
2016-06-18 03:17:25 +02:00
|
|
|
nit = deser_compact_size(f)
|
2015-04-28 18:36:15 +02:00
|
|
|
r = []
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(nit):
|
2015-04-28 18:36:15 +02:00
|
|
|
t = struct.unpack("<i", f.read(4))[0]
|
|
|
|
r.append(t)
|
|
|
|
return r
|
|
|
|
|
|
|
|
|
|
|
|
def ser_int_vector(l):
|
2016-06-18 03:17:25 +02:00
|
|
|
r = ser_compact_size(len(l))
|
2015-04-28 18:36:15 +02:00
|
|
|
for i in l:
|
|
|
|
r += struct.pack("<i", i)
|
|
|
|
return r
|
|
|
|
|
2015-12-08 23:25:28 +01:00
|
|
|
# Deserialize from a hex string representation (eg from RPC)
|
|
|
|
def FromHex(obj, hex_string):
|
2017-12-29 14:23:27 +01:00
|
|
|
obj.deserialize(BytesIO(hex_str_to_bytes(hex_string)))
|
2015-12-08 23:25:28 +01:00
|
|
|
return obj
|
|
|
|
|
|
|
|
# Convert a binary-serializable object to hex (eg for submission via RPC)
|
|
|
|
def ToHex(obj):
|
2017-12-29 14:23:27 +01:00
|
|
|
return bytes_to_hex_str(obj.serialize())
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-03-06 16:14:39 +01:00
|
|
|
# Objects that map to dashd objects, which can be serialized/deserialized
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
class CAddress(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.nServices = 1
|
2016-04-10 16:54:28 +02:00
|
|
|
self.pchReserved = b"\x00" * 10 + b"\xff" * 2
|
2015-04-28 18:36:15 +02:00
|
|
|
self.ip = "0.0.0.0"
|
|
|
|
self.port = 0
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nServices = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
self.pchReserved = f.read(12)
|
|
|
|
self.ip = socket.inet_ntoa(f.read(4))
|
|
|
|
self.port = struct.unpack(">H", f.read(2))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<Q", self.nServices)
|
|
|
|
r += self.pchReserved
|
|
|
|
r += socket.inet_aton(self.ip)
|
|
|
|
r += struct.pack(">H", self.port)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CAddress(nServices=%i ip=%s port=%i)" % (self.nServices,
|
|
|
|
self.ip, self.port)
|
|
|
|
|
|
|
|
|
|
|
|
class CInv(object):
|
|
|
|
typemap = {
|
|
|
|
0: "Error",
|
|
|
|
1: "TX",
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
2: "Block",
|
|
|
|
20: "CompactBlock"
|
|
|
|
}
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-05-06 11:23:48 +02:00
|
|
|
def __init__(self, t=0, h=0):
|
2015-04-28 18:36:15 +02:00
|
|
|
self.type = t
|
|
|
|
self.hash = h
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.type = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.hash = deser_uint256(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.type)
|
|
|
|
r += ser_uint256(self.hash)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CInv(type=%s hash=%064x)" \
|
|
|
|
% (self.typemap[self.type], self.hash)
|
|
|
|
|
|
|
|
|
|
|
|
class CBlockLocator(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.nVersion = MY_VERSION
|
|
|
|
self.vHave = []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nVersion = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.vHave = deser_uint256_vector(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += ser_uint256_vector(self.vHave)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CBlockLocator(nVersion=%i vHave=%s)" \
|
|
|
|
% (self.nVersion, repr(self.vHave))
|
|
|
|
|
|
|
|
|
|
|
|
class COutPoint(object):
|
|
|
|
def __init__(self, hash=0, n=0):
|
|
|
|
self.hash = hash
|
|
|
|
self.n = n
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.hash = deser_uint256(f)
|
|
|
|
self.n = struct.unpack("<I", f.read(4))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += ser_uint256(self.hash)
|
|
|
|
r += struct.pack("<I", self.n)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "COutPoint(hash=%064x n=%i)" % (self.hash, self.n)
|
|
|
|
|
|
|
|
|
|
|
|
class CTxIn(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
def __init__(self, outpoint=None, scriptSig=b"", nSequence=0):
|
2015-04-28 18:36:15 +02:00
|
|
|
if outpoint is None:
|
|
|
|
self.prevout = COutPoint()
|
|
|
|
else:
|
|
|
|
self.prevout = outpoint
|
|
|
|
self.scriptSig = scriptSig
|
|
|
|
self.nSequence = nSequence
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.prevout = COutPoint()
|
|
|
|
self.prevout.deserialize(f)
|
|
|
|
self.scriptSig = deser_string(f)
|
|
|
|
self.nSequence = struct.unpack("<I", f.read(4))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += self.prevout.serialize()
|
|
|
|
r += ser_string(self.scriptSig)
|
|
|
|
r += struct.pack("<I", self.nSequence)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CTxIn(prevout=%s scriptSig=%s nSequence=%i)" \
|
2017-12-29 14:23:27 +01:00
|
|
|
% (repr(self.prevout), bytes_to_hex_str(self.scriptSig),
|
2015-04-28 18:36:15 +02:00
|
|
|
self.nSequence)
|
|
|
|
|
|
|
|
|
|
|
|
class CTxOut(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
def __init__(self, nValue=0, scriptPubKey=b""):
|
2015-04-28 18:36:15 +02:00
|
|
|
self.nValue = nValue
|
|
|
|
self.scriptPubKey = scriptPubKey
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nValue = struct.unpack("<q", f.read(8))[0]
|
|
|
|
self.scriptPubKey = deser_string(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<q", self.nValue)
|
|
|
|
r += ser_string(self.scriptPubKey)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CTxOut(nValue=%i.%08i scriptPubKey=%s)" \
|
2016-01-19 17:47:55 +01:00
|
|
|
% (self.nValue // COIN, self.nValue % COIN,
|
2017-12-29 14:23:27 +01:00
|
|
|
bytes_to_hex_str(self.scriptPubKey))
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
class CTransaction(object):
|
|
|
|
def __init__(self, tx=None):
|
|
|
|
if tx is None:
|
|
|
|
self.nVersion = 1
|
|
|
|
self.vin = []
|
|
|
|
self.vout = []
|
|
|
|
self.nLockTime = 0
|
|
|
|
self.sha256 = None
|
|
|
|
self.hash = None
|
|
|
|
else:
|
|
|
|
self.nVersion = tx.nVersion
|
|
|
|
self.vin = copy.deepcopy(tx.vin)
|
|
|
|
self.vout = copy.deepcopy(tx.vout)
|
|
|
|
self.nLockTime = tx.nLockTime
|
2017-12-29 14:23:27 +01:00
|
|
|
self.sha256 = tx.sha256
|
|
|
|
self.hash = tx.hash
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nVersion = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.vin = deser_vector(f, CTxIn)
|
|
|
|
self.vout = deser_vector(f, CTxOut)
|
|
|
|
self.nLockTime = struct.unpack("<I", f.read(4))[0]
|
|
|
|
self.sha256 = None
|
|
|
|
self.hash = None
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += ser_vector(self.vin)
|
|
|
|
r += ser_vector(self.vout)
|
|
|
|
r += struct.pack("<I", self.nLockTime)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def rehash(self):
|
|
|
|
self.sha256 = None
|
|
|
|
self.calc_sha256()
|
|
|
|
|
|
|
|
def calc_sha256(self):
|
|
|
|
if self.sha256 is None:
|
|
|
|
self.sha256 = uint256_from_str(hash256(self.serialize()))
|
2016-04-10 16:54:28 +02:00
|
|
|
self.hash = encode(hash256(self.serialize())[::-1], 'hex_codec').decode('ascii')
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def is_valid(self):
|
|
|
|
self.calc_sha256()
|
|
|
|
for tout in self.vout:
|
2016-01-19 17:47:55 +01:00
|
|
|
if tout.nValue < 0 or tout.nValue > 21000000 * COIN:
|
2015-04-28 18:36:15 +02:00
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CTransaction(nVersion=%i vin=%s vout=%s nLockTime=%i)" \
|
|
|
|
% (self.nVersion, repr(self.vin), repr(self.vout), self.nLockTime)
|
|
|
|
|
|
|
|
|
|
|
|
class CBlockHeader(object):
|
|
|
|
def __init__(self, header=None):
|
|
|
|
if header is None:
|
|
|
|
self.set_null()
|
|
|
|
else:
|
|
|
|
self.nVersion = header.nVersion
|
|
|
|
self.hashPrevBlock = header.hashPrevBlock
|
|
|
|
self.hashMerkleRoot = header.hashMerkleRoot
|
|
|
|
self.nTime = header.nTime
|
|
|
|
self.nBits = header.nBits
|
|
|
|
self.nNonce = header.nNonce
|
|
|
|
self.sha256 = header.sha256
|
|
|
|
self.hash = header.hash
|
|
|
|
self.calc_sha256()
|
|
|
|
|
|
|
|
def set_null(self):
|
|
|
|
self.nVersion = 1
|
|
|
|
self.hashPrevBlock = 0
|
|
|
|
self.hashMerkleRoot = 0
|
|
|
|
self.nTime = 0
|
|
|
|
self.nBits = 0
|
|
|
|
self.nNonce = 0
|
|
|
|
self.sha256 = None
|
|
|
|
self.hash = None
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nVersion = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.hashPrevBlock = deser_uint256(f)
|
|
|
|
self.hashMerkleRoot = deser_uint256(f)
|
|
|
|
self.nTime = struct.unpack("<I", f.read(4))[0]
|
|
|
|
self.nBits = struct.unpack("<I", f.read(4))[0]
|
|
|
|
self.nNonce = struct.unpack("<I", f.read(4))[0]
|
|
|
|
self.sha256 = None
|
|
|
|
self.hash = None
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += ser_uint256(self.hashPrevBlock)
|
|
|
|
r += ser_uint256(self.hashMerkleRoot)
|
|
|
|
r += struct.pack("<I", self.nTime)
|
|
|
|
r += struct.pack("<I", self.nBits)
|
|
|
|
r += struct.pack("<I", self.nNonce)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def calc_sha256(self):
|
|
|
|
if self.sha256 is None:
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += ser_uint256(self.hashPrevBlock)
|
|
|
|
r += ser_uint256(self.hashMerkleRoot)
|
|
|
|
r += struct.pack("<I", self.nTime)
|
|
|
|
r += struct.pack("<I", self.nBits)
|
|
|
|
r += struct.pack("<I", self.nNonce)
|
2016-03-06 16:14:39 +01:00
|
|
|
self.sha256 = uint256_from_str(dashhash(r))
|
2016-08-26 03:00:27 +02:00
|
|
|
self.hash = encode(dashhash(r)[::-1], 'hex_codec').decode('ascii')
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def rehash(self):
|
|
|
|
self.sha256 = None
|
|
|
|
self.calc_sha256()
|
|
|
|
return self.sha256
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CBlockHeader(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x)" \
|
|
|
|
% (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
|
|
|
|
time.ctime(self.nTime), self.nBits, self.nNonce)
|
|
|
|
|
|
|
|
|
|
|
|
class CBlock(CBlockHeader):
|
|
|
|
def __init__(self, header=None):
|
|
|
|
super(CBlock, self).__init__(header)
|
|
|
|
self.vtx = []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
super(CBlock, self).deserialize(f)
|
|
|
|
self.vtx = deser_vector(f, CTransaction)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += super(CBlock, self).serialize()
|
|
|
|
r += ser_vector(self.vtx)
|
|
|
|
return r
|
|
|
|
|
2017-12-29 14:23:27 +01:00
|
|
|
# Calculate the merkle root given a vector of transaction hashes
|
|
|
|
def get_merkle_root(self, hashes):
|
2015-04-28 18:36:15 +02:00
|
|
|
while len(hashes) > 1:
|
|
|
|
newhashes = []
|
2016-05-06 11:23:48 +02:00
|
|
|
for i in range(0, len(hashes), 2):
|
2015-04-28 18:36:15 +02:00
|
|
|
i2 = min(i+1, len(hashes)-1)
|
|
|
|
newhashes.append(hash256(hashes[i] + hashes[i2]))
|
|
|
|
hashes = newhashes
|
|
|
|
return uint256_from_str(hashes[0])
|
|
|
|
|
2017-12-29 14:23:27 +01:00
|
|
|
def calc_merkle_root(self):
|
|
|
|
hashes = []
|
|
|
|
for tx in self.vtx:
|
|
|
|
tx.calc_sha256()
|
|
|
|
hashes.append(ser_uint256(tx.sha256))
|
|
|
|
return self.get_merkle_root(hashes)
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
def is_valid(self):
|
|
|
|
self.calc_sha256()
|
|
|
|
target = uint256_from_compact(self.nBits)
|
|
|
|
if self.sha256 > target:
|
|
|
|
return False
|
|
|
|
for tx in self.vtx:
|
|
|
|
if not tx.is_valid():
|
|
|
|
return False
|
|
|
|
if self.calc_merkle_root() != self.hashMerkleRoot:
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
def solve(self):
|
2016-02-04 20:36:11 +01:00
|
|
|
self.rehash()
|
2015-04-28 18:36:15 +02:00
|
|
|
target = uint256_from_compact(self.nBits)
|
|
|
|
while self.sha256 > target:
|
|
|
|
self.nNonce += 1
|
|
|
|
self.rehash()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x vtx=%s)" \
|
|
|
|
% (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
|
|
|
|
time.ctime(self.nTime), self.nBits, self.nNonce, repr(self.vtx))
|
|
|
|
|
|
|
|
|
|
|
|
class CUnsignedAlert(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.nVersion = 1
|
|
|
|
self.nRelayUntil = 0
|
|
|
|
self.nExpiration = 0
|
|
|
|
self.nID = 0
|
|
|
|
self.nCancel = 0
|
|
|
|
self.setCancel = []
|
|
|
|
self.nMinVer = 0
|
|
|
|
self.nMaxVer = 0
|
|
|
|
self.setSubVer = []
|
|
|
|
self.nPriority = 0
|
2016-04-10 16:54:28 +02:00
|
|
|
self.strComment = b""
|
|
|
|
self.strStatusBar = b""
|
|
|
|
self.strReserved = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nVersion = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.nRelayUntil = struct.unpack("<q", f.read(8))[0]
|
|
|
|
self.nExpiration = struct.unpack("<q", f.read(8))[0]
|
|
|
|
self.nID = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.nCancel = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.setCancel = deser_int_vector(f)
|
|
|
|
self.nMinVer = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.nMaxVer = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.setSubVer = deser_string_vector(f)
|
|
|
|
self.nPriority = struct.unpack("<i", f.read(4))[0]
|
|
|
|
self.strComment = deser_string(f)
|
|
|
|
self.strStatusBar = deser_string(f)
|
|
|
|
self.strReserved = deser_string(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += struct.pack("<q", self.nRelayUntil)
|
|
|
|
r += struct.pack("<q", self.nExpiration)
|
|
|
|
r += struct.pack("<i", self.nID)
|
|
|
|
r += struct.pack("<i", self.nCancel)
|
|
|
|
r += ser_int_vector(self.setCancel)
|
|
|
|
r += struct.pack("<i", self.nMinVer)
|
|
|
|
r += struct.pack("<i", self.nMaxVer)
|
|
|
|
r += ser_string_vector(self.setSubVer)
|
|
|
|
r += struct.pack("<i", self.nPriority)
|
|
|
|
r += ser_string(self.strComment)
|
|
|
|
r += ser_string(self.strStatusBar)
|
|
|
|
r += ser_string(self.strReserved)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CUnsignedAlert(nVersion %d, nRelayUntil %d, nExpiration %d, nID %d, nCancel %d, nMinVer %d, nMaxVer %d, nPriority %d, strComment %s, strStatusBar %s, strReserved %s)" \
|
|
|
|
% (self.nVersion, self.nRelayUntil, self.nExpiration, self.nID,
|
|
|
|
self.nCancel, self.nMinVer, self.nMaxVer, self.nPriority,
|
|
|
|
self.strComment, self.strStatusBar, self.strReserved)
|
|
|
|
|
|
|
|
|
|
|
|
class CAlert(object):
|
|
|
|
def __init__(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
self.vchMsg = b""
|
|
|
|
self.vchSig = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.vchMsg = deser_string(f)
|
|
|
|
self.vchSig = deser_string(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-23 14:35:52 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += ser_string(self.vchMsg)
|
|
|
|
r += ser_string(self.vchSig)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "CAlert(vchMsg.sz %d, vchSig.sz %d)" \
|
|
|
|
% (len(self.vchMsg), len(self.vchSig))
|
|
|
|
|
|
|
|
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
class PrefilledTransaction(object):
|
|
|
|
def __init__(self, index=0, tx = None):
|
|
|
|
self.index = index
|
|
|
|
self.tx = tx
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.index = deser_compact_size(f)
|
|
|
|
self.tx = CTransaction()
|
|
|
|
self.tx.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += ser_compact_size(self.index)
|
|
|
|
r += self.tx.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "PrefilledTransaction(index=%d, tx=%s)" % (self.index, repr(self.tx))
|
|
|
|
|
|
|
|
# This is what we send on the wire, in a cmpctblock message.
|
|
|
|
class P2PHeaderAndShortIDs(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.header = CBlockHeader()
|
|
|
|
self.nonce = 0
|
|
|
|
self.shortids_length = 0
|
|
|
|
self.shortids = []
|
|
|
|
self.prefilled_txn_length = 0
|
|
|
|
self.prefilled_txn = []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.header.deserialize(f)
|
|
|
|
self.nonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
self.shortids_length = deser_compact_size(f)
|
|
|
|
for i in range(self.shortids_length):
|
|
|
|
# shortids are defined to be 6 bytes in the spec, so append
|
|
|
|
# two zero bytes and read it in as an 8-byte number
|
|
|
|
self.shortids.append(struct.unpack("<Q", f.read(6) + b'\x00\x00')[0])
|
|
|
|
self.prefilled_txn = deser_vector(f, PrefilledTransaction)
|
|
|
|
self.prefilled_txn_length = len(self.prefilled_txn)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += self.header.serialize()
|
|
|
|
r += struct.pack("<Q", self.nonce)
|
|
|
|
r += ser_compact_size(self.shortids_length)
|
|
|
|
for x in self.shortids:
|
|
|
|
# We only want the first 6 bytes
|
|
|
|
r += struct.pack("<Q", x)[0:6]
|
|
|
|
r += ser_vector(self.prefilled_txn)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "P2PHeaderAndShortIDs(header=%s, nonce=%d, shortids_length=%d, shortids=%s, prefilled_txn_length=%d, prefilledtxn=%s" % (repr(self.header), self.nonce, self.shortids_length, repr(self.shortids), self.prefilled_txn_length, repr(self.prefilled_txn))
|
|
|
|
|
|
|
|
|
|
|
|
# Calculate the BIP 152-compact blocks shortid for a given transaction hash
|
|
|
|
def calculate_shortid(k0, k1, tx_hash):
|
|
|
|
expected_shortid = siphash256(k0, k1, tx_hash)
|
|
|
|
expected_shortid &= 0x0000ffffffffffff
|
|
|
|
return expected_shortid
|
|
|
|
|
|
|
|
# This version gets rid of the array lengths, and reinterprets the differential
|
|
|
|
# encoding into indices that can be used for lookup.
|
|
|
|
class HeaderAndShortIDs(object):
|
|
|
|
def __init__(self, p2pheaders_and_shortids = None):
|
|
|
|
self.header = CBlockHeader()
|
|
|
|
self.nonce = 0
|
|
|
|
self.shortids = []
|
|
|
|
self.prefilled_txn = []
|
|
|
|
|
|
|
|
if p2pheaders_and_shortids != None:
|
|
|
|
self.header = p2pheaders_and_shortids.header
|
|
|
|
self.nonce = p2pheaders_and_shortids.nonce
|
|
|
|
self.shortids = p2pheaders_and_shortids.shortids
|
|
|
|
last_index = -1
|
|
|
|
for x in p2pheaders_and_shortids.prefilled_txn:
|
|
|
|
self.prefilled_txn.append(PrefilledTransaction(x.index + last_index + 1, x.tx))
|
|
|
|
last_index = self.prefilled_txn[-1].index
|
|
|
|
|
|
|
|
def to_p2p(self):
|
|
|
|
ret = P2PHeaderAndShortIDs()
|
|
|
|
ret.header = self.header
|
|
|
|
ret.nonce = self.nonce
|
|
|
|
ret.shortids_length = len(self.shortids)
|
|
|
|
ret.shortids = self.shortids
|
|
|
|
ret.prefilled_txn_length = len(self.prefilled_txn)
|
|
|
|
ret.prefilled_txn = []
|
|
|
|
last_index = -1
|
|
|
|
for x in self.prefilled_txn:
|
|
|
|
ret.prefilled_txn.append(PrefilledTransaction(x.index - last_index - 1, x.tx))
|
|
|
|
last_index = x.index
|
|
|
|
return ret
|
|
|
|
|
|
|
|
def get_siphash_keys(self):
|
|
|
|
header_nonce = self.header.serialize()
|
|
|
|
header_nonce += struct.pack("<Q", self.nonce)
|
|
|
|
hash_header_nonce_as_str = sha256(header_nonce)
|
|
|
|
key0 = struct.unpack("<Q", hash_header_nonce_as_str[0:8])[0]
|
|
|
|
key1 = struct.unpack("<Q", hash_header_nonce_as_str[8:16])[0]
|
|
|
|
return [ key0, key1 ]
|
|
|
|
|
|
|
|
def initialize_from_block(self, block, nonce=0, prefill_list = [0]):
|
|
|
|
self.header = CBlockHeader(block)
|
|
|
|
self.nonce = nonce
|
|
|
|
self.prefilled_txn = [ PrefilledTransaction(i, block.vtx[i]) for i in prefill_list ]
|
|
|
|
self.shortids = []
|
|
|
|
[k0, k1] = self.get_siphash_keys()
|
|
|
|
for i in range(len(block.vtx)):
|
|
|
|
if i not in prefill_list:
|
|
|
|
self.shortids.append(calculate_shortid(k0, k1, block.vtx[i].sha256))
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "HeaderAndShortIDs(header=%s, nonce=%d, shortids=%s, prefilledtxn=%s" % (repr(self.header), self.nonce, repr(self.shortids), repr(self.prefilled_txn))
|
|
|
|
|
|
|
|
|
|
|
|
class BlockTransactionsRequest(object):
|
|
|
|
|
|
|
|
def __init__(self, blockhash=0, indexes = None):
|
|
|
|
self.blockhash = blockhash
|
|
|
|
self.indexes = indexes if indexes != None else []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.blockhash = deser_uint256(f)
|
|
|
|
indexes_length = deser_compact_size(f)
|
|
|
|
for i in range(indexes_length):
|
|
|
|
self.indexes.append(deser_compact_size(f))
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += ser_uint256(self.blockhash)
|
|
|
|
r += ser_compact_size(len(self.indexes))
|
|
|
|
for x in self.indexes:
|
|
|
|
r += ser_compact_size(x)
|
|
|
|
return r
|
|
|
|
|
|
|
|
# helper to set the differentially encoded indexes from absolute ones
|
|
|
|
def from_absolute(self, absolute_indexes):
|
|
|
|
self.indexes = []
|
|
|
|
last_index = -1
|
|
|
|
for x in absolute_indexes:
|
|
|
|
self.indexes.append(x-last_index-1)
|
|
|
|
last_index = x
|
|
|
|
|
|
|
|
def to_absolute(self):
|
|
|
|
absolute_indexes = []
|
|
|
|
last_index = -1
|
|
|
|
for x in self.indexes:
|
|
|
|
absolute_indexes.append(x+last_index+1)
|
|
|
|
last_index = absolute_indexes[-1]
|
|
|
|
return absolute_indexes
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "BlockTransactionsRequest(hash=%064x indexes=%s)" % (self.blockhash, repr(self.indexes))
|
|
|
|
|
|
|
|
|
|
|
|
class BlockTransactions(object):
|
|
|
|
|
|
|
|
def __init__(self, blockhash=0, transactions = None):
|
|
|
|
self.blockhash = blockhash
|
|
|
|
self.transactions = transactions if transactions != None else []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.blockhash = deser_uint256(f)
|
|
|
|
self.transactions = deser_vector(f, CTransaction)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += ser_uint256(self.blockhash)
|
|
|
|
r += ser_vector(self.transactions)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "BlockTransactions(hash=%064x transactions=%s)" % (self.blockhash, repr(self.transactions))
|
|
|
|
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
# Objects that correspond to messages on the wire
|
|
|
|
class msg_version(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"version"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.nVersion = MY_VERSION
|
|
|
|
self.nServices = 1
|
2016-03-19 21:36:32 +01:00
|
|
|
self.nTime = int(time.time())
|
2015-04-28 18:36:15 +02:00
|
|
|
self.addrTo = CAddress()
|
|
|
|
self.addrFrom = CAddress()
|
|
|
|
self.nNonce = random.getrandbits(64)
|
|
|
|
self.strSubVer = MY_SUBVERSION
|
|
|
|
self.nStartingHeight = -1
|
2016-11-09 22:06:37 +01:00
|
|
|
self.nRelay = MY_RELAY
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nVersion = struct.unpack("<i", f.read(4))[0]
|
|
|
|
if self.nVersion == 10300:
|
|
|
|
self.nVersion = 300
|
|
|
|
self.nServices = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
self.nTime = struct.unpack("<q", f.read(8))[0]
|
|
|
|
self.addrTo = CAddress()
|
|
|
|
self.addrTo.deserialize(f)
|
2016-11-09 22:06:37 +01:00
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
if self.nVersion >= 106:
|
|
|
|
self.addrFrom = CAddress()
|
|
|
|
self.addrFrom.deserialize(f)
|
|
|
|
self.nNonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
self.strSubVer = deser_string(f)
|
|
|
|
else:
|
|
|
|
self.addrFrom = None
|
|
|
|
self.nNonce = None
|
|
|
|
self.strSubVer = None
|
|
|
|
self.nStartingHeight = None
|
|
|
|
|
2016-11-09 22:06:37 +01:00
|
|
|
if self.nVersion >= 209:
|
|
|
|
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
|
|
|
|
else:
|
|
|
|
self.nStartingHeight = None
|
|
|
|
|
|
|
|
if self.nVersion >= 70001:
|
|
|
|
# Relay field is optional for version 70001 onwards
|
|
|
|
try:
|
|
|
|
self.nRelay = struct.unpack("<b", f.read(1))[0]
|
|
|
|
except:
|
|
|
|
self.nRelay = 0
|
|
|
|
else:
|
|
|
|
self.nRelay = 0
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<i", self.nVersion)
|
|
|
|
r += struct.pack("<Q", self.nServices)
|
|
|
|
r += struct.pack("<q", self.nTime)
|
|
|
|
r += self.addrTo.serialize()
|
|
|
|
r += self.addrFrom.serialize()
|
|
|
|
r += struct.pack("<Q", self.nNonce)
|
|
|
|
r += ser_string(self.strSubVer)
|
|
|
|
r += struct.pack("<i", self.nStartingHeight)
|
2016-11-09 22:06:37 +01:00
|
|
|
r += struct.pack("<b", self.nRelay)
|
2015-04-28 18:36:15 +02:00
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
2016-11-09 22:06:37 +01:00
|
|
|
return 'msg_version(nVersion=%i nServices=%i nTime=%s addrTo=%s addrFrom=%s nNonce=0x%016X strSubVer=%s nStartingHeight=%i nRelay=%i)' \
|
2015-04-28 18:36:15 +02:00
|
|
|
% (self.nVersion, self.nServices, time.ctime(self.nTime),
|
|
|
|
repr(self.addrTo), repr(self.addrFrom), self.nNonce,
|
2016-11-09 22:06:37 +01:00
|
|
|
self.strSubVer, self.nStartingHeight, self.nRelay)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
class msg_verack(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"verack"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
return b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_verack()"
|
|
|
|
|
|
|
|
|
|
|
|
class msg_addr(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"addr"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.addrs = []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.addrs = deser_vector(f, CAddress)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return ser_vector(self.addrs)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_addr(addrs=%s)" % (repr(self.addrs))
|
|
|
|
|
|
|
|
|
|
|
|
class msg_alert(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"alert"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.alert = CAlert()
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.alert = CAlert()
|
|
|
|
self.alert.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += self.alert.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_alert(alert=%s)" % (repr(self.alert), )
|
|
|
|
|
|
|
|
|
|
|
|
class msg_inv(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"inv"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self, inv=None):
|
|
|
|
if inv is None:
|
|
|
|
self.inv = []
|
|
|
|
else:
|
|
|
|
self.inv = inv
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.inv = deser_vector(f, CInv)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return ser_vector(self.inv)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_inv(inv=%s)" % (repr(self.inv))
|
|
|
|
|
|
|
|
|
|
|
|
class msg_getdata(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"getdata"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2014-11-18 22:16:32 +01:00
|
|
|
def __init__(self, inv=None):
|
|
|
|
self.inv = inv if inv != None else []
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.inv = deser_vector(f, CInv)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return ser_vector(self.inv)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_getdata(inv=%s)" % (repr(self.inv))
|
|
|
|
|
|
|
|
|
|
|
|
class msg_getblocks(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"getblocks"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.locator = CBlockLocator()
|
2016-05-06 11:23:48 +02:00
|
|
|
self.hashstop = 0
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.locator = CBlockLocator()
|
|
|
|
self.locator.deserialize(f)
|
|
|
|
self.hashstop = deser_uint256(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += self.locator.serialize()
|
|
|
|
r += ser_uint256(self.hashstop)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_getblocks(locator=%s hashstop=%064x)" \
|
|
|
|
% (repr(self.locator), self.hashstop)
|
|
|
|
|
|
|
|
|
|
|
|
class msg_tx(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"tx"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self, tx=CTransaction()):
|
|
|
|
self.tx = tx
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.tx.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return self.tx.serialize()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_tx(tx=%s)" % (repr(self.tx))
|
|
|
|
|
|
|
|
|
|
|
|
class msg_block(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"block"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self, block=None):
|
|
|
|
if block is None:
|
|
|
|
self.block = CBlock()
|
|
|
|
else:
|
|
|
|
self.block = block
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.block.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return self.block.serialize()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_block(block=%s)" % (repr(self.block))
|
|
|
|
|
2016-06-13 11:36:48 +02:00
|
|
|
# for cases where a user needs tighter control over what is sent over the wire
|
|
|
|
# note that the user must supply the name of the command, and the data
|
|
|
|
class msg_generic(object):
|
|
|
|
def __init__(self, command, data=None):
|
|
|
|
self.command = command
|
|
|
|
self.data = data
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
return self.data
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_generic()"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
class msg_getaddr(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"getaddr"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
return b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_getaddr()"
|
|
|
|
|
|
|
|
|
|
|
|
class msg_ping_prebip31(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"ping"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
return b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_ping() (pre-bip31)"
|
|
|
|
|
|
|
|
|
|
|
|
class msg_ping(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"ping"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-05-06 11:23:48 +02:00
|
|
|
def __init__(self, nonce=0):
|
2015-04-28 18:36:15 +02:00
|
|
|
self.nonce = nonce
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<Q", self.nonce)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_ping(nonce=%08x)" % self.nonce
|
|
|
|
|
|
|
|
|
|
|
|
class msg_pong(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"pong"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-04-10 16:54:28 +02:00
|
|
|
def __init__(self, nonce=0):
|
2015-04-28 18:36:15 +02:00
|
|
|
self.nonce = nonce
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.nonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += struct.pack("<Q", self.nonce)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_pong(nonce=%08x)" % self.nonce
|
|
|
|
|
|
|
|
|
|
|
|
class msg_mempool(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"mempool"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
return b""
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_mempool()"
|
|
|
|
|
2014-11-18 22:16:32 +01:00
|
|
|
class msg_sendheaders(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"sendheaders"
|
2014-11-18 22:16:32 +01:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
return b""
|
2014-11-18 22:16:32 +01:00
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_sendheaders()"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2017-12-29 14:23:27 +01:00
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
# getheaders message has
|
|
|
|
# number of entries
|
|
|
|
# vector of hashes
|
|
|
|
# hash_stop (hash of last desired block header, 0 to get as many as possible)
|
|
|
|
class msg_getheaders(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"getheaders"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.locator = CBlockLocator()
|
2016-05-06 11:23:48 +02:00
|
|
|
self.hashstop = 0
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.locator = CBlockLocator()
|
|
|
|
self.locator.deserialize(f)
|
|
|
|
self.hashstop = deser_uint256(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
r = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
r += self.locator.serialize()
|
|
|
|
r += ser_uint256(self.hashstop)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_getheaders(locator=%s, stop=%064x)" \
|
|
|
|
% (repr(self.locator), self.hashstop)
|
|
|
|
|
|
|
|
|
|
|
|
# headers message has
|
|
|
|
# <count> <vector of block headers>
|
|
|
|
class msg_headers(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"headers"
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.headers = []
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
2016-03-06 16:14:39 +01:00
|
|
|
# comment in dashd indicates these should be deserialized as blocks
|
2015-04-28 18:36:15 +02:00
|
|
|
blocks = deser_vector(f, CBlock)
|
|
|
|
for x in blocks:
|
|
|
|
self.headers.append(CBlockHeader(x))
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
blocks = [CBlock(x) for x in self.headers]
|
|
|
|
return ser_vector(blocks)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_headers(headers=%s)" % repr(self.headers)
|
|
|
|
|
|
|
|
|
|
|
|
class msg_reject(object):
|
2016-04-10 16:54:28 +02:00
|
|
|
command = b"reject"
|
2016-04-19 22:18:38 +02:00
|
|
|
REJECT_MALFORMED = 1
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def __init__(self):
|
2016-04-10 16:54:28 +02:00
|
|
|
self.message = b""
|
2016-03-19 21:36:32 +01:00
|
|
|
self.code = 0
|
2016-04-23 14:35:52 +02:00
|
|
|
self.reason = b""
|
2016-05-06 11:23:48 +02:00
|
|
|
self.data = 0
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.message = deser_string(f)
|
|
|
|
self.code = struct.unpack("<B", f.read(1))[0]
|
|
|
|
self.reason = deser_string(f)
|
2016-04-19 22:18:38 +02:00
|
|
|
if (self.code != self.REJECT_MALFORMED and
|
|
|
|
(self.message == b"block" or self.message == b"tx")):
|
2015-04-28 18:36:15 +02:00
|
|
|
self.data = deser_uint256(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = ser_string(self.message)
|
|
|
|
r += struct.pack("<B", self.code)
|
|
|
|
r += ser_string(self.reason)
|
2016-04-19 22:18:38 +02:00
|
|
|
if (self.code != self.REJECT_MALFORMED and
|
|
|
|
(self.message == b"block" or self.message == b"tx")):
|
2015-04-28 18:36:15 +02:00
|
|
|
r += ser_uint256(self.data)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_reject: %s %d %s [%064x]" \
|
|
|
|
% (self.message, self.code, self.reason, self.data)
|
|
|
|
|
2016-03-04 21:08:10 +01:00
|
|
|
# Helper function
|
2016-10-02 23:14:01 +02:00
|
|
|
def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
|
2016-03-04 21:08:10 +01:00
|
|
|
attempt = 0
|
|
|
|
elapsed = 0
|
|
|
|
|
|
|
|
while attempt < attempts and elapsed < timeout:
|
|
|
|
with mininode_lock:
|
|
|
|
if predicate():
|
|
|
|
return True
|
|
|
|
attempt += 1
|
|
|
|
elapsed += 0.05
|
|
|
|
time.sleep(0.05)
|
|
|
|
|
|
|
|
return False
|
2015-04-28 18:36:15 +02:00
|
|
|
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
class msg_sendcmpct(object):
|
|
|
|
command = b"sendcmpct"
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.announce = False
|
|
|
|
self.version = 1
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.announce = struct.unpack("<?", f.read(1))[0]
|
|
|
|
self.version = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += struct.pack("<?", self.announce)
|
|
|
|
r += struct.pack("<Q", self.version)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_sendcmpct(announce=%s, version=%lu)" % (self.announce, self.version)
|
|
|
|
|
|
|
|
class msg_cmpctblock(object):
|
|
|
|
command = b"cmpctblock"
|
|
|
|
|
|
|
|
def __init__(self, header_and_shortids = None):
|
|
|
|
self.header_and_shortids = header_and_shortids
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.header_and_shortids = P2PHeaderAndShortIDs()
|
|
|
|
self.header_and_shortids.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += self.header_and_shortids.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_cmpctblock(HeaderAndShortIDs=%s)" % repr(self.header_and_shortids)
|
|
|
|
|
|
|
|
class msg_getblocktxn(object):
|
|
|
|
command = b"getblocktxn"
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.block_txn_request = None
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.block_txn_request = BlockTransactionsRequest()
|
|
|
|
self.block_txn_request.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += self.block_txn_request.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_getblocktxn(block_txn_request=%s)" % (repr(self.block_txn_request))
|
|
|
|
|
|
|
|
class msg_blocktxn(object):
|
|
|
|
command = b"blocktxn"
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.block_transactions = BlockTransactions()
|
|
|
|
|
|
|
|
def deserialize(self, f):
|
|
|
|
self.block_transactions.deserialize(f)
|
|
|
|
|
|
|
|
def serialize(self):
|
|
|
|
r = b""
|
|
|
|
r += self.block_transactions.serialize()
|
|
|
|
return r
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "msg_blocktxn(block_transactions=%s)" % (repr(self.block_transactions))
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
# This is what a callback should look like for NodeConn
|
|
|
|
# Reimplement the on_* functions to provide handling for events
|
|
|
|
class NodeConnCB(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.verack_received = False
|
2016-01-07 15:22:20 +01:00
|
|
|
# deliver_sleep_time is helpful for debugging race conditions in p2p
|
|
|
|
# tests; it causes message delivery to sleep for the specified time
|
|
|
|
# before acquiring the global lock and delivering the next message.
|
|
|
|
self.deliver_sleep_time = None
|
2017-12-29 14:23:27 +01:00
|
|
|
# Remember the services our peer has advertised
|
|
|
|
self.peer_services = None
|
2016-01-07 15:22:20 +01:00
|
|
|
|
|
|
|
def set_deliver_sleep_time(self, value):
|
|
|
|
with mininode_lock:
|
|
|
|
self.deliver_sleep_time = value
|
|
|
|
|
|
|
|
def get_deliver_sleep_time(self):
|
|
|
|
with mininode_lock:
|
|
|
|
return self.deliver_sleep_time
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2014-11-18 22:16:32 +01:00
|
|
|
# Spin until verack message is received from the node.
|
|
|
|
# Tests may want to use this as a signal that the test can begin.
|
|
|
|
# This can be called from the testing thread, so it needs to acquire the
|
|
|
|
# global lock.
|
|
|
|
def wait_for_verack(self):
|
|
|
|
while True:
|
|
|
|
with mininode_lock:
|
|
|
|
if self.verack_received:
|
|
|
|
return
|
|
|
|
time.sleep(0.05)
|
|
|
|
|
2015-04-28 18:36:15 +02:00
|
|
|
def deliver(self, conn, message):
|
2016-01-07 15:22:20 +01:00
|
|
|
deliver_sleep = self.get_deliver_sleep_time()
|
|
|
|
if deliver_sleep is not None:
|
|
|
|
time.sleep(deliver_sleep)
|
2015-05-01 20:47:21 +02:00
|
|
|
with mininode_lock:
|
2015-04-28 18:36:15 +02:00
|
|
|
try:
|
2016-05-06 11:23:48 +02:00
|
|
|
getattr(self, 'on_' + message.command.decode('ascii'))(conn, message)
|
2015-04-28 18:36:15 +02:00
|
|
|
except:
|
2016-05-06 11:23:48 +02:00
|
|
|
print("ERROR delivering %s (%s)" % (repr(message),
|
|
|
|
sys.exc_info()[0]))
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def on_version(self, conn, message):
|
|
|
|
if message.nVersion >= 209:
|
|
|
|
conn.send_message(msg_verack())
|
|
|
|
conn.ver_send = min(MY_VERSION, message.nVersion)
|
|
|
|
if message.nVersion < 209:
|
|
|
|
conn.ver_recv = conn.ver_send
|
2017-12-29 14:23:27 +01:00
|
|
|
conn.nServices = message.nServices
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def on_verack(self, conn, message):
|
|
|
|
conn.ver_recv = conn.ver_send
|
|
|
|
self.verack_received = True
|
|
|
|
|
|
|
|
def on_inv(self, conn, message):
|
|
|
|
want = msg_getdata()
|
|
|
|
for i in message.inv:
|
|
|
|
if i.type != 0:
|
|
|
|
want.inv.append(i)
|
|
|
|
if len(want.inv):
|
|
|
|
conn.send_message(want)
|
|
|
|
|
|
|
|
def on_addr(self, conn, message): pass
|
|
|
|
def on_alert(self, conn, message): pass
|
|
|
|
def on_getdata(self, conn, message): pass
|
|
|
|
def on_getblocks(self, conn, message): pass
|
|
|
|
def on_tx(self, conn, message): pass
|
|
|
|
def on_block(self, conn, message): pass
|
|
|
|
def on_getaddr(self, conn, message): pass
|
|
|
|
def on_headers(self, conn, message): pass
|
|
|
|
def on_getheaders(self, conn, message): pass
|
|
|
|
def on_ping(self, conn, message):
|
|
|
|
if conn.ver_send > BIP0031_VERSION:
|
|
|
|
conn.send_message(msg_pong(message.nonce))
|
|
|
|
def on_reject(self, conn, message): pass
|
2017-02-14 14:34:20 +01:00
|
|
|
def on_open(self, conn): pass
|
2015-04-28 18:36:15 +02:00
|
|
|
def on_close(self, conn): pass
|
|
|
|
def on_mempool(self, conn): pass
|
|
|
|
def on_pong(self, conn, message): pass
|
2017-12-29 14:23:27 +01:00
|
|
|
def on_sendheaders(self, conn, message): pass
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
def on_sendcmpct(self, conn, message): pass
|
|
|
|
def on_cmpctblock(self, conn, message): pass
|
|
|
|
def on_getblocktxn(self, conn, message): pass
|
|
|
|
def on_blocktxn(self, conn, message): pass
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2016-03-04 21:08:10 +01:00
|
|
|
# More useful callbacks and functions for NodeConnCB's which have a single NodeConn
|
|
|
|
class SingleNodeConnCB(NodeConnCB):
|
|
|
|
def __init__(self):
|
|
|
|
NodeConnCB.__init__(self)
|
|
|
|
self.connection = None
|
|
|
|
self.ping_counter = 1
|
|
|
|
self.last_pong = msg_pong()
|
|
|
|
|
|
|
|
def add_connection(self, conn):
|
|
|
|
self.connection = conn
|
|
|
|
|
|
|
|
# Wrapper for the NodeConn's send_message function
|
|
|
|
def send_message(self, message):
|
|
|
|
self.connection.send_message(message)
|
|
|
|
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
def send_and_ping(self, message):
|
|
|
|
self.send_message(message)
|
|
|
|
self.sync_with_ping()
|
|
|
|
|
2016-03-04 21:08:10 +01:00
|
|
|
def on_pong(self, conn, message):
|
|
|
|
self.last_pong = message
|
|
|
|
|
|
|
|
# Sync up with the node
|
|
|
|
def sync_with_ping(self, timeout=30):
|
|
|
|
def received_pong():
|
|
|
|
return (self.last_pong.nonce == self.ping_counter)
|
|
|
|
self.send_message(msg_ping(nonce=self.ping_counter))
|
2018-02-08 08:43:25 +01:00
|
|
|
success = wait_until(received_pong, timeout=timeout)
|
2016-03-04 21:08:10 +01:00
|
|
|
self.ping_counter += 1
|
|
|
|
return success
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
# The actual NodeConn class
|
|
|
|
# This class provides an interface for a p2p connection to a specified node
|
|
|
|
class NodeConn(asyncore.dispatcher):
|
|
|
|
messagemap = {
|
2016-04-10 16:54:28 +02:00
|
|
|
b"version": msg_version,
|
|
|
|
b"verack": msg_verack,
|
|
|
|
b"addr": msg_addr,
|
|
|
|
b"alert": msg_alert,
|
|
|
|
b"inv": msg_inv,
|
|
|
|
b"getdata": msg_getdata,
|
|
|
|
b"getblocks": msg_getblocks,
|
|
|
|
b"tx": msg_tx,
|
|
|
|
b"block": msg_block,
|
|
|
|
b"getaddr": msg_getaddr,
|
|
|
|
b"ping": msg_ping,
|
|
|
|
b"pong": msg_pong,
|
|
|
|
b"headers": msg_headers,
|
|
|
|
b"getheaders": msg_getheaders,
|
|
|
|
b"reject": msg_reject,
|
|
|
|
b"mempool": msg_mempool,
|
Backport compact blocks functionality from bitcoin (#1966)
* Merge #8068: Compact Blocks
48efec8 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 blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
* Merge #8418: Add tests for compact blocks
45c7ddd 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 files
1aacfc2 various typos (leijurv)
* Merge #8449: [Trivial] Do not shadow local variable, cleanup
a159f25 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.py
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
* Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
* Merge #8393: Support for compact blocks together with segwit
27acfc1 [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.py
b55d941 [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 case
4cdece4 [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 cmpctblock
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
* Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processing
dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
* Merge #8515: A few mempool removal optimizations
0334430 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 blocks
d4833ff 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 optimizations
d59a518 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 name
ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)
* Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks
dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)
* Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 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 processing
037159c 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 typos
15fa95d 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 regression
dd0df81 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 txConflicted
a874ab5 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 ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
* Merge #9352: Attempt reconstruction from all compact block announcements
813ede9 [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 optimizations
91335ba 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 connection
02ee4eb 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 consistent
e6111b2 Make peer id logging consistent ("peer=%d" instead of "peer %d") (Matt Corallo)
* Merge #9400: Set peers as HB peers upon full block validation
d4781ac Set peers as HB peers upon full block validation (Gregory Sanders)
* Merge #9499: Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
c594580 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 comments
cc16d99 [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 from https://github.com/bitcoin/bitcoin/commit/58a215ce8c13b900cf982c39f8ee4879290d1a95
* Backport missed comments and mapBlockSource.emplace call
Missed from two commits:
https://github.com/bitcoin/bitcoin/commit/88c35491ab19f9afdf9b3fa9356a072f70ef2f55
https://github.com/bitcoin/bitcoin/commit/7c98ce584ec23bcddcba8cdb33efa6547212f6ef
* Add CheckPeerHeaders() helper and check in (nCount == 0) too
2018-04-11 13:06:01 +02:00
|
|
|
b"sendheaders": msg_sendheaders,
|
|
|
|
b"sendcmpct": msg_sendcmpct,
|
|
|
|
b"cmpctblock": msg_cmpctblock,
|
|
|
|
b"getblocktxn": msg_getblocktxn,
|
|
|
|
b"blocktxn": msg_blocktxn
|
2015-04-28 18:36:15 +02:00
|
|
|
}
|
|
|
|
MAGIC_BYTES = {
|
2016-08-26 03:00:27 +02:00
|
|
|
"mainnet": b"\xbf\x0c\x6b\xbd", # mainnet
|
|
|
|
"testnet3": b"\xce\xe2\xca\xff", # testnet3
|
2017-12-29 14:23:27 +01:00
|
|
|
"regtest": b"\xfc\xc1\xb7\xdc", # regtest
|
2015-04-28 18:36:15 +02:00
|
|
|
}
|
|
|
|
|
2017-02-14 14:34:20 +01:00
|
|
|
def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
|
2015-04-30 22:40:22 +02:00
|
|
|
asyncore.dispatcher.__init__(self, map=mininode_socket_map)
|
2015-04-28 18:36:15 +02:00
|
|
|
self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
|
|
|
|
self.dstaddr = dstaddr
|
|
|
|
self.dstport = dstport
|
|
|
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
2016-04-10 16:54:28 +02:00
|
|
|
self.sendbuf = b""
|
|
|
|
self.recvbuf = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
self.ver_send = 209
|
|
|
|
self.ver_recv = 209
|
|
|
|
self.last_sent = 0
|
|
|
|
self.state = "connecting"
|
|
|
|
self.network = net
|
|
|
|
self.cb = callback
|
|
|
|
self.disconnect = False
|
2017-12-29 14:23:27 +01:00
|
|
|
self.nServices = 0
|
2015-04-28 18:36:15 +02:00
|
|
|
|
2017-02-14 14:34:20 +01:00
|
|
|
if send_version:
|
|
|
|
# stuff version msg into sendbuf
|
|
|
|
vt = msg_version()
|
|
|
|
vt.nServices = services
|
|
|
|
vt.addrTo.ip = self.dstaddr
|
|
|
|
vt.addrTo.port = self.dstport
|
|
|
|
vt.addrFrom.ip = "0.0.0.0"
|
|
|
|
vt.addrFrom.port = 0
|
|
|
|
self.send_message(vt, True)
|
|
|
|
|
2016-05-06 11:23:48 +02:00
|
|
|
print('MiniNode: Connecting to Dash Node IP # ' + dstaddr + ':' \
|
|
|
|
+ str(dstport))
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
try:
|
|
|
|
self.connect((dstaddr, dstport))
|
|
|
|
except:
|
|
|
|
self.handle_close()
|
|
|
|
self.rpc = rpc
|
|
|
|
|
|
|
|
def show_debug_msg(self, msg):
|
|
|
|
self.log.debug(msg)
|
|
|
|
|
|
|
|
def handle_connect(self):
|
2017-02-14 14:34:20 +01:00
|
|
|
if self.state != "connected":
|
|
|
|
self.show_debug_msg("MiniNode: Connected & Listening: \n")
|
|
|
|
self.state = "connected"
|
|
|
|
self.cb.on_open(self)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def handle_close(self):
|
|
|
|
self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
|
|
|
|
% (self.dstaddr, self.dstport))
|
|
|
|
self.state = "closed"
|
2016-04-10 16:54:28 +02:00
|
|
|
self.recvbuf = b""
|
|
|
|
self.sendbuf = b""
|
2015-04-28 18:36:15 +02:00
|
|
|
try:
|
|
|
|
self.close()
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
self.cb.on_close(self)
|
|
|
|
|
|
|
|
def handle_read(self):
|
|
|
|
try:
|
|
|
|
t = self.recv(8192)
|
|
|
|
if len(t) > 0:
|
|
|
|
self.recvbuf += t
|
|
|
|
self.got_data()
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def readable(self):
|
|
|
|
return True
|
|
|
|
|
|
|
|
def writable(self):
|
2015-05-01 20:47:21 +02:00
|
|
|
with mininode_lock:
|
2017-02-14 14:34:20 +01:00
|
|
|
pre_connection = self.state == "connecting"
|
2015-05-01 20:47:21 +02:00
|
|
|
length = len(self.sendbuf)
|
2017-02-14 14:34:20 +01:00
|
|
|
return (length > 0 or pre_connection)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def handle_write(self):
|
2015-05-01 20:47:21 +02:00
|
|
|
with mininode_lock:
|
2017-02-14 14:34:20 +01:00
|
|
|
# asyncore does not expose socket connection, only the first read/write
|
|
|
|
# event, thus we must check connection manually here to know when we
|
|
|
|
# actually connect
|
|
|
|
if self.state == "connecting":
|
|
|
|
self.handle_connect()
|
|
|
|
if not self.writable():
|
|
|
|
return
|
|
|
|
|
2015-05-01 20:47:21 +02:00
|
|
|
try:
|
|
|
|
sent = self.send(self.sendbuf)
|
|
|
|
except:
|
|
|
|
self.handle_close()
|
|
|
|
return
|
|
|
|
self.sendbuf = self.sendbuf[sent:]
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def got_data(self):
|
2016-03-19 21:36:32 +01:00
|
|
|
try:
|
|
|
|
while True:
|
|
|
|
if len(self.recvbuf) < 4:
|
2015-04-28 18:36:15 +02:00
|
|
|
return
|
2016-03-19 21:36:32 +01:00
|
|
|
if self.recvbuf[:4] != self.MAGIC_BYTES[self.network]:
|
|
|
|
raise ValueError("got garbage %s" % repr(self.recvbuf))
|
|
|
|
if self.ver_recv < 209:
|
|
|
|
if len(self.recvbuf) < 4 + 12 + 4:
|
|
|
|
return
|
2016-04-10 16:54:28 +02:00
|
|
|
command = self.recvbuf[4:4+12].split(b"\x00", 1)[0]
|
2016-03-19 21:36:32 +01:00
|
|
|
msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
|
|
|
|
checksum = None
|
|
|
|
if len(self.recvbuf) < 4 + 12 + 4 + msglen:
|
|
|
|
return
|
|
|
|
msg = self.recvbuf[4+12+4:4+12+4+msglen]
|
|
|
|
self.recvbuf = self.recvbuf[4+12+4+msglen:]
|
|
|
|
else:
|
|
|
|
if len(self.recvbuf) < 4 + 12 + 4 + 4:
|
|
|
|
return
|
2016-04-10 16:54:28 +02:00
|
|
|
command = self.recvbuf[4:4+12].split(b"\x00", 1)[0]
|
2016-03-19 21:36:32 +01:00
|
|
|
msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
|
|
|
|
checksum = self.recvbuf[4+12+4:4+12+4+4]
|
|
|
|
if len(self.recvbuf) < 4 + 12 + 4 + 4 + msglen:
|
|
|
|
return
|
|
|
|
msg = self.recvbuf[4+12+4+4:4+12+4+4+msglen]
|
|
|
|
th = sha256(msg)
|
|
|
|
h = sha256(th)
|
|
|
|
if checksum != h[:4]:
|
|
|
|
raise ValueError("got bad checksum " + repr(self.recvbuf))
|
|
|
|
self.recvbuf = self.recvbuf[4+12+4+4+msglen:]
|
|
|
|
if command in self.messagemap:
|
|
|
|
f = BytesIO(msg)
|
|
|
|
t = self.messagemap[command]()
|
|
|
|
t.deserialize(f)
|
|
|
|
self.got_message(t)
|
|
|
|
else:
|
2017-12-21 19:17:59 +01:00
|
|
|
self.show_debug_msg("Unknown command: '" + str(command) + "' " +
|
2016-03-19 21:36:32 +01:00
|
|
|
repr(msg))
|
|
|
|
except Exception as e:
|
2016-05-06 11:23:48 +02:00
|
|
|
print('got_data:', repr(e))
|
|
|
|
# import traceback
|
|
|
|
# traceback.print_tb(sys.exc_info()[2])
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def send_message(self, message, pushbuf=False):
|
|
|
|
if self.state != "connected" and not pushbuf:
|
2016-06-17 15:41:32 +02:00
|
|
|
raise IOError('Not connected, no pushbuf')
|
2015-04-28 18:36:15 +02:00
|
|
|
self.show_debug_msg("Send %s" % repr(message))
|
|
|
|
command = message.command
|
|
|
|
data = message.serialize()
|
|
|
|
tmsg = self.MAGIC_BYTES[self.network]
|
|
|
|
tmsg += command
|
2016-04-10 16:54:28 +02:00
|
|
|
tmsg += b"\x00" * (12 - len(command))
|
2015-04-28 18:36:15 +02:00
|
|
|
tmsg += struct.pack("<I", len(data))
|
|
|
|
if self.ver_send >= 209:
|
|
|
|
th = sha256(data)
|
|
|
|
h = sha256(th)
|
|
|
|
tmsg += h[:4]
|
|
|
|
tmsg += data
|
2015-05-01 20:47:21 +02:00
|
|
|
with mininode_lock:
|
|
|
|
self.sendbuf += tmsg
|
|
|
|
self.last_sent = time.time()
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
def got_message(self, message):
|
2016-04-10 16:54:28 +02:00
|
|
|
if message.command == b"version":
|
2015-04-28 18:36:15 +02:00
|
|
|
if message.nVersion <= BIP0031_VERSION:
|
2016-04-10 16:54:28 +02:00
|
|
|
self.messagemap[b'ping'] = msg_ping_prebip31
|
2015-04-28 18:36:15 +02:00
|
|
|
if self.last_sent + 30 * 60 < time.time():
|
2016-04-10 16:54:28 +02:00
|
|
|
self.send_message(self.messagemap[b'ping']())
|
2015-04-28 18:36:15 +02:00
|
|
|
self.show_debug_msg("Recv %s" % repr(message))
|
|
|
|
self.cb.deliver(self, message)
|
|
|
|
|
|
|
|
def disconnect_node(self):
|
|
|
|
self.disconnect = True
|
|
|
|
|
|
|
|
|
|
|
|
class NetworkThread(Thread):
|
|
|
|
def run(self):
|
2015-04-30 22:40:22 +02:00
|
|
|
while mininode_socket_map:
|
|
|
|
# We check for whether to disconnect outside of the asyncore
|
|
|
|
# loop to workaround the behavior of asyncore when using
|
|
|
|
# select
|
|
|
|
disconnected = []
|
|
|
|
for fd, obj in mininode_socket_map.items():
|
|
|
|
if obj.disconnect:
|
|
|
|
disconnected.append(obj)
|
|
|
|
[ obj.handle_close() for obj in disconnected ]
|
|
|
|
asyncore.loop(0.1, use_poll=True, map=mininode_socket_map, count=1)
|
2015-04-28 18:36:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
# An exception we can raise if we detect a potential disconnect
|
|
|
|
# (p2p or rpc) before the test is complete
|
|
|
|
class EarlyDisconnectError(Exception):
|
|
|
|
def __init__(self, value):
|
|
|
|
self.value = value
|
|
|
|
|
|
|
|
def __str__(self):
|
|
|
|
return repr(self.value)
|