From 3331a02bd327eec23740eb39f57b012dbb6e26b6 Mon Sep 17 00:00:00 2001 From: Chevdor Date: Sat, 18 Dec 2021 13:17:27 +0100 Subject: [PATCH] Fix statemint ed25519 (#867) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use `ed25519` as key * Fix build * Fmt Co-authored-by: Bastian Köcher --- polkadot-parachains/parachains-common/src/lib.rs | 2 +- polkadot-parachains/src/chain_spec.rs | 10 +++++++--- polkadot-parachains/src/service.rs | 7 ++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/polkadot-parachains/parachains-common/src/lib.rs b/polkadot-parachains/parachains-common/src/lib.rs index 23f90e55e5..42dd954353 100644 --- a/polkadot-parachains/parachains-common/src/lib.rs +++ b/polkadot-parachains/parachains-common/src/lib.rs @@ -50,7 +50,7 @@ mod types { pub type DigestItem = sp_runtime::generic::DigestItem; // Aura consensus authority. - pub type AuraId = sp_consensus_aura::sr25519::AuthorityId; + pub type AuraId = sp_consensus_aura::ed25519::AuthorityId; // Id used for identifying assets. pub type AssetId = u32; diff --git a/polkadot-parachains/src/chain_spec.rs b/polkadot-parachains/src/chain_spec.rs index f977044e45..35bbfe6197 100644 --- a/polkadot-parachains/src/chain_spec.rs +++ b/polkadot-parachains/src/chain_spec.rs @@ -16,7 +16,8 @@ use cumulus_primitives_core::ParaId; use hex_literal::hex; -use rococo_parachain_runtime::{AccountId, AuraId, Signature}; +use parachains_common::AuraId; +use rococo_parachain_runtime::{AccountId, Signature}; use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup}; use sc_service::ChainType; use serde::{Deserialize, Serialize}; @@ -75,7 +76,10 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec { move || { testnet_genesis( get_account_id_from_seed::("Alice"), - vec![get_from_seed::("Alice"), get_from_seed::("Bob")], + vec![ + get_from_seed::("Alice"), + get_from_seed::("Bob"), + ], vec![ get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), @@ -147,7 +151,7 @@ pub fn staging_test_net(id: ParaId) -> ChainSpec { fn testnet_genesis( root_key: AccountId, - initial_authorities: Vec, + initial_authorities: Vec, endowed_accounts: Vec, id: ParaId, ) -> rococo_parachain_runtime::GenesisConfig { diff --git a/polkadot-parachains/src/service.rs b/polkadot-parachains/src/service.rs index a896cad242..b0fbd00900 100644 --- a/polkadot-parachains/src/service.rs +++ b/polkadot-parachains/src/service.rs @@ -34,6 +34,7 @@ pub use parachains_common::{AccountId, Balance, Block, Hash, Header, Index as No use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier; use futures::lock::Mutex; +use parachains_common::AuraId; use sc_client_api::ExecutorProvider; use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, @@ -45,7 +46,7 @@ use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClie use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::{ApiExt, ConstructRuntimeApi}; use sp_consensus::{CacheKeyId, SlotData}; -use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; +use sp_consensus_aura::AuraApi; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::{ generic::BlockId, @@ -996,7 +997,7 @@ where let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client2).unwrap(); Box::new(cumulus_client_consensus_aura::build_verifier::< - sp_consensus_aura::sr25519::AuthorityPair, + sp_consensus_aura::ed25519::AuthorityPair, _, _, _, @@ -1109,7 +1110,7 @@ where let relay_chain_client2 = relay_chain_client.clone(); build_aura_consensus::< - sp_consensus_aura::sr25519::AuthorityPair, + sp_consensus_aura::ed25519::AuthorityPair, _, _, _,