ttrezor and clones: rm dead code - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ab1ec574292d09855707d0feb031eb4149cc43b3
DIR parent 8aebb8249a0163cb2b1953b6aeaab9ff0c569f61
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 30 Sep 2018 02:10:17 +0200
ttrezor and clones: rm dead code
see Electron-Cash/Electron-Cash#872
see Electron-Cash/Electron-Cash#874
Diffstat:
M electrum/plugins/keepkey/keepkey.py | 6 +-----
M electrum/plugins/safe_t/safe_t.py | 6 +-----
M electrum/plugins/trezor/trezor.py | 6 +-----
M electrum/transaction.py | 1 -
4 files changed, 3 insertions(+), 16 deletions(-)
---
DIR diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py
t@@ -345,11 +345,7 @@ class KeepKeyPlugin(HW_PluginBase):
txinputtype.script_type = self.get_keepkey_input_script_type(txin['type'])
else:
def f(x_pubkey):
- if is_xpubkey(x_pubkey):
- xpub, s = parse_xpubkey(x_pubkey)
- else:
- xpub = xpub_from_pubkey(0, bfh(x_pubkey))
- s = []
+ xpub, s = parse_xpubkey(x_pubkey)
return self._make_node_path(xpub, s)
pubkeys = list(map(f, x_pubkeys))
multisig = self.types.MultisigRedeemScriptType(
DIR diff --git a/electrum/plugins/safe_t/safe_t.py b/electrum/plugins/safe_t/safe_t.py
t@@ -354,11 +354,7 @@ class SafeTPlugin(HW_PluginBase):
txinputtype.script_type = self.get_safet_input_script_type(txin['type'])
else:
def f(x_pubkey):
- if is_xpubkey(x_pubkey):
- xpub, s = parse_xpubkey(x_pubkey)
- else:
- xpub = xpub_from_pubkey(0, bfh(x_pubkey))
- s = []
+ xpub, s = parse_xpubkey(x_pubkey)
return self._make_node_path(xpub, s)
pubkeys = list(map(f, x_pubkeys))
multisig = self.types.MultisigRedeemScriptType(
DIR diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py
t@@ -365,11 +365,7 @@ class TrezorPlugin(HW_PluginBase):
txinputtype.script_type = self.get_trezor_input_script_type(txin['type'])
else:
def f(x_pubkey):
- if is_xpubkey(x_pubkey):
- xpub, s = parse_xpubkey(x_pubkey)
- else:
- xpub = xpub_from_pubkey(0, bfh(x_pubkey))
- s = []
+ xpub, s = parse_xpubkey(x_pubkey)
return self._make_node_path(xpub, s)
pubkeys = list(map(f, x_pubkeys))
multisig = self.types.MultisigRedeemScriptType(
DIR diff --git a/electrum/transaction.py b/electrum/transaction.py
t@@ -742,7 +742,6 @@ class Transaction:
j = pubkeys.index(pubkey_hex)
print_error("adding sig", i, j, pubkey_hex, sig)
self.add_signature_to_txin(i, j, sig)
- #self._inputs[i]['x_pubkeys'][j] = pubkey
break
# redo raw
self.raw = self.serialize()