Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(genesis): rm EIP150Hash #1039

Merged
merged 2 commits into from
Jul 11, 2024
Merged

feat(genesis): rm EIP150Hash #1039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b068e18
feat(genesis): rm eip150_hash
jsvisa Jul 11, 2024
12fba4e
fix testcase
jsvisa Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions crates/genesis/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ impl GenesisAccount {
/// Encapsulates parameters shaping network evolution and behavior.
///
/// See [geth's `ChainConfig`
/// struct](https://github.com/ethereum/go-ethereum/blob/64dccf7aa411c5c7cd36090c3d9b9892945ae813/params/config.go#L349)
/// struct](https://github.com/ethereum/go-ethereum/blob/v1.14.0/params/config.go#L326)
/// for the source of each field.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[serde(default, rename_all = "camelCase")]
Expand Down Expand Up @@ -287,10 +287,6 @@ pub struct ChainConfig {
)]
pub eip150_block: Option<u64>,

/// The [EIP-150](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-150.md) hard fork hash.
#[serde(skip_serializing_if = "Option::is_none")]
pub eip150_hash: Option<B256>,

/// The [EIP-155](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md) hard fork block.
#[serde(
skip_serializing_if = "Option::is_none",
Expand Down Expand Up @@ -528,7 +524,6 @@ impl Default for ChainConfig {
dao_fork_block: None,
dao_fork_support: false,
eip150_block: None,
eip150_hash: None,
eip155_block: None,
eip158_block: None,
byzantium_block: None,
Expand Down Expand Up @@ -987,7 +982,6 @@ mod tests {
"chainId": 1337,
"homesteadBlock": 0,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
Expand Down Expand Up @@ -1020,9 +1014,6 @@ mod tests {
let expected_genesis = Genesis {
config: ChainConfig {
chain_id: 1337,
eip150_hash: Some(
hex!("0000000000000000000000000000000000000000000000000000000000000000").into(),
),
homestead_block: Some(0),
eip150_block: Some(0),
eip155_block: Some(0),
Expand Down Expand Up @@ -1065,7 +1056,6 @@ mod tests {
"chainId": 1337,
"homesteadBlock": 0,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
Expand Down Expand Up @@ -1097,9 +1087,6 @@ mod tests {
let expected_genesis = Genesis {
config: ChainConfig {
chain_id: 1337,
eip150_hash: Some(
hex!("0000000000000000000000000000000000000000000000000000000000000000").into(),
),
homestead_block: Some(0),
eip150_block: Some(0),
eip155_block: Some(0),
Expand Down