simple payment verification: check targets, use block headers file.
[electrum-nvc.git] / lib / wallet.py
index 1812589..c3f5984 100644 (file)
@@ -26,357 +26,77 @@ import operator
 import ast
 import threading
 import random
-import getpass
 import aes
 import ecdsa
+import Queue
+import time
 
 from ecdsa.util import string_to_number, number_to_string
-from util import print_error
-
-############ functions from pywallet ##################### 
-
-addrtype = 0
-
-def hash_160(public_key):
-    try:
-        md = hashlib.new('ripemd160')
-        md.update(hashlib.sha256(public_key).digest())
-        return md.digest()
-    except:
-        import ripemd
-        md = ripemd.new(hashlib.sha256(public_key).digest())
-        return md.digest()
-
-
-def public_key_to_bc_address(public_key):
-    h160 = hash_160(public_key)
-    return hash_160_to_bc_address(h160)
-
-def hash_160_to_bc_address(h160):
-    vh160 = chr(addrtype) + h160
-    h = Hash(vh160)
-    addr = vh160 + h[0:4]
-    return b58encode(addr)
-
-def bc_address_to_hash_160(addr):
-    bytes = b58decode(addr, 25)
-    return bytes[1:21]
-
-def encode_point(pubkey, compressed=False):
-    order = generator_secp256k1.order()
-    p = pubkey.pubkey.point
-    x_str = ecdsa.util.number_to_string(p.x(), order)
-    y_str = ecdsa.util.number_to_string(p.y(), order)
-    if compressed:
-        return chr(2 + (p.y() & 1)) + x_str
-    else:
-        return chr(4) + pubkey.to_string() #x_str + y_str
-
-__b58chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
-__b58base = len(__b58chars)
-
-def b58encode(v):
-    """ encode v, which is a string of bytes, to base58."""
-
-    long_value = 0L
-    for (i, c) in enumerate(v[::-1]):
-        long_value += (256**i) * ord(c)
-
-    result = ''
-    while long_value >= __b58base:
-        div, mod = divmod(long_value, __b58base)
-        result = __b58chars[mod] + result
-        long_value = div
-    result = __b58chars[long_value] + result
-
-    # Bitcoin does a little leading-zero-compression:
-    # leading 0-bytes in the input become leading-1s
-    nPad = 0
-    for c in v:
-        if c == '\0': nPad += 1
-        else: break
-
-    return (__b58chars[0]*nPad) + result
-
-def b58decode(v, length):
-    """ decode v into a string of len bytes."""
-    long_value = 0L
-    for (i, c) in enumerate(v[::-1]):
-        long_value += __b58chars.find(c) * (__b58base**i)
-
-    result = ''
-    while long_value >= 256:
-        div, mod = divmod(long_value, 256)
-        result = chr(mod) + result
-        long_value = div
-    result = chr(long_value) + result
-
-    nPad = 0
-    for c in v:
-        if c == __b58chars[0]: nPad += 1
-        else: break
-
-    result = chr(0)*nPad + result
-    if length is not None and len(result) != length:
-        return None
-
-    return result
-
-
-def Hash(data):
-    return hashlib.sha256(hashlib.sha256(data).digest()).digest()
-
-def EncodeBase58Check(vchIn):
-    hash = Hash(vchIn)
-    return b58encode(vchIn + hash[0:4])
-
-def DecodeBase58Check(psz):
-    vchRet = b58decode(psz, None)
-    key = vchRet[0:-4]
-    csum = vchRet[-4:]
-    hash = Hash(key)
-    cs32 = hash[0:4]
-    if cs32 != csum:
-        return None
-    else:
-        return key
-
-def PrivKeyToSecret(privkey):
-    return privkey[9:9+32]
-
-def SecretToASecret(secret):
-    vchIn = chr(addrtype+128) + secret
-    return EncodeBase58Check(vchIn)
-
-def ASecretToSecret(key):
-    vch = DecodeBase58Check(key)
-    if vch and vch[0] == chr(addrtype+128):
-        return vch[1:]
-    else:
-        return False
-
-########### end pywallet functions #######################
-
-# get password routine
-def prompt_password(prompt, confirm=True):
-    if sys.stdin.isatty():
-        password = getpass.getpass(prompt)
-
-        if password and confirm:
-            password2 = getpass.getpass("Confirm: ")
-
-            if password != password2:
-                sys.exit("Error: Passwords do not match.")
-
-    else:
-        password = raw_input(prompt)
-
-    if not password:
-        password = None
-
-    return password
+from util import print_error, user_dir, format_satoshis
+from bitcoin import *
 
 # URL decode
 _ud = re.compile('%([0-9a-hA-H]{2})', re.MULTILINE)
 urldecode = lambda x: _ud.sub(lambda m: chr(int(m.group(1), 16)), x)
 
