mirror of
https://github.com/sigp/lighthouse.git
synced 2026-04-17 04:48:21 +00:00
Remove use of ethers core (#5301)
* Remove use of ethers_core::RlpStream
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core
* Remove old code
* Simplify keccak call
* Remove unused package
* Merge branch 'unstable' of https://github.com/ethDreamer/lighthouse into remove_use_of_ethers_core
* Merge branch 'unstable' into remove_use_of_ethers_core
* Run clippy
* Merge branch 'remove_use_of_ethers_core' of https://github.com/dospore/lighthouse into remove_use_of_ethers_core
* Check all cargo fmt
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core
* Revert lock
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core
* introduce a shim to convert between the two u256 types
* move alloy to wrokspace
* align alloy versions
* update
* update web3signer test certs
* Revert "update web3signer test certs"
This reverts commit effd5910ad.
* Consolidate alloy versions
* Delete empty file
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
use crate::{Address, EthSpec, ExecutionPayloadRef, Hash256, Hash64, Uint256};
|
||||
use alloy_rlp::RlpEncodable;
|
||||
use metastruct::metastruct;
|
||||
|
||||
/// Execution block header as used for RLP encoding and Keccak hashing.
|
||||
@@ -89,3 +90,74 @@ impl ExecutionBlockHeader {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable)]
|
||||
#[rlp(trailing)]
|
||||
pub struct EncodableExecutionBlockHeader<'a> {
|
||||
pub parent_hash: &'a [u8],
|
||||
pub ommers_hash: &'a [u8],
|
||||
pub beneficiary: &'a [u8],
|
||||
pub state_root: &'a [u8],
|
||||
pub transactions_root: &'a [u8],
|
||||
pub receipts_root: &'a [u8],
|
||||
pub logs_bloom: &'a [u8],
|
||||
pub difficulty: alloy_primitives::U256,
|
||||
pub number: alloy_primitives::U256,
|
||||
pub gas_limit: alloy_primitives::U256,
|
||||
pub gas_used: alloy_primitives::U256,
|
||||
pub timestamp: u64,
|
||||
pub extra_data: &'a [u8],
|
||||
pub mix_hash: &'a [u8],
|
||||
pub nonce: &'a [u8],
|
||||
pub base_fee_per_gas: alloy_primitives::U256,
|
||||
pub withdrawals_root: Option<&'a [u8]>,
|
||||
pub blob_gas_used: Option<u64>,
|
||||
pub excess_blob_gas: Option<u64>,
|
||||
pub parent_beacon_block_root: Option<&'a [u8]>,
|
||||
}
|
||||
|
||||
impl<'a> From<&'a ExecutionBlockHeader> for EncodableExecutionBlockHeader<'a> {
|
||||
fn from(header: &'a ExecutionBlockHeader) -> Self {
|
||||
let mut encodable = Self {
|
||||
parent_hash: header.parent_hash.as_bytes(),
|
||||
ommers_hash: header.ommers_hash.as_bytes(),
|
||||
beneficiary: header.beneficiary.as_bytes(),
|
||||
state_root: header.state_root.as_bytes(),
|
||||
transactions_root: header.transactions_root.as_bytes(),
|
||||
receipts_root: header.receipts_root.as_bytes(),
|
||||
logs_bloom: header.logs_bloom.as_slice(),
|
||||
difficulty: U256Shim(header.difficulty).into(),
|
||||
number: U256Shim(header.number).into(),
|
||||
gas_limit: U256Shim(header.gas_limit).into(),
|
||||
gas_used: U256Shim(header.gas_used).into(),
|
||||
timestamp: header.timestamp,
|
||||
extra_data: header.extra_data.as_slice(),
|
||||
mix_hash: header.mix_hash.as_bytes(),
|
||||
nonce: header.nonce.as_bytes(),
|
||||
base_fee_per_gas: U256Shim(header.base_fee_per_gas).into(),
|
||||
withdrawals_root: None,
|
||||
blob_gas_used: header.blob_gas_used,
|
||||
excess_blob_gas: header.excess_blob_gas,
|
||||
parent_beacon_block_root: None,
|
||||
};
|
||||
if let Some(withdrawals_root) = &header.withdrawals_root {
|
||||
encodable.withdrawals_root = Some(withdrawals_root.as_bytes());
|
||||
}
|
||||
if let Some(parent_beacon_block_root) = &header.parent_beacon_block_root {
|
||||
encodable.parent_beacon_block_root = Some(parent_beacon_block_root.as_bytes())
|
||||
}
|
||||
encodable
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(alloy) this shim can be removed once we fully migrate
|
||||
// from ethereum types to alloy primitives
|
||||
struct U256Shim(Uint256);
|
||||
|
||||
impl From<U256Shim> for alloy_primitives::U256 {
|
||||
fn from(value: U256Shim) -> Self {
|
||||
let mut buffer: [u8; 32] = [0; 32];
|
||||
value.0.to_little_endian(&mut buffer);
|
||||
Self::from_le_slice(&buffer)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ pub use crate::epoch_cache::{EpochCache, EpochCacheError, EpochCacheKey};
|
||||
pub use crate::eth1_data::Eth1Data;
|
||||
pub use crate::eth_spec::EthSpecId;
|
||||
pub use crate::execution_block_hash::ExecutionBlockHash;
|
||||
pub use crate::execution_block_header::ExecutionBlockHeader;
|
||||
pub use crate::execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader};
|
||||
pub use crate::execution_layer_withdrawal_request::ExecutionLayerWithdrawalRequest;
|
||||
pub use crate::execution_payload::{
|
||||
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
|
||||
|
||||
Reference in New Issue
Block a user