feat(deps): bump revm/reth (#84)

* feat(deps): bump revm/reth

* chore: compatible bumps

* chore: fixes

* lint: clippy

---------

Co-authored-by: James <[email protected]>

Author: Evalir

Cargo.toml

@@ -49,41 +49,38 @@ signet-zenith = { version = "0.5.0", path = "crates/zenith" }
 ajj = { version = "0.3.4" }
 
 # trevm
-trevm = { version = "0.23.7", features = ["full_env_cfg"] }
+trevm = { version = "0.27.0", features = ["full_env_cfg"] }
 
 # Alloy periphery crates
-alloy = { version = "=1.0.11", features = [
+alloy = { version = "1.0.19", features = [
     "full",
     "rpc-types-mev",
     "genesis",
     "arbitrary",
 ] }
-alloy-contract = { version = "=1.0.11", features = ["pubsub"] }
-alloy-trie = { version = "=0.8.1" }
-alloy-genesis = { version = "=1.0.11" }
-alloy-consensus = { version = "=1.0.11" }
+alloy-contract = { version = "1.0.19", features = ["pubsub"] }
 
 # Reth
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
 
 # Foundry periphery
-foundry-blob-explorers = "0.10"
+foundry-blob-explorers = "0.17"
 
 # Async
 tokio = { version = "1.43.0", features = ["macros"] }

crates/bundle/src/call/driver.rs

@@ -117,12 +117,12 @@ where
 
         // Check if the block we're in is valid for this bundle. Both must match
         trevm_ensure!(
-            trevm.block_number() == bundle.block_number,
+            trevm.block_number().to::<u64>() == bundle.block_number,
             trevm,
             BundleError::BlockNumberMismatch
         );
         // Set the state block number this simulation was based on
-        self.response.state_block_number = trevm.block_number();
+        self.response.state_block_number = trevm.block_number().to();
 
         // Check if the state block number is valid (not 0, and not a tag)
         trevm_ensure!(

crates/bundle/src/call/trevm.rs

@@ -1,4 +1,5 @@
 use crate::SignetCallBundle;
+use alloy::primitives::U256;
 use trevm::{revm::context::BlockEnv, Block};
 
 impl Block for SignetCallBundle {
@@ -14,9 +15,9 @@ impl Block for SignetCallBundle {
             blob_excess_gas_and_price: _,
         } = block_env;
 
-        *number = self.bundle.state_block_number.as_number().unwrap_or(*number);
+        *number = self.bundle.state_block_number.as_number().map(U256::from).unwrap_or(*number);
         *beneficiary = self.bundle.coinbase.unwrap_or(*beneficiary);
-        *timestamp = self.bundle.timestamp.unwrap_or(*timestamp);
+        *timestamp = self.bundle.timestamp.map(U256::from).unwrap_or(*timestamp);
         *gas_limit = self.bundle.gas_limit.unwrap_or(*gas_limit);
         *difficulty = self.bundle.difficulty.unwrap_or(*difficulty);
         *basefee =

crates/bundle/src/send/driver.rs

@@ -122,22 +122,21 @@ where
 
         // Check if the block we're in is valid for this bundle. Both must match
         trevm_ensure!(
-            trevm.block_number() == bundle.block_number,
+            trevm.block_number().to::<u64>() == bundle.block_number,
             trevm,
             BundleError::BlockNumberMismatch.into()
         );
 
         // Check if the state block number is valid (not 0, and not a tag)
         let timestamp = trevm.block_timestamp();
         trevm_ensure!(
-            timestamp >= bundle.min_timestamp.unwrap_or_default()
-                && timestamp <= bundle.max_timestamp.unwrap_or(u64::MAX),
+            self.bundle.is_valid_at_timestamp(timestamp.to()),
             trevm,
             BundleError::TimestampOutOfRange.into()
         );
 
         // Check that the `SignedFill` is valid at the timestamp.
-        if self.bundle().validate_fills_offchain(timestamp).is_err() {
+        if self.bundle().validate_fills_offchain(timestamp.to()).is_err() {
             return Err(trevm.errored(BundleError::BundleReverted.into()));
         }
 

crates/constants/Cargo.toml

@@ -11,9 +11,6 @@ repository.workspace = true
 
 [dependencies]
 alloy.workspace = true
-alloy-trie.workspace = true
-alloy-genesis.workspace = true
-alloy-consensus.workspace = true
 
 serde.workspace = true
 serde_json.workspace = true

crates/constants/src/lib.rs

@@ -21,10 +21,6 @@ pub use chains::pecorino;
 #[cfg(any(test, feature = "test-utils"))]
 pub use chains::test_utils;
 
-use alloy_consensus as _;
-use alloy_genesis as _;
-use alloy_trie as _;
-
 mod types;
 pub use types::{
     ConfigError, HostConstants, KnownChains, PairedHeights, ParseChainError, PermissionedToken,

crates/evm/Cargo.toml

@@ -14,7 +14,7 @@ signet-extract.workspace = true
 signet-types.workspace = true
 signet-zenith.workspace = true
 
-trevm = { workspace = true, features = ["secp256r1"] }
+trevm.workspace = true
 
 alloy.workspace = true
 

crates/evm/src/driver.rs

@@ -950,9 +950,9 @@ impl<C: Extractable> trevm::Block for SignetDriver<'_, '_, C> {
             prevrandao,
             blob_excess_gas_and_price,
         } = block_env;
-        *number = self.ru_height();
+        *number = U256::from(self.ru_height());
         *beneficiary = self.beneficiary();
-        *timestamp = self.extracts.host_block.timestamp();
+        *timestamp = U256::from(self.extracts.host_block.timestamp());
         *gas_limit = self.gas_limit();
         *basefee = self.base_fee();
         *difficulty = self.extracts.host_block.difficulty();

crates/evm/src/orders/inspector.rs

@@ -9,8 +9,7 @@ use trevm::{
     helpers::Ctx,
     revm::{
         interpreter::{
-            CallInputs, CallOutcome, CreateInputs, CreateOutcome, EOFCreateInputs, Interpreter,
-            InterpreterTypes,
+            CallInputs, CallOutcome, CreateInputs, CreateOutcome, Interpreter, InterpreterTypes,
         },
         Database, Inspector,
     },
@@ -147,28 +146,6 @@ where
         }
     }
 
-    fn eofcreate(
-        &mut self,
-        _context: &mut Ctx<Db>,
-        _inputs: &mut EOFCreateInputs,
-    ) -> Option<CreateOutcome> {
-        self.orders.enter_frame();
-        None
-    }
-
-    fn eofcreate_end(
-        &mut self,
-        _context: &mut Ctx<Db>,
-        _inputs: &EOFCreateInputs,
-        outcome: &mut CreateOutcome,
-    ) {
-        if outcome.result.is_ok() {
-            self.orders.exit_frame();
-        } else {
-            self.orders.revert_frame();
-        }
-    }
-
     fn selfdestruct(&mut self, _contract: Address, _target: Address, _value: U256) {
         self.orders.exit_frame();
     }

crates/rpc/src/ctx.rs

@@ -23,8 +23,7 @@ use reth::{
     },
     revm::{database::StateProviderDatabase, primitives::hardfork::SpecId},
     rpc::{
-        compat::block::from_block,
-        eth::{filter::EthFilterError, EthTxBuilder},
+        eth::{filter::EthFilterError, helpers::types::EthRpcConverter},
         server_types::eth::{
             fee_history::{
                 calculate_reward_percentiles_for_block, fee_history_cache_new_blocks_task,
@@ -39,7 +38,7 @@ use reth::{
 };
 use reth_chainspec::{BaseFeeParams, ChainSpec, ChainSpecProvider};
 use reth_node_api::{BlockBody, FullNodeComponents};
-use reth_rpc_eth_api::{RpcBlock, RpcReceipt, RpcTransaction};
+use reth_rpc_eth_api::{RpcBlock, RpcConvert, RpcReceipt, RpcTransaction};
 use signet_evm::EvmNeedsTx;
 use signet_tx_cache::client::TxCache;
 use signet_types::{constants::SignetSystemConstants, MagicSig};
@@ -203,7 +202,7 @@ where
 
     // Gas stuff
     gas_oracle: GasPriceOracle<BlockchainProvider<Inner>>,
-    fee_history: FeeHistoryCache,
+    fee_history: FeeHistoryCache<reth::primitives::Header>,
 
     // Tx stuff
     tx_cache: Option<TxCache>,
@@ -326,6 +325,11 @@ where
         self.cache.get_recovered_block(hash).await.map_err(Into::into).map(|b| b.map(|b| (hash, b)))
     }
 
+    /// Create a transaction response builder for the RPC API.
+    pub const fn tx_resp_builder(&self) -> EthRpcConverter {
+        EthRpcConverter::new()
+    }
+
     /// Get the block for a given block, formatting the block for
     /// the RPC API.
     pub async fn block(
@@ -341,7 +345,11 @@ where
             return Ok(None);
         };
 
-        from_block((*block).clone(), full.unwrap_or_default().into(), &EthTxBuilder::default())
+        (*block)
+            .clone()
+            .into_rpc_block(full.unwrap_or_default().into(), |tx, tx_info| {
+                self.tx_resp_builder().fill(tx, tx_info)
+            })
             .map(Some)
     }
 
@@ -627,7 +635,10 @@ where
             }
 
             for entry in &fee_entries {
-                base_fee_per_gas.push(entry.base_fee_per_gas as u128);
+                base_fee_per_gas.push(
+                    entry.header.base_fee_per_gas().expect("signet only has post-eip1559 headers")
+                        as u128,
+                );
                 gas_used_ratio.push(entry.gas_used_ratio);
 
                 if let Some(percentiles) = &reward_percentiles {
@@ -642,8 +653,12 @@ where
 
             // Also need to include the `base_fee_per_gas` and `base_fee_per_blob_gas` for the
             // next block
-            base_fee_per_gas
-                .push(last_entry.next_block_base_fee(self.provider().chain_spec()) as u128);
+            base_fee_per_gas.push(
+                last_entry
+                    .header
+                    .next_block_base_fee(BaseFeeParams::ethereum())
+                    .expect("signet only has post-eip1559 headers") as u128,
+            );
         } else {
             // read the requested header range
             let headers = self.provider().sealed_headers_range(start_block..=end_block)?;