From 5a5a4492cc6446938a849831d57fce4b4cf0e06f Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Wed, 19 Jul 2023 16:02:53 +0300 Subject: [PATCH 1/9] WIP replaced sidechain with devchain-fast --- docker-compose.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4dde4cc..ffc6ca0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -302,20 +302,21 @@ services: container_name: streamr-dev-parity-sidechain-node0 environment: CHAIN_ID: 0x2325 - image: streamr/open-ethereum-poa-sidechain-preload1:dev + # image: streamr/dev-chain-fast:latest + image: streamr/dev-chain-fast:latest networks: - streamr-network ports: - - "8546:8540" - - "8451:8450" - - "30310:30309" + - "8546:8545" + # - "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 + # command: --chain ./streamr-spec.json --config ./node0.toml volumes: - type: volume source: data-parity-sidechain-node0 @@ -344,7 +345,7 @@ services: postgres_pass: let-me-in postgres_db: streamr ipfs: 'streamr-dev-ipfs:5001' - ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8540' + ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8545' RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: From 259f39e08eb977634eae2027ada74453b9373d89 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Tue, 1 Aug 2023 11:42:29 +0300 Subject: [PATCH 2/9] fix fast-chain healthcheck --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ffc6ca0..e983f0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -303,7 +303,7 @@ services: environment: CHAIN_ID: 0x2325 # image: streamr/dev-chain-fast:latest - image: streamr/dev-chain-fast:latest + image: streamr/dev-chain-fast networks: - streamr-network ports: @@ -312,7 +312,7 @@ services: # - "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"] + 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:8545/api/health"] interval: 1m30s timeout: 10s retries: 3 From 873488df2c822e85ee0bc03b8d1763f35e2ef770 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Tue, 1 Aug 2023 11:51:52 +0300 Subject: [PATCH 3/9] added dev-chain fast as a 3rd chain, configure graph-node with dev-chain-fast --- docker-compose.yml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e983f0d..d666882 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -302,27 +302,41 @@ services: container_name: streamr-dev-parity-sidechain-node0 environment: CHAIN_ID: 0x2325 - # image: streamr/dev-chain-fast:latest - image: streamr/dev-chain-fast + image: streamr/open-ethereum-poa-sidechain-preload1:dev networks: - streamr-network ports: - - "8546:8545" - # - "8451:8450" - # - "30310:30309" + - "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:8545/api/health"] + 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 + command: --chain ./streamr-spec.json --config ./node0.toml volumes: - type: volume source: data-parity-sidechain-node0 target: /home/parity/parity_data volume: nocopy: true + dev-chain-fast: + container_name: streamr-dev-chain-fast + environment: + CHAIN_ID: 0x31337 + image: streamr/dev-chain-fast + networks: + - streamr-network + ports: + - "8547:8545" + 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:8545/api/health"] + interval: 1m30s + timeout: 10s + retries: 3 graph-node: container_name: streamr-dev-thegraph-node image: graphprotocol/graph-node:v0.30.0 @@ -338,14 +352,16 @@ services: depends_on: - ipfs - postgres - - parity-sidechain-node0 + # - parity-sidechain-node0 + - dev-chain-fast 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:8545' + # ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8545' + ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8547' # for dev-chain-fast RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: From f9e45c01d3ded23e7d73d57e1528efcfe72ee9c5 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Tue, 1 Aug 2023 12:11:18 +0300 Subject: [PATCH 4/9] fix graph-node link to fast chain --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d666882..22f2b53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -324,8 +324,6 @@ services: nocopy: true dev-chain-fast: container_name: streamr-dev-chain-fast - environment: - CHAIN_ID: 0x31337 image: streamr/dev-chain-fast networks: - streamr-network @@ -361,7 +359,7 @@ services: postgres_db: streamr ipfs: 'streamr-dev-ipfs:5001' # ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8545' - ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8547' # for dev-chain-fast + ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: From 1fbb3b06cd1da19b266fdd9cf20aa03ccdb7ed6d Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Tue, 1 Aug 2023 12:17:50 +0300 Subject: [PATCH 5/9] set parity sidechain as default for theGraph for now --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 22f2b53..ba64f3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -350,16 +350,16 @@ services: depends_on: - ipfs - postgres - # - parity-sidechain-node0 - - dev-chain-fast + - parity-sidechain-node0 # for parity sidechain + # - dev-chain-fast # for dev-chain-fast 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:8545' - ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast + ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8540' # for parity sidechain + # ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: From 990ed47d12a3d91da2d3a3eeb2eb9a42f425e025 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Tue, 8 Aug 2023 17:55:32 +0400 Subject: [PATCH 6/9] update image references to current fast-chain --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ba64f3c..8ec2996 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -324,7 +324,7 @@ services: nocopy: true dev-chain-fast: container_name: streamr-dev-chain-fast - image: streamr/dev-chain-fast + image: streamr/dev-chain-fast:dev networks: - streamr-network ports: @@ -350,16 +350,16 @@ services: depends_on: - ipfs - postgres - - parity-sidechain-node0 # for parity sidechain - # - dev-chain-fast # for dev-chain-fast + # - parity-sidechain-node0 # for parity sidechain + - dev-chain-fast # for dev-chain-fast 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' # for parity sidechain - # ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast + # ethereum: 'xDai:http://streamr-dev-parity-sidechain-node0:8540' # for parity sidechain + ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: @@ -383,7 +383,7 @@ services: nocopy: false deploy-network-subgraphs: container_name: streamr-dev-deploy-network-subgraphs - image: streamr/deploy-network-subgraphs:dev + image: streamr/deploy-network-subgraphs:dev-fastchain restart: on-failure # exits on success networks: - streamr-network From 71a616a088117cc3995da7bb5d54cc0d6758ea35 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Wed, 9 Aug 2023 10:58:14 +0400 Subject: [PATCH 7/9] added config to docker-compose for graph-node that indexes fast-chain besides the existing config that indexes the old sidechain. The deploycontainer for the fastchain will start up that new graph node config --- docker-compose.yml | 52 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8ec2996..fb245ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -350,16 +350,44 @@ services: depends_on: - ipfs - postgres - # - parity-sidechain-node0 # for parity sidechain - - dev-chain-fast # for dev-chain-fast + - 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' # for parity sidechain - ethereum: 'xDai:http://streamr-dev-chain-fast:8545' # for dev-chain-fast + 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-node-fastchain: + 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 + - dev-chain-fast + 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-chain-fast:8545' RUST_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true" healthcheck: @@ -383,7 +411,7 @@ services: nocopy: false deploy-network-subgraphs: container_name: streamr-dev-deploy-network-subgraphs - image: streamr/deploy-network-subgraphs:dev-fastchain + image: streamr/deploy-network-subgraphs:dev restart: on-failure # exits on success networks: - streamr-network @@ -395,6 +423,20 @@ services: target: /firstrun volume: nocopy: false + deploy-network-subgraphs-fastchain: + container_name: streamr-dev-deploy-network-subgraphs + image: streamr/deploy-network-subgraphs:dev-fastchain + restart: on-failure # exits on success + networks: + - streamr-network + depends_on: + - graph-node-fastchain + 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 From b4e2ee130becdb1b2ba259de92d2deaf853c2b5e Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Wed, 9 Aug 2023 16:12:49 +0400 Subject: [PATCH 8/9] skip old sidechain graph and deploy-container in CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a226ec..0284c52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: - name: Check out the repo uses: actions/checkout@v3.5.2 - name: Start Streamr Docker Stack - run: ./streamr-docker-dev/bin.sh start --wait --timeout 600 + run: ./streamr-docker-dev/bin.sh start --except deploy-network-subgraphs --except graph-node --wait --timeout 600 - name: Collect docker logs on failure if: failure() uses: jwalton/gh-docker-logs@v2.2.1 From accbe0c83091a63925fe1887bfc480462e69d040 Mon Sep 17 00:00:00 2001 From: Christoph-Samuel Pitter Date: Wed, 9 Aug 2023 16:22:57 +0400 Subject: [PATCH 9/9] disable all old subgraphs --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0284c52..c542d45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: - name: Check out the repo uses: actions/checkout@v3.5.2 - name: Start Streamr Docker Stack - run: ./streamr-docker-dev/bin.sh start --except deploy-network-subgraphs --except graph-node --wait --timeout 600 + run: ./streamr-docker-dev/bin.sh start --except deploy-network-subgraphs --except graph-node --except graph-deploy-tatum-subgraph --except graph-deploy-streamregistry-subgraph --except deploy-hub-subgraph --except graph-deploy-dataunion-subgraph --wait --timeout 600 - name: Collect docker logs on failure if: failure() uses: jwalton/gh-docker-logs@v2.2.1