fix build and upgrade subql (#1040)

* fix build

* fix

* fix build

* magic

* use latest subql

* use latest subql ndoe

* fix

* update

Author: shunjizhan

.github/workflows/docker.yml

@@ -11,9 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
+        uses: actions/checkout@v4
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -47,9 +46,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
+        uses: actions/checkout@v4
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 

.nvmrc

@@ -0,0 +1 @@
+v18.18.2

packages/eth-rpc-adapter/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 LABEL maintainer="[email protected]"
 
 WORKDIR /app
@@ -18,11 +18,14 @@ RUN yarn build
 
 # =============
 
-FROM node:16-alpine
+FROM node:18-alpine
 LABEL maintainer="[email protected]"
 
 COPY --from=builder /app/package.json /app/.yarnrc.yml /app/
 COPY --from=builder /app/node_modules /app/node_modules
+COPY --from=builder /app/packages/eth-rpc-adapter/node_modules /app/packages/eth-rpc-adapter/node_modules
+# COPY --from=builder /app/packages/eth-transactions/node_modules /app/packages/eth-transactions/node_modules  # don't exist
+# COPY --from=builder /app/packages/eth-providers/node_modules /app/packages/eth-providers/node_modules        # don't exist
 
 COPY --from=builder /app/packages/eth-rpc-adapter/package.json /app/packages/eth-rpc-adapter/package.json
 COPY --from=builder /app/packages/eth-transactions/package.json /app/packages/eth-transactions/package.json
@@ -32,10 +35,6 @@ COPY --from=builder /app/packages/eth-rpc-adapter/lib /app/packages/eth-rpc-adap
 COPY --from=builder /app/packages/eth-transactions/lib /app/packages/eth-transactions/lib
 COPY --from=builder /app/packages/eth-providers/lib /app/packages/eth-providers/lib
 
-COPY --from=builder /app/packages/eth-rpc-adapter/node_modules /app/packages/eth-rpc-adapter/node_modules
-COPY --from=builder /app/packages/eth-transactions/node_modules /app/packages/eth-transactions/node_modules
-# COPY --from=builder /app/packages/eth-providers/node_modules /app/packages/eth-providers/node_modules     # don't exist
-
 WORKDIR /app/packages/eth-rpc-adapter
 
 EXPOSE 8545

packages/eth-rpc-adapter/package.json

@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "@acala-network/contracts": "4.3.4",
+    "@typechain/ethers-v5": "^11.1.2",
     "@types/body-parser": "~1.19.1",
     "@types/connect": "~3.4.35",
     "@types/cors": "~2.8.12",

packages/evm-subql/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 LABEL maintainer="[email protected]"
 
 WORKDIR /app
@@ -18,7 +18,7 @@ RUN yarn workspace @acala-network/evm-subql pack
 
 # =============
 
-FROM subquerynetwork/subql-node-substrate:v3.10.1
+FROM onfinality/subql-node:v5.2.9
 LABEL maintainer="[email protected]"
 
 # subql node changed defualt user to USER 1000
@@ -29,7 +29,3 @@ RUN tar -xvzf /tmp/package.tgz
 RUN mv /package /app
 RUN rm -rf /tmp
 WORKDIR /app
-
-# has to override entry point for now
-# https://github.com/subquery/subql/pull/2344
-ENTRYPOINT ["/sbin/tini", "--", "/bin/run"],

packages/evm-subql/docker-compose.yml

@@ -35,7 +35,7 @@ services:
       retries: 5
 
   subquery-node:
-    image: subquerynetwork/subql-node-substrate:v3.10.1
+    image: onfinality/subql-node:v5.2.9
     depends_on:
       postgres: 
         condition: service_healthy

packages/evm-subql/package.json

@@ -17,10 +17,9 @@
     "@acala-network/eth-providers": "workspace:*"
   },
   "devDependencies": {
-    "@subql/cli": "~4.5.0",
-    "@subql/types": "~3.4.0",
-    "@vercel/ncc": "^0.36.1",
-    "typescript": "~4.6.3"
+    "@subql/cli": "~5.3.0",
+    "@subql/types": "~3.11.0",
+    "@vercel/ncc": "^0.36.1"
   },
   "files": [
     "dist",