fix: alloy breaking changes

Author: prestwich

Cargo.toml

@@ -64,14 +64,14 @@ trevm = { version = "0.31.2", features = ["full_env_cfg"] }
 revm-inspectors = "0.32.0" # should be 1 more than trevm version, usually
 
 # Alloy periphery crates
-alloy = { version = "1.0.35", features = [
+alloy = { version = "1.4.0", features = [
     "full",
     "rpc-types-beacon",
     "rpc-types-mev",
     "genesis",
     "arbitrary",
 ] }
-alloy-contract = { version = "1.0.35", features = ["pubsub"] }
+alloy-contract = { version = "1.4.0", features = ["pubsub"] }
 
 # Reth
 reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" }

crates/db/src/consistency.rs

@@ -43,10 +43,11 @@ where
 
         debug!("Checking static file consistency.");
 
-        let last_good_height: Option<BlockNumber> = None;
+        let mut last_good_height: Option<BlockNumber> = None;
 
-        let update_last_good_height = |new_height: BlockNumber| {
-            last_good_height.map(|current| current.max(new_height)).or(Some(new_height))
+        let mut update_last_good_height = |new_height: BlockNumber| {
+            last_good_height =
+                last_good_height.map(|current| current.min(new_height)).or(Some(new_height));
         };
 
         for segment in StaticFileSegment::iter() {
@@ -168,7 +169,7 @@ where
 ///    then [`None`] will be returned.
 ///
 /// [`TxNumber`]: alloy::primitives::TxNumber
-#[instrument(skip(this), fields(table = T::NAME))]
+#[instrument(skip(this, segment), fields(table = T::NAME))]
 fn ensure_invariants<Db, T: Table<Key = u64>>(
     this: &ProviderFactory<SignetNodeTypes<Db>>,
     segment: StaticFileSegment,

crates/node-tests/src/context.rs

@@ -142,7 +142,7 @@ impl SignetTestContext {
         // after RPC booted, we can create the alloy provider
         let alloy_provider = ProviderBuilder::new_with_network()
             .disable_recommended_fillers()
-            .filler(BlobGasFiller)
+            .filler(BlobGasFiller::default())
             .with_gas_estimation()
             .with_nonce_management(SimpleNonceManager::default())
             .with_chain_id(constants.ru_chain_id())