mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-06 14:58:03 +00:00
ab3a3bc278
It changes following APIs: - trait `ChainApi` -- `validate_transaction` - trait `TransactionPool` --`submit_at` --`submit_one` --`submit_and_watch` and some implementation details, in particular: - impl `Pool` --`submit_at` --`resubmit_at` --`submit_one` --`submit_and_watch` --`prune_known` --`prune` --`prune_tags` --`resolve_block_number` --`verify` --`verify_one` - revalidation queue All tests are also adjusted. --------- Co-authored-by: command-bot <> Co-authored-by: Bastian Köcher <git@kchr.de>
453 lines
13 KiB
Rust
453 lines
13 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
|
|
|
// This program 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.
|
|
|
|
// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
//! Pool periodic revalidation.
|
|
|
|
use std::{
|
|
collections::{BTreeMap, HashMap, HashSet},
|
|
pin::Pin,
|
|
sync::Arc,
|
|
};
|
|
|
|
use crate::{
|
|
graph::{BlockHash, ChainApi, ExtrinsicHash, Pool, ValidatedTransaction},
|
|
LOG_TARGET,
|
|
};
|
|
use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
|
|
use sp_runtime::{
|
|
generic::BlockId, traits::SaturatedConversion, transaction_validity::TransactionValidityError,
|
|
};
|
|
|
|
use futures::prelude::*;
|
|
use std::time::Duration;
|
|
|
|
const BACKGROUND_REVALIDATION_INTERVAL: Duration = Duration::from_millis(200);
|
|
|
|
const MIN_BACKGROUND_REVALIDATION_BATCH_SIZE: usize = 20;
|
|
|
|
/// Payload from queue to worker.
|
|
struct WorkerPayload<Api: ChainApi> {
|
|
at: BlockHash<Api>,
|
|
transactions: Vec<ExtrinsicHash<Api>>,
|
|
}
|
|
|
|
/// Async revalidation worker.
|
|
///
|
|
/// Implements future and can be spawned in place or in background.
|
|
struct RevalidationWorker<Api: ChainApi> {
|
|
api: Arc<Api>,
|
|
pool: Arc<Pool<Api>>,
|
|
best_block: BlockHash<Api>,
|
|
block_ordered: BTreeMap<BlockHash<Api>, HashSet<ExtrinsicHash<Api>>>,
|
|
members: HashMap<ExtrinsicHash<Api>, BlockHash<Api>>,
|
|
}
|
|
|
|
impl<Api: ChainApi> Unpin for RevalidationWorker<Api> {}
|
|
|
|
/// Revalidate batch of transaction.
|
|
///
|
|
/// Each transaction is validated against chain, and invalid are
|
|
/// removed from the `pool`, while valid are resubmitted.
|
|
async fn batch_revalidate<Api: ChainApi>(
|
|
pool: Arc<Pool<Api>>,
|
|
api: Arc<Api>,
|
|
at: BlockHash<Api>,
|
|
batch: impl IntoIterator<Item = ExtrinsicHash<Api>>,
|
|
) {
|
|
// This conversion should work. Otherwise, for unknown block the revalidation shall be skipped,
|
|
// all the transactions will be kept in the validated pool, and can be scheduled for
|
|
// revalidation with the next request.
|
|
let block_number = match api.block_id_to_number(&BlockId::Hash(at)) {
|
|
Ok(Some(n)) => n,
|
|
Ok(None) => {
|
|
log::debug!(target: LOG_TARGET, "revalidation skipped at block {at:?}, could not get block number.");
|
|
return
|
|
},
|
|
Err(e) => {
|
|
log::debug!(target: LOG_TARGET, "revalidation skipped at block {at:?}: {e:?}.");
|
|
return
|
|
},
|
|
};
|
|
|
|
let mut invalid_hashes = Vec::new();
|
|
let mut revalidated = HashMap::new();
|
|
|
|
let validation_results = futures::future::join_all(batch.into_iter().filter_map(|ext_hash| {
|
|
pool.validated_pool().ready_by_hash(&ext_hash).map(|ext| {
|
|
api.validate_transaction(at, ext.source, ext.data.clone())
|
|
.map(move |validation_result| (validation_result, ext_hash, ext))
|
|
})
|
|
}))
|
|
.await;
|
|
|
|
for (validation_result, ext_hash, ext) in validation_results {
|
|
match validation_result {
|
|
Ok(Err(TransactionValidityError::Invalid(err))) => {
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"[{:?}]: Revalidation: invalid {:?}",
|
|
ext_hash,
|
|
err,
|
|
);
|
|
invalid_hashes.push(ext_hash);
|
|
},
|
|
Ok(Err(TransactionValidityError::Unknown(err))) => {
|
|
// skipping unknown, they might be pushed by valid or invalid transaction
|
|
// when latter resubmitted.
|
|
log::trace!(
|
|
target: LOG_TARGET,
|
|
"[{:?}]: Unknown during revalidation: {:?}",
|
|
ext_hash,
|
|
err,
|
|
);
|
|
},
|
|
Ok(Ok(validity)) => {
|
|
revalidated.insert(
|
|
ext_hash,
|
|
ValidatedTransaction::valid_at(
|
|
block_number.saturated_into::<u64>(),
|
|
ext_hash,
|
|
ext.source,
|
|
ext.data.clone(),
|
|
api.hash_and_length(&ext.data).1,
|
|
validity,
|
|
),
|
|
);
|
|
},
|
|
Err(validation_err) => {
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"[{:?}]: Removing due to error during revalidation: {}",
|
|
ext_hash,
|
|
validation_err
|
|
);
|
|
invalid_hashes.push(ext_hash);
|
|
},
|
|
}
|
|
}
|
|
|
|
pool.validated_pool().remove_invalid(&invalid_hashes);
|
|
if revalidated.len() > 0 {
|
|
pool.resubmit(revalidated);
|
|
}
|
|
}
|
|
|
|
impl<Api: ChainApi> RevalidationWorker<Api> {
|
|
fn new(api: Arc<Api>, pool: Arc<Pool<Api>>, best_block: BlockHash<Api>) -> Self {
|
|
Self {
|
|
api,
|
|
pool,
|
|
best_block,
|
|
block_ordered: Default::default(),
|
|
members: Default::default(),
|
|
}
|
|
}
|
|
|
|
fn prepare_batch(&mut self) -> Vec<ExtrinsicHash<Api>> {
|
|
let mut queued_exts = Vec::new();
|
|
let mut left =
|
|
std::cmp::max(MIN_BACKGROUND_REVALIDATION_BATCH_SIZE, self.members.len() / 4);
|
|
|
|
// Take maximum of count transaction by order
|
|
// which they got into the pool
|
|
while left > 0 {
|
|
let first_block = match self.block_ordered.keys().next().cloned() {
|
|
Some(bn) => bn,
|
|
None => break,
|
|
};
|
|
let mut block_drained = false;
|
|
if let Some(extrinsics) = self.block_ordered.get_mut(&first_block) {
|
|
let to_queue = extrinsics.iter().take(left).cloned().collect::<Vec<_>>();
|
|
if to_queue.len() == extrinsics.len() {
|
|
block_drained = true;
|
|
} else {
|
|
for xt in &to_queue {
|
|
extrinsics.remove(xt);
|
|
}
|
|
}
|
|
left -= to_queue.len();
|
|
queued_exts.extend(to_queue);
|
|
}
|
|
|
|
if block_drained {
|
|
self.block_ordered.remove(&first_block);
|
|
}
|
|
}
|
|
|
|
for hash in queued_exts.iter() {
|
|
self.members.remove(hash);
|
|
}
|
|
|
|
queued_exts
|
|
}
|
|
|
|
fn len(&self) -> usize {
|
|
self.block_ordered.iter().map(|b| b.1.len()).sum()
|
|
}
|
|
|
|
fn push(&mut self, worker_payload: WorkerPayload<Api>) {
|
|
// we don't add something that already scheduled for revalidation
|
|
let transactions = worker_payload.transactions;
|
|
let block_number = worker_payload.at;
|
|
|
|
for ext_hash in transactions {
|
|
// we don't add something that already scheduled for revalidation
|
|
if self.members.contains_key(&ext_hash) {
|
|
log::trace!(
|
|
target: LOG_TARGET,
|
|
"[{:?}] Skipped adding for revalidation: Already there.",
|
|
ext_hash,
|
|
);
|
|
|
|
continue
|
|
}
|
|
|
|
self.block_ordered
|
|
.entry(block_number)
|
|
.and_modify(|value| {
|
|
value.insert(ext_hash);
|
|
})
|
|
.or_insert_with(|| {
|
|
let mut bt = HashSet::new();
|
|
bt.insert(ext_hash);
|
|
bt
|
|
});
|
|
self.members.insert(ext_hash, block_number);
|
|
}
|
|
}
|
|
|
|
/// Background worker main loop.
|
|
///
|
|
/// It does two things: periodically tries to process some transactions
|
|
/// from the queue and also accepts messages to enqueue some more
|
|
/// transactions from the pool.
|
|
pub async fn run(
|
|
mut self,
|
|
from_queue: TracingUnboundedReceiver<WorkerPayload<Api>>,
|
|
interval: Duration,
|
|
) {
|
|
let interval_fut = futures_timer::Delay::new(interval);
|
|
let from_queue = from_queue.fuse();
|
|
futures::pin_mut!(interval_fut, from_queue);
|
|
let this = &mut self;
|
|
|
|
loop {
|
|
futures::select! {
|
|
// Using `fuse()` in here is okay, because we reset the interval when it has fired.
|
|
_ = (&mut interval_fut).fuse() => {
|
|
let next_batch = this.prepare_batch();
|
|
let batch_len = next_batch.len();
|
|
|
|
batch_revalidate(this.pool.clone(), this.api.clone(), this.best_block, next_batch).await;
|
|
|
|
if batch_len > 0 || this.len() > 0 {
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Revalidated {} transactions. Left in the queue for revalidation: {}.",
|
|
batch_len,
|
|
this.len(),
|
|
);
|
|
}
|
|
|
|
interval_fut.reset(interval);
|
|
},
|
|
workload = from_queue.next() => {
|
|
match workload {
|
|
Some(worker_payload) => {
|
|
this.best_block = worker_payload.at;
|
|
this.push(worker_payload);
|
|
|
|
if this.members.len() > 0 {
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Updated revalidation queue at {:?}. Transactions: {:?}",
|
|
this.best_block,
|
|
this.members,
|
|
);
|
|
}
|
|
|
|
continue;
|
|
},
|
|
// R.I.P. worker!
|
|
None => break,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Revalidation queue.
|
|
///
|
|
/// Can be configured background (`new_background`)
|
|
/// or immediate (just `new`).
|
|
pub struct RevalidationQueue<Api: ChainApi> {
|
|
pool: Arc<Pool<Api>>,
|
|
api: Arc<Api>,
|
|
background: Option<TracingUnboundedSender<WorkerPayload<Api>>>,
|
|
}
|
|
|
|
impl<Api: ChainApi> RevalidationQueue<Api>
|
|
where
|
|
Api: 'static,
|
|
{
|
|
/// New revalidation queue without background worker.
|
|
pub fn new(api: Arc<Api>, pool: Arc<Pool<Api>>) -> Self {
|
|
Self { api, pool, background: None }
|
|
}
|
|
|
|
/// New revalidation queue with background worker.
|
|
pub fn new_with_interval(
|
|
api: Arc<Api>,
|
|
pool: Arc<Pool<Api>>,
|
|
interval: Duration,
|
|
best_block: BlockHash<Api>,
|
|
) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
|
|
let (to_worker, from_queue) = tracing_unbounded("mpsc_revalidation_queue", 100_000);
|
|
|
|
let worker = RevalidationWorker::new(api.clone(), pool.clone(), best_block);
|
|
|
|
let queue = Self { api, pool, background: Some(to_worker) };
|
|
|
|
(queue, worker.run(from_queue, interval).boxed())
|
|
}
|
|
|
|
/// New revalidation queue with background worker.
|
|
pub fn new_background(
|
|
api: Arc<Api>,
|
|
pool: Arc<Pool<Api>>,
|
|
best_block: BlockHash<Api>,
|
|
) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
|
|
Self::new_with_interval(api, pool, BACKGROUND_REVALIDATION_INTERVAL, best_block)
|
|
}
|
|
|
|
/// Queue some transaction for later revalidation.
|
|
///
|
|
/// If queue configured with background worker, this will return immediately.
|
|
/// If queue configured without background worker, this will resolve after
|
|
/// revalidation is actually done.
|
|
pub async fn revalidate_later(
|
|
&self,
|
|
at: BlockHash<Api>,
|
|
transactions: Vec<ExtrinsicHash<Api>>,
|
|
) {
|
|
if transactions.len() > 0 {
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Sent {} transactions to revalidation queue",
|
|
transactions.len(),
|
|
);
|
|
}
|
|
|
|
if let Some(ref to_worker) = self.background {
|
|
if let Err(e) = to_worker.unbounded_send(WorkerPayload { at, transactions }) {
|
|
log::warn!(target: LOG_TARGET, "Failed to update background worker: {:?}", e);
|
|
}
|
|
} else {
|
|
let pool = self.pool.clone();
|
|
let api = self.api.clone();
|
|
batch_revalidate(pool, api, at, transactions).await
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{
|
|
graph::Pool,
|
|
tests::{uxt, TestApi},
|
|
};
|
|
use futures::executor::block_on;
|
|
use sc_transaction_pool_api::TransactionSource;
|
|
use substrate_test_runtime::{AccountId, Transfer, H256};
|
|
use substrate_test_runtime_client::AccountKeyring::{Alice, Bob};
|
|
|
|
#[test]
|
|
fn revalidation_queue_works() {
|
|
let api = Arc::new(TestApi::default());
|
|
let pool = Arc::new(Pool::new(Default::default(), true.into(), api.clone()));
|
|
let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
|
|
|
|
let uxt = uxt(Transfer {
|
|
from: Alice.into(),
|
|
to: AccountId::from_h256(H256::from_low_u64_be(2)),
|
|
amount: 5,
|
|
nonce: 0,
|
|
});
|
|
|
|
let hash_of_block0 = api.expect_hash_from_number(0);
|
|
|
|
let uxt_hash =
|
|
block_on(pool.submit_one(hash_of_block0, TransactionSource::External, uxt.clone()))
|
|
.expect("Should be valid");
|
|
|
|
block_on(queue.revalidate_later(hash_of_block0, vec![uxt_hash]));
|
|
|
|
// revalidated in sync offload 2nd time
|
|
assert_eq!(api.validation_requests().len(), 2);
|
|
// number of ready
|
|
assert_eq!(pool.validated_pool().status().ready, 1);
|
|
}
|
|
|
|
#[test]
|
|
fn revalidation_queue_skips_revalidation_for_unknown_block_hash() {
|
|
let api = Arc::new(TestApi::default());
|
|
let pool = Arc::new(Pool::new(Default::default(), true.into(), api.clone()));
|
|
let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
|
|
|
|
let uxt0 = uxt(Transfer {
|
|
from: Alice.into(),
|
|
to: AccountId::from_h256(H256::from_low_u64_be(2)),
|
|
amount: 5,
|
|
nonce: 0,
|
|
});
|
|
let uxt1 = uxt(Transfer {
|
|
from: Bob.into(),
|
|
to: AccountId::from_h256(H256::from_low_u64_be(2)),
|
|
amount: 4,
|
|
nonce: 1,
|
|
});
|
|
|
|
let hash_of_block0 = api.expect_hash_from_number(0);
|
|
let unknown_block = H256::repeat_byte(0x13);
|
|
|
|
let uxt_hashes =
|
|
block_on(pool.submit_at(hash_of_block0, TransactionSource::External, vec![uxt0, uxt1]))
|
|
.expect("Should be valid")
|
|
.into_iter()
|
|
.map(|r| r.expect("Should be valid"))
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(api.validation_requests().len(), 2);
|
|
assert_eq!(pool.validated_pool().status().ready, 2);
|
|
|
|
// revalidation works fine for block 0:
|
|
block_on(queue.revalidate_later(hash_of_block0, uxt_hashes.clone()));
|
|
assert_eq!(api.validation_requests().len(), 4);
|
|
assert_eq!(pool.validated_pool().status().ready, 2);
|
|
|
|
// revalidation shall be skipped for unknown block:
|
|
block_on(queue.revalidate_later(unknown_block, uxt_hashes));
|
|
// no revalidation shall be done
|
|
assert_eq!(api.validation_requests().len(), 4);
|
|
// number of ready shall not change
|
|
assert_eq!(pool.validated_pool().status().ready, 2);
|
|
}
|
|
}
|