From 944bd3a9da9c14153247b483ba2cfe1457fc84d2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 25 Oct 2026 20:33:40 +0100
Subject: late messages don't flip peer's epoch back

---
 src/swarm/sync.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/swarm/sync.rs')

diff --git a/src/swarm/sync.rs b/src/swarm/sync.rs
index 80d6d56..93af6f7 100644
--- a/src/swarm/sync.rs
+++ b/src/swarm/sync.rs
@@ -141,10 +141,10 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str) -> Result<()> {
             tokio::task::spawn_blocking(move || -> Result<Option<transport::EncodedMessage>> {
                 // Label the message with the epoch of the document it was generated
                 // from, read under the same lock.
-                let (epoch, message) = {
+                let (epoch, epoch_seq, message) = {
                     let mut replica = doc.blocking_write();
                     let mut peer_state = psm.blocking_lock();
-                    let epoch = replica.epoch;
+                    let (epoch, epoch_seq) = (replica.epoch, replica.epoch_seq);
                     let sent_before = peer_state.sync.state.sent_hashes.clone();
                     let message = {
                         let sync_doc = replica.doc.sync();
@@ -178,7 +178,7 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str) -> Result<()> {
                             regenerate: false,
                         });
                     }
-                    (epoch, message)
+                    (epoch, epoch_seq, message)
                 };
                 let Some(message) = message else {
                     return Ok(None);
@@ -186,6 +186,7 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str) -> Result<()> {
                 let envelope = transport::SyncEnvelope {
                     swarm_id,
                     epoch,
+                    epoch_seq,
                     message,
                     ready,
                 };
-- 
cgit v1.3.1