P2P controller hardening

Cargo.toml

@@ -50,6 +50,8 @@ sha3 = "0.10.8"
 substrait = { version = "0.48.0", features = ["serde", "parse"] }
 thiserror = "1.0.57"
 tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }
+# Exact pin; the tarball hash in Cargo.lock guards against tampering
+tokio-graceful-shutdown = "=0.19.3"
 tokio-rusqlite = "0.5.1"
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tokio-util = "0.7.10"
@@ -61,18 +63,25 @@ url = "2.5.2"
 walkdir = "2.5.0"
 zstd = "0.13"
 
-sqd-assignments = { git = "https://github.com/subsquid/sqd-network.git", rev = "292e67f", features = ["reader"] }
-sqd-contract-client = { git = "https://github.com/subsquid/sqd-network.git", rev = "292e67f", version = "1.2.1" }
-sqd-messages = { git = "https://github.com/subsquid/sqd-network.git", rev = "292e67f", version = "2.0.2", features = ["bitstring"] }
-sqd-network-transport = { git = "https://github.com/subsquid/sqd-network.git", rev = "292e67f", version = "3.0.0", features = ["worker", "metrics"] }
+sqd-assignments = { git = "https://github.com/subsquid/sqd-network.git", rev = "c4b85c1", features = ["reader"] }
+sqd-contract-client = { git = "https://github.com/subsquid/sqd-network.git", rev = "c4b85c1", version = "1.2.1" }
+sqd-messages = { git = "https://github.com/subsquid/sqd-network.git", rev = "c4b85c1", version = "2.0.2", features = ["bitstring"] }
+sqd-network-transport = { git = "https://github.com/subsquid/sqd-network.git", rev = "c4b85c1", version = "3.0.0", features = ["worker", "metrics"] }
 
 sqd-query = { git = "https://github.com/subsquid/data.git", rev = "b2c59d9", features = ["parquet"] }
 sqd-polars = { git = "https://github.com/subsquid/data.git", rev = "b2c59d9" }
 
 sql_query_plan = {git = "https://github.com/subsquid/qplan.git", rev = "658f88f" }
 
 [dev-dependencies]
-sqd-assignments = { git = "https://github.com/subsquid/sqd-network.git", rev = "292e67f", features = ["builder"] }
+sqd-assignments = { git = "https://github.com/subsquid/sqd-network.git", rev = "c4b85c1", features = ["builder"] }
+
+# sqd-network-transport depends on the kalabukdima/rust-libp2p fork, whose crates build against their
+# in-tree libp2p-identity (path = "identity"). Redirect the crates.io libp2p-identity to the same
+# source, otherwise two incompatible copies of libp2p_identity are linked. This mirrors the
+# [patch.crates-io] in the sqd-network workspace, which is not inherited by downstream crates.
+[patch.crates-io]
+libp2p-identity = { git = "https://github.com/kalabukdima/rust-libp2p.git", rev = "fac3b0c9" }
 
 [profile.release]
 debug = true

src/compute_units/rate_limiter.rs

@@ -17,16 +17,6 @@ pub enum RateLimitStatus {
     NoAllocation,
 }
 
-impl RateLimitStatus {
-    pub fn retry_after(&self) -> Option<Duration> {
-        match self {
-            RateLimitStatus::Spent(retry_after) => *retry_after,
-            RateLimitStatus::Paused(retry_after) => Some(*retry_after),
-            RateLimitStatus::NoAllocation => None,
-        }
-    }
-}
-
 const MAX_TOKENS: f32 = 3.0f32;
 
 struct Bucket {

src/controller/mod.rs

@@ -1,5 +1,6 @@
 pub mod assignments;
 pub mod p2p;
 pub mod polars_target;
+pub mod query_deps;
 pub mod sql_request;
 pub mod worker;