AaronFiore/electrum
1
0
Fork 0
Code Activity

Correct errors in command 'serialize(deserialize(pbst))'

Browse Source 
The fields for 'locktime' and 'value_sats' were not parsing properly.
Fixed 'locktime' typo and made 'value' and 'value_sats' synonyms
This commit is contained in:
brianddk
2020-08-05 01:47:35 -05:00
parent 9b416b577e
commit 3f5c1a0171
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/commands.py
View File

@@ -362,7 +362,7 @@ class Commands:
""" """
keypairs = {} keypairs = {}
inputs = [] # type: List[PartialTxInput] inputs = [] # type: List[PartialTxInput]
locktime = jsontx.get('lockTime', 0) locktime = jsontx.get('locktime', 0)
for txin_dict in jsontx.get('inputs'): for txin_dict in jsontx.get('inputs'):
if txin_dict.get('prevout_hash') is not None and txin_dict.get('prevout_n') is not None: if txin_dict.get('prevout_hash') is not None and txin_dict.get('prevout_n') is not None:
prevout = TxOutpoint(txid=bfh(txin_dict['prevout_hash']), out_idx=int(txin_dict['prevout_n'])) prevout = TxOutpoint(txid=bfh(txin_dict['prevout_hash']), out_idx=int(txin_dict['prevout_n']))
@@ -371,7 +371,7 @@ class Commands:
else: else:
raise Exception("missing prevout for txin") raise Exception("missing prevout for txin")
txin = PartialTxInput(prevout=prevout) txin = PartialTxInput(prevout=prevout)
txin._trusted_value_sats = int(txin_dict['value']) txin._trusted_value_sats = int(txin_dict.get('value', txin_dict['value_sats']))
nsequence = txin_dict.get('nsequence', None) nsequence = txin_dict.get('nsequence', None)
if nsequence is not None: if nsequence is not None:
txin.nsequence = nsequence txin.nsequence = nsequence
@@ -385,7 +385,7 @@ class Commands:
txin.num_sig = 1 txin.num_sig = 1
inputs.append(txin) inputs.append(txin)
outputs = [PartialTxOutput.from_address_and_value(txout['address'], int(txout['value'])) outputs = [PartialTxOutput.from_address_and_value(txout['address'], int(txout.get('value', txout['value_sats'])))
for txout in jsontx.get('outputs')] for txout in jsontx.get('outputs')]
tx = PartialTransaction.from_io(inputs, outputs, locktime=locktime) tx = PartialTransaction.from_io(inputs, outputs, locktime=locktime)
tx.sign(keypairs) tx.sign(keypairs)