From c21e165e370bc0c03a814b3dba72178c314293c4 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 7 Nov 2019 15:43:22 +0100 Subject: [PATCH 1/9] switch to latest v2 components --- README.md | 2 +- start_ocean.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 28ce767..b0bdc7d 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | | -------- | --------- | -------------- | --------- | -------- | -------- | -| `v0.3.9` | `v0.4.6` | `v0.1.2` | `v0.12.7` | `v1.3.1` | `v0.3.2` | +| `v0.4.2` | `v0.6.0` | `v0.3.0` | `v0.12.7` | `v1.3.1` | `v0.3.2` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. diff --git a/start_ocean.sh b/start_ocean.sh index 0dda182..5997135 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,9 +25,9 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.9} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.6} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.1.2} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.4.2} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.6.0} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v1.3.1} From a095b00cb04841257c7339fe72d2a61a17a65ec9 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 14 Nov 2019 14:15:32 +0100 Subject: [PATCH 2/9] bump to Aquarius v1.0.2 --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 5997135..022611d 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,7 +25,7 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.4.2} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.2} export BRIZO_VERSION=${BRIZO_VERSION:-v0.6.0} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} From e1002741de1273d841a8576e71000c793fb0a7c4 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 14 Nov 2019 15:56:00 +0100 Subject: [PATCH 3/9] bump to Commons v2.0.0-beta.1 --- README.md | 2 +- start_ocean.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b0bdc7d..9e6c12b 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | | -------- | --------- | -------------- | --------- | -------- | -------- | -| `v0.4.2` | `v0.6.0` | `v0.3.0` | `v0.12.7` | `v1.3.1` | `v0.3.2` | +| `v1.0.2` | `v0.6.0` | `v0.3.0` | `v0.12.7` | `v2.0.0` | `v0.3.2` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. diff --git a/start_ocean.sh b/start_ocean.sh index 022611d..4fcac33 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,8 +30,8 @@ export BRIZO_VERSION=${BRIZO_VERSION:-v0.6.0} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v1.3.1} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v1.3.1} +export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.1} +export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.1} export PARITY_IMAGE="parity/parity:v2.5.7-stable" From 0ee4407fca6ade2e0aa8d7d960b5d64838c25308 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 15 Nov 2019 12:08:46 +0100 Subject: [PATCH 4/9] bump to Brizo v0.7.0 --- README.md | 2 +- start_ocean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9e6c12b..681b65b 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | | -------- | --------- | -------------- | --------- | -------- | -------- | -| `v1.0.2` | `v0.6.0` | `v0.3.0` | `v0.12.7` | `v2.0.0` | `v0.3.2` | +| `v1.0.2` | `v0.7.0` | `v0.3.0` | `v0.12.7` | `v2.0.0` | `v0.3.2` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. diff --git a/start_ocean.sh b/start_ocean.sh index 4fcac33..44de025 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -26,7 +26,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.2} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.6.0} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.0} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} From 96878d6c514d186115edbf103c05301b575181c3 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 15 Nov 2019 12:48:37 +0100 Subject: [PATCH 5/9] bump Commons --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 44de025..f347a2a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,8 +30,8 @@ export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.0} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.1} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.1} +export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.2} +export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.2} export PARITY_IMAGE="parity/parity:v2.5.7-stable" From cd0ee51081e65800f3d7ef4d530ed288261e727c Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 20 Nov 2019 17:31:58 +0100 Subject: [PATCH 6/9] Add operator service envvar for brizo compute. --- compose-files/brizo.yml | 1 + start_ocean.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 438c824..beda946 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -23,6 +23,7 @@ services: LOG_LEVEL: ${BRIZO_LOG_LEVEL} BRIZO_WORKERS: ${BRIZO_WORKERS} IPFS_GATEWAY: ${BRIZO_IPFS_GATEWAY} + OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ${ACCOUNTS_FOLDER}:/accounts diff --git a/start_ocean.sh b/start_ocean.sh index f347a2a..9959ab5 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -124,6 +124,8 @@ export COMMONS_FAUCET_URL=${FAUCET_URL} export COMMONS_IPFS_GATEWAY_URI=https://ipfs.oceanprotocol.com export COMMONS_IPFS_NODE_URI=https://ipfs.oceanprotocol.com:443 +export OPERATOR_SERVICE_URL=http://127.0.0.1:8050 + # Export User UID and GID export LOCAL_USER_ID=$(id -u) export LOCAL_GROUP_ID=$(id -g) From d6ccf5de3d582992455165f41994f8df430c649c Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 22 Nov 2019 12:54:32 +0100 Subject: [PATCH 7/9] bump components --- start_ocean.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 9959ab5..794a6ac 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,13 +25,13 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.2} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.0} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.3} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.2} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.2} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.2} +export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.3} +export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.3} export PARITY_IMAGE="parity/parity:v2.5.7-stable" From af5c91a26784a26773f9620aa366f08cedf5177a Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 6 Dec 2019 15:44:21 +0100 Subject: [PATCH 8/9] bump components --- README.md | 20 ++++++++++---------- start_ocean.sh | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 5ef7bea..f49116e 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,9 @@ The startup script comes with a set of options for customizing various things. The default versions are always a combination of component versions which are considered stable. -| Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | -| -------- | --------- | -------------- | --------- | -------- | -------- | -| `v1.0.2` | `v0.7.0` | `v0.3.0` | `v0.12.7` | `v2.0.0` | `v0.3.2` | +| Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | +| -------- | -------- | -------------- | --------- | -------- | -------- | +| `v1.0.5` | `v0.7.2` | `v0.3.4` | `v0.12.7` | `v2.0.0` | `v0.3.2` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. @@ -129,8 +129,8 @@ By default it will start two containers (client & server). If Commons is running This Building Block can be disabled by setting the `--no-commons` flag. -| Hostname | External Port | Internal URL | Local URL | Description | -|------------------|---------------|----------------------------|-----------------------|----------------------------------------------------------- | +| Hostname | External Port | Internal URL | Local URL | Description | +| ---------------- | ------------- | -------------------------- | --------------------- | ---------------------------------------------------------- | | `commons-client` | `3000` | http://commons-client:3000 | http://localhost:3000 | [Commons Client](https://github.com/oceanprotocol/commons) | | `commons-server` | `4000` | http://commons-server:4000 | http://locahost:4000 | [Commons Server](https://github.com/oceanprotocol/commons) | @@ -233,11 +233,11 @@ you will have available a keeper node in the local and private Spree Network wit | `0xe08A1dAe983BC701D05E492DB80e0144f8f4b909` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether | | `0xbcE5A3468386C64507D30136685A99cFD5603135` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether | -Use one of the above accounts to populate `PROVIDER_ADDRESS`, `PROVIDER_PASSWORD` and `PROVIDER_KEYFILE` in `start_ocean.sh`. -This account will is used in `brizo` and `events-handler` as the `provider` account which is important for processing the -service agreements flow. The `PROVIDER_KEYFILE` must be placed in the `accounts` folder and must match the ethereum -address from `PROVIDER_ADDRESS`. The `PROVIDER_ADDRESS` is also set in `commons` instance so that published assets get -assigned the correct provider address. +Use one of the above accounts to populate `PROVIDER_ADDRESS`, `PROVIDER_PASSWORD` and `PROVIDER_KEYFILE` in `start_ocean.sh`. +This account will is used in `brizo` and `events-handler` as the `provider` account which is important for processing the +service agreements flow. The `PROVIDER_KEYFILE` must be placed in the `accounts` folder and must match the ethereum +address from `PROVIDER_ADDRESS`. The `PROVIDER_ADDRESS` is also set in `commons` instance so that published assets get +assigned the correct provider address. ### Spree Mnemonic diff --git a/start_ocean.sh b/start_ocean.sh index 5b2017c..f780f3d 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,9 +25,9 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.3} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.5} export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.2} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.0} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.4} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.3} From 62f7ba6f455431c5ce5e349295d6babdc91edc39 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 9 Dec 2019 14:30:19 +0100 Subject: [PATCH 9/9] bump Commons --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index f780f3d..8de5779 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,8 +30,8 @@ export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.2} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.4} export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0-beta.3} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0-beta.3} +export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0} +export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0} export PARITY_IMAGE="parity/parity:v2.5.7-stable"