Merge pull request #301 from hackaugusto/develop

Fixed naming differences between the c_secp256k1 and bitcoin libraries

Author: heikoheiko

ethereum/specials.py

@@ -1,8 +1,18 @@
+# -*- coding: utf8 -*-
 import bitcoin
 from ethereum import utils, opcodes
 from ethereum.utils import safe_ord, decode_hex
 from rlp.utils import ascii_chr
 
+try:
+    from c_secp256k1 import ecdsa_recover_raw
+except ImportError:
+    import warnings
+    warnings.warn('missing c_secp256k1 falling back to pybitcointools')
+
+    from bitcoin import ecdsa_raw_recover as ecdsa_recover_raw
+
+
 ZERO_PRIVKEY_ADDR = decode_hex('3f17f1962b36e491b30a40b2405849e597ba5fb5')
 
 
@@ -20,7 +30,7 @@ def proc_ecrecover(ext, msg):
     s = msg.data.extract32(96)
     if r >= bitcoin.N or s >= bitcoin.N or v < 27 or v > 28:
         return 1, msg.gas - opcodes.GECRECOVER, []
-    recovered_addr = bitcoin.ecdsa_raw_recover(h, (v, r, s))
+    recovered_addr = ecdsa_recover_raw(h, (v, r, s))
     if recovered_addr in (False, (0, 0)):
         return 1, msg.gas - gas_cost, []
     pub = bitcoin.encode_pubkey(recovered_addr, 'bin')

ethereum/tests/test_contracts.py

@@ -1,11 +1,22 @@
-import bitcoin
+# -*- coding: utf8 -*-
 import os
+
+import bitcoin
 import pytest
-from ethereum import tester, utils, abi
 import serpent
 from rlp.utils import decode_hex, encode_hex
-from ethereum.utils import safe_ord
+
+from ethereum import tester, utils, abi
 from ethereum.slogging import set_level
+from ethereum.utils import safe_ord
+
+try:
+    from c_secp256k1 import ecdsa_sign_raw
+except ImportError:
+    import warnings
+    warnings.warn('missing c_secp256k1 falling back to pybitcointools')
+
+    from bitcoin import ecdsa_raw_sign as ecdsa_sign_raw
 
 # customize VM log output to your needs
 # hint: use 'py.test' with the '-s' option to dump logs to the console
@@ -1207,7 +1218,7 @@ def test_ecrecover():
     pub = bitcoin.privtopub(priv)
 
     msghash = encode_hex(utils.sha3('the quick brown fox jumps over the lazy dog'))
-    V, R, S = bitcoin.ecdsa_raw_sign(msghash, priv)
+    V, R, S = ecdsa_sign_raw(msghash, priv)
     assert bitcoin.ecdsa_raw_verify(msghash, (V, R, S), pub)
 
     addr = utils.big_endian_to_int(utils.sha3(bitcoin.encode_pubkey(pub, 'bin')[1:])[12:])
@@ -1660,7 +1671,7 @@ def test_prefix_types_in_functions():
     s = tester.state()
     c = s.abi_contract(prefix_types_in_functions_code)
     assert c.sqrdiv(25, 2) == 156
-    
+
 
 
 # test_evm = None

ethereum/transactions.py

@@ -1,17 +1,24 @@
-from bitcoin import encode_pubkey, N, P
-try:
-    from c_secp256k1 import ecdsa_raw_sign, ecdsa_raw_recover
-except ImportError:
-    from bitcoin import ecdsa_raw_sign, ecdsa_raw_recover
+# -*- coding: utf8 -*-
 import rlp
+from bitcoin import encode_pubkey, N, P
 from rlp.sedes import big_endian_int, binary
 from rlp.utils import decode_hex, encode_hex, str_to_bytes, ascii_chr
+
+from ethereum.exceptions import InvalidTransaction
 from ethereum import bloom
+from ethereum import opcodes
 from ethereum import utils
-from ethereum.utils import TT256, mk_contract_address
-from ethereum.exceptions import InvalidTransaction
 from ethereum.slogging import get_logger
-from ethereum import opcodes
+from ethereum.utils import TT256, mk_contract_address
+
+try:
+    from c_secp256k1 import ecdsa_sign_raw, ecdsa_recover_raw
+except ImportError:
+    import warnings
+    warnings.warn('missing c_secp256k1 falling back to pybitcointools')
+
+    from bitcoin import ecdsa_raw_sign as ecdsa_sign_raw, ecdsa_raw_recover as ecdsa_recover_raw
+
 log = get_logger('eth.chain.tx')
 
 # in the yellow paper it is specified that s should be smaller than secpk1n (eq.205)
@@ -78,7 +85,7 @@ def sender(self):
                 log.debug('recovering sender')
                 rlpdata = rlp.encode(self, UnsignedTransaction)
                 rawhash = utils.sha3(rlpdata)
-                pub = ecdsa_raw_recover(rawhash, (self.v, self.r, self.s))
+                pub = ecdsa_recover_raw(rawhash, (self.v, self.r, self.s))
                 if pub is False:
                     raise InvalidTransaction("Invalid signature values (x^3+7 is non-residue)")
                 if pub == (0, 0):
@@ -102,7 +109,7 @@ def sign(self, key):
         if key in (0, '', '\x00' * 32):
             raise InvalidTransaction("Zero privkey cannot sign")
         rawhash = utils.sha3(rlp.encode(self, UnsignedTransaction))
-        self.v, self.r, self.s = ecdsa_raw_sign(rawhash, key)
+        self.v, self.r, self.s = ecdsa_sign_raw(rawhash, key)
         self.sender = utils.privtoaddr(key)
         return self