-
-def int_to_hex(i, length=1):
-    s = hex(i)[2:].rstrip('L')
-    s = "0"*(2*length - len(s)) + s
-    return s.decode('hex')[::-1].encode('hex')
-
-
-# AES
+# AES encryption
 EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s))
 DecodeAES = lambda secret, e: aes.decryptData(secret, base64.b64decode(e))
 
 
-
-# secp256k1, http://www.oid-info.com/get/1.3.132.0.10
-_p = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2FL
-_r = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141L
-_b = 0x0000000000000000000000000000000000000000000000000000000000000007L
-_a = 0x0000000000000000000000000000000000000000000000000000000000000000L
-_Gx = 0x79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798L
-_Gy = 0x483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8L
-curve_secp256k1 = ecdsa.ellipticcurve.CurveFp( _p, _a, _b )
-generator_secp256k1 = ecdsa.ellipticcurve.Point( curve_secp256k1, _Gx, _Gy, _r )
-oid_secp256k1 = (1,3,132,0,10)
-SECP256k1 = ecdsa.curves.Curve("SECP256k1", curve_secp256k1, generator_secp256k1, oid_secp256k1 ) 
-
-
-def filter(s): 
-    out = re.sub('( [^\n]*|)\n','',s)
-    out = out.replace(' ','')
-    out = out.replace('\n','')
-    return out
-
-def raw_tx( inputs, outputs, for_sig = None ):
-    s  = int_to_hex(1,4)                                     +   '     version\n' 
-    s += int_to_hex( len(inputs) )                           +   '     number of inputs\n'
-    for i in range(len(inputs)):
-        _, _, p_hash, p_index, p_script, pubkey, sig = inputs[i]
-        s += p_hash.decode('hex')[::-1].encode('hex')        +  '     prev hash\n'
-        s += int_to_hex(p_index,4)                           +  '     prev index\n'
-        if for_sig is None:
-            sig = sig + chr(1)                               # hashtype
-            script  = int_to_hex( len(sig))                  +  '     push %d bytes\n'%len(sig)
-            script += sig.encode('hex')                      +  '     sig\n'
-            pubkey = chr(4) + pubkey
-            script += int_to_hex( len(pubkey))               +  '     push %d bytes\n'%len(pubkey)
-            script += pubkey.encode('hex')                   +  '     pubkey\n'
-        elif for_sig==i:
-            script = p_script                                +  '     scriptsig \n'
-        else:
-            script=''
-        s += int_to_hex( len(filter(script))/2 )             +  '     script length \n'
-        s += script
-        s += "ffffffff"                                      +  '     sequence\n'
-    s += int_to_hex( len(outputs) )                          +  '     number of outputs\n'
-    for output in outputs:
-        addr, amount = output
-        s += int_to_hex( amount, 8)                          +  '     amount: %d\n'%amount 
-        script = '76a9'                                      # op_dup, op_hash_160
-        script += '14'                                       # push 0x14 bytes
-        script += bc_address_to_hash_160(addr).encode('hex')
-        script += '88ac'                                     # op_equalverify, op_checksig
-        s += int_to_hex( len(filter(script))/2 )             +  '     script length \n'
-        s += script                                          +  '     script \n'
-    s += int_to_hex(0,4)                                     # lock time
-    if for_sig is not None: s += int_to_hex(1, 4)            # hash type
-    return s
-
-
-
-
-def format_satoshis(x, is_diff=False, num_zeros = 0):
-    from decimal import Decimal
-    s = Decimal(x)
-    sign, digits, exp = s.as_tuple()
-    digits = map(str, digits)
-    while len(digits) < 9:
-        digits.insert(0,'0')
-    digits.insert(-8,'.')
-    s = ''.join(digits).rstrip('0')
-    if sign: 
-        s = '-' + s
-    elif is_diff:
-        s = "+" + s
-
-    p = s.find('.')
-    s += "0"*( 1 + num_zeros - ( len(s) - p ))
-    s += " "*( 9 - ( len(s) - p ))
-    s = " "*( 5 - ( p )) + s
-    return s
-
-
 from version import ELECTRUM_VERSION, SEED_VERSION
