treformatting - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 7933ac4324738173925277f4d9f5e28a167fe8f7
DIR parent 15632adb40aef519933dc210638b359990c458da
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 4 Jul 2015 12:07:33 +0200
reformatting
Diffstat:
M lib/bitcoin.py | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -468,6 +468,7 @@ class MyVerifyingKey(ecdsa.VerifyingKey):
class EC_KEY(object):
+
def __init__( self, k ):
secret = string_to_number(k)
self.pubkey = ecdsa.ecdsa.Public_key( generator_secp256k1, generator_secp256k1 * secret )
t@@ -483,21 +484,20 @@ class EC_KEY(object):
signature = private_key.sign_digest_deterministic( Hash( msg_magic(message) ), hashfunc=hashlib.sha256, sigencode = ecdsa.util.sigencode_string )
assert public_key.verify_digest( signature, Hash( msg_magic(message) ), sigdecode = ecdsa.util.sigdecode_string)
for i in range(4):
- sig = base64.b64encode( chr(27 + i + (4 if compressed else 0)) + signature )
+ sig = base64.b64encode(chr(27 + i + (4 if compressed else 0)) + signature)
try:
- self.verify_message( address, sig, message)
+ self.verify_message(address, sig, message)
return sig
except Exception:
continue
else:
raise Exception("error: cannot sign message")
-
@classmethod
def verify_message(self, address, signature, message):
sig = base64.b64decode(signature)
- if len(sig) != 65: raise Exception("Wrong encoding")
-
+ if len(sig) != 65:
+ raise Exception("Wrong encoding")
nV = ord(sig[0])
if nV < 27 or nV >= 35:
raise Exception("Bad encoding")
t@@ -506,16 +506,15 @@ class EC_KEY(object):
nV -= 4
else:
compressed = False
-
recid = nV - 27
- h = Hash( msg_magic(message) )
- public_key = MyVerifyingKey.from_signature( sig[1:], recid, h, curve = SECP256k1 )
+ h = Hash(msg_magic(message))
+ public_key = MyVerifyingKey.from_signature(sig[1:], recid, h, curve = SECP256k1)
# check 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)
+ pubkey = point_to_ser(public_key.pubkey.point, compressed)
# check that we get the original signing address
- addr = public_key_to_bc_address( point_to_ser(public_key.pubkey.point, compressed) )
+ addr = public_key_to_bc_address(pubkey)
if address != addr:
raise Exception("Bad signature")