AaronFiore/electrum
1
0
Fork 0
Code Activity

init plugins before gui. register wallet types in plugin constructor

Browse Source
This commit is contained in:
ThomasV
2014-08-31 15:33:20 +02:00
parent 337a20b815
commit 79588eb4da
12 changed files with 63 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/plugins.py
View File

@@ -6,7 +6,7 @@ from i18n import _
plugins = []
def init_plugins(self):
def init_plugins(config):
import imp, pkgutil, __builtin__, os
global plugins
@@ -23,7 +23,7 @@ def init_plugins(self):
for name, p in zip(plugin_names, plugin_modules):
try:
plugins.append( p.Plugin(self, name) )
plugins.append( p.Plugin(config, name) )
except Exception:
print_msg(_("Error: cannot initialize plugin"),p)
traceback.print_exc(file=sys.stdout)
@@ -61,10 +61,9 @@ def run_hook(name, *args):
class BasePlugin:
def __init__(self, gui, name):
self.gui = gui
def __init__(self, config, name):
self.name = name
self.config = gui.config
self.config = config
# add self to hooks
for k in dir(self):
if k in hook_names:

32
lib/wallet.py
View File

@@ -1559,6 +1559,17 @@ class OldWallet(Deterministic_Wallet):
return True
return False
wallet_types = [
('old', ("Old wallet"), OldWallet),
('xpub', ("BIP32 Import"), BIP32_Simple_Wallet),
('standard', ("Standard wallet"), NewWallet),
('imported', ("Imported wallet"), Imported_Wallet),
('2of2', ("Multisig wallet (2 of 2)"), Wallet_2of2),
('2of3', ("Multisig wallet (2 of 3)"), Wallet_2of3)
]
# former WalletFactory
class Wallet(object):
"""The main wallet "entry point".
@@ -1568,19 +1579,14 @@ class Wallet(object):
def __new__(self, storage):
config = storage.config
self.wallet_types = [
('old', ("Old wallet"), OldWallet),
('xpub', ("BIP32 Import"), BIP32_Simple_Wallet),
('standard', ("Standard wallet"), NewWallet),
('imported', ("Imported wallet"), Imported_Wallet),
('2of2', ("Multisig wallet (2 of 2)"), Wallet_2of2),
('2of3', ("Multisig wallet (2 of 3)"), Wallet_2of3)
]
run_hook('add_wallet_types', self.wallet_types)
for t, l, WalletClass in self.wallet_types:
if t == storage.get('wallet_type'):
return WalletClass(storage)
run_hook('add_wallet_types', wallet_types)
wallet_type = storage.get('wallet_type')
if wallet_type:
for t, l, WalletClass in wallet_types:
if t == wallet_type:
return WalletClass(storage)
else:
raise BaseException('unknown wallet type', wallet_type)
if not storage.file_exists:
seed_version = NEW_SEED_VERSION