difftreelog
fix benchmark rmrk-core with opal-runtime
in: master
10 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8558,11 +8558,14 @@
"fp-evm-mapping",
"fp-rpc",
"fp-self-contained",
+ "frame-benchmarking",
"frame-executive",
"frame-support",
"frame-system",
+ "frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"frame-try-runtime",
+ "hex-literal",
"log",
"orml-vesting",
"pallet-aura",
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@
.PHONY: _bench
_bench:
- cargo run --release --features runtime-benchmarks,unique-runtime -- \
+ cargo run --release --features runtime-benchmarks,$(RUNTIME) -- \
benchmark pallet --pallet pallet-$(if $(PALLET),$(PALLET),$(error Must set PALLET)) \
--wasm-execution compiled --extrinsic '*' \
--template .maintain/frame-weight-template.hbs --steps=50 --repeat=80 --heap-pages=4096 \
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -323,7 +323,9 @@
[features]
default = []
runtime-benchmarks = [
- 'unique-runtime/runtime-benchmarks',
+ 'unique-runtime?/runtime-benchmarks',
+ 'quartz-runtime?/runtime-benchmarks',
+ 'opal-runtime/runtime-benchmarks',
'polkadot-service/runtime-benchmarks',
]
try-runtime = []
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -26,13 +26,13 @@
use unique_runtime_common::types::*;
#[cfg(feature = "unique-runtime")]
-use unique_runtime as default_runtime;
+pub use unique_runtime as default_runtime;
#[cfg(all(not(feature = "unique-runtime"), feature = "quartz-runtime"))]
-use quartz_runtime as default_runtime;
+pub use quartz_runtime as default_runtime;
#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))]
-use opal_runtime as default_runtime;
+pub use opal_runtime as default_runtime;
/// The `ChainSpec` parameterized for the unique runtime.
#[cfg(feature = "unique-runtime")]
node/cli/src/command.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license18// This file is part of Substrate.1920// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435use crate::{36 chain_spec::{self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification},37 cli::{Cli, RelayChainCli, Subcommand},38 service::{new_partial, start_node, start_dev_node},39};4041#[cfg(feature = "unique-runtime")]42use crate::service::UniqueRuntimeExecutor;4344#[cfg(feature = "quartz-runtime")]45use crate::service::QuartzRuntimeExecutor;4647use crate::service::OpalRuntimeExecutor;4849use codec::Encode;50use cumulus_primitives_core::ParaId;51use cumulus_client_service::genesis::generate_genesis_block;52use std::{future::Future, pin::Pin};53use log::info;54use polkadot_parachain::primitives::AccountIdConversion;55use sc_cli::{56 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,57 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,58};59use sc_service::{60 config::{BasePath, PrometheusConfig},61};62use sp_core::hexdisplay::HexDisplay;63use sp_runtime::traits::Block as BlockT;64use std::{io::Write, net::SocketAddr, time::Duration};6566use unique_runtime_common::types::Block;6768macro_rules! no_runtime_err {69 ($chain_name:expr) => {70 format!(71 "No runtime valid runtime was found for chain {}",72 $chain_name73 )74 };75}7677fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {78 Ok(match id {79 "dev" => Box::new(chain_spec::development_config()),80 "" | "local" => Box::new(chain_spec::local_testnet_config()),81 path => {82 let path = std::path::PathBuf::from(path);83 let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)84 as Box<dyn sc_service::ChainSpec>;8586 match chain_spec.runtime_id() {87 #[cfg(feature = "unique-runtime")]88 RuntimeId::Unique => Box::new(chain_spec::UniqueChainSpec::from_json_file(path)?),8990 #[cfg(feature = "quartz-runtime")]91 RuntimeId::Quartz => Box::new(chain_spec::QuartzChainSpec::from_json_file(path)?),9293 RuntimeId::Opal => chain_spec,94 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain)),95 }96 }97 })98}99100impl SubstrateCli for Cli {101 // TODO use args102 fn impl_name() -> String {103 format!("{} Node", Self::node_name())104 }105106 fn impl_version() -> String {107 env!("SUBSTRATE_CLI_IMPL_VERSION").into()108 }109 // TODO use args110 fn description() -> String {111 format!(112 "{} Node\n\nThe command-line arguments provided first will be \113 passed to the parachain node, while the arguments provided after -- will be passed \114 to the relaychain node.\n\n\115 {} [parachain-args] -- [relaychain-args]",116 Self::node_name(),117 Self::executable_name()118 )119 }120121 fn author() -> String {122 env!("CARGO_PKG_AUTHORS").into()123 }124125 //TODO use args126 fn support_url() -> String {127 "support@unique.network".into()128 }129130 fn copyright_start_year() -> i32 {131 2019132 }133134 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {135 load_spec(id)136 }137138 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {139 match chain_spec.runtime_id() {140 #[cfg(feature = "unique-runtime")]141 RuntimeId::Unique => &unique_runtime::VERSION,142143 #[cfg(feature = "quartz-runtime")]144 RuntimeId::Quartz => &quartz_runtime::VERSION,145146 RuntimeId::Opal => &opal_runtime::VERSION,147 RuntimeId::Unknown(chain) => panic!("{}", no_runtime_err!(chain)),148 }149 }150}151152impl SubstrateCli for RelayChainCli {153 // TODO use args154 fn impl_name() -> String {155 format!("{} Node", Cli::node_name())156 }157158 fn impl_version() -> String {159 env!("SUBSTRATE_CLI_IMPL_VERSION").into()160 }161 // TODO use args162 fn description() -> String {163 format!(164 "{} Node\n\nThe command-line arguments provided first will be \165 passed to the parachain node, while the arguments provided after -- will be passed \166 to the relaychain node.\n\n\167 parachain-collator [parachain-args] -- [relaychain-args]",168 Cli::node_name()169 )170 }171172 fn author() -> String {173 env!("CARGO_PKG_AUTHORS").into()174 }175 // TODO use args176 fn support_url() -> String {177 "support@unique.network".into()178 }179180 fn copyright_start_year() -> i32 {181 2019182 }183184 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {185 polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)186 }187188 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {189 polkadot_cli::Cli::native_runtime_version(chain_spec)190 }191}192193#[allow(clippy::borrowed_box)]194fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {195 let mut storage = chain_spec.build_storage()?;196197 storage198 .top199 .remove(sp_core::storage::well_known_keys::CODE)200 .ok_or_else(|| "Could not find wasm file in genesis state!".into())201}202203macro_rules! async_run_with_runtime {204 (205 $runtime_api:path, $executor:path,206 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,207 $( $code:tt )*208 ) => {209 $runner.async_run(|$config| {210 let $components = new_partial::<211 $runtime_api, $executor, _212 >(213 &$config,214 crate::service::parachain_build_import_queue,215 )?;216 let task_manager = $components.task_manager;217218 { $( $code )* }.map(|v| (v, task_manager))219 })220 };221}222223macro_rules! construct_async_run {224 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{225 let runner = $cli.create_runner($cmd)?;226227 match runner.config().chain_spec.runtime_id() {228 #[cfg(feature = "unique-runtime")]229 RuntimeId::Unique => async_run_with_runtime!(230 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,231 runner, $components, $cli, $cmd, $config, $( $code )*232 ),233234 #[cfg(feature = "quartz-runtime")]235 RuntimeId::Quartz => async_run_with_runtime!(236 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,237 runner, $components, $cli, $cmd, $config, $( $code )*238 ),239240 RuntimeId::Opal => async_run_with_runtime!(241 opal_runtime::RuntimeApi, OpalRuntimeExecutor,242 runner, $components, $cli, $cmd, $config, $( $code )*243 ),244245 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into())246 }247 }}248}249250macro_rules! start_node_using_chain_runtime {251 ($start_node_fn:ident($config:expr $(, $($args:expr),+)?) $($code:tt)*) => {252 match $config.chain_spec.runtime_id() {253 #[cfg(feature = "unique-runtime")]254 RuntimeId::Unique => $start_node_fn::<255 unique_runtime::Runtime,256 unique_runtime::RuntimeApi,257 UniqueRuntimeExecutor,258 >($config $(, $($args),+)?) $($code)*,259260 #[cfg(feature = "quartz-runtime")]261 RuntimeId::Quartz => $start_node_fn::<262 quartz_runtime::Runtime,263 quartz_runtime::RuntimeApi,264 QuartzRuntimeExecutor,265 >($config $(, $($args),+)?) $($code)*,266267 RuntimeId::Opal => $start_node_fn::<268 opal_runtime::Runtime,269 opal_runtime::RuntimeApi,270 OpalRuntimeExecutor,271 >($config $(, $($args),+)?) $($code)*,272273 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),274 }275 };276}277278/// Parse command line arguments into service configuration.279pub fn run() -> Result<()> {280 let cli = Cli::from_args();281282 match &cli.subcommand {283 Some(Subcommand::BuildSpec(cmd)) => {284 let runner = cli.create_runner(cmd)?;285 runner.sync_run(|config| cmd.run(config.chain_spec, config.network))286 }287 Some(Subcommand::CheckBlock(cmd)) => {288 construct_async_run!(|components, cli, cmd, config| {289 Ok(cmd.run(components.client, components.import_queue))290 })291 }292 Some(Subcommand::ExportBlocks(cmd)) => {293 construct_async_run!(|components, cli, cmd, config| {294 Ok(cmd.run(components.client, config.database))295 })296 }297 Some(Subcommand::ExportState(cmd)) => {298 construct_async_run!(|components, cli, cmd, config| {299 Ok(cmd.run(components.client, config.chain_spec))300 })301 }302 Some(Subcommand::ImportBlocks(cmd)) => {303 construct_async_run!(|components, cli, cmd, config| {304 Ok(cmd.run(components.client, components.import_queue))305 })306 }307 Some(Subcommand::PurgeChain(cmd)) => {308 let runner = cli.create_runner(cmd)?;309310 runner.sync_run(|config| {311 let polkadot_cli = RelayChainCli::new(312 &config,313 [RelayChainCli::executable_name()]314 .iter()315 .chain(cli.relaychain_args.iter()),316 );317318 let polkadot_config = SubstrateCli::create_configuration(319 &polkadot_cli,320 &polkadot_cli,321 config.tokio_handle.clone(),322 )323 .map_err(|err| format!("Relay chain argument error: {}", err))?;324325 cmd.run(config, polkadot_config)326 })327 }328 Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {329 Ok(cmd.run(components.client, components.backend, None))330 }),331 Some(Subcommand::ExportGenesisState(params)) => {332 let mut builder = sc_cli::LoggerBuilder::new("");333 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");334 let _ = builder.init();335336 let spec = load_spec(¶ms.chain.clone().unwrap_or_default())?;337 let state_version = Cli::native_runtime_version(&spec).state_version();338 let block: Block = generate_genesis_block(&spec, state_version)?;339 let raw_header = block.header().encode();340 let output_buf = if params.raw {341 raw_header342 } else {343 format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()344 };345346 if let Some(output) = ¶ms.output {347 std::fs::write(output, output_buf)?;348 } else {349 std::io::stdout().write_all(&output_buf)?;350 }351352 Ok(())353 }354 Some(Subcommand::ExportGenesisWasm(params)) => {355 let mut builder = sc_cli::LoggerBuilder::new("");356 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");357 let _ = builder.init();358359 let raw_wasm_blob =360 extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?;361 let output_buf = if params.raw {362 raw_wasm_blob363 } else {364 format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes()365 };366367 if let Some(output) = ¶ms.output {368 std::fs::write(output, output_buf)?;369 } else {370 std::io::stdout().write_all(&output_buf)?;371 }372373 Ok(())374 }375 #[cfg(feature = "unique-runtime")]376 Some(Subcommand::Benchmark(cmd)) => {377 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};378 let runner = cli.create_runner(cmd)?;379 // Switch on the concrete benchmark sub-command-380 match cmd {381 BenchmarkCmd::Pallet(cmd) => {382 if cfg!(feature = "runtime-benchmarks") {383 runner.sync_run(|config| cmd.run::<Block, UniqueRuntimeExecutor>(config))384 } else {385 Err("Benchmarking wasn't enabled when building the node. \386 You can enable it with `--features runtime-benchmarks`."387 .into())388 }389 }390 BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {391 let partials = new_partial::<392 unique_runtime::RuntimeApi,393 UniqueRuntimeExecutor,394 _,395 >(&config, crate::service::parachain_build_import_queue)?;396 cmd.run(partials.client)397 }),398 BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {399 let partials = new_partial::<400 unique_runtime::RuntimeApi,401 UniqueRuntimeExecutor,402 _,403 >(&config, crate::service::parachain_build_import_queue)?;404 let db = partials.backend.expose_db();405 let storage = partials.backend.expose_storage();406407 cmd.run(config, partials.client.clone(), db, storage)408 }),409 BenchmarkCmd::Machine(cmd) => {410 runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))411 }412 BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()),413 }414 }415 #[cfg(not(feature = "unique-runtime"))]416 Some(Subcommand::Benchmark(..)) => {417 Err("benchmarking is only available with unique runtime enabled".into())418 }419 Some(Subcommand::TryRuntime(cmd)) => {420 if cfg!(feature = "try-runtime") {421 let runner = cli.create_runner(cmd)?;422423 // grab the task manager.424 let registry = &runner425 .config()426 .prometheus_config427 .as_ref()428 .map(|cfg| &cfg.registry);429 let task_manager =430 sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)431 .map_err(|e| format!("Error: {:?}", e))?;432433 runner.async_run(|config| -> Result<(Pin<Box<dyn Future<Output = _>>>, _)> {434 Ok((435 match config.chain_spec.runtime_id() {436 #[cfg(feature = "unique-runtime")]437 RuntimeId::Unique => Box::pin(cmd.run::<Block, UniqueRuntimeExecutor>(config)),438439 #[cfg(feature = "quartz-runtime")]440 RuntimeId::Quartz => Box::pin(cmd.run::<Block, QuartzRuntimeExecutor>(config)),441442 RuntimeId::Opal => {443 Box::pin(cmd.run::<Block, OpalRuntimeExecutor>(config))444 }445 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain).into()),446 },447 task_manager,448 ))449 })450 } else {451 Err("Try-runtime must be enabled by `--features try-runtime`.".into())452 }453 }454 None => {455 let runner = cli.create_runner(&cli.run.normalize())?;456 let collator_options = cli.run.collator_options();457458 runner.run_node_until_exit(|config| async move {459 let hwbench = if !cli.no_hardware_benchmarks {460 config.database.path().map(|database_path| {461 let _ = std::fs::create_dir_all(&database_path);462 sc_sysinfo::gather_hwbench(Some(database_path))463 })464 } else {465 None466 };467468 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);469470 let service_id = config.chain_spec.service_id();471 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());472 let is_dev_service = matches![service_id, ServiceId::Dev]473 || relay_chain_id == Some("dev-service".into());474475 if is_dev_service {476 info!("Running Dev service");477478 let autoseal_interval = Duration::from_millis(cli.idle_autoseal_interval);479480 return start_node_using_chain_runtime! {481 start_dev_node(config, autoseal_interval).map_err(Into::into)482 };483 };484485 let para_id = extensions486 .map(|e| e.para_id)487 .ok_or("Could not find parachain ID in chain-spec.")?;488489 let polkadot_cli = RelayChainCli::new(490 &config,491 [RelayChainCli::executable_name()]492 .iter()493 .chain(cli.relaychain_args.iter()),494 );495496 let para_id = ParaId::from(para_id);497498 let parachain_account =499 AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account(500 ¶_id,501 );502503 let state_version =504 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();505 let block: Block = generate_genesis_block(&config.chain_spec, state_version)506 .map_err(|e| format!("{:?}", e))?;507 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));508 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));509510 let polkadot_config = SubstrateCli::create_configuration(511 &polkadot_cli,512 &polkadot_cli,513 config.tokio_handle.clone(),514 )515 .map_err(|err| format!("Relay chain argument error: {}", err))?;516517 info!("Parachain id: {:?}", para_id);518 info!("Parachain Account: {}", parachain_account);519 info!("Parachain genesis state: {}", genesis_state);520 info!("Parachain genesis hash: {}", genesis_hash);521 info!(522 "Is collating: {}",523 if config.role.is_authority() {524 "yes"525 } else {526 "no"527 }528 );529530 start_node_using_chain_runtime! {531 start_node(config, polkadot_config, collator_options, para_id, hwbench)532 .await533 .map(|r| r.0)534 .map_err(Into::into)535 }536 })537 }538 }539}540541impl DefaultConfigurationValues for RelayChainCli {542 fn p2p_listen_port() -> u16 {543 30334544 }545546 fn rpc_ws_listen_port() -> u16 {547 9945548 }549550 fn rpc_http_listen_port() -> u16 {551 9934552 }553554 fn prometheus_listen_port() -> u16 {555 9616556 }557}558559impl CliConfiguration<Self> for RelayChainCli {560 fn shared_params(&self) -> &SharedParams {561 self.base.base.shared_params()562 }563564 fn import_params(&self) -> Option<&ImportParams> {565 self.base.base.import_params()566 }567568 fn network_params(&self) -> Option<&NetworkParams> {569 self.base.base.network_params()570 }571572 fn keystore_params(&self) -> Option<&KeystoreParams> {573 self.base.base.keystore_params()574 }575576 fn base_path(&self) -> Result<Option<BasePath>> {577 Ok(self578 .shared_params()579 .base_path()580 .or_else(|| self.base_path.clone().map(Into::into)))581 }582583 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {584 self.base.base.rpc_http(default_listen_port)585 }586587 fn rpc_ipc(&self) -> Result<Option<String>> {588 self.base.base.rpc_ipc()589 }590591 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {592 self.base.base.rpc_ws(default_listen_port)593 }594595 fn prometheus_config(596 &self,597 default_listen_port: u16,598 chain_spec: &Box<dyn ChainSpec>,599 ) -> Result<Option<PrometheusConfig>> {600 self.base601 .base602 .prometheus_config(default_listen_port, chain_spec)603 }604605 fn init<F>(606 &self,607 _support_url: &String,608 _impl_version: &String,609 _logger_hook: F,610 _config: &sc_service::Configuration,611 ) -> Result<()> {612 unreachable!("PolkadotCli is never initialized; qed");613 }614615 fn chain_id(&self, is_dev: bool) -> Result<String> {616 let chain_id = self.base.base.chain_id(is_dev)?;617618 Ok(if chain_id.is_empty() {619 self.chain_id.clone().unwrap_or_default()620 } else {621 chain_id622 })623 }624625 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {626 self.base.base.role(is_dev)627 }628629 fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> {630 self.base.base.transaction_pool()631 }632633 fn state_cache_child_ratio(&self) -> Result<Option<usize>> {634 self.base.base.state_cache_child_ratio()635 }636637 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {638 self.base.base.rpc_methods()639 }640641 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {642 self.base.base.rpc_ws_max_connections()643 }644645 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {646 self.base.base.rpc_cors(is_dev)647 }648649 fn default_heap_pages(&self) -> Result<Option<u64>> {650 self.base.base.default_heap_pages()651 }652653 fn force_authoring(&self) -> Result<bool> {654 self.base.base.force_authoring()655 }656657 fn disable_grandpa(&self) -> Result<bool> {658 self.base.base.disable_grandpa()659 }660661 fn max_runtime_instances(&self) -> Result<Option<usize>> {662 self.base.base.max_runtime_instances()663 }664665 fn announce_block(&self) -> Result<bool> {666 self.base.base.announce_block()667 }668669 fn telemetry_endpoints(670 &self,671 chain_spec: &Box<dyn ChainSpec>,672 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {673 self.base.base.telemetry_endpoints(chain_spec)674 }675}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license18// This file is part of Substrate.1920// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435use crate::{36 chain_spec::{self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification, default_runtime},37 cli::{Cli, RelayChainCli, Subcommand},38 service::{new_partial, start_node, start_dev_node},39};4041#[cfg(feature = "unique-runtime")]42use crate::service::UniqueRuntimeExecutor;4344#[cfg(feature = "quartz-runtime")]45use crate::service::QuartzRuntimeExecutor;4647use crate::service::{OpalRuntimeExecutor, DefaultRuntimeExecutor};4849use codec::Encode;50use cumulus_primitives_core::ParaId;51use cumulus_client_service::genesis::generate_genesis_block;52use std::{future::Future, pin::Pin};53use log::info;54use polkadot_parachain::primitives::AccountIdConversion;55use sc_cli::{56 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,57 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,58};59use sc_service::{60 config::{BasePath, PrometheusConfig},61};62use sp_core::hexdisplay::HexDisplay;63use sp_runtime::traits::Block as BlockT;64use std::{io::Write, net::SocketAddr, time::Duration};6566use unique_runtime_common::types::Block;6768macro_rules! no_runtime_err {69 ($chain_name:expr) => {70 format!(71 "No runtime valid runtime was found for chain {}",72 $chain_name73 )74 };75}7677fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {78 Ok(match id {79 "dev" => Box::new(chain_spec::development_config()),80 "" | "local" => Box::new(chain_spec::local_testnet_config()),81 path => {82 let path = std::path::PathBuf::from(path);83 let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)84 as Box<dyn sc_service::ChainSpec>;8586 match chain_spec.runtime_id() {87 #[cfg(feature = "unique-runtime")]88 RuntimeId::Unique => Box::new(chain_spec::UniqueChainSpec::from_json_file(path)?),8990 #[cfg(feature = "quartz-runtime")]91 RuntimeId::Quartz => Box::new(chain_spec::QuartzChainSpec::from_json_file(path)?),9293 RuntimeId::Opal => chain_spec,94 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain)),95 }96 }97 })98}99100impl SubstrateCli for Cli {101 // TODO use args102 fn impl_name() -> String {103 format!("{} Node", Self::node_name())104 }105106 fn impl_version() -> String {107 env!("SUBSTRATE_CLI_IMPL_VERSION").into()108 }109 // TODO use args110 fn description() -> String {111 format!(112 "{} Node\n\nThe command-line arguments provided first will be \113 passed to the parachain node, while the arguments provided after -- will be passed \114 to the relaychain node.\n\n\115 {} [parachain-args] -- [relaychain-args]",116 Self::node_name(),117 Self::executable_name()118 )119 }120121 fn author() -> String {122 env!("CARGO_PKG_AUTHORS").into()123 }124125 //TODO use args126 fn support_url() -> String {127 "support@unique.network".into()128 }129130 fn copyright_start_year() -> i32 {131 2019132 }133134 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {135 load_spec(id)136 }137138 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {139 match chain_spec.runtime_id() {140 #[cfg(feature = "unique-runtime")]141 RuntimeId::Unique => &unique_runtime::VERSION,142143 #[cfg(feature = "quartz-runtime")]144 RuntimeId::Quartz => &quartz_runtime::VERSION,145146 RuntimeId::Opal => &opal_runtime::VERSION,147 RuntimeId::Unknown(chain) => panic!("{}", no_runtime_err!(chain)),148 }149 }150}151152impl SubstrateCli for RelayChainCli {153 // TODO use args154 fn impl_name() -> String {155 format!("{} Node", Cli::node_name())156 }157158 fn impl_version() -> String {159 env!("SUBSTRATE_CLI_IMPL_VERSION").into()160 }161 // TODO use args162 fn description() -> String {163 format!(164 "{} Node\n\nThe command-line arguments provided first will be \165 passed to the parachain node, while the arguments provided after -- will be passed \166 to the relaychain node.\n\n\167 parachain-collator [parachain-args] -- [relaychain-args]",168 Cli::node_name()169 )170 }171172 fn author() -> String {173 env!("CARGO_PKG_AUTHORS").into()174 }175 // TODO use args176 fn support_url() -> String {177 "support@unique.network".into()178 }179180 fn copyright_start_year() -> i32 {181 2019182 }183184 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {185 polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)186 }187188 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {189 polkadot_cli::Cli::native_runtime_version(chain_spec)190 }191}192193#[allow(clippy::borrowed_box)]194fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {195 let mut storage = chain_spec.build_storage()?;196197 storage198 .top199 .remove(sp_core::storage::well_known_keys::CODE)200 .ok_or_else(|| "Could not find wasm file in genesis state!".into())201}202203macro_rules! async_run_with_runtime {204 (205 $runtime_api:path, $executor:path,206 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,207 $( $code:tt )*208 ) => {209 $runner.async_run(|$config| {210 let $components = new_partial::<211 $runtime_api, $executor, _212 >(213 &$config,214 crate::service::parachain_build_import_queue,215 )?;216 let task_manager = $components.task_manager;217218 { $( $code )* }.map(|v| (v, task_manager))219 })220 };221}222223macro_rules! construct_async_run {224 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{225 let runner = $cli.create_runner($cmd)?;226227 match runner.config().chain_spec.runtime_id() {228 #[cfg(feature = "unique-runtime")]229 RuntimeId::Unique => async_run_with_runtime!(230 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,231 runner, $components, $cli, $cmd, $config, $( $code )*232 ),233234 #[cfg(feature = "quartz-runtime")]235 RuntimeId::Quartz => async_run_with_runtime!(236 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,237 runner, $components, $cli, $cmd, $config, $( $code )*238 ),239240 RuntimeId::Opal => async_run_with_runtime!(241 opal_runtime::RuntimeApi, OpalRuntimeExecutor,242 runner, $components, $cli, $cmd, $config, $( $code )*243 ),244245 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into())246 }247 }}248}249250macro_rules! start_node_using_chain_runtime {251 ($start_node_fn:ident($config:expr $(, $($args:expr),+)?) $($code:tt)*) => {252 match $config.chain_spec.runtime_id() {253 #[cfg(feature = "unique-runtime")]254 RuntimeId::Unique => $start_node_fn::<255 unique_runtime::Runtime,256 unique_runtime::RuntimeApi,257 UniqueRuntimeExecutor,258 >($config $(, $($args),+)?) $($code)*,259260 #[cfg(feature = "quartz-runtime")]261 RuntimeId::Quartz => $start_node_fn::<262 quartz_runtime::Runtime,263 quartz_runtime::RuntimeApi,264 QuartzRuntimeExecutor,265 >($config $(, $($args),+)?) $($code)*,266267 RuntimeId::Opal => $start_node_fn::<268 opal_runtime::Runtime,269 opal_runtime::RuntimeApi,270 OpalRuntimeExecutor,271 >($config $(, $($args),+)?) $($code)*,272273 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),274 }275 };276}277278/// Parse command line arguments into service configuration.279pub fn run() -> Result<()> {280 let cli = Cli::from_args();281282 match &cli.subcommand {283 Some(Subcommand::BuildSpec(cmd)) => {284 let runner = cli.create_runner(cmd)?;285 runner.sync_run(|config| cmd.run(config.chain_spec, config.network))286 }287 Some(Subcommand::CheckBlock(cmd)) => {288 construct_async_run!(|components, cli, cmd, config| {289 Ok(cmd.run(components.client, components.import_queue))290 })291 }292 Some(Subcommand::ExportBlocks(cmd)) => {293 construct_async_run!(|components, cli, cmd, config| {294 Ok(cmd.run(components.client, config.database))295 })296 }297 Some(Subcommand::ExportState(cmd)) => {298 construct_async_run!(|components, cli, cmd, config| {299 Ok(cmd.run(components.client, config.chain_spec))300 })301 }302 Some(Subcommand::ImportBlocks(cmd)) => {303 construct_async_run!(|components, cli, cmd, config| {304 Ok(cmd.run(components.client, components.import_queue))305 })306 }307 Some(Subcommand::PurgeChain(cmd)) => {308 let runner = cli.create_runner(cmd)?;309310 runner.sync_run(|config| {311 let polkadot_cli = RelayChainCli::new(312 &config,313 [RelayChainCli::executable_name()]314 .iter()315 .chain(cli.relaychain_args.iter()),316 );317318 let polkadot_config = SubstrateCli::create_configuration(319 &polkadot_cli,320 &polkadot_cli,321 config.tokio_handle.clone(),322 )323 .map_err(|err| format!("Relay chain argument error: {}", err))?;324325 cmd.run(config, polkadot_config)326 })327 }328 Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {329 Ok(cmd.run(components.client, components.backend, None))330 }),331 Some(Subcommand::ExportGenesisState(params)) => {332 let mut builder = sc_cli::LoggerBuilder::new("");333 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");334 let _ = builder.init();335336 let spec = load_spec(¶ms.chain.clone().unwrap_or_default())?;337 let state_version = Cli::native_runtime_version(&spec).state_version();338 let block: Block = generate_genesis_block(&spec, state_version)?;339 let raw_header = block.header().encode();340 let output_buf = if params.raw {341 raw_header342 } else {343 format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()344 };345346 if let Some(output) = ¶ms.output {347 std::fs::write(output, output_buf)?;348 } else {349 std::io::stdout().write_all(&output_buf)?;350 }351352 Ok(())353 }354 Some(Subcommand::ExportGenesisWasm(params)) => {355 let mut builder = sc_cli::LoggerBuilder::new("");356 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");357 let _ = builder.init();358359 let raw_wasm_blob =360 extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?;361 let output_buf = if params.raw {362 raw_wasm_blob363 } else {364 format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes()365 };366367 if let Some(output) = ¶ms.output {368 std::fs::write(output, output_buf)?;369 } else {370 std::io::stdout().write_all(&output_buf)?;371 }372373 Ok(())374 }375 Some(Subcommand::Benchmark(cmd)) => {376 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};377 let runner = cli.create_runner(cmd)?;378 // Switch on the concrete benchmark sub-command-379 match cmd {380 BenchmarkCmd::Pallet(cmd) => {381 if cfg!(feature = "runtime-benchmarks") {382 runner.sync_run(|config| cmd.run::<Block, DefaultRuntimeExecutor>(config))383 } else {384 Err("Benchmarking wasn't enabled when building the node. \385 You can enable it with `--features runtime-benchmarks`."386 .into())387 }388 }389 BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {390 let partials = new_partial::<391 default_runtime::RuntimeApi,392 DefaultRuntimeExecutor,393 _,394 >(&config, crate::service::parachain_build_import_queue)?;395 cmd.run(partials.client)396 }),397 BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {398 let partials = new_partial::<399 default_runtime::RuntimeApi,400 DefaultRuntimeExecutor,401 _,402 >(&config, crate::service::parachain_build_import_queue)?;403 let db = partials.backend.expose_db();404 let storage = partials.backend.expose_storage();405406 cmd.run(config, partials.client.clone(), db, storage)407 }),408 BenchmarkCmd::Machine(cmd) => {409 runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))410 }411 BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()),412 }413 }414 Some(Subcommand::TryRuntime(cmd)) => {415 if cfg!(feature = "try-runtime") {416 let runner = cli.create_runner(cmd)?;417418 // grab the task manager.419 let registry = &runner420 .config()421 .prometheus_config422 .as_ref()423 .map(|cfg| &cfg.registry);424 let task_manager =425 sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)426 .map_err(|e| format!("Error: {:?}", e))?;427428 runner.async_run(|config| -> Result<(Pin<Box<dyn Future<Output = _>>>, _)> {429 Ok((430 match config.chain_spec.runtime_id() {431 #[cfg(feature = "unique-runtime")]432 RuntimeId::Unique => Box::pin(cmd.run::<Block, UniqueRuntimeExecutor>(config)),433434 #[cfg(feature = "quartz-runtime")]435 RuntimeId::Quartz => Box::pin(cmd.run::<Block, QuartzRuntimeExecutor>(config)),436437 RuntimeId::Opal => {438 Box::pin(cmd.run::<Block, OpalRuntimeExecutor>(config))439 }440 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain).into()),441 },442 task_manager,443 ))444 })445 } else {446 Err("Try-runtime must be enabled by `--features try-runtime`.".into())447 }448 }449 None => {450 let runner = cli.create_runner(&cli.run.normalize())?;451 let collator_options = cli.run.collator_options();452453 runner.run_node_until_exit(|config| async move {454 let hwbench = if !cli.no_hardware_benchmarks {455 config.database.path().map(|database_path| {456 let _ = std::fs::create_dir_all(&database_path);457 sc_sysinfo::gather_hwbench(Some(database_path))458 })459 } else {460 None461 };462463 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);464465 let service_id = config.chain_spec.service_id();466 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());467 let is_dev_service = matches![service_id, ServiceId::Dev]468 || relay_chain_id == Some("dev-service".into());469470 if is_dev_service {471 info!("Running Dev service");472473 let autoseal_interval = Duration::from_millis(cli.idle_autoseal_interval);474475 return start_node_using_chain_runtime! {476 start_dev_node(config, autoseal_interval).map_err(Into::into)477 };478 };479480 let para_id = extensions481 .map(|e| e.para_id)482 .ok_or("Could not find parachain ID in chain-spec.")?;483484 let polkadot_cli = RelayChainCli::new(485 &config,486 [RelayChainCli::executable_name()]487 .iter()488 .chain(cli.relaychain_args.iter()),489 );490491 let para_id = ParaId::from(para_id);492493 let parachain_account =494 AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account(495 ¶_id,496 );497498 let state_version =499 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();500 let block: Block = generate_genesis_block(&config.chain_spec, state_version)501 .map_err(|e| format!("{:?}", e))?;502 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));503 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));504505 let polkadot_config = SubstrateCli::create_configuration(506 &polkadot_cli,507 &polkadot_cli,508 config.tokio_handle.clone(),509 )510 .map_err(|err| format!("Relay chain argument error: {}", err))?;511512 info!("Parachain id: {:?}", para_id);513 info!("Parachain Account: {}", parachain_account);514 info!("Parachain genesis state: {}", genesis_state);515 info!("Parachain genesis hash: {}", genesis_hash);516 info!(517 "Is collating: {}",518 if config.role.is_authority() {519 "yes"520 } else {521 "no"522 }523 );524525 start_node_using_chain_runtime! {526 start_node(config, polkadot_config, collator_options, para_id, hwbench)527 .await528 .map(|r| r.0)529 .map_err(Into::into)530 }531 })532 }533 }534}535536impl DefaultConfigurationValues for RelayChainCli {537 fn p2p_listen_port() -> u16 {538 30334539 }540541 fn rpc_ws_listen_port() -> u16 {542 9945543 }544545 fn rpc_http_listen_port() -> u16 {546 9934547 }548549 fn prometheus_listen_port() -> u16 {550 9616551 }552}553554impl CliConfiguration<Self> for RelayChainCli {555 fn shared_params(&self) -> &SharedParams {556 self.base.base.shared_params()557 }558559 fn import_params(&self) -> Option<&ImportParams> {560 self.base.base.import_params()561 }562563 fn network_params(&self) -> Option<&NetworkParams> {564 self.base.base.network_params()565 }566567 fn keystore_params(&self) -> Option<&KeystoreParams> {568 self.base.base.keystore_params()569 }570571 fn base_path(&self) -> Result<Option<BasePath>> {572 Ok(self573 .shared_params()574 .base_path()575 .or_else(|| self.base_path.clone().map(Into::into)))576 }577578 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {579 self.base.base.rpc_http(default_listen_port)580 }581582 fn rpc_ipc(&self) -> Result<Option<String>> {583 self.base.base.rpc_ipc()584 }585586 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {587 self.base.base.rpc_ws(default_listen_port)588 }589590 fn prometheus_config(591 &self,592 default_listen_port: u16,593 chain_spec: &Box<dyn ChainSpec>,594 ) -> Result<Option<PrometheusConfig>> {595 self.base596 .base597 .prometheus_config(default_listen_port, chain_spec)598 }599600 fn init<F>(601 &self,602 _support_url: &String,603 _impl_version: &String,604 _logger_hook: F,605 _config: &sc_service::Configuration,606 ) -> Result<()> {607 unreachable!("PolkadotCli is never initialized; qed");608 }609610 fn chain_id(&self, is_dev: bool) -> Result<String> {611 let chain_id = self.base.base.chain_id(is_dev)?;612613 Ok(if chain_id.is_empty() {614 self.chain_id.clone().unwrap_or_default()615 } else {616 chain_id617 })618 }619620 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {621 self.base.base.role(is_dev)622 }623624 fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> {625 self.base.base.transaction_pool()626 }627628 fn state_cache_child_ratio(&self) -> Result<Option<usize>> {629 self.base.base.state_cache_child_ratio()630 }631632 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {633 self.base.base.rpc_methods()634 }635636 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {637 self.base.base.rpc_ws_max_connections()638 }639640 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {641 self.base.base.rpc_cors(is_dev)642 }643644 fn default_heap_pages(&self) -> Result<Option<u64>> {645 self.base.base.default_heap_pages()646 }647648 fn force_authoring(&self) -> Result<bool> {649 self.base.base.force_authoring()650 }651652 fn disable_grandpa(&self) -> Result<bool> {653 self.base.base.disable_grandpa()654 }655656 fn max_runtime_instances(&self) -> Result<Option<usize>> {657 self.base.base.max_runtime_instances()658 }659660 fn announce_block(&self) -> Result<bool> {661 self.base.base.announce_block()662 }663664 fn telemetry_endpoints(665 &self,666 chain_spec: &Box<dyn ChainSpec>,667 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {668 self.base.base.telemetry_endpoints(chain_spec)669 }670}node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -77,13 +77,21 @@
#[cfg(feature = "quartz-runtime")]
/// Quartz native executor instance.
-
pub struct QuartzRuntimeExecutor;
/// Opal native executor instance.
pub struct OpalRuntimeExecutor;
#[cfg(feature = "unique-runtime")]
+pub type DefaultRuntimeExecutor = UniqueRuntimeExecutor;
+
+#[cfg(all(not(feature = "unique-runtime"), feature = "quartz-runtime"))]
+pub type DefaultRuntimeExecutor = QuartzRuntimeExecutor;
+
+#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))]
+pub type DefaultRuntimeExecutor = OpalRuntimeExecutor;
+
+#[cfg(feature = "unique-runtime")]
impl NativeExecutionDispatch for UniqueRuntimeExecutor {
type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
pallets/proxy-rmrk-core/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/benchmarking.rs
+++ b/pallets/proxy-rmrk-core/src/benchmarking.rs
@@ -220,7 +220,6 @@
let b in 0..100;
let caller: T::AccountId = account("caller", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
create_max_collection::<T>(&caller)?;
let collection_id = 0;
@@ -381,7 +380,6 @@
add_basic_resource {
let caller: T::AccountId = account("caller", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
create_max_collection::<T>(&caller)?;
let collection_id = 0;
@@ -398,7 +396,6 @@
add_composable_resource {
let caller: T::AccountId = account("caller", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
create_max_collection::<T>(&caller)?;
let collection_id = 0;
@@ -415,7 +412,6 @@
add_slot_resource {
let caller: T::AccountId = account("caller", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
create_max_collection::<T>(&caller)?;
let collection_id = 0;
@@ -432,7 +428,6 @@
remove_resource {
let caller: T::AccountId = account("caller", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
create_max_collection::<T>(&caller)?;
let collection_id = 0;
@@ -448,7 +443,7 @@
resource
)?;
- let resource_id = 1;
+ let resource_id = 0;
}: _(
RawOrigin::Signed(caller),
collection_id,
@@ -460,8 +455,6 @@
let caller: T::AccountId = account("caller", 0, SEED);
let admin: T::AccountId = account("admin", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&admin, T::CollectionCreationPrice::get());
-
create_max_collection::<T>(&admin)?;
let collection_id = 0;
@@ -486,7 +479,7 @@
resource
)?;
- let resource_id = 1;
+ let resource_id = 0;
}: _(
RawOrigin::Signed(caller),
collection_id,
@@ -498,8 +491,6 @@
let caller: T::AccountId = account("caller", 0, SEED);
let admin: T::AccountId = account("admin", 0, SEED);
- <T as pallet_common::Config>::Currency::deposit_creating(&admin, T::CollectionCreationPrice::get());
-
create_max_collection::<T>(&admin)?;
let collection_id = 0;
@@ -515,7 +506,7 @@
resource
)?;
- let resource_id = 1;
+ let resource_id = 0;
let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::AccountId(caller.clone());
pallets/proxy-rmrk-core/src/weights.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/weights.rs
+++ b/pallets/proxy-rmrk-core/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_proxy_rmrk_core
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-06-14, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-16, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -19,7 +19,7 @@
// --template
// .maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=200
+// --repeat=80
// --heap-pages=4096
// --output=./pallets/proxy-rmrk-core/src/weights.rs
@@ -64,7 +64,7 @@
// Storage: Common CollectionById (r:0 w:1)
// Storage: RmrkCore UniqueCollectionId (r:0 w:1)
fn create_collection() -> Weight {
- (41_277_000 as Weight)
+ (41_768_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(8 as Weight))
}
@@ -77,7 +77,7 @@
// Storage: Nonfungible TokensBurnt (r:0 w:1)
// Storage: Common AdminAmount (r:0 w:1)
fn destroy_collection() -> Weight {
- (43_371_000 as Weight)
+ (43_402_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -85,7 +85,7 @@
// Storage: Common CollectionById (r:1 w:1)
// Storage: Common CollectionProperties (r:1 w:0)
fn change_collection_issuer() -> Weight {
- (21_891_000 as Weight)
+ (21_711_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -95,7 +95,7 @@
// Storage: Nonfungible TokensMinted (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:0)
fn lock_collection() -> Weight {
- (23_144_000 as Weight)
+ (23_204_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -107,18 +107,15 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:2 w:2)
fn mint_nft(b: u32, ) -> Weight {
- (68_329_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((21_470_000 as Weight).saturating_mul(b as Weight))
- .saturating_add(T::DbWeight::get().reads(12 as Weight))
+ (44_655_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((10_953_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(6 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
- .saturating_add(T::DbWeight::get().writes(12 as Weight))
- .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
@@ -132,8 +129,8 @@
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_nft(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 959_000
- .saturating_add((305_872_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 3_677_000
+ .saturating_add((357_082_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(9 as Weight))
.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
@@ -149,7 +146,7 @@
// Storage: Nonfungible TokenChildren (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:2)
fn send() -> Weight {
- (71_405_000 as Weight)
+ (73_968_000 as Weight)
.saturating_add(T::DbWeight::get().reads(12 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -163,22 +160,22 @@
// Storage: Nonfungible TokenChildren (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:2)
fn accept_nft() -> Weight {
- (79_159_000 as Weight)
+ (81_954_000 as Weight)
.saturating_add(T::DbWeight::get().reads(15 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
// Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:5)
// Storage: Nonfungible TokenProperties (r:1 w:5)
- // Storage: Nonfungible TokenData (r:5 w:5)
// Storage: Nonfungible TokenChildren (r:9 w:4)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:5 w:5)
// Storage: Nonfungible Allowance (r:5 w:0)
// Storage: Nonfungible Owned (r:0 w:5)
fn reject_nft() -> Weight {
- (238_179_000 as Weight)
+ (250_041_000 as Weight)
.saturating_add(T::DbWeight::get().reads(29 as Weight))
.saturating_add(T::DbWeight::get().writes(25 as Weight))
}
@@ -188,7 +185,7 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:5 w:0)
fn set_property() -> Weight {
- (47_770_000 as Weight)
+ (48_631_000 as Weight)
.saturating_add(T::DbWeight::get().reads(9 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -198,100 +195,72 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:5 w:0)
fn set_priority() -> Weight {
- (46_679_000 as Weight)
+ (47_830_000 as Weight)
.saturating_add(T::DbWeight::get().reads(9 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_basic_resource() -> Weight {
- (100_770_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(16 as Weight))
- .saturating_add(T::DbWeight::get().writes(12 as Weight))
+ (54_773_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(10 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_composable_resource() -> Weight {
- (101_791_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(16 as Weight))
- .saturating_add(T::DbWeight::get().writes(12 as Weight))
+ (55_214_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(10 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_slot_resource() -> Weight {
- (101_610_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(16 as Weight))
- .saturating_add(T::DbWeight::get().writes(12 as Weight))
+ (54_863_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(10 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:2 w:0)
- // Storage: Common CollectionById (r:2 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
- // Storage: Nonfungible TokenData (r:6 w:1)
- // Storage: Nonfungible TokenChildren (r:1 w:0)
- // Storage: Nonfungible TokensBurnt (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Allowance (r:1 w:0)
- // Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
+ // Storage: Nonfungible TokenData (r:5 w:0)
fn remove_resource() -> Weight {
- (80_571_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(16 as Weight))
- .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ (46_848_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(9 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
// Storage: Common CollectionById (r:1 w:0)
// Storage: Nonfungible TokenData (r:5 w:0)
- // Storage: Nonfungible TokenProperties (r:2 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn accept_resource() -> Weight {
- (54_733_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(10 as Weight))
+ (45_635_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(9 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:2 w:0)
- // Storage: Common CollectionById (r:2 w:0)
- // Storage: Nonfungible TokenData (r:6 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:1)
- // Storage: Nonfungible TokenChildren (r:1 w:0)
- // Storage: Nonfungible TokensBurnt (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Allowance (r:1 w:0)
- // Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn accept_resource_removal() -> Weight {
- (84_138_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(17 as Weight))
- .saturating_add(T::DbWeight::get().writes(5 as Weight))
+ (45_535_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(9 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
@@ -306,7 +275,7 @@
// Storage: Common CollectionById (r:0 w:1)
// Storage: RmrkCore UniqueCollectionId (r:0 w:1)
fn create_collection() -> Weight {
- (41_277_000 as Weight)
+ (41_768_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(8 as Weight))
}
@@ -319,7 +288,7 @@
// Storage: Nonfungible TokensBurnt (r:0 w:1)
// Storage: Common AdminAmount (r:0 w:1)
fn destroy_collection() -> Weight {
- (43_371_000 as Weight)
+ (43_402_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -327,7 +296,7 @@
// Storage: Common CollectionById (r:1 w:1)
// Storage: Common CollectionProperties (r:1 w:0)
fn change_collection_issuer() -> Weight {
- (21_891_000 as Weight)
+ (21_711_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -337,7 +306,7 @@
// Storage: Nonfungible TokensMinted (r:1 w:0)
// Storage: Nonfungible TokensBurnt (r:1 w:0)
fn lock_collection() -> Weight {
- (23_144_000 as Weight)
+ (23_204_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -349,18 +318,15 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:2 w:2)
fn mint_nft(b: u32, ) -> Weight {
- (68_329_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((21_470_000 as Weight).saturating_mul(b as Weight))
- .saturating_add(RocksDbWeight::get().reads(12 as Weight))
+ (44_655_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((10_953_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(6 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
- .saturating_add(RocksDbWeight::get().writes(12 as Weight))
- .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
@@ -374,8 +340,8 @@
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_nft(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 959_000
- .saturating_add((305_872_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 3_677_000
+ .saturating_add((357_082_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(9 as Weight))
.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
@@ -391,7 +357,7 @@
// Storage: Nonfungible TokenChildren (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:2)
fn send() -> Weight {
- (71_405_000 as Weight)
+ (73_968_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(12 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -405,22 +371,22 @@
// Storage: Nonfungible TokenChildren (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:2)
fn accept_nft() -> Weight {
- (79_159_000 as Weight)
+ (81_954_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(15 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
// Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:5)
// Storage: Nonfungible TokenProperties (r:1 w:5)
- // Storage: Nonfungible TokenData (r:5 w:5)
// Storage: Nonfungible TokenChildren (r:9 w:4)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:5 w:5)
// Storage: Nonfungible Allowance (r:5 w:0)
// Storage: Nonfungible Owned (r:0 w:5)
fn reject_nft() -> Weight {
- (238_179_000 as Weight)
+ (250_041_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(29 as Weight))
.saturating_add(RocksDbWeight::get().writes(25 as Weight))
}
@@ -430,7 +396,7 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:5 w:0)
fn set_property() -> Weight {
- (47_770_000 as Weight)
+ (48_631_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(9 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -440,99 +406,71 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Nonfungible TokenData (r:5 w:0)
fn set_priority() -> Weight {
- (46_679_000 as Weight)
+ (47_830_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(9 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_basic_resource() -> Weight {
- (100_770_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(16 as Weight))
- .saturating_add(RocksDbWeight::get().writes(12 as Weight))
+ (54_773_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(10 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_composable_resource() -> Weight {
- (101_791_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(16 as Weight))
- .saturating_add(RocksDbWeight::get().writes(12 as Weight))
+ (55_214_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(10 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:1 w:1)
- // Storage: Common CollectionById (r:1 w:1)
- // Storage: Nonfungible TokenData (r:5 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:2)
- // Storage: Common CreatedCollectionCount (r:1 w:1)
- // Storage: Common DestroyedCollectionCount (r:1 w:0)
- // Storage: System Account (r:2 w:2)
- // Storage: Nonfungible TokensMinted (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Owned (r:0 w:1)
- // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn add_slot_resource() -> Weight {
- (101_610_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(16 as Weight))
- .saturating_add(RocksDbWeight::get().writes(12 as Weight))
+ (54_863_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(10 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:2 w:0)
- // Storage: Common CollectionById (r:2 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
- // Storage: Nonfungible TokenData (r:6 w:1)
- // Storage: Nonfungible TokenChildren (r:1 w:0)
- // Storage: Nonfungible TokensBurnt (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Allowance (r:1 w:0)
- // Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
+ // Storage: Nonfungible TokenData (r:5 w:0)
fn remove_resource() -> Weight {
- (80_571_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(16 as Weight))
- .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ (46_848_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(9 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
// Storage: Common CollectionProperties (r:1 w:0)
// Storage: Common CollectionById (r:1 w:0)
// Storage: Nonfungible TokenData (r:5 w:0)
- // Storage: Nonfungible TokenProperties (r:2 w:1)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn accept_resource() -> Weight {
- (54_733_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(10 as Weight))
+ (45_635_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(9 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
- // Storage: Common CollectionProperties (r:2 w:0)
- // Storage: Common CollectionById (r:2 w:0)
- // Storage: Nonfungible TokenData (r:6 w:1)
- // Storage: Nonfungible TokenProperties (r:2 w:1)
- // Storage: Nonfungible TokenChildren (r:1 w:0)
- // Storage: Nonfungible TokensBurnt (r:1 w:1)
- // Storage: Nonfungible AccountBalance (r:1 w:1)
- // Storage: Nonfungible Allowance (r:1 w:0)
- // Storage: Nonfungible Owned (r:0 w:1)
+ // Storage: Common CollectionProperties (r:1 w:0)
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:5 w:0)
+ // Storage: Nonfungible TokenSysProperties (r:1 w:1)
fn accept_resource_removal() -> Weight {
- (84_138_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(17 as Weight))
- .saturating_add(RocksDbWeight::get().writes(5 as Weight))
+ (45_535_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(9 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
}
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -454,6 +454,10 @@
list_benchmark!(list, extra, pallet_refungible, Refungible);
list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);
list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
+
+ #[cfg(not(feature = "unique-runtime"))]
+ list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);
+
// list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
let storage_info = AllPalletsReversedWithSystemFirst::storage_info();
@@ -498,6 +502,10 @@
add_benchmark!(params, batches, pallet_refungible, Refungible);
add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);
add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
+
+ #[cfg(not(feature = "unique-runtime"))]
+ add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);
+
// add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -16,7 +16,7 @@
targets = ['x86_64-unknown-linux-gnu']
[features]
-default = ['std']
+default = ['std', 'unique-runtime']
runtime-benchmarks = [
'hex-literal',
'frame-benchmarking',
@@ -119,6 +119,7 @@
"orml-vesting/std",
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
+unique-runtime = []
################################################################################
# Substrate Dependencies