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

chore(rpc-types-compat): use SealedBlock.raw_transactions to reduce deplicate (#6406)

Browse Source 
Signed-off-by: jsvisa <delweng@gmail.com>
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
This commit is contained in:
Delweng
2024-02-06 23:29:08 +08:00
committed by GitHub
parent 52f78bad0a
commit 2895ed30d9
2 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/primitives/src/block.rs
View File

@ -1,6 +1,6 @@
use crate::{
Address, GotExpected, Header, SealedHeader, TransactionSigned, TransactionSignedEcRecovered,
Withdrawal, Withdrawals, B256,
Address, Bytes, GotExpected, Header, SealedHeader, TransactionSigned,
TransactionSignedEcRecovered, Withdrawal, Withdrawals, B256,
};
use alloy_rlp::{RlpDecodable, RlpEncodable};
use reth_codecs::derive_arbitrary;
@ -348,6 +348,11 @@ impl SealedBlock {
Ok(())
}
/// Returns a vector of transactions RLP encoded with [TransactionSigned::encode_enveloped].
pub fn raw_transactions(&self) -> Vec<Bytes> {
self.body.iter().map(|tx| tx.envelope_encoded()).collect()
}
}
impl From<SealedBlock> for Block {

40
crates/rpc/rpc-types-compat/src/engine/payload.rs
View File

@ -102,15 +102,7 @@ pub fn try_block_to_payload(value: SealedBlock) -> ExecutionPayload {
/// Converts [SealedBlock] to [ExecutionPayloadV1]
pub fn try_block_to_payload_v1(value: SealedBlock) -> ExecutionPayloadV1 {
let transactions = value
.body
.iter()
.map(|tx| {
let mut encoded = Vec::new();
tx.encode_enveloped(&mut encoded);
encoded.into()
})
.collect();
let transactions = value.raw_transactions();
ExecutionPayloadV1 {
parent_hash: value.parent_hash,
fee_recipient: value.beneficiary,
@ -131,15 +123,7 @@ pub fn try_block_to_payload_v1(value: SealedBlock) -> ExecutionPayloadV1 {
/// Converts [SealedBlock] to [ExecutionPayloadV2]
pub fn try_block_to_payload_v2(value: SealedBlock) -> ExecutionPayloadV2 {
let transactions = value
.body
.iter()
.map(|tx| {
let mut encoded = Vec::new();
tx.encode_enveloped(&mut encoded);
encoded.into()
})
.collect();
let transactions = value.raw_transactions();
let standalone_withdrawals: Vec<reth_rpc_types::withdrawal::Withdrawal> = value
.withdrawals
.clone()
@ -171,15 +155,7 @@ pub fn try_block_to_payload_v2(value: SealedBlock) -> ExecutionPayloadV2 {
/// Converts [SealedBlock] to [ExecutionPayloadV3]
pub fn block_to_payload_v3(value: SealedBlock) -> ExecutionPayloadV3 {
let transactions = value
.body
.iter()
.map(|tx| {
let mut encoded = Vec::new();
tx.encode_enveloped(&mut encoded);
encoded.into()
})
.collect();
let transactions = value.raw_transactions();
let withdrawals: Vec<reth_rpc_types::withdrawal::Withdrawal> = value
.withdrawals
@ -362,15 +338,7 @@ pub fn convert_to_payload_body_v1(value: Block) -> ExecutionPayloadBodyV1 {
/// Transforms a [SealedBlock] into a [ExecutionPayloadV1]
pub fn execution_payload_from_sealed_block(value: SealedBlock) -> ExecutionPayloadV1 {
let transactions = value
.body
.iter()
.map(|tx| {
let mut encoded = Vec::new();
tx.encode_enveloped(&mut encoded);
encoded.into()
})
.collect();
let transactions = value.raw_transactions();
ExecutionPayloadV1 {
parent_hash: value.parent_hash,
fee_recipient: value.beneficiary,