From 2a8db4e23699cda8526629924b2e4bd7a070685c Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 11 Feb 2021 15:41:13 +0200 Subject: [PATCH 1/5] Update start_ocean.sh --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 298ee8a..d75e366 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.1.13} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.4.6} +export PROVIDER_VERSION=${PROVIDER_VERSION:--additionalInput} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.9} export PROJECT_NAME="ocean" export FORCEPULL="false" @@ -87,7 +87,7 @@ else fi #export OPERATOR_SERVICE_URL=http://127.0.0.1:8050 -export OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com +export OPERATOR_SERVICE_URL=https://nextv.operator.dev-ocean.com/ # Add aquarius to /etc/hosts From 7f91c12feff543b6956b01a14a20f0a4a28db223 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 11 Feb 2021 15:47:49 +0200 Subject: [PATCH 2/5] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index d75e366..995a53c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.1.13} -export PROVIDER_VERSION=${PROVIDER_VERSION:--additionalInput} +export PROVIDER_VERSION=${PROVIDER_VERSION:-additionalInput} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.9} export PROJECT_NAME="ocean" export FORCEPULL="false" From ff7f1c2fced0ad9af843a8ab6b13bb225e8527ee Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Sat, 13 Feb 2021 00:55:45 -0800 Subject: [PATCH 3/5] add 2nd provider --- compose-files/provider.yml | 4 ---- compose-files/provider2.yml | 25 +++++++++++++++++++++++++ start_ocean.sh | 7 ++++++- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 compose-files/provider2.yml diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 61445f5..48f7b5b 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -13,11 +13,7 @@ services: ARTIFACTS_PATH: "/ocean-contracts/artifacts" NETWORK_URL: ${NETWORK_RPC_URL} PARITY_URL: ${NETWORK_RPC_URL} - PROVIDER_KEY: ${PROVIDER_PRIVATE_KEY} PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY} - PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} - PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} - PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY} LOG_LEVEL: ${PROVIDER_LOG_LEVEL} OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030' OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS} diff --git a/compose-files/provider2.yml b/compose-files/provider2.yml new file mode 100644 index 0000000..6766c77 --- /dev/null +++ b/compose-files/provider2.yml @@ -0,0 +1,25 @@ +version: '3' +services: + provider2: + image: oceanprotocol/provider-py:${PROVIDER_VERSION:-latest} + ports: + - 8031:8030 + networks: + backend: + ipv4_address: 172.15.0.7 + depends_on: + - ocean-contracts + environment: + ARTIFACTS_PATH: "/ocean-contracts/artifacts" + NETWORK_URL: ${NETWORK_RPC_URL} + PARITY_URL: ${NETWORK_RPC_URL} + PROVIDER_PRIVATE_KEY: ${PROVIDER2_PRIVATE_KEY} + LOG_LEVEL: ${PROVIDER_LOG_LEVEL} + OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030' + OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS} + IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} + OCEAN_PROVIDER_TIMEOUT: '9000' + OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} + AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5000} + volumes: + - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/start_ocean.sh b/start_ocean.sh index 995a53c..b722ef7 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -75,10 +75,11 @@ CHECK_ELASTIC_VM_COUNT=true #Provider -export PROVIDER_LOG_LEVEL=INFO +export PROVIDER_LOG_LEVEL=${PROVIDER_LOG_LEVEL:-INFO} export PROVIDER_WORKERS=1 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215 +export PROVIDER2_PRIVATE_KEY=0xc852b55146fd168ec3d392bbd70988c18463efa460a395dede376453aca1180e if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 @@ -186,6 +187,10 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}" printf $COLOR_Y'Starting without Provider...\n\n'$COLOR_RESET ;; + --with-provider2) + COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider2.yml" + printf $COLOR_Y'Starting with a 2nd Provider...\n\n'$COLOR_RESET + ;; --no-ganache) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ganache.yml/}" COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ocean_contracts.yml/}" From 71b697448f5d3f9aea1ae981732d2c8224111ddf Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 15 Feb 2021 21:13:16 +0200 Subject: [PATCH 4/5] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index b722ef7..6bf43e2 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -76,7 +76,7 @@ CHECK_ELASTIC_VM_COUNT=true #Provider export PROVIDER_LOG_LEVEL=${PROVIDER_LOG_LEVEL:-INFO} -export PROVIDER_WORKERS=1 +export PROVIDER_WORKERS=10 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215 export PROVIDER2_PRIVATE_KEY=0xc852b55146fd168ec3d392bbd70988c18463efa460a395dede376453aca1180e From 6b678f42347efb5181bf4d7231faeadda222a73a Mon Sep 17 00:00:00 2001 From: ssallam Date: Thu, 18 Feb 2021 11:45:51 +0100 Subject: [PATCH 5/5] use latest provider, adjust indentation. --- start_ocean.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 6bf43e2..d8c153d 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.1.13} -export PROVIDER_VERSION=${PROVIDER_VERSION:-additionalInput} +export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.9} export PROJECT_NAME="ocean" export FORCEPULL="false" @@ -187,8 +187,8 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}" printf $COLOR_Y'Starting without Provider...\n\n'$COLOR_RESET ;; - --with-provider2) - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider2.yml" + --with-provider2) + COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider2.yml" printf $COLOR_Y'Starting with a 2nd Provider...\n\n'$COLOR_RESET ;; --no-ganache)