tRevert mistaken commit - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 84450b9189f49c23aaae47ecdb80652085b9c582
DIR parent ed3c0a546982dd74ca850e9ae528a241be4aebe2
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Tue, 29 Dec 2015 23:16:53 +0900
Revert mistaken commit
Diffstat:
M lib/wallet.py | 5 ++++-
M plugins/ledger/ledger.py | 3 +++
M plugins/trezor/plugin.py | 3 +++
M plugins/trustedcoin/trustedcoin.py | 3 +++
4 files changed, 13 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1916,7 +1916,10 @@ class Wallet(object):
if wallet_type:
for cat, t, name, loader in wallet_types:
if t == wallet_type:
- WalletClass = loader
+ if cat in ['hardware', 'twofactor']:
+ WalletClass = lambda storage: apply(loader().constructor, (storage,))
+ else:
+ WalletClass = loader
break
else:
if re.match('(\d+)of(\d+)', wallet_type):
DIR diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
t@@ -424,6 +424,9 @@ class LedgerPlugin(BasePlugin):
self.wallet = None
self.handler = None
+ def constructor(self, s):
+ return BTChipWallet(s)
+
def is_enabled(self):
if not BTCHIP:
return False
DIR diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
t@@ -158,6 +158,9 @@ class TrezorCompatiblePlugin(BasePlugin):
self.handler = None
self.client = None
+ def constructor(self, s):
+ return self.wallet_class(s)
+
def give_error(self, message):
self.print_error(message)
raise Exception(message)
DIR diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
t@@ -276,6 +276,9 @@ class TrustedCoinPlugin(BasePlugin):
BasePlugin.__init__(self, parent, config, name)
self.seed_func = lambda x: bitcoin.is_new_seed(x, SEED_PREFIX)
+ def constructor(self, s):
+ return Wallet_2fa(s)
+
def is_available(self):
return True