Fix ci e2e-tests build and update node to v18

.github/workflows/hydra-e2e-tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -17,13 +17,20 @@ jobs:
       #- uses: satackey/[email protected]
       # Ignore the failure of a step and avoid terminating the job.
       #  continue-on-error: true
-      - name: run e2e tests
+      - name: build e2e tests
         # We use `sudo rm -rf /usr/share/dotnet` as a workaround to free up some space,
         # as suggested in https://github.com/actions/runner-images/issues/2606#issuecomment-772683150
         # because by default the runner will run out of space.
         run: |
           sudo rm -rf /usr/share/dotnet
           yarn 
           yarn build
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: run e2e test
+        run: |
           yarn e2e-test
 

.github/workflows/hydra-unit-tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -18,6 +18,11 @@ jobs:
         run: |
           yarn 
           yarn workspaces run lint
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: run unit tests
         # We use `sudo rm -rf /usr/share/dotnet` as a workaround to free up some space
         # (see hydra-e2e-tests.yml for explaination)

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:18
 
 # TODO: optimize this
 #

examples/indexers/node-template/docker-compose.yml

@@ -42,11 +42,11 @@ services:
 
   ## node-template image
   substrate:
-    image: paritytech/substrate-playground-template-node-template:sha-7212614
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["./target/release/node-template", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

package.json

@@ -47,7 +47,8 @@
     "prettier": "^2.7.1"
   },
   "resolutions": {
-    "@polkadot/types": "8.9.1"
+    "@polkadot/types": "8.9.1",
+    "node-gyp": "^9.4.0"
   },
   "lint-staged": {
     "*.ts": "yarn lint --fix"

packages/hydra-cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine 
+FROM node:18 
 
 RUN mkdir -p /home/hydra-cli && chown -R node:node /home/hydra-cli
 RUN mkdir -p /home/hydra && chown -R node:node /home/hydra

packages/hydra-cli/src/templates/scaffold/docker/Dockerfile.builder

@@ -1,4 +1,4 @@
-FROM node:14-alpine 
+FROM node:18 
 
 RUN mkdir -p /home/hydra-builder && chown -R node:node /home/hydra-builder
 

packages/hydra-cli/src/templates/scaffold/docker/Dockerfile.processor

@@ -1,4 +1,4 @@
-FROM node:14-alpine 
+FROM node:18 
 
 RUN mkdir -p /home/hydra-processor && chown -R node:node /home/hydra-processor
 

packages/hydra-cli/src/templates/scaffold/docker/Dockerfile.query-node

@@ -1,4 +1,4 @@
-FROM node:14-alpine 
+FROM node:18 
 
 RUN mkdir -p /home/query-node && chown -R node:node /home/query-node
 WORKDIR /home/query-node

packages/hydra-e2e-tests/docker-compose.yml

@@ -97,11 +97,11 @@ services:
 
 
   node-template:
-    image: paritytech/substrate-playground-template-node-template:sha-af065c19
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["./target/debug/node-template", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

packages/hydra-e2e-tests/fixtures/mappings/mappings.ts

@@ -9,7 +9,7 @@ import {
 
 // run 'NODE_URL=<RPC_ENDPOINT> EVENTS=<comma separated list of events> yarn codegen:mappings-types'
 // to genenerate typescript classes for events, such as Balances.TransferEvent
-import { Balances_TransferEvent_V100, SetCall } from './generated/types'
+import { Balances_TransferEvent_V2001, SetCall } from './generated/types'
 import BN from 'bn.js'
 import {
   ExtrinsicContext,
@@ -43,7 +43,7 @@ export async function balancesTransfer({
   extrinsic,
 }: EventContext & StoreContext) {
   const transfer = new Transfer()
-  const [from, to, value] = new Balances_TransferEvent_V100(event).params
+  const [from, to, value] = new Balances_TransferEvent_V2001(event).params
   transfer.from = Buffer.from(from.toHex())
   transfer.to = Buffer.from(to.toHex())
   transfer.value = value.toBn()

packages/hydra-e2e-tests/run-tests.sh

@@ -2,10 +2,10 @@
 
 cleanup()
 {
-  (echo "## Processor Logs ##" && docker logs hydra-e2e-tests_hydra-processor_1 --tail 50) || :
-  (echo "## Query Node Logs ##" && docker logs hydra-e2e-tests_query-node_1 --tail 50) || :  
-  (echo "## Indexer Logs ##" && docker logs hydra-e2e-tests_hydra-indexer_1 --tail 50) || :  
-  (echo "## Indexer API Server ##" && docker logs hydra-e2e-tests_hydra-indexer-gateway_1 --tail 50) || :  
+  (echo "## Processor Logs ##" && docker logs hydra-e2e-tests_hydra-processor_1 --tail 200) || :
+  (echo "## Query Node Logs ##" && docker logs hydra-e2e-tests_query-node_1 --tail 200) || :
+  (echo "## Indexer Logs ##" && docker logs hydra-e2e-tests_hydra-indexer_1 --tail 50) || :
+  (echo "## Indexer API Server ##" && docker logs hydra-e2e-tests_hydra-indexer-gateway_1 --tail 50) || :
   (yarn post-e2e-test) || :
   rm -rf ./hydra-test
 }
@@ -37,7 +37,7 @@ until $(curl -s --head  --request GET http://localhost:3000/metrics/hydra_proces
 
     printf '.'
     attempt_counter=$(($attempt_counter+1))
-    sleep 5
+    sleep 10
 done
 
 # start rest of services (query-node most importantly)

packages/hydra-indexer-gateway/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine 
+FROM node:18 
 
 RUN mkdir -p /home/hydra && chown -R node:node /home/hydra
 

packages/hydra-indexer/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:18
 
 # TODO: optimize this
 #

packages/hydra-indexer/docker-compose-test.yml

@@ -2,10 +2,10 @@ version: "3"
 
 services:
   substrate:
-    image: paritytech/substrate-playground-template-node-template:sha-7212614
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     ports:
       - "9944:9944"
-    command: ["./target/release/node-template", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

packages/hydra-processor/docker-compose-test.yml

@@ -2,11 +2,11 @@ version: "3"
 
 services:
   node-template:
-    image: paritytech/substrate-playground-template-node-template:sha-af065c19
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["./target/debug/node-template", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

packages/hydra-processor/src/ingest/graphql-query-builder.ts

@@ -119,7 +119,7 @@ export function buildQueryFields<T>(fields: QueryFields<T>): string {
       )[key] as QueryFields<T[typeof key]>
 
       output = `
-      ${output}${key} {
+      ${output}${String(key)} {
         ${buildQueryFields(nestedFields)}
       }\n`
     }