AaronFiore/electrum
1
0
Fork 0
Code Activity

RBF batching: some fixes

Browse Source
This commit is contained in:
SomberNight
2018-11-09 17:56:42 +01:00
parent f55db2f90b
commit 71ac3bb305
5 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/transaction.py
View File

@@ -864,7 +864,7 @@ class Transaction:
@classmethod
def serialize_witness(self, txin, estimate_size=False):
_type = txin['type']
if not self.is_segwit_input(txin) and not self.is_input_value_needed(txin):
if not self.is_segwit_input(txin) and not txin['type'] == 'address':
return '00'
if _type == 'coinbase':
return txin['witness']
@@ -902,10 +902,6 @@ class Transaction:
def is_segwit_inputtype(cls, txin_type):
return txin_type in ('p2wpkh', 'p2wpkh-p2sh', 'p2wsh', 'p2wsh-p2sh')
@classmethod
def is_input_value_needed(cls, txin):
return cls.is_segwit_input(txin) or txin['type'] == 'address'
@classmethod
def guess_txintype_from_address(cls, addr):
# It's not possible to tell the script type in general