AaronFiore/electrum
1
0
Fork 0
Code Activity

commands: small fix and clean-up for "serialize" cmd

Browse Source 
Docstring was outdated, and
`txout.get('value', txout['value_sats'])`
was a logic bug.

fixes https://github.com/spesmilo/electrum/issues/8265
This commit is contained in:
SomberNight
2023-03-19 18:34:43 +00:00
parent 8b0a6940bc
commit 68bba47052
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
electrum/commands.py
View File

@@ -371,9 +371,17 @@ class Commands:
@command('') @command('')
async def serialize(self, jsontx): async def serialize(self, jsontx):
"""Create a transaction from json inputs. """Create a signed raw transaction from a json tx template.
Inputs must have a redeemPubkey.
Outputs must be a list of {'address':address, 'value':satoshi_amount}. Example value for "jsontx" arg: {
"inputs": [
{"prevout_hash": "9d221a69ca3997cbeaf5624d723e7dc5f829b1023078c177d37bdae95f37c539", "prevout_n": 1,
"value_sats": 1000000, "privkey": "p2wpkh:cVDXzzQg6RoCTfiKpe8MBvmm5d5cJc6JLuFApsFDKwWa6F5TVHpD"}
],
"outputs": [
{"address": "tb1q4s8z6g5jqzllkgt8a4har94wl8tg0k9m8kv5zd", "value_sats": 990000}
]
}
""" """
keypairs = {} keypairs = {}
inputs = [] # type: List[PartialTxInput] inputs = [] # type: List[PartialTxInput]
@@ -386,7 +394,10 @@ 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.get('value', txin_dict['value_sats'])) try:
txin._trusted_value_sats = int(txin_dict.get('value') or txin_dict['value_sats'])
except KeyError:
raise Exception("missing 'value_sats' field for txin")
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
@@ -399,8 +410,19 @@ class Commands:
txin.script_descriptor = desc txin.script_descriptor = desc
inputs.append(txin) inputs.append(txin)
outputs = [PartialTxOutput.from_address_and_value(txout['address'], int(txout.get('value', txout['value_sats']))) outputs = [] # type: List[PartialTxOutput]
for txout in jsontx.get('outputs')] for txout_dict in jsontx.get('outputs'):
try:
txout_addr = txout_dict['address']
except KeyError:
raise Exception("missing 'address' field for txout")
try:
txout_val = int(txout_dict.get('value') or txout_dict['value_sats'])
except KeyError:
raise Exception("missing 'value_sats' field for txout")
txout = PartialTxOutput.from_address_and_value(txout_addr, txout_val)
outputs.append(txout)
tx = PartialTransaction.from_io(inputs, outputs, locktime=locktime) tx = PartialTransaction.from_io(inputs, outputs, locktime=locktime)
tx.sign(keypairs) tx.sign(keypairs)
return tx.serialize() return tx.serialize()