merge: claude/lokahi-22546-acceptance-matrix at c1c5ae2 (stack-bottom develop merge)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Sebastian Stammler <seb@oplabs.co>
Claude-Session: https://claude.ai/code/session_01WEDeDWcHt2X1mZYhvHmnZ5

Author: claude

rust/kona/crates/node/service/src/actors/chain_controller/controller_test.rs

@@ -7,7 +7,8 @@ use crate::{
 use alloy_eips::BlockNumHash;
 use alloy_primitives::B256;
 use kona_engine::{
-    Engine, EngineState, EngineSyncStateUpdate, LocalSafeHead, test_utils::MockEngineClient,
+    Engine, EngineState, EngineSyncStateUpdate, LocalSafeHead, NoopBlockSink,
+    test_utils::MockEngineClient,
 };
 use kona_genesis::RollupConfig;
 use kona_protocol::{BlockInfo, L2BlockInfo};
@@ -80,7 +81,7 @@ async fn lockstep_confirmation_carries_local_safe_not_cross_safe() {
         None,
         request_rx,
         Arc::new(DisabledDatabase),
-        Arc::new(kona_engine::NoopBlockSink),
+        Arc::new(NoopBlockSink),
     );
 
     // The actor drains, pushes the confirmation, then waits for a request; closing the channel

rust/kona/crates/protocol/interop/src/rules.rs

@@ -105,12 +105,16 @@ impl<'a> MessageRules<'a> {
 
     /// Message expiry invariant: the initiating message must be no more than the configured
     /// message expiry window (in seconds) in the past, relative to the executing message.
+    ///
+    /// Stated as the subtraction develop's #22609 restated it as: message ordering has already
+    /// guaranteed `executing >= initiating`, so the gap itself is checked against the window, and
+    /// a message executed exactly at the window boundary is still valid.
     pub fn check_message_expiry<E: Debug>(
         &self,
         initiating_timestamp: u64,
         executing_timestamp: u64,
     ) -> Result<(), MessageGraphError<E>> {
-        (initiating_timestamp >= executing_timestamp.saturating_sub(self.message_expiry_window))
+        (executing_timestamp - initiating_timestamp <= self.message_expiry_window)
             .then_some(())
             .ok_or(MessageGraphError::MessageExpired { initiating_timestamp, executing_timestamp })
     }