Merge pull request #320 from ethereum/switch_secp

Switch to secp256k1

Author: konradkonrad

ethereum/specials.py

@@ -1,16 +1,10 @@
 # -*- coding: utf8 -*-
 import bitcoin
-from ethereum import utils, opcodes
-from ethereum.utils import safe_ord, decode_hex
 from rlp.utils import ascii_chr
+from secp256k1 import PublicKey, ALL_FLAGS
 
-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
+from ethereum import utils, opcodes
+from ethereum.utils import safe_ord, decode_hex
 
 
 ZERO_PRIVKEY_ADDR = decode_hex('3f17f1962b36e491b30a40b2405849e597ba5fb5')
@@ -22,18 +16,40 @@ def proc_ecrecover(ext, msg):
     gas_cost = OP_GAS
     if msg.gas < gas_cost:
         return 0, 0, []
-    b = [0] * 32
-    msg.data.extract_copy(b, 0, 0, 32)
-    h = b''.join([ascii_chr(x) for x in b])
+
+    message_hash_bytes = [0] * 32
+    msg.data.extract_copy(message_hash_bytes, 0, 0, 32)
+    message_hash = b''.join(map(ascii_chr, message_hash_bytes))
+
+    # TODO: This conversion isn't really necessary.
+    # TODO: Invesitage if the check below is really needed.
     v = msg.data.extract32(32)
     r = msg.data.extract32(64)
     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 = ecdsa_recover_raw(h, (v, r, s))
-    if recovered_addr in (False, (0, 0)):
+
+    signature_bytes = [0] * 64
+    msg.data.extract_copy(signature_bytes, 0, 64, 32)
+    msg.data.extract_copy(signature_bytes, 32, 96, 32)
+    signature = b''.join(map(ascii_chr, signature_bytes))
+
+    pk = PublicKey(flags=ALL_FLAGS)
+    try:
+        pk.public_key = pk.ecdsa_recover(
+            message_hash,
+            pk.ecdsa_recoverable_deserialize(
+                signature,
+                v - 27
+            ),
+            raw=True
+        )
+    except Exception:
+        # Recovery failed
         return 1, msg.gas - gas_cost, []
-    pub = bitcoin.encode_pubkey(recovered_addr, 'bin')
+
+    pub = pk.serialize(compressed=False)
     o = [0] * 12 + [safe_ord(x) for x in utils.sha3(pub[1:])[-20:]]
     return 1, msg.gas - gas_cost, o
 

ethereum/transactions.py

@@ -1,23 +1,17 @@
 # -*- coding: utf8 -*-
 import rlp
-from bitcoin import encode_pubkey, N, P
+from bitcoin import encode_pubkey, N, P, encode_privkey
 from rlp.sedes import big_endian_int, binary
-from rlp.utils import decode_hex, encode_hex, str_to_bytes, ascii_chr
+from rlp.utils import encode_hex, str_to_bytes, ascii_chr
+from secp256k1 import PublicKey, ALL_FLAGS, PrivateKey
 
 from ethereum.exceptions import InvalidTransaction
 from ethereum import bloom
 from ethereum import opcodes
 from ethereum import utils
 from ethereum.slogging import get_logger
-from ethereum.utils import TT256, mk_contract_address
+from ethereum.utils import TT256, mk_contract_address, zpad, int_to_32bytearray, big_endian_to_int
 
-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')
 
@@ -85,10 +79,22 @@ def sender(self):
                 log.debug('recovering sender')
                 rlpdata = rlp.encode(self, UnsignedTransaction)
                 rawhash = utils.sha3(rlpdata)
