Merge branch 'master' into develop

catalyst/constants.py

@@ -43,4 +43,4 @@ ENIGMA_CONTRACT = 'https://raw.githubusercontent.com/enigmampc/catalyst/' \
 
 ENIGMA_CONTRACT_ABI = 'https://raw.githubusercontent.com/enigmampc/' \
                       'catalyst/develop/catalyst/marketplace/' \
-                      'contract_enigma_abi.json'
+                      'contract_enigma_abi.json'

etc/docker_cmd.sh

@@ -16,4 +16,4 @@ fi
 
 jupyter notebook -y --no-browser --notebook-dir=${PROJECT_DIR} \
     --certfile=${SSL_CERT_PEM} --keyfile=${SSL_CERT_KEY} --ip='*' \
-    --config=${CONFIG_PATH}
+    --config=${CONFIG_PATH} --allow-root

etc/python2.7-environment.yml

@@ -21,6 +21,8 @@ dependencies:
   - bottleneck==1.2.1
   - chardet==3.0.4
   - ccxt==1.10.1049
+  - web3==4.0.0b7
+  - requests-toolbelt==0.8.0
   - click==6.7
   - contextlib2==0.5.5
   - cycler==0.10.0

etc/requirements.txt

@@ -84,3 +84,5 @@ tables==3.3.0
 ccxt==1.10.1049
 boto3==1.4.8
 redo==1.6
+web3==4.0.0b7
+requests-toolbelt==0.8.0