jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Merge system tx from address

Browse Source
This commit is contained in:
sprites0
2025-03-01 17:10:15 +00:00
parent 7a81e16702
commit 5d779a66a0
8 changed files with 22 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/reth/Cargo.toml
View File

@ -92,11 +92,9 @@ similar-asserts.workspace = true
parking_lot.workspace = true
lz4_flex = "0.11.3"
rmp-serde = "1.3.0"
rmpv = "1.3.0"
serde = { workspace = true, features = ["derive"] }
reth-e2e-test-utils.workspace = true
once_cell.workspace = true
alloy-chains.workspace = true
reth-ethereum-forks.workspace = true
jsonrpsee.workspace = true
reth-rpc-layer.workspace = true

31
bin/reth/src/block_ingest.rs
View File

@ -1,10 +1,8 @@
use std::path::PathBuf;
use std::sync::Arc;
use alloy_consensus::transaction::RlpEcdsaTx;
use alloy_consensus::{BlockBody, BlockHeader};
use alloy_eips::Typed2718;
use alloy_primitives::{address, Address, PrimitiveSignature, B256, U256};
use alloy_primitives::{Address, PrimitiveSignature, B256, U256};
use alloy_rpc_types::engine::{
ExecutionPayloadEnvelopeV3, ForkchoiceState, PayloadAttributes, PayloadStatusEnum,
};
@ -16,7 +14,7 @@ use reth_node_builder::EngineTypes;
use reth_node_builder::NodeTypesWithEngine;
use reth_node_builder::{rpc::RethRpcAddOns, FullNode};
use reth_payload_builder::{EthBuiltPayload, EthPayloadBuilderAttributes, PayloadId};
use reth_primitives::{Transaction, TransactionSigned};
use reth_primitives::TransactionSigned;
use reth_provider::{BlockHashReader, StageCheckpointReader};
use reth_rpc_api::EngineApiClient;
use reth_rpc_layer::AuthClientService;
@ -53,23 +51,6 @@ async fn submit_payload<Engine: PayloadTypes + EngineTypes>(
Ok(submission.latest_valid_hash.unwrap_or_default())
}
pub(crate) fn impersonated_hash(
this: &Transaction,
sender: Address,
signature: &PrimitiveSignature,
) -> B256 {
let mut buffer = Vec::new();
let ty = this.ty();
match this {
Transaction::Legacy(tx) => tx.eip2718_encode_with_type(signature, ty, &mut buffer),
Transaction::Eip2930(tx) => tx.eip2718_encode_with_type(signature, ty, &mut buffer),
Transaction::Eip1559(tx) => tx.eip2718_encode_with_type(signature, ty, &mut buffer),
Transaction::Eip4844(tx) => tx.eip2718_encode_with_type(signature, ty, &mut buffer),
Transaction::Eip7702(tx) => tx.eip2718_encode_with_type(signature, ty, &mut buffer),
}
buffer.extend_from_slice(sender.as_ref());
B256::from_slice(alloy_primitives::utils::keccak256(&buffer).as_slice())
}
impl BlockIngest {
pub(crate) fn collect_block(&self, height: u64) -> Option<super::serialized::Block> {
let f = ((height - 1) / 1_000_000) * 1_000_000;
@ -126,7 +107,6 @@ impl BlockIngest {
{
let BlockBody { transactions, ommers, withdrawals } =
std::mem::take(block.body_mut());
let signer = address!("2222222222222222222222222222222222222222");
let signature = PrimitiveSignature::new(
// from anvil
U256::from(0x1),
@ -136,8 +116,11 @@ impl BlockIngest {
let mut system_txs = vec![];
for transaction in original_block.system_txs {
let typed_transaction = transaction.tx.to_reth();
let hash = impersonated_hash(&typed_transaction, signer, &signature);
let tx = TransactionSigned::new(typed_transaction, signature, hash);
let tx = TransactionSigned::new(
typed_transaction,
signature,
Default::default(),
);
system_txs.push(tx);
}
let mut txs = vec![];