diff --git a/crates/ethcore/res/chainspec/foundation.json b/crates/ethcore/res/chainspec/foundation.json index 75f2a7ea4..4aa98c0e5 100644 --- a/crates/ethcore/res/chainspec/foundation.json +++ b/crates/ethcore/res/chainspec/foundation.json @@ -172,14 +172,7 @@ "eip1884Transition": "0x8a61c8", "eip2028Transition": "0x8a61c8", "eip2929Transition": "0xbad420", - "eip2930Transition": "0xbad420", - "eip1559Transition": "0xc3d0e8", - "eip3198Transition": "0xc3d0e8", - "eip3541Transition": "0xc3d0e8", - "eip3529Transition": "0xc3d0e8", - "eip1559BaseFeeMaxChangeDenominator": "0x8", - "eip1559ElasticityMultiplier": "0x2", - "eip1559BaseFeeInitialValue": "0x3B9ACA00" + "eip2930Transition": "0xbad420" }, "genesis": { "seal": { diff --git a/crates/ethcore/res/json_tests b/crates/ethcore/res/json_tests index fa0ab110f..5d651381d 160000 --- a/crates/ethcore/res/json_tests +++ b/crates/ethcore/res/json_tests @@ -1 +1 @@ -Subproject commit fa0ab110f3f45d1f6786f978ea596a18ecbe8275 +Subproject commit 5d651381daf9d12cc663a7326b3b16d7bb4c1aa0 diff --git a/crates/ethcore/src/spec/genesis.rs b/crates/ethcore/src/spec/genesis.rs index ef1df70ee..127ffd531 100644 --- a/crates/ethcore/src/spec/genesis.rs +++ b/crates/ethcore/src/spec/genesis.rs @@ -65,7 +65,7 @@ impl From for Genesis { state_root: g.state_root.map(Into::into), gas_used: g.gas_used.map_or_else(U256::zero, Into::into), extra_data: g.extra_data.map_or_else(Vec::new, Into::into), - base_fee: g.base_fee.map(Into::into), + base_fee: g.base_fee_per_gas.map(Into::into), } } } diff --git a/crates/ethjson/src/blockchain/blockchain.rs b/crates/ethjson/src/blockchain/blockchain.rs index ae4e3f975..76b97692c 100644 --- a/crates/ethjson/src/blockchain/blockchain.rs +++ b/crates/ethjson/src/blockchain/blockchain.rs @@ -89,7 +89,7 @@ impl BlockChain { state_root: Some(self.genesis_block.state_root.clone()), gas_used: Some(self.genesis_block.gas_used), extra_data: Some(self.genesis_block.extra_data.clone()), - base_fee: self.genesis_block.base_fee, + base_fee_per_gas: self.genesis_block.base_fee_per_gas, } } } diff --git a/crates/ethjson/src/blockchain/header.rs b/crates/ethjson/src/blockchain/header.rs index 1b32b40a6..4f61dca43 100644 --- a/crates/ethjson/src/blockchain/header.rs +++ b/crates/ethjson/src/blockchain/header.rs @@ -63,7 +63,7 @@ pub struct Header { #[serde(rename = "uncleHash")] pub uncles_hash: H256, /// Base fee - pub base_fee: Option, + pub base_fee_per_gas: Option, } #[cfg(test)] diff --git a/crates/ethjson/src/spec/genesis.rs b/crates/ethjson/src/spec/genesis.rs index 312deef0a..19b7205c4 100644 --- a/crates/ethjson/src/spec/genesis.rs +++ b/crates/ethjson/src/spec/genesis.rs @@ -52,7 +52,7 @@ pub struct Genesis { /// Extra data. pub extra_data: Option, /// Base fee. - pub base_fee: Option, + pub base_fee_per_gas: Option, } #[cfg(test)] @@ -124,7 +124,7 @@ mod tests { ) .unwrap() ), - base_fee: None, + base_fee_per_gas: None, } ); }