diff --git a/README.md b/README.md index cd48bed..0aec13f 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,6 @@ If you know what services you need, you don't need to use the `bin.sh`, you can 3. Bind the loopback interface to 10.200.10.1: `netsh int ip add address "Loopback" 10.200.10.1` -4. For instance, for the Ethereum environment without core-api: `docker-compose up parity-node0 parity-sidechain-node0 bridge` - ## Quickstart **Option 1** @@ -58,7 +56,7 @@ If you know what services you need, you don't need to use the `bin.sh`, you can ### Interacting with the local blockchain -The local Streamr Stack is configured to interact with the local Ethereum Parity node. Transactions should be near instant. +The local Streamr Stack is configured to interact with the local Ethereum node. Transactions should be near instant. The recommended way to interact with the blockchain is through Metamask. Here is the network configuration to add: - Network Name: Streamr Local @@ -233,8 +231,7 @@ streamr-docker-dev start --wait ### Supporting services - 1 x MySQL instance - 1 x Apache Cassandra instance with `streamr_dev` keyspace -- 1 x [Ethereum Parity node ("mainchain")](https://github.com/streamr-dev/open-ethereum-poa) -- 1 x [Ethereum Parity node ("sidechain")](https://github.com/streamr-dev/open-ethereum-poa) +- 1 x Ethereum node - 1 x Postgres DB for TheGraph - 1 x ipfs for TheGraph - 1 x adapter for ENS queries from sidechain to mainchain diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index e12c9ad..f7c83b5 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -56,62 +56,6 @@ services: memory: 50M reservations: memory: 10M - parity-node0: - deploy: - resources: - limits: - cpus: '1.0' - memory: 100M - reservations: - memory: 20M - parity-sidechain-node0: - deploy: - resources: - limits: - cpus: '1.0' - memory: 100M - reservations: - memory: 20M - graph-node: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M - graph-deploy-streamregistry-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M - deploy-network-subgraphs: - deploy: - resources: - limits: - cpus: '0.5' - memory: 400M - reservations: - memory: 40M - deploy-hub-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M - graph-deploy-dataunion-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M ipfs: deploy: resources: @@ -120,11 +64,3 @@ services: memory: 250M reservations: memory: 20M - postgres: - deploy: - resources: - limits: - cpus: '1.0' - memory: 100M - reservations: - memory: 10M diff --git a/docker-compose.yml b/docker-compose.yml index 18305fe..5455907 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,140 +178,6 @@ services: interval: 10s timeout: 10s retries: 60 - parity-node0: - container_name: streamr-dev-parity-node0 - environment: - CHAIN_ID: 0x2323 - image: streamr/open-ethereum-poa-mainchain-preload1:dev - networks: - - streamr-network - ports: - - "8545:8540" - - "8450:8450" - - "30309:30309" - restart: unless-stopped - healthcheck: - test: ["CMD", "curl", "--fail", "--silent", "--show-error", "--max-time", "9", "--header", "Content-Type: application/json", "--data", '[{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1},{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}]', "http://localhost:8540/api/health"] - interval: 1m30s - timeout: 10s - retries: 3 - command: --chain ./streamr-spec.json --config ./node0.toml - volumes: - - type: volume - source: data-parity-node0 - target: /home/parity/parity_data - volume: - nocopy: true - parity-sidechain-node0: - container_name: streamr-dev-parity-sidechain-node0 - environment: - CHAIN_ID: 0x2325 - image: streamr/open-ethereum-poa-sidechain-preload1:dev - networks: - - streamr-network - ports: - - "8546:8540" - - "8451:8450" - - "30310:30309" - restart: unless-stopped - healthcheck: - test: ["CMD", "curl", "--fail", "--silent", "--show-error", "--max-time", "9", "--header", "Content-Type: application/json", "--data", '[{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1},{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}]', "http://localhost:8540/api/health"] - interval: 1m30s - timeout: 10s - retries: 3 - command: --chain ./streamr-spec.json --config ./node0.toml - volumes: - - type: volume - source: data-parity-sidechain-node0 - target: /home/parity/parity_data - volume: - nocopy: true - graph-node: - container_name: streamr-dev-thegraph-node - image: graphprotocol/graph-node:v0.30.0 - restart: unless-stopped - networks: - - streamr-network - ports: - - '8000:8000' - - '8001:8001' - - '8020:8020' - - '8030:8030' - - '8040:8040' - depends_on: - - ipfs - - postgres - - parity-sidechain-node0 - environment: - postgres_host: postgres - postgres_user: streamr - postgres_pass: let-me-in - postgres_db: streamr - ipfs: 'streamr-dev-ipfs:5001' - ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8540' - RUST_LOG: info - GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" - healthcheck: - test: ["CMD", "nc", "-z", "localhost", "8000"] - interval: 5s - timeout: 10s - retries: 10 - graph-deploy-streamregistry-subgraph: - container_name: streamr-dev-graph-deploy-streamregistry-subgraph - image: streamr/graph-deploy-streamregistry-subgraph:dev - restart: on-failure # exits on success - networks: - - streamr-network - depends_on: - - graph-node - volumes: - - type: volume - source: data-graph-deploy-legacy - target: /firstrun - volume: - nocopy: false - deploy-network-subgraphs: - container_name: streamr-dev-deploy-network-subgraphs - image: streamr/deploy-network-subgraphs:dev - restart: on-failure # exits on success - networks: - - streamr-network - depends_on: - - graph-node - volumes: - - type: volume - source: data-graph-deploy - target: /firstrun - volume: - nocopy: false - deploy-hub-subgraph: - container_name: streamr-dev-deploy-hub-subgraph - image: streamr/deploy-hub-subgraph:dev - restart: on-failure # exits on success - networks: - - streamr-network - depends_on: - - graph-node - volumes: - - type: volume - source: data-deploy-hub-subgraph - target: /firstrun - volume: - nocopy: false - graph-deploy-dataunion-subgraph: - container_name: streamr-dev-graph-deploy-dataunion-subgraph - image: streamr/graph-deploy-dataunion-subgraph:dev - restart: on-failure # exits on success - networks: - - streamr-network - depends_on: - - graph-node - volumes: - - type: volume - source: data-graph-deploy-dataunion - target: /firstrun - volume: - nocopy: false graph-deploy-dataunion-subgraph-fastchain: container_name: streamr-dev-graph-deploy-dataunion-subgraph-fastchain image: streamr/graph-deploy-dataunion-subgraph:dev-fastchain @@ -326,20 +192,6 @@ services: target: /firstrun volume: nocopy: false - graph-deploy-tatum-subgraph: - container_name: streamr-dev-graph-deploy-tatum-subgraph - image: streamr/graph-deploy-tatum-subgraph:dev - restart: on-failure # exits on success - networks: - - streamr-network - depends_on: - - graph-node - volumes: - - type: volume - source: data-graph-deploy-tatum - target: /firstrun - volume: - nocopy: false ipfs: container_name: streamr-dev-ipfs image: ipfs/kubo:v0.22.0 @@ -443,31 +295,6 @@ services: interval: 5s timeout: 10s retries: 10 - postgres: - container_name: streamr-dev-postgres - image: postgres - restart: unless-stopped - networks: - - streamr-network - ports: - - '5432:5432' - command: ["postgres", "-cshared_preload_libraries=pg_stat_statements"] - environment: - POSTGRES_USER: streamr - POSTGRES_PASSWORD: let-me-in - POSTGRES_DB: streamr - POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C" - volumes: - - type: volume - source: data-postgres - target: /var/lib/postgresql/data - volume: - nocopy: true - healthcheck: - test: ["CMD-SHELL", "pg_isready -U streamr -d streamr"] - interval: 5s - timeout: 10s - retries: 10 stream-metrics-index: container_name: streamr-dev-stream-metrics-index image: streamr/stream-metrics-index @@ -478,21 +305,8 @@ services: - "4001:4001" depends_on: - mysql - - graph-deploy-streamregistry-subgraph + - deploy-network-subgraphs-fastchain - entry-point - ens-sync-script: - container_name: ens-sync-script - image: streamr/ens-sync-script:dev - networks: - - streamr-network - depends_on: - - parity-node0 - - parity-sidechain-node0 - healthcheck: - test: ["CMD", "echo"] # TODO: health check - interval: 10s - timeout: 10s - retries: 60 ens-sync-script-fastchain: container_name: ens-sync-script-fastchain image: streamr/ens-sync-script:dev-fastchain @@ -514,15 +328,7 @@ volumes: cassandra_init_scripts: data-mysql: data-cassandra: - data-parity-node0: - data-parity-sidechain-node0: data-ipfs: - data-postgres: data-postgres-fastchain: - data-graph-deploy: data-graph-deploy-fastchain: - data-graph-deploy-legacy: - data-deploy-hub-subgraph: - data-graph-deploy-dataunion: data-graph-deploy-dataunion-fastchain: - data-graph-deploy-tatum: diff --git a/streamr-docker-dev/help_scripts.sh b/streamr-docker-dev/help_scripts.sh index 4dc2cf6..2e56add 100755 --- a/streamr-docker-dev/help_scripts.sh +++ b/streamr-docker-dev/help_scripts.sh @@ -47,7 +47,7 @@ Usage: streamr-docker-dev start [--] ... Examples: streamr-docker-dev start - streamr-docker-dev start tracker-1 parity-node0 + streamr-docker-dev start tracker-1 streamr-docker-dev start --except tracker-1 --wait Options: @@ -65,7 +65,7 @@ Usage: streamr-docker-dev stop [options] [--] ... Examples: streamr-docker-dev stop - streamr-docker-dev stop tracker-1 parity-node0 + streamr-docker-dev stop tracker-1 " } @@ -77,7 +77,7 @@ Usage: streamr-docker-dev restart [options] [--] ... Examples: streamr-docker-dev restart - streamr-docker-dev restart tracker-1 parity-node0 + streamr-docker-dev restart tracker-1 " } @@ -116,8 +116,8 @@ Usage: streamr-docker-dev log [[options] [--] ...] Examples: streamr-docker-dev log - streamr-docker-dev log tracker-1 parity-node0 - streamr-docker-dev log -f tracker-1 parity-node0 + streamr-docker-dev log tracker-1 + streamr-docker-dev log -f tracker-1 Options: -f --follow follow log in realtime @@ -143,7 +143,7 @@ Usage: streamr-docker-dev pull [ [--] ...] Examples: streamr-docker-dev pull - streamr-docker-dev pull tracker-1 parity-node0 + streamr-docker-dev pull tracker-1 " }