,
pub pool: Arc,
- pub deny_unsafe: DenyUnsafe,
}
pub fn create_full(deps: FullDeps) -> Result>
@@ -57,13 +55,9 @@ where
use substrate_frame_rpc_system::{System, SystemApiServer};
let mut module = RpcExtension::new(());
- let FullDeps {
- client,
- pool,
- deny_unsafe,
- } = deps;
+ let FullDeps { client, pool } = deps;
- module.merge(System::new(Arc::clone(&client), pool, deny_unsafe).into_rpc())?;
+ module.merge(System::new(Arc::clone(&client), pool).into_rpc())?;
module.merge(TransactionPayment::new(client).into_rpc())?;
Ok(module)
}
diff --git a/dip-template/nodes/dip-consumer/src/service.rs b/dip-template/nodes/dip-consumer/src/service.rs
index fe834b0221..8e58152070 100644
--- a/dip-template/nodes/dip-consumer/src/service.rs
+++ b/dip-template/nodes/dip-consumer/src/service.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use std::{sync::Arc, time::Duration};
@@ -37,6 +37,7 @@ use frame_benchmarking::benchmarking::HostFunctions;
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
use sc_client_api::Backend;
use sc_consensus::{DefaultImportQueue, ImportQueue};
+#[allow(deprecated)]
use sc_executor::NativeElseWasmExecutor;
use sc_network::NetworkBlock;
use sc_network_sync::SyncingService;
@@ -67,6 +68,7 @@ impl sc_executor::NativeExecutionDispatch for ParachainNativeExecutor {
}
}
+#[allow(deprecated)]
type ParachainExecutor = NativeElseWasmExecutor;
type ParachainClient = TFullClient;
type ParachainBackend = TFullBackend;
@@ -97,6 +99,7 @@ pub fn new_partial(
})
.transpose()?;
+ #[allow(deprecated)]
let executor = sc_service::new_native_or_wasm_executor(config);
let (client, backend, keystore_container, task_manager) = new_full_parts::(
@@ -175,7 +178,10 @@ async fn start_node_impl(
let prometheus_registry = parachain_config.prometheus_registry().cloned();
let transaction_pool = Arc::clone(¶ms.transaction_pool);
let import_queue_service = params.import_queue.service();
- let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network);
+ let net_config = sc_network::config::FullNetworkConfiguration::<_, _, sc_network::NetworkWorker>::new(
+ ¶chain_config.network,
+ prometheus_registry.clone(),
+ );
let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
build_network(BuildNetworkParams {
@@ -194,22 +200,23 @@ async fn start_node_impl(
if parachain_config.offchain_worker.enabled {
use futures::FutureExt;
+ let offchain_workers = sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+ runtime_api_provider: Arc::clone(&client),
+ keystore: Some(params.keystore_container.keystore()),
+ offchain_db: backend.offchain_storage(),
+ transaction_pool: Some(OffchainTransactionPoolFactory::new(Arc::clone(&transaction_pool))),
+ network_provider: Arc::new(Arc::clone(&network)),
+ is_validator: parachain_config.role.is_authority(),
+ enable_http_requests: false,
+ custom_extensions: move |_| vec![],
+ });
+
task_manager.spawn_handle().spawn(
"offchain-workers-runner",
"offchain-work",
- sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
- runtime_api_provider: Arc::clone(&client),
- keystore: Some(params.keystore_container.keystore()),
- offchain_db: backend.offchain_storage(),
- transaction_pool: Some(OffchainTransactionPoolFactory::new(Arc::clone(&transaction_pool))),
- #[allow(clippy::clone_on_ref_ptr)]
- network_provider: network.clone(),
- is_validator: parachain_config.role.is_authority(),
- enable_http_requests: false,
- custom_extensions: move |_| vec![],
- })
- .run(Arc::clone(&client), task_manager.spawn_handle())
- .boxed(),
+ offchain_workers
+ .run(Arc::clone(&client), task_manager.spawn_handle())
+ .boxed(),
);
}
@@ -217,11 +224,10 @@ async fn start_node_impl(
let client = Arc::clone(&client);
let transaction_pool = Arc::clone(&transaction_pool);
- Box::new(move |deny_unsafe, _| {
+ Box::new(move |_| {
let deps = FullDeps {
client: Arc::clone(&client),
pool: Arc::clone(&transaction_pool),
- deny_unsafe,
};
create_full(deps).map_err(Into::into)
@@ -245,7 +251,7 @@ async fn start_node_impl(
if let Some(hwbench) = hwbench {
print_hwbench(&hwbench);
- match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+ match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, false) {
Err(err) if validator => {
log::warn!(
"⚠️ The hardware does not meet the minimal requirements {} for role 'Authority'.",
@@ -357,7 +363,7 @@ fn start_consensus(
task_manager: &TaskManager,
relay_chain_interface: Arc,
transaction_pool: Arc>,
- sync_oracle: Arc>,
+ _sync_oracle: Arc>,
keystore: KeystorePtr,
relay_chain_slot_duration: Duration,
para_id: ParaId,
@@ -367,8 +373,6 @@ fn start_consensus(
) -> Result<(), sc_service::Error> {
use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams};
- let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
task_manager.spawn_handle(),
Arc::clone(&client),
@@ -393,12 +397,10 @@ fn start_consensus(
para_backend: backend,
relay_client: relay_chain_interface,
code_hash_provider: move |block_hash| client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash()),
- sync_oracle,
keystore,
collator_key,
para_id,
overseer_handle,
- slot_duration,
relay_chain_slot_duration,
proposer,
collator_service,
@@ -406,7 +408,7 @@ fn start_consensus(
reinitialize: false,
};
- let fut = aura::run::(params);
+ let fut = aura::run::(params);
task_manager.spawn_essential_handle().spawn("aura", None, fut);
Ok(())
diff --git a/dip-template/nodes/dip-provider/build.rs b/dip-template/nodes/dip-provider/build.rs
index f672256b2e..3bf56b537e 100644
--- a/dip-template/nodes/dip-provider/build.rs
+++ b/dip-template/nodes/dip-provider/build.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
diff --git a/dip-template/nodes/dip-provider/src/chain_spec.rs b/dip-template/nodes/dip-provider/src/chain_spec.rs
index 0488275198..685f146cba 100644
--- a/dip-template/nodes/dip-provider/src/chain_spec.rs
+++ b/dip-template/nodes/dip-provider/src/chain_spec.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
// Triggered by the `ChainSpecGroup` derive macro used for the custom chainspec
// extension.
@@ -34,7 +34,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
const PARA_ID: u32 = 2_000;
-pub type ChainSpec = GenericChainSpec;
+pub type ChainSpec = GenericChainSpec;
type AccountPublic = ::Signer;
pub(crate) fn get_from_seed(seed: &str) -> ::Public {
@@ -97,6 +97,7 @@ fn testnet_genesis(
.into_iter()
.map(|(acc, aura)| (acc.clone(), acc, template_session_keys(aura)))
.collect(),
+ ..Default::default()
},
..Default::default()
}
diff --git a/dip-template/nodes/dip-provider/src/cli.rs b/dip-template/nodes/dip-provider/src/cli.rs
index 7f8ec35ee1..3459b4bd0c 100644
--- a/dip-template/nodes/dip-provider/src/cli.rs
+++ b/dip-template/nodes/dip-provider/src/cli.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use std::path::PathBuf;
@@ -79,7 +79,10 @@ pub struct RelayChainCli {
}
impl RelayChainCli {
- pub fn new<'a>(para_config: &Configuration, relay_chain_args: impl Iterator- ) -> Self {
+ pub fn new<'a, I>(para_config: &Configuration, relay_chain_args: I) -> Self
+ where
+ I: Iterator
- ,
+ {
let extension = Extensions::try_get(&*para_config.chain_spec);
let chain_id = extension.map(|e| e.relay_chain.clone());
let base_path = Some(para_config.base_path.path().join("polkadot"));
diff --git a/dip-template/nodes/dip-provider/src/command.rs b/dip-template/nodes/dip-provider/src/command.rs
index 4b2990f0bd..9ba442716d 100644
--- a/dip-template/nodes/dip-provider/src/command.rs
+++ b/dip-template/nodes/dip-provider/src/command.rs
@@ -14,21 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
-use std::{fs::create_dir_all, iter::once, net::SocketAddr};
+use std::{fs::create_dir_all, iter::once};
use cumulus_primitives_core::ParaId;
use dip_provider_runtime_template::Block;
use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
use log::info;
use sc_cli::{
- ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, LoggerBuilder,
- NetworkParams, Result, SharedParams, SubstrateCli,
+ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result,
+ SharedParams, SubstrateCli,
};
use sc_service::{
config::{BasePath, PrometheusConfig},
- Configuration, Role, RpcMethods, TransactionPoolOptions,
+ Role, RpcMethods, TransactionPoolOptions,
};
use sc_sysinfo::gather_hwbench;
use sc_telemetry::TelemetryEndpoints;
@@ -196,7 +196,9 @@ pub fn run() -> Result<()> {
match cmd {
BenchmarkCmd::Pallet(cmd) => {
if cfg!(feature = "runtime-benchmarks") {
- runner.sync_run(|config| cmd.run::(config))
+ runner.sync_run(|config| {
+ cmd.run_with_spec::, ()>(Some(config.chain_spec))
+ })
} else {
Err("Benchmarking wasn't enabled when building the node. \
You can enable it with `--features runtime-benchmarks`."
@@ -235,7 +237,7 @@ pub fn run() -> Result<()> {
let hwbench = (!cli.no_hardware_benchmarks)
.then_some(config.database.path().map(|database_path| {
let _ = create_dir_all(database_path);
- gather_hwbench(Some(database_path))
+ gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
}))
.flatten();
@@ -310,7 +312,7 @@ impl CliConfiguration for RelayChainCli {
.or_else(|| self.base_path.clone().map(Into::into)))
}
- fn rpc_addr(&self, default_listen_port: u16) -> Result> {
+ fn rpc_addr(&self, default_listen_port: u16) -> Result>> {
self.base.base.rpc_addr(default_listen_port)
}
@@ -322,16 +324,7 @@ impl CliConfiguration for RelayChainCli {
self.base.base.prometheus_config(default_listen_port, chain_spec)
}
- fn init(
- &self,
- _support_url: &String,
- _impl_version: &String,
- _logger_hook: F,
- _config: &Configuration,
- ) -> Result<()>
- where
- F: FnOnce(&mut LoggerBuilder, &Configuration),
- {
+ fn init(&self, _support_url: &String, _impl_version: &String, _logger_hook: F) -> Result<()> {
unreachable!("PolkadotCli is never initialized; qed");
}
diff --git a/dip-template/nodes/dip-provider/src/main.rs b/dip-template/nodes/dip-provider/src/main.rs
index 6987d4bacc..b784bdd2c6 100644
--- a/dip-template/nodes/dip-provider/src/main.rs
+++ b/dip-template/nodes/dip-provider/src/main.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! KILT Decentralized Identity Provider (DIP) Provider CLI.
diff --git a/dip-template/nodes/dip-provider/src/rpc.rs b/dip-template/nodes/dip-provider/src/rpc.rs
index 769a0fc3ed..7c6b825dc3 100644
--- a/dip-template/nodes/dip-provider/src/rpc.rs
+++ b/dip-template/nodes/dip-provider/src/rpc.rs
@@ -14,11 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
#![warn(missing_docs)]
-pub use sc_rpc_api::DenyUnsafe;
use substrate_frame_rpc_system::AccountNonceApi;
use std::{error::Error, sync::Arc};
@@ -37,7 +36,6 @@ pub type RpcExtension = RpcModule<()>;
pub struct FullDeps {
pub client: Arc,
pub pool: Arc
,
- pub deny_unsafe: DenyUnsafe,
}
pub fn create_full(deps: FullDeps) -> Result>
@@ -57,13 +55,9 @@ where
use substrate_frame_rpc_system::{System, SystemApiServer};
let mut module = RpcExtension::new(());
- let FullDeps {
- client,
- pool,
- deny_unsafe,
- } = deps;
+ let FullDeps { client, pool } = deps;
- module.merge(System::new(Arc::clone(&client), pool, deny_unsafe).into_rpc())?;
+ module.merge(System::new(Arc::clone(&client), pool).into_rpc())?;
module.merge(TransactionPayment::new(client).into_rpc())?;
Ok(module)
}
diff --git a/dip-template/nodes/dip-provider/src/service.rs b/dip-template/nodes/dip-provider/src/service.rs
index 79ae7af14f..7b9731af43 100644
--- a/dip-template/nodes/dip-provider/src/service.rs
+++ b/dip-template/nodes/dip-provider/src/service.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use std::{sync::Arc, time::Duration};
@@ -37,6 +37,7 @@ use frame_benchmarking::benchmarking::HostFunctions;
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
use sc_client_api::Backend;
use sc_consensus::{DefaultImportQueue, ImportQueue};
+#[allow(deprecated)]
use sc_executor::NativeElseWasmExecutor;
use sc_network::NetworkBlock;
use sc_network_sync::SyncingService;
@@ -67,6 +68,7 @@ impl sc_executor::NativeExecutionDispatch for ParachainNativeExecutor {
}
}
+#[allow(deprecated)]
type ParachainExecutor = NativeElseWasmExecutor;
type ParachainClient = TFullClient;
type ParachainBackend = TFullBackend;
@@ -97,6 +99,7 @@ pub fn new_partial(
})
.transpose()?;
+ #[allow(deprecated)]
let executor = sc_service::new_native_or_wasm_executor(config);
let (client, backend, keystore_container, task_manager) = new_full_parts::(
@@ -175,7 +178,10 @@ async fn start_node_impl(
let prometheus_registry = parachain_config.prometheus_registry().cloned();
let transaction_pool = Arc::clone(¶ms.transaction_pool);
let import_queue_service = params.import_queue.service();
- let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network);
+ let net_config = sc_network::config::FullNetworkConfiguration::<_, _, sc_network::NetworkWorker>::new(
+ ¶chain_config.network,
+ prometheus_registry.clone(),
+ );
let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
build_network(BuildNetworkParams {
@@ -194,22 +200,23 @@ async fn start_node_impl(
if parachain_config.offchain_worker.enabled {
use futures::FutureExt;
+ let offchain_workers = sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+ runtime_api_provider: Arc::clone(&client),
+ keystore: Some(params.keystore_container.keystore()),
+ offchain_db: backend.offchain_storage(),
+ transaction_pool: Some(OffchainTransactionPoolFactory::new(Arc::clone(&transaction_pool))),
+ network_provider: Arc::new(Arc::clone(&network)),
+ is_validator: parachain_config.role.is_authority(),
+ enable_http_requests: false,
+ custom_extensions: move |_| vec![],
+ });
+
task_manager.spawn_handle().spawn(
"offchain-workers-runner",
"offchain-work",
- sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
- runtime_api_provider: Arc::clone(&client),
- keystore: Some(params.keystore_container.keystore()),
- offchain_db: backend.offchain_storage(),
- transaction_pool: Some(OffchainTransactionPoolFactory::new(Arc::clone(&transaction_pool))),
- #[allow(clippy::clone_on_ref_ptr)]
- network_provider: network.clone(),
- is_validator: parachain_config.role.is_authority(),
- enable_http_requests: false,
- custom_extensions: move |_| vec![],
- })
- .run(Arc::clone(&client), task_manager.spawn_handle())
- .boxed(),
+ offchain_workers
+ .run(Arc::clone(&client), task_manager.spawn_handle())
+ .boxed(),
);
}
@@ -217,11 +224,10 @@ async fn start_node_impl(
let client = Arc::clone(&client);
let transaction_pool = Arc::clone(&transaction_pool);
- Box::new(move |deny_unsafe, _| {
+ Box::new(move |_| {
let deps = FullDeps {
client: Arc::clone(&client),
pool: Arc::clone(&transaction_pool),
- deny_unsafe,
};
create_full(deps).map_err(Into::into)
@@ -245,7 +251,7 @@ async fn start_node_impl(
if let Some(hwbench) = hwbench {
print_hwbench(&hwbench);
- match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+ match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, false) {
Err(err) if validator => {
log::warn!(
"⚠️ The hardware does not meet the minimal requirements {} for role 'Authority'.",
@@ -357,7 +363,7 @@ fn start_consensus(
task_manager: &TaskManager,
relay_chain_interface: Arc,
transaction_pool: Arc>,
- sync_oracle: Arc>,
+ _sync_oracle: Arc>,
keystore: KeystorePtr,
relay_chain_slot_duration: Duration,
para_id: ParaId,
@@ -367,8 +373,6 @@ fn start_consensus(
) -> Result<(), sc_service::Error> {
use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams};
- let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
task_manager.spawn_handle(),
Arc::clone(&client),
@@ -393,12 +397,10 @@ fn start_consensus(
para_backend: backend,
relay_client: relay_chain_interface,
code_hash_provider: move |block_hash| client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash()),
- sync_oracle,
keystore,
collator_key,
para_id,
overseer_handle,
- slot_duration,
relay_chain_slot_duration,
proposer,
collator_service,
@@ -406,7 +408,7 @@ fn start_consensus(
reinitialize: false,
};
- let fut = aura::run::(params);
+ let fut = aura::run::(params);
task_manager.spawn_essential_handle().spawn("aura", None, fut);
Ok(())
diff --git a/dip-template/pallets/pallet-postit/src/lib.rs b/dip-template/pallets/pallet-postit/src/lib.rs
index 549264c5ef..aa6705c8ed 100644
--- a/dip-template/pallets/pallet-postit/src/lib.rs
+++ b/dip-template/pallets/pallet-postit/src/lib.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
#![cfg_attr(not(feature = "std"), no_std)]
@@ -35,6 +35,8 @@ pub use pallet::*;
// very end of the development cycle of a pallet, and from time to time it should be commented out to catch any issues
// other than the one generated by the `pallet::event` macro.
#[allow(clippy::shadow_reuse)]
+// map_err is used over inspect_err in the macro-generated code, and we have to ignore it.
+#[allow(clippy::manual_inspect)]
pub mod pallet {
use super::*;
diff --git a/dip-template/pallets/pallet-postit/src/post.rs b/dip-template/pallets/pallet-postit/src/post.rs
index 9fb6d776af..772864973c 100644
--- a/dip-template/pallets/pallet-postit/src/post.rs
+++ b/dip-template/pallets/pallet-postit/src/post.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use frame_support::{traits::ConstU32, BoundedVec};
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
diff --git a/dip-template/pallets/pallet-postit/src/traits.rs b/dip-template/pallets/pallet-postit/src/traits.rs
index 31ef552e20..9f2732ecbf 100644
--- a/dip-template/pallets/pallet-postit/src/traits.rs
+++ b/dip-template/pallets/pallet-postit/src/traits.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
pub trait GetUsername {
type Username;
diff --git a/dip-template/runtimes/dip-consumer/Cargo.toml b/dip-template/runtimes/dip-consumer/Cargo.toml
index c474da6ecc..bd68b8f5c7 100644
--- a/dip-template/runtimes/dip-consumer/Cargo.toml
+++ b/dip-template/runtimes/dip-consumer/Cargo.toml
@@ -58,7 +58,7 @@ sp-weights = { workspace = true }
# Cumulus
cumulus-pallet-aura-ext = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-parachain-system = { workspace = true }
cumulus-primitives-aura = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
diff --git a/dip-template/runtimes/dip-consumer/build.rs b/dip-template/runtimes/dip-consumer/build.rs
index 9d730bd288..52e91453e1 100644
--- a/dip-template/runtimes/dip-consumer/build.rs
+++ b/dip-template/runtimes/dip-consumer/build.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use substrate_wasm_builder::WasmBuilder;
diff --git a/dip-template/runtimes/dip-consumer/src/dip.rs b/dip-template/runtimes/dip-consumer/src/dip.rs
index cb8ac66ca3..4d323836b2 100644
--- a/dip-template/runtimes/dip-consumer/src/dip.rs
+++ b/dip-template/runtimes/dip-consumer/src/dip.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use did::{DidVerificationKeyRelationship, KeyIdOf};
use dip_provider_runtime_template::{
@@ -189,7 +189,7 @@ mod get_worst_case_impl {
id: hex!("78e54fc7807f8c1cbd6e3dac9f3291096e7a2d8ab879934edb402f320a3d46a0").into(),
relationship: DidVerificationKeyRelationship::Authentication.into(),
details: DidPublicKeyDetails {
- key: DidVerificationKey::Sr25519(sr25519::Public(hex!(
+ key: DidVerificationKey::Sr25519(sr25519::Public::from_raw(hex!(
"e68a94309d0adee950b6a63a0a141a3166c15e8ef25c301531f75e25086fe05a"
)))
.into(),
@@ -405,7 +405,7 @@ mod get_worst_case_impl {
id: hex!("106e6b1fa2d0ac6b81387fce6eb985b760f70a43a6d8e0c3f9e78c8a9d9e548e").into(),
relationship: DidVerificationKeyRelationship::CapabilityDelegation.into(),
details: DidPublicKeyDetails {
- key: DidVerificationKey::Ed25519(ed25519::Public(hex!(
+ key: DidVerificationKey::Ed25519(ed25519::Public::from_raw(hex!(
"39985b639d8d21629190f2a310b0e2b935894a6261e45ba58f0fbf2bd6c0c832"
)))
.into(),
@@ -417,7 +417,7 @@ mod get_worst_case_impl {
id: hex!("5e14c0826d524d79a17cb5bc5fd61f9b2d364c9af73a5db87408f389e83afcdf").into(),
relationship: DidVerificationKeyRelationship::AssertionMethod.into(),
details: DidPublicKeyDetails {
- key: DidVerificationKey::Ed25519(ed25519::Public(hex!(
+ key: DidVerificationKey::Ed25519(ed25519::Public::from_raw(hex!(
"6c89991144954da6d916f88e59ce0c52bc2dcea2e7edd065e750234ebbb8d8eb"
)))
.into(),
@@ -482,7 +482,7 @@ mod get_worst_case_impl {
.into(),
],
);
- let signature = TimeBoundDidSignature::new(DidSignature::Sr25519(sr25519::Signature(hex!("1ca20d39357dba602862e6b6371887c6b1ec46c86ead3c92178cca814e3ff45f7fd6a58395d422b53b6e1d1ab7be5944dbc2c6e640ecfac67c02a218607cc881"))), 282 as BlockNumberFor);
+ let signature = TimeBoundDidSignature::new(DidSignature::Sr25519(sr25519::Signature::from_raw(hex!("1ca20d39357dba602862e6b6371887c6b1ec46c86ead3c92178cca814e3ff45f7fd6a58395d422b53b6e1d1ab7be5944dbc2c6e640ecfac67c02a218607cc881"))), 282 as BlockNumberFor);
let proof =
ParachainDipDidProof::new(provider_head_state_proof, dip_commitment_proof, dip_proof, signature);
diff --git a/dip-template/runtimes/dip-consumer/src/lib.rs b/dip-template/runtimes/dip-consumer/src/lib.rs
index f85b6222c0..19a7108031 100644
--- a/dip-template/runtimes/dip-consumer/src/lib.rs
+++ b/dip-template/runtimes/dip-consumer/src/lib.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Runtime template of a Decentralized Identity Provider (DIP) consumer, which
//! does not itself include any identity-related pallets, but only the
@@ -44,7 +44,7 @@ use cumulus_primitives_core::{AggregateMessageOrigin, CollationInfo};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
- genesis_builder_helper::{build_config, create_default_config},
+ genesis_builder_helper::{build_state, get_preset},
parameter_types,
traits::{ConstU32, ConstU64, ConstU8, EnqueueWithOrigin, Everything},
weights::{
@@ -64,6 +64,7 @@ use pallet_transaction_payment::{FeeDetails, FungibleAdapter, RuntimeDispatchInf
use sp_api::impl_runtime_apis;
use sp_consensus_aura::SlotDuration;
use sp_core::{crypto::KeyTypeId, ConstBool, ConstU128, ConstU16, OpaqueMetadata};
+use sp_genesis_builder::PresetId;
use sp_inherents::{CheckInherentsResult, InherentData};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
@@ -231,6 +232,11 @@ impl frame_system::Config for Runtime {
type SS58Prefix = ConstU16;
type SystemWeightInfo = weights::frame_system::WeightInfo;
type Version = Version;
+ type MultiBlockMigrator = ();
+ type PostInherents = ();
+ type PostTransactions = ();
+ type PreInherents = ();
+ type SingleBlockMigrations = ();
}
/// Maximum number of blocks simultaneously accepted by the Runtime, not yet
@@ -369,6 +375,7 @@ impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
type DisabledValidators = ();
type MaxAuthorities = ConstU32<100_000>;
+ type SlotDuration = ConstU64;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
@@ -407,7 +414,7 @@ impl_runtime_apis! {
}
fn authorities() -> Vec {
- Aura::authorities().into_inner()
+ pallet_aura::Authorities::::get().into_inner()
}
}
@@ -420,7 +427,7 @@ impl_runtime_apis! {
Executive::execute_block(block)
}
- fn initialize_block(header: &::Header) {
+ fn initialize_block(header: &::Header) -> sp_runtime::ExtrinsicInclusionMode {
Executive::initialize_block(header)
}
}
@@ -545,13 +552,16 @@ impl_runtime_apis! {
}
impl sp_genesis_builder::GenesisBuilder for Runtime {
+ fn build_state(config: Vec) -> sp_genesis_builder::Result {
+ build_state::(config)
+ }
- fn create_default_config() -> Vec {
- create_default_config::()
+ fn get_preset(id: &Option) -> Option> {
+ get_preset::(id, |_| None)
}
- fn build_config(config: Vec) -> sp_genesis_builder::Result {
- build_config::(config)
+ fn preset_names() -> Vec {
+ Default::default()
}
}
diff --git a/dip-template/runtimes/dip-consumer/src/origin_adapter.rs b/dip-template/runtimes/dip-consumer/src/origin_adapter.rs
index 173c1cd271..2ea4f09a28 100644
--- a/dip-template/runtimes/dip-consumer/src/origin_adapter.rs
+++ b/dip-template/runtimes/dip-consumer/src/origin_adapter.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use crate::{AccountId, DidIdentifier, MerkleProofVerifierOutput, RuntimeOrigin, Web3Name};
use frame_support::traits::EnsureOrigin;
diff --git a/dip-template/runtimes/dip-consumer/src/weights/frame_system.rs b/dip-template/runtimes/dip-consumer/src/weights/frame_system.rs
index 0491d5f258..ae8e660875 100644
--- a/dip-template/runtimes/dip-consumer/src/weights/frame_system.rs
+++ b/dip-template/runtimes/dip-consumer/src/weights/frame_system.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `frame_system`
//!
diff --git a/dip-template/runtimes/dip-consumer/src/weights/mod.rs b/dip-template/runtimes/dip-consumer/src/weights/mod.rs
index 67d5885727..7807812121 100644
--- a/dip-template/runtimes/dip-consumer/src/weights/mod.rs
+++ b/dip-template/runtimes/dip-consumer/src/weights/mod.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
pub mod frame_system;
pub mod pallet_dip_consumer;
diff --git a/dip-template/runtimes/dip-consumer/src/weights/pallet_dip_consumer.rs b/dip-template/runtimes/dip-consumer/src/weights/pallet_dip_consumer.rs
index 0e0fb07ff7..d43c22fcad 100644
--- a/dip-template/runtimes/dip-consumer/src/weights/pallet_dip_consumer.rs
+++ b/dip-template/runtimes/dip-consumer/src/weights/pallet_dip_consumer.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `pallet_dip_consumer`
//!
diff --git a/dip-template/runtimes/dip-consumer/src/weights/pallet_relay_store.rs b/dip-template/runtimes/dip-consumer/src/weights/pallet_relay_store.rs
index 7205cddb17..9f0035c61f 100644
--- a/dip-template/runtimes/dip-consumer/src/weights/pallet_relay_store.rs
+++ b/dip-template/runtimes/dip-consumer/src/weights/pallet_relay_store.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `pallet_relay_store`
//!
diff --git a/dip-template/runtimes/dip-provider/Cargo.toml b/dip-template/runtimes/dip-provider/Cargo.toml
index 8b0181b68b..018dd86617 100644
--- a/dip-template/runtimes/dip-provider/Cargo.toml
+++ b/dip-template/runtimes/dip-provider/Cargo.toml
@@ -58,7 +58,7 @@ sp-weights = { workspace = true }
# Cumulus
cumulus-pallet-aura-ext = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-parachain-system = { workspace = true }
cumulus-primitives-aura = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
diff --git a/dip-template/runtimes/dip-provider/build.rs b/dip-template/runtimes/dip-provider/build.rs
index 9d730bd288..52e91453e1 100644
--- a/dip-template/runtimes/dip-provider/build.rs
+++ b/dip-template/runtimes/dip-provider/build.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use substrate_wasm_builder::WasmBuilder;
diff --git a/dip-template/runtimes/dip-provider/src/dip.rs b/dip-template/runtimes/dip-provider/src/dip.rs
index dcb51621b5..e119bcff7d 100644
--- a/dip-template/runtimes/dip-provider/src/dip.rs
+++ b/dip-template/runtimes/dip-provider/src/dip.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
use did::{DidRawOrigin, EnsureDidOrigin, KeyIdOf};
use frame_system::EnsureSigned;
diff --git a/dip-template/runtimes/dip-provider/src/lib.rs b/dip-template/runtimes/dip-provider/src/lib.rs
index eb46af38ba..adbc60e9f4 100644
--- a/dip-template/runtimes/dip-provider/src/lib.rs
+++ b/dip-template/runtimes/dip-provider/src/lib.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Runtime template of a Decentralized Identity Provider (DIP) provider, which
//! includes, beyond system pallets, [`did::Pallet`],
@@ -43,7 +43,7 @@ use did::{DidRawOrigin, EnsureDidOrigin};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
- genesis_builder_helper::{build_config, create_default_config},
+ genesis_builder_helper::{build_state, get_preset},
parameter_types,
traits::{ConstU32, ConstU64, ConstU8, EnqueueWithOrigin, Everything},
weights::{
@@ -65,6 +65,7 @@ use runtime_common::dip::merkle::{CompleteMerkleProof, DidMerkleProofOf, DidMerk
use sp_api::impl_runtime_apis;
use sp_consensus_aura::SlotDuration;
use sp_core::{crypto::KeyTypeId, ConstBool, ConstU128, ConstU16, OpaqueMetadata};
+use sp_genesis_builder::PresetId;
use sp_inherents::{CheckInherentsResult, InherentData};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
@@ -232,6 +233,11 @@ impl frame_system::Config for Runtime {
type SS58Prefix = ConstU16;
type SystemWeightInfo = weights::frame_system::WeightInfo;
type Version = Version;
+ type MultiBlockMigrator = ();
+ type PostInherents = ();
+ type PostTransactions = ();
+ type PreInherents = ();
+ type SingleBlockMigrations = ();
}
/// Maximum number of blocks simultaneously accepted by the Runtime, not yet
@@ -370,6 +376,7 @@ impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
type DisabledValidators = ();
type MaxAuthorities = ConstU32<100_000>;
+ type SlotDuration = ConstU64;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
@@ -489,7 +496,7 @@ impl_runtime_apis! {
}
fn authorities() -> Vec {
- Aura::authorities().into_inner()
+ pallet_aura::Authorities::::get().into_inner()
}
}
@@ -502,7 +509,7 @@ impl_runtime_apis! {
Executive::execute_block(block)
}
- fn initialize_block(header: &::Header) {
+ fn initialize_block(header: &::Header) -> sp_runtime::ExtrinsicInclusionMode {
Executive::initialize_block(header)
}
}
@@ -776,15 +783,17 @@ impl_runtime_apis! {
DidMerkleRootGenerator::::generate_proof(&identity_details, request.version, request.keys.iter(), request.should_include_web3_name, request.accounts.iter()).map_err(runtime_api::DipProofError::MerkleProof)
}
}
-
impl sp_genesis_builder::GenesisBuilder for Runtime {
+ fn build_state(config: Vec) -> sp_genesis_builder::Result {
+ build_state::(config)
+ }
- fn create_default_config() -> Vec {
- create_default_config::()
+ fn get_preset(id: &Option) -> Option> {
+ get_preset::(id, |_| None)
}
- fn build_config(config: Vec) -> sp_genesis_builder::Result {
- build_config::(config)
+ fn preset_names() -> Vec {
+ Default::default()
}
}
diff --git a/dip-template/runtimes/dip-provider/src/weights/did.rs b/dip-template/runtimes/dip-provider/src/weights/did.rs
index 329c4abe89..9d357e4fd6 100644
--- a/dip-template/runtimes/dip-provider/src/weights/did.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/did.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `did`
//!
diff --git a/dip-template/runtimes/dip-provider/src/weights/frame_system.rs b/dip-template/runtimes/dip-provider/src/weights/frame_system.rs
index 6c00b19d2a..4bc151d52a 100644
--- a/dip-template/runtimes/dip-provider/src/weights/frame_system.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/frame_system.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `frame_system`
//!
diff --git a/dip-template/runtimes/dip-provider/src/weights/mod.rs b/dip-template/runtimes/dip-provider/src/weights/mod.rs
index c2cccacd47..0aacec82ae 100644
--- a/dip-template/runtimes/dip-provider/src/weights/mod.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/mod.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
pub mod did;
pub mod frame_system;
diff --git a/dip-template/runtimes/dip-provider/src/weights/pallet_deposit_storage.rs b/dip-template/runtimes/dip-provider/src/weights/pallet_deposit_storage.rs
index 0c25daeecc..dd01618455 100644
--- a/dip-template/runtimes/dip-provider/src/weights/pallet_deposit_storage.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/pallet_deposit_storage.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `pallet_deposit_storage`
//!
diff --git a/dip-template/runtimes/dip-provider/src/weights/pallet_did_lookup.rs b/dip-template/runtimes/dip-provider/src/weights/pallet_did_lookup.rs
index bb282e3bbd..b7903c2f34 100644
--- a/dip-template/runtimes/dip-provider/src/weights/pallet_did_lookup.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/pallet_did_lookup.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at
//! Autogenerated weights for `pallet_did_lookup`
//!
diff --git a/dip-template/runtimes/dip-provider/src/weights/pallet_dip_provider.rs b/dip-template/runtimes/dip-provider/src/weights/pallet_dip_provider.rs
index ba7f981bd9..919966c246 100644
--- a/dip-template/runtimes/dip-provider/src/weights/pallet_dip_provider.rs
+++ b/dip-template/runtimes/dip-provider/src/weights/pallet_dip_provider.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-// If you feel like getting in touch with us, you can do so at
+// If you feel like getting in touch with us, you can do so at