-from interface import DEFAULT_SERVERS
-
-
 
 
 class Wallet:
-    def __init__(self):
+    def __init__(self, config={}):
 
+        self.config = config
         self.electrum_version = ELECTRUM_VERSION
-        self.seed_version = SEED_VERSION
-        self.update_callbacks = []
-
-        self.gap_limit = 5           # configuration
-        self.use_change = True
-        self.fee = 100000
-        self.num_zeros = 0
-        self.master_public_key = ''
-        self.conversion_currency = None
-        self.theme = "Cleanlook"
 
         # saved fields
-        self.use_encryption = False
-        self.addresses = []          # receiving addresses visible for user
-        self.change_addresses = []   # addresses used as change
-        self.seed = ''               # encrypted
-        self.history = {}
-        self.labels = {}             # labels for addresses and transactions
-        self.aliases = {}            # aliases for addresses
-        self.authorities = {}        # trusted addresses
-        self.frozen_addresses = []
-        self.prioritized_addresses = []
-        self.expert_mode = False
-        
-        self.receipts = {}           # signed URIs
-        self.receipt = None          # next receipt
-        self.addressbook = []        # outgoing addresses, for payments
-        self.debug_server = False    # write server communication debug info to stdout
+        self.seed_version          = config.get('seed_version', SEED_VERSION)
+        self.gap_limit             = config.get('gap_limit', 5)
+        self.use_change            = config.get('use_change',True)
+        self.fee                   = int(config.get('fee',100000))
+        self.num_zeros             = int(config.get('num_zeros',0))
+        self.master_public_key     = config.get('master_public_key','')
+        self.use_encryption        = config.get('use_encryption', False)
+        self.addresses             = config.get('addresses', [])          # receiving addresses visible for user
+        self.change_addresses      = config.get('change_addresses', [])   # addresses used as change
+        self.seed                  = config.get('seed', '')               # encrypted
+        self.history               = config.get('history',{})
+        self.labels                = config.get('labels',{})              # labels for addresses and transactions
+        self.aliases               = config.get('aliases', {})            # aliases for addresses
+        self.authorities           = config.get('authorities', {})        # trusted addresses
+        self.frozen_addresses      = config.get('frozen_addresses',[])
+        self.prioritized_addresses = config.get('prioritized_addresses',[])
+        self.receipts              = config.get('receipts',{})            # signed URIs
+        self.addressbook           = config.get('contacts', [])           # outgoing addresses, for payments
+        self.imported_keys         = config.get('imported_keys',{})
 
         # not saved
+        self.receipt = None          # next receipt
         self.tx_history = {}
-
-        self.imported_keys = {}
-        self.remote_url = None
-
         self.was_updated = True
         self.blocks = -1
         self.banner = ''
 
