dbg

x :broom:
anton-rs · Aug 20, 2023 · c62e4cd · c62e4cd
1 parent 0f6201d
commit c62e4cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/crates/payload/basic/src/optimism.rs b/crates/payload/basic/src/optimism.rs
@@ -87,7 +87,7 @@ where
             l1_block_info.calculate_tx_l1_cost(
                 Arc::clone(&chain_spec),
                 attributes.timestamp,
-                &reth_primitives::Bytes::from(&encoded[..]),
+                &encoded.freeze().into(),
                 sequencer_tx.is_deposit(),
             )
         });

diff --git a/crates/revm/src/executor.rs b/crates/revm/src/executor.rs
@@ -294,7 +294,7 @@ where
                     l1_block_info.calculate_tx_l1_cost(
                         chain_spec,
                         block.timestamp,
-                        &Bytes::from(&encoded[..]),
+                        &encoded.freeze().into(),
                         transaction.is_deposit(),
                     )
                 });

diff --git a/crates/revm/src/optimism.rs b/crates/revm/src/optimism.rs
@@ -1,7 +1,7 @@
 use std::{ops::Mul, str::FromStr, sync::Arc};
 
 use reth_interfaces::executor;
-use reth_primitives::{Address, Block, Bytes, ChainSpec, TransactionKind, U256};
+use reth_primitives::{Address, Block, Bytes, ChainSpec, Hardfork, TransactionKind, U256};
 
 const L1_FEE_RECIPIENT: &str = "0x420000000000000000000000000000000000001A";
 const BASE_FEE_RECIPIENT: &str = "0x4200000000000000000000000000000000000019";
@@ -105,7 +105,7 @@ impl L1BlockInfo {
         }));
 
         // Prior to regolith, an extra 68 non zero bytes were included in the rollup data costs.
-        if !chain_spec.fork(reth_primitives::Hardfork::Regolith).active_at_timestamp(timestamp) {
+        if !chain_spec.fork(Hardfork::Regolith).active_at_timestamp(timestamp) {
             rollup_data_gas_cost += U256::from(NON_ZERO_BYTE_COST).mul(U256::from(68));
         }
 

diff --git a/crates/transaction-pool/src/validate/eth.rs b/crates/transaction-pool/src/validate/eth.rs
@@ -8,9 +8,8 @@ use crate::{
     TransactionValidationOutcome, TransactionValidationTaskExecutor, TransactionValidator,
 };
 use reth_primitives::{
-    bytes::BytesMut, constants::ETHEREUM_BLOCK_GAS_LIMIT, Bytes, ChainSpec,
-    InvalidTransactionError, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID,
-    LEGACY_TX_TYPE_ID,
+    bytes::BytesMut, constants::ETHEREUM_BLOCK_GAS_LIMIT, ChainSpec, InvalidTransactionError,
+    EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID,
 };
 use reth_provider::{AccountReader, BlockReaderIdExt, StateProviderFactory};
 use reth_tasks::TaskSpawner;
@@ -252,7 +251,7 @@ where
                 Ok(info) => info.calculate_tx_l1_cost(
                     Arc::clone(&self.chain_spec),
                     block.timestamp,
-                    &Bytes::from(&encoded[..]),
+                    &encoded.freeze().into(),
                     transaction.is_deposit(),
                 ),
                 Err(err) => {