From 55521b87b919014d13e2ce23690a2bf5ed53c076 Mon Sep 17 00:00:00 2001 From: Guy Thouret Date: Mon, 22 Jan 2018 11:11:37 +0000 Subject: [PATCH 1/5] Allow jupyter to run as root inside Docker image Signed-off-by: Guy Thouret --- etc/docker_cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/docker_cmd.sh b/etc/docker_cmd.sh index 30308a61..b4c9f348 100755 --- a/etc/docker_cmd.sh +++ b/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 From ee93b16558d9bda15f82e52e8fcf2d83f8ea107f Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Sun, 4 Feb 2018 08:42:42 -0800 Subject: [PATCH 2/5] BLD:Solidity contract addressed added to constants --- catalyst/constants.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/catalyst/constants.py b/catalyst/constants.py index c4111fdd..94d2487c 100644 --- a/catalyst/constants.py +++ b/catalyst/constants.py @@ -16,3 +16,9 @@ DATE_TIME_FORMAT = '%Y-%m-%d %H:%M' DATE_FORMAT = '%Y-%m-%d' AUTO_INGEST = False + +''' +Marketplace and Enigma contract +''' +ADDRESS_MARKETPLACE_CONTRACT = '0x7fAec9aaE31BE428DeAAE1be8195dF609079Fd10' +ADDRESS_ENIGMA_CONTRACT = '0x4fe3d3c2d8c0730d565789ddd3b63e53f342a482' \ No newline at end of file From 5889f4c74bf5dc8ac7a33c230cffcdf40271622e Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Sun, 4 Feb 2018 08:45:06 -0800 Subject: [PATCH 3/5] BLD: added smart contract addresses --- catalyst/constants.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/constants.py b/catalyst/constants.py index 94d2487c..fbc973cc 100644 --- a/catalyst/constants.py +++ b/catalyst/constants.py @@ -18,7 +18,7 @@ DATE_FORMAT = '%Y-%m-%d' AUTO_INGEST = False ''' -Marketplace and Enigma contract +Marketplace and Enigma contract current network: Ropsten ''' -ADDRESS_MARKETPLACE_CONTRACT = '0x7fAec9aaE31BE428DeAAE1be8195dF609079Fd10' -ADDRESS_ENIGMA_CONTRACT = '0x4fe3d3c2d8c0730d565789ddd3b63e53f342a482' \ No newline at end of file +ADDRESS_MARKETPLACE_CONTRACT = '0x4fe3d3c2d8c0730d565789ddd3b63e53f342a482' +ADDRESS_ENIGMA_CONTRACT = '0x7fAec9aaE31BE428DeAAE1be8195dF609079Fd10' \ No newline at end of file From 881e3e595391dbf972d2017c64ded2b7965f0fc0 Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Sun, 4 Feb 2018 08:51:27 -0800 Subject: [PATCH 4/5] REV:constants.py revert --- catalyst/constants.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/catalyst/constants.py b/catalyst/constants.py index fbc973cc..517b20d2 100644 --- a/catalyst/constants.py +++ b/catalyst/constants.py @@ -17,8 +17,3 @@ DATE_FORMAT = '%Y-%m-%d' AUTO_INGEST = False -''' -Marketplace and Enigma contract current network: Ropsten -''' -ADDRESS_MARKETPLACE_CONTRACT = '0x4fe3d3c2d8c0730d565789ddd3b63e53f342a482' -ADDRESS_ENIGMA_CONTRACT = '0x7fAec9aaE31BE428DeAAE1be8195dF609079Fd10' \ No newline at end of file From 793b6e92d8c1d58aca9838b1aba579ad1fcdaa6c Mon Sep 17 00:00:00 2001 From: Frederic Fortier Date: Thu, 8 Feb 2018 00:47:25 -0500 Subject: [PATCH 5/5] BLD: included marketplace dependencies --- etc/python2.7-environment.yml | 2 ++ etc/requirements.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/etc/python2.7-environment.yml b/etc/python2.7-environment.yml index 4232bdbb..4f06bbae 100644 --- a/etc/python2.7-environment.yml +++ b/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 diff --git a/etc/requirements.txt b/etc/requirements.txt index 7c5f2e62..5d890d2e 100644 --- a/etc/requirements.txt +++ b/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