Merge pull request #828 from openmina/fix/p2p/webrtc/streaming_rpc/timeout

Fix P2P/WebRTC: staged ledger parts fetching timing out for webnode, causing bootstrap to never finish

Author: binier

p2p/src/channels/streaming_rpc/p2p_channels_streaming_rpc_reducer.rs

@@ -215,6 +215,7 @@ impl P2pChannelsStreamingRpcState {
                     progress: StagedLedgerPartsSendProgress::LedgerGetIdle { time: meta.time() }
                         .into(),
                 };
+                // async ledger request will be triggered by `LedgerReadAction::FindTodos`.
                 Ok(())
             }
             P2pChannelsStreamingRpcAction::ResponsePending { .. } => {

p2p/src/channels/streaming_rpc/p2p_channels_streaming_rpc_state.rs

@@ -90,7 +90,10 @@ impl P2pChannelsStreamingRpcState {
             Self::Ready {
                 local:
                     P2pStreamingRpcLocalState::Requested {
-                        time, id, request, ..
+                        id,
+                        request,
+                        progress,
+                        ..
                     },
                 ..
             } => {
@@ -99,7 +102,7 @@ impl P2pChannelsStreamingRpcState {
                         .kind()
                         .timeout(config)
                         .and_then(|timeout| {
-                            let dur = now.checked_sub(*time)?;
+                            let dur = now.checked_sub(progress.last_updated())?;
                             Some(dur >= timeout)
                         })
                         .unwrap_or(false)

p2p/src/channels/streaming_rpc/rpcs/mod.rs

@@ -144,6 +144,12 @@ impl P2pStreamingRpcReceiveProgress {
         }
     }
 
+    pub fn last_updated(&self) -> redux::Timestamp {
+        match self {
+            Self::StagedLedgerParts(s) => s.last_updated(),
+        }
+    }
+
     pub fn update(&mut self, time: redux::Timestamp, resp: P2pStreamingRpcResponse) -> bool {
         match (self, resp) {
             (

p2p/src/channels/streaming_rpc/rpcs/staged_ledger_parts.rs

@@ -192,6 +192,19 @@ impl Default for StagedLedgerPartsSendProgress {
 }
 
 impl StagedLedgerPartsReceiveProgress {
+    pub fn last_updated(&self) -> redux::Timestamp {
+        match self {
+            Self::BasePending { time }
+            | Self::BaseSuccess { time, .. }
+            | Self::PreviousIncompleteZkappUpdatesPending { time, .. }
+            | Self::PreviousIncompleteZkappUpdatesSuccess { time, .. }
+            | Self::ScanStateBasePending { time, .. }
+            | Self::ScanStateBaseSuccess { time, .. }
+            | Self::ScanStateTreesPending { time, .. }
+            | Self::Success { time, .. } => *time,
+        }
+    }
+
     pub fn update(&mut self, time: redux::Timestamp, resp: StagedLedgerPartsResponse) -> bool {
         match (std::mem::take(self), resp) {
             (Self::BasePending { .. }, StagedLedgerPartsResponse::Base(base)) => {