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

fix(primitives): remove Hardfork::Eip150, Eip158 (#926)

Browse Source
This commit is contained in:
Dan Cline
2023-01-18 22:38:25 -05:00
committed by GitHub
parent d0e3741136
commit 78ffd0a7c0
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/executor/src/config.rs
View File

@ -20,8 +20,7 @@ pub fn revm_spec(chain_spec: &ChainSpec, for_block: BlockNumber) -> revm::SpecId
b if chain_spec.fork_active(Hardfork::Petersburg, b) => revm::PETERSBURG, b if chain_spec.fork_active(Hardfork::Petersburg, b) => revm::PETERSBURG,
b if chain_spec.fork_active(Hardfork::Byzantium, b) => revm::BYZANTIUM, b if chain_spec.fork_active(Hardfork::Byzantium, b) => revm::BYZANTIUM,
b if chain_spec.fork_active(Hardfork::SpuriousDragon, b) => revm::SPURIOUS_DRAGON, b if chain_spec.fork_active(Hardfork::SpuriousDragon, b) => revm::SPURIOUS_DRAGON,
b if chain_spec.fork_active(Hardfork::Eip150, b) => revm::TANGERINE, b if chain_spec.fork_active(Hardfork::Tangerine, b) => revm::TANGERINE,
b if chain_spec.fork_active(Hardfork::Eip158, b) => revm::TANGERINE,
b if chain_spec.fork_active(Hardfork::Homestead, b) => revm::HOMESTEAD, b if chain_spec.fork_active(Hardfork::Homestead, b) => revm::HOMESTEAD,
b if chain_spec.fork_active(Hardfork::Frontier, b) => revm::FRONTIER, b if chain_spec.fork_active(Hardfork::Frontier, b) => revm::FRONTIER,
_ => panic!("wrong configuration"), _ => panic!("wrong configuration"),

14
crates/primitives/src/chain_spec.rs
View File

@ -18,8 +18,7 @@ pub static MAINNET: Lazy<ChainSpec> = Lazy::new(|| ChainSpec {
(Hardfork::Frontier, 0), (Hardfork::Frontier, 0),
(Hardfork::Homestead, 1150000), (Hardfork::Homestead, 1150000),
(Hardfork::Dao, 1920000), (Hardfork::Dao, 1920000),
(Hardfork::Eip150, 2463000), (Hardfork::Tangerine, 2463000),
(Hardfork::Eip158, 2463000),
(Hardfork::SpuriousDragon, 2675000), (Hardfork::SpuriousDragon, 2675000),
(Hardfork::Byzantium, 4370000), (Hardfork::Byzantium, 4370000),
(Hardfork::Constantinople, 7280000), (Hardfork::Constantinople, 7280000),
@ -201,8 +200,7 @@ impl From<EthersGenesis> for ChainSpec {
let hardfork_opts = vec![ let hardfork_opts = vec![
(Hardfork::Homestead, genesis.config.homestead_block), (Hardfork::Homestead, genesis.config.homestead_block),
(Hardfork::Dao, genesis.config.dao_fork_block), (Hardfork::Dao, genesis.config.dao_fork_block),
(Hardfork::Eip150, genesis.config.eip150_block), (Hardfork::Tangerine, genesis.config.eip150_block),
(Hardfork::Eip158, genesis.config.eip158_block),
(Hardfork::SpuriousDragon, genesis.config.eip155_block), (Hardfork::SpuriousDragon, genesis.config.eip155_block),
(Hardfork::Byzantium, genesis.config.byzantium_block), (Hardfork::Byzantium, genesis.config.byzantium_block),
(Hardfork::Constantinople, genesis.config.constantinople_block), (Hardfork::Constantinople, genesis.config.constantinople_block),
@ -300,8 +298,7 @@ impl ChainSpecBuilder {
/// Enables Tangerine /// Enables Tangerine
pub fn tangerine_whistle_activated(mut self) -> Self { pub fn tangerine_whistle_activated(mut self) -> Self {
self = self.homestead_activated(); self = self.homestead_activated();
self.hardforks.insert(Hardfork::Eip150, 0); self.hardforks.insert(Hardfork::Tangerine, 0);
self.hardforks.insert(Hardfork::Eip158, 0);
self self
} }
@ -440,8 +437,7 @@ mod tests {
.genesis_hash(empty_sealed.hash()) .genesis_hash(empty_sealed.hash())
.with_fork(Hardfork::Frontier, 0) .with_fork(Hardfork::Frontier, 0)
.with_fork(Hardfork::Homestead, 0) .with_fork(Hardfork::Homestead, 0)
.with_fork(Hardfork::Eip150, 0) .with_fork(Hardfork::Tangerine, 0)
.with_fork(Hardfork::Eip158, 0)
.with_fork(Hardfork::SpuriousDragon, 0) .with_fork(Hardfork::SpuriousDragon, 0)
.with_fork(Hardfork::Byzantium, 0) .with_fork(Hardfork::Byzantium, 0)
.with_fork(Hardfork::Constantinople, 0) .with_fork(Hardfork::Constantinople, 0)
@ -481,7 +477,7 @@ mod tests {
.genesis_hash(empty_sealed.hash()) .genesis_hash(empty_sealed.hash())
.with_fork(Hardfork::Frontier, 0) .with_fork(Hardfork::Frontier, 0)
.with_fork(Hardfork::Homestead, 1) .with_fork(Hardfork::Homestead, 1)
.with_fork(Hardfork::Eip150, 1) .with_fork(Hardfork::Tangerine, 1)
.build(); .build();
assert_eq!(unique_spec.fork_id(2), duplicate_spec.fork_id(2)); assert_eq!(unique_spec.fork_id(2), duplicate_spec.fork_id(2));

26
crates/primitives/src/hardfork.rs
View File

@ -12,8 +12,7 @@ pub enum Hardfork {
Frontier, Frontier,
Homestead, Homestead,
Dao, Dao,
Eip150, Tangerine,
Eip158,
SpuriousDragon, SpuriousDragon,
Byzantium, Byzantium,
Constantinople, Constantinople,
@ -86,19 +85,18 @@ impl FromStr for Hardfork {
"frontier" | "1" => Hardfork::Frontier, "frontier" | "1" => Hardfork::Frontier,
"homestead" | "2" => Hardfork::Homestead, "homestead" | "2" => Hardfork::Homestead,
"dao" | "3" => Hardfork::Dao, "dao" | "3" => Hardfork::Dao,
"eip150" | "4" => Hardfork::Eip150, "tangerine" | "4" => Hardfork::Tangerine,
"eip158" | "5" => Hardfork::Eip158, "spuriousdragon" | "5" => Hardfork::SpuriousDragon,
"spuriousdragon" | "6" => Hardfork::SpuriousDragon, "byzantium" | "6" => Hardfork::Byzantium,
"byzantium" | "7" => Hardfork::Byzantium, "constantinople" | "7" => Hardfork::Constantinople,
"constantinople" | "8" => Hardfork::Constantinople, "petersburg" | "8" => Hardfork::Petersburg,
"petersburg" | "9" => Hardfork::Petersburg, "istanbul" | "9" => Hardfork::Istanbul,
"istanbul" | "10" => Hardfork::Istanbul, "muirglacier" | "10" => Hardfork::Muirglacier,
"muirglacier" | "11" => Hardfork::Muirglacier, "berlin" | "11" => Hardfork::Berlin,
"berlin" | "12" => Hardfork::Berlin, "london" | "12" => Hardfork::London,
"london" | "13" => Hardfork::London, "arrowglacier" | "13" => Hardfork::ArrowGlacier,
"arrowglacier" | "14" => Hardfork::ArrowGlacier,
"grayglacier" => Hardfork::GrayGlacier, "grayglacier" => Hardfork::GrayGlacier,
"latest" | "15" => Hardfork::Latest, "latest" | "14" => Hardfork::Latest,
_ => return Err(format!("Unknown hardfork {s}")), _ => return Err(format!("Unknown hardfork {s}")),
}; };
Ok(hardfork) Ok(hardfork)