# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import sys
+import base64
+import os
+import re
+import hashlib
+import copy
+import operator
+import ast
+import threading
+import random
+import getpass
+import aes
+import ecdsa
-import sys, base64, os, re, hashlib, copy, operator, ast, threading, random
-import aes, ecdsa
from ecdsa.util import string_to_number, number_to_string
+from util import print_error
+from util import user_dir
############ functions from pywallet #####################
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.
- """
+ """ encode v, which is a string of bytes, to base58."""
long_value = 0L
for (i, c) in enumerate(v[::-1]):
return (__b58chars[0]*nPad) + result
def b58decode(v, length):
- """ decode v into a string of len bytes
- """
+ """ 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)
########### 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
+
# 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)
from version import ELECTRUM_VERSION, SEED_VERSION
-from interface import DEFAULT_SERVERS
-
class Wallet:
- def __init__(self, gui_callback = lambda: None):
+ def __init__(self, config={}):
+ self.config = config
self.electrum_version = ELECTRUM_VERSION
- self.seed_version = SEED_VERSION
- self.gui_callback = gui_callback
-
- self.gap_limit = 5 # configuration
- self.fee = 100000
- self.num_zeros = 0
- self.master_public_key = ''
+ self.update_callbacks = []
# 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.receipts = {} # signed URIs
- self.receipt = None # next receipt
- self.addressbook = [] # outgoing addresses, for payments
+ 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','').decode('hex')
+ 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 = ''
self.lock = threading.Lock()
self.tx_event = threading.Event()
- self.pick_random_server()
+ 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 register_callback(self, update_callback):
+ with self.lock:
+ self.update_callbacks.append(update_callback)
- def pick_random_server(self):
- self.server = random.choice( DEFAULT_SERVERS ) # random choice when the wallet is created
+ 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 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()
-
- def set_path(self, wallet_path):
-
- if wallet_path is not None:
- self.path = wallet_path
- else:
- # backward compatibility: look for wallet file in the default data directory
- 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.")
-
- if not os.path.exists( wallet_dir ): os.mkdir( wallet_dir )
- self.path = os.path.join( wallet_dir, 'electrum.dat' )
def import_key(self, keypair, password):
address, key = keypair.split(':')
if address in self.all_addresses():
raise BaseException('Address already in wallet')
b = ASecretToSecret( key )
- if not b: return False
+ if not b:
+ raise BaseException('Unsupported key format')
secexp = int( b.encode('hex'), 16)
private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve=SECP256k1 )
# sanity check
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)
continue
else:
raise BaseException("error: cannot sign message")
-
-
+
+
def verify_message(self, address, signature, message):
""" See http://www.secg.org/download/aid-780/sec1-v2.pdf for the math """
from ecdsa import numbertheory, ellipticcurve, util
sig = base64.b64decode(signature)
if len(sig) != 65: raise BaseException("Wrong encoding")
r,s = util.sigdecode_string(sig[1:], order)
- recid = ord(sig[0]) - 27
+ nV = ord(sig[0])
+ if nV < 27 or nV >= 35:
+ raise BaseException("Bad encoding")
+ if nV >= 31:
+ compressed = True
+ nV -= 4
+ else:
+ compressed = False
+
+ recid = nV - 27
# 1.1
x = r + (recid/2) * order
# 1.3
# check that Q is the public key
public_key.verify_digest( sig[1:], h, sigdecode = ecdsa.util.sigdecode_string)
# check that we get the original signing address
- addr = public_key_to_bc_address( '04'.decode('hex') + public_key.to_string() )
- # print addr
+ addr = public_key_to_bc_address( encode_point(public_key, compressed) )
if address != addr:
- print "bad signature"
raise BaseException("Bad signature")
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, 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:
+ self.gap_limit = value
+ self.save()
+ self.interface.poke()
+ return True
+
+ elif value >= self.min_acceptable_gap():
+ k = self.num_unused_trailing_addresses()
+ n = len(self.addresses) - k + value
+ self.addresses = self.addresses[0:n]
+ self.gap_limit = value
+ self.save()
+ return True
+ else:
+ return False
+
+ def num_unused_trailing_addresses(self):
+ k = 0
+ for a in self.addresses[::-1]:
+ if self.history.get(a):break
+ k = k + 1
+ return k
+
+ def min_acceptable_gap(self):
+ # fixme: this assumes wallet is synchronized
+ n = 0
+ nmax = 0
+ k = self.num_unused_trailing_addresses()
+ for a in self.addresses[0:-k]:
+ if self.history.get(a):
+ n = 0
+ else:
+ n += 1
+ if n > nmax: nmax = n
+ return nmax + 1
def synchronize(self):
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 )
self.update_tx_labels()
- def save(self):
- s = {
- 'seed_version':self.seed_version,
- 'use_encryption':self.use_encryption,
- '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,
- }
- f = open(self.path,"w")
- f.write( repr(s) )
- f.close()
-
- def read(self):
- import interface
-
- upgrade_msg = """This wallet seed is deprecated. Please run upgrade.py for a diagnostic."""
- self.file_exists = False
- try:
- f = open(self.path,"r")
- data = f.read()
- f.close()
- except:
- return
- data = interface.old_to_new(data)
- try:
- d = ast.literal_eval( data )
- 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.fee = int( d.get('fee') )
- self.seed = d.get('seed')
- self.server = d.get('server')
- #blocks = d.get('blocks')
- 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',[])
- except:
- raise BaseException("cannot read wallet file")
-
- self.update_tx_history()
-
- if self.seed_version != SEED_VERSION:
- raise BaseException(upgrade_msg)
-
- 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 "-"
+ return flags
def get_addr_balance(self, addr):
coins = sorted( coins, key = lambda x: x[1]['timestamp'] )
- for addr in prioritized_addresses:
+ for addr in self.prioritized_addresses:
h = self.history.get(addr)
if h is None: continue
for item in h:
fee = self.fee*len(inputs) if fixed_fee is None else fixed_fee
if total >= amount + fee: break
else:
- #print "not enough funds: %d %d"%(total, fee)
+ #print "not enough funds: %s %s"%(format_satoshis(total), format_satoshis(fee))
inputs = []
return inputs, total, fee
try:
d.decode('hex')
except:
- raise BaseException("Invalid password")
+ raise ValueError("Invalid password")
return d
else:
return s
default_label = ''
if tx['value']<0:
for o_addr in tx['outputs']:
- if not self.is_change(o_addr):
- dest_label = self.labels.get(o_addr)
- if dest_label:
- default_label = 'to: ' + dest_label
- else:
- default_label = 'to: ' + o_addr
+ if not self.is_mine(o_addr):
+ try:
+ default_label = self.labels[o_addr]
+ except KeyError:
+ default_label = o_addr
else:
for o_addr in tx['outputs']:
if self.is_mine(o_addr) and not self.is_change(o_addr):
if o_addr:
dest_label = self.labels.get(o_addr)
- if dest_label:
- default_label = 'at: ' + dest_label
- else:
- default_label = 'at: ' + o_addr
+ try:
+ default_label = self.labels[o_addr]
+ except KeyError:
+ default_label = o_addr
tx['default_label'] = default_label
def mktx(self, to_address, amount, label, password, fee=None, change_addr=None, from_addr= None):
if not self.is_valid(to_address):
- raise BaseException("Invalid address")
+ raise ValueError("Invalid address")
inputs, total, fee = self.choose_tx_inputs( amount, fee, from_addr )
if not inputs:
- raise BaseException("Not enough funds")
+ raise ValueError("Not enough funds")
+
+ if not self.use_change and not change_addr:
+ change_addr = inputs[0][0]
+ print "Sending change to", change_addr
+
outputs = self.choose_tx_outputs( to_address, amount, fee, total, change_addr )
s_inputs = self.sign_inputs( inputs, outputs, password )
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:
self.verify_message(previous, signature, "alias:%s:%s"%(alias,target))
if not self.is_valid(target):
- raise BaseException("Invalid bitcoin address")
+ raise ValueError("Invalid bitcoin address")
return target, signing_addr, auth_name
else:
print k,v
+ if label and self.labels.get(address) != label:
+ if question('Give label "%s" to address %s ?'%(label,address)):
+ if address not in self.addressbook and address not in self.all_addresses():
+ self.addressbook.append(address)
+ self.labels[address] = label
+
if signature:
if re.match('^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$', identity):
signing_address = self.get_alias(identity, True, show_message, question)
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()
+ return True
+ else:
+ return False
+
+ def unfreeze(self,addr):
+ if addr in self.all_addresses() and addr in self.frozen_addresses:
+ self.frozen_addresses.remove(addr)
+ self.save()
+ return True
+ else:
+ return False
+
+ def prioritize(self,addr):
+ if addr in self.all_addresses() and addr not in self.prioritized_addresses:
+ self.unfreeze(addr)
+ self.prioritized_addresses.append(addr)
+ self.save()
+ return True
+ else:
+ return False
+ def unprioritize(self,addr):
+ if addr in self.all_addresses() and addr in self.prioritized_addresses:
+ self.prioritized_addresses.remove(addr)
+ self.save()
+ 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.encode('hex'),
+ '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()
git://git.novaco.in / electrum-nvc.git / blobdiff