Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Conflicts:
	ethereum/config.py

Author: vub

ethereum/blocks.py

@@ -93,7 +93,7 @@ def code(self, value):
         self.db.inc_refcount(self.code_hash, value)
 
     @classmethod
-    def blank_account(cls, db):
+    def blank_account(cls, db, initial_nonce=0):
         """Create a blank account
 
         The returned account will have zero nonce and balance, a blank storage
@@ -103,7 +103,7 @@ def blank_account(cls, db):
         """
         code_hash = utils.sha3(b'')
         db.put(code_hash, b'')
-        return cls(0, 0, trie.BLANK_ROOT, code_hash, db)
+        return cls(initial_nonce, 0, trie.BLANK_ROOT, code_hash, db)
 
 
 class Receipt(rlp.Serializable):
@@ -699,7 +699,7 @@ def _get_acct(self, address):
             acct._mutable = True
             acct._cached_rlp = None
         else:
-            acct = Account.blank_account(self.db)
+            acct = Account.blank_account(self.db, self.config['ACCOUNT_INITIAL_NONCE'])
         return acct
 
     def _get_acct_item(self, address, param):
@@ -854,7 +854,7 @@ def increment_nonce(self, address):
         :returns: `True` if successful, otherwise `False`
         """
         if self.get_nonce(address) == 0:
-            return self._delta_item(address, 'nonce', self.config['STARTING_ACCT_NONCE'] + 1)
+            return self._delta_item(address, 'nonce', self.config['ACCOUNT_INITIAL_NONCE'] + 1)
         else:
             return self._delta_item(address, 'nonce', 1)
 

ethereum/config.py

@@ -41,8 +41,8 @@
     # Exponential difficulty timebomb period
     EXPDIFF_PERIOD=100000,
     EXPDIFF_FREE_PERIODS=2,
-    # Starting nonce
-    STARTING_ACCT_NONCE=0
+    # Blank account initial nonce
+    ACCOUNT_INITIAL_NONCE=0,
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32

ethereum/slogging.py

@@ -1,6 +1,6 @@
 import logging
 import json
-from logging import StreamHandler, Formatter
+from logging import StreamHandler, Formatter, FileHandler
 from ethereum.utils import bcolors, isnumeric
 
 
@@ -9,6 +9,7 @@
 JSON_FORMAT = '%(message)s'
 
 PRINT_FORMAT = '%(levelname)s:%(name)s\t%(message)s'
+FILE_PREFIX = '%(asctime)s'
 
 TRACE = 5
 
@@ -193,7 +194,7 @@ def getLogger(name=None):
         return rootLogger
 
 
-def configure(config_string=None, log_json=False):
+def configure(config_string=None, log_json=False, log_file=None):
     if not config_string:
         config_string = ":{}".format(DEFAULT_LOGLEVEL)
 
@@ -209,6 +210,12 @@ def configure(config_string=None, log_json=False):
         formatter = Formatter(log_format)
         handler.setFormatter(formatter)
         rootLogger.addHandler(handler)
+    if log_file:
+        if not any(isinstance(hndlr, FileHandler) for hndlr in rootLogger.handlers):
+            handler = FileHandler(log_file)
+            formatter = Formatter("{} {}".format(FILE_PREFIX, log_format))
+            handler.setFormatter(formatter)
+            rootLogger.addHandler(handler)
 
     # Reset logging levels before applying new config below
     for name, logger in SLogger.manager.loggerDict.items():

ethereum/transactions.py

@@ -1,6 +1,6 @@
 from bitcoin import encode_pubkey, N, P
 try:
-    from ecdsa_recover import ecdsa_raw_sign, ecdsa_raw_recover
+    from c_secp256k1 import ecdsa_raw_sign, ecdsa_raw_recover
 except ImportError:
     from bitcoin import ecdsa_raw_sign, ecdsa_raw_recover
 import rlp

setup.py

@@ -51,6 +51,6 @@ def run_tests(self):
       install_requires=install_requires,
       tests_require=tests_require,
       entry_points=dict(console_scripts=console_scripts),
-      version='1.0.3',
+      version='1.0.5',
       cmdclass=cmdclass
       )