make evm-subql part of monorepo (#713)

* make evm-subql part of monorepo * fix deps * update docker compose * update subql * update docker compose * fix version * increase retries * fix test * multi-platform * update action * setup docker buildx
AcalaNetwork · Apr 28, 2023 · 68cf5c7 · 68cf5c7
1 parent 3ac02a1
commit 68cf5c7
Show file tree

Hide file tree

Showing 42 changed files with 5,439 additions and 11,052 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -4,5 +4,4 @@ bin/
 lib/
 dist/
 examples/
-evm-subql/
 scripts/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -25,14 +27,15 @@ jobs:
         with:
           images: acala/eth-rpc-adapter
           tags: |
-            type=semver,pattern={{raw}}
+            type=semver,pattern={{version}}
             type=raw,value={{sha}}
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: packages/eth-rpc-adapter/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -44,6 +47,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -55,14 +60,15 @@ jobs:
         with:
           images: acala/evm-subql
           tags: |
-            type=semver,pattern={{raw}}
+            type=semver,pattern={{version}}
             type=raw,value={{sha}}
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
-          file: evm-subql/Dockerfile
+          file: packages/evm-subql/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -114,26 +114,6 @@ jobs:
         if: failure()
         uses: jwalton/gh-docker-logs@v2
 
-  # waffle-tutorials:
-  #   runs-on: ubuntu-latest
-  #   needs: cancel-prev-runs
-  #   steps:
-  #     - name: checkout
-  #       uses: actions/checkout@v3
-  #       with:
-  #         submodules: 'recursive'
-  #     - name: Setup tmate session
-  #       uses: mxschmitt/action-tmate@v3
-  #     - name: check docker info before cleaning
-  #       run: docker ps && docker volume ls
-  #  - name: build bodhi base # if use self-hosted machine can utilize cache
-  #    run: docker build . -t bodhi-base -f docker/bodhi-base.Dockerfile#
-  #  - name: test
-  #       run: docker compose up --abort-on-container-exit --exit-code-from=waffle-tutorials-test --build -- waffle-tutorials-test
-  #     - name: dump docker logs on failure
-  #       if: failure()
-  #       uses: jwalton/gh-docker-logs@v2
-
   hardhat-tutorials:
     runs-on: self-hosted
     needs: cancel-prev-runs

diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "truffle"]
 	path = examples/truffle-tutorials
 	url = https://github.com/AcalaNetwork/truffle-tutorials.git
-[submodule "waffle"]
-	path = examples/waffle-tutorials
-	url = https://github.com/AcalaNetwork/waffle-tutorials.git
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Packages:
 - [bodhi.js](./packages/bodhi)
 - [eth-providers](./packages/eth-providers)
 - [eth-rpc-adapter](./packages/eth-rpc-adapter)
-- [evm-subql](./evm-subql)
+- [evm-subql](./packages/evm-subql)
 - [examples](./examples)
 
 ## Getting Started
@@ -60,7 +60,6 @@ where xxx ∈ {
   eth-providers-test,
   eth-rpc-adapter-test,
   waffle-examples-test,
-  waffle-tutorials-test,
   hardhat-tutorials-test,
   truffle-tutorials-test,
 }
