fix syntax of redeem_script

[electrum-nvc.git] / lib / account.py

diff --git a/lib/account.py b/lib/account.py
index 5359567..9a9d86e 100644 (file)
--- a/lib/account.py
+++ b/lib/account.py
@@ -72,28 +72,22 @@ class Account(object):
     def get_name(self, k):
         return _('Main account')
 
-    def get_keyID(self, *sequence):
-        pass
-
-    def redeem_script(self, *sequence):
-        pass
+    def redeem_script(self, for_change, n):
+        return None
 
 
 class PendingAccount(Account):
     def __init__(self, v):
-        try:
-            self.pending_pubkey = v['pending_pubkey']
-        except:
-            pass
+        self.pending_address = v['pending']
 
     def get_addresses(self, is_change):
-        return []
+        return [self.pending_address] 
 
     def has_change(self):
         return False
 
     def dump(self):
-        return {} #{'pending_pubkey':self.pending_pubkey }
+        return {'pending':self.pending_address }
 
     def get_name(self, k):
         return _('Pending account')
@@ -223,17 +217,14 @@ class OldAccount(Account):
             raise Exception('Invalid password')
         return True
 
-    def redeem_script(self, sequence):
-        return None
-
     def get_master_pubkeys(self):
         return [self.mpk.encode('hex')]
 
     def get_type(self):
         return _('Old Electrum format')
 
-    def get_xpubkeys(self, sequence):
-        s = ''.join(map(lambda x: bitcoin.int_to_hex(x,2), sequence))
+    def get_xpubkeys(self, for_change, n):
+        s = ''.join(map(lambda x: bitcoin.int_to_hex(x,2), (for_change, n)))
         mpk = self.mpk.encode('hex')
         x_pubkey = 'fe' + mpk + s
         return [ x_pubkey ]
@@ -265,7 +256,9 @@ class BIP32_Account(Account):
         return d
 
     def first_address(self):
-        return self.get_address(0,0)
+        pubkeys = self.derive_pubkeys(0, 0)
+        address = self.pubkeys_to_address(pubkeys)
+        return address
 
     def get_master_pubkeys(self):
         return [self.xpub]
@@ -300,9 +293,6 @@ class BIP32_Account(Account):
             out.append(pk)
         return out
 
-    def redeem_script(self, sequence):
-        return None
-
     def get_type(self):
         return _('Standard 1 of 1')