Merge pull request #1 from ethereum/develop

Latest develop

Author: musalbas

.travis.yml

@@ -1,26 +1,26 @@
 language: python
 python: 2.7
-sudo: false  # use new infrastructure
+sudo: false
 env:
-  - TOX_ENV=py27
-
+- TOX_ENV=py27
 install:
-  - pip install -r requirements.txt
-  - pip install -r dev_requirements.txt
-
+- pip install -r requirements.txt
+- pip install -r dev_requirements.txt
 script:
-- coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
+- coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore
+  ethereum/tests/test_state.py
 - coverage run --append --source ethereum -m py.test ethereum/tests/test_vm.py
 - coverage run --append --source ethereum -m py.test ethereum/tests/test_state.py
-
 after_success:
 - coveralls
-
+notifications:
+  slack:
+    secure: W/UAhQ/GgYwMWrl3aiVAVOWr4WGdWrxUOX/rTB3ZgwDwGqDYLzQO5UqbsQlo1JXPZ6JOWfIPMURhHu7DSfue9dBW6xQ+NL+bFHe9lSXG4nqFK3IjezYyTBzNRJRDbGUvSSqgj6D5cwhJ8BjfUIRPbJz3CxL64KmsNXezEaMY60w=
 deploy:
   provider: pypi
   user: ethereum_pypi_automated
   password:
-    secure: "FvkEn1xULi9mGxAL9sKlTuxJZvk0Uyd2GaDPAHN5ZAfaJUNwzA6+m7PRAMPd44Uy/LOw0+Ah9X1rxAxZc+7yx+FJjwH1Nl8MjtqYTWp+Ue6TFUNdJXNHjekC5ce4rbULudrqlmwmaWzi5iRC7qhpxuTg1y3iBw3Fsd8E82qbDac="
+    secure: FvkEn1xULi9mGxAL9sKlTuxJZvk0Uyd2GaDPAHN5ZAfaJUNwzA6+m7PRAMPd44Uy/LOw0+Ah9X1rxAxZc+7yx+FJjwH1Nl8MjtqYTWp+Ue6TFUNdJXNHjekC5ce4rbULudrqlmwmaWzi5iRC7qhpxuTg1y3iBw3Fsd8E82qbDac=
   on:
     tags: true
     repo: ethereum/pyethereum

ethereum/config.py

@@ -43,8 +43,8 @@
     EXPDIFF_FREE_PERIODS=2,
     # Blank account initial nonce
     ACCOUNT_INITIAL_NONCE=0,
-    # Homestead fork (500k on livenet?)
-    HOMESTEAD_FORK_BLKNUM=1000000,
+    # Homestead fork
+    HOMESTEAD_FORK_BLKNUM=1150000,
     HOMESTEAD_DIFF_ADJUSTMENT_CUTOFF=10,
 )
 assert default_config['NEPHEW_REWARD'] == \

ethereum/processblock.py

@@ -10,6 +10,7 @@
 from ethereum.exceptions import *
 from ethereum.utils import safe_ord, normalize_address, mk_contract_address
 from ethereum import transactions
+import ethereum.config as config
 
 sys.setrecursionlimit(100000)
 
@@ -80,6 +81,8 @@ def rp(what, actual, target):
     # (1) The transaction signature is valid;
     if not tx.sender:  # sender is set and validated on Transaction initialization
         raise UnsignedTransaction(tx)
+    if block.number >= config.default_config["HOMESTEAD_FORK_BLKNUM"]:
+            tx.check_low_s()
 
     # (2) the transaction nonce is valid (equivalent to the
     #     sender account's current nonce);

ethereum/slogging.py

@@ -16,7 +16,6 @@
 known_loggers = set()
 
 log_listeners = []
-print_logs=True
 
 
 # add level trace into logging
@@ -39,17 +38,12 @@ class LogRecorder(object):
     def __init__(self):
         self._records = []
         log_listeners.append(self._add_log_record)
-        global print_logs
-        self.prev_print_logs = print_logs
-        print_logs = False
 
     def pop_records(self):
         # can only be called once
         r = self._records[:]
         self._records = None
         log_listeners.remove(self._add_log_record)
-        global print_logs
-        print_logs = self.prev_print_logs
         return r
 
     def _add_log_record(self, msg):
@@ -132,17 +126,13 @@ def bind(self, **kwargs):
         return BoundLogger(self, kwargs)
 
     def _log(self, level, msg, args, **kwargs):
-        for listener in log_listeners:
-            kwargs['event'] = msg
-            listener(kwargs)
         exc_info = kwargs.pop('exc_info', None)
         extra = kwargs.pop('extra', {})
         highlight = kwargs.pop('highlight', False)
         extra['kwargs'] = kwargs
         extra['original_msg'] = msg
         msg = self.format_message(msg, kwargs, highlight)
-        if print_logs:
-            super(SLogger, self)._log(level, msg, args, exc_info, extra)
+        super(SLogger, self)._log(level, msg, args, exc_info, extra)
 
     def DEV(self, msg, *args, **kwargs):
         """Shortcut to output highlighted log text"""

ethereum/tests/test_transactions.py

@@ -4,6 +4,7 @@
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 import ethereum.testutils as testutils
 from ethereum.testutils import fixture_to_bytes
+import ethereum.config as config
 import sys
 import json
 import os
@@ -24,6 +25,9 @@ def run_test(filename, testname, testdata):
         rlpdata = decode_hex(testdata["rlp"][2:])
         o = {}
         tx = rlp.decode(rlpdata, transactions.Transaction)
+        blknum = int(testdata["blocknumber"])
+        if blknum >= config.default_config["HOMESTEAD_FORK_BLKNUM"]:
+            tx.check_low_s()
         o["sender"] = tx.sender
         o["transaction"] = {
             "data": b'0x' * (len(tx.data) > 0) + encode_hex(tx.data),

ethereum/transactions.py

@@ -170,6 +170,13 @@ def __repr__(self):
     def __structlog__(self):
         return encode_hex(self.hash)
 
+    # This method should be called for block numbers >= HOMESTEAD_FORK_BLKNUM only.
+    # The >= operator is replaced by > because the integer division N/2 always produces the value
+    # which is by 0.5 less than the real N/2
+    def check_low_s(self):
+        if self.s > N/2 or self.s == 0:
+            raise InvalidTransaction("Invalid signature S value!")
+
 
 UnsignedTransaction = Transaction.exclude(['v', 'r', 's'])
 

fixtures

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.8
+current_version = 1.1.0
 commit = True
 tag = True
 

setup.cfg

@@ -43,7 +43,7 @@ def run_tests(self):
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
-version = '1.0.8'
+version = '1.1.0'
 
 setup(name="ethereum",
       packages=find_packages("."),