5e7086d54c
* eip1559 hard fork activation * eip1559 hard fork activation 2 * added new transaction type for eip1559 * added base fee field to block header * fmt fix * added base fee calculation. added block header validation against base fee * fmt * temporarily added modified transaction pool * tx pool fix of PendingIterator * tx pool fix of UnorderedIterator * tx pool added test for set_scoring * transaction pool changes * added tests for eip1559 transaction and eip1559 receipt * added test for eip1559 transaction execution * block gas limit / block gas target handling * base fee verification moved out of engine * calculate_base_fee moved to EthereumMachine * handling of base_fee_per_gas as part of seal * handling of base_fee_per_gas changed. Different encoding/decoding of block header * eip1559 transaction execution - gas price handling * eip1559 transaction execution - verification, fee burning * effectiveGasPrice removed from the receipt payload (specs) * added support for 1559 txs in tx pool verification * added Aleut test network configuration * effective_tip_scaled replaced by typed_gas_price * eip 3198 - Basefee opcode * rpc - updated structs Block and Header * rpc changes for 1559 * variable renaming according to spec * - typed_gas_price renamed to effective_gas_price - elasticity_multiplier definition moved to update_schedule() * calculate_base_fee simplified * Evm environment context temporary fix for gas limit * fmt fix * fixed fake_sign::sign_call * temporary fix for GASLIMIT opcode to provide gas_target actually * gas_target removed from block header according to spec change: https://github.com/ethereum/EIPs/pull/3566 * tx pool verification fix * env_info base fee changed to Option * fmt fix * pretty format * updated ethereum tests * cache_pending refresh on each update of score * code review fixes * fmt fix * code review fix - changed handling of eip1559_base_fee_max_change_denominator * code review fix - modification.gas_price * Skip gas_limit_bump for Aura * gas_limit calculation changed to target ceil * gas_limit calculation will target ceil on 1559 activation block * transaction verification updated according spec: https://github.com/ethereum/EIPs/pull/3594 * updated json tests * ethereum json tests fix for base_fee
241 lines
6.9 KiB
Rust
241 lines
6.9 KiB
Rust
// Copyright 2015-2020 Parity Technologies (UK) Ltd.
|
|
// This file is part of OpenEthereum.
|
|
|
|
// OpenEthereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// OpenEthereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with OpenEthereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Spec deserialization.
|
|
|
|
use crate::spec::{Engine, Genesis, Params, State};
|
|
use serde_json::{self, Error};
|
|
use std::io::Read;
|
|
|
|
/// Fork spec definition
|
|
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize)]
|
|
pub enum ForkSpec {
|
|
EIP150,
|
|
EIP158,
|
|
Frontier,
|
|
Homestead,
|
|
Byzantium,
|
|
Constantinople,
|
|
ConstantinopleFix,
|
|
Istanbul,
|
|
EIP158ToByzantiumAt5,
|
|
FrontierToHomesteadAt5,
|
|
HomesteadToDaoAt5,
|
|
HomesteadToEIP150At5,
|
|
ByzantiumToConstantinopleAt5,
|
|
ByzantiumToConstantinopleFixAt5,
|
|
Berlin,
|
|
London,
|
|
}
|
|
|
|
/// Spec deserialization.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Spec {
|
|
/// Spec name.
|
|
pub name: String,
|
|
/// Special fork name.
|
|
pub data_dir: Option<String>,
|
|
/// Engine.
|
|
pub engine: Engine,
|
|
/// Spec params.
|
|
pub params: Params,
|
|
/// Genesis header.
|
|
pub genesis: Genesis,
|
|
/// Genesis state.
|
|
pub accounts: State,
|
|
/// Boot nodes.
|
|
pub nodes: Option<Vec<String>>,
|
|
}
|
|
|
|
impl Spec {
|
|
/// Loads test from json.
|
|
pub fn load<R>(reader: R) -> Result<Self, Error>
|
|
where
|
|
R: Read,
|
|
{
|
|
serde_json::from_reader(reader)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::spec::spec::Spec;
|
|
use serde_json;
|
|
|
|
#[test]
|
|
fn should_error_on_unknown_fields() {
|
|
let s = r#"{
|
|
"name": "Morden",
|
|
"dataDir": "morden",
|
|
"engine": {
|
|
"Ethash": {
|
|
"params": {
|
|
"minimumDifficulty": "0x020000",
|
|
"difficultyBoundDivisor": "0x0800",
|
|
"durationLimit": "0x0d",
|
|
"homesteadTransition" : "0x",
|
|
"daoHardforkTransition": "0xffffffffffffffff",
|
|
"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
|
|
"daoHardforkAccounts": []
|
|
}
|
|
}
|
|
},
|
|
"params": {
|
|
"accountStartNonce": "0x0100000",
|
|
"maximumExtraDataSize": "0x20",
|
|
"minGasLimit": "0x1388",
|
|
"networkID" : "0x2",
|
|
"forkBlock": "0xffffffffffffffff",
|
|
"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"gasLimitBoundDivisor": "0x20",
|
|
"unknownField": "0x0"
|
|
},
|
|
"genesis": {
|
|
"seal": {
|
|
"ethereum": {
|
|
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"nonce": "0x00006d6f7264656e"
|
|
}
|
|
},
|
|
"difficulty": "0x20000",
|
|
"author": "0x0000000000000000000000000000000000000000",
|
|
"timestamp": "0x00",
|
|
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"extraData": "0x",
|
|
"gasLimit": "0x2fefd8"
|
|
},
|
|
"nodes": [
|
|
"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
|
|
],
|
|
"accounts": {
|
|
"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
|
|
"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
|
|
"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
|
|
"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
|
|
"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
|
|
}
|
|
}"#;
|
|
let result: Result<Spec, _> = serde_json::from_str(s);
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn spec_deserialization() {
|
|
let s = r#"{
|
|
"name": "Morden",
|
|
"dataDir": "morden",
|
|
"engine": {
|
|
"Ethash": {
|
|
"params": {
|
|
"minimumDifficulty": "0x020000",
|
|
"difficultyBoundDivisor": "0x0800",
|
|
"durationLimit": "0x0d",
|
|
"homesteadTransition" : "0x",
|
|
"daoHardforkTransition": "0xffffffffffffffff",
|
|
"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
|
|
"daoHardforkAccounts": []
|
|
}
|
|
}
|
|
},
|
|
"params": {
|
|
"accountStartNonce": "0x0100000",
|
|
"maximumExtraDataSize": "0x20",
|
|
"minGasLimit": "0x1388",
|
|
"networkID" : "0x2",
|
|
"forkBlock": "0xffffffffffffffff",
|
|
"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"gasLimitBoundDivisor": "0x20"
|
|
},
|
|
"genesis": {
|
|
"seal": {
|
|
"ethereum": {
|
|
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"nonce": "0x00006d6f7264656e"
|
|
}
|
|
},
|
|
"difficulty": "0x20000",
|
|
"author": "0x0000000000000000000000000000000000000000",
|
|
"timestamp": "0x00",
|
|
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"extraData": "0x",
|
|
"gasLimit": "0x2fefd8"
|
|
},
|
|
"nodes": [
|
|
"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
|
|
],
|
|
"accounts": {
|
|
"0000000000000000000000000000000000000001": {
|
|
"balance": "1",
|
|
"nonce": "1048576",
|
|
"builtin": {
|
|
"name": "ecrecover",
|
|
"pricing": {
|
|
"linear": {
|
|
"base": 3000,
|
|
"word": 0
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"0000000000000000000000000000000000000002": {
|
|
"balance": "1",
|
|
"nonce": "1048576",
|
|
"builtin": {
|
|
"name": "sha256",
|
|
"pricing": {
|
|
"linear": {
|
|
"base": 60,
|
|
"word": 12
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"0000000000000000000000000000000000000003": {
|
|
"balance": "1",
|
|
"nonce": "1048576",
|
|
"builtin": {
|
|
"name": "ripemd160",
|
|
"pricing": {
|
|
"linear": {
|
|
"base": 600,
|
|
"word": 120
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"0000000000000000000000000000000000000004": {
|
|
"balance": "1",
|
|
"nonce": "1048576",
|
|
"builtin": {
|
|
"name": "identity",
|
|
"pricing": {
|
|
"linear": {
|
|
"base": 15,
|
|
"word": 3
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
|
|
}
|
|
}"#;
|
|
let _deserialized: Spec = serde_json::from_str(s).unwrap();
|
|
// TODO: validate all fields
|
|
}
|
|
}
|