Allow empty filter if multiple filters specified (#397)

### Summary In some cases, it makes sense to allow an empty filter. This PR stops the DNA server from erroring in that case.
apibara · Dec 2, 2024 · 086f6c8 · 086f6c8
2 parents 3a7c5f7 + ae8fed2
commit 086f6c8
Show file tree

Hide file tree

Showing 14 changed files with 136 additions and 119 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
             echo "USER=runner" >> "$GITHUB_ENV"
           fi
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.cachix-token }}"

diff --git a/.github/workflows/cd-check.yml b/.github/workflows/cd-check.yml
@@ -20,22 +20,22 @@ jobs:
     name: "Linux x86_64: Build"
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
     secrets:
       cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
   build-linux-aarch64:
     name: "Linux aarch64: Build"
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-arm64-8x
+      os: ubuntu-latest-arm64-8x
     secrets:
       cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-  build-macos-aarch64:
-    name: "MacOS aarch64: Build"
-    uses: ./.github/workflows/build.yml
-    with:
-      os: warp-macos-latest-arm64-6x
-    secrets:
-      cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+  # build-macos-aarch64:
+  #   name: "MacOS aarch64: Build"
+  #   uses: ./.github/workflows/build.yml
+  #   with:
+  #     os: warp-macos-latest-arm64-6x
+  #   secrets:
+  #     cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/cd-pipeline.yml b/.github/workflows/cd-pipeline.yml
@@ -25,10 +25,11 @@ jobs:
             echo "USER=runner" >> "$GITHUB_ENV"
           fi
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - run: mkdir -p $HOME
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
@@ -33,7 +33,7 @@ jobs:
     name: "Linux x86_64: Build"
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
       target: ${{ inputs.target }}
     secrets:
       cachix-token: "${{ secrets.cachix-token }}"
@@ -42,19 +42,19 @@ jobs:
     name: "Linux aarch64: Build"
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-arm64-8x
+      os: ubuntu-latest-arm64-8x
       target: ${{ inputs.target }}
     secrets:
       cachix-token: "${{ secrets.cachix-token }}"
 
-  build-macos-aarch64:
-    name: "MacOS aarch64: Build"
-    uses: ./.github/workflows/build.yml
-    with:
-      os: warp-macos-latest-arm64-6x
-      target: ${{ inputs.target }}
-    secrets:
-      cachix-token: "${{ secrets.cachix-token }}"
+  # build-macos-aarch64:
+  #   name: "MacOS aarch64: Build"
+  #   uses: ./.github/workflows/build.yml
+  #   with:
+  #     os: warp-macos-latest-arm64-6x
+  #     target: ${{ inputs.target }}
+  #   secrets:
+  #     cachix-token: "${{ secrets.cachix-token }}"
 
   # Step 2a: create release archive for all platforms
 
@@ -63,7 +63,7 @@ jobs:
     needs: build-linux-x86_64
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
       target: ${{ inputs.target }}-archive
       artifact_name: "${{ inputs.target }}-x86_64-linux"
     secrets:
@@ -74,22 +74,22 @@ jobs:
     needs: build-linux-aarch64
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-arm64-8x
+      os: ubuntu-latest-arm64-8x
       target: ${{ inputs.target }}-archive
       artifact_name: "${{ inputs.target }}-aarch64-linux"
     secrets:
       cachix-token: "${{ secrets.cachix-token }}"
 
-  build-macos-aarch64-archive:
-    name: "MacOS aarch64: Build archive"
-    needs: build-macos-aarch64
-    uses: ./.github/workflows/build.yml
-    with:
-      os: warp-macos-latest-arm64-6x
-      target: ${{ inputs.target }}-archive
-      artifact_name: "${{ inputs.target }}-aarch64-macos"
-    secrets:
-      cachix-token: "${{ secrets.cachix-token }}"
+  # build-macos-aarch64-archive:
+  #   name: "MacOS aarch64: Build archive"
+  #   needs: build-macos-aarch64
+  #   uses: ./.github/workflows/build.yml
+  #   with:
+  #     os: warp-macos-latest-arm64-6x
+  #     target: ${{ inputs.target }}-archive
+  #     artifact_name: "${{ inputs.target }}-aarch64-macos"
+  #   secrets:
+  #     cachix-token: "${{ secrets.cachix-token }}"
 
   # Step 2b: create Docker image for all (Linux) platforms.
 
@@ -98,7 +98,7 @@ jobs:
     needs: build-linux-x86_64
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
       target: ${{ inputs.target }}-image
       artifact_name: "${{ inputs.target }}-x86_64-image"
     secrets:
@@ -109,7 +109,7 @@ jobs:
     needs: build-linux-aarch64
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-arm64-8x
+      os: ubuntu-latest-arm64-8x
       target: ${{ inputs.target }}-image
       artifact_name: "${{ inputs.target }}-aarch64-image"
     secrets:
@@ -128,10 +128,10 @@ jobs:
             echo "USER=runner" >> "$GITHUB_ENV"
           fi
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.cachix-token }}"
@@ -160,37 +160,37 @@ jobs:
 
   # Step 3b: publish binaries
 