-        # there is a difference between self.up_to_date and self.is_up_to_date()
-        # self.is_up_to_date() returns true when all requests have been answered and processed
-        # self.up_to_date is true when the wallet is synchronized (stronger requirement)
+        # there is a difference between wallet.up_to_date and interface.is_up_to_date()
+        # interface.is_up_to_date() returns true when all requests have been answered and processed
+        # wallet.up_to_date is true when the wallet is synchronized (stronger requirement)
         self.up_to_date_event = threading.Event()
         self.up_to_date_event.clear()
         self.up_to_date = False
         self.lock = threading.Lock()
         self.tx_event = threading.Event()
 
-        self.pick_random_server()
-
-    def register_callback(self, update_callback):
-        with self.lock:
-            self.update_callbacks.append(update_callback)
-
-    def trigger_callbacks(self):
-        with self.lock:
-            callbacks = self.update_callbacks[:]
-        [update() for update in callbacks]
-
-    def pick_random_server(self):
-        self.server = random.choice( DEFAULT_SERVERS )         # random choice when the wallet is created
-
-    def is_up_to_date(self):
-        return self.interface.responses.empty() and not self.interface.unanswered_requests
-
-    def set_server(self, server):
-        # raise an error if the format isnt correct
-        a,b,c = server.split(':')
-        b = int(b)
-        assert c in ['t', 'h', 'n']
-        # set the server
-        if server != self.server:
-            self.server = server
-            self.save()
-            self.interface.is_connected = False  # this exits the polling loop
-            self.interface.poke()
+        self.update_tx_history()
+        if self.seed_version != SEED_VERSION:
+            raise ValueError("This wallet seed is deprecated. Please run upgrade.py for a diagnostic.")
 
-    def set_path(self, wallet_path):
-        """Set the path of the wallet."""
-        if wallet_path is not None:
-            self.path = wallet_path
-            return
-        # Look for wallet file in the default data directory.
-        # Keeps backwards compatibility.
-        if "HOME" in os.environ:
-            wallet_dir = os.path.join(os.environ["HOME"], ".electrum")
-        elif "LOCALAPPDATA" in os.environ:
-            wallet_dir = os.path.join(os.environ["LOCALAPPDATA"], "Electrum")
-        elif "APPDATA" in os.environ:
-            wallet_dir = os.path.join(os.environ["APPDATA"], "Electrum")
-        else:
-            raise BaseException("No home directory found in environment variables.")
-        # Make wallet directory if it does not yet exist.
-        if not os.path.exists(wallet_dir):
-            os.mkdir(wallet_dir)
-        self.path = os.path.join(wallet_dir, "electrum.dat")
+    def init_up_to_date(self):
+        self.up_to_date_event.clear()
+        self.up_to_date = False
 
     def import_key(self, keypair, password):
         address, key = keypair.split(':')
@@ -395,6 +115,7 @@ class Wallet:
             raise BaseException('Address does not match private key')
         self.imported_keys[address] = self.pw_encode( key, password )
 
+
     def new_seed(self, password):
         seed = "%032x"%ecdsa.util.randrange( pow(2,128) )
         #self.init_mpk(seed)
@@ -407,7 +128,7 @@ class Wallet:
         curve = SECP256k1
         secexp = self.stretch_key(seed)
         master_private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
-        self.master_public_key = master_private_key.get_verifying_key().to_string()
+        self.master_public_key = master_private_key.get_verifying_key().to_string().encode('hex')
 
     def all_addresses(self):
         return self.addresses + self.change_addresses + self.imported_keys.keys()
@@ -434,7 +155,7 @@ class Wallet:
         return string_to_number( seed )
 
     def get_sequence(self,n,for_change):
-        return string_to_number( Hash( "%d:%d:"%(n,for_change) + self.master_public_key ) )
+        return string_to_number( Hash( "%d:%d:"%(n,for_change) + self.master_public_key.decode('hex') ) )
 
     def get_private_key_base58(self, address, password):
         pk = self.get_private_key(address, password)
