pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 07:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Companion #13615] Keystore overhaul (#2336)

Browse Source 
* Align to Substrate keystore overhaul

* 'sync_keystore' renamed to 'keystore'

* Further fixes after removal of async keystore trait

* update lockfile for {"polkadot", "substrate"}

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Davide Galassi
2023-03-17 13:50:38 +01:00
committed by GitHub
parent 0aa857aca2
commit 37329f8dd7
6 changed files with 280 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+256 -257
View File
File diff suppressed because it is too large Load Diff
cumulus/client/consensus/aura/src/lib.rs
+2 -2
View File
@@ -40,7 +40,7 @@ use sp_consensus::{EnableProofRecording, Environment, ProofRecording, Proposer,
use sp_consensus_aura::{AuraApi, SlotDuration}; use sp_consensus_aura::{AuraApi, SlotDuration};
use sp_core::crypto::Pair; use sp_core::crypto::Pair;
use sp_inherents::CreateInherentDataProviders; use sp_inherents::CreateInherentDataProviders;
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::KeystorePtr;
use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Member, NumberFor}; use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Member, NumberFor};
use std::{convert::TryFrom, hash::Hash, marker::PhantomData, sync::Arc}; use std::{convert::TryFrom, hash::Hash, marker::PhantomData, sync::Arc};
@@ -79,7 +79,7 @@ pub struct BuildAuraConsensusParams<PF, BI, CIDP, Client, BS, SO> {
pub para_client: Arc<Client>, pub para_client: Arc<Client>,
pub backoff_authoring_blocks: Option<BS>, pub backoff_authoring_blocks: Option<BS>,
pub sync_oracle: SO, pub sync_oracle: SO,
pub keystore: SyncCryptoStorePtr, pub keystore: KeystorePtr,
pub force_authoring: bool, pub force_authoring: bool,
pub slot_duration: SlotDuration, pub slot_duration: SlotDuration,
pub telemetry: Option<TelemetryHandle>, pub telemetry: Option<TelemetryHandle>,
cumulus/client/network/src/tests.rs
+7 -8
View File
@@ -38,7 +38,7 @@ use sp_blockchain::HeaderBackend;
use sp_consensus::BlockOrigin; use sp_consensus::BlockOrigin;
use sp_core::{Pair, H256}; use sp_core::{Pair, H256};
use sp_keyring::Sr25519Keyring; use sp_keyring::Sr25519Keyring;
use sp_keystore::{testing::KeyStore, SyncCryptoStore, SyncCryptoStorePtr}; use sp_keystore::{testing::MemoryKeystore, Keystore, KeystorePtr};
use sp_runtime::RuntimeAppPublic; use sp_runtime::RuntimeAppPublic;
use sp_state_machine::StorageValue; use sp_state_machine::StorageValue;
use std::{collections::BTreeMap, time::Duration}; use std::{collections::BTreeMap, time::Duration};
@@ -273,8 +273,8 @@ async fn make_gossip_message_and_header(
relay_parent: H256, relay_parent: H256,
validator_index: u32, validator_index: u32,
) -> (CollationSecondedSignal, Header) { ) -> (CollationSecondedSignal, Header) {
let keystore: SyncCryptoStorePtr = Arc::new(KeyStore::new()); let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
let alice_public = SyncCryptoStore::sr25519_generate_new( let alice_public = Keystore::sr25519_generate_new(
&*keystore, &*keystore,
ValidatorId::ID, ValidatorId::ID,
Some(&Sr25519Keyring::Alice.to_seed()), Some(&Sr25519Keyring::Alice.to_seed()),
@@ -309,7 +309,6 @@ async fn make_gossip_message_and_header(
validator_index.into(), validator_index.into(),
&alice_public.into(), &alice_public.into(),
) )
.await
.ok() .ok()
.flatten() .flatten()
.expect("Signing statement"); .expect("Signing statement");
@@ -454,8 +453,8 @@ async fn check_statement_seconded() {
let header = default_header(); let header = default_header();
let relay_parent = H256::from_low_u64_be(1); let relay_parent = H256::from_low_u64_be(1);
let keystore: SyncCryptoStorePtr = Arc::new(KeyStore::new()); let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
let alice_public = SyncCryptoStore::sr25519_generate_new( let alice_public = Keystore::sr25519_generate_new(
&*keystore, &*keystore,
ValidatorId::ID, ValidatorId::ID,
Some(&Sr25519Keyring::Alice.to_seed()), Some(&Sr25519Keyring::Alice.to_seed()),
@@ -466,13 +465,13 @@ async fn check_statement_seconded() {
let statement = Statement::Valid(Default::default()); let statement = Statement::Valid(Default::default());
let signed_statement = block_on(SignedFullStatement::sign( let signed_statement = SignedFullStatement::sign(
&keystore, &keystore,
statement, statement,
&signing_context, &signing_context,
0.into(), 0.into(),
&alice_public.into(), &alice_public.into(),
)) )
.ok() .ok()
.flatten() .flatten()
.expect("Signs statement"); .expect("Signs statement");
cumulus/parachain-template/node/src/service.rs
+4 -4
View File
@@ -27,7 +27,7 @@ use sc_network::NetworkBlock;
use sc_network_sync::SyncingService; use sc_network_sync::SyncingService;
use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager}; use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::KeystorePtr;
use substrate_prometheus_endpoint::Registry; use substrate_prometheus_endpoint::Registry;
/// Native executor type. /// Native executor type.
@@ -212,7 +212,7 @@ async fn start_node_impl(
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager, task_manager: &mut task_manager,
config: parachain_config, config: parachain_config,
keystore: params.keystore_container.sync_keystore(), keystore: params.keystore_container.keystore(),
backend, backend,
network: network.clone(), network: network.clone(),
sync_service: sync_service.clone(), sync_service: sync_service.clone(),
@@ -263,7 +263,7 @@ async fn start_node_impl(
relay_chain_interface.clone(), relay_chain_interface.clone(),
transaction_pool, transaction_pool,
sync_service, sync_service,
params.keystore_container.sync_keystore(), params.keystore_container.keystore(),
force_authoring, force_authoring,
para_id, para_id,
)?; )?;
@@ -352,7 +352,7 @@ fn build_consensus(
relay_chain_interface: Arc<dyn RelayChainInterface>, relay_chain_interface: Arc<dyn RelayChainInterface>,
transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient>>, transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient>>,
sync_oracle: Arc<SyncingService<Block>>, sync_oracle: Arc<SyncingService<Block>>,
keystore: SyncCryptoStorePtr, keystore: KeystorePtr,
force_authoring: bool, force_authoring: bool,
para_id: ParaId, para_id: ParaId,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error> { ) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error> {
cumulus/polkadot-parachain/src/service.rs
+10 -10
View File
@@ -49,7 +49,7 @@ use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, Ta
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::{ApiExt, ConstructRuntimeApi}; use sp_api::{ApiExt, ConstructRuntimeApi};
use sp_consensus_aura::AuraApi; use sp_consensus_aura::AuraApi;
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::KeystorePtr;
use sp_runtime::{ use sp_runtime::{
app_crypto::AppKey, app_crypto::AppKey,
traits::{BlakeTwo256, Header as HeaderT}, traits::{BlakeTwo256, Header as HeaderT},
@@ -359,7 +359,7 @@ where
Arc<dyn RelayChainInterface>, Arc<dyn RelayChainInterface>,
Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>, Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
Arc<SyncingService<Block>>, Arc<SyncingService<Block>>,
SyncCryptoStorePtr, KeystorePtr,
bool, bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>, ) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{ {
@@ -411,7 +411,7 @@ where
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager, task_manager: &mut task_manager,
config: parachain_config, config: parachain_config,
keystore: params.keystore_container.sync_keystore(), keystore: params.keystore_container.keystore(),
backend: backend.clone(), backend: backend.clone(),
network: network.clone(), network: network.clone(),
sync_service: sync_service.clone(), sync_service: sync_service.clone(),
@@ -457,7 +457,7 @@ where
relay_chain_interface.clone(), relay_chain_interface.clone(),
transaction_pool, transaction_pool,
sync_service, sync_service,
params.keystore_container.sync_keystore(), params.keystore_container.keystore(),
force_authoring, force_authoring,
)?; )?;
@@ -547,7 +547,7 @@ where
Arc<dyn RelayChainInterface>, Arc<dyn RelayChainInterface>,
Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>, Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
Arc<SyncingService<Block>>, Arc<SyncingService<Block>>,
SyncCryptoStorePtr, KeystorePtr,
bool, bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>, ) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{ {
@@ -611,7 +611,7 @@ where
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager, task_manager: &mut task_manager,
config: parachain_config, config: parachain_config,
keystore: params.keystore_container.sync_keystore(), keystore: params.keystore_container.keystore(),
backend: backend.clone(), backend: backend.clone(),
network: network.clone(), network: network.clone(),
sync_service: sync_service.clone(), sync_service: sync_service.clone(),
@@ -656,7 +656,7 @@ where
relay_chain_interface.clone(), relay_chain_interface.clone(),
transaction_pool, transaction_pool,
sync_service, sync_service,
params.keystore_container.sync_keystore(), params.keystore_container.keystore(),
force_authoring, force_authoring,
)?; )?;
@@ -1317,7 +1317,7 @@ where
Arc<dyn RelayChainInterface>, Arc<dyn RelayChainInterface>,
Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>, Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
Arc<SyncingService<Block>>, Arc<SyncingService<Block>>,
SyncCryptoStorePtr, KeystorePtr,
bool, bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>, ) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{ {
@@ -1380,7 +1380,7 @@ where
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager, task_manager: &mut task_manager,
config: parachain_config, config: parachain_config,
keystore: params.keystore_container.sync_keystore(), keystore: params.keystore_container.keystore(),
backend: backend.clone(), backend: backend.clone(),
network: network.clone(), network: network.clone(),
sync_service: sync_service.clone(), sync_service: sync_service.clone(),
@@ -1425,7 +1425,7 @@ where
relay_chain_interface.clone(), relay_chain_interface.clone(),
transaction_pool, transaction_pool,
sync_service, sync_service,
params.keystore_container.sync_keystore(), params.keystore_container.keystore(),
force_authoring, force_authoring,
)?; )?;
cumulus/test/service/src/lib.rs
+1 -1
View File
@@ -339,7 +339,7 @@ where
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager, task_manager: &mut task_manager,
config: parachain_config, config: parachain_config,
keystore: params.keystore_container.sync_keystore(), keystore: params.keystore_container.keystore(),
backend: backend.clone(), backend: backend.clone(),
network: network.clone(), network: network.clone(),
sync_service: sync_service.clone(), sync_service: sync_service.clone(),