Skip to content

Commit 6a9fd27

Browse files
dvushdvush
authored
reth 1.9.3 (#822)
## 📝 Summary <!--- A general summary of your changes --> ## 💡 Motivation and Context <!--- (Optional) Why is this change required? What problem does it solve? Remove this section if not applicable. --> --- ## ✅ I have completed the following steps: * [ ] Run `make lint` * [ ] Run `make test` * [ ] Added tests (if applicable)
1 parent 4e18f8f commit 6a9fd27

File tree

13 files changed

+1184
-799
lines changed

13 files changed

+1184
-799
lines changed

‎Cargo.lock‎

Lines changed: 1014 additions & 669 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -70,61 +70,61 @@ codegen-units = 1
7070
incremental = false
7171

7272
[workspace.dependencies]
73-
reth = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
74-
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
75-
reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
76-
reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
77-
reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
78-
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
79-
reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
80-
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
81-
reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
82-
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
83-
reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
84-
reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
85-
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
86-
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
87-
reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b", features = [
73+
reth = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
74+
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
75+
reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
76+
reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
77+
reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
78+
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
79+
reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
80+
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
81+
reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
82+
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
83+
reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
84+
reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
85+
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
86+
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
87+
reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646", features = [
8888
"test-utils",
8989
] }
90-
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
91-
reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
92-
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
93-
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
94-
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
95-
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "42197415102b7a20be42e4fe919f024b81ceb55b" }
96-
97-
# compatible with reth 42197415102b7a20be42e4fe919f024b81ceb55b dependencies
98-
revm = { version = "29.0.1", features = [
90+
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
91+
reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
92+
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
93+
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
94+
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
95+
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "27a8c0f5a6dfb27dea84c5751776ecabdd069646" }
96+
97+
# compatible with reth 27a8c0f5a6dfb27dea84c5751776ecabdd069646 dependencies
98+
revm = { version = "31.0.2", features = [
9999
"std",
100100
"secp256k1",
101101
"optional_balance_check",
102102
], default-features = false }
103-
revm-inspectors = { version = "0.30.0", default-features = false }
103+
revm-inspectors = { version = "0.32.0", default-features = false }
104104

105105
ethereum_ssz_derive = "0.9.0"
106106
ethereum_ssz = "0.9.0"
107107

108-
alloy-primitives = { version = "1.3.1", default-features = false, features = [
108+
alloy-primitives = { version = "1.4.1", default-features = false, features = [
109109
"getrandom",
110110
] }
111111
alloy-rlp = "0.3.10"
112112
alloy-chains = "0.2.5"
113113
alloy-trie = { version = "0.8.1", default-features = false }
114-
alloy-evm = { version = "0.21.1", default-features = false }
115-
alloy-provider = { version = "1.0.37", features = ["ipc", "pubsub", "ws"] }
116-
alloy-eips = { version = "1.0.37" }
117-
alloy-rpc-types = { version = "1.0.37" }
118-
alloy-json-rpc = { version = "1.0.37" }
119-
alloy-network = { version = "1.0.37" }
120-
alloy-network-primitives = { version = "1.0.37" }
121-
alloy-node-bindings = { version = "1.0.37" }
122-
alloy-consensus = { version = "1.0.37", features = ["kzg"] }
123-
alloy-rpc-types-beacon = { version = "1.0.37", features = ["ssz"] }
124-
alloy-rpc-types-engine = { version = "1.0.37", features = ["ssz"] }
125-
alloy-rpc-types-eth = { version = "1.0.37" }
126-
alloy-signer = { version = "1.0.37" }
127-
alloy-signer-local = { version = "1.0.37" }
114+
alloy-evm = { version = "0.23.3", default-features = false }
115+
alloy-provider = { version = "1.0.41", features = ["ipc", "pubsub", "ws"] }
116+
alloy-eips = { version = "1.0.41" }
117+
alloy-rpc-types = { version = "1.0.41" }
118+
alloy-json-rpc = { version = "1.0.41" }
119+
alloy-network = { version = "1.0.41" }
120+
alloy-network-primitives = { version = "1.0.41" }
121+
alloy-node-bindings = { version = "1.0.41" }
122+
alloy-consensus = { version = "1.0.41", features = ["kzg"] }
123+
alloy-rpc-types-beacon = { version = "1.0.41", features = ["ssz"] }
124+
alloy-rpc-types-engine = { version = "1.0.41", features = ["ssz"] }
125+
alloy-rpc-types-eth = { version = "1.0.41" }
126+
alloy-signer = { version = "1.0.41" }
127+
alloy-signer-local = { version = "1.0.41" }
128128

129129
# Version required by ethereum-consensus beacon-api-client
130130
mev-share-sse = { git = "https://github.com/paradigmxyz/mev-share-rs", rev = "9eb2b0138ab3202b9eb3af4b19c7b3bf40b0faa8", default-features = false }

‎crates/rbuilder/src/backtest/build_block/synthetic_orders.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ fn create_tip_tx(
6363

6464
impl<ConfigType: LiveBuilderConfig> SyntheticOrdersSource<ConfigType> {
6565
fn new(extra_cfg: ExtraCfg, config: ConfigType) -> eyre::Result<Self> {
66-
let block_number = 1;
67-
let test_chain_state = TestChainState::new(BlockArgs::default().number(block_number))?;
66+
let block_number = BlockArgs::MIN_BLOCK_NUMBER;
67+
let test_chain_state = TestChainState::new(BlockArgs::default().with_number(block_number))?;
6868
let mut orders = Vec::new();
6969
for i in 0..extra_cfg.tx_count {
7070
let order = Order::Tx(MempoolTx::new(create_tip_tx(

‎crates/rbuilder/src/building/precompile_cache.rs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use parking_lot::Mutex;
77
use revm::{
88
context::{Cfg, ContextTr},
99
handler::PrecompileProvider,
10-
interpreter::{InputsImpl, InterpreterResult},
10+
interpreter::{CallInputs, InterpreterResult},
1111
primitives::hardfork::SpecId,
1212
};
1313
use std::{num::NonZeroUsize, sync::Arc};
@@ -56,15 +56,12 @@ impl<CTX: ContextTr, P: PrecompileProvider<CTX, Output = InterpreterResult>> Pre
5656
fn run(
5757
&mut self,
5858
context: &mut CTX,
59-
address: &Address,
60-
inputs: &InputsImpl,
61-
is_static: bool,
62-
gas_limit: u64,
59+
inputs: &CallInputs,
6360
) -> Result<Option<Self::Output>, String> {
64-
let key = (self.spec, inputs.input.bytes(context), gas_limit);
61+
let key = (self.spec, inputs.input.bytes(context), inputs.gas_limit);
6562

6663
// get the result if it exists
67-
if let Some(precompiles) = self.cache.lock().get_mut(address) {
64+
if let Some(precompiles) = self.cache.lock().get_mut(&inputs.target_address) {
6865
if let Some(result) = precompiles.get(&key) {
6966
inc_precompile_cache_hits();
7067
return result.clone().map(Some);
@@ -74,15 +71,13 @@ impl<CTX: ContextTr, P: PrecompileProvider<CTX, Output = InterpreterResult>> Pre
7471
inc_precompile_cache_misses();
7572

7673
// call the precompile if cache miss
77-
let output = self
78-
.precompile
79-
.run(context, address, inputs, is_static, gas_limit);
74+
let output = self.precompile.run(context, inputs);
8075

8176
if let Some(output) = output.clone().transpose() {
8277
// insert the result into the cache
8378
self.cache
8479
.lock()
85-
.entry(*address)
80+
.entry(inputs.target_address)
8681
.or_insert(PrecompileResultCache::new(NonZeroUsize::new(2048).unwrap()))
8782
.put(key, output);
8883
}

0 commit comments

Comments
 (0)