" \ - + ""+_("WARNING")+": " + _("Never disclose your seed. Never type it on a website.") + "
" - if imported_keys: - msg2 += ""+_("WARNING")+": " + _("Your wallet contains imported keys. These keys cannot be recovered from seed.") + "
"
- label2 = QLabel(msg2)
- label2.setWordWrap(True)
-
- logo = QLabel()
- logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
- logo.setMaximumWidth(60)
-
- qrw = QRCodeWidget(seed)
-
- ok_button = QPushButton(_("OK"))
- ok_button.setDefault(True)
- ok_button.clicked.connect(dialog.accept)
-
- grid = QGridLayout()
- #main_layout.addWidget(logo, 0, 0)
-
- grid.addWidget(logo, 0, 0)
- grid.addWidget(label1, 0, 1)
-
- grid.addWidget(seed_text, 1, 0, 1, 2)
-
- grid.addWidget(qrw, 0, 2, 2, 1)
- vbox = QVBoxLayout()
- vbox.addLayout(grid)
- vbox.addWidget(label2)
+ from seed_dialog import SeedDialog
+ d = SeedDialog(self)
+ d.show_seed(seed, self.wallet.imported_keys)
- hbox = QHBoxLayout()
- hbox.addStretch(1)
- hbox.addWidget(ok_button)
- vbox.addLayout(hbox)
- dialog.setLayout(vbox)
- dialog.exec_()
def show_qrcode(self, data, title = "QR code"):
if not data: return
@@ -1728,79 +1700,6 @@ class ElectrumWindow(QMainWindow):
- @staticmethod
- def change_password_dialog( wallet, parent=None ):
-
- if not wallet.seed:
- QMessageBox.information(parent, _('Error'), _('No seed'), _('OK'))
- return
-
- d = QDialog(parent)
- d.setModal(1)
-
- pw = QLineEdit()
- pw.setEchoMode(2)
- new_pw = QLineEdit()
- new_pw.setEchoMode(2)
- conf_pw = QLineEdit()
- conf_pw.setEchoMode(2)
-
- vbox = QVBoxLayout()
- if parent:
- msg = (_('Your wallet is encrypted. Use this dialog to change your password.')+'\n'\
- +_('To disable wallet encryption, enter an empty new password.')) \
- if wallet.use_encryption else _('Your wallet keys are not encrypted')
- else:
- msg = _("Please choose a password to encrypt your wallet keys.")+'\n'\
- +_("Leave these fields empty if you want to disable encryption.")
- vbox.addWidget(QLabel(msg))
-
- grid = QGridLayout()
- grid.setSpacing(8)
-
- if wallet.use_encryption:
- grid.addWidget(QLabel(_('Password')), 1, 0)
- grid.addWidget(pw, 1, 1)
-
- grid.addWidget(QLabel(_('New Password')), 2, 0)
- grid.addWidget(new_pw, 2, 1)
-
- grid.addWidget(QLabel(_('Confirm Password')), 3, 0)
- grid.addWidget(conf_pw, 3, 1)
- vbox.addLayout(grid)
-
- vbox.addLayout(ok_cancel_buttons(d))
- d.setLayout(vbox)
-
- if not d.exec_(): return
-
- password = unicode(pw.text()) if wallet.use_encryption else None
- new_password = unicode(new_pw.text())
- new_password2 = unicode(conf_pw.text())
-
- try:
- seed = wallet.decode_seed(password)
- except:
- QMessageBox.warning(parent, _('Error'), _('Incorrect Password'), _('OK'))
- return
-
- if new_password != new_password2:
- QMessageBox.warning(parent, _('Error'), _('Passwords do not match'), _('OK'))
- return ElectrumWindow.change_password_dialog(wallet, parent) # Retry
-
- try:
- wallet.update_password(seed, password, new_password)
- except:
- QMessageBox.warning(parent, _('Error'), _('Failed to update password'), _('OK'))
- return
-
- QMessageBox.information(parent, _('Success'), _('Password was updated successfully'), _('OK'))
-
- if parent:
- icon = QIcon(":icons/lock.png") if wallet.use_encryption else QIcon(":icons/unlock.png")
- parent.password_button.setIcon( icon )
-
-
def generate_transaction_information_widget(self, tx):
tabs = QTabWidget(self)
@@ -2282,10 +2181,13 @@ class OpenFileEventFilter(QObject):
return True
return False
+
+
+
class ElectrumGui:
- def __init__(self, wallet, config, app=None):
- self.wallet = wallet
+ def __init__(self, config, app=None):
+ self.interface = Interface(config, True)
self.config = config
self.windows = []
self.efilter = OpenFileEventFilter(self.windows)
@@ -2293,116 +2195,32 @@ class ElectrumGui:
self.app = QApplication(sys.argv)
self.app.installEventFilter(self.efilter)
- def restore_or_create(self):
- msg = _("Wallet file not found.")+"\n"+_("Do you want to create a new wallet, or to restore an existing one?")
- r = QMessageBox.question(None, _('Message'), msg, _('Create'), _('Restore'), _('Cancel'), 0, 2)
- if r==2: return None
- return 'restore' if r==1 else 'create'
-
-
- def verify_seed(self):
- r = self.seed_dialog(False)
- if r != self.wallet.seed:
- QMessageBox.warning(None, _('Error'), 'incorrect seed', 'OK')
- return False
- else:
- return True
-
-
- def seed_dialog(self, is_restore=True):
- d = QDialog()
- d.setModal(1)
-
- vbox = QVBoxLayout()
- if is_restore:
- msg = _("Please enter your wallet seed (or your master public key if you want to create a watching-only wallet)." + ' ')
- else:
- msg = _("Your seed is important! To make sure that you have properly saved your seed, please type it here." + ' ')
-
- msg += _("Your seed can be entered as a sequence of words, or as a hexadecimal string."+ '\n')
-
- label=QLabel(msg)
- label.setWordWrap(True)
- vbox.addWidget(label)
-
- seed_e = QTextEdit()
- seed_e.setMaximumHeight(100)
- vbox.addWidget(seed_e)
-
- if is_restore:
- grid = QGridLayout()
- grid.setSpacing(8)
- gap_e = AmountEdit(None, True)
- gap_e.setText("5")
- grid.addWidget(QLabel(_('Gap limit')), 2, 0)
- grid.addWidget(gap_e, 2, 1)
- grid.addWidget(HelpButton(_('Keep the default value unless you modified this parameter in your wallet.')), 2, 3)
- vbox.addLayout(grid)
-
- vbox.addLayout(ok_cancel_buttons(d))
- d.setLayout(vbox)
-
- if not d.exec_(): return
-
- try:
- seed = str(seed_e.toPlainText())
- seed.decode('hex')
- except:
- try:
- seed = mnemonic.mn_decode( seed.split() )
- except:
- QMessageBox.warning(None, _('Error'), _('I cannot decode this'), _('OK'))
- return
-
- if not seed:
- QMessageBox.warning(None, _('Error'), _('No seed'), _('OK'))
- return
-
- if not is_restore:
- return seed
+ def main(self, url):
+
+ found = self.config.wallet_file_exists
+ if not found:
+ import installwizard
+ wizard = installwizard.InstallWizard(self.config, self.interface)
+ wallet = wizard.run()
+ if not wallet:
+ exit()
else:
- try:
- gap = int(unicode(gap_e.text()))
- except:
- QMessageBox.warning(None, _('Error'), 'error', 'OK')
- return
- return seed, gap
-
-
- def network_dialog(self):
- return NetworkDialog(self.wallet.interface, self.config, None).do_exec()
-
-
- def show_seed(self):
- ElectrumWindow.show_seed(self.wallet.seed, self.wallet.imported_keys)
+ wallet = Wallet(self.config)
- def password_dialog(self):
- if self.wallet.seed:
- ElectrumWindow.change_password_dialog(self.wallet)
-
-
- def restore_wallet(self):
- wallet = self.wallet
- # wait until we are connected, because the user might have selected another server
- if not wallet.interface.is_connected:
- waiting = lambda: False if wallet.interface.is_connected else "%s \n" % (_("Connecting..."))
- waiting_dialog(waiting)
+ self.wallet = wallet
- waiting = lambda: False if wallet.is_up_to_date() else "%s\n%s %d\n%s %.1f"\
- %(_("Please wait..."),_("Addresses generated:"),len(wallet.addresses(True)),_("Kilobytes received:"), wallet.interface.bytes_received/1024.)
+ self.interface.start(wait = False)
+ self.interface.send([('server.peers.subscribe',[])])
+ wallet.interface = self.interface
- wallet.set_up_to_date(False)
- wallet.interface.poke('synchronizer')
- waiting_dialog(waiting)
- if wallet.is_found():
- print_error( "Recovery successful" )
- else:
- QMessageBox.information(None, _('Error'), _("No transactions found for this seed"), _('OK'))
+ verifier = WalletVerifier(self.interface, self.config)
+ verifier.start()
+ wallet.set_verifier(verifier)
+ synchronizer = WalletSynchronizer(wallet, self.config)
+ synchronizer.start()
- return True
- def main(self,url):
s = Timer()
s.start()
w = ElectrumWindow(self.wallet, self.config)
@@ -2415,4 +2233,8 @@ class ElectrumGui:
self.app.exec_()
+ verifier.stop()
+ synchronizer.stop()
+ self.interface.stop()
+
diff --git a/gui/installwizard.py b/gui/installwizard.py
new file mode 100644
index 000000000..430ae934e
--- /dev/null
+++ b/gui/installwizard.py
@@ -0,0 +1,183 @@
+from PyQt4.QtGui import *
+from PyQt4.QtCore import *
+import PyQt4.QtCore as QtCore
+from i18n import _
+
+from electrum import Wallet, mnemonic
+from seed_dialog import SeedDialog
+from network_dialog import NetworkDialog
+from qt_util import *
+
+class InstallWizard(QDialog):
+
+ def __init__(self, config, interface):
+ QDialog.__init__(self)
+ self.config = config
+ self.interface = interface
+
+
+ def restore_or_create(self):
+ msg = _("Wallet file not found.")+"\n"+_("Do you want to create a new wallet, or to restore an existing one?")
+ r = QMessageBox.question(None, _('Message'), msg, _('Create'), _('Restore'), _('Cancel'), 0, 2)
+ if r==2: return None
+ return 'restore' if r==1 else 'create'
+
+
+ def verify_seed(self, wallet):
+ r = self.seed_dialog(False)
+ if r != wallet.seed:
+ QMessageBox.warning(None, _('Error'), 'incorrect seed', 'OK')
+ return False
+ else:
+ return True
+
+
+ def seed_dialog(self, is_restore=True):
+ d = QDialog()
+ d.setModal(1)
+
+ vbox = QVBoxLayout()
+ if is_restore:
+ msg = _("Please enter your wallet seed (or your master public key if you want to create a watching-only wallet)." + ' ')
+ else:
+ msg = _("Your seed is important! To make sure that you have properly saved your seed, please type it here." + ' ')
+
+ msg += _("Your seed can be entered as a sequence of words, or as a hexadecimal string."+ '\n')
+
+ label=QLabel(msg)
+ label.setWordWrap(True)
+ vbox.addWidget(label)
+
+ seed_e = QTextEdit()
+ seed_e.setMaximumHeight(100)
+ vbox.addWidget(seed_e)
+
+ if is_restore:
+ grid = QGridLayout()
+ grid.setSpacing(8)
+ gap_e = AmountEdit(None, True)
+ gap_e.setText("5")
+ grid.addWidget(QLabel(_('Gap limit')), 2, 0)
+ grid.addWidget(gap_e, 2, 1)
+ grid.addWidget(HelpButton(_('Keep the default value unless you modified this parameter in your wallet.')), 2, 3)
+ vbox.addLayout(grid)
+
+ vbox.addLayout(ok_cancel_buttons(d))
+ d.setLayout(vbox)
+
+ if not d.exec_(): return
+
+ try:
+ seed = str(seed_e.toPlainText())
+ seed.decode('hex')
+ except:
+ try:
+ seed = mnemonic.mn_decode( seed.split() )
+ except:
+ QMessageBox.warning(None, _('Error'), _('I cannot decode this'), _('OK'))
+ return
+
+ if not seed:
+ QMessageBox.warning(None, _('Error'), _('No seed'), _('OK'))
+ return
+
+ if not is_restore:
+ return seed
+ else:
+ try:
+ gap = int(unicode(gap_e.text()))
+ except:
+ QMessageBox.warning(None, _('Error'), 'error', 'OK')
+ return
+ return seed, gap
+
+
+ def network_dialog(self):
+ return NetworkDialog(self.interface, self.config, None).do_exec()
+
+
+ def show_seed(self, wallet):
+ d = SeedDialog()
+ d.show_seed(wallet.seed, wallet.imported_keys)
+
+
+ def password_dialog(self, wallet):
+ from password_dialog import PasswordDialog
+ d = PasswordDialog(wallet)
+ d.run()
+
+
+ def restore_wallet(self):
+ wallet = self.wallet
+ # wait until we are connected, because the user might have selected another server
+ if not wallet.interface.is_connected:
+ waiting = lambda: False if wallet.interface.is_connected else "%s \n" % (_("Connecting..."))
+ waiting_dialog(waiting)
+
+ waiting = lambda: False if wallet.is_up_to_date() else "%s\n%s %d\n%s %.1f"\
+ %(_("Please wait..."),_("Addresses generated:"),len(wallet.addresses(True)),_("Kilobytes received:"), wallet.interface.bytes_received/1024.)
+
+ wallet.set_up_to_date(False)
+ wallet.interface.poke('synchronizer')
+ waiting_dialog(waiting)
+ if wallet.is_found():
+ print_error( "Recovery successful" )
+ else:
+ QMessageBox.information(None, _('Error'), _("No transactions found for this seed"), _('OK'))
+
+ return True
+
+
+ def run(self):
+
+ a = self.restore_or_create()
+ if not a: exit()
+
+ wallet = Wallet(self.config)
+ wallet.interface = self.interface
+
+ if a =='create':
+ wallet.init_seed(None)
+ self.show_seed(wallet)
+ if self.verify_seed(wallet):
+ wallet.save_seed()
+ else:
+ exit()
+ else:
+ # ask for seed and gap.
+ sg = gui.seed_dialog()
+ if not sg: exit()
+ seed, gap = sg
+ if not seed: exit()
+ wallet.gap_limit = gap
+ if len(seed) == 128:
+ wallet.seed = ''
+ wallet.init_sequence(str(seed))
+ else:
+ wallet.init_seed(str(seed))
+ wallet.save_seed()
+
+ # select a server.
+ s = self.network_dialog()
+ if s is None:
+ self.config.set_key("server", None, True)
+ self.config.set_key('auto_cycle', False, True)
+
+ # generate the first addresses, in case we are offline
+ if s is None or a == 'create':
+ wallet.synchronize()
+
+
+ if a == 'restore' and s is not None:
+ try:
+ keep_it = gui.restore_wallet()
+ wallet.fill_addressbook()
+ except:
+ import traceback
+ traceback.print_exc(file=sys.stdout)
+ exit()
+
+ if not keep_it: exit()
+
+
+ self.password_dialog(wallet)
diff --git a/gui/password_dialog.py b/gui/password_dialog.py
new file mode 100644
index 000000000..b8133aefc
--- /dev/null
+++ b/gui/password_dialog.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+#
+# Electrum - lightweight Bitcoin client
+# Copyright (C) 2013 ecdsa@github
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
" \ + + ""+_("WARNING")+": " + _("Never disclose your seed. Never type it on a website.") + "
" + if imported_keys: + msg2 += ""+_("WARNING")+": " + _("Your wallet contains imported keys. These keys cannot be recovered from seed.") + "
"
+ label2 = QLabel(msg2)
+ label2.setWordWrap(True)
+
+ logo = QLabel()
+ logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
+ logo.setMaximumWidth(60)
+
+ qrw = QRCodeWidget(seed)
+
+ ok_button = QPushButton(_("OK"))
+ ok_button.setDefault(True)
+ ok_button.clicked.connect(self.accept)
+
+ grid = QGridLayout()
+ #main_layout.addWidget(logo, 0, 0)
+
+ grid.addWidget(logo, 0, 0)
+ grid.addWidget(label1, 0, 1)
+
+ grid.addWidget(seed_text, 1, 0, 1, 2)
+
+ grid.addWidget(qrw, 0, 2, 2, 1)
+
+ vbox = QVBoxLayout()
+ vbox.addLayout(grid)
+ vbox.addWidget(label2)
+
+ hbox = QHBoxLayout()
+ hbox.addStretch(1)
+ hbox.addWidget(ok_button)
+ vbox.addLayout(hbox)
+
+ self.setLayout(vbox)
+ self.exec_()
diff --git a/lib/account.py b/lib/account.py
index 1b59ef0dc..a2ef2d785 100644
--- a/lib/account.py
+++ b/lib/account.py
@@ -24,13 +24,9 @@ class Account(object):
def __init__(self, v):
self.addresses = v.get('0', [])
self.change = v.get('1', [])
- self.name = v.get('name', 'unnamed')
def dump(self):
- return {'0':self.addresses, '1':self.change, 'name':self.name}
-
- def get_name(self):
- return self.name
+ return {'0':self.addresses, '1':self.change}
def get_addresses(self, for_change):
return self.change[:] if for_change else self.addresses[:]
@@ -171,25 +167,9 @@ class BIP32_Account(Account):
K, K_compressed, chain = CKD_prime(K, chain, i)
return K_compressed.encode('hex')
- def get_private_key(self, sequence, master_k):
- chain = self.c
- k = master_k
- for i in sequence:
- k, chain = CKD(k, chain, i)
- return SecretToASecret(k, True)
-
- def get_private_keys(self, sequence_list, seed):
- return [ self.get_private_key( sequence, seed) for sequence in sequence_list]
+ def redeem_script(self, sequence):
+ return None
- def check_seed(self, seed):
- master_secret, master_chain, master_public_key, master_public_key_compressed = bip32_init(seed)
- assert self.mpk == (master_public_key.encode('hex'), master_chain.encode('hex'))
-
- def get_input_info(self, sequence):
- chain, i = sequence
- pk_addr = self.get_address(chain, i)
- redeemScript = None
- return pk_addr, redeemScript
@@ -215,18 +195,44 @@ class BIP32_Account_2of2(BIP32_Account):
K, K_compressed, chain = CKD_prime(K, chain, i)
return K_compressed.encode('hex')
+ def redeem_script(self, sequence):
+ chain, i = sequence
+ pubkey1 = self.get_pubkey(chain, i)
+ pubkey2 = self.get_pubkey2(chain, i)
+ return Transaction.multisig_script([pubkey1, pubkey2], 2)
+
def get_address(self, for_change, n):
- pubkey1 = self.get_pubkey(for_change, n)
- pubkey2 = self.get_pubkey2(for_change, n)
- address = Transaction.multisig_script([pubkey1, pubkey2], 2)["address"]
+ address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
return address
- def get_input_info(self, sequence):
+
+class BIP32_Account_2of3(BIP32_Account_2of2):
+
+ def __init__(self, v):
+ BIP32_Account_2of2.__init__(self, v)
+ self.c3 = v['c3'].decode('hex')
+ self.K3 = v['K3'].decode('hex')
+ self.cK3 = v['cK3'].decode('hex')
+
+ def dump(self):
+ d = BIP32_Account_2of2.dump(self)
+ d['c3'] = self.c3.encode('hex')
+ d['K3'] = self.K3.encode('hex')
+ d['cK3'] = self.cK3.encode('hex')
+ return d
+
+ def get_pubkey3(self, for_change, n):
+ K = self.K3
+ chain = self.c3
+ for i in [for_change, n]:
+ K, K_compressed, chain = CKD_prime(K, chain, i)
+ return K_compressed.encode('hex')
+
+ def get_redeem_script(self, sequence):
chain, i = sequence
pubkey1 = self.get_pubkey(chain, i)
pubkey2 = self.get_pubkey2(chain, i)
- # fixme
- pk_addr = None # public_key_to_bc_address( pubkey1 ) # we need to return that address to get the right private key
- redeemScript = Transaction.multisig_script([pubkey1, pubkey2], 2)['redeemScript']
- return pk_addr, redeemScript
+ pubkey3 = self.get_pubkey3(chain, i)
+ return Transaction.multisig_script([pubkey1, pubkey2, pubkey3], 3)
+
diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index b068baaff..c4e111bd9 100644
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -244,17 +244,17 @@ def is_compressed(sec):
return len(b) == 33
-def address_from_private_key(sec):
+def public_key_from_private_key(sec):
# rebuild public key from private key, compressed or uncompressed
pkey = regenerate_key(sec)
assert pkey
-
- # figure out if private key is compressed
compressed = is_compressed(sec)
-
- # rebuild private and public key from regenerated secret
- private_key = GetPrivKey(pkey, compressed)
public_key = GetPubKey(pkey.pubkey, compressed)
+ return public_key.encode('hex')
+
+
+def address_from_private_key(sec):
+ public_key = public_key_from_private_key(sec)
address = public_key_to_bc_address(public_key)
return address
@@ -448,6 +448,11 @@ def bip32_public_derivation(c, K, branch, sequence):
return c.encode('hex'), K.encode('hex'), cK.encode('hex')
+def bip32_private_key(sequence, k, chain):
+ for i in sequence:
+ k, chain = CKD(k, chain, i)
+ return SecretToASecret(k, True)
+
@@ -508,8 +513,7 @@ class Transaction:
raise
s += 'ae'
- out = { "address": hash_160_to_bc_address(hash_160(s.decode('hex')), 5), "redeemScript":s }
- return out
+ return s
@classmethod
def serialize( klass, inputs, outputs, for_sig = None ):
@@ -522,24 +526,24 @@ class Transaction:
s += int_to_hex(txin['index'],4) # prev index
if for_sig is None:
- pubkeysig = txin.get('pubkeysig')
- if pubkeysig:
- pubkey, sig = pubkeysig[0]
- sig = sig + chr(1) # hashtype
- script = op_push( len(sig))
- script += sig.encode('hex')
- script += op_push( len(pubkey))
- script += pubkey.encode('hex')
+ signatures = txin['signatures']
+ pubkeys = txin['pubkeys']
+ if not txin.get('redeemScript'):
+ pubkey = pubkeys[0]
+ sig = signatures[0]
+ sig = sig + '01' # hashtype
+ script = op_push(len(sig)/2)
+ script += sig
+ script += op_push(len(pubkey)/2)
+ script += pubkey
else:
- signatures = txin['signatures']
- pubkeys = txin['pubkeys']
script = '00' # op_0
for sig in signatures:
sig = sig + '01'
script += op_push(len(sig)/2)
script += sig
- redeem_script = klass.multisig_script(pubkeys,2).get('redeemScript')
+ redeem_script = klass.multisig_script(pubkeys,2)
script += op_push(len(redeem_script)/2)
script += redeem_script
@@ -587,79 +591,47 @@ class Transaction:
def hash(self):
return Hash(self.raw.decode('hex') )[::-1].encode('hex')
- def sign(self, private_keys):
+
+
+ def sign(self, keypairs):
import deserialize
+ is_complete = True
+ print_error("tx.sign(), keypairs:", keypairs)
- for i in range(len(self.inputs)):
- txin = self.inputs[i]
- tx_for_sig = self.serialize( self.inputs, self.outputs, for_sig = i )
+ for i, txin in enumerate(self.inputs):
+ # if the input is multisig, parse redeem script
redeem_script = txin.get('redeemScript')
- if redeem_script:
- # 1 parse the redeem script
- num, redeem_pubkeys = deserialize.parse_redeemScript(redeem_script)
- self.inputs[i]["pubkeys"] = redeem_pubkeys
-
- # build list of public/private keys
- keypairs = {}
- for sec in private_keys.values():
+ num, redeem_pubkeys = deserialize.parse_redeemScript(redeem_script) if redeem_script else (1, [txin.get('redeemPubkey')])
+
+ # add pubkeys
+ txin["pubkeys"] = redeem_pubkeys
+ # get list of already existing signatures
+ signatures = txin.get("signatures",[])
+ # continue if this txin is complete
+ if len(signatures) == num:
+ continue
+
+ tx_for_sig = self.serialize( self.inputs, self.outputs, for_sig = i )
+ for pubkey in redeem_pubkeys:
+ # check if we have the corresponding private key
+ if pubkey in keypairs.keys():
+ # add signature
+ sec = keypairs[pubkey]
compressed = is_compressed(sec)
pkey = regenerate_key(sec)
- pubkey = GetPubKey(pkey.pubkey, compressed)
- keypairs[ pubkey.encode('hex') ] = sec
-
- print "keypairs", keypairs
- print redeem_script, redeem_pubkeys
-
- # list of already existing signatures
- signatures = txin.get("signatures",[])
- print_error("signatures",signatures)
-
- for pubkey in redeem_pubkeys:
-
- # here we have compressed key.. it won't work
- #public_key = ecdsa.VerifyingKey.from_string(pubkey[2:].decode('hex'), curve = SECP256k1)
- #for s in signatures:
- # try:
- # public_key.verify_digest( s.decode('hex')[:-1], Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
- # break
- # except ecdsa.keys.BadSignatureError:
- # continue
- #else:
- if 1:
- # check if we have a key corresponding to the redeem script
- if pubkey in keypairs.keys():
- # add signature
- sec = keypairs[pubkey]
- compressed = is_compressed(sec)
- pkey = regenerate_key(sec)
- secexp = pkey.secret
- private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
- public_key = private_key.get_verifying_key()
- sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
- assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
- signatures.append( sig.encode('hex') )
-
- # for p2sh, pubkeysig is a tuple (may be incomplete)
- self.inputs[i]["signatures"] = signatures
- print_error("signatures",signatures)
- self.is_complete = len(signatures) == num
-
- else:
- sec = private_keys[txin['address']]
- compressed = is_compressed(sec)
- pkey = regenerate_key(sec)
- secexp = pkey.secret
- private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
- public_key = private_key.get_verifying_key()
- pkey = EC_KEY(secexp)
- pubkey = GetPubKey(pkey.pubkey, compressed)
- sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
- assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
-
- self.inputs[i]["pubkeysig"] = [(pubkey, sig)]
- self.is_complete = True
+ secexp = pkey.secret
+ private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
+ public_key = private_key.get_verifying_key()
+ sig = private_key.sign_digest( Hash( tx_for_sig.decode('hex') ), sigencode = ecdsa.util.sigencode_der )
+ assert public_key.verify_digest( sig, Hash( tx_for_sig.decode('hex') ), sigdecode = ecdsa.util.sigdecode_der)
+ signatures.append( sig.encode('hex') )
+ print_error("adding signature for", pubkey)
+
+ txin["signatures"] = signatures
+ is_complete = is_complete and len(signatures) == num
+ self.is_complete = is_complete
self.raw = self.serialize( self.inputs, self.outputs )
diff --git a/lib/commands.py b/lib/commands.py
index c30b0841c..639d7cb01 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -60,7 +60,9 @@ register_command('importprivkey', 1, 1, True, True, 'Import a private k
register_command('listaddresses', 3, 3, False, True, 'Returns your list of addresses.', '', listaddr_options)
register_command('listunspent', 0, 0, False, True, 'Returns a list of unspent inputs in your wallet.')
register_command('mktx', 5, 5, True, True, 'Create a signed transaction', 'mktx