From 241debca00eb40c2be29fff05b86d62edd20263b Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 6 Jan 2025 12:26:52 +0100 Subject: [PATCH 1/2] chore: bump revm 19.1 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/optimism/evm/src/l1.rs | 4 ++-- crates/optimism/node/src/txpool.rs | 2 +- crates/optimism/rpc/src/eth/receipt.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c88bc85635b7..adc8970aff4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9654,9 +9654,9 @@ dependencies = [ [[package]] name = "revm" -version = "19.0.0" +version = "19.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8905d0c5f10e767f13ea7cb8e502d315f144071a60fe2bd83977922dd3afa26" +checksum = "5cf3e76e72b3924612d9f5f9ca9f970e0c0aabbf060cacfdb77faa9a12f9d2c9" dependencies = [ "auto_impl", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index 66ddec61ccc3..121ef9a86c08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -426,7 +426,7 @@ reth-trie-sparse = { path = "crates/trie/sparse" } reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false } # revm -revm = { version = "19.0.0", default-features = false } +revm = { version = "19.1.0", default-features = false } revm-primitives = { version = "15.1.0", default-features = false } revm-interpreter = { version = "15.0.0", default-features = false } revm-inspectors = "0.14.1" diff --git a/crates/optimism/evm/src/l1.rs b/crates/optimism/evm/src/l1.rs index 1a092b831a56..033d632b505d 100644 --- a/crates/optimism/evm/src/l1.rs +++ b/crates/optimism/evm/src/l1.rs @@ -196,7 +196,7 @@ pub trait RethL1BlockInfo { /// - `input`: The calldata of the transaction. /// - `is_deposit`: Whether or not the transaction is a deposit. fn l1_tx_data_fee( - &self, + &mut self, chain_spec: &ChainSpec, timestamp: u64, input: &[u8], @@ -219,7 +219,7 @@ pub trait RethL1BlockInfo { impl RethL1BlockInfo for L1BlockInfo { fn l1_tx_data_fee( - &self, + &mut self, chain_spec: &ChainSpec, timestamp: u64, input: &[u8], diff --git a/crates/optimism/node/src/txpool.rs b/crates/optimism/node/src/txpool.rs index 9692e8cdb136..96a43279c5ad 100644 --- a/crates/optimism/node/src/txpool.rs +++ b/crates/optimism/node/src/txpool.rs @@ -324,7 +324,7 @@ where propagate, } = outcome { - let l1_block_info = self.block_info.l1_block_info.read().clone(); + let mut l1_block_info = self.block_info.l1_block_info.read().clone(); let mut encoded = Vec::with_capacity(valid_tx.transaction().encoded_length()); let tx = valid_tx.transaction().clone_into_consensus(); diff --git a/crates/optimism/rpc/src/eth/receipt.rs b/crates/optimism/rpc/src/eth/receipt.rs index cc37dbbb5320..d83cb7a5e844 100644 --- a/crates/optimism/rpc/src/eth/receipt.rs +++ b/crates/optimism/rpc/src/eth/receipt.rs @@ -107,7 +107,7 @@ impl OpReceiptFieldsBuilder { mut self, chain_spec: &OpChainSpec, tx: &OpTransactionSigned, - l1_block_info: revm::L1BlockInfo, + mut l1_block_info: revm::L1BlockInfo, ) -> Result { let raw_tx = tx.encoded_2718(); let timestamp = self.block_timestamp; From 1d4b056be2b466b4cd419ef494811991a3830608 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 6 Jan 2025 17:20:30 +0100 Subject: [PATCH 2/2] chore: bump revm 19.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e29a1d431e1..03e9ed43854f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9655,9 +9655,9 @@ dependencies = [ [[package]] name = "revm" -version = "19.1.0" +version = "19.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf3e76e72b3924612d9f5f9ca9f970e0c0aabbf060cacfdb77faa9a12f9d2c9" +checksum = "8b829dc9d6e62c5a540dfdceb0c4d2217e445bf5f6f5ed3866817e7a9637c019" dependencies = [ "auto_impl", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index 121ef9a86c08..1c470f72ef9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -426,7 +426,7 @@ reth-trie-sparse = { path = "crates/trie/sparse" } reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false } # revm -revm = { version = "19.1.0", default-features = false } +revm = { version = "19.2.0", default-features = false } revm-primitives = { version = "15.1.0", default-features = false } revm-interpreter = { version = "15.0.0", default-features = false } revm-inspectors = "0.14.1"