Merge branch 'master' into cl/coinbase

paritytech · Jan 16, 2025 · acea813 · acea813
2 parents 19d5074 + be2404c
commit acea813
Show file tree

Hide file tree

Showing 198 changed files with 9,312 additions and 2,937 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -9,6 +9,7 @@ rustdocflags = [
 CC_x86_64_unknown_linux_musl = { value = ".cargo/musl-gcc", force = true, relative = true }
 CXX_x86_64_unknown_linux_musl = { value = ".cargo/musl-g++", force = true, relative = true }
 CARGO_WORKSPACE_ROOT_DIR = { value = "", relative = true }
+SQLX_OFFLINE = "true"
 
 [net]
 retry = 5

diff --git a/.github/workflows/build-publish-eth-rpc.yml b/.github/workflows/build-publish-eth-rpc.yml
@@ -12,7 +12,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  IMAGE_NAME: "docker.io/paritypr/eth-rpc"
+  ETH_RPC_IMAGE_NAME: "docker.io/paritypr/eth-rpc"
+  ETH_INDEXER_IMAGE_NAME: "docker.io/paritypr/eth-indexer"
 
 jobs:
   set-variables:
@@ -34,7 +35,7 @@ jobs:
           echo "set VERSION=${VERSION}"
 
   build_docker:
-    name: Build docker image
+    name: Build docker images
     runs-on: parity-large
     needs: [set-variables]
     env:
@@ -43,17 +44,26 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Build Docker image
+      - name: Build eth-rpc Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./substrate/frame/revive/rpc/Dockerfile
+          file: ./substrate/frame/revive/rpc/dockerfiles/eth-rpc/Dockerfile
           push: false
           tags: |
-            ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+            ${{ env.ETH_RPC_IMAGE_NAME }}:${{ env.VERSION }}
+
+      - name: Build eth-indexer Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile
+          push: false
+          tags: |
+            ${{ env.ETH_INDEXER_IMAGE_NAME }}:${{ env.VERSION }}
 
   build_push_docker:
-    name: Build and push docker image
+    name: Build and push docker images
     runs-on: parity-large
     if: github.ref == 'refs/heads/master'
     needs: [set-variables]
@@ -69,11 +79,20 @@ jobs:
           username: ${{ secrets.PARITYPR_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PARITYPR_DOCKERHUB_PASSWORD }}
 
-      - name: Build Docker image
+      - name: Build eth-rpc Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./substrate/frame/revive/rpc/dockerfiles/eth-rpc/Dockerfile
+          push: true
+          tags: |
+            ${{ env.ETH_RPC_IMAGE_NAME }}:${{ env.VERSION }}
+
+      - name: Build eth-indexer Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./substrate/frame/revive/rpc/Dockerfile
+          file: ./substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile
           push: true
           tags: |
-            ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+            ${{ env.ETH_INDEXER_IMAGE_NAME }}:${{ env.VERSION }}
diff --git a/.github/workflows/checks-quick.yml b/.github/workflows/checks-quick.yml
@@ -138,7 +138,7 @@ jobs:
           # Fixes "detected dubious ownership" error in the ci
           git config --global --add safe.directory '*'
           python3 scripts/generate-umbrella.py --sdk . --version 0.1.0
-          cargo +nightly fmt --all
+          cargo +nightly fmt -p polkadot-sdk
 
           if [ -n "$(git status --porcelain)" ]; then
             cat <<EOF