trename createrawtx -> serialize - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6b54459833388471b3cfbb874fb440e60ec5c8d4
DIR parent 461cbd357a71659ccacdcc5140a321f8a67c645b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 18 May 2016 14:33:00 +0200
rename createrawtx -> serialize
Diffstat:
M lib/commands.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -193,10 +193,13 @@ class Commands:
return {'address': r}
@command('')
- def createrawtx(self, inputs, outputs):
+ def serialize(self, jsontx):
"""Create a transaction from json inputs. Inputs must have a redeemPubkey. Outputs must be a list of (address, value).
"""
keypairs = {}
+ inputs = jsontx.get('inputs')
+ outputs = jsontx.get('outputs')
+ locktime = jsontx.get('locktime', 0)
for txin in inputs:
if txin.get('output'):
prevout_hash, prevout_n = txin['output'].split(':')
t@@ -219,7 +222,7 @@ class Commands:
raise BaseException('No redeem script')
outputs = map(lambda x: (TYPE_ADDRESS, x[0], int(COIN*Decimal(x[1]))), outputs)
- tx = Transaction.from_io(inputs, outputs)
+ tx = Transaction.from_io(inputs, outputs, locktime=locktime)
tx.sign(keypairs)
return tx.as_dict()
t@@ -693,6 +696,7 @@ arg_types = {
'entropy': long,
'tx': tx_from_str,
'pubkeys': json_loads,
+ 'jsontx': json_loads,
'inputs': json_loads,
'outputs': json_loads,
'tx_fee': lambda x: str(Decimal(x)) if x is not None else None,