@@ -535,23 +256,26 @@ class Wallet:
     
 
     def create_new_address(self, for_change):
-        """   Publickey(type,n) = Master_public_key + H(n|S|type)*point  """
-        curve = SECP256k1
         n = len(self.change_addresses) if for_change else len(self.addresses)
-        z = self.get_sequence(n,for_change)
-        master_public_key = ecdsa.VerifyingKey.from_string( self.master_public_key, curve = SECP256k1 )
-        pubkey_point = master_public_key.pubkey.point + z*curve.generator
-        public_key2 = ecdsa.VerifyingKey.from_public_point( pubkey_point, curve = SECP256k1 )
-        address = public_key_to_bc_address( '04'.decode('hex') + public_key2.to_string() )
+        address = self.get_new_address(n, for_change)
         if for_change:
             self.change_addresses.append(address)
         else:
             self.addresses.append(address)
-
         self.history[address] = []
+        return address
+        
+    def get_new_address(self, n, for_change):
+        """   Publickey(type,n) = Master_public_key + H(n|S|type)*point  """
+        curve = SECP256k1
+        z = self.get_sequence(n, for_change)
+        master_public_key = ecdsa.VerifyingKey.from_string( self.master_public_key.decode('hex'), curve = SECP256k1 )
+        pubkey_point = master_public_key.pubkey.point + z*curve.generator
+        public_key2 = ecdsa.VerifyingKey.from_public_point( pubkey_point, curve = SECP256k1 )
+        address = public_key_to_bc_address( '04'.decode('hex') + public_key2.to_string() )
         print address
         return address
-
+                                                                      
 
     def change_gap_limit(self, value):
         if value >= self.gap_limit:
@@ -616,26 +340,9 @@ class Wallet:
             else:
                 new_addresses.append( self.create_new_address(False) )
 
-        if self.remote_url:
-            num = self.get_remote_number()
-            while len(self.addresses)<num:
-                new_addresses.append( self.create_new_address(False) )
-
         return new_addresses
 
 
-    def get_remote_number(self):
-        import jsonrpclib
-        server = jsonrpclib.Server(self.remote_url)
-        out = server.getnum()
-        return out
-
-    def get_remote_mpk(self):
-        import jsonrpclib
-        server = jsonrpclib.Server(self.remote_url)
-        out = server.getkey()
-        return out
-
     def is_found(self):
         return (len(self.change_addresses) > 1 ) or ( len(self.addresses) > self.gap_limit )
 
@@ -649,93 +356,6 @@ class Wallet:
         self.update_tx_labels()
 
 
