From 67e70e127116d0b220143124d3f4143992bcdb5e Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben@z.cash>
Date: Wed, 25 Sep 2019 10:27:45 -0400
Subject: [PATCH 1/2] Allow reading RPC parameters from env

---
 pyZcash/settings.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pyZcash/settings.py b/pyZcash/settings.py
index 1fe4f8c..e5810ee 100644
--- a/pyZcash/settings.py
+++ b/pyZcash/settings.py
@@ -12,21 +12,25 @@ TIMEOUT = 600
 #Default fee to use on network for txs.
 DEFAULT_FEE = 0.01
 
-zcashconf = os.path.expanduser('~/.zcash/zcash.conf')
+# Try to get RPC parameters from environment
+if 'RPCUSER' in os.environ and 'RPCPASSWORD' in os.environ:
+    RPCUSER = os.getenviron('RPCUSER')
+    RPCPASSWORD = os.getenviron('RPCPASSWORD')
+else:
+    zcashconf = os.path.expanduser('~/.zcash/zcash.conf')
+    def read_config(filename):
+        f = open(filename)
+        for line in f:
+            if re.match('rpcuser', line):
+                user = line.strip('\n').split('=')[1]
+            if re.match('rpcpassword', line):
+                password = line.strip('\n').split('=')[1]
+        return (user, password)
 
-def read_config(filename):
-    f = open(filename)
-    for line in f:
-        if re.match('rpcuser', line):
-            user = line.strip('\n').split('=')[1]
-        if re.match('rpcpassword', line):
-            password = line.strip('\n').split('=')[1]
-    return (user, password)
-
-config = read_config(zcashconf)
-# from zcash conf
-RPCUSER = config[0]
-RPCPASSWORD = config[1]
+    config = read_config(zcashconf)
+    # from zcash conf
+    RPCUSER = config[0]
+    RPCPASSWORD = config[1]
 
 #TESTS
 #for tests (sample data here - replace with your own)

From 7fce7170a565af5e029a288235e1541e4092ffd7 Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben@z.cash>
Date: Wed, 25 Sep 2019 13:17:22 -0400
Subject: [PATCH 2/2] Fix RPC names

---
 pyZcash/settings.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pyZcash/settings.py b/pyZcash/settings.py
index e5810ee..3f6f8ce 100644
--- a/pyZcash/settings.py
+++ b/pyZcash/settings.py
@@ -4,8 +4,12 @@ import os, re
 testnet = "http://localhost:18232" #testnet
 mainnet = "http://localhost:8232"
 regtest = "http://localhost:18444"
+if 'ZCASH_NETWORK' in os.environ:
+    ZCASH_NETWORK = os.getenv('ZCASH_NETWORK')
+    NETWORK = ZCASH_NETWORK
 # Default is testnet
-NETWORK = testnet
+else:
+    NETWORK = testnet
 
 #Timeout needs to be high for any pour operations
 TIMEOUT = 600
@@ -14,8 +18,8 @@ DEFAULT_FEE = 0.01
 
 # Try to get RPC parameters from environment
 if 'RPCUSER' in os.environ and 'RPCPASSWORD' in os.environ:
-    RPCUSER = os.getenviron('RPCUSER')
-    RPCPASSWORD = os.getenviron('RPCPASSWORD')
+    RPCUSER = os.getenv('RPCUSER')
+    RPCPASSWORD = os.getenv('RPCPASSWORD')
 else:
     zcashconf = os.path.expanduser('~/.zcash/zcash.conf')
     def read_config(filename):