feat(deps): bump reth & related deps to 1.8.1 release spec

Cargo.toml

@@ -41,48 +41,48 @@ signet-rpc = { version = "0.9.0", path = "crates/rpc" }
 
 init4-bin-base = { version = "0.10.0", features = ["alloy"] }
 
-signet-bundle = "0.9.0"
-signet-constants = "0.9.0"
-signet-evm = "0.9.0"
-signet-extract = "0.9.0"
-signet-tx-cache = "0.9.0"
-signet-types = "0.9.0"
-signet-zenith = "0.9.0"
+signet-bundle = "0.11.0"
+signet-constants = "0.11.0"
+signet-evm = "0.11.0"
+signet-extract = "0.11.0"
+signet-tx-cache = "0.11.0"
+signet-types = "0.11.0"
+signet-zenith = "0.11.0"
 
 # ajj
 ajj = { version = "0.3.4" }
 
 # trevm
-trevm = { version = "0.27.0", features = ["full_env_cfg"] }
+trevm = { version = "0.29.0", features = ["full_env_cfg"] }
 
 # Alloy periphery crates
-alloy = { version = "1.0.19", features = [
+alloy-core = { version = "1.4" }
+alloy = { version = "1.0.35", features = [
     "full",
     "rpc-types-beacon",
     "rpc-types-mev",
     "genesis",
     "arbitrary",
 ] }
-alloy-contract = { version = "1.0.19", features = ["pubsub"] }
+alloy-contract = { version = "1.0.35", features = ["pubsub"] }
 
 # Reth
-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" }
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
 
 # Foundry periphery
 foundry-blob-explorers = "0.17"
@@ -117,3 +117,6 @@ uuid = "1.16.0"
 # Test Utils
 alloy-rlp = "0.3.11"
 tempfile = "3.17.0"
+
+[patch.crates-io]
+init4-bin-base = {path = "../bin-base" }

crates/db/src/provider.rs

@@ -445,7 +445,7 @@ where
         //
         // last reviewed at tag v1.5.1
 
-        let BlockResult { sealed_block: block, execution_outcome } = block_result;
+        let BlockResult { sealed_block: block, execution_outcome, .. } = block_result;
 
         let ru_height = block.number();
         self.insert_signet_block(header, block, journal_hash, StorageLocation::Database)?;

crates/node-types/Cargo.toml

@@ -14,6 +14,5 @@ reth-chainspec.workspace = true
 reth-db.workspace = true
 reth-node-api.workspace = true
 reth-node-ethereum.workspace = true
-reth-trie-db.workspace = true
 
 tokio.workspace = true

crates/node-types/src/lib.rs

@@ -24,7 +24,6 @@ use reth::{
 use reth_chainspec::ChainSpec;
 use reth_node_api::{NodePrimitives, NodeTypes, NodeTypesWithDB};
 use reth_node_ethereum::EthEngineTypes;
-use reth_trie_db::MerklePatriciaTrie;
 use std::marker::PhantomData;
 use tokio::sync::broadcast::error::SendError;
 
@@ -85,8 +84,6 @@ where
 
     type ChainSpec = ChainSpec;
 
-    type StateCommitment = MerklePatriciaTrie;
-
     type Storage = EthStorage;
 
     type Payload = EthEngineTypes;

crates/rpc/examples/filler.rs

@@ -137,6 +137,7 @@ where
                 replacement_uuid: None, // optional if implementing strategies that replace or cancel bundles
                 ..Default::default()    // all other options are not used.
             },
+            host_txs: vec![],
         };
 
         // submit the Bundle to the transaction cache

crates/rpc/src/ctx.rs

@@ -13,11 +13,11 @@ use alloy::{
 };
 use reth::{
     core::primitives::SignerRecoverable,
-    primitives::{Block, Receipt, Recovered, RecoveredBlock, TransactionSigned},
+    primitives::{Block, EthPrimitives, Receipt, Recovered, RecoveredBlock, TransactionSigned},
     providers::{
         BlockHashReader, BlockIdReader, BlockNumReader, CanonStateSubscriptions, HeaderProvider,
-        ProviderBlock, ProviderError, ProviderFactory, ProviderReceipt, ProviderResult,
-        ReceiptProvider, StateProviderFactory, TransactionsProvider, providers::BlockchainProvider,
+        ProviderError, ProviderFactory, ProviderResult, ReceiptProvider, StateProviderFactory,
+        TransactionsProvider, providers::BlockchainProvider,
     },
     revm::{database::StateProviderDatabase, primitives::hardfork::SpecId},
     rpc::{
@@ -29,6 +29,7 @@ use reth::{
                 calculate_reward_percentiles_for_block, fee_history_cache_new_blocks_task,
             },
             logs_utils::{self, ProviderOrBlock, append_matching_block_logs},
+            receipt::EthReceiptConverter,
         },
         types::{FilterBlockOption, FilteredParams},
     },
@@ -194,10 +195,7 @@ where
     // State stuff
     factory: ProviderFactory<Inner>,
     provider: BlockchainProvider<Inner>,
-    cache: EthStateCache<
-        ProviderBlock<BlockchainProvider<Inner>>,
-        ProviderReceipt<BlockchainProvider<Inner>>,
-    >,
+    cache: EthStateCache<EthPrimitives>,
 
     // Gas stuff
     gas_oracle: GasPriceOracle<BlockchainProvider<Inner>>,
@@ -347,8 +345,8 @@ where
     }
 
     /// Create a transaction response builder for the RPC API.
-    pub const fn tx_resp_builder(&self) -> EthRpcConverter {
-        EthRpcConverter::new()
+    pub fn tx_resp_builder(&self) -> EthRpcConverter<ChainSpec> {
+        EthRpcConverter::new(EthReceiptConverter::new(self.chain_spec()))
     }
 
     /// Get the block for a given block, formatting the block for
@@ -368,9 +366,11 @@ where
 
         (*block)
             .clone()
-            .into_rpc_block(full.unwrap_or_default().into(), |tx, tx_info| {
-                self.tx_resp_builder().fill(tx, tx_info)
-            })
+            .into_rpc_block(
+                full.unwrap_or_default().into(),
+                |tx, tx_info| self.tx_resp_builder().fill(tx, tx_info),
+                |header, size| self.tx_resp_builder().convert_header(header, size),
+            )
             .map(Some)
     }
 

crates/rpc/src/receipts.rs

@@ -1,12 +1,13 @@
 //! Signet RPC receipt response builder.
 
-use alloy::consensus::Transaction;
-use alloy::consensus::{ReceiptEnvelope, TxReceipt, transaction::TransactionMeta};
-use alloy::primitives::{Address, TxKind};
-use alloy::rpc::types::eth::{Log, ReceiptWithBloom, TransactionReceipt};
-use reth::core::primitives::SignerRecoverable;
-use reth::primitives::{Receipt, TransactionSigned, TxType};
+use alloy::{
+    consensus::{ReceiptEnvelope, Transaction, TxReceipt, transaction::TransactionMeta},
+    primitives::{Address, TxKind},
+    rpc::types::eth::{Log, ReceiptWithBloom, TransactionReceipt},
+};
+use reth::primitives::{Receipt, TransactionSigned};
 use reth::rpc::server_types::eth::{EthApiError, EthResult};
+use reth::{core::primitives::SignerRecoverable, primitives::TxType};
 use signet_types::MagicSig;
 
 /// Builds an [`TransactionReceipt`] obtaining the inner receipt envelope from the given closure.