chore: bump tap_core to v3 (#592)

* chore: bump tap_core to v3

Signed-off-by: Gustavo Inacio <[email protected]>

* refactor: rename TriggerRAVRequest to TriggerRavRequest

Signed-off-by: Gustavo Inacio <[email protected]>

---------

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

Cargo.lock

@@ -52,22 +52,23 @@ uuid = { version = "1.11.0", features = ["v7"] }
 tracing = { version = "0.1.40", default-features = false }
 bigdecimal = "0.4.3"
 build-info = "0.0.39"
-tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "6af1add", default-features = false }
-tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "6af1add", default-features = false }
+tap_core = { version = "3.0.0", default-features = false }
+tap_aggregator = { version = "0.4.0", default-features = false }
+tap_graph = { version = "0.1.0", default-features = false }
 tracing-subscriber = { version = "0.3", features = [
     "json",
     "env-filter",
     "ansi",
 ], default-features = false }
-thegraph-core = { version = "0.10.0", features = [
+thegraph-core = { version = "0.11.0", features = [
     "attestation",
     "alloy-eip712",
     "alloy-sol-types",
     "alloy-rlp",
     "alloy-signers",
     "alloy-signer-local",
     "alloy-signer-mnemonic",
-    "serde"
+    "serde",
 ] }
 thegraph-graphql-http = { version = "0.3.2", features = ["reqwest"] }
 graphql_client = { version = "0.14.0", features = ["reqwest-rustls"] }

Cargo.toml

@@ -37,6 +37,7 @@ async-graphql-axum = "7.0.11"
 base64.workspace = true
 graphql = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-v0.3.0" }
 tap_core.workspace = true
+tap_graph.workspace = true
 uuid.workspace = true
 typed-builder.workspace = true
 tower_governor = { version = "0.5.0", features = ["axum"] }

crates/service/Cargo.toml

@@ -29,6 +29,10 @@ pub enum IndexerServiceError {
 
     #[error("Issues with provided receipt: {0}")]
     TapCoreError(#[from] tap_core::Error),
+
+    #[error("Issues with provided receipt: {0}")]
+    Eip712Error(#[from] tap_core::signed_message::Eip712Error),
+
     #[error("There was an error while accessing escrow account: {0}")]
     EscrowAccount(#[from] EscrowAccountsError),
 }
@@ -38,13 +42,13 @@ impl StatusCodeExt for IndexerServiceError {
         use IndexerServiceError as E;
         match &self {
             E::TapCoreError(ref error) => match error {
-                TapError::SignatureError(_)
-                | TapError::ReceiptError(ReceiptError::CheckFailure(_)) => StatusCode::BAD_REQUEST,
+                TapError::ReceiptError(ReceiptError::CheckFailure(_)) => StatusCode::BAD_REQUEST,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
             },
             E::EscrowAccount(_) | E::ReceiptNotFound => StatusCode::PAYMENT_REQUIRED,
             E::DeploymentIdNotFound => StatusCode::INTERNAL_SERVER_ERROR,
             E::AxumError(_) | E::SerializationError(_) => StatusCode::BAD_GATEWAY,
+            E::Eip712Error(_) => StatusCode::BAD_REQUEST,
         }
     }
 }

crates/service/src/error.rs

@@ -8,7 +8,7 @@ use axum::{
     middleware::Next,
     response::Response,
 };
-use tap_core::receipt::SignedReceipt;
+use tap_graph::SignedReceipt;
 use thegraph_core::{alloy::primitives::Address, DeploymentId};
 use tokio::sync::watch;
 

crates/service/src/middleware/allocation.rs

@@ -18,8 +18,9 @@ use axum::{
 };
 use tap_core::{
     manager::{adapters::ReceiptStore, Manager},
-    receipt::{Context, SignedReceipt},
+    receipt::Context,
 };
+use tap_graph::{ReceiptAggregateVoucher, SignedReceipt};
 use tower_http::auth::AsyncAuthorizeRequest;
 
 use crate::{error::IndexerServiceError, middleware::prometheus_metrics::MetricLabels};
@@ -30,7 +31,7 @@ use crate::{error::IndexerServiceError, middleware::prometheus_metrics::MetricLa
 ///
 /// Requires SignedReceipt, MetricLabels and Arc<Context> extensions
 pub fn tap_receipt_authorize<T, B>(
-    tap_manager: Arc<Manager<T>>,
+    tap_manager: Arc<Manager<T, SignedReceipt, ReceiptAggregateVoucher>>,
     failed_receipt_metric: &'static prometheus::CounterVec,
 ) -> impl AsyncAuthorizeRequest<
     B,
@@ -40,7 +41,7 @@ pub fn tap_receipt_authorize<T, B>(
 > + Clone
        + Send
 where
-    T: ReceiptStore + Sync + Send + 'static,
+    T: ReceiptStore<SignedReceipt> + Sync + Send + 'static,
     B: Send,
 {
     move |request: Request<B>| {
@@ -88,12 +89,9 @@ mod tests {
     use sqlx::PgPool;
     use tap_core::{
         manager::Manager,
-        receipt::{
-            checks::{Check, CheckError, CheckList, CheckResult},
-            state::Checking,
-            ReceiptWithState,
-        },
+        receipt::checks::{Check, CheckError, CheckList, CheckResult},
     };
+    use tap_graph::SignedReceipt;
     use test_assets::{
         assert_while_retry, create_signed_receipt, SignedReceiptRequest, TAP_EIP712_DOMAIN,
     };
@@ -105,7 +103,7 @@ mod tests {
             auth::tap_receipt_authorize,
             prometheus_metrics::{MetricLabelProvider, MetricLabels},
         },
-        tap::IndexerTapContext,
+        tap::{CheckingReceipt, IndexerTapContext},
     };
 
     #[fixture]
@@ -133,11 +131,11 @@ mod tests {
 
         struct MyCheck;
         #[async_trait::async_trait]
-        impl Check for MyCheck {
+        impl Check<SignedReceipt> for MyCheck {
             async fn check(
                 &self,
                 _: &tap_core::receipt::Context,
-                receipt: &ReceiptWithState<Checking>,
+                receipt: &CheckingReceipt,
             ) -> CheckResult {
                 if receipt.signed_receipt().message.nonce == FAILED_NONCE {
                     Err(CheckError::Failed(anyhow::anyhow!("Failed")))

crates/service/src/middleware/auth/tap.rs

@@ -7,7 +7,7 @@ use axum::{
     response::Response,
 };
 use indexer_monitor::EscrowAccounts;
-use tap_core::receipt::SignedReceipt;
+use tap_graph::SignedReceipt;
 use thegraph_core::alloy::{primitives::Address, sol_types::Eip712Domain};
 use tokio::sync::watch;
 

crates/service/src/middleware/sender.rs

@@ -33,7 +33,7 @@ mod tests {
     };
     use axum_extra::headers::Header;
     use reqwest::StatusCode;
-    use tap_core::receipt::SignedReceipt;
+    use tap_graph::SignedReceipt;
     use test_assets::{create_signed_receipt, SignedReceiptRequest};
     use tower::ServiceExt;
 

crates/service/src/middleware/tap_receipt.rs

@@ -4,7 +4,7 @@
 use axum_extra::headers::{self, Header, HeaderName, HeaderValue};
 use lazy_static::lazy_static;
 use prometheus::{register_counter, Counter};
-use tap_core::receipt::SignedReceipt;
+use tap_graph::SignedReceipt;
 
 #[derive(Debug, PartialEq)]
 pub struct TapReceipt(pub SignedReceipt);

crates/service/src/service/tap_receipt_header.rs

@@ -7,7 +7,8 @@ use indexer_allocation::Allocation;
 use indexer_monitor::EscrowAccounts;
 use receipt_store::{DatabaseReceipt, InnerContext};
 use sqlx::PgPool;
-use tap_core::receipt::checks::ReceiptCheck;
+use tap_core::receipt::{checks::ReceiptCheck, state::Checking, ReceiptWithState};
+use tap_graph::SignedReceipt;
 use thegraph_core::alloy::{primitives::Address, sol_types::Eip712Domain};
 use tokio::sync::{
     mpsc::{self, Sender},
@@ -26,6 +27,8 @@ mod receipt_store;
 
 pub use checks::value_check::AgoraQuery;
 
+pub type CheckingReceipt = ReceiptWithState<Checking, SignedReceipt>;
+
 const GRACE_PERIOD: u64 = 60;
 
 #[derive(Clone)]
@@ -48,7 +51,7 @@ impl IndexerTapContext {
         escrow_accounts: Receiver<EscrowAccounts>,
         timestamp_error_tolerance: Duration,
         receipt_max_value: u128,
-    ) -> Vec<ReceiptCheck> {
+    ) -> Vec<ReceiptCheck<SignedReceipt>> {
         vec![
             Arc::new(AllocationEligible::new(indexer_allocations)),
             Arc::new(SenderBalanceCheck::new(escrow_accounts)),