Merge branch 'master' of github.com:pipermerriam/py-geth

Author: pipermerriam

.gitignore

@@ -49,3 +49,6 @@ docs/_build
 
 # Known Contracts
 **/known_contracts.json
+
+# Created by tox run for geth logs
+logs

geth/accounts.py

@@ -38,6 +38,61 @@ def get_accounts(data_dir, **geth_kwargs):
 
 
 def create_new_account(data_dir, password, **geth_kwargs):
+    """Creates a new Ethereum account on geth.
+
+    This is useful for testing when you want to stress
+    interaction (transfers) between Ethereum accounts.
+
+    This command communicates with ``geth`` command over
+    terminal interaction. It creates keystore folder and new
+    account there.
+
+    This function only works against offline geth processes,
+    because geth builds an account cache when starting up.
+    If geth process is already running you can create new
+    accounts using
+    `web3.personal.newAccount()
+    <https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console#personalnewaccount>_`
+    RPC API.
+
+
+    Example py.test fixture for tests:
+
+    .. code-block:: python
+
+        import os
+
+        from geth.wrapper import DEFAULT_PASSWORD_PATH
+        from geth.accounts import create_new_account
+
+
+        @pytest.fixture
+        def target_account() -> str:
+            '''Create a new Ethereum account on a running Geth node.
+
+            The account can be used as a withdrawal target for tests.
+
+            :return: 0x address of the account
+            '''
+
+            # We store keystore files in the current working directory
+            # of the test run
+            data_dir = os.getcwd()
+
+            # Use the default password "this-is-not-a-secure-password"
+            # as supplied in geth/default_blockchain_password file.
+            # The supplied password must be bytes, not string,
+            # as we only want ASCII characters and do not want to
+            # deal encoding problems with passwords
+            account = create_new_account(data_dir, DEFAULT_PASSWORD_PATH)
+            return account
+
+    :param data_dir: Geth data fir path - where to keep "keystore" folder
+    :param password: Path to a file containing the password
+        for newly created account
+    :param geth_kwargs: Extra command line arguments passwrord to geth
+    :return: Account as 0x prefixed hex string
+    """
     if os.path.exists(password):
         geth_kwargs['password'] = password
 

geth/chain.py

@@ -85,14 +85,22 @@ def write_genesis_file(genesis_file_path,
                        difficulty="0x400",
                        mixhash="0x0000000000000000000000000000000000000000000000000000000000000000",  # NOQA
                        coinbase="0x3333333333333333333333333333333333333333",
-                       alloc=None):
+                       alloc=None,
+                       config=None):
 
     if os.path.exists(genesis_file_path) and not overwrite:
         raise ValueError("Genesis file already present.  call with `overwrite=True` to overwrite this file")  # NOQA
 
     if alloc is None:
         alloc = {}
 
+    if config is None:
+        config = {
+            'homesteadBlock': 0,
+            'daoForkBlock': 0,
+            'daoForSupport': True,
+        }
+
     genesis_data = {
         "nonce": nonce,
         "timestamp": timestamp,
@@ -103,6 +111,7 @@ def write_genesis_file(genesis_file_path,
         "mixhash": mixhash,
         "coinbase": coinbase,
         "alloc": alloc,
+        "config": config,
     }
 
     with open(genesis_file_path, 'w') as genesis_file:

geth/utils/proc.py

@@ -1,26 +1,40 @@
-import time
 import signal
 
 import gevent
 
 
-def wait_for_popen(proc, max_wait=5):
-    wait_till = time.time() + 5
-    while proc.poll() is None and time.time() < wait_till:
-        gevent.sleep(0.1)
+def wait_for_popen(proc, timeout=30):
+    try:
+        with gevent.Timeout(30):
+            while proc.poll() is None:
+                gevent.sleep(0.1)
+    except gevent.Timeout:
+        pass
 
 
 def kill_proc(proc):
     try:
         if proc.poll() is None:
-            proc.send_signal(signal.SIGINT)
-            wait_for_popen(proc, 5)
+            try:
+                proc.send_signal(signal.SIGINT)
+                wait_for_popen(proc, 30)
+            except KeyboardInterrupt:
+                print(
+                    "Trying to close geth process.  Press Ctrl+C 2 more times "
+                    "to force quit"
+                )
         if proc.poll() is None:
-            proc.terminate()
-            wait_for_popen(proc, 2)
+            try:
+                proc.terminate()
+                wait_for_popen(proc, 10)
+            except KeyboardInterrupt:
+                print(
+                    "Trying to close geth process.  Press Ctrl+C 1 more times "
+                    "to force quit"
+                )
         if proc.poll() is None:
             proc.kill()
-            wait_for_popen(proc, 1)
+            wait_for_popen(proc, 2)
     except KeyboardInterrupt:
         proc.kill()