-                pub = ecdsa_recover_raw(rawhash, (self.v, self.r, self.s))
-                if pub is False:
+
+                pk = PublicKey(flags=ALL_FLAGS)
+                try:
+                    pk.public_key = pk.ecdsa_recover(
+                        rawhash,
+                        pk.ecdsa_recoverable_deserialize(
+                            zpad("".join(chr(c) for c in int_to_32bytearray(self.r)), 32) + zpad("".join(chr(c) for c in int_to_32bytearray(self.s)), 32),
+                            self.v - 27
+                        ),
+                        raw=True
+                    )
+                    pub = pk.serialize(compressed=False)
+                except Exception:
                     raise InvalidTransaction("Invalid signature values (x^3+7 is non-residue)")
-                if pub == (0, 0):
+
+                if pub[1:] == "\x00" * 32:
                     raise InvalidTransaction("Invalid signature (zero privkey cannot sign)")
                 pub = encode_pubkey(pub, 'bin')
                 self._sender = utils.sha3(pub[1:])[-20:]
@@ -106,10 +112,23 @@ def sign(self, key):
 
         A potentially already existing signature would be overridden.
         """
-        if key in (0, '', '\x00' * 32):
+        if key in (0, '', '\x00' * 32, '0' * 64):
             raise InvalidTransaction("Zero privkey cannot sign")
         rawhash = utils.sha3(rlp.encode(self, UnsignedTransaction))
-        self.v, self.r, self.s = ecdsa_sign_raw(rawhash, key)
+
+        if len(key) == 64:
+            # we need a binary key
+            key = encode_privkey(key, 'bin')
+
+        pk = PrivateKey(key, raw=True)
+        signature = pk.ecdsa_recoverable_serialize(
+            pk.ecdsa_sign_recoverable(rawhash, raw=True)
+        )
+        signature = signature[0] + chr(signature[1])
+        self.v = ord(signature[64]) + 27
+        self.r = big_endian_to_int(signature[0:32])
+        self.s = big_endian_to_int(signature[32:64])
+
         self.sender = utils.privtoaddr(key)
         return self
 

requirements.txt

@@ -7,3 +7,4 @@ pycryptodome>=3.3.1
 scrypt
 rlp==0.4.4
 https://github.com/ethereum/ethash/tarball/master
+git+https://github.com/ulope/secp256k1-py#egg=secp256k1

setup.cfg

@@ -6,3 +6,5 @@ tag = True
 [bumpversion:file:setup.py]
 search = version = "{current_version}"
 
+[aliases]
+test = pytest

setup.py

@@ -1,38 +1,15 @@
-import sys
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
 
 
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
 with open('README.rst') as readme_file:
     readme = readme_file.read()
 
-
-console_scripts = []
-
-cmdclass = dict(test=PyTest)
-
 # requirements
 install_requires = set(x.strip() for x in open('requirements.txt'))
 install_requires_replacements = {
-    'https://github.com/ethereum/ethash/tarball/master': 'pyethash'}
+    'https://github.com/ethereum/ethash/tarball/master': 'pyethash',
+    'git+https://github.com/ulope/secp256k1-py#egg=secp256k1': 'secp256k1'
+}
 install_requires = [install_requires_replacements.get(r, r) for r in install_requires]
 
 # dev requirements
@@ -45,14 +22,19 @@ def run_tests(self):
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
 version = '1.1.0'
 
-setup(name="ethereum",
-      packages=find_packages("."),
-      description='Next generation cryptocurrency network',
-      long_description=readme,
-      url='https://github.com/ethereum/pyethereum/',
-      install_requires=install_requires,
-      tests_require=tests_require,
-      entry_points=dict(console_scripts=console_scripts),
-      version=version,
-      cmdclass=cmdclass
-      )
+setup(
+    name="ethereum",
+    packages=find_packages("."),
+    description='Next generation cryptocurrency network',
+    long_description=readme,
+    url='https://github.com/ethereum/pyethereum/',
+    install_requires=install_requires,
+    tests_require=tests_require,
+    setup_requires=[
+        'pytest-runner==2.7'
+    ],
+    dependency_links=[
+        "https://github.com/ulope/secp256k1-py/archive/master.zip#egg=secp256k1-0.11.1"
+    ],
+    version=version,
+)