gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 00:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update merge consensus to v1.1.0-beta.5 (#2630)

Browse Source
This commit is contained in:
Michael Sproul
2021-09-27 09:42:29 +10:00
committed by Paul Hauner
parent c10e8ce955
commit 10b263fed4
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
consensus/types/src/eth_spec.rs
View File

@@ -91,6 +91,7 @@ pub trait EthSpec: 'static + Default + Sync + Send + Clone + Debug + PartialEq +
type BytesPerLogsBloom: Unsigned + Clone + Sync + Send + Debug + PartialEq;
type GasLimitDenominator: Unsigned + Clone + Sync + Send + Debug + PartialEq;
type MinGasLimit: Unsigned + Clone + Sync + Send + Debug + PartialEq;
type MaxExtraDataBytes: Unsigned + Clone + Sync + Send + Debug + PartialEq;
/*
* Derived values (set these CAREFULLY)
*/
@@ -262,6 +263,7 @@ impl EthSpec for MainnetEthSpec {
type BytesPerLogsBloom = U256;
type GasLimitDenominator = U1024;
type MinGasLimit = U5000;
type MaxExtraDataBytes = U32;
type SyncSubcommitteeSize = U128; // 512 committee size / 4 sync committee subnet count
type MaxPendingAttestations = U4096; // 128 max attestations * 32 slots per epoch
type SlotsPerEth1VotingPeriod = U2048; // 64 epochs * 32 slots per epoch
@@ -308,7 +310,8 @@ impl EthSpec for MinimalEthSpec {
MaxTransactionsPerPayload,
BytesPerLogsBloom,
GasLimitDenominator,
MinGasLimit
MinGasLimit,
MaxExtraDataBytes
});
fn default_spec() -> ChainSpec {

3
consensus/types/src/execution_payload.rs
View File

@@ -57,6 +57,8 @@ pub struct ExecutionPayload<T: EthSpec> {
pub gas_used: u64,
#[serde(with = "eth2_serde_utils::quoted_u64")]
pub timestamp: u64,
#[serde(with = "ssz_types::serde_utils::hex_var_list")]
pub extra_data: VariableList<u8, T::MaxExtraDataBytes>,
pub base_fee_per_gas: Hash256,
pub block_hash: Hash256,
#[test_random(default)]
@@ -77,6 +79,7 @@ impl<T: EthSpec> ExecutionPayload<T> {
gas_limit: 0,
gas_used: 0,
timestamp: 0,
extra_data: VariableList::empty(),
base_fee_per_gas: Hash256::zero(),
block_hash: Hash256::zero(),
transactions: VariableList::empty(),

2
consensus/types/src/execution_payload_header.rs
View File

@@ -24,6 +24,8 @@ pub struct ExecutionPayloadHeader<T: EthSpec> {
pub gas_used: u64,
#[serde(with = "eth2_serde_utils::quoted_u64")]
pub timestamp: u64,
#[serde(with = "ssz_types::serde_utils::hex_var_list")]
pub extra_data: VariableList<u8, T::MaxExtraDataBytes>,
pub base_fee_per_gas: Hash256,
pub block_hash: Hash256,
pub transactions_root: Hash256,