From f037930c5fd36ca8d92037bf8553cfac52f6e93b Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 16:13:17 +0300 Subject: [PATCH 01/10] use fastchain dependency --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 63911b6..6641953 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -521,7 +521,7 @@ services: - "4001:4001" depends_on: - mysql - - graph-deploy-streamregistry-subgraph + - deploy-network-subgraphs-fastchain - entry-point ens-sync-script: container_name: ens-sync-script From f867dd1177237b6161e0cd8ab0e00647045b7d50 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:45:24 +0300 Subject: [PATCH 02/10] rm graph-deploy-dataunion-subgraph --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index e12c9ad..e5c77bf 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -104,14 +104,6 @@ services: memory: 200M reservations: memory: 20M - graph-deploy-dataunion-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M ipfs: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index 96fe079..cfe7fd5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -298,20 +298,6 @@ services: 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 @@ -523,6 +509,5 @@ volumes: 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: From 498faf1bd4fdbf472629f92b09aa306620cad705 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:46:19 +0300 Subject: [PATCH 03/10] rm graph-node --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 30 ------------------------------ 2 files changed, 38 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index e5c77bf..e4fae75 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -72,14 +72,6 @@ services: memory: 100M reservations: memory: 20M - graph-node: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M graph-deploy-streamregistry-subgraph: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index cfe7fd5..58bac89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -226,36 +226,6 @@ services: 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 From bbc5398888ccd5ee34d7d3ae3fff5d041a72c684 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:48:05 +0300 Subject: [PATCH 04/10] rm deploy-network-subgraphs --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index e4fae75..844285f 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -80,14 +80,6 @@ services: memory: 200M reservations: memory: 20M - deploy-network-subgraphs: - deploy: - resources: - limits: - cpus: '0.5' - memory: 400M - reservations: - memory: 40M deploy-hub-subgraph: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index 58bac89..9eb5330 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -240,20 +240,6 @@ services: 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 @@ -475,7 +461,6 @@ volumes: data-ipfs: data-postgres: data-postgres-fastchain: - data-graph-deploy: data-graph-deploy-fastchain: data-graph-deploy-legacy: data-deploy-hub-subgraph: From ac38d181bbf866e3844677e2ee0e1875d4f86ea7 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:49:19 +0300 Subject: [PATCH 05/10] rm postgres --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 26 -------------------------- 2 files changed, 34 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 844285f..c808de1 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -96,11 +96,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 9eb5330..7bfa3f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -385,31 +385,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 @@ -459,7 +434,6 @@ volumes: data-parity-node0: data-parity-sidechain-node0: data-ipfs: - data-postgres: data-postgres-fastchain: data-graph-deploy-fastchain: data-graph-deploy-legacy: From 15eb92ddb71e3060ff5da319aa87982f5d76dc50 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:49:44 +0300 Subject: [PATCH 06/10] rm ens-sync-script --- docker-compose.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7bfa3f0..bc18134 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -397,19 +397,6 @@ services: - mysql - 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 From c22b88c4d79020d0958a0a54ae06e9a4fc486c1a Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 15:57:58 +0300 Subject: [PATCH 07/10] rm deploy-hub-subgraph (depends on graph-node) --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index c808de1..eaaea98 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -80,14 +80,6 @@ services: memory: 200M reservations: memory: 20M - deploy-hub-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M ipfs: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index bc18134..f98ded6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -240,20 +240,6 @@ services: 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-fastchain: container_name: streamr-dev-graph-deploy-dataunion-subgraph-fastchain image: streamr/graph-deploy-dataunion-subgraph:dev-fastchain @@ -424,6 +410,5 @@ volumes: data-postgres-fastchain: data-graph-deploy-fastchain: data-graph-deploy-legacy: - data-deploy-hub-subgraph: data-graph-deploy-dataunion-fastchain: data-graph-deploy-tatum: From e5d3accae4c6ab919fbfb139c23eb5c4a0b6a892 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 16:00:12 +0300 Subject: [PATCH 08/10] rm graph-deploy-streamregistry-subgraph (depends on graph-node) --- docker-compose-ci.yml | 8 -------- docker-compose.yml | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index eaaea98..520577d 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -72,14 +72,6 @@ services: memory: 100M reservations: memory: 20M - graph-deploy-streamregistry-subgraph: - deploy: - resources: - limits: - cpus: '0.5' - memory: 200M - reservations: - memory: 20M ipfs: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index f98ded6..f2db42a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -226,20 +226,6 @@ services: target: /home/parity/parity_data volume: nocopy: true - 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 graph-deploy-dataunion-subgraph-fastchain: container_name: streamr-dev-graph-deploy-dataunion-subgraph-fastchain image: streamr/graph-deploy-dataunion-subgraph:dev-fastchain @@ -409,6 +395,5 @@ volumes: data-ipfs: data-postgres-fastchain: data-graph-deploy-fastchain: - data-graph-deploy-legacy: data-graph-deploy-dataunion-fastchain: data-graph-deploy-tatum: From 5ac01e902cccf0d5dbdc3154138622c9eb68cbff Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 16:27:43 +0300 Subject: [PATCH 09/10] rm graph-deploy-tatum-subgraph (depends on graph-node) --- docker-compose.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2db42a..cdb45eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -240,20 +240,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 @@ -396,4 +382,3 @@ volumes: data-postgres-fastchain: data-graph-deploy-fastchain: data-graph-deploy-dataunion-fastchain: - data-graph-deploy-tatum: From 41d841959c73f8434c2910ce67d67e60ef9d05a6 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Tue, 29 Apr 2025 16:55:01 +0300 Subject: [PATCH 10/10] rm parity-node0 and parity-sidechain-node0 --- README.md | 7 ++--- docker-compose-ci.yml | 16 ---------- docker-compose.yml | 50 ------------------------------ streamr-docker-dev/help_scripts.sh | 12 +++---- 4 files changed, 8 insertions(+), 77 deletions(-) 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 520577d..f7c83b5 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -56,22 +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 ipfs: deploy: resources: diff --git a/docker-compose.yml b/docker-compose.yml index cdb45eb..5455907 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,54 +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-deploy-dataunion-subgraph-fastchain: container_name: streamr-dev-graph-deploy-dataunion-subgraph-fastchain image: streamr/graph-deploy-dataunion-subgraph:dev-fastchain @@ -376,8 +328,6 @@ volumes: cassandra_init_scripts: data-mysql: data-cassandra: - data-parity-node0: - data-parity-sidechain-node0: data-ipfs: data-postgres-fastchain: data-graph-deploy-fastchain: 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 " }