Initial novacoin support

[electrum-nvc.git] / lib / bitcoin.py

diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index af0a6ed..0d49942 100644 (file)
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -205,7 +205,7 @@ def public_key_to_bc_address(public_key):
     h160 = hash_160(public_key)
     return hash_160_to_bc_address(h160)
 
-def hash_160_to_bc_address(h160, addrtype = 0):
+def hash_160_to_bc_address(h160, addrtype = 8):
     vh160 = chr(addrtype) + h160
     h = Hash(vh160)
     addr = vh160 + h[0:4]
@@ -290,12 +290,12 @@ def PrivKeyToSecret(privkey):
     return privkey[9:9+32]
 
 
-def SecretToASecret(secret, compressed=False, addrtype=0):
+def SecretToASecret(secret, compressed=False, addrtype=8):
     vchIn = chr((addrtype+128)&255) + secret
     if compressed: vchIn += '\01'
     return EncodeBase58Check(vchIn)
 
-def ASecretToSecret(key, addrtype=0):
+def ASecretToSecret(key, addrtype=8):
     vch = DecodeBase58Check(key)
     if vch and vch[0] == chr((addrtype+128)&255):
         return vch[1:]
@@ -379,7 +379,7 @@ from ecdsa.util import string_to_number, number_to_string
 def msg_magic(message):
     varint = var_int(len(message))
     encoded_varint = "".join([chr(int(varint[i:i+2], 16)) for i in xrange(0, len(varint), 2)])
-    return "\x18Bitcoin Signed Message:\n" + encoded_varint + message
+    return "\x18Novacoin Signed Message:\n" + encoded_varint + message
 
 
 def verify_message(address, signature, message):
@@ -478,7 +478,7 @@ class EC_KEY(object):
     def sign_message(self, message, compressed, address):
         private_key = ecdsa.SigningKey.from_secret_exponent( self.secret, curve = SECP256k1 )
         public_key = private_key.get_verifying_key()
-        signature = private_key.sign_digest_deterministic( Hash( msg_magic(message) ), hashfunc=hashlib.sha256, sigencode = ecdsa.util.sigencode_string )
+        signature = private_key.sign_digest_deterministic( Hash( msg_magic(message) ), hashfunc=hashlib.sha256, sigencode = ecdsa.util.sigencode_string_canonize )
         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 )
@@ -640,26 +640,22 @@ def _CKD_pub(cK, c, s):
     return cK_n, c_n
 
 
-BITCOIN_HEADERS = ["0488ade4", "0488b21e"]
-TESTNET_HEADERS = ["043587cf", "04358394"]
-
-BITCOIN_HEAD = "0488ade4"
-TESTNET_HEAD = "04358394"
-
-BITCOIN_HEADER_PRIV = "0488ADE4"
-BITCOIN_HEADER_PUB = "0488B21E"
+BITCOIN_HEADER_PRIV = "0488ade4"
+BITCOIN_HEADER_PUB = "0488b21e"
 
 TESTNET_HEADER_PRIV = "04358394"
-TESTNET_HEADER_PUB = "043587CF"
+TESTNET_HEADER_PUB = "043587cf"
 
+BITCOIN_HEADERS = (BITCOIN_HEADER_PUB, BITCOIN_HEADER_PRIV)
+TESTNET_HEADERS = (TESTNET_HEADER_PUB, TESTNET_HEADER_PRIV)
 
 def _get_headers(testnet):
     """Returns the correct headers for either testnet or bitcoin, in the form
     of a 2-tuple, like (public, private)."""
     if testnet:
-        return (TESTNET_HEADER_PUB, TESTNET_HEADER_PRIV)
+        return TESTNET_HEADERS
     else:
-        return (BITCOIN_HEADER_PUB, BITCOIN_HEADER_PRIV)
+        return BITCOIN_HEADERS
 
 
 def deserialize_xkey(xkey):
@@ -670,9 +666,9 @@ def deserialize_xkey(xkey):
     xkey_header = xkey[0:4].encode('hex')
     # Determine if the key is a bitcoin key or a testnet key.
     if xkey_header in TESTNET_HEADERS:
-        head = TESTNET_HEAD
+        head = TESTNET_HEADER_PRIV
     elif xkey_header in BITCOIN_HEADERS:
-        head = BITCOIN_HEAD
+        head = BITCOIN_HEADER_PRIV
     else:
         raise Exception("Unknown xkey header: '%s'" % xkey_header)
 
@@ -714,7 +710,7 @@ def bip32_root(seed, testnet=False):
     import hmac
     header_pub, header_priv = _get_headers(testnet)
     seed = seed.decode('hex')
-    I = hmac.new("Bitcoin seed", seed, hashlib.sha512).digest()
+    I = hmac.new("Novacoin seed", seed, hashlib.sha512).digest()
     master_k = I[0:32]
     master_c = I[32:]
     K, cK = get_pubkeys_from_secret(master_k)