Browse Source

Revert "Fix MultiSig wallet creation."

This reverts commit 21038843ea.
283
ThomasV 9 years ago
parent
commit
90a2fc1379
  1. 5
      lib/wallet.py
  2. 6
      lib/wizard.py

5
lib/wallet.py

@ -1817,6 +1817,11 @@ class Multisig_Wallet(BIP32_Wallet, Mnemonic):
def get_master_public_keys(self):
return self.master_public_keys
def get_action(self):
for i in range(self.n):
if self.master_public_keys.get("x%d/"%(i+1)) is None:
return 'create_seed' if i == 0 else 'add_cosigners'
class OldWallet(Deterministic_Wallet):
wallet_type = 'old'

6
lib/wizard.py

@ -19,7 +19,7 @@
from electrum import WalletStorage
from electrum.plugins import run_hook
from util import PrintError
from wallet import Wallet, Multisig_Wallet
from wallet import Wallet
from i18n import _
MSG_GENERATING_WAIT = _("Electrum is generating your addresses, please wait...")
@ -264,14 +264,12 @@ class WizardBase(PrintError):
def create_seed(self, wallet):
'''The create_seed action creates a seed and then generates
wallet account(s) whilst we still have the password.'''
wallet account(s).'''
seed = wallet.make_seed(self.language_for_seed)
self.show_and_verify_seed(seed)
password = self.request_password()
wallet.add_seed(seed, password)
wallet.create_master_keys(password)
if isinstance(wallet, Multisig_Wallet):
self.add_cosigners(wallet)
wallet.create_main_account(password)
def add_cosigners(self, wallet):

Loading…
Cancel
Save