mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 18:01:03 +00:00
BlockId removal: runtime-api refactor (#13255)
* BlockId removal: refactor of runtime API It changes the arguments of: - `ApiExt` methods: `has_api`, `has_api_with`, `api_version` - `CallApiAt` method: `runtime_version_at` from: `BlockId<Block>` to: `Block::Hash` It also changes the first argument of all generated runtime API calls from: `BlockId<Block>` to: `Block::Hash` This PR is part of BlockId::Number refactoring analysis (paritytech/substrate#11292) * BlockId removal: refactor of runtime API - tests - tests adjusted to new runtime API, - some tests migrated from block number to block hash * benchmarking-cli: BlockId(0) migrated to info().genesis_hash `runtime_api.call()` now requires the block hash instead of BlockId::Number. To access the genesis hash widely used in benchmarking engine the Client was constrained to satisfy `sp_blockchain::HeaderBackend<Block>` trait which provides `info().genesis_hash`. * trivial: api.call(BlockId) -> api.call(Hash) - Migrated all `runtime_api.calls` to use Hash - Noteworthy (?): -- `validate_transaction_blocking` in transaction pool, * CallApiAtParams::at changed to Block::Hash * missed doc updated * Apply suggestions from code review Co-authored-by: Bastian Köcher <git@kchr.de> * ".git/.scripts/commands/fmt/fmt.sh" * BlockId removal: Benchmark::consumed_weight Little refactor around `Benchmark::consumed_weight`: `BlockId` removed. * at_hash renamed * wrong merge fixed * beefy worker: merged with master * beefy: tests: missing block problem fixed * Apply review suggestion * fix --------- Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: command-bot <>
This commit is contained in:
committed by
GitHub
parent
ac13aaeb2f
commit
7a10154188
@@ -52,10 +52,7 @@ use sp_blockchain::{
|
||||
use sp_consensus::{Error as ConsensusError, SyncOracle};
|
||||
use sp_keystore::SyncCryptoStorePtr;
|
||||
use sp_mmr_primitives::MmrApi;
|
||||
use sp_runtime::{
|
||||
generic::BlockId,
|
||||
traits::{Block, Zero},
|
||||
};
|
||||
use sp_runtime::traits::{Block, Zero};
|
||||
use std::{collections::VecDeque, marker::PhantomData, sync::Arc};
|
||||
|
||||
mod aux_schema;
|
||||
@@ -345,7 +342,7 @@ where
|
||||
{
|
||||
let beefy_genesis = runtime
|
||||
.runtime_api()
|
||||
.beefy_genesis(&BlockId::hash(best_grandpa.hash()))
|
||||
.beefy_genesis(best_grandpa.hash())
|
||||
.ok()
|
||||
.flatten()
|
||||
.ok_or_else(|| ClientError::Backend("BEEFY pallet expected to be active.".into()))?;
|
||||
@@ -369,7 +366,7 @@ where
|
||||
let best_beefy = *header.number();
|
||||
// If no session boundaries detected so far, just initialize new rounds here.
|
||||
if sessions.is_empty() {
|
||||
let active_set = expect_validator_set(runtime, BlockId::hash(header.hash()))?;
|
||||
let active_set = expect_validator_set(runtime, header.hash())?;
|
||||
let mut rounds = Rounds::new(best_beefy, active_set);
|
||||
// Mark the round as already finalized.
|
||||
rounds.conclude(best_beefy);
|
||||
@@ -383,8 +380,8 @@ where
|
||||
|
||||
if *header.number() == beefy_genesis {
|
||||
// We've reached BEEFY genesis, initialize voter here.
|
||||
let genesis_set = expect_validator_set(runtime, BlockId::hash(header.hash()))
|
||||
.and_then(genesis_set_sanity_check)?;
|
||||
let genesis_set =
|
||||
expect_validator_set(runtime, header.hash()).and_then(genesis_set_sanity_check)?;
|
||||
info!(
|
||||
target: LOG_TARGET,
|
||||
"🥩 Loading BEEFY voter state from genesis on what appears to be first startup. \
|
||||
@@ -409,16 +406,11 @@ where
|
||||
|
||||
// Check if state is still available if we move up the chain.
|
||||
let parent_hash = *header.parent_hash();
|
||||
runtime
|
||||
.runtime_api()
|
||||
.validator_set(&BlockId::hash(parent_hash))
|
||||
.ok()
|
||||
.flatten()
|
||||
.ok_or_else(|| {
|
||||
let msg = format!("{}. Could not initialize BEEFY voter.", parent_hash);
|
||||
error!(target: LOG_TARGET, "🥩 {}", msg);
|
||||
ClientError::Consensus(sp_consensus::Error::StateUnavailable(msg))
|
||||
})?;
|
||||
runtime.runtime_api().validator_set(parent_hash).ok().flatten().ok_or_else(|| {
|
||||
let msg = format!("{}. Could not initialize BEEFY voter.", parent_hash);
|
||||
error!(target: LOG_TARGET, "🥩 {}", msg);
|
||||
ClientError::Consensus(sp_consensus::Error::StateUnavailable(msg))
|
||||
})?;
|
||||
|
||||
// Move up the chain.
|
||||
header = blockchain.expect_header(parent_hash)?;
|
||||
@@ -449,8 +441,8 @@ where
|
||||
Some(notif) => notif,
|
||||
None => break
|
||||
};
|
||||
let at = BlockId::hash(notif.header.hash());
|
||||
if let Some(start) = runtime.runtime_api().beefy_genesis(&at).ok().flatten() {
|
||||
let at = notif.header.hash();
|
||||
if let Some(start) = runtime.runtime_api().beefy_genesis(at).ok().flatten() {
|
||||
if *notif.header.number() >= start {
|
||||
// Beefy pallet available, return header for best grandpa at the time.
|
||||
info!(
|
||||
@@ -485,7 +477,7 @@ fn genesis_set_sanity_check(
|
||||
|
||||
fn expect_validator_set<B, R>(
|
||||
runtime: &R,
|
||||
at: BlockId<B>,
|
||||
at_hash: B::Hash,
|
||||
) -> ClientResult<ValidatorSet<AuthorityId>>
|
||||
where
|
||||
B: Block,
|
||||
@@ -494,7 +486,7 @@ where
|
||||
{
|
||||
runtime
|
||||
.runtime_api()
|
||||
.validator_set(&at)
|
||||
.validator_set(at_hash)
|
||||
.ok()
|
||||
.flatten()
|
||||
.ok_or_else(|| ClientError::Backend("BEEFY pallet expected to be active.".into()))
|
||||
|
||||
Reference in New Issue
Block a user