mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 18:07:58 +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>
264 lines
8.0 KiB
Rust
264 lines
8.0 KiB
Rust
// Copyright 2019-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/>.
|
|
|
|
//! System SRML specific RPC methods.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use codec::{self, Codec, Decode, Encode};
|
|
use sc_client::{
|
|
light::blockchain::{future_header, RemoteBlockchain},
|
|
light::fetcher::{Fetcher, RemoteCallRequest},
|
|
};
|
|
use jsonrpc_core::{
|
|
Error, ErrorCode,
|
|
futures::future::{result, Future},
|
|
};
|
|
use jsonrpc_derive::rpc;
|
|
use futures::future::{ready, TryFutureExt};
|
|
use sp_blockchain::{
|
|
HeaderBackend,
|
|
Error as ClientError
|
|
};
|
|
use sp_runtime::{
|
|
generic::BlockId,
|
|
traits,
|
|
};
|
|
use sp_core::hexdisplay::HexDisplay;
|
|
use sp_transaction_pool::{TransactionPool, InPoolTransaction};
|
|
|
|
pub use frame_system_rpc_runtime_api::AccountNonceApi;
|
|
pub use self::gen_client::Client as SystemClient;
|
|
|
|
/// Future that resolves to account nonce.
|
|
pub type FutureResult<T> = Box<dyn Future<Item = T, Error = Error> + Send>;
|
|
|
|
/// System RPC methods.
|
|
#[rpc]
|
|
pub trait SystemApi<AccountId, Index> {
|
|
/// Returns the next valid index (aka nonce) for given account.
|
|
///
|
|
/// This method takes into consideration all pending transactions
|
|
/// currently in the pool and if no transactions are found in the pool
|
|
/// it fallbacks to query the index from the runtime (aka. state nonce).
|
|
#[rpc(name = "system_accountNextIndex", alias("account_nextIndex"))]
|
|
fn nonce(&self, account: AccountId) -> FutureResult<Index>;
|
|
}
|
|
|
|
const RUNTIME_ERROR: i64 = 1;
|
|
|
|
/// An implementation of System-specific RPC methods on full client.
|
|
pub struct FullSystem<P: TransactionPool, C, B> {
|
|
client: Arc<C>,
|
|
pool: Arc<P>,
|
|
_marker: std::marker::PhantomData<B>,
|
|
}
|
|
|
|
impl<P: TransactionPool, C, B> FullSystem<P, C, B> {
|
|
/// Create new `FullSystem` given client and transaction pool.
|
|
pub fn new(client: Arc<C>, pool: Arc<P>) -> Self {
|
|
FullSystem {
|
|
client,
|
|
pool,
|
|
_marker: Default::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<P, C, Block, AccountId, Index> SystemApi<AccountId, Index> for FullSystem<P, C, Block>
|
|
where
|
|
C: sp_api::ProvideRuntimeApi<Block>,
|
|
C: HeaderBackend<Block>,
|
|
C: Send + Sync + 'static,
|
|
C::Api: AccountNonceApi<Block, AccountId, Index>,
|
|
P: TransactionPool + 'static,
|
|
Block: traits::Block,
|
|
AccountId: Clone + std::fmt::Display + Codec,
|
|
Index: Clone + std::fmt::Display + Codec + Send + traits::SimpleArithmetic + 'static,
|
|
{
|
|
fn nonce(&self, account: AccountId) -> FutureResult<Index> {
|
|
let get_nonce = || {
|
|
let api = self.client.runtime_api();
|
|
let best = self.client.info().best_hash;
|
|
let at = BlockId::hash(best);
|
|
|
|
let nonce = api.account_nonce(&at, account.clone()).map_err(|e| Error {
|
|
code: ErrorCode::ServerError(RUNTIME_ERROR),
|
|
message: "Unable to query nonce.".into(),
|
|
data: Some(format!("{:?}", e).into()),
|
|
})?;
|
|
|
|
Ok(adjust_nonce(&*self.pool, account, nonce))
|
|
};
|
|
|
|
Box::new(result(get_nonce()))
|
|
}
|
|
}
|
|
|
|
/// An implementation of System-specific RPC methods on light client.
|
|
pub struct LightSystem<P: TransactionPool, C, F, Block> {
|
|
client: Arc<C>,
|
|
remote_blockchain: Arc<dyn RemoteBlockchain<Block>>,
|
|
fetcher: Arc<F>,
|
|
pool: Arc<P>,
|
|
}
|
|
|
|
impl<P: TransactionPool, C, F, Block> LightSystem<P, C, F, Block> {
|
|
/// Create new `LightSystem`.
|
|
pub fn new(
|
|
client: Arc<C>,
|
|
remote_blockchain: Arc<dyn RemoteBlockchain<Block>>,
|
|
fetcher: Arc<F>,
|
|
pool: Arc<P>,
|
|
) -> Self {
|
|
LightSystem {
|
|
client,
|
|
remote_blockchain,
|
|
fetcher,
|
|
pool,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<P, C, F, Block, AccountId, Index> SystemApi<AccountId, Index> for LightSystem<P, C, F, Block>
|
|
where
|
|
P: TransactionPool + 'static,
|
|
C: HeaderBackend<Block>,
|
|
C: Send + Sync + 'static,
|
|
F: Fetcher<Block> + 'static,
|
|
Block: traits::Block,
|
|
AccountId: Clone + std::fmt::Display + Codec + Send + 'static,
|
|
Index: Clone + std::fmt::Display + Codec + Send + traits::SimpleArithmetic + 'static,
|
|
{
|
|
fn nonce(&self, account: AccountId) -> FutureResult<Index> {
|
|
let best_hash = self.client.info().best_hash;
|
|
let best_id = BlockId::hash(best_hash);
|
|
let future_best_header = future_header(&*self.remote_blockchain, &*self.fetcher, best_id);
|
|
let fetcher = self.fetcher.clone();
|
|
let call_data = account.encode();
|
|
let future_best_header = future_best_header
|
|
.and_then(move |maybe_best_header| ready(
|
|
match maybe_best_header {
|
|
Some(best_header) => Ok(best_header),
|
|
None => Err(ClientError::UnknownBlock(format!("{}", best_hash))),
|
|
}
|
|
));
|
|
let future_nonce = future_best_header.and_then(move |best_header|
|
|
fetcher.remote_call(RemoteCallRequest {
|
|
block: best_hash,
|
|
header: best_header,
|
|
method: "AccountNonceApi_account_nonce".into(),
|
|
call_data,
|
|
retry_count: None,
|
|
})
|
|
).compat();
|
|
let future_nonce = future_nonce.and_then(|nonce| Decode::decode(&mut &nonce[..])
|
|
.map_err(|e| ClientError::CallResultDecode("Cannot decode account nonce", e)));
|
|
let future_nonce = future_nonce.map_err(|e| Error {
|
|
code: ErrorCode::ServerError(RUNTIME_ERROR),
|
|
message: "Unable to query nonce.".into(),
|
|
data: Some(format!("{:?}", e).into()),
|
|
});
|
|
|
|
let pool = self.pool.clone();
|
|
let future_nonce = future_nonce.map(move |nonce| adjust_nonce(&*pool, account, nonce));
|
|
|
|
Box::new(future_nonce)
|
|
}
|
|
}
|
|
|
|
/// Adjust account nonce from state, so that tx with the nonce will be
|
|
/// placed after all ready txpool transactions.
|
|
fn adjust_nonce<P, AccountId, Index>(
|
|
pool: &P,
|
|
account: AccountId,
|
|
nonce: Index,
|
|
) -> Index where
|
|
P: TransactionPool,
|
|
AccountId: Clone + std::fmt::Display + Encode,
|
|
Index: Clone + std::fmt::Display + Encode + traits::SimpleArithmetic + 'static,
|
|
{
|
|
log::debug!(target: "rpc", "State nonce for {}: {}", account, nonce);
|
|
// Now we need to query the transaction pool
|
|
// and find transactions originating from the same sender.
|
|
//
|
|
// Since extrinsics are opaque to us, we look for them using
|
|
// `provides` tag. And increment the nonce if we find a transaction
|
|
// that matches the current one.
|
|
let mut current_nonce = nonce.clone();
|
|
let mut current_tag = (account.clone(), nonce.clone()).encode();
|
|
for tx in pool.ready() {
|
|
log::debug!(
|
|
target: "rpc",
|
|
"Current nonce to {}, checking {} vs {:?}",
|
|
current_nonce,
|
|
HexDisplay::from(¤t_tag),
|
|
tx.provides().iter().map(|x| format!("{}", HexDisplay::from(x))).collect::<Vec<_>>(),
|
|
);
|
|
// since transactions in `ready()` need to be ordered by nonce
|
|
// it's fine to continue with current iterator.
|
|
if tx.provides().get(0) == Some(¤t_tag) {
|
|
current_nonce += traits::One::one();
|
|
current_tag = (account.clone(), current_nonce.clone()).encode();
|
|
}
|
|
}
|
|
|
|
current_nonce
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
use futures::executor::block_on;
|
|
use substrate_test_runtime_client::{
|
|
runtime::Transfer,
|
|
AccountKeyring,
|
|
};
|
|
use sc_transaction_pool::{BasicPool, FullChainApi};
|
|
|
|
#[test]
|
|
fn should_return_next_nonce_for_some_account() {
|
|
// given
|
|
let _ = env_logger::try_init();
|
|
let client = Arc::new(substrate_test_runtime_client::new());
|
|
let pool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
|
|
|
|
let new_transaction = |nonce: u64| {
|
|
let t = Transfer {
|
|
from: AccountKeyring::Alice.into(),
|
|
to: AccountKeyring::Bob.into(),
|
|
amount: 5,
|
|
nonce,
|
|
};
|
|
t.into_signed_tx()
|
|
};
|
|
// Populate the pool
|
|
let ext0 = new_transaction(0);
|
|
block_on(pool.submit_one(&BlockId::number(0), ext0)).unwrap();
|
|
let ext1 = new_transaction(1);
|
|
block_on(pool.submit_one(&BlockId::number(0), ext1)).unwrap();
|
|
|
|
let accounts = FullSystem::new(client, pool);
|
|
|
|
// when
|
|
let nonce = accounts.nonce(AccountKeyring::Alice.into());
|
|
|
|
// then
|
|
assert_eq!(nonce.wait().unwrap(), 2);
|
|
}
|
|
}
|