AaronFiore/electrum
1
0
Fork 0
Code Activity

remove redundant function

Browse Source
This commit is contained in:
ThomasV
2014-02-03 13:50:01 +01:00
parent 4693727659
commit fc9d2b6ee9
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/bitcoin.py
View File

@@ -348,17 +348,6 @@ def point_to_ser(P, comp=True ):
return ( '04'+('%064x'%P.x())+('%064x'%P.y()) ).decode('hex') return ( '04'+('%064x'%P.x())+('%064x'%P.y()) ).decode('hex')
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
def ser_to_point(Aser): def ser_to_point(Aser):
curve = curve_secp256k1 curve = curve_secp256k1
generator = generator_secp256k1 generator = generator_secp256k1
@@ -435,7 +424,7 @@ class EC_KEY(object):
# check that Q is the public key # check that Q is the public key
public_key.verify_digest( sig[1:], h, sigdecode = ecdsa.util.sigdecode_string) public_key.verify_digest( sig[1:], h, sigdecode = ecdsa.util.sigdecode_string)
# check that we get the original signing address # check that we get the original signing address
addr = public_key_to_bc_address( encode_point(public_key, compressed) ) addr = public_key_to_bc_address( point_to_ser(public_key.pubkey.point, compressed) )
if address != addr: if address != addr:
raise Exception("Bad signature") raise Exception("Bad signature")