Make initial account nonce configurable

Needed for ethereum/pyethapp#63

Author: ulope

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):
@@ -698,7 +698,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):

ethereum/config.py

@@ -40,7 +40,9 @@
     MAX_EXTRADATA_LENGTH=32,
     # Exponential difficulty timebomb period
     EXPDIFF_PERIOD=100000,
-    EXPDIFF_FREE_PERIODS=2
+    EXPDIFF_FREE_PERIODS=2,
+    # Blank account initial nonce
+    ACCOUNT_INITIAL_NONCE=0,
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32