* parity-version: bump beta to 2.1.2
* docs(rpc): push the branch along with tags (#9578)
* docs(rpc): push the branch along with tags
* ci: remove old rpc docs script
* Remove snapcraft clean (#9585)
* Revert " add snapcraft package image (master) (#9584)"
This reverts commit ceaedbbd7f.
* Update package-snap.sh
* Update .gitlab-ci.yml
* ci: fix regex 🙄 (#9597)
* docs(rpc): annotate tag with the provided message (#9601)
* Update ropsten.json (#9602)
* HF in POA Sokol (2018-09-19) (#9607)
https://github.com/poanetwork/poa-chain-spec/pull/86
* fix(network): don't disconnect reserved peers (#9608)
The priority of && and || was borked.
* fix failing node-table tests on mac os, closes #9632 (#9633)
* ethcore-io retries failed work steal (#9651)
* ethcore-io uses newer version of crossbeam && retries failed work steal
* ethcore-io non-mio service uses newer crossbeam
* remove master from releasable branches (#9655)
* remove master from releasable branches
need backporting in beta
fix https://gitlab.parity.io/parity/parity-ethereum/-/jobs/101065 etc
* add except for snap packages for master
* Test fix for windows cache name... (#9658)
* Test fix for windows cache name...
* Fix variable name.
* fix(light_fetch): avoid race with BlockNumber::Latest (#9665)
* Calculate sha3 instead of sha256 for push-release. (#9673)
* Calculate sha3 instead of sha256 for push-release.
* Add pushes to the script.
* Hardfork the testnets (#9562)
* ethcore: propose hardfork block number 4230000 for ropsten
* ethcore: propose hardfork block number 9000000 for kovan
* ethcore: enable kip-4 and kip-6 on kovan
* etcore: bump kovan hardfork to block 9.2M
* ethcore: fix ropsten constantinople block number to 4.2M
* ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream
* ci: fix push script (#9679)
* ci: fix push script
* Fix copying & running on windows.
* CI: Remove unnecessary pipes (#9681)
* ci: reduce gitlab pipelines significantly
* ci: build pipeline for PR
* ci: remove dead weight
* ci: remove github release script
* ci: remove forever broken aura tests
* ci: add random stuff to the end of the pipes
* ci: add wind and mac to the end of the pipe
* ci: remove snap artifacts
* ci: (re)move dockerfiles
* ci: clarify job names
* ci: add cargo audit job
* ci: make audit script executable
* ci: ignore snap and docker files for rust check
* ci: simplify audit script
* ci: rename misc to optional
* ci: add publish script to releaseable branches
* ci: more verbose cp command for windows build
* ci: fix weird binary checksum logic in push script
* ci: fix regex in push script for windows
* ci: simplify gitlab caching
* docs: align README with ci changes
* ci: specify default cargo target dir
* ci: print verbose environment
* ci: proper naming of scripts
* ci: restore docker files
* ci: use docker hub file
* ci: use cargo home instead of cargo target dir
* ci: touch random rust file to trigger real builds
* ci: set cargo target dir for audit script
* ci: remove temp file
* ci: don't export the cargo target dir in the audit script
* ci: fix windows unbound variable
* docs: fix gitlab badge path
* rename deprecated gitlab ci variables
https://docs.gitlab.com/ee/ci/variables/#9-0-renaming
* ci: fix git compare for nightly builds
* test: skip c++ example for all platforms but linux
* ci: add random rust file to trigger tests
* ci: remove random rust file
* disable cpp lib test for mac, win and beta (#9686)
* cleanup ci merge
* ci: fix tests
* fix bad-block reporting no reason (#9638)
* ethcore: fix detection of major import (#9552)
* sync: set state to idle after sync is completed
* sync: refactor sync reset
* Don't hash the init_code of CREATE. (#9688)
* Docker: run as parity user (#9689)
* Implement CREATE2 gas changes and fix some potential overflowing (#9694)
* Implement CREATE2 gas changes and fix some potential overflowing
* Ignore create2 state tests
* Split CREATE and CREATE2 in gasometer
* Generalize rounding (x + 31) / 32 to to_word_size
* make instantSeal engine backwards compatible, closes #9696 (#9700)
* ethcore: delay ropsten hardfork (#9704)
* fix (light/provider) : Make `read_only executions` read-only (#9591)
* `ExecutionsRequest` from light-clients as read-only
This changes so all `ExecutionRequests` from light-clients are executed
as read-only which the `virtual``flag == true ensures.
This boost up the current transaction to always succeed
Note, this only affects `eth_estimateGas` and `eth_call` AFAIK.
* grumbles(revert renaming) : TransactionProof
* grumbles(trace) : remove incorrect trace
* grumbles(state/prove_tx) : explicit `virt`
Remove the boolean flag to determine that a `state::prove_transaction`
whether it should be executed in a virtual context or not.
Because of that also rename the function to
`state::prove_transction_virtual` to make more clear
* CI: Skip docs job for nightly (#9693)
* ci: force-tag wiki changes
* ci: force-tag wiki changes
* ci: skip docs job for master and nightly
* ci: revert docs job checking for nightly tag
* ci: exclude docs job from nightly builds in gitlab script
156 lines
3.9 KiB
Rust
156 lines
3.9 KiB
Rust
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity 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.
|
|
|
|
// Parity 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 Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Engine deserialization.
|
|
|
|
use super::{Ethash, BasicAuthority, AuthorityRound, Tendermint, NullEngine, InstantSeal};
|
|
|
|
/// Engine deserialization.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub enum Engine {
|
|
/// Null engine.
|
|
#[serde(rename="null")]
|
|
Null(NullEngine),
|
|
/// Instantly sealing engine.
|
|
#[serde(rename="instantSeal")]
|
|
InstantSeal(Option<InstantSeal>),
|
|
/// Ethash engine.
|
|
Ethash(Ethash),
|
|
/// BasicAuthority engine.
|
|
#[serde(rename="basicAuthority")]
|
|
BasicAuthority(BasicAuthority),
|
|
/// AuthorityRound engine.
|
|
#[serde(rename="authorityRound")]
|
|
AuthorityRound(AuthorityRound),
|
|
/// Tendermint engine.
|
|
#[serde(rename="tendermint")]
|
|
Tendermint(Tendermint)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json;
|
|
use spec::Engine;
|
|
|
|
#[test]
|
|
fn engine_deserialization() {
|
|
let s = r#"{
|
|
"null": {
|
|
"params": {
|
|
"blockReward": "0x0d"
|
|
}
|
|
}
|
|
}"#;
|
|
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::Null(_) => {}, // unit test in its own file.
|
|
_ => panic!(),
|
|
}
|
|
|
|
let s = r#"{
|
|
"instantSeal": {"params": {}}
|
|
}"#;
|
|
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::InstantSeal(_) => {}, // instant seal is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
|
|
let s = r#"{
|
|
"instantSeal": null
|
|
}"#;
|
|
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::InstantSeal(_) => {}, // instant seal is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
|
|
|
|
let s = r#"{
|
|
"Ethash": {
|
|
"params": {
|
|
"minimumDifficulty": "0x020000",
|
|
"difficultyBoundDivisor": "0x0800",
|
|
"durationLimit": "0x0d",
|
|
"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
|
|
"homesteadTransition" : "0x",
|
|
"daoHardforkTransition": "0xffffffffffffffff",
|
|
"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
|
|
"daoHardforkAccounts": []
|
|
}
|
|
}
|
|
}"#;
|
|
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::Ethash(_) => {}, // ethash is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
|
|
let s = r#"{
|
|
"basicAuthority": {
|
|
"params": {
|
|
"durationLimit": "0x0d",
|
|
"validators" : {
|
|
"list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
|
|
}
|
|
}
|
|
}
|
|
}"#;
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::BasicAuthority(_) => {}, // basicAuthority is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
|
|
let s = r#"{
|
|
"authorityRound": {
|
|
"params": {
|
|
"stepDuration": "0x02",
|
|
"validators": {
|
|
"list" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
|
|
},
|
|
"startStep" : 24,
|
|
"validateStepTransition": 150
|
|
}
|
|
}
|
|
}"#;
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::AuthorityRound(_) => {}, // AuthorityRound is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
|
|
let s = r#"{
|
|
"tendermint": {
|
|
"params": {
|
|
"validators": {
|
|
"list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
|
|
}
|
|
}
|
|
}
|
|
}"#;
|
|
let deserialized: Engine = serde_json::from_str(s).unwrap();
|
|
match deserialized {
|
|
Engine::Tendermint(_) => {}, // Tendermint is unit tested in its own file.
|
|
_ => panic!(),
|
|
};
|
|
}
|
|
}
|