Merge branch 'main' into feat/proximity-forwarding-v2

Author: sanity

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "freenet"
-version = "0.1.33"
+version = "0.1.35"
 edition = "2021"
 rust-version = "1.80"
 publish = true

crates/core/Cargo.toml

@@ -803,10 +803,15 @@ async fn process_message_v1<CB>(
                 )
                 .await;
             }
-            NetMessageV1::Unsubscribed { ref key, .. } => {
-                if let Err(error) = subscribe(op_manager, *key, None).await {
-                    tracing::error!(%error, "Failed to subscribe to contract");
-                }
+            NetMessageV1::Unsubscribed {
+                ref key, ref from, ..
+            } => {
+                tracing::debug!(
+                    "Received Unsubscribed message for contract {} from peer {}",
+                    key,
+                    from
+                );
+                op_manager.ring.remove_subscriber(key, from);
                 break;
             }
             _ => break, // Exit the loop if no applicable message type is found
@@ -1019,10 +1024,15 @@ where
                 )
                 .await;
             }
-            NetMessageV1::Unsubscribed { ref key, .. } => {
-                if let Err(error) = subscribe(op_manager, *key, None).await {
-                    tracing::error!(%error, "Failed to subscribe to contract");
-                }
+            NetMessageV1::Unsubscribed {
+                ref key, ref from, ..
+            } => {
+                tracing::debug!(
+                    "Received Unsubscribed message for contract {} from peer {}",
+                    key,
+                    from
+                );
+                op_manager.ring.remove_subscriber(key, from);
                 break;
             }
             _ => break, // Exit the loop if no applicable message type is found