mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-10-11 03:53:22 +02:00
test: Update test framework p2p protocol version to 70016
This new p2p protocol version allows to use WTXIDs for tx relay.
This commit is contained in:
committed by
Suhas Daftuar
parent
dd78d1d641
commit
9a5392fdf6
@@ -31,7 +31,7 @@ from test_framework.siphash import siphash256
|
||||
from test_framework.util import hex_str_to_bytes, assert_equal
|
||||
|
||||
MIN_VERSION_SUPPORTED = 60001
|
||||
MY_VERSION = 70014 # past bip-31 for ping/pong
|
||||
MY_VERSION = 70016 # past wtxid relay
|
||||
MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
|
||||
MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
|
||||
|
||||
@@ -59,6 +59,7 @@ MSG_TX = 1
|
||||
MSG_BLOCK = 2
|
||||
MSG_FILTERED_BLOCK = 3
|
||||
MSG_CMPCT_BLOCK = 4
|
||||
MSG_WTX = 5
|
||||
MSG_WITNESS_FLAG = 1 << 30
|
||||
MSG_TYPE_MASK = 0xffffffff >> 2
|
||||
|
||||
@@ -242,7 +243,8 @@ class CInv:
|
||||
MSG_TX | MSG_WITNESS_FLAG: "WitnessTx",
|
||||
MSG_BLOCK | MSG_WITNESS_FLAG: "WitnessBlock",
|
||||
MSG_FILTERED_BLOCK: "filtered Block",
|
||||
4: "CompactBlock"
|
||||
4: "CompactBlock",
|
||||
5: "WTX",
|
||||
}
|
||||
|
||||
def __init__(self, t=0, h=0):
|
||||
@@ -263,6 +265,9 @@ class CInv:
|
||||
return "CInv(type=%s hash=%064x)" \
|
||||
% (self.typemap[self.type], self.hash)
|
||||
|
||||
def __eq__(self, other):
|
||||
return isinstance(other, CInv) and self.hash == other.hash and self.type == other.type
|
||||
|
||||
|
||||
class CBlockLocator:
|
||||
__slots__ = ("nVersion", "vHave")
|
||||
@@ -1124,6 +1129,22 @@ class msg_tx:
|
||||
def __repr__(self):
|
||||
return "msg_tx(tx=%s)" % (repr(self.tx))
|
||||
|
||||
class msg_wtxidrelay:
|
||||
__slots__ = ()
|
||||
msgtype = b"wtxidrelay"
|
||||
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
def deserialize(self, f):
|
||||
pass
|
||||
|
||||
def serialize(self):
|
||||
return b""
|
||||
|
||||
def __repr__(self):
|
||||
return "msg_wtxidrelay()"
|
||||
|
||||
|
||||
class msg_no_witness_tx(msg_tx):
|
||||
__slots__ = ()
|
||||
|
Reference in New Issue
Block a user