mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-08 01:57:22 +00:00
Remove requirement on Hash = H256, make Proposer return StorageChanges and Proof (#3860)
* 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>
This commit is contained in:
@@ -43,10 +43,9 @@ use std::sync::Arc;
|
||||
use log::info;
|
||||
use sc_client::Client;
|
||||
use sp_block_builder::BlockBuilder;
|
||||
use sp_api::ConstructRuntimeApi;
|
||||
use sp_core::{Blake2Hasher, Hasher};
|
||||
use sp_api::{ConstructRuntimeApi, ProvideRuntimeApi};
|
||||
use sp_runtime::generic::BlockId;
|
||||
use sp_runtime::traits::{Block as BlockT, ProvideRuntimeApi, One, Zero};
|
||||
use sp_runtime::traits::{Block as BlockT, One, Zero};
|
||||
|
||||
use crate::{RuntimeAdapter, create_block};
|
||||
|
||||
@@ -59,12 +58,13 @@ pub fn next<RA, Backend, Exec, Block, RtApi>(
|
||||
prior_block_id: BlockId<Block>,
|
||||
) -> Option<Block>
|
||||
where
|
||||
Block: BlockT<Hash = <Blake2Hasher as Hasher>::Out>,
|
||||
Exec: sc_client::CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone,
|
||||
Backend: sc_client_api::backend::Backend<Block, Blake2Hasher> + Send,
|
||||
Client<Backend, Exec, Block, RtApi>: ProvideRuntimeApi,
|
||||
<Client<Backend, Exec, Block, RtApi> as ProvideRuntimeApi>::Api:
|
||||
BlockBuilder<Block, Error = sp_blockchain::Error>,
|
||||
Block: BlockT,
|
||||
Exec: sc_client::CallExecutor<Block, Backend = Backend> + Send + Sync + Clone,
|
||||
Backend: sc_client_api::backend::Backend<Block> + Send,
|
||||
Client<Backend, Exec, Block, RtApi>: ProvideRuntimeApi<Block>,
|
||||
<Client<Backend, Exec, Block, RtApi> as ProvideRuntimeApi<Block>>::Api:
|
||||
BlockBuilder<Block, Error = sp_blockchain::Error> +
|
||||
sp_api::ApiExt<Block, StateBackend = Backend::State>,
|
||||
RtApi: ConstructRuntimeApi<Block, Client<Backend, Exec, Block, RtApi>> + Send + Sync,
|
||||
RA: RuntimeAdapter,
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user