mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 18:41:05 +00:00
fd6b29dd2c
* Extend `Proposer` to optionally generate a proof of the proposal * Something * Refactor sr-api to not depend on client anymore * Fix benches * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Apply suggestions from code review * Introduce new `into_storage_changes` function * Switch to runtime api for `execute_block` and don't require `H256` anywhere in the code * Put the `StorageChanges` into the `Proposal` * Move the runtime api error to its own trait * Adds `StorageTransactionCache` to the runtime api This requires that we add `type NodeBlock = ` to the `impl_runtime_apis!` macro to work around some bugs in rustc :( * Remove `type NodeBlock` and switch to a "better" hack * Start using the transaction cache from the runtime api * Make it compile * Move `InMemory` to its own file * Make all tests work again * Return block, storage_changes and proof from Blockbuilder::bake() * Make sure that we use/set `storage_changes` when possible * Add test * Fix deadlock * Remove accidentally added folders * Introduce `RecordProof` as argument type to be more explicit * Update client/src/client.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update primitives/state-machine/src/ext.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Integrates review feedback * Remove `unsafe` usage * Update client/block-builder/src/lib.rs Co-Authored-By: Benjamin Kampmann <ben@gnunicorn.org> * Update client/src/call_executor.rs * Bump versions Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com> Co-authored-by: Benjamin Kampmann <ben.kampmann@googlemail.com>
499 lines
15 KiB
Rust
499 lines
15 KiB
Rust
// Copyright 2017-2020 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate 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.
|
|
|
|
// Substrate 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 Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Trie-based state machine backend essence used to read values
|
|
//! from storage.
|
|
|
|
use std::ops::Deref;
|
|
use std::sync::Arc;
|
|
use log::{debug, warn};
|
|
use hash_db::{self, Hasher, EMPTY_PREFIX, Prefix};
|
|
use sp_trie::{Trie, MemoryDB, PrefixedMemoryDB, DBValue,
|
|
default_child_trie_root, read_trie_value, read_child_trie_value,
|
|
for_keys_in_child_trie, KeySpacedDB};
|
|
use sp_trie::trie_types::{TrieDB, TrieError, Layout};
|
|
use crate::backend::Consolidate;
|
|
use sp_core::storage::ChildInfo;
|
|
use codec::Encode;
|
|
|
|
/// Patricia trie-based storage trait.
|
|
pub trait Storage<H: Hasher>: Send + Sync {
|
|
/// Get a trie node.
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String>;
|
|
}
|
|
|
|
/// Patricia trie-based pairs storage essence.
|
|
pub struct TrieBackendEssence<S: TrieBackendStorage<H>, H: Hasher> {
|
|
storage: S,
|
|
root: H::Out,
|
|
}
|
|
|
|
impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out: Encode {
|
|
/// Create new trie-based backend.
|
|
pub fn new(storage: S, root: H::Out) -> Self {
|
|
TrieBackendEssence {
|
|
storage,
|
|
root,
|
|
}
|
|
}
|
|
|
|
/// Get backend storage reference.
|
|
pub fn backend_storage(&self) -> &S {
|
|
&self.storage
|
|
}
|
|
|
|
/// Get trie root.
|
|
pub fn root(&self) -> &H::Out {
|
|
&self.root
|
|
}
|
|
|
|
/// Consumes self and returns underlying storage.
|
|
pub fn into_storage(self) -> S {
|
|
self.storage
|
|
}
|
|
|
|
/// Return the next key in the trie i.e. the minimum key that is strictly superior to `key` in
|
|
/// lexicographic order.
|
|
pub fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
|
|
self.next_storage_key_from_root(&self.root, None, key)
|
|
}
|
|
|
|
/// Return the next key in the child trie i.e. the minimum key that is strictly superior to
|
|
/// `key` in lexicographic order.
|
|
pub fn next_child_storage_key(
|
|
&self,
|
|
storage_key: &[u8],
|
|
child_info: ChildInfo,
|
|
key: &[u8],
|
|
) -> Result<Option<Vec<u8>>, String> {
|
|
let child_root = match self.storage(storage_key)? {
|
|
Some(child_root) => child_root,
|
|
None => return Ok(None),
|
|
};
|
|
|
|
let mut hash = H::Out::default();
|
|
|
|
if child_root.len() != hash.as_ref().len() {
|
|
return Err(format!("Invalid child storage hash at {:?}", storage_key));
|
|
}
|
|
// note: child_root and hash must be same size, panics otherwise.
|
|
hash.as_mut().copy_from_slice(&child_root[..]);
|
|
|
|
self.next_storage_key_from_root(&hash, Some(child_info), key)
|
|
}
|
|
|
|
/// Return next key from main trie or child trie by providing corresponding root.
|
|
fn next_storage_key_from_root(
|
|
&self,
|
|
root: &H::Out,
|
|
child_info: Option<ChildInfo>,
|
|
key: &[u8],
|
|
) -> Result<Option<Vec<u8>>, String> {
|
|
let mut read_overlay = S::Overlay::default();
|
|
let eph = Ephemeral {
|
|
storage: &self.storage,
|
|
overlay: &mut read_overlay,
|
|
};
|
|
let dyn_eph: &dyn hash_db::HashDBRef<_, _>;
|
|
let keyspace_eph;
|
|
if let Some(child_info) = child_info.as_ref() {
|
|
keyspace_eph = KeySpacedDB::new(&eph, child_info.keyspace());
|
|
dyn_eph = &keyspace_eph;
|
|
} else {
|
|
dyn_eph = &eph;
|
|
}
|
|
|
|
let trie = TrieDB::<H>::new(dyn_eph, root)
|
|
.map_err(|e| format!("TrieDB creation error: {}", e))?;
|
|
let mut iter = trie.iter()
|
|
.map_err(|e| format!("TrieDB iteration error: {}", e))?;
|
|
|
|
// The key just after the one given in input, basically `key++0`.
|
|
// Note: We are sure this is the next key if:
|
|
// * size of key has no limit (i.e. we can always add 0 to the path),
|
|
// * and no keys can be inserted between `key` and `key++0` (this is ensured by sp-io).
|
|
let mut potential_next_key = Vec::with_capacity(key.len() + 1);
|
|
potential_next_key.extend_from_slice(key);
|
|
potential_next_key.push(0);
|
|
|
|
iter.seek(&potential_next_key)
|
|
.map_err(|e| format!("TrieDB iterator seek error: {}", e))?;
|
|
|
|
let next_element = iter.next();
|
|
|
|
let next_key = if let Some(next_element) = next_element {
|
|
let (next_key, _) = next_element
|
|
.map_err(|e| format!("TrieDB iterator next error: {}", e))?;
|
|
Some(next_key)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
Ok(next_key)
|
|
}
|
|
|
|
/// Get the value of storage at given key.
|
|
pub fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
|
|
let mut read_overlay = S::Overlay::default();
|
|
let eph = Ephemeral {
|
|
storage: &self.storage,
|
|
overlay: &mut read_overlay,
|
|
};
|
|
|
|
let map_e = |e| format!("Trie lookup error: {}", e);
|
|
|
|
read_trie_value::<Layout<H>, _>(&eph, &self.root, key).map_err(map_e)
|
|
}
|
|
|
|
/// Get the value of child storage at given key.
|
|
pub fn child_storage(
|
|
&self,
|
|
storage_key: &[u8],
|
|
child_info: ChildInfo,
|
|
key: &[u8],
|
|
) -> Result<Option<Vec<u8>>, String> {
|
|
let root = self.storage(storage_key)?
|
|
.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode());
|
|
|
|
let mut read_overlay = S::Overlay::default();
|
|
let eph = Ephemeral {
|
|
storage: &self.storage,
|
|
overlay: &mut read_overlay,
|
|
};
|
|
|
|
let map_e = |e| format!("Trie lookup error: {}", e);
|
|
|
|
read_child_trie_value::<Layout<H>, _>(storage_key, child_info.keyspace(), &eph, &root, key)
|
|
.map_err(map_e)
|
|
}
|
|
|
|
/// Retrieve all entries keys of child storage and call `f` for each of those keys.
|
|
pub fn for_keys_in_child_storage<F: FnMut(&[u8])>(
|
|
&self,
|
|
storage_key: &[u8],
|
|
child_info: ChildInfo,
|
|
f: F,
|
|
) {
|
|
let root = match self.storage(storage_key) {
|
|
Ok(v) => v.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode()),
|
|
Err(e) => {
|
|
debug!(target: "trie", "Error while iterating child storage: {}", e);
|
|
return;
|
|
}
|
|
};
|
|
|
|
let mut read_overlay = S::Overlay::default();
|
|
let eph = Ephemeral {
|
|
storage: &self.storage,
|
|
overlay: &mut read_overlay,
|
|
};
|
|
|
|
if let Err(e) = for_keys_in_child_trie::<Layout<H>, _, Ephemeral<S, H>>(
|
|
storage_key,
|
|
child_info.keyspace(),
|
|
&eph,
|
|
&root,
|
|
f,
|
|
) {
|
|
debug!(target: "trie", "Error while iterating child storage: {}", e);
|
|
}
|
|
}
|
|
|
|
/// Execute given closure for all keys starting with prefix.
|
|
pub fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
|
|
&self,
|
|
storage_key: &[u8],
|
|
child_info: ChildInfo,
|
|
prefix: &[u8],
|
|
mut f: F,
|
|
) {
|
|
let root_vec = match self.storage(storage_key) {
|
|
Ok(v) => v.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode()),
|
|
Err(e) => {
|
|
debug!(target: "trie", "Error while iterating child storage: {}", e);
|
|
return;
|
|
}
|
|
};
|
|
let mut root = H::Out::default();
|
|
root.as_mut().copy_from_slice(&root_vec);
|
|
self.keys_values_with_prefix_inner(&root, prefix, |k, _v| f(k), Some(child_info))
|
|
}
|
|
|
|
/// Execute given closure for all keys starting with prefix.
|
|
pub fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], mut f: F) {
|
|
self.keys_values_with_prefix_inner(&self.root, prefix, |k, _v| f(k), None)
|
|
}
|
|
|
|
fn keys_values_with_prefix_inner<F: FnMut(&[u8], &[u8])>(
|
|
&self,
|
|
root: &H::Out,
|
|
prefix: &[u8],
|
|
mut f: F,
|
|
child_info: Option<ChildInfo>,
|
|
) {
|
|
let mut read_overlay = S::Overlay::default();
|
|
let eph = Ephemeral {
|
|
storage: &self.storage,
|
|
overlay: &mut read_overlay,
|
|
};
|
|
|
|
let mut iter = move |db| -> Result<(), Box<TrieError<H::Out>>> {
|
|
let trie = TrieDB::<H>::new(db, root)?;
|
|
let mut iter = trie.iter()?;
|
|
|
|
iter.seek(prefix)?;
|
|
|
|
for x in iter {
|
|
let (key, value) = x?;
|
|
|
|
if !key.starts_with(prefix) {
|
|
break;
|
|
}
|
|
|
|
f(&key, &value);
|
|
}
|
|
|
|
Ok(())
|
|
};
|
|
|
|
let result = if let Some(child_info) = child_info {
|
|
let db = KeySpacedDB::new(&eph, child_info.keyspace());
|
|
iter(&db)
|
|
} else {
|
|
iter(&eph)
|
|
};
|
|
if let Err(e) = result {
|
|
debug!(target: "trie", "Error while iterating by prefix: {}", e);
|
|
}
|
|
}
|
|
|
|
/// Execute given closure for all key and values starting with prefix.
|
|
pub fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], f: F) {
|
|
self.keys_values_with_prefix_inner(&self.root, prefix, f, None)
|
|
}
|
|
}
|
|
|
|
pub(crate) struct Ephemeral<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> {
|
|
storage: &'a S,
|
|
overlay: &'a mut S::Overlay,
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> hash_db::AsPlainDB<H::Out, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn as_plain_db<'b>(&'b self) -> &'b (dyn hash_db::PlainDB<H::Out, DBValue> + 'b) { self }
|
|
fn as_plain_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::PlainDB<H::Out, DBValue> + 'b) {
|
|
self
|
|
}
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> hash_db::AsHashDB<H, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn as_hash_db<'b>(&'b self) -> &'b (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
|
|
fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
|
|
}
|
|
|
|
impl<'a, S: TrieBackendStorage<H>, H: Hasher> Ephemeral<'a, S, H> {
|
|
pub fn new(storage: &'a S, overlay: &'a mut S::Overlay) -> Self {
|
|
Ephemeral {
|
|
storage,
|
|
overlay,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: Hasher> hash_db::PlainDB<H::Out, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn get(&self, key: &H::Out) -> Option<DBValue> {
|
|
if let Some(val) = hash_db::HashDB::get(self.overlay, key, EMPTY_PREFIX) {
|
|
Some(val)
|
|
} else {
|
|
match self.storage.get(&key, EMPTY_PREFIX) {
|
|
Ok(x) => x,
|
|
Err(e) => {
|
|
warn!(target: "trie", "Failed to read from DB: {}", e);
|
|
None
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
fn contains(&self, key: &H::Out) -> bool {
|
|
hash_db::HashDB::get(self, key, EMPTY_PREFIX).is_some()
|
|
}
|
|
|
|
fn emplace(&mut self, key: H::Out, value: DBValue) {
|
|
hash_db::HashDB::emplace(self.overlay, key, EMPTY_PREFIX, value)
|
|
}
|
|
|
|
fn remove(&mut self, key: &H::Out) {
|
|
hash_db::HashDB::remove(self.overlay, key, EMPTY_PREFIX)
|
|
}
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: Hasher> hash_db::PlainDBRef<H::Out, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn get(&self, key: &H::Out) -> Option<DBValue> { hash_db::PlainDB::get(self, key) }
|
|
fn contains(&self, key: &H::Out) -> bool { hash_db::PlainDB::contains(self, key) }
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: Hasher> hash_db::HashDB<H, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
|
|
if let Some(val) = hash_db::HashDB::get(self.overlay, key, prefix) {
|
|
Some(val)
|
|
} else {
|
|
match self.storage.get(&key, prefix) {
|
|
Ok(x) => x,
|
|
Err(e) => {
|
|
warn!(target: "trie", "Failed to read from DB: {}", e);
|
|
None
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
fn contains(&self, key: &H::Out, prefix: Prefix) -> bool {
|
|
hash_db::HashDB::get(self, key, prefix).is_some()
|
|
}
|
|
|
|
fn insert(&mut self, prefix: Prefix, value: &[u8]) -> H::Out {
|
|
hash_db::HashDB::insert(self.overlay, prefix, value)
|
|
}
|
|
|
|
fn emplace(&mut self, key: H::Out, prefix: Prefix, value: DBValue) {
|
|
hash_db::HashDB::emplace(self.overlay, key, prefix, value)
|
|
}
|
|
|
|
fn remove(&mut self, key: &H::Out, prefix: Prefix) {
|
|
hash_db::HashDB::remove(self.overlay, key, prefix)
|
|
}
|
|
}
|
|
|
|
impl<'a, S: 'a + TrieBackendStorage<H>, H: Hasher> hash_db::HashDBRef<H, DBValue>
|
|
for Ephemeral<'a, S, H>
|
|
{
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
|
|
hash_db::HashDB::get(self, key, prefix)
|
|
}
|
|
|
|
fn contains(&self, key: &H::Out, prefix: Prefix) -> bool {
|
|
hash_db::HashDB::contains(self, key, prefix)
|
|
}
|
|
}
|
|
|
|
/// Key-value pairs storage that is used by trie backend essence.
|
|
pub trait TrieBackendStorage<H: Hasher>: Send + Sync {
|
|
/// Type of in-memory overlay.
|
|
type Overlay: hash_db::HashDB<H, DBValue> + Default + Consolidate;
|
|
/// Get the value stored at key.
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String>;
|
|
}
|
|
|
|
// This implementation is used by normal storage trie clients.
|
|
impl<H: Hasher> TrieBackendStorage<H> for Arc<dyn Storage<H>> {
|
|
type Overlay = PrefixedMemoryDB<H>;
|
|
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
|
|
Storage::<H>::get(self.deref(), key, prefix)
|
|
}
|
|
}
|
|
|
|
// This implementation is used by test storage trie clients.
|
|
impl<H: Hasher> TrieBackendStorage<H> for PrefixedMemoryDB<H> {
|
|
type Overlay = PrefixedMemoryDB<H>;
|
|
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
|
|
Ok(hash_db::HashDB::get(self, key, prefix))
|
|
}
|
|
}
|
|
|
|
impl<H: Hasher> TrieBackendStorage<H> for MemoryDB<H> {
|
|
type Overlay = MemoryDB<H>;
|
|
|
|
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
|
|
Ok(hash_db::HashDB::get(self, key, prefix))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use sp_core::{Blake2Hasher, H256};
|
|
use sp_trie::{TrieMut, PrefixedMemoryDB, trie_types::TrieDBMut, KeySpacedDBMut};
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn next_storage_key_and_next_child_storage_key_work() {
|
|
let child_info = ChildInfo::new_default(b"uniqueid");
|
|
// Contains values
|
|
let mut root_1 = H256::default();
|
|
// Contains child trie
|
|
let mut root_2 = H256::default();
|
|
|
|
let mut mdb = PrefixedMemoryDB::<Blake2Hasher>::default();
|
|
{
|
|
let mut trie = TrieDBMut::new(&mut mdb, &mut root_1);
|
|
trie.insert(b"3", &[1]).expect("insert failed");
|
|
trie.insert(b"4", &[1]).expect("insert failed");
|
|
trie.insert(b"6", &[1]).expect("insert failed");
|
|
}
|
|
{
|
|
let mut mdb = KeySpacedDBMut::new(&mut mdb, child_info.keyspace());
|
|
// reuse of root_1 implicitly assert child trie root is same
|
|
// as top trie (contents must remain the same).
|
|
let mut trie = TrieDBMut::new(&mut mdb, &mut root_1);
|
|
trie.insert(b"3", &[1]).expect("insert failed");
|
|
trie.insert(b"4", &[1]).expect("insert failed");
|
|
trie.insert(b"6", &[1]).expect("insert failed");
|
|
}
|
|
{
|
|
let mut trie = TrieDBMut::new(&mut mdb, &mut root_2);
|
|
trie.insert(b"MyChild", root_1.as_ref()).expect("insert failed");
|
|
};
|
|
|
|
let essence_1 = TrieBackendEssence::new(mdb, root_1);
|
|
|
|
assert_eq!(essence_1.next_storage_key(b"2"), Ok(Some(b"3".to_vec())));
|
|
assert_eq!(essence_1.next_storage_key(b"3"), Ok(Some(b"4".to_vec())));
|
|
assert_eq!(essence_1.next_storage_key(b"4"), Ok(Some(b"6".to_vec())));
|
|
assert_eq!(essence_1.next_storage_key(b"5"), Ok(Some(b"6".to_vec())));
|
|
assert_eq!(essence_1.next_storage_key(b"6"), Ok(None));
|
|
|
|
let mdb = essence_1.into_storage();
|
|
let essence_2 = TrieBackendEssence::new(mdb, root_2);
|
|
|
|
assert_eq!(
|
|
essence_2.next_child_storage_key(b"MyChild", child_info, b"2"), Ok(Some(b"3".to_vec()))
|
|
);
|
|
assert_eq!(
|
|
essence_2.next_child_storage_key(b"MyChild", child_info, b"3"), Ok(Some(b"4".to_vec()))
|
|
);
|
|
assert_eq!(
|
|
essence_2.next_child_storage_key(b"MyChild", child_info, b"4"), Ok(Some(b"6".to_vec()))
|
|
);
|
|
assert_eq!(
|
|
essence_2.next_child_storage_key(b"MyChild", child_info, b"5"), Ok(Some(b"6".to_vec()))
|
|
);
|
|
assert_eq!(
|
|
essence_2.next_child_storage_key(b"MyChild", child_info, b"6"), Ok(None)
|
|
);
|
|
}
|
|
}
|