LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-04 12:55:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify signatures

Browse source
This commit is contained in:
thomasv 2012-02-03 11:48:09 +01:00
parent 382abc54a8
commit ac9d9048dd
3 changed files with 73 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
client/electrum
View file

@ -93,20 +93,21 @@ if __name__ == '__main__':
uv = urldecode(v) uv = urldecode(v)
if k == 'amount': amount = uv if k == 'amount': amount = uv
elif k == 'label': label = uv elif k == 'label': label = uv
elif k == 'signature': signature = uv elif k == 'signature':
elif k == 'identity': identity, signature = uv.split(':')
identity = uv
signing_address = alias(identity) signing_address = alias(identity)
cmd = cmd.replace('&%s=%s'%(k,v),'')
else: else:
print k,v print k,v
if k in ['identity','signature']: if signature:
cmd = cmd.replace('&%s=%s'%(k,v),'') try:
wallet.verify_message(signing_address, signature, cmd )
except:
gui.show_message('Warning: the URI contains a bad signature.\nThe identity of the recipient cannot be verified.\nContinue at your own risks!')
signature = identity = ''
gui.set_send_tab(address, amount, label, identity) gui.set_send_tab(address, amount, label, identity)
if signature:
if not wallet.verify_message(signing_address, signature, cmd ):
gui.show_message('Warning: the URI contains a bad signature.\nThe identity of the recipient cannot be verified.\nPay at your own risks!')
gui.main() gui.main()
wallet.save() wallet.save()
@ -366,5 +367,10 @@ if __name__ == '__main__':
elif cmd == 'verifymessage': elif cmd == 'verifymessage':
address, signature, message = args[1:4] address, signature, message = args[1:4]
print wallet.verify_message(address, signature, message) try:
wallet.verify_message(address, signature, message)
print True
except:
print False

74
client/gui.py
View file