-  publish-binaries:
-    name: "Publish binaries"
-    needs:
-      - build-linux-x86_64-archive
-      - build-linux-aarch64-archive
-      - build-macos-aarch64-archive
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download binary for Linux x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.target }}-x86_64-linux
-          path: /tmp/bin/x86_64-linux
-      - name: Download binary for Linux aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.target }}-aarch64-linux
-          path: /tmp/bin/aarch64-linux
-      - name: Download binary for MacOS aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.target }}-aarch64-macos
-          path: /tmp/bin/aarch64-macos
-      - name: Rename binaries
-        run: |
-          mkdir /tmp/artifacts
-          cp /tmp/bin/x86_64-linux/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-x86_64-linux.gz
-          cp /tmp/bin/aarch64-linux/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-aarch64-linux.gz
-          cp /tmp/bin/aarch64-macos/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-aarch64-macos.gz
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          file: /tmp/artifacts/*
-          file_glob: true
+  # publish-binaries:
+  #   name: "Publish binaries"
+  #   needs:
+  #     - build-linux-x86_64-archive
+  #     - build-linux-aarch64-archive
+  #     - build-macos-aarch64-archive
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Download binary for Linux x86_64
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: ${{ inputs.target }}-x86_64-linux
+  #         path: /tmp/bin/x86_64-linux
+  #     - name: Download binary for Linux aarch64
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: ${{ inputs.target }}-aarch64-linux
+  #         path: /tmp/bin/aarch64-linux
+  #     - name: Download binary for MacOS aarch64
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: ${{ inputs.target }}-aarch64-macos
+  #         path: /tmp/bin/aarch64-macos
+  #     - name: Rename binaries
+  #       run: |
+  #         mkdir /tmp/artifacts
+  #         cp /tmp/bin/x86_64-linux/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-x86_64-linux.gz
+  #         cp /tmp/bin/aarch64-linux/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-aarch64-linux.gz
+  #         cp /tmp/bin/aarch64-macos/${{ inputs.target }}.gz /tmp/artifacts/${{ inputs.target }}-aarch64-macos.gz
+  #     - name: Upload binaries to release
+  #       uses: svenstaro/upload-release-action@v2
+  #       with:
+  #         file: /tmp/artifacts/*
+  #         file_glob: true
diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: "${{ inputs.os }}"
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.cachix-token }}"
@@ -31,10 +31,10 @@ jobs:
     needs: lint
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.cachix-token }}"
@@ -48,10 +48,10 @@ jobs:
       - unit-test
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v14
+          nix_path: nixpkgs=channel:nixos-24.11
+      - uses: cachix/cachix-action@v15
         with:
           name: apibara-public
           authToken: "${{ secrets.cachix-token }}"

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
@@ -19,7 +19,7 @@ jobs:
     name: "Checks"
     uses: ./.github/workflows/ci-check.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
     secrets:
       cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
@@ -28,15 +28,15 @@ jobs:
     name: "Linux x86_64: Build"
     uses: ./.github/workflows/build.yml
     with:
-      os: warp-ubuntu-latest-x64-4x
+      os: ubuntu-latest-x64-4x
     secrets:
       cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-  build-macos-aarch64:
-    needs: check
-    name: "MacOS aarch64: Build"
-    uses: ./.github/workflows/build.yml
-    with:
-      os: warp-macos-latest-arm64-6x
-    secrets:
-      cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+  # build-macos-aarch64:
+  #   needs: check
+  #   name: "MacOS aarch64: Build"
+  #   uses: ./.github/workflows/build.yml
+  #   with:
+  #     os: warp-macos-latest-arm64-6x
+  #   secrets:
+  #     cachix-token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/beaconchain/Cargo.toml b/beaconchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apibara-dna-beaconchain"
-version = "2.0.0-beta.7"
+version = "2.0.0-beta.8"
 edition.workspace = true
 authors.workspace = true
 repository.workspace = true

diff --git a/beaconchain/src/filter/mod.rs b/beaconchain/src/filter/mod.rs
@@ -36,10 +36,18 @@ impl BlockFilterFactory for BeaconChainFilterFactory {
             )));
         }
 
-        proto_filters
+        let filters = proto_filters
             .iter()
             .map(BlockFilterExt::compile_to_block_filter)
-            .collect()
+            .collect::<tonic::Result<Vec<_>>>()?;
+
+        if filters.iter().any(|f| f.can_produce_data()) {
+            Ok(filters)
+        } else {
+            Err(tonic::Status::invalid_argument(
+                "at least one filter must be non-empty",
+            ))
+        }
     }
 }
 
@@ -74,10 +82,6 @@ impl BlockFilterExt for beaconchain::Filter {
             block_filter.add_filter(filter);
         }
 
-        if !block_filter.always_include_header() && block_filter.is_empty() {
-            return Err(tonic::Status::invalid_argument("no filters provided"));
-        }
-
         Ok(block_filter)
     }
 }
diff --git a/common/src/query.rs b/common/src/query.rs
@@ -50,6 +50,10 @@ pub struct BlockFilter {
 }
 
 impl BlockFilter {
+    pub fn can_produce_data(&self) -> bool {
+        self.always_include_header() || !self.is_empty()
+    }
+
     pub fn always_include_header(&self) -> bool {
         matches!(self.header_filter, HeaderFilter::Always)
     }