tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2b0a7bcd735dbf0bcc9458979554cfee4745fc2c
DIR parent e43abb5c960f1be7c9463c66656d74916fb00bab
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 10 Mar 2017 14:16:57 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/digitalbitbox/digitalbitbo… | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/digitalbitbox/digitalbitbox.py b/plugins/digitalbitbox/digitalbitbox.py
t@@ -367,7 +367,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
if txin.get('is_coinbase'):
self.give_error("Coinbase not supported") # should never happen
- if len(txin['pubkeys']) > 1:
+ if txin['type'] in ['p2sh']:
p2shTransaction = True
for x_pubkey in txin['x_pubkeys']:
t@@ -384,7 +384,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
# Sanity check
if p2shTransaction:
for txinput in tx.inputs():
- if len(txinput['pubkeys']) < 2:
+ if txinput['type'] != 'p2sh':
self.give_error("P2SH / regular input mixed in same transaction not supported") # should never happen
# Build pubkeyarray from outputs (unused because echo for smart verification not implemented)