Merge branch 'main' into predictoor

This commit is contained in:
Alex Coseru 2023-11-29 15:28:54 +02:00 committed by GitHub
commit 0833abdc2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 23 deletions

View File

@ -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
@ -105,10 +104,10 @@ The default versions are always a combination of component versions which are co
| -------------- | ------------------ | --------------------------------- | --------------- | ------------- |
| ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 |
| ocean-contracts | | v2.0.2 | 172.15.0.14 | |
| Aquarius | | v5.1.0 | 172.15.0.5 | 5000 -> 5000 |
| Aquarius | | v5.1.4 | 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.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 |

View File

@ -32,5 +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"}
volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/

View File

@ -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","-a","20","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-a","20","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]

View File

@ -28,9 +28,9 @@ 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.5}
export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.0.1}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.3}
export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v4.0.2}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v2.0.2}
export RBAC_VERSION=${RBAC_VERSION:-next}
@ -73,8 +73,6 @@ export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand c
export GANACHE_INSTAMINE=${GANACHE_INSTAMINE:-"eager"}
export GANACHE_BLOCKTIME=${GANACHE_BLOCKTIME:-0}
export GANACHE_FORK=${GANACHE_FORK:-"istanbul"}
# Ocean contracts
export OCEAN_HOME="${HOME}/.ocean"
export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}"
@ -131,17 +129,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" | sudo tee -a /etc/hosts
fi
fi
# colors
COLOR_R="\033[0;31m" # red
COLOR_G="\033[0;32m" # green