import random
import aes
import ecdsa
+import Queue
+import time
from ecdsa.util import string_to_number, number_to_string
-from util import print_error
-from util import user_dir
-
-############ 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 #######################
-
+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
-
class Wallet:
def __init__(self, config={}):
self.config = config
self.electrum_version = ELECTRUM_VERSION
- self.update_callbacks = []
# saved fields
self.seed_version = config.get('seed_version', SEED_VERSION)
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','').decode('hex')
+ 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.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.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
if self.seed_version != SEED_VERSION:
raise ValueError("This wallet seed is deprecated. Please run upgrade.py for a diagnostic.")
-
- 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 is_up_to_date(self):
- return self.interface.responses.empty() and not self.interface.unanswered_requests
-
+ 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(':')
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()
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)
""" 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, curve = SECP256k1 )
+ 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() )
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:
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
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():
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)
'seed_version': self.seed_version,
'use_encryption': self.use_encryption,
'use_change': self.use_change,
- 'master_public_key': self.master_public_key.encode('hex'),
+ 'master_public_key': self.master_public_key,
'fee': self.fee,
'seed': self.seed,
'addresses': self.addresses,
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
+
+
git://git.novaco.in / electrum-nvc.git / blobdiff