tMerge pull request #2291 from saleemrashid/testnet-trezor - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b27aeadb719ccdc4a7a8d94cc5d6a4218a64c010
DIR parent 2737788e9c23fa6390822ed677bfc086db29508a
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 14 Mar 2017 05:55:38 +0100
Merge pull request #2291 from saleemrashid/testnet-trezor
TREZOR Testnet support
Diffstat:
M lib/base_wizard.py | 4 ++--
M lib/keystore.py | 5 ++++-
M plugins/trezor/plugin.py | 23 +++++++++++++++--------
3 files changed, 21 insertions(+), 11 deletions(-)
---
DIR diff --git a/lib/base_wizard.py b/lib/base_wizard.py
t@@ -26,6 +26,7 @@
import os
import bitcoin
import keystore
+from keystore import bip44_derivation
from wallet import Wallet, Imported_Wallet, Standard_Wallet, Multisig_Wallet, wallet_types
from i18n import _
from plugins import run_hook
t@@ -219,7 +220,6 @@ class BaseWizard(object):
# This is partially compatible with BIP45; assumes index=0
self.on_hw_derivation(name, device_info, "m/45'/0")
else:
- from keystore import bip44_derivation
f = lambda x: self.run('on_hw_derivation', name, device_info, bip44_derivation(int(x)))
self.account_id_dialog(f)
t@@ -301,7 +301,7 @@ class BaseWizard(object):
def on_bip44(self, seed, passphrase, account_id):
k = keystore.BIP32_KeyStore({})
bip32_seed = keystore.bip39_to_seed(seed, passphrase)
- derivation = "m/44'/0'/%d'"%account_id
+ derivation = bip44_derivation(account_id)
k.add_xprv_from_seed(bip32_seed, 0, derivation)
self.on_keystore(k)
DIR diff --git a/lib/keystore.py b/lib/keystore.py
t@@ -650,7 +650,10 @@ is_private_key = lambda x: is_xprv(x) or is_private_key_list(x)
is_bip32_key = lambda x: is_xprv(x) or is_xpub(x)
def bip44_derivation(account_id):
- return "m/44'/0'/%d'"% int(account_id)
+ if TESTNET:
+ return "m/44'/1'/%d'"% int(account_id)
+ else:
+ return "m/44'/0'/%d'"% int(account_id)
def from_seed(seed, passphrase):
t = seed_type(seed)
DIR diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
t@@ -7,7 +7,8 @@ from functools import partial
from electrum.bitcoin import (bc_address_to_hash_160, xpub_from_pubkey,
public_key_to_p2pkh, EncodeBase58Check,
- TYPE_ADDRESS, TYPE_SCRIPT)
+ TYPE_ADDRESS, TYPE_SCRIPT,
+ TESTNET, ADDRTYPE_P2PKH, ADDRTYPE_P2SH)
from electrum.i18n import _
from electrum.plugins import BasePlugin, hook
from electrum.transaction import deserialize, Transaction
t@@ -41,7 +42,7 @@ class TrezorCompatibleKeyStore(Hardware_KeyStore):
client = self.get_client()
address_path = self.get_derivation() + "/%d/%d"%sequence
address_n = client.expand_path(address_path)
- msg_sig = client.sign_message('Bitcoin', address_n, message)
+ msg_sig = client.sign_message(self.get_coin_name(), address_n, message)
return msg_sig.signature
def sign_transaction(self, tx, password):
t@@ -143,6 +144,12 @@ class TrezorCompatiblePlugin(HW_PluginBase):
client.used()
return client
+ def get_coin_name(self):
+ if TESTNET:
+ return "Testnet"
+ else:
+ return "Bitcoin"
+
def initialize_device(self, device_id, wizard, handler):
# Initialization method
msg = _("Choose how you want to initialize your %s.\n\n"
t@@ -233,7 +240,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
client = self.get_client(keystore)
inputs = self.tx_inputs(tx, True)
outputs = self.tx_outputs(keystore.get_derivation(), tx)
- signed_tx = client.sign_tx('Bitcoin', inputs, outputs)[1]
+ signed_tx = client.sign_tx(self.get_coin_name(), inputs, outputs)[1]
raw = signed_tx.encode('hex')
tx.update_signatures(raw)
t@@ -246,7 +253,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
derivation = wallet.keystore.derivation
address_path = "%s/%d/%d"%(derivation, change, index)
address_n = client.expand_path(address_path)
- client.get_address('Bitcoin', address_n, True)
+ client.get_address(self.get_coin_name(), address_n, True)
def tx_inputs(self, tx, for_sig=False):
inputs = []
t@@ -319,14 +326,14 @@ class TrezorCompatiblePlugin(HW_PluginBase):
has_change = True # no more than one change address
addrtype, hash_160 = bc_address_to_hash_160(address)
index, xpubs, m = info
- if addrtype == 0:
+ if addrtype == ADDRTYPE_P2PKH:
address_n = self.client_class.expand_path(derivation + "/%d/%d"%index)
txoutputtype = self.types.TxOutputType(
amount = amount,
script_type = self.types.PAYTOADDRESS,
address_n = address_n,
)
- elif addrtype == 5:
+ elif addrtype == ADDRTYPE_P2SH:
address_n = self.client_class.expand_path("/%d/%d"%index)
nodes = map(self.ckd_public.deserialize, xpubs)
pubkeys = [ self.types.HDNodePathType(node=node, address_n=address_n) for node in nodes]
t@@ -346,9 +353,9 @@ class TrezorCompatiblePlugin(HW_PluginBase):
txoutputtype.op_return_data = address[2:]
elif _type == TYPE_ADDRESS:
addrtype, hash_160 = bc_address_to_hash_160(address)
- if addrtype == 0:
+ if addrtype == ADDRTYPE_P2PKH:
txoutputtype.script_type = self.types.PAYTOADDRESS
- elif addrtype == 5:
+ elif addrtype == ADDRTYPE_P2SH:
txoutputtype.script_type = self.types.PAYTOSCRIPTHASH
else:
raise BaseException('addrtype')