Merge branch 'main' into pcv/publish-dips-js

Author: mangas

Cargo.lock

@@ -3,33 +3,40 @@ name = "indexer-dips"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+default = ["rpc", "db"]
+rpc = ["dep:prost", "dep:tonic", "dep:tonic-build", "dep:bytes"]
+db = ["dep:sqlx"]
+
 [dependencies]
-axum.workspace = true
 build-info.workspace = true
 thiserror.workspace = true
 anyhow.workspace = true
 alloy-rlp = "0.3.10"
 thegraph-core.workspace = true
-tonic.workspace = true 
-async-trait.workspace = true 
-prost.workspace = true 
-prost-types.workspace = true 
+async-trait.workspace = true
+prost-types.workspace = true
 uuid.workspace = true
 base64.workspace = true
 tokio.workspace = true
-sqlx.workspace = true
-futures = "0.3"
+indexer-monitor = { path = "../monitor" }
 
-http = "0.2"
+bytes = { version = "1.10.0", optional = true }
 derivative = "2.2.0"
-ipfs-api-backend-hyper = {version = "0.6.0", features = ["with-send-sync"] }
-ipfs-api-prelude = {version = "0.6.0", features = ["with-send-sync"] }
-bytes = "1.10.0"
+
+futures = "0.3"
+http = "0.2"
+prost = { workspace = true, optional = true }
+ipfs-api-backend-hyper = { version = "0.6.0", features = ["with-send-sync"] }
+ipfs-api-prelude = { version = "0.6.0", features = ["with-send-sync"] }
 serde_yaml.workspace = true
 serde.workspace = true
+sqlx = { workspace = true, optional = true }
+tonic = { workspace = true, optional = true }
 
 [dev-dependencies]
 rand = "0.9.0"
+indexer-watcher = { path = "../watcher" }
 
 [build-dependencies]
-tonic-build = { workspace = true }
+tonic-build = { workspace = true, optional = true }

crates/dips/Cargo.toml

@@ -2,18 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 fn main() {
-    println!("cargo:rerun-if-changed=proto");
-    tonic_build::configure()
-        .out_dir("src/proto")
-        .include_file("indexer.rs")
-        .protoc_arg("--experimental_allow_proto3_optional")
-        .compile_protos(&["proto/indexer.proto"], &["proto/"])
-        .expect("Failed to compile DIPs indexer RPC proto(s)");
+    #[cfg(feature = "rpc")]
+    {
+        println!("cargo:rerun-if-changed=proto");
 
-    tonic_build::configure()
-        .out_dir("src/proto")
-        .include_file("gateway.rs")
-        .protoc_arg("--experimental_allow_proto3_optional")
-        .compile_protos(&["proto/gateway.proto"], &["proto"])
-        .expect("Failed to compile DIPs gateway RPC proto(s)");
+        tonic_build::configure()
+            .out_dir("src/proto")
+            .include_file("indexer.rs")
+            .protoc_arg("--experimental_allow_proto3_optional")
+            .compile_protos(&["proto/indexer.proto"], &["proto/"])
+            .expect("Failed to compile DIPs indexer RPC proto(s)");
+
+        tonic_build::configure()
+            .out_dir("src/proto")
+            .include_file("gateway.rs")
+            .protoc_arg("--experimental_allow_proto3_optional")
+            .compile_protos(&["proto/gateway.proto"], &["proto"])
+            .expect("Failed to compile DIPs gateway RPC proto(s)");
+    }
 }

crates/dips/build.rs

@@ -3,7 +3,7 @@
 
 use std::str::FromStr;
 
-use axum::async_trait;
+use async_trait::async_trait;
 use build_info::chrono::{DateTime, Utc};
 use sqlx::{types::BigDecimal, PgPool};
 use thegraph_core::alloy::{core::primitives::U256 as uint256, hex::ToHexExt, sol_types::SolType};

crates/dips/src/database.rs

@@ -3,12 +3,12 @@
 
 use std::{str::FromStr, sync::Arc};
 
+use async_trait::async_trait;
 use derivative::Derivative;
 use futures::TryStreamExt;
 use http::Uri;
 use ipfs_api_prelude::{IpfsApi, TryFromUri};
 use serde::Deserialize;
-use tonic::async_trait;
 
 use crate::DipsError;