From a9773e820e96674ae1f498e51e67500be4d3cae6 Mon Sep 17 00:00:00 2001
From: Thomas McCabe <TomMcCabe@users.noreply.github.com>
Date: Fri, 26 Feb 2016 10:34:36 -0600
Subject: [PATCH] Consolidate settings in constants.py to eliminate
 redundancies in sidechain-manipulation.py

045b310 Import settings from constants.py into sidechain-manipulation.py

b698a88 Restore original value of secondScriptPubKey to sidechain-manipulation.py

7474a1c Update alpha-README.md - edit RPC info in constants.py instead of sidechain-manipulation.py
---
 alpha-README.md                   |  2 +-
 contrib/sidechain-manipulation.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/alpha-README.md b/alpha-README.md
index 33bdd0df68..c1e65f550a 100644
--- a/alpha-README.md
+++ b/alpha-README.md
@@ -46,7 +46,7 @@ for notes on dependencies that must be installed before beginning.
 ```bash
   git clone https://github.com/jgarzik/python-bitcoinrpc
 ```
-5\. Edit sidechain-manipulation.py (replace `user:pass` with your RPC username and password):
+5\. Edit contrib/fedpeg/constants.py (replace `user:pass` with your RPC username and password):
 ```python
   # VARIOUS SETTINGS...
   sidechain_url = "http://user:pass@127.0.0.1:4241"
diff --git a/contrib/sidechain-manipulation.py b/contrib/sidechain-manipulation.py
index d52c396058..2019350703 100755
--- a/contrib/sidechain-manipulation.py
+++ b/contrib/sidechain-manipulation.py
@@ -4,6 +4,8 @@
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../python-bitcoinrpc"))
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
 from decimal import *
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "fedpeg/"))
+from constants import FedpegConstants
 
 # Command line arguments
 parser = argparse.ArgumentParser(description = 'Script that accommodates the ' \
@@ -50,12 +52,14 @@
 args = parser.parse_args()
 
 # VARIOUS SETTINGS...
-sidechain_url = "http://user:pass@127.0.0.1:4241"
-bitcoin_url = "http://user:pass@127.0.0.1:18332"
+settings = FedpegConstants
 
-redeem_script = "55210269992fb441ae56968e5b77d46a3e53b69f136444ae65a94041fc937bdb28d93321021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a2102174c82021492c2c6dfcbfa4187d10d38bed06afb7fdcd72c880179fddd641ea121033f96e43d72c33327b6a4631ccaa6ea07f0b106c88b9dc71c9000bb6044d5e88a210313d8748790f2a86fb524579b46ce3c68fedd58d2a738716249a9f7d5458a15c221030b632eeb079eb83648886122a04c7bf6d98ab5dfb94cf353ee3e9382a4c2fab02102fb54a7fcaa73c307cfd70f3fa66a2e4247a71858ca731396343ad30c7c4009ce57ae"
+sidechain_url = settings.sidechain_url
+bitcoin_url = settings.bitcoin_url
+
+redeem_script = settings.redeem_script
+secondScriptPubKeyHash = settings.secondScriptPubKeyHash
 secondScriptPubKey = "OP_DROP 144 OP_LESSTHANOREQUAL"
-secondScriptPubKeyHash = "9eac001049d5c38ece8996485418421f4a01e2d7"
 
 #Bitcoin:
 bitcoin_genesis_hash = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"