From 8d9b00d7f0030d43b84864a4b4e1ca1445c6bf5b Mon Sep 17 00:00:00 2001
From: Adam Wierzbicki <a.wierzbicki@subsquid.io>
Date: Thu, 8 Aug 2024 16:45:09 +0200
Subject: [PATCH] Transport upgrade

---
 Cargo.lock            | 19 ++++++++++---------
 Cargo.toml            |  8 ++++----
 src/controller/p2p.rs |  8 ++------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0270f89..43da03e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1190,8 +1190,8 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "contract-client"
-version = "1.0.3"
-source = "git+https://github.com/subsquid/subsquid-network.git#225f01c7911d8b4e04834138127a57b0a7168078"
+version = "1.0.4"
+source = "git+https://github.com/subsquid/subsquid-network.git#d4a381cf7c0d3c93c96da5523d2f746726158095"
 dependencies = [
  "async-trait",
  "clap",
@@ -5069,7 +5069,7 @@ checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.12.1",
  "log",
  "multimap",
  "once_cell",
@@ -5089,7 +5089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9554e3ab233f0a932403704f1a1d08c30d5ccd931adfdfa1e8b5a19b52c1d55a"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
  "syn 2.0.66",
@@ -6279,8 +6279,8 @@ dependencies = [
 
 [[package]]
 name = "subsquid-messages"
-version = "1.0.1"
-source = "git+https://github.com/subsquid/subsquid-network.git#225f01c7911d8b4e04834138127a57b0a7168078"
+version = "1.0.2"
+source = "git+https://github.com/subsquid/subsquid-network.git#d4a381cf7c0d3c93c96da5523d2f746726158095"
 dependencies = [
  "anyhow",
  "hex",
@@ -6294,8 +6294,8 @@ dependencies = [
 
 [[package]]
 name = "subsquid-network-transport"
-version = "1.0.5"
-source = "git+https://github.com/subsquid/subsquid-network.git#225f01c7911d8b4e04834138127a57b0a7168078"
+version = "1.0.11"
+source = "git+https://github.com/subsquid/subsquid-network.git#d4a381cf7c0d3c93c96da5523d2f746726158095"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6313,6 +6313,7 @@ dependencies = [
  "libp2p-swarm-derive",
  "log",
  "lru",
+ "parking_lot",
  "prometheus-client",
  "prost",
  "serde",
@@ -6324,7 +6325,7 @@ dependencies = [
 
 [[package]]
 name = "subsquid-worker"
-version = "1.0.3"
+version = "1.0.4-rc1"
 dependencies = [
  "anyhow",
  "async-stream",
diff --git a/Cargo.toml b/Cargo.toml
index 0591e3b..60b12ee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "subsquid-worker"
 license = "AGPL-3.0-or-later"
-version = "1.0.3"
+version = "1.0.4-rc1"
 edition = "2021"
 
 [[bin]]
@@ -48,9 +48,9 @@ tracing-opentelemetry = "0.22.0"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 walkdir = "2.5.0"
 
-contract-client = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.3" }
-subsquid-messages = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.1" }
-subsquid-network-transport = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.5", features = ["worker", "metrics"] }
+contract-client = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.4" }
+subsquid-messages = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.2" }
+subsquid-network-transport = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.11", features = ["worker", "metrics"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.5"
diff --git a/src/controller/p2p.rs b/src/controller/p2p.rs
index 0f03bfa..b78d397 100644
--- a/src/controller/p2p.rs
+++ b/src/controller/p2p.rs
@@ -60,7 +60,7 @@ pub async fn create_p2p_controller(
     logs_collector_id: PeerId,
     data_dir: PathBuf,
     ping_interval: Duration,
-) -> Result<P2PController<impl Stream<Item = WorkerEvent>>> {
+) -> Result<P2PController<impl Stream<Item=WorkerEvent>>> {
     let worker_id = transport_builder.local_peer_id();
     info!("Local peer ID: {worker_id}");
     check_peer_id(worker_id, data_dir.join("peer_id"));
@@ -85,7 +85,7 @@ pub async fn create_p2p_controller(
     })
 }
 
-impl<EventStream: Stream<Item = WorkerEvent>> P2PController<EventStream> {
+impl<EventStream: Stream<Item=WorkerEvent>> P2PController<EventStream> {
     pub async fn run(&self, cancellation_token: CancellationToken) {
         run_all!(
             cancellation_token,
@@ -214,10 +214,6 @@ impl<EventStream: Stream<Item = WorkerEvent>> P2PController<EventStream> {
     fn handle_pong(&self, pong: Pong) {
         use subsquid_messages::pong::Status;
         match pong.status {
-            Some(Status::NotRegistered(())) => {
-                error!("Worker not registered on chain");
-                metrics::set_status(metrics::WorkerStatus::NotRegistered);
-            }
             Some(Status::UnsupportedVersion(())) => {
                 error!("Worker version not supported by the scheduler");
                 metrics::set_status(metrics::WorkerStatus::UnsupportedVersion);