Skip to content

Commit 29b1e73

Browse files
EvalirEvalir
committed
feat(deps): bump reth & related deps to 1.8.1 release spec
1 parent 9f2c264 commit 29b1e73

File tree

7 files changed

+51
-50
lines changed

7 files changed

+51
-50
lines changed

‎Cargo.toml‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,48 +41,48 @@ signet-rpc = { version = "0.9.0", path = "crates/rpc" }
4141

4242
init4-bin-base = { version = "0.10.0", features = ["alloy"] }
4343

44-
signet-bundle = "0.9.0"
45-
signet-constants = "0.9.0"
46-
signet-evm = "0.9.0"
47-
signet-extract = "0.9.0"
48-
signet-tx-cache = "0.9.0"
49-
signet-types = "0.9.0"
50-
signet-zenith = "0.9.0"
44+
signet-bundle = "0.11.0"
45+
signet-constants = "0.11.0"
46+
signet-evm = "0.11.0"
47+
signet-extract = "0.11.0"
48+
signet-tx-cache = "0.11.0"
49+
signet-types = "0.11.0"
50+
signet-zenith = "0.11.0"
5151

5252
# ajj
5353
ajj = { version = "0.3.4" }
5454

5555
# trevm
56-
trevm = { version = "0.27.0", features = ["full_env_cfg"] }
56+
trevm = { version = "0.29.0", features = ["full_env_cfg"] }
5757

5858
# Alloy periphery crates
59-
alloy = { version = "1.0.19", features = [
59+
alloy-core = { version = "1.4" }
60+
alloy = { version = "1.0.35", features = [
6061
"full",
6162
"rpc-types-beacon",
6263
"rpc-types-mev",
6364
"genesis",
6465
"arbitrary",
6566
] }
66-
alloy-contract = { version = "1.0.19", features = ["pubsub"] }
67+
alloy-contract = { version = "1.0.35", features = ["pubsub"] }
6768

6869
# Reth
69-
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
70-
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
71-
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
72-
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
73-
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
74-
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
75-
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
76-
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
77-
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
78-
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
79-
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
80-
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
81-
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
82-
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
83-
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
84-
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
85-
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.1" }
70+
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
71+
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
72+
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
73+
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
74+
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
75+
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
76+
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
77+
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
78+
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
79+
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
80+
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
81+
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
82+
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
83+
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
84+
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
85+
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
8686

8787
# Foundry periphery
8888
foundry-blob-explorers = "0.17"
@@ -117,3 +117,6 @@ uuid = "1.16.0"
117117
# Test Utils
118118
alloy-rlp = "0.3.11"
119119
tempfile = "3.17.0"
120+
121+
[patch.crates-io]
122+
init4-bin-base = {path = "../bin-base" }

‎crates/db/src/provider.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ where
445445
//
446446
// last reviewed at tag v1.5.1
447447

448-
let BlockResult { sealed_block: block, execution_outcome } = block_result;
448+
let BlockResult { sealed_block: block, execution_outcome, .. } = block_result;
449449

450450
let ru_height = block.number();
451451
self.insert_signet_block(header, block, journal_hash, StorageLocation::Database)?;

‎crates/node-types/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ reth-chainspec.workspace = true
1414
reth-db.workspace = true
1515
reth-node-api.workspace = true
1616
reth-node-ethereum.workspace = true
17-
reth-trie-db.workspace = true
1817

1918
tokio.workspace = true

‎crates/node-types/src/lib.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use reth::{
2424
use reth_chainspec::ChainSpec;
2525
use reth_node_api::{NodePrimitives, NodeTypes, NodeTypesWithDB};
2626
use reth_node_ethereum::EthEngineTypes;
27-
use reth_trie_db::MerklePatriciaTrie;
2827
use std::marker::PhantomData;
2928
use tokio::sync::broadcast::error::SendError;
3029

@@ -85,8 +84,6 @@ where
8584

8685
type ChainSpec = ChainSpec;
8786

88-
type StateCommitment = MerklePatriciaTrie;
89-
9087
type Storage = EthStorage;
9188

9289
type Payload = EthEngineTypes;

‎crates/rpc/examples/filler.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ where
137137
replacement_uuid: None, // optional if implementing strategies that replace or cancel bundles
138138
..Default::default() // all other options are not used.
139139
},
140+
host_txs: vec![],
140141
};
141142

142143
// submit the Bundle to the transaction cache

‎crates/rpc/src/ctx.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ use alloy::{
1313
};
1414
use reth::{
1515
core::primitives::SignerRecoverable,
16-
primitives::{Block, Receipt, Recovered, RecoveredBlock, TransactionSigned},
16+
primitives::{Block, EthPrimitives, Receipt, Recovered, RecoveredBlock, TransactionSigned},
1717
providers::{
1818
BlockHashReader, BlockIdReader, BlockNumReader, CanonStateSubscriptions, HeaderProvider,
19-
ProviderBlock, ProviderError, ProviderFactory, ProviderReceipt, ProviderResult,
20-
ReceiptProvider, StateProviderFactory, TransactionsProvider, providers::BlockchainProvider,
19+
ProviderError, ProviderFactory, ProviderResult, ReceiptProvider, StateProviderFactory,
20+
TransactionsProvider, providers::BlockchainProvider,
2121
},
2222
revm::{database::StateProviderDatabase, primitives::hardfork::SpecId},
2323
rpc::{
@@ -29,6 +29,7 @@ use reth::{
2929
calculate_reward_percentiles_for_block, fee_history_cache_new_blocks_task,
3030
},
3131
logs_utils::{self, ProviderOrBlock, append_matching_block_logs},
32+
receipt::EthReceiptConverter,
3233
},
3334
types::{FilterBlockOption, FilteredParams},
3435
},
@@ -194,10 +195,7 @@ where
194195
// State stuff
195196
factory: ProviderFactory<Inner>,
196197
provider: BlockchainProvider<Inner>,
197-
cache: EthStateCache<
198-
ProviderBlock<BlockchainProvider<Inner>>,
199-
ProviderReceipt<BlockchainProvider<Inner>>,
200-
>,
198+
cache: EthStateCache<EthPrimitives>,
201199

202200
// Gas stuff
203201
gas_oracle: GasPriceOracle<BlockchainProvider<Inner>>,
@@ -347,8 +345,8 @@ where
347345
}
348346

