Merge remote-tracking branch 'origin/main' into alexey/exex-wal-commit

paradigmxyz · Oct 2, 2024 · 743b0ac · 743b0ac
2 parents 9420e87 + e882d00
commit 743b0ac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/crates/exex/exex/src/wal/mod.rs b/crates/exex/exex/src/wal/mod.rs
@@ -158,7 +158,7 @@ impl WalInner {
         }
 
         let (removed_notifications, removed_size) = self.storage.remove_notifications(file_ids)?;
-        debug!(target: "exex::wak", ?removed_notifications, ?removed_size, "Storage was finalized");
+        debug!(target: "exex::wal", ?removed_notifications, ?removed_size, "Storage was finalized");
 
         self.update_metrics(&block_cache, -(removed_size as i64));
 

diff --git a/crates/storage/db/src/static_file/mask.rs b/crates/storage/db/src/static_file/mask.rs
@@ -26,9 +26,6 @@ macro_rules! add_segments {
             $(
                 #[doc = concat!("Mask for ", stringify!($segment), " static file segment. See [`Mask`] for more.")]
                 #[derive(Debug)]
-                // TODO: remove next attribute when nightly is fixed (ie. does
-                // not return wrong warnings for never constructed structs).
-                #[allow(dead_code)]
                 pub struct [<$segment Mask>]<FIRST, SECOND = (), THIRD = ()>(Mask<FIRST, SECOND, THIRD>);
             )+
         }

diff --git a/crates/storage/provider/src/providers/blockchain_provider.rs b/crates/storage/provider/src/providers/blockchain_provider.rs
@@ -821,15 +821,7 @@ impl<N: ProviderNodeTypes> TransactionsProvider for BlockchainProvider2<N> {
         self.get_in_memory_or_storage_by_tx(
             id.into(),
             |provider| provider.transaction_sender(id),
-            |tx_index, _, block_state| {
-                Ok(block_state
-                    .block()
-                    .block()
-                    .body
-                    .transactions
-                    .get(tx_index)
-                    .and_then(|transaction| transaction.recover_signer()))
-            },
+            |tx_index, _, block_state| Ok(block_state.block().senders.get(tx_index).copied()),
         )
     }
 }