BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2275 from digitalbitbox/170310/dbb_bugfix 

Digital Bitbox cannot send coins bug (due to a later upstream change)
This commit is contained in:
ThomasV 2017-03-10 11:59:37 +01:00 committed by GitHub
parent 9628619e68 5b0d5814b9
commit b8fdfe2037
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/digitalbitbox/digitalbitbox.py
View File

@ -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']:
@ -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)