tfix regression from 1d6f000868caa02607129a99cad7bed8ec3f28df - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit dc2f8ee804a7a2062f19521932c0a3f76d7b2aa1
DIR parent 8174c31f132affceaa573c4d63956156c65f3ae1
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Wed, 9 May 2018 18:14:22 +0200
fix regression from 1d6f000868caa02607129a99cad7bed8ec3f28df
re trezor/keepkey multisig signing
Diffstat:
M plugins/keepkey/keepkey.py | 2 +-
M plugins/trezor/trezor.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/keepkey/keepkey.py b/plugins/keepkey/keepkey.py
t@@ -327,7 +327,7 @@ class KeepKeyPlugin(HW_PluginBase):
txinputtype.prev_hash = prev_hash
txinputtype.prev_index = prev_index
- if 'scriptSig' in txin:
+ if txin.get('scriptSig') is not None:
script_sig = bfh(txin['scriptSig'])
txinputtype.script_sig = script_sig
DIR diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py
t@@ -379,7 +379,7 @@ class TrezorPlugin(HW_PluginBase):
txinputtype.prev_hash = prev_hash
txinputtype.prev_index = prev_index
- if 'scriptSig' in txin:
+ if txin.get('scriptSig') is not None:
script_sig = bfh(txin['scriptSig'])
txinputtype.script_sig = script_sig