* version: bump beta to 2.2.2 * Add experimental RPCs flag (#9928) * WiP * Enable experimental RPCs. * Keep existing blocks when restoring a Snapshot (#8643) * Rename db_restore => client * First step: make it compile! * Second step: working implementation! * Refactoring * Fix tests * PR Grumbles * PR Grumbles WIP * Migrate ancient blocks interating backward * Early return in block migration if snapshot is aborted * Remove RwLock getter (PR Grumble I) * Remove dependency on `Client`: only used Traits * Add test for recovering aborted snapshot recovery * Add test for migrating old blocks * Fix build * PR Grumble I * PR Grumble II * PR Grumble III * PR Grumble IV * PR Grumble V * PR Grumble VI * Fix one test * Fix test * PR Grumble * PR Grumbles * PR Grumbles II * Fix tests * Release RwLock earlier * Revert Cargo.lock * Update _update ancient block_ logic: set local in `commit` * Update typo in ethcore/src/snapshot/service.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * Adjust requests costs for light client (#9925) * PIP Table Cost relative to average peers instead of max peers * Add tracing in PIP new_cost_table * Update stat peer_count * Use number of leeching peers for Light serve costs * Fix test::light_params_load_share_depends_on_max_peers (wrong type) * Remove (now) useless test * Remove `load_share` from LightParams.Config Prevent div. by 0 * Add LEECHER_COUNT_FACTOR * PR Grumble: u64 to u32 for f64 casting * Prevent u32 overflow for avg_peer_count * Add tests for LightSync::Statistics * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * prevent silent errors in daemon mode, closes #9367 (#9946) * Fix a deadlock (#9952) * Update informant: - decimal in Mgas/s - print every 5s (not randomly between 5s and 10s) * Fix dead-lock in `blockchain.rs` * Update locks ordering * Fix light client informant while syncing (#9932) * Add `is_idle` to LightSync to check importing status * Use SyncStateWrapper to make sure is_idle gets updates * Update is_major_import to use verified queue size as well * Add comment for `is_idle` * Add Debug to `SyncStateWrapper` * `fn get` -> `fn into_inner` * ci: rearrange pipeline by logic (#9970) * ci: rearrange pipeline by logic * ci: rename docs script * fix docker build (#9971) * Deny unknown fields for chainspec (#9972) * Add deny_unknown_fields to chainspec * Add tests and fix existing one * Remove serde_ignored dependency for chainspec * Fix rpc test eth chain spec * Fix starting_nonce_test spec * Improve block and transaction propagation (#9954) * Refactor sync to add priority tasks. * Send priority tasks notifications. * Propagate blocks, optimize transactions. * Implement transaction propagation. Use sync_channel. * Tone down info. * Prevent deadlock by not waiting forever for sync lock. * Fix lock order. * Don't use sync_channel to prevent deadlocks. * Fix tests. * Fix unstable peers and slowness in sync (#9967) * Don't sync all peers after each response * Update formating * Fix tests: add `continue_sync` to `Sync_step` * Update ethcore/sync/src/chain/mod.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * fix rpc middlewares * fix Cargo.lock * json: resolve merge in spec * rpc: fix starting_nonce_test * ci: allow nightl job to fail
136 lines
3.4 KiB
Rust
136 lines
3.4 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/>.
|
|
|
|
use api::TransactionStats;
|
|
use std::hash::BuildHasher;
|
|
use std::collections::{HashSet, HashMap};
|
|
use ethereum_types::{H256, H512};
|
|
use fastmap::H256FastMap;
|
|
|
|
type NodeId = H512;
|
|
type BlockNumber = u64;
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct Stats {
|
|
first_seen: BlockNumber,
|
|
propagated_to: HashMap<NodeId, usize>,
|
|
}
|
|
|
|
impl Stats {
|
|
pub fn new(number: BlockNumber) -> Self {
|
|
Stats {
|
|
first_seen: number,
|
|
propagated_to: Default::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a> From<&'a Stats> for TransactionStats {
|
|
fn from(other: &'a Stats) -> Self {
|
|
TransactionStats {
|
|
first_seen: other.first_seen,
|
|
propagated_to: other.propagated_to
|
|
.iter()
|
|
.map(|(hash, size)| (*hash, *size))
|
|
.collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct TransactionsStats {
|
|
pending_transactions: H256FastMap<Stats>,
|
|
}
|
|
|
|
impl TransactionsStats {
|
|
/// Increases number of propagations to given `enodeid`.
|
|
pub fn propagated(&mut self, hash: &H256, enode_id: Option<NodeId>, current_block_num: BlockNumber) {
|
|
let enode_id = enode_id.unwrap_or_default();
|
|
let stats = self.pending_transactions.entry(*hash).or_insert_with(|| Stats::new(current_block_num));
|
|
let count = stats.propagated_to.entry(enode_id).or_insert(0);
|
|
*count = count.saturating_add(1);
|
|
}
|
|
|
|
/// Returns propagation stats for given hash or `None` if hash is not known.
|
|
#[cfg(test)]
|
|
pub fn get(&self, hash: &H256) -> Option<&Stats> {
|
|
self.pending_transactions.get(hash)
|
|
}
|
|
|
|
pub fn stats(&self) -> &H256FastMap<Stats> {
|
|
&self.pending_transactions
|
|
}
|
|
|
|
/// Retains only transactions present in given `HashSet`.
|
|
pub fn retain<S: BuildHasher>(&mut self, hashes: &HashSet<H256, S>) {
|
|
let to_remove = self.pending_transactions.keys()
|
|
.filter(|hash| !hashes.contains(hash))
|
|
.cloned()
|
|
.collect::<Vec<_>>();
|
|
|
|
for hash in to_remove {
|
|
self.pending_transactions.remove(&hash);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
|
|
use std::collections::{HashMap, HashSet};
|
|
use super::{Stats, TransactionsStats};
|
|
|
|
#[test]
|
|
fn should_keep_track_of_propagations() {
|
|
// given
|
|
let mut stats = TransactionsStats::default();
|
|
let hash = 5.into();
|
|
let enodeid1 = 2.into();
|
|
let enodeid2 = 5.into();
|
|
|
|
// when
|
|
stats.propagated(&hash, Some(enodeid1), 5);
|
|
stats.propagated(&hash, Some(enodeid1), 10);
|
|
stats.propagated(&hash, Some(enodeid2), 15);
|
|
|
|
// then
|
|
let stats = stats.get(&hash);
|
|
assert_eq!(stats, Some(&Stats {
|
|
first_seen: 5,
|
|
propagated_to: hash_map![
|
|
enodeid1 => 2,
|
|
enodeid2 => 1
|
|
],
|
|
}));
|
|
}
|
|
|
|
#[test]
|
|
fn should_remove_hash_from_tracking() {
|
|
// given
|
|
let mut stats = TransactionsStats::default();
|
|
let hash = 5.into();
|
|
let enodeid1 = 5.into();
|
|
stats.propagated(&hash, Some(enodeid1), 10);
|
|
|
|
// when
|
|
stats.retain(&HashSet::new());
|
|
|
|
// then
|
|
let stats = stats.get(&hash);
|
|
assert_eq!(stats, None);
|
|
}
|
|
}
|