-    def save(self):
-        # TODO: Need special config storage class. Should not be mixed
-        # up with the wallet.
-        # Settings should maybe be stored in a flat ini file.
-        s = {
-            'seed_version': self.seed_version,
-            'use_encryption': self.use_encryption,
-            'use_change': self.use_change,
-            'master_public_key': self.master_public_key.encode('hex'),
-            'fee': self.fee,
-            'server': self.server,
-            'seed': self.seed,
-            'addresses': self.addresses,
-            'change_addresses': self.change_addresses,
-            'history': self.history, 
-            'labels': self.labels,
-            'contacts': self.addressbook,
-            'imported_keys': self.imported_keys,
-            'aliases': self.aliases,
-            'authorities': self.authorities,
-            'receipts': self.receipts,
-            'num_zeros': self.num_zeros,
-            'frozen_addresses': self.frozen_addresses,
-            'prioritized_addresses': self.prioritized_addresses,
-            'expert_mode': self.expert_mode,
-            'gap_limit': self.gap_limit,
-            'debug_server': self.debug_server,
-            'conversion_currency': self.conversion_currency,
-            'theme': self.theme
-        }
-        f = open(self.path,"w")
-        f.write( repr(s) )
-        f.close()
-        import stat
-        os.chmod(self.path,stat.S_IREAD | stat.S_IWRITE)
-
-    def read(self):
-        """Read the contents of the wallet file."""
-        import interface
-
-        self.file_exists = False
-        try:
-            with open(self.path, "r") as f:
-                data = f.read()
-        except IOError:
-            return
-        try:
-            d = ast.literal_eval( data )  #parse raw data from reading wallet file
-            interface.old_to_new(d)
-            
-            self.seed_version = d.get('seed_version')
-            self.master_public_key = d.get('master_public_key').decode('hex')
-            self.use_encryption = d.get('use_encryption')
-            self.use_change = bool(d.get('use_change', True))
-            self.fee = int(d.get('fee'))
-            self.seed = d.get('seed')
-            self.server = d.get('server')
-            self.addresses = d.get('addresses')
-            self.change_addresses = d.get('change_addresses')
-            self.history = d.get('history')
-            self.labels = d.get('labels')
-            self.addressbook = d.get('contacts')
-            self.imported_keys = d.get('imported_keys', {})
-            self.aliases = d.get('aliases', {})
-            self.authorities = d.get('authorities', {})
-            self.receipts = d.get('receipts', {})
-            self.num_zeros = d.get('num_zeros', 0)
-            self.frozen_addresses = d.get('frozen_addresses', [])
-            self.prioritized_addresses = d.get('prioritized_addresses', [])
-            self.expert_mode = d.get('expert_mode', False)
-            self.gap_limit = d.get('gap_limit', 5)
-            self.debug_server = d.get('debug_server', False)
-            self.conversion_currency = d.get('conversion_currency', 'USD')
-            self.theme = d.get('theme', 'Cleanlook')
-        except:
-            raise IOError("Cannot read wallet file.")
-
-        self.update_tx_history()
-
-        if self.seed_version != SEED_VERSION:
-            raise ValueError("This wallet seed is deprecated. Please run upgrade.py for a diagnostic.")
-
-        if self.remote_url: assert self.master_public_key.encode('hex') == self.get_remote_mpk()
-
-        self.file_exists = True
-
-
     def get_address_flags(self, addr):
         flags = "C" if self.is_change(addr) else "I" if addr in self.imported_keys.keys() else "-" 
         flags += "F" if addr in self.frozen_addresses else "P" if addr in self.prioritized_addresses else "-"
@@ -854,7 +474,8 @@ class Wallet:
             return s
 
     def get_status(self, address):
-        h = self.history.get(address)
+        with self.lock:
+            h = self.history.get(address)
         if not h:
             status = None
         else:
@@ -864,11 +485,6 @@ class Wallet:
                 status = status + ':%d'% len(h)
         return status
 
-    def receive_status_callback(self, addr, status):
-        with self.lock:
-            if self.get_status(addr) != status:
-                #print "updating status for", addr, status
-                self.interface.get_history(addr)
 
     def receive_history_callback(self, addr, data): 
         #print "updating history for", addr
@@ -878,10 +494,26 @@ class Wallet:
             self.save()
 
     def get_tx_history(self):
-        lines = self.tx_history.values()
+        with self.lock:
+            lines = self.tx_history.values()
         lines = sorted(lines, key=operator.itemgetter("timestamp"))
         return lines
 
+    def get_tx_hashes(self):
+        with self.lock:
+            hashes = self.tx_history.keys()
+        return hashes
+
+    def get_transactions_at_height(self, height):
+        with self.lock:
+            values = self.tx_history.values()[:]
+
+        out = []
+        for tx in values:
+            if tx['height'] == height:
+                out.append(tx['tx_hash'])
+        return out
+
     def update_tx_history(self):
         self.tx_history= {}
         for addr in self.all_addresses():
@@ -953,10 +585,19 @@ class Wallet:
         return tx
 
     def sendtx(self, tx):