349347
/// Create a transaction response builder for the RPC API.
350-
pub const fn tx_resp_builder(&self) -> EthRpcConverter {
351-
EthRpcConverter::new()
348+
pub fn tx_resp_builder(&self) -> EthRpcConverter<ChainSpec> {
349+
EthRpcConverter::new(EthReceiptConverter::new(self.chain_spec()))
352350
}
353351

354352
/// Get the block for a given block, formatting the block for
@@ -368,9 +366,11 @@ where
368366

369367
(*block)
370368
.clone()
371-
.into_rpc_block(full.unwrap_or_default().into(), |tx, tx_info| {
372-
self.tx_resp_builder().fill(tx, tx_info)
373-
})
369+
.into_rpc_block(
370+
full.unwrap_or_default().into(),
371+
|tx, tx_info| self.tx_resp_builder().fill(tx, tx_info),
372+
|header, size| self.tx_resp_builder().convert_header(header, size),
373+
)
374374
.map(Some)
375375
}
376376

‎crates/rpc/src/receipts.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
//! Signet RPC receipt response builder.
22
3-
use alloy::consensus::Transaction;
4-
use alloy::consensus::{ReceiptEnvelope, TxReceipt, transaction::TransactionMeta};
5-
use alloy::primitives::{Address, TxKind};
6-
use alloy::rpc::types::eth::{Log, ReceiptWithBloom, TransactionReceipt};
7-
use reth::core::primitives::SignerRecoverable;
8-
use reth::primitives::{Receipt, TransactionSigned, TxType};
3+
use alloy::{
4+
consensus::{ReceiptEnvelope, Transaction, TxReceipt, transaction::TransactionMeta},
5+
primitives::{Address, TxKind},
6+
rpc::types::eth::{Log, ReceiptWithBloom, TransactionReceipt},
7+
};
8+
use reth::primitives::{Receipt, TransactionSigned};
99
use reth::rpc::server_types::eth::{EthApiError, EthResult};
10+
use reth::{core::primitives::SignerRecoverable, primitives::TxType};
1011
use signet_types::MagicSig;
1112

1213
/// Builds an [`TransactionReceipt`] obtaining the inner receipt envelope from the given closure.

0 commit comments

Comments
 (0)