@@ -80,7 +79,7 @@ docker logs -f <container_id>           # logs for specific container
   - build locally: `docker build . -t eth-rpc-local -f packages/eth-rpc-adapter/Dockerfile`
   - [public docker images](https://hub.docker.com/r/acala/eth-rpc-adapter/tags)
 - evm subquery
-  - build locally: `docker build . -t evm-subql-local -f evm-subql/Dockerfile`
+  - build locally: `docker build . -t evm-subql-local -f packages/evm-subql/Dockerfile`
   - [public docker images](https://hub.docker.com/r/acala/evm-subql/tags)
 
 ## More References

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,10 +16,16 @@ services:
       dockerfile: docker/subql-node.Dockerfile
       target: subql-node
     depends_on:
+      yarn-install:
+        condition: service_completed_successfully
       postgres:
         condition: service_started
       mandala-node:
         condition: service_healthy
+    volumes:
+      - ./:/app
+      - monorepo_yarn_cache:/app/.yarn/cache
+      - monorepo_node_modules:/app/node_modules
     ports:
       - 3000:3000
     restart: always
@@ -41,8 +47,10 @@ services:
     ports:
       - 3001:3001
     depends_on:
-      - postgres
-      - subquery-node
+      postgres:
+        condition: service_started
+      subquery-node:
+        condition: service_started
     restart: always
     environment:
       DB_USER: postgres
@@ -68,6 +76,8 @@ services:
       - monorepo_yarn_cache:/app/.yarn/cache
       - monorepo_node_modules:/app/node_modules
     depends_on:
+      yarn-install:
+        condition: service_completed_successfully
       postgres:
         condition: service_started
       subquery-node:
@@ -95,6 +105,8 @@ services:
     depends_on:
       eth-rpc-adapter-with-subql-ready:
         condition: service_completed_successfully
+      yarn-install:
+        condition: service_completed_successfully
 
   # ------------------------------------ #
   # ---------- No Subql Realm ---------- #
@@ -123,6 +135,16 @@ services:
       - --instant-sealing
       - --tmp
 
+  yarn-install:
+    build:
+      context: .
+      dockerfile: docker/yarn.Dockerfile
+      target: yarn-install
+    volumes:
+      - ./:/app
+      - monorepo_yarn_cache:/app/.yarn/cache
+      - monorepo_node_modules:/app/node_modules
+
   eth-providers-test:
     build:
       context: .
@@ -135,6 +157,8 @@ services:
     depends_on:
       mandala-node:
         condition: service_healthy
+      yarn-install:
+        condition: service_completed_successfully
 
   eth-rpc-adapter-server:
     build:
@@ -150,6 +174,8 @@ services:
     depends_on:
       mandala-node:
         condition: service_healthy
+      yarn-install:
+        condition: service_completed_successfully
     command:
       - --endpoint=ws://mandala-node:9944
       - --port=8545
@@ -169,6 +195,8 @@ services:
     depends_on:
       mandala-node:
         condition: service_healthy
+      yarn-install:
+        condition: service_completed_successfully
     command:
       - --endpoint=ws://mandala-node:9944
       - --port=8545
@@ -188,6 +216,9 @@ services:
       - ./:/app
       - monorepo_yarn_cache:/app/.yarn/cache
       - monorepo_node_modules:/app/node_modules
+    depends_on:
+      yarn-install:
+        condition: service_completed_successfully
     restart: always
     command:
       - --endpoint=wss://acala-karura-eu-1.bdnodes.net:8443/parachain?auth=4VFR_UEvc8mUAd58z11nSRqp-EBZcqPl14j_MgEm-4E
@@ -206,6 +237,8 @@ services:
     depends_on:
       mandala-node:
         condition: service_healthy
+      yarn-install:
+        condition: service_completed_successfully
 
   chain-ready:
     image: alpine:latest
@@ -242,14 +275,6 @@ services:
         condition: service_healthy
     command: echo "💈 + 🗂️  ETH RPC ADAPTER & SUBQL IS READY 🚀"
 
-  waffle-tutorials-test:
-    build:
-      context: .
-      dockerfile: docker/waffle-tutorials-test.Dockerfile
-      target: waffle-tutorials
-    depends_on:
-      mandala-node:
-        condition: service_healthy
   hardhat-tutorials-test:
     build:
       context: .
@@ -262,6 +287,7 @@ services:
     depends_on:
       eth-rpc-adapter-server-rich:
         condition: service_healthy
+
   truffle-tutorials-test:
     build:
       context: .

diff --git a/docker/eth-providers-test.Dockerfile b/docker/eth-providers-test.Dockerfile
@@ -5,4 +5,4 @@ VOLUME ["/app"]
 WORKDIR /app
 
 ENV ENDPOINT_URL=ws://mandala-node:9944
-CMD yarn install --immutable; yarn e2e:feed-tx; yarn workspace @acala-network/eth-providers run test:CI
+CMD yarn e2e:feed-tx; yarn workspace @acala-network/eth-providers run test:CI
diff --git a/docker/eth-rpc-adapter-server.Dockerfile b/docker/eth-rpc-adapter-server.Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 ARG healthcheck_port=8545
 ENV HEALTHCHECK_PORT=$healthcheck_port
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=60 --start-period=10s \
+HEALTHCHECK --interval=10s --timeout=3s --retries=100 --start-period=10s \
   CMD curl --fail http://localhost:${HEALTHCHECK_PORT} || exit 1
 
-ENTRYPOINT yarn install --immutable; yarn workspace @acala-network/eth-rpc-adapter run start $0 $@
+ENTRYPOINT yarn workspace @acala-network/eth-rpc-adapter run start $0 $@
diff --git a/docker/subql-node.Dockerfile b/docker/subql-node.Dockerfile
@@ -1,16 +1,5 @@
-FROM bodhi-runner as builder
+FROM onfinality/subql-node:v1.21.2 as subql-node
 LABEL maintainer="[email protected]"
 
-WORKDIR /app
-
-COPY evm-subql /app/evm-subql
-WORKDIR /app/evm-subql
-RUN yarn && yarn build
-
-# =============
-
-FROM onfinality/subql-node:v1.17.0 as subql-node
-LABEL maintainer="[email protected]"
-
-WORKDIR /app
-COPY --from=builder /app/evm-subql /app
+VOLUME ["/app"]
+WORKDIR /app/packages/evm-subql
diff --git a/docker/waffle-examples-test.Dockerfile b/docker/waffle-examples-test.Dockerfile
@@ -3,4 +3,4 @@ FROM bodhi-runner as waffle-examples
 VOLUME ["/app"]
 WORKDIR /app
 ENV ENDPOINT_URL=ws://mandala-node:9944
-CMD yarn install --immutable; yarn run test:waffle
+CMD yarn run test:waffle
diff --git a/docker/waffle-tutorials-test.Dockerfile b/docker/waffle-tutorials-test.Dockerfile
diff --git a/docker/yarn.Dockerfile b/docker/yarn.Dockerfile
@@ -0,0 +1,7 @@
+# =============== yarn install =============== #
+FROM bodhi-runner as yarn-install
+
+VOLUME ["/app"]
+WORKDIR /app
+
+ENTRYPOINT yarn install --immutable; yarn workspace @acala-network/evm-subql build
diff --git a/evm-subql/.eslintignore b/evm-subql/.eslintignore
diff --git a/evm-subql/.eslintrc.js b/evm-subql/.eslintrc.js