Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/compute nextv #229

Merged
merged 5 commits into from
Feb 18, 2021
Merged

Feature/compute nextv #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a8db4e
Update start_ocean.sh
alexcos20 Feb 11, 2021
7f91c12
Update start_ocean.sh
alexcos20 Feb 11, 2021
ff7f1c2
add 2nd provider
alexcos20 Feb 13, 2021
71b6974
Update start_ocean.sh
alexcos20 Feb 15, 2021
6b678f4
use latest provider, adjust indentation.
Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions compose-files/provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
25 changes: 25 additions & 0 deletions compose-files/provider2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
13 changes: 9 additions & 4 deletions start_ocean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:-latest}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.9}
export PROJECT_NAME="ocean"
export FORCEPULL="false"
Expand Down Expand Up @@ -75,10 +75,11 @@ CHECK_ELASTIC_VM_COUNT=true


#Provider
export PROVIDER_LOG_LEVEL=INFO
export PROVIDER_WORKERS=1
export PROVIDER_LOG_LEVEL=${PROVIDER_LOG_LEVEL:-INFO}
export PROVIDER_WORKERS=10
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
Expand All @@ -87,7 +88,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
Expand Down Expand Up @@ -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/}"
Expand Down