cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

remove clone of access lists

Browse Source
This commit is contained in:
realbigsean 2023-02-08 10:59:48 -05:00
parent dd40adc5c0
commit 902f64a946
No known key found for this signature in database
GPG Key ID: BE1B3DB104F6C788
1 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
beacon_node/execution_layer/src/lib.rs
View File

@ -14,6 +14,7 @@ pub use engine_api::{http, http::deposit_methods, http::HttpJsonRpc};
use engines::{Engine, EngineError}; use engines::{Engine, EngineError};
pub use engines::{EngineState, ForkchoiceState}; pub use engines::{EngineState, ForkchoiceState};
use eth2::types::{builder_bid::SignedBuilderBid, ForkVersionedResponse}; use eth2::types::{builder_bid::SignedBuilderBid, ForkVersionedResponse};
use ethers_core::types::transaction::eip2930::AccessListItem;
use ethers_core::types::{Transaction as EthersTransaction, U64}; use ethers_core::types::{Transaction as EthersTransaction, U64};
use fork_choice::ForkchoiceUpdateParameters; use fork_choice::ForkchoiceUpdateParameters;
use lru::LruCache; use lru::LruCache;
@ -51,6 +52,7 @@ use types::{
use types::{ use types::{
ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844, ExecutionPayloadMerge, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844, ExecutionPayloadMerge,
}; };
use warp::hyper::body::HttpBody;
mod block_hash; mod block_hash;
mod engine_api; mod engine_api;
@ -1689,13 +1691,15 @@ impl<T: EthSpec> ExecutionLayer<T> {
return Ok(None); return Ok(None);
}; };
let transactions = VariableList::from( let convert_transactions = |transactions: Vec<EthersTransaction>| {
block VariableList::new(
.transactions() transactions
.into_iter() .into_iter()
.map(ethers_tx_to_bytes::<T>) .map(ethers_tx_to_bytes::<T>)
.collect::<Result<Vec<_>, BlobTxConversionError>>()?, .collect::<Result<Vec<_>, BlobTxConversionError>>()?,
); )
.map_err(BlobTxConversionError::SszError)
};
let payload = match block { let payload = match block {
ExecutionBlockWithTransactions::Merge(merge_block) => { ExecutionBlockWithTransactions::Merge(merge_block) => {
@ -1713,7 +1717,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
extra_data: merge_block.extra_data, extra_data: merge_block.extra_data,
base_fee_per_gas: merge_block.base_fee_per_gas, base_fee_per_gas: merge_block.base_fee_per_gas,
block_hash: merge_block.block_hash, block_hash: merge_block.block_hash,
transactions, transactions: convert_transactions(merge_block.transactions)?,
}) })
} }
ExecutionBlockWithTransactions::Capella(capella_block) => { ExecutionBlockWithTransactions::Capella(capella_block) => {
@ -1739,7 +1743,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
extra_data: capella_block.extra_data, extra_data: capella_block.extra_data,
base_fee_per_gas: capella_block.base_fee_per_gas, base_fee_per_gas: capella_block.base_fee_per_gas,
block_hash: capella_block.block_hash, block_hash: capella_block.block_hash,
transactions, transactions: convert_transactions(capella_block.transactions)?,
withdrawals, withdrawals,
}) })
} }
@ -1767,7 +1771,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
base_fee_per_gas: eip4844_block.base_fee_per_gas, base_fee_per_gas: eip4844_block.base_fee_per_gas,
excess_data_gas: eip4844_block.excess_data_gas, excess_data_gas: eip4844_block.excess_data_gas,
block_hash: eip4844_block.block_hash, block_hash: eip4844_block.block_hash,
transactions, transactions: convert_transactions(eip4844_block.transactions)?,
withdrawals, withdrawals,
}) })
} }
@ -2062,7 +2066,7 @@ impl From<serde_json::Error> for BlobTxConversionError {
/// on transaction type. That means RLP encoding if this is a transaction other than a /// on transaction type. That means RLP encoding if this is a transaction other than a
/// `BLOB_TX_TYPE` transaction in which case, SSZ encoding will be used. /// `BLOB_TX_TYPE` transaction in which case, SSZ encoding will be used.
fn ethers_tx_to_bytes<T: EthSpec>( fn ethers_tx_to_bytes<T: EthSpec>(
transaction: &EthersTransaction, transaction: EthersTransaction,
) -> Result<Transaction<T::MaxBytesPerTransaction>, BlobTxConversionError> { ) -> Result<Transaction<T::MaxBytesPerTransaction>, BlobTxConversionError> {
let tx_type = transaction let tx_type = transaction
.transaction_type .transaction_type
@ -2070,58 +2074,73 @@ fn ethers_tx_to_bytes<T: EthSpec>(
.as_u64(); .as_u64();
let tx = if BLOB_TX_TYPE as u64 == tx_type { let tx = if BLOB_TX_TYPE as u64 == tx_type {
let EthersTransaction {
hash,
nonce,
block_hash,
block_number,
transaction_index,
from,
to,
value,
gas_price,
gas,
input,
v,
r,
s,
transaction_type,
access_list,
max_priority_fee_per_gas,
max_fee_per_gas,
chain_id,
other,
} = transaction;
// ******************** BlobTransaction fields ******************** // ******************** BlobTransaction fields ********************
// chainId // chainId
let chain_id = transaction let chain_id = chain_id.ok_or(BlobTxConversionError::NoChainId)?;
.chain_id
.ok_or(BlobTxConversionError::NoChainId)?;
// nonce // nonce
let nonce = if transaction.nonce > Uint256::from(u64::MAX) { let nonce = if nonce > Uint256::from(u64::MAX) {
return Err(BlobTxConversionError::NonceTooLarge); return Err(BlobTxConversionError::NonceTooLarge);
} else { } else {
transaction.nonce.as_u64() nonce.as_u64()
}; };
// maxPriorityFeePerGas // maxPriorityFeePerGas
let max_priority_fee_per_gas = transaction let max_priority_fee_per_gas =
.max_priority_fee_per_gas max_priority_fee_per_gas.ok_or(BlobTxConversionError::MaxPriorityFeePerGasMissing)?;
.ok_or(BlobTxConversionError::MaxPriorityFeePerGasMissing)?;
// maxFeePerGas // maxFeePerGas
let max_fee_per_gas = transaction let max_fee_per_gas = max_fee_per_gas.ok_or(BlobTxConversionError::MaxFeePerGasMissing)?;
.max_fee_per_gas
.ok_or(BlobTxConversionError::MaxFeePerGasMissing)?;
// gas // gas
let gas = if transaction.gas > Uint256::from(u64::MAX) { let gas = if gas > Uint256::from(u64::MAX) {
return Err(BlobTxConversionError::GasTooHigh); return Err(BlobTxConversionError::GasTooHigh);
} else { } else {
transaction.gas.as_u64() gas.as_u64()
}; };
// to
let to = transaction.to;
// value
let value = transaction.value;
// data (a.k.a input) // data (a.k.a input)
let data = VariableList::new(transaction.input.to_vec())?; let data = VariableList::new(input.to_vec())?;
// accessList // accessList
let access_list = VariableList::new( let access_list = VariableList::new(
transaction access_list
.access_list
.as_ref()
.ok_or(BlobTxConversionError::AccessListMissing)? .ok_or(BlobTxConversionError::AccessListMissing)?
.0 .0
.iter() .into_iter()
.map(|access_tuple| { .map(|access_tuple| {
let AccessListItem {
address,
storage_keys,
} = access_tuple;
Ok(AccessTuple { Ok(AccessTuple {
address: access_tuple.address, address,
storage_keys: VariableList::new(access_tuple.storage_keys.clone())?, storage_keys: VariableList::new(storage_keys)?,
}) })
}) })
.collect::<Result<Vec<AccessTuple>, BlobTxConversionError>>()?, .collect::<Result<Vec<AccessTuple>, BlobTxConversionError>>()?,
@ -2134,8 +2153,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
// maxFeePerDataGas // maxFeePerDataGas
let data_gas_bytes = eth2_serde_utils::hex::decode( let data_gas_bytes = eth2_serde_utils::hex::decode(
transaction other
.other
.get("maxFeePerDataGas") .get("maxFeePerDataGas")
.ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)? .ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)?
.as_str() .as_str()
@ -2149,8 +2167,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
}?; }?;
// blobVersionedHashes // blobVersionedHashes
let blob_versioned_hashes = transaction let blob_versioned_hashes = other
.other
.get("blobVersionedHashes") .get("blobVersionedHashes")
.ok_or(BlobTxConversionError::BlobVersionedHashesMissing)? .ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?
.as_array() .as_array()
@ -2186,15 +2203,13 @@ fn ethers_tx_to_bytes<T: EthSpec>(
// ******************** EcdsaSignature fields ******************** // ******************** EcdsaSignature fields ********************
let y_parity = if transaction.v == U64::zero() { let y_parity = if v == U64::zero() {
false false
} else if transaction.v == U64::one() { } else if v == U64::one() {
true true
} else { } else {
return Err(BlobTxConversionError::InvalidYParity); return Err(BlobTxConversionError::InvalidYParity);
}; };
let r = transaction.r;
let s = transaction.s;
let signature = EcdsaSignature { y_parity, r, s }; let signature = EcdsaSignature { y_parity, r, s };
// The `BLOB_TX_TYPE` should prepend the SSZ encoded `SignedBlobTransaction`. // The `BLOB_TX_TYPE` should prepend the SSZ encoded `SignedBlobTransaction`.