fix syntax of redeem_script
This commit is contained in:
parent
c0fe5962ad
commit
38e662e522
|
@ -72,11 +72,8 @@ class Account(object):
|
||||||
def get_name(self, k):
|
def get_name(self, k):
|
||||||
return _('Main account')
|
return _('Main account')
|
||||||
|
|
||||||
def get_keyID(self, *sequence):
|
def redeem_script(self, for_change, n):
|
||||||
pass
|
return None
|
||||||
|
|
||||||
def redeem_script(self, *sequence):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class PendingAccount(Account):
|
class PendingAccount(Account):
|
||||||
|
@ -220,17 +217,14 @@ class OldAccount(Account):
|
||||||
raise Exception('Invalid password')
|
raise Exception('Invalid password')
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def redeem_script(self, sequence):
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_master_pubkeys(self):
|
def get_master_pubkeys(self):
|
||||||
return [self.mpk.encode('hex')]
|
return [self.mpk.encode('hex')]
|
||||||
|
|
||||||
def get_type(self):
|
def get_type(self):
|
||||||
return _('Old Electrum format')
|
return _('Old Electrum format')
|
||||||
|
|
||||||
def get_xpubkeys(self, sequence):
|
def get_xpubkeys(self, for_change, n):
|
||||||
s = ''.join(map(lambda x: bitcoin.int_to_hex(x,2), sequence))
|
s = ''.join(map(lambda x: bitcoin.int_to_hex(x,2), (for_change, n)))
|
||||||
mpk = self.mpk.encode('hex')
|
mpk = self.mpk.encode('hex')
|
||||||
x_pubkey = 'fe' + mpk + s
|
x_pubkey = 'fe' + mpk + s
|
||||||
return [ x_pubkey ]
|
return [ x_pubkey ]
|
||||||
|
@ -299,9 +293,6 @@ class BIP32_Account(Account):
|
||||||
out.append(pk)
|
out.append(pk)
|
||||||
return out
|
return out
|
||||||
|
|
||||||
def redeem_script(self, sequence):
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_type(self):
|
def get_type(self):
|
||||||
return _('Standard 1 of 1')
|
return _('Standard 1 of 1')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue