This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Switching ValidatorSet #4961
Merged
Merged
Switching ValidatorSet #4961
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
{ | ||
"name": "TestMutiValidator", | ||
"engine": { | ||
"basicAuthority": { | ||
"params": { | ||
"gasLimitBoundDivisor": "0x0400", | ||
"durationLimit": "0x0d", | ||
"validators": { | ||
"multi": { | ||
"1": { "list": ["0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1"] }, | ||
"2": { "list": ["0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e"] } | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
"params": { | ||
"accountStartNonce": "0x0", | ||
"maximumExtraDataSize": "0x20", | ||
"minGasLimit": "0x1388", | ||
"networkID" : "0x69" | ||
}, | ||
"genesis": { | ||
"seal": { | ||
"generic": "0xc180" | ||
}, | ||
"difficulty": "0x20000", | ||
"author": "0x0000000000000000000000000000000000000000", | ||
"timestamp": "0x00", | ||
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
"extraData": "0x", | ||
"gasLimit": "0x2fefd8" | ||
}, | ||
"accounts": { | ||
"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } }, | ||
"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } }, | ||
"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } }, | ||
"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, | ||
"0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { "balance": "99999999999999999999999" }, | ||
"0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { "balance": "99999999999999999999999" } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
// Copyright 2015-2017 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/>. | ||
|
||
/// Validator set changing at fork blocks. | ||
|
||
use std::collections::BTreeMap; | ||
use std::sync::Weak; | ||
use util::{H256, Address, RwLock}; | ||
use ids::BlockId; | ||
use header::BlockNumber; | ||
use client::{Client, BlockChainClient}; | ||
use super::ValidatorSet; | ||
|
||
pub struct Multi { | ||
sets: BTreeMap<BlockNumber, Box<ValidatorSet>>, | ||
block_number: RwLock<Box<Fn(&H256) -> Result<BlockNumber, String> + Send + Sync + 'static>>, | ||
} | ||
|
||
impl Multi { | ||
pub fn new(set_map: BTreeMap<BlockNumber, Box<ValidatorSet>>) -> Self { | ||
Multi { | ||
sets: set_map, | ||
block_number: RwLock::new(Box::new(move |_| Err("No client!".into()))), | ||
} | ||
} | ||
|
||
fn correct_set(&self, bh: &H256) -> Option<&Box<ValidatorSet>> { | ||
match self | ||
.block_number | ||
.read()(bh) | ||
.map(|parent_block| self | ||
.sets | ||
.iter() | ||
.rev() | ||
.find(|&(block, _)| *block <= parent_block + 1) | ||
.expect("First ValidatorSet has to start at block 0!") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be documented, and the example starts at block 1. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Speaking more broadly, it makes sense to do these kinds of checks at deserialization time, and then the expectation can be infallible. |
||
) { | ||
Ok((block, set)) => { | ||
trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block); | ||
Some(set) | ||
}, | ||
Err(e) => { | ||
debug!(target: "engine", "ValidatorSet could not be recovered: {}", e); | ||
None | ||
}, | ||
} | ||
} | ||
} | ||
|
||
impl ValidatorSet for Multi { | ||
fn contains(&self, bh: &H256, address: &Address) -> bool { | ||
self.correct_set(bh).map_or(false, |set| set.contains(bh, address)) | ||
} | ||
|
||
fn get(&self, bh: &H256, nonce: usize) -> Address { | ||
self.correct_set(bh).map_or_else(Default::default, |set| set.get(bh, nonce)) | ||
} | ||
|
||
fn count(&self, bh: &H256) -> usize { | ||
self.correct_set(bh).map_or_else(usize::max_value, |set| set.count(bh)) | ||
} | ||
|
||
|
||
fn register_contract(&self, client: Weak<Client>) { | ||
*self.block_number.write() = Box::new(move |hash| client | ||
.upgrade() | ||
.ok_or("No client!".into()) | ||
.and_then(|c| c.block_number(BlockId::Hash(*hash)).ok_or("Unknown block".into()))) | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use util::*; | ||
use types::ids::BlockId; | ||
use spec::Spec; | ||
use account_provider::AccountProvider; | ||
use client::{BlockChainClient, EngineClient}; | ||
use ethkey::Secret; | ||
use miner::MinerService; | ||
use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data}; | ||
|
||
#[test] | ||
fn uses_current_set() { | ||
::env_logger::init().unwrap(); | ||
let tap = Arc::new(AccountProvider::transient_provider()); | ||
let s0 = Secret::from_slice(&"0".sha3()).unwrap(); | ||
let v0 = tap.insert_account(s0.clone(), "").unwrap(); | ||
let v1 = tap.insert_account(Secret::from_slice(&"1".sha3()).unwrap(), "").unwrap(); | ||
let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_multi, Some(tap)); | ||
client.engine().register_client(Arc::downgrade(&client)); | ||
|
||
// Make sure txs go through. | ||
client.miner().set_gas_floor_target(1_000_000.into()); | ||
|
||
// Wrong signer for the first block. | ||
client.miner().set_engine_signer(v1, "".into()).unwrap(); | ||
client.transact_contract(Default::default(), Default::default()).unwrap(); | ||
client.update_sealing(); | ||
assert_eq!(client.chain_info().best_block_number, 0); | ||
// Right signer for the first block. | ||
client.miner().set_engine_signer(v0, "".into()).unwrap(); | ||
client.update_sealing(); | ||
assert_eq!(client.chain_info().best_block_number, 1); | ||
// This time v0 is wrong. | ||
client.transact_contract(Default::default(), Default::default()).unwrap(); | ||
client.update_sealing(); | ||
assert_eq!(client.chain_info().best_block_number, 1); | ||
client.miner().set_engine_signer(v1, "".into()).unwrap(); | ||
client.update_sealing(); | ||
assert_eq!(client.chain_info().best_block_number, 2); | ||
// v1 is still good. | ||
client.transact_contract(Default::default(), Default::default()).unwrap(); | ||
client.update_sealing(); | ||
assert_eq!(client.chain_info().best_block_number, 3); | ||
|
||
// Check syncing. | ||
let sync_client = generate_dummy_client_with_spec_and_data(Spec::new_validator_multi, 0, 0, &[]); | ||
sync_client.engine().register_client(Arc::downgrade(&sync_client)); | ||
for i in 1..4 { | ||
sync_client.import_block(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap(); | ||
} | ||
sync_client.flush_queue(); | ||
assert_eq!(sync_client.chain_info().best_block_number, 3); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a typedef of the closure would really help readability here