@ -570,7 +570,7 @@ class BitcoinGUI:
self.window.add(vbox) self.window.add(vbox)
self.window.show_all() self.window.show_all()
self.fee_box.hide() #self.fee_box.hide()
self.context_id = self.status_bar.get_context_id("statusbar") self.context_id = self.status_bar.get_context_id("statusbar")
self.update_status_bar() self.update_status_bar()
@ -638,16 +638,19 @@ class BitcoinGUI:
def create_send_tab(self): def create_send_tab(self):
# cases:
# no alias bitcoin:address
# alias bitcoin:name@domain
# alias + signature bitcoin:address?id=name@domain&sig=signature
page = vbox = gtk.VBox() page = vbox = gtk.VBox()
page.show() page.show()
payto = gtk.HBox() payto = gtk.HBox()
payto_label = gtk.Label('Pay to:') payto_label = gtk.Label('Pay to:')
payto_label.set_size_request(100,10) payto_label.set_size_request(100,-1)
payto_label.show() payto_label.show()
payto.pack_start(payto_label, False) payto.pack_start(payto_label, False)
payto_id = gtk.Label('')
payto.pack_start(payto_id, False)
payto_entry = gtk.Entry() payto_entry = gtk.Entry()
payto_entry.set_size_request(350, 26) payto_entry.set_size_request(350, 26)
payto_entry.show() payto_entry.show()
@ -656,7 +659,7 @@ class BitcoinGUI:
label = gtk.HBox() label = gtk.HBox()
label_label = gtk.Label('Label:') label_label = gtk.Label('Label:')
label_label.set_size_request(100,10) label_label.set_size_request(100,-1)
label_label.show() label_label.show()
label.pack_start(label_label, False) label.pack_start(label_label, False)
label_entry = gtk.Entry() label_entry = gtk.Entry()
@ -678,18 +681,17 @@ class BitcoinGUI:
self.fee_box = fee_box = gtk.HBox() self.fee_box = fee_box = gtk.HBox()
fee_label = gtk.Label('Fee:') fee_label = gtk.Label('Fee:')
fee_box.set_size_request(220,10) fee_label.set_size_request(100,-1)
fee_box.pack_start(fee_label, False)
fee_entry = gtk.Entry() fee_entry = gtk.Entry()
fee_entry.set_size_request(60, 26) fee_entry.set_size_request(60, 26)
fee_entry.set_has_frame(False) fee_box.pack_start(fee_entry, False)
fee_entry.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("#eeeeee"))
fee_box.pack_end(fee_entry, False)
fee_box.pack_end(fee_label, False)
amount_box.pack_start(fee_box, False, False, 5)
end_box = gtk.HBox() end_box = gtk.HBox()
end_box.pack_start(fee_box, False, False, 5)
empty_label = gtk.Label('') empty_label = gtk.Label('')
empty_label.set_size_request(100,10) empty_label.set_size_request(100,-1)
end_box.pack_start(empty_label, False) end_box.pack_start(empty_label, False)
send_button = gtk.Button("Send") send_button = gtk.Button("Send")
send_button.show() send_button.show()
@ -697,11 +699,18 @@ class BitcoinGUI:
clear_button = gtk.Button("Clear") clear_button = gtk.Button("Clear")
clear_button.show() clear_button.show()
end_box.pack_start(clear_button, False, False, 5) end_box.pack_start(clear_button, False, False, 5)
send_button.connect("clicked", self.do_send, (payto_entry, label_entry, amount_entry, fee_entry)) send_button.connect("clicked", self.do_send, (payto_entry, label_entry, amount_entry, fee_entry))
clear_button.connect("clicked", self.do_clear, (payto_entry, label_entry, amount_entry, fee_entry)) clear_button.connect("clicked", self.do_clear, (payto_entry, label_entry, amount_entry, fee_entry))
vbox.pack_start(end_box, False, False, 5) vbox.pack_start(end_box, False, False, 5)
# display this line only if there is a signature
payto_sig = gtk.HBox()
payto_sig_id = gtk.Label('')
payto_sig.pack_start(payto_sig_id, False)
vbox.pack_start(payto_sig, True, True, 5)
self.user_fee = False self.user_fee = False
def entry_changed( entry, is_fee ): def entry_changed( entry, is_fee ):
@ -709,7 +718,8 @@ class BitcoinGUI:
fee = numbify(fee_entry) fee = numbify(fee_entry)
if not is_fee: fee = None if not is_fee: fee = None
if amount is None: if amount is None:
self.fee_box.hide(); return #self.fee_box.hide();
return
inputs, total, fee = self.wallet.choose_tx_inputs( amount, fee ) inputs, total, fee = self.wallet.choose_tx_inputs( amount, fee )
if not is_fee: if not is_fee:
fee_entry.set_text( str( Decimal( fee ) / 100000000 ) ) fee_entry.set_text( str( Decimal( fee ) / 100000000 ) )
@ -730,19 +740,35 @@ class BitcoinGUI:
self.payto_entry = payto_entry self.payto_entry = payto_entry
self.payto_fee_entry = fee_entry self.payto_fee_entry = fee_entry
self.payto_id = payto_id self.payto_sig_id = payto_sig_id
self.payto_sig = payto_sig
self.payto_amount_entry = amount_entry self.payto_amount_entry = amount_entry
self.payto_label_entry = label_entry self.payto_label_entry = label_entry
self.add_tab(page, 'Send') self.add_tab(page, 'Send')
def set_frozen(self,entry,frozen):
if frozen:
entry.set_editable(False)
entry.set_has_frame(False)
entry.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("#eeeeee"))
else:
entry.set_editable(True)
entry.set_has_frame(True)
entry.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("#ffffff"))
def set_send_tab(self, address, amount, label, identity): def set_send_tab(self, address, amount, label, identity):
self.notebook.set_current_page(1) self.notebook.set_current_page(1)
self.payto_entry.set_text(address) self.payto_entry.set_text(address)
if identity:
self.payto_id.set_text(identity + ' [' + address + ']')
self.payto_entry.set_visible(False)
self.payto_label_entry.set_text(label) self.payto_label_entry.set_text(label)
self.payto_amount_entry.set_text(amount) self.payto_amount_entry.set_text(amount)
if identity:
self.set_frozen(self.payto_entry,True)
self.set_frozen(self.payto_amount_entry,True)
self.set_frozen(self.payto_label_entry,True)
self.payto_sig_id.set_text( ' This transaction URI was signed by ' + identity )
else:
self.payto_sig.set_visible(False)
def create_about_tab(self): def create_about_tab(self):
page = gtk.VBox() page = gtk.VBox()
@ -758,12 +784,10 @@ class BitcoinGUI:
self.add_tab(page, 'Wall') self.add_tab(page, 'Wall')
def do_clear(self, w, data): def do_clear(self, w, data):
self.payto_entry.set_text('') self.payto_sig.set_visible(False)
self.payto_entry.set_visible(True) for entry in [self.payto_entry,self.payto_amount_entry,self.payto_label_entry]:
self.payto_id.set_visible(False) self.set_frozen(entry,False)
self.payto_label_entry.set_text('') entry.set_text('')
self.payto_amount_entry.set_text('')
self.payto_fee_entry.set_text('')
def do_send(self, w, data): def do_send(self, w, data):
@ -809,7 +833,7 @@ class BitcoinGUI:
label_entry.set_text("") label_entry.set_text("")
amount_entry.set_text("") amount_entry.set_text("")
fee_entry.set_text("") fee_entry.set_text("")
self.fee_box.hide() #self.fee_box.hide()
self.update_sending_tab() self.update_sending_tab()
else: else:
self.show_message( msg ) self.show_message( msg )

