Merge branch 'master' into feature/raw_tx
This commit is contained in:
commit
f63f9ff900
2
electrum
2
electrum
|
@ -233,7 +233,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
if len(seed) == 128:
|
if len(seed) == 128:
|
||||||
wallet.seed = None
|
wallet.seed = None
|
||||||
wallet.sequence.master_public_key = seed
|
wallet.init_sequence(str(seed))
|
||||||
else:
|
else:
|
||||||
wallet.seed = str(seed)
|
wallet.seed = str(seed)
|
||||||
wallet.init_mpk( wallet.seed )
|
wallet.init_mpk( wallet.seed )
|
||||||
|
|
|
@ -216,6 +216,7 @@ class Wallet:
|
||||||
return self.get_private_keys([address], password).get(address)
|
return self.get_private_keys([address], password).get(address)
|
||||||
|
|
||||||
def get_private_keys(self, addresses, password):
|
def get_private_keys(self, addresses, password):
|
||||||
|
if not self.seed: return {}
|
||||||
# decode seed in any case, in order to test the password
|
# decode seed in any case, in order to test the password
|
||||||
seed = self.decode_seed(password)
|
seed = self.decode_seed(password)
|
||||||
out = {}
|
out = {}
|
||||||
|
@ -776,8 +777,9 @@ class Wallet:
|
||||||
pk_addresses.append(pk_addr)
|
pk_addresses.append(pk_addr)
|
||||||
|
|
||||||
# get all private keys at once.
|
# get all private keys at once.
|
||||||
private_keys = self.get_private_keys(pk_addresses, password)
|
if self.seed:
|
||||||
tx.sign(private_keys)
|
private_keys = self.get_private_keys(pk_addresses, password)
|
||||||
|
tx.sign(private_keys)
|
||||||
|
|
||||||
for address, x in outputs:
|
for address, x in outputs:
|
||||||
if address not in self.addressbook and not self.is_mine(address):
|
if address not in self.addressbook and not self.is_mine(address):
|
||||||
|
|
Loading…
Reference in New Issue