AaronFiore/electrum
1
0
Fork 0
Code Activity

detect when trying to sign with a hw wallet offline in a not supported config

Browse Source 
closes #4229
This commit is contained in:
SomberNight
2018-04-06 18:29:41 +02:00
parent 4ff3791cb9
commit 3b8c1c6c04
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/keepkey/plugin.py
View File

@@ -7,7 +7,7 @@ from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
from electrum import constants from electrum import constants
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin from electrum.plugins import BasePlugin
from electrum.transaction import deserialize from electrum.transaction import deserialize, Transaction
from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey
from electrum.base_wizard import ScriptTypeNotSupported from electrum.base_wizard import ScriptTypeNotSupported
@@ -48,6 +48,8 @@ class KeepKeyCompatibleKeyStore(Hardware_KeyStore):
for txin in tx.inputs(): for txin in tx.inputs():
pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin) pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin)
tx_hash = txin['prevout_hash'] tx_hash = txin['prevout_hash']
if txin.get('prev_tx') is None and not Transaction.is_segwit_input(txin):
raise Exception(_('Offline signing with {} is not supported for legacy inputs.').format(self.device))
prev_tx[tx_hash] = txin['prev_tx'] prev_tx[tx_hash] = txin['prev_tx']
for x_pubkey in x_pubkeys: for x_pubkey in x_pubkeys:
if not is_xpubkey(x_pubkey): if not is_xpubkey(x_pubkey):

3
plugins/ledger/ledger.py
View File

@@ -350,6 +350,9 @@ class Ledger_KeyStore(Hardware_KeyStore):
self.give_error("No matching x_key for sign_transaction") # should never happen self.give_error("No matching x_key for sign_transaction") # should never happen
redeemScript = Transaction.get_preimage_script(txin) redeemScript = Transaction.get_preimage_script(txin)
if txin.get('prev_tx') is None: # and not Transaction.is_segwit_input(txin):
# note: offline signing does not work atm even with segwit inputs for ledger
raise Exception(_('Offline signing with {} is not supported.').format(self.device))
inputs.append([txin['prev_tx'].raw, txin['prevout_n'], redeemScript, txin['prevout_hash'], signingPos, txin.get('sequence', 0xffffffff - 1) ]) inputs.append([txin['prev_tx'].raw, txin['prevout_n'], redeemScript, txin['prevout_hash'], signingPos, txin.get('sequence', 0xffffffff - 1) ])
inputsPaths.append(hwAddress) inputsPaths.append(hwAddress)
pubKeys.append(pubkeys) pubKeys.append(pubkeys)

4
plugins/trezor/trezor.py
View File

@@ -6,7 +6,7 @@ from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
from electrum import constants from electrum import constants
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin, Device from electrum.plugins import BasePlugin, Device
from electrum.transaction import deserialize from electrum.transaction import deserialize, Transaction
from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey
from ..hw_wallet import HW_PluginBase from ..hw_wallet import HW_PluginBase
@@ -63,6 +63,8 @@ class TrezorKeyStore(Hardware_KeyStore):
for txin in tx.inputs(): for txin in tx.inputs():
pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin) pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin)
tx_hash = txin['prevout_hash'] tx_hash = txin['prevout_hash']
if txin.get('prev_tx') is None and not Transaction.is_segwit_input(txin):
raise Exception(_('Offline signing with {} is not supported for legacy inputs.').format(self.device))
prev_tx[tx_hash] = txin['prev_tx'] prev_tx[tx_hash] = txin['prev_tx']
for x_pubkey in x_pubkeys: for x_pubkey in x_pubkeys:
if not is_xpubkey(x_pubkey): if not is_xpubkey(x_pubkey):