-        tx_hash = Hash(tx.decode('hex') )[::-1].encode('hex')
+        # synchronous
+        h = self.send_tx(tx)
+        self.tx_event.wait()
+        self.receive_tx(h)
+
+    def send_tx(self, tx):
+        # asynchronous
         self.tx_event.clear()
+        tx_hash = Hash(tx.decode('hex') )[::-1].encode('hex')
         self.interface.send([('blockchain.transaction.broadcast', [tx])])
-        self.tx_event.wait()
+        return tx_hash
+
+    def receive_tx(self,tx_hash):
         out = self.tx_result 
         if out != tx_hash:
             return False, "error: " + out
@@ -973,9 +614,9 @@ class Wallet:
         m1 = re.match('([\w\-\.]+)@((\w[\w\-]+\.)+[\w\-]+)', alias)
         m2 = re.match('((\w[\w\-]+\.)+[\w\-]+)', alias)
         if m1:
-            url = 'http://' + m1.group(2) + '/bitcoin.id/' + m1.group(1) 
+            url = 'https://' + m1.group(2) + '/bitcoin.id/' + m1.group(1) 
         elif m2:
-            url = 'http://' + alias + '/bitcoin.id'
+            url = 'https://' + alias + '/bitcoin.id'
         else:
             return ''
         try:
@@ -1112,21 +753,15 @@ class Wallet:
 
 
     def update(self):
-        self.interface.poke()
+        self.interface.poke('synchronizer')
         self.up_to_date_event.wait(10000000000)
 
 
-    def start_session(self, interface):
-        self.interface = interface
-        self.interface.send([('server.banner',[]), ('blockchain.numblocks.subscribe',[]), ('server.peers.subscribe',[])])
-        self.interface.subscribe(self.all_addresses())
-
-
     def freeze(self,addr):
         if addr in self.all_addresses() and addr not in self.frozen_addresses:
             self.unprioritize(addr)
             self.frozen_addresses.append(addr)
-            self.save()
+            self.config.set_key('frozen_addresses', self.frozen_addresses, True)
             return True
         else:
             return False
@@ -1134,7 +769,7 @@ class Wallet:
     def unfreeze(self,addr):
         if addr in self.all_addresses() and addr in self.frozen_addresses:
             self.frozen_addresses.remove(addr)
-            self.save()
+            self.config.set_key('frozen_addresses', self.frozen_addresses, True)
             return True
         else:
             return False
@@ -1143,7 +778,7 @@ class Wallet:
         if addr in self.all_addresses() and addr not in self.prioritized_addresses:
             self.unfreeze(addr)
             self.prioritized_addresses.append(addr)
-            self.save()
+            self.config.set_key('prioritized_addresses', self.prioritized_addresses, True)
             return True
         else:
             return False
@@ -1151,7 +786,157 @@ class Wallet:
     def unprioritize(self,addr):
         if addr in self.all_addresses() and addr in self.prioritized_addresses:
             self.prioritized_addresses.remove(addr)
-            self.save()
+            self.config.set_key('prioritized_addresses', self.prioritized_addresses, True)
             return True
         else:
             return False
