* Trace precompiled contracts when the transfer value is not zero (#8486) * Trace precompiled contracts when the transfer value is not zero * Add tests for precompiled CALL tracing * Use byzantium test machine for the new test * Add notes in comments on why we don't trace all precompileds * Use is_transferred instead of transferred * Return error if RLP size of transaction exceeds the limit (#8473) * Return error if RLP size of transaction exceeds the limit * Review comments fixed * RLP check moved to verifier, corresponding pool test added * Don't block sync when importing old blocks (#8530) * Alter IO queueing. * Don't require IoMessages to be Clone * Ancient blocks imported via IoChannel. * Get rid of private transactions io message. * Get rid of deadlock and fix disconnected handler. * Revert to old disconnect condition. * Fix tests. * Fix deadlock. * Refactoring `ethcore-sync` - Fixing warp-sync barrier (#8543) * Start dividing sync chain : first supplier method * WIP - updated chain sync supplier * Finish refactoring the Chain Sync Supplier * Create Chain Sync Requester * Add Propagator for Chain Sync * Add the Chain Sync Handler * Move tests from mod -> handler * Move tests to propagator * Refactor SyncRequester arguments * Refactoring peer fork header handler * Fix wrong highest block number in snapshot sync * Small refactor... * Address PR grumbles * Retry failed CI job * Fix tests * PR Grumbles * Handle socket address parsing errors (#8545) Unpack errors and check for io::ErrorKind::InvalidInput and return our own AddressParse error. Remove the foreign link to std::net::AddrParseError and add an `impl From` for that error. Test parsing properly. * Fix packet count when talking with PAR2 peers (#8555) * Support diferent packet counts in different protocol versions. * Fix light timeouts and eclipse protection. * Fix devp2p tests. * Fix whisper-cli compilation. * Fix compilation. * Fix ethcore-sync tests. * Revert "Fix light timeouts and eclipse protection." This reverts commit 06285ea8c1d9d184d809f64b5507aece633da6cc. * Increase timeouts. * Add whisper CLI to the pipelines (#8578) * Add whisper CLI to the pipelines * Address todo, ref #8579 * Rename `whisper-cli binary` to `whisper` (#8579) * rename whisper-cli binary to whisper * fix tests * Remove manually added text to the errors (#8595) These messages were confusing for the users especially the help message. * Fix account list double 0x display (#8596) * Remove unused self import * Fix account list double 0x display * Fix BlockReward contract "arithmetic operation overflow" (#8611) * Fix BlockReward contract "arithmetic operation overflow" * Add docs on how execute_as_system works * Fix typo * Rlp decode returns Result (#8527) rlp::decode returns Result Make a best effort to handle decoding errors gracefully throughout the code, using `expect` where the value is guaranteed to be valid (and in other places where it makes sense). * Remove expect (#8536) * Remove expect and propagate rlp::DecoderErrors as TrieErrors * Decoding headers can fail (#8570) * rlp::decode returns Result * Fix journaldb to handle rlp::decode Result * Fix ethcore to work with rlp::decode returning Result * Light client handles rlp::decode returning Result * Fix tests in rlp_derive * Fix tests * Cleanup * cleanup * Allow panic rather than breaking out of iterator * Let decoding failures when reading from disk blow up * syntax * Fix the trivial grumbles * Fix failing tests * Make Account::from_rlp return Result * Syntx, sigh * Temp-fix for decoding failures * Header::decode returns Result Handle new return type throughout the code base. * Do not continue reading from the DB when a value could not be read * Fix tests * Handle header decoding in light_sync * Handling header decoding errors * Let the DecodeError bubble up unchanged * Remove redundant error conversion * fix compiler warning (#8590) * Attempt to fix intermittent test failures (#8584) Occasionally should_return_correct_nonces_when_dropped_because_of_limit fails, possibly because of multiple threads competing to finish. See CI logs here for an example: https://gitlab.parity.io/parity/parity/-/jobs/86738 * block_header can fail so return Result (#8581) * block_header can fail so return Result * Restore previous return type based on feedback * Fix failing doc tests running on non-code * Block::decode() returns Result (#8586) * Gitlab test script fixes (#8573) * Exclude /docs from modified files. * Ensure all references in the working tree are available * Remove duplicated line from test script
240 lines
7.1 KiB
Rust
240 lines
7.1 KiB
Rust
// 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/>.
|
|
|
|
//! Database utilities and definitions.
|
|
|
|
use std::ops::Deref;
|
|
use std::hash::Hash;
|
|
use std::collections::HashMap;
|
|
use parking_lot::RwLock;
|
|
use kvdb::{DBTransaction, KeyValueDB};
|
|
|
|
use rlp;
|
|
|
|
// database columns
|
|
/// Column for State
|
|
pub const COL_STATE: Option<u32> = Some(0);
|
|
/// Column for Block headers
|
|
pub const COL_HEADERS: Option<u32> = Some(1);
|
|
/// Column for Block bodies
|
|
pub const COL_BODIES: Option<u32> = Some(2);
|
|
/// Column for Extras
|
|
pub const COL_EXTRA: Option<u32> = Some(3);
|
|
/// Column for Traces
|
|
pub const COL_TRACE: Option<u32> = Some(4);
|
|
/// Column for the empty accounts bloom filter.
|
|
pub const COL_ACCOUNT_BLOOM: Option<u32> = Some(5);
|
|
/// Column for general information from the local node which can persist.
|
|
pub const COL_NODE_INFO: Option<u32> = Some(6);
|
|
/// Column for the light client chain.
|
|
pub const COL_LIGHT_CHAIN: Option<u32> = Some(7);
|
|
/// Number of columns in DB
|
|
pub const NUM_COLUMNS: Option<u32> = Some(8);
|
|
|
|
/// Modes for updating caches.
|
|
#[derive(Clone, Copy)]
|
|
pub enum CacheUpdatePolicy {
|
|
/// Overwrite entries.
|
|
Overwrite,
|
|
/// Remove entries.
|
|
Remove,
|
|
}
|
|
|
|
/// A cache for arbitrary key-value pairs.
|
|
pub trait Cache<K, V> {
|
|
/// Insert an entry into the cache and get the old value.
|
|
fn insert(&mut self, k: K, v: V) -> Option<V>;
|
|
|
|
/// Remove an entry from the cache, getting the old value if it existed.
|
|
fn remove(&mut self, k: &K) -> Option<V>;
|
|
|
|
/// Query the cache for a key's associated value.
|
|
fn get(&self, k: &K) -> Option<&V>;
|
|
}
|
|
|
|
impl<K, V> Cache<K, V> for HashMap<K, V> where K: Hash + Eq {
|
|
fn insert(&mut self, k: K, v: V) -> Option<V> {
|
|
HashMap::insert(self, k, v)
|
|
}
|
|
|
|
fn remove(&mut self, k: &K) -> Option<V> {
|
|
HashMap::remove(self, k)
|
|
}
|
|
|
|
fn get(&self, k: &K) -> Option<&V> {
|
|
HashMap::get(self, k)
|
|
}
|
|
}
|
|
|
|
/// Should be used to get database key associated with given value.
|
|
pub trait Key<T> {
|
|
/// The db key associated with this value.
|
|
type Target: Deref<Target = [u8]>;
|
|
|
|
/// Returns db key.
|
|
fn key(&self) -> Self::Target;
|
|
}
|
|
|
|
/// Should be used to write value into database.
|
|
pub trait Writable {
|
|
/// Writes the value into the database.
|
|
fn write<T, R>(&mut self, col: Option<u32>, key: &Key<T, Target = R>, value: &T) where T: rlp::Encodable, R: Deref<Target = [u8]>;
|
|
|
|
/// Deletes key from the databse.
|
|
fn delete<T, R>(&mut self, col: Option<u32>, key: &Key<T, Target = R>) where T: rlp::Encodable, R: Deref<Target = [u8]>;
|
|
|
|
/// Writes the value into the database and updates the cache.
|
|
fn write_with_cache<K, T, R>(&mut self, col: Option<u32>, cache: &mut Cache<K, T>, key: K, value: T, policy: CacheUpdatePolicy) where
|
|
K: Key<T, Target = R> + Hash + Eq,
|
|
T: rlp::Encodable,
|
|
R: Deref<Target = [u8]> {
|
|
self.write(col, &key, &value);
|
|
match policy {
|
|
CacheUpdatePolicy::Overwrite => {
|
|
cache.insert(key, value);
|
|
},
|
|
CacheUpdatePolicy::Remove => {
|
|
cache.remove(&key);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Writes the values into the database and updates the cache.
|
|
fn extend_with_cache<K, T, R>(&mut self, col: Option<u32>, cache: &mut Cache<K, T>, values: HashMap<K, T>, policy: CacheUpdatePolicy) where
|
|
K: Key<T, Target = R> + Hash + Eq,
|
|
T: rlp::Encodable,
|
|
R: Deref<Target = [u8]> {
|
|
match policy {
|
|
CacheUpdatePolicy::Overwrite => {
|
|
for (key, value) in values {
|
|
self.write(col, &key, &value);
|
|
cache.insert(key, value);
|
|
}
|
|
},
|
|
CacheUpdatePolicy::Remove => {
|
|
for (key, value) in &values {
|
|
self.write(col, key, value);
|
|
cache.remove(key);
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
/// Writes and removes the values into the database and updates the cache.
|
|
fn extend_with_option_cache<K, T, R>(&mut self, col: Option<u32>, cache: &mut Cache<K, Option<T>>, values: HashMap<K, Option<T>>, policy: CacheUpdatePolicy) where
|
|
K: Key<T, Target = R> + Hash + Eq,
|
|
T: rlp::Encodable,
|
|
R: Deref<Target = [u8]> {
|
|
match policy {
|
|
CacheUpdatePolicy::Overwrite => {
|
|
for (key, value) in values {
|
|
match value {
|
|
Some(ref v) => self.write(col, &key, v),
|
|
None => self.delete(col, &key),
|
|
}
|
|
cache.insert(key, value);
|
|
}
|
|
},
|
|
CacheUpdatePolicy::Remove => {
|
|
for (key, value) in values {
|
|
match value {
|
|
Some(v) => self.write(col, &key, &v),
|
|
None => self.delete(col, &key),
|
|
}
|
|
cache.remove(&key);
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
/// Should be used to read values from database.
|
|
pub trait Readable {
|
|
/// Returns value for given key.
|
|
fn read<T, R>(&self, col: Option<u32>, key: &Key<T, Target = R>) -> Option<T> where
|
|
T: rlp::Decodable,
|
|
R: Deref<Target = [u8]>;
|
|
|
|
/// Returns value for given key either in cache or in database.
|
|
fn read_with_cache<K, T, C>(&self, col: Option<u32>, cache: &RwLock<C>, key: &K) -> Option<T> where
|
|
K: Key<T> + Eq + Hash + Clone,
|
|
T: Clone + rlp::Decodable,
|
|
C: Cache<K, T> {
|
|
{
|
|
let read = cache.read();
|
|
if let Some(v) = read.get(key) {
|
|
return Some(v.clone());
|
|
}
|
|
}
|
|
|
|
self.read(col, key).map(|value: T|{
|
|
let mut write = cache.write();
|
|
write.insert(key.clone(), value.clone());
|
|
value
|
|
})
|
|
}
|
|
|
|
/// Returns true if given value exists.
|
|
fn exists<T, R>(&self, col: Option<u32>, key: &Key<T, Target = R>) -> bool where R: Deref<Target= [u8]>;
|
|
|
|
/// Returns true if given value exists either in cache or in database.
|
|
fn exists_with_cache<K, T, R, C>(&self, col: Option<u32>, cache: &RwLock<C>, key: &K) -> bool where
|
|
K: Eq + Hash + Key<T, Target = R>,
|
|
R: Deref<Target = [u8]>,
|
|
C: Cache<K, T> {
|
|
{
|
|
let read = cache.read();
|
|
if read.get(key).is_some() {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
self.exists::<T, R>(col, key)
|
|
}
|
|
}
|
|
|
|
impl Writable for DBTransaction {
|
|
fn write<T, R>(&mut self, col: Option<u32>, key: &Key<T, Target = R>, value: &T) where T: rlp::Encodable, R: Deref<Target = [u8]> {
|
|
self.put(col, &key.key(), &rlp::encode(value));
|
|
}
|
|
|
|
fn delete<T, R>(&mut self, col: Option<u32>, key: &Key<T, Target = R>) where T: rlp::Encodable, R: Deref<Target = [u8]> {
|
|
self.delete(col, &key.key());
|
|
}
|
|
}
|
|
|
|
impl<KVDB: KeyValueDB + ?Sized> Readable for KVDB {
|
|
fn read<T, R>(&self, col: Option<u32>, key: &Key<T, Target = R>) -> Option<T>
|
|
where T: rlp::Decodable, R: Deref<Target = [u8]> {
|
|
self.get(col, &key.key())
|
|
.expect(&format!("db get failed, key: {:?}", &key.key() as &[u8]))
|
|
.map(|v| rlp::decode(&v).expect("decode db value failed") )
|
|
|
|
}
|
|
|
|
fn exists<T, R>(&self, col: Option<u32>, key: &Key<T, Target = R>) -> bool where R: Deref<Target = [u8]> {
|
|
let result = self.get(col, &key.key());
|
|
|
|
match result {
|
|
Ok(v) => v.is_some(),
|
|
Err(err) => {
|
|
panic!("db get failed, key: {:?}, err: {:?}", &key.key() as &[u8], err);
|
|
}
|
|
}
|
|
}
|
|
}
|