1ef9d5b52f
* WIP move errors, pod_account and state account to own crates * Sort out dependencies, fix broken code and tests Remove botched ethcore-error crate * remove template line * fix review feedback * Remove test-only AccountDBMut::new * Extract AccountDB to account-db * Move Substate to state-account – wip * Add lib.rs * cleanup * test failure * test failure 2 * third time's the charm * Add factories crate * Use new factories crate * Use factories crate * Extract trace * Fix tests * Sort out parity-util-mem and parking_lot * cleanup * WIP port over the rest of state from ethcore * Collect all impls for Machine * some notes * Rename pod-account to pod * Move PodState to pod crate * Use PodState from pod crate * Fix use clause for json tests * Sort out evmbin * Add missing code and use PodState * Move code that depends on Machine and Executive to own module * Sort out cloning errors, fix ethcore to use new state crate * Do without funky From impls * Fix ethcore tests * Fixes around the project to use new state crate * Add back the more specific impls of StateOrBlock From conversions * Move execute to freestanding function and remove it from trait Sort out the error handling in executive_state by moving the result types from state to ethcore Undo the verbose code added to work around the StateOrBlock From conversions * cleanup * Fix "error: enum variants on type aliases are experimental" * Bring back the state tests Fix whitespace * remove ethcore/state/mod.rs * cleanup * cleanup * Cleanup state-account errors * Fix more todos Add module docs * Add error.rs * Fixup Cargo.lock * Smaller ethcore API is fine * Add `to-pod-full` feature to state-account Fix evmbin * Fix a few more test failures * Fix RPC test build * Baptize the new trait * Remove resolved TODOs * Rename state-account to account-state * Do not re-export the trace crate * Don't export state_db from ethcore * Let private-tx use StateDB. :( * Remove ethcore/src/pod_state.rs * Inner type does not need to be pub/pub(crate) * optimise imports * Revert "Inner type does not need to be pub/pub(crate)" This reverts commit 2f839f8a0f72f71334da64620f57e6dd6039f06b. * Move DatabaseExtras to ethcore-blockchain * Add database_extra module to ethcore-blockchain * Remove to-pod-full feature * cosmetics * New crate: state-db * Add new crate * Move PreverifiedBlock and BlockError to types * Sort out the merge * Add missing `license` meta data keys * wip * wip client-traits * merge conflict * verification crate type checks * Move impls for CommonParams to common_types Fix misc stuff in ethcore * Fix tests * Implement VerifyingEngine for all engines except Ethash Temporarily sort out error handling Move more types to common_types * Split Engine in two and move code around * cleanup * verification: don't rexport common_types * Use error from common_types * Consolidate error types * VerifyingEngine use Errors from common_types * verification: Use error type from common_types * SnapshotError moved to common_types * Move more code from Engne to VerifyingEngine Add a VerifyingClient trait: BlockInfo + CallContract Whitespace * Add MAX_UNCLE_AGE const * Port over remaining code from ethcore/verification * Use errors from common_types * Fix the confusing "io" naming * Move more types into common_types * Add todos * Experiment with Engine trait outside ethcore * Hook up types from common_types in ethcore Don't use verification crate Don't use client-traits crate * Revert to impl Engine for Arc<Ethash> and add note to explain why Revert moving ClientIoMessage to common_types Fix build * Remove ClientIoMessage from common_types * Cleanup * More cleanup * Sort error handling changes in the rest of parity * Remove unused code * Remove WIP types * Cleanup todos not tackled here * remove cruft * Fix some whitespace and a merge error * ethcore tests * test failures * Restore Engine impls to master to make review a bit easier * cleanup * whitespace * applied review suggestions * types does not depend on rustc-hex * ethash engine moved to engine module * applied review suggestion
89 lines
2.6 KiB
Rust
89 lines
2.6 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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 Ethereum 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 Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Blooms migration from rocksdb to blooms-db
|
|
|
|
use std::path::Path;
|
|
use ethereum_types::Bloom;
|
|
use types::errors::EthcoreError as Error;
|
|
use rlp;
|
|
use super::kvdb_rocksdb::DatabaseConfig;
|
|
use super::open_database;
|
|
|
|
const LOG_BLOOMS_ELEMENTS_PER_INDEX: u64 = 16;
|
|
|
|
pub fn migrate_blooms<P: AsRef<Path>>(path: P, config: &DatabaseConfig) -> Result<(), Error> {
|
|
// init
|
|
let db = open_database(&path.as_ref().to_string_lossy(), config)?;
|
|
|
|
// possible optimization:
|
|
// pre-allocate space on disk for faster migration
|
|
|
|
// iterate over header blooms and insert them in blooms-db
|
|
// Some(3) -> COL_EXTRA
|
|
// 3u8 -> ExtrasIndex::BlocksBlooms
|
|
// 0u8 -> level 0
|
|
let blooms_iterator = db.key_value()
|
|
.iter_from_prefix(Some(3), &[3u8, 0u8])
|
|
.filter(|(key, _)| key.len() == 6)
|
|
.take_while(|(key, _)| {
|
|
key[0] == 3u8 && key[1] == 0u8
|
|
})
|
|
.map(|(key, group)| {
|
|
let index =
|
|
(key[2] as u64) << 24 |
|
|
(key[3] as u64) << 16 |
|
|
(key[4] as u64) << 8 |
|
|
(key[5] as u64);
|
|
let number = index * LOG_BLOOMS_ELEMENTS_PER_INDEX;
|
|
|
|
let blooms = rlp::decode_list::<Bloom>(&group);
|
|
(number, blooms)
|
|
});
|
|
|
|
for (number, blooms) in blooms_iterator {
|
|
db.blooms().insert_blooms(number, blooms.iter())?;
|
|
}
|
|
|
|
// iterate over trace blooms and insert them in blooms-db
|
|
// Some(4) -> COL_TRACE
|
|
// 1u8 -> TraceDBIndex::BloomGroups
|
|
// 0u8 -> level 0
|
|
let trace_blooms_iterator = db.key_value()
|
|
.iter_from_prefix(Some(4), &[1u8, 0u8])
|
|
.filter(|(key, _)| key.len() == 6)
|
|
.take_while(|(key, _)| {
|
|
key[0] == 1u8 && key[1] == 0u8
|
|
})
|
|
.map(|(key, group)| {
|
|
let index =
|
|
(key[2] as u64) |
|
|
(key[3] as u64) << 8 |
|
|
(key[4] as u64) << 16 |
|
|
(key[5] as u64) << 24;
|
|
let number = index * LOG_BLOOMS_ELEMENTS_PER_INDEX;
|
|
|
|
let blooms = rlp::decode_list::<Bloom>(&group);
|
|
(number, blooms)
|
|
});
|
|
|
|
for (number, blooms) in trace_blooms_iterator {
|
|
db.trace_blooms().insert_blooms(number, blooms.iter())?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|