parse_scriptSig

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

diff --git a/lib/account.py b/lib/account.py
index c4cfa6a..3ef6400 100644 (file)
--- a/lib/account.py
+++ b/lib/account.py
@@ -71,7 +71,7 @@ class PendingAccount(Account):
     def dump(self):
         return {'pending':self.addresses[0]}
 
-    def get_name(self):
+    def get_name(self, k):
         return _('Pending account')
 
 
@@ -86,7 +86,7 @@ class ImportedAccount(Account):
         for_change, i = sequence
         assert for_change == 0
         addr = self.get_addresses(0)[i]
-        return self.keypairs[addr][i][0]
+        return self.keypairs[addr][0]
 
     def get_private_key(self, sequence, wallet, password):
         from wallet import pw_decode
@@ -197,14 +197,14 @@ class OldAccount(Account):
         return None
 
     def get_master_pubkeys(self):
-        return [self.mpk]
+        return [self.mpk.encode('hex')]
 
     def get_type(self):
         return _('Old Electrum format')
 
     def get_keyID(self, sequence):
         a, b = sequence
-        return 'old(%s,%d,%d)'%(self.mpk,a,b)
+        return 'old(%s,%d,%d)'%(self.mpk.encode('hex'),a,b)