+
+    def save(self):
+        s = {
+            'seed_version': self.seed_version,
+            'use_encryption': self.use_encryption,
+            'use_change': self.use_change,
+            'master_public_key': self.master_public_key,
+            'fee': self.fee,
+            'seed': self.seed,
+            'addresses': self.addresses,
+            'change_addresses': self.change_addresses,
+            'history': self.history, 
+            'labels': self.labels,
+            'contacts': self.addressbook,
+            'imported_keys': self.imported_keys,
+            'aliases': self.aliases,
+            'authorities': self.authorities,
+            'receipts': self.receipts,
+            'num_zeros': self.num_zeros,
+            'frozen_addresses': self.frozen_addresses,
+            'prioritized_addresses': self.prioritized_addresses,
+            'gap_limit': self.gap_limit,
+        }
+        for k, v in s.items():
+            self.config.set_key(k,v)
+        self.config.save()
+
+
+
+
+
+
+class WalletSynchronizer(threading.Thread):
+
+
+    def __init__(self, wallet, config):
+        threading.Thread.__init__(self)
+        self.daemon = True
+        self.wallet = wallet
+        self.interface = self.wallet.interface
+        self.interface.register_channel('synchronizer')
+        self.wallet.interface.register_callback('connected', self.wallet.init_up_to_date)
+        self.wallet.interface.register_callback('connected', lambda: self.interface.send([('server.banner',[])],'synchronizer') )
+
+    def synchronize_wallet(self):
+        new_addresses = self.wallet.synchronize()
+        if new_addresses:
+            self.subscribe_to_addresses(new_addresses)
+            
+        if self.interface.is_up_to_date('synchronizer'):
+            if not self.wallet.up_to_date:
+                self.wallet.up_to_date = True
+                self.wallet.was_updated = True
+                self.wallet.up_to_date_event.set()
+        else:
+            if self.wallet.up_to_date:
+                self.wallet.up_to_date = False
+                self.wallet.was_updated = True
+
+
+
+    def subscribe_to_addresses(self, addresses):
+        messages = []
+        for addr in addresses:
+            messages.append(('blockchain.address.subscribe', [addr]))
+        self.interface.send( messages, 'synchronizer')
+
+
+    def run(self):
+
+        # wait until we are connected, in case the user is not connected
+        while not self.interface.is_connected:
+            time.sleep(1)
+        
+        # request banner, because 'connected' event happens before this thread is started
+        self.interface.send([('server.banner',[])],'synchronizer')
+
+        # subscriptions
+        self.interface.send([('blockchain.numblocks.subscribe',[])], 'synchronizer')
+        self.interface.send([('server.peers.subscribe',[])],'synchronizer')
+        self.subscribe_to_addresses(self.wallet.all_addresses())
+
+        while True:
+            # 1. send new requests
+            self.synchronize_wallet()
+
+            if self.wallet.was_updated:
+                self.interface.trigger_callback('updated')
+                self.wallet.was_updated = False
+
+            # 2. get a response
+            r = self.interface.get_response('synchronizer')
+            if not r: continue
+
+            # 3. handle response
+            method = r['method']
+            params = r['params']
+            result = r['result']
+
+            if method == 'blockchain.address.subscribe':
+                addr = params[0]
+                if self.wallet.get_status(addr) != result:
+                    self.interface.send([('blockchain.address.get_history', [address] )])
+                            
+            elif method == 'blockchain.address.get_history':
+                addr = params[0]
+                self.wallet.receive_history_callback(addr, result)
+                self.wallet.was_updated = True
+
+            elif method == 'blockchain.transaction.broadcast':
+                self.wallet.tx_result = result
+                self.wallet.tx_event.set()
+
+            elif method == 'blockchain.numblocks.subscribe':
+                self.wallet.blocks = result
+                self.wallet.was_updated = True
+
+            elif method == 'server.version':
+                pass
+
+            elif method == 'server.peers.subscribe':
+                servers = []
+                for item in result:
+                    s = []
+                    host = item[1]
+                    ports = []
+                    version = None
+                    if len(item) > 2:
+                        for v in item[2]:
+                            if re.match("[stgh]\d+", v):
+                                ports.append((v[0], v[1:]))
+                            if re.match("v(.?)+", v):
+                                version = v[1:]
+                    if ports and version:
+                        servers.append((host, ports))
+                self.interface.servers = servers
+                self.interface.trigger_callback('peers')
+
+            elif method == 'server.banner':
+                self.wallet.banner = result
+                self.wallet.was_updated = True
+
+            else:
+                print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
+
+            if self.wallet.was_updated:
+                self.interface.trigger_callback('updated')
+                self.wallet.was_updated = False
+
+