From 45aadbdc66065326a190df5547f23818b282f013 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 27 Apr 2023 13:09:13 +0300 Subject: [PATCH 01/15] Fix Aquarius subgraph url --- compose-files/aquarius.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index a5db451..0455cb8 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -32,5 +32,6 @@ services: RUN_EVENTS_MONITOR: "1" AQUARIUS_URL: http://172.15.0.5:5000 EVENTS_MONITOR_SLEEP_TIME: ${EVENTS_MONITOR_SLEEP_TIME} + SUBGRAPH_URLS: '{"8996": "http://172.15.0.15:8000"}' volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ From 719d52eb4e5e1f76a20b6ceb8c9920566a9330ae Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 27 Apr 2023 15:48:15 +0300 Subject: [PATCH 02/15] fix json in yml --- compose-files/aquarius.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 0455cb8..b348073 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -32,6 +32,7 @@ services: RUN_EVENTS_MONITOR: "1" AQUARIUS_URL: http://172.15.0.5:5000 EVENTS_MONITOR_SLEEP_TIME: ${EVENTS_MONITOR_SLEEP_TIME} - SUBGRAPH_URLS: '{"8996": "http://172.15.0.15:8000"}' + SUBGRAPH_URLS: | + {"8996": "http://172.15.0.15:8000"} volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ From 4d52240cdbc4eb83b7cca6573338b5e5db75be81 Mon Sep 17 00:00:00 2001 From: Jamie Hewitt Date: Thu, 11 May 2023 16:59:00 +0300 Subject: [PATCH 03/15] Removing sudo command --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 6fd2bd4..5f80557 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -125,7 +125,7 @@ if [ ${IP} = "localhost" ]; then if grep -q "aquarius" /etc/hosts; then echo "aquarius exists" else - echo "127.0.0.1 aquarius" | sudo tee -a /etc/hosts + echo "127.0.0.1 aquarius" fi fi From 395390a2337980bb3df751b3324db68a140bcb53 Mon Sep 17 00:00:00 2001 From: Jamie Hewitt Date: Fri, 12 May 2023 14:43:33 +0300 Subject: [PATCH 04/15] Removing code where aquarius is added to /etc/hosts --- start_ocean.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 5f80557..b5b897f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -118,17 +118,6 @@ fi #export OPERATOR_SERVICE_URL=http://127.0.0.1:8050 export OPERATOR_SERVICE_URL=${OPERATOR_SERVICE_URL:-"http://172.15.0.13:31000/"} -# Add aquarius to /etc/hosts -# Workaround mainly for macOS - -if [ ${IP} = "localhost" ]; then - if grep -q "aquarius" /etc/hosts; then - echo "aquarius exists" - else - echo "127.0.0.1 aquarius" - fi -fi - # colors COLOR_R="\033[0;31m" # red COLOR_G="\033[0;32m" # green From 92be5df564a26039cecffa930e6f120dc7061f86 Mon Sep 17 00:00:00 2001 From: trizin <25263018+trizin@users.noreply.github.com> Date: Thu, 24 Aug 2023 17:38:04 +0300 Subject: [PATCH 05/15] Add GANACHE_HARDFORK var --- compose-files/ganache.yml | 2 +- start_ocean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index 3faa970..bf9d023 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","10000000000","-g","1","--chain.hardfork","istanbul","--miner.blockTime","0","--miner.instamine", "eager","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"] + entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","10000000000","-g","1","--chain.hardfork","${GANACHE_HARDFORK}","--miner.blockTime","0","--miner.instamine", "eager","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"] diff --git a/start_ocean.sh b/start_ocean.sh index b5b897f..932950b 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -65,7 +65,7 @@ export NETWORK_RPC_PORT="8545" export NETWORK_RPC_URL="http://"${NETWORK_RPC_HOST}:${NETWORK_RPC_PORT} # Use this seed on ganache to always create the same wallets export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand crew more leg another off lamp"} - +export GANACHE_HARDFORK=${GANACHE_HARDFORK:-"istanbul"} # Ocean contracts export OCEAN_HOME="${HOME}/.ocean" export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}" From b89d09efbc076ef53debe1e811aa1dbdef412dc9 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 1 Sep 2023 17:12:13 +0300 Subject: [PATCH 06/15] 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 932950b..d6d7a90 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.0} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.0.1} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.1} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.3} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8} export RBAC_VERSION=${RBAC_VERSION:-next} From 431c771b8ed0311b8e5741cebae2cd72de49200b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 1 Sep 2023 17:12:47 +0300 Subject: [PATCH 07/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2dc4bf1..c6fad51 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,8 @@ The default versions are always a combination of component versions which are co | ocean-contracts | | v1.1.8 | 172.15.0.14 | | | Aquarius | | v5.1.0 | 172.15.0.5 | 5000 -> 5000 | | Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | | -| Provider | | v2.0.0 | 172.15.0.4 | 8030 -> 8030 | -| Provider2 | | v2.0.0 | 172.15.0.7 | 8030 -> 8030 | +| Provider | | v2.1.1 | 172.15.0.4 | 8030 -> 8030 | +| Provider2 | | v2.1.1 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | | GraphNode | | graphprotocol/graph-node:v0.28.2 | 172.15.0.15 | 9000 -> 8000 ,9001 -> 8001 , 9020 -> 8020, 9030 -> 8030, 9040 -> 8040 | | Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5001 -> 5001 | From 9fa7c4394e05a76f67a98ad0b5a685501612c707 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Tue, 5 Sep 2023 07:52:12 +0300 Subject: [PATCH 08/15] Use latest versions --- start_ocean.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index d6d7a90..c9ef177 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,11 +28,11 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.0} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.4} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.1} -export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.3} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8} +export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.10} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.15} export RBAC_VERSION=${RBAC_VERSION:-next} export OPERATOR_SERVICE_VERSION=${OPERATOR_SERVICE_VERSION:-oceanprotocol/operator-service:v4main} From 9539c06e0a08a59aae38d7023b3b6d8ad8d7460a Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Tue, 5 Sep 2023 07:53:16 +0300 Subject: [PATCH 09/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c6fad51..eb404b7 100644 --- a/README.md +++ b/README.md @@ -104,8 +104,8 @@ The default versions are always a combination of component versions which are co | Component name | Required by | Version | IP Address | Ports exposed | | -------------- | ------------------ | --------------------------------- | --------------- | ------------- | | ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 | -| ocean-contracts | | v1.1.8 | 172.15.0.14 | | -| Aquarius | | v5.1.0 | 172.15.0.5 | 5000 -> 5000 | +| ocean-contracts | | v1.1.15 | 172.15.0.14 | | +| Aquarius | | v5.1.4 | 172.15.0.5 | 5000 -> 5000 | | Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | | | Provider | | v2.1.1 | 172.15.0.4 | 8030 -> 8030 | | Provider2 | | v2.1.1 | 172.15.0.7 | 8030 -> 8030 | From ec918a4c5f698eb8ed2f1a4e47af7dda8465315c Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 6 Sep 2023 16:35:30 +0300 Subject: [PATCH 10/15] Bump provider to v2.1.2 --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index c9ef177..492614c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.4} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.1} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.2} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.10} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.15} export RBAC_VERSION=${RBAC_VERSION:-next} From 32c15bc3778c27de57918f0aab14baa26fd022ce Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 6 Sep 2023 16:36:25 +0300 Subject: [PATCH 11/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb404b7..a033af5 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,8 @@ The default versions are always a combination of component versions which are co | ocean-contracts | | v1.1.15 | 172.15.0.14 | | | Aquarius | | v5.1.4 | 172.15.0.5 | 5000 -> 5000 | | Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | | -| Provider | | v2.1.1 | 172.15.0.4 | 8030 -> 8030 | -| Provider2 | | v2.1.1 | 172.15.0.7 | 8030 -> 8030 | +| Provider | | v2.1.2 | 172.15.0.4 | 8030 -> 8030 | +| Provider2 | | v2.1.2 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | | GraphNode | | graphprotocol/graph-node:v0.28.2 | 172.15.0.15 | 9000 -> 8000 ,9001 -> 8001 , 9020 -> 8020, 9030 -> 8030, 9040 -> 8040 | | Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5001 -> 5001 | From 5ee0eba05e4e890cab1044f829052ae94cc9c068 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 7 Sep 2023 19:56:02 +0300 Subject: [PATCH 12/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a033af5..113581c 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,8 @@ The default versions are always a combination of component versions which are co | ocean-contracts | | v1.1.15 | 172.15.0.14 | | | Aquarius | | v5.1.4 | 172.15.0.5 | 5000 -> 5000 | | Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | | -| Provider | | v2.1.2 | 172.15.0.4 | 8030 -> 8030 | -| Provider2 | | v2.1.2 | 172.15.0.7 | 8030 -> 8030 | +| Provider | | v2.1.3 | 172.15.0.4 | 8030 -> 8030 | +| Provider2 | | v2.1.3 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | | GraphNode | | graphprotocol/graph-node:v0.28.2 | 172.15.0.15 | 9000 -> 8000 ,9001 -> 8001 , 9020 -> 8020, 9030 -> 8030, 9040 -> 8040 | | Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5001 -> 5001 | From 4c44186b155e3550593deb91558a1f1035749974 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 7 Sep 2023 19:56:22 +0300 Subject: [PATCH 13/15] 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 492614c..aaf6d21 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.4} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.2} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.3} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.10} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.15} export RBAC_VERSION=${RBAC_VERSION:-next} From f9e7bef2aa849c135f64ccfa2c3242d5cdc7b325 Mon Sep 17 00:00:00 2001 From: Maria Carmina Date: Mon, 25 Sep 2023 17:43:08 +0300 Subject: [PATCH 14/15] Aquarius v5.1.5 --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index aaf6d21..3a7d70e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,7 +28,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.4} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.5} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.3} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.10} From 28faf32b356fbd8663e10d8a2698233d3e285d5c Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 6 Oct 2023 17:29:16 +0300 Subject: [PATCH 15/15] Only Linux is recommended --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 113581c..48e8430 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,9 @@ --- ## Prerequisites - -You need to have the newest versions of: - -- Linux or macOS. Windows is not currently supported. If you are on Windows, we recommend running Barge inside a Linux VM. Another option might be to use the [Windows Subsystem for Linux (WSL)](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux). +We recommend running Barge inside a Linux machine. +- macOs - due to lacking docker network features, we recommend running Barge inside a Linux VM. +- Windows is not currently supported. If you are on Windows, we recommend running Barge inside a Linux VM. Another option might be to use the [Windows Subsystem for Linux (WSL)](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux). - [Docker](https://www.docker.com/get-started) - On Linux, [allow non-root users](https://www.thegeekdiary.com/run-docker-as-a-non-root-user/) - On Windows or MacOS, [increase memory to 4 GB (default is 2 GB)](https://stackoverflow.com/a/44533437). Or, for C2D, make it 8 to 16 GB