tMerge pull request #4133 from laseryuan/patch-1 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit bf67920f7f8211e507991899c693670dc6380757
DIR parent f8f00188ed36aabde056596c4a00009ae29f6f7f
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 22 Mar 2018 12:25:58 +0100
Merge pull request #4133 from laseryuan/patch-1
Fix the error: locktime is always reset to zero when serialize the js…
Diffstat:
M lib/commands.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -201,7 +201,7 @@ class Commands:
keypairs = {}
inputs = jsontx.get('inputs')
outputs = jsontx.get('outputs')
- locktime = jsontx.get('locktime', 0)
+ locktime = jsontx.get('lockTime', 0)
for txin in inputs:
if txin.get('output'):
prevout_hash, prevout_n = txin['output'].split(':')