23
client/wallet.py
View file

@ -351,8 +351,11 @@ class Wallet:
assert public_key.verify_digest( signature, Hash( self.msg_magic( message ) ), sigdecode = ecdsa.util.sigdecode_string) assert public_key.verify_digest( signature, Hash( self.msg_magic( message ) ), sigdecode = ecdsa.util.sigdecode_string)
for i in range(4): for i in range(4):
sig = base64.b64encode( chr(27+i) + signature ) sig = base64.b64encode( chr(27+i) + signature )
if self.verify_message( address, sig, message): try:
self.verify_message( address, sig, message)
return sig return sig
except:
continue
else: else:
raise BaseException("error: cannot sign message") raise BaseException("error: cannot sign message")
@ -364,49 +367,33 @@ class Wallet:
curve = curve_secp256k1 curve = curve_secp256k1
G = generator_secp256k1 G = generator_secp256k1
order = G.order() order = G.order()
# extract r,s from signature # extract r,s from signature
sig = base64.b64decode(signature) sig = base64.b64decode(signature)
if len(sig) != 65: raise BaseException("error") if len(sig) != 65: raise BaseException("error")
r,s = util.sigdecode_string(sig[1:], order) r,s = util.sigdecode_string(sig[1:], order)
recid = ord(sig[0]) - 27 recid = ord(sig[0]) - 27
# 1.1 # 1.1
x = r + (recid/2) * order x = r + (recid/2) * order
# 1.3 # 1.3
alpha = ( x * x * x + curve.a() * x + curve.b() ) % curve.p() alpha = ( x * x * x + curve.a() * x + curve.b() ) % curve.p()
beta = msqr.modular_sqrt(alpha, curve.p()) beta = msqr.modular_sqrt(alpha, curve.p())
y = beta if (beta - recid) % 2 == 0 else curve.p() - beta y = beta if (beta - recid) % 2 == 0 else curve.p() - beta
# 1.4 the constructor checks that nR is at infinity # 1.4 the constructor checks that nR is at infinity
try:
R = ellipticcurve.Point(curve, x, y, order) R = ellipticcurve.Point(curve, x, y, order)
except:
print "not in curve"
return False
# 1.5 compute e from message: # 1.5 compute e from message:
h = Hash( self.msg_magic( message ) ) h = Hash( self.msg_magic( message ) )
e = string_to_number(h) e = string_to_number(h)
minus_e = -e % order minus_e = -e % order
# 1.6 compute Q = r^-1 (sR - eG) # 1.6 compute Q = r^-1 (sR - eG)
inv_r = numbertheory.inverse_mod(r,order) inv_r = numbertheory.inverse_mod(r,order)
Q = inv_r * ( s * R + minus_e * G ) Q = inv_r * ( s * R + minus_e * G )
public_key = ecdsa.VerifyingKey.from_public_point( Q, curve = SECP256k1 ) public_key = ecdsa.VerifyingKey.from_public_point( Q, curve = SECP256k1 )
# check that Q is the public key # check that Q is the public key
try:
public_key.verify_digest( sig[1:], h, sigdecode = ecdsa.util.sigdecode_string) public_key.verify_digest( sig[1:], h, sigdecode = ecdsa.util.sigdecode_string)
except:
print "wrong key"
return False
# check that we get the original signing address # check that we get the original signing address
addr = public_key_to_bc_address( '04'.decode('hex') + public_key.to_string() ) addr = public_key_to_bc_address( '04'.decode('hex') + public_key.to_string() )
# print addr # print addr
return address == addr assert address == addr
def create_new_address2(self, for_change): def create_new_address2(self, for_change):