AaronFiore/electrum
1
0
Fork 0
Code Activity

add witness version to our partial format

Browse Source
This commit is contained in:
SomberNight
2018-06-11 19:25:02 +02:00
parent a0ba5a7962
commit 6b8a563d41
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/transaction.py
View File

@@ -481,6 +481,7 @@ def parse_witness(vds, txin, full_parse: bool):
return return
if n == 0xffffffff: if n == 0xffffffff:
txin['value'] = vds.read_uint64() txin['value'] = vds.read_uint64()
txin['witness_version'] = vds.read_uint16()
n = vds.read_compact_size() n = vds.read_compact_size()
# now 'n' is the number of items in the witness # now 'n' is the number of items in the witness
w = list(bh2u(vds.read_bytes(vds.read_compact_size())) for i in range(n)) w = list(bh2u(vds.read_bytes(vds.read_compact_size())) for i in range(n))
@@ -488,9 +489,9 @@ def parse_witness(vds, txin, full_parse: bool):
if not full_parse: if not full_parse:
return return
# NOTE: when witness version 1 comes, if we need to distinguish it for partial txns here,
# we could put the witness version in our partial format, e.g. after value
try: try:
if txin['witness_version'] != 0:
raise UnknownTxinType()
if txin['type'] == 'coinbase': if txin['type'] == 'coinbase':
pass pass
elif txin['type'] == 'p2wsh-p2sh' or n > 2: elif txin['type'] == 'p2wsh-p2sh' or n > 2:
@@ -780,10 +781,12 @@ class Transaction:
else: else:
raise Exception('wrong txin type:', txin['type']) raise Exception('wrong txin type:', txin['type'])
if self.is_txin_complete(txin) or estimate_size: if self.is_txin_complete(txin) or estimate_size:
value_field = '' partial_format_witness_prefix = ''
else: else:
value_field = var_int(0xffffffff) + int_to_hex(txin['value'], 8) input_value = int_to_hex(txin['value'], 8)
return value_field + witness witness_version = int_to_hex(txin.get('witness_version', 0), 2)
partial_format_witness_prefix = var_int(0xffffffff) + input_value + witness_version
return partial_format_witness_prefix + witness
@classmethod @classmethod
def is_segwit_input(cls, txin): def is_segwit_input(cls, txin):