git.delta.rocks / unique-network / refs/commits / 890b4afabe76

difftreelog

Merge branch 'develop' into feature/CORE-324

Yaroslav Bolyukin2022-04-01parents: #4b84a72 #a961c1a.patch.diff
in: master

17 files changed

modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 RUST_TOOLCHAIN=nightly-2021-11-11
 RUST_C=1.58.0-nightly
-POLKA_VERSION=release-v0.9.17
+POLKA_VERSION=release-v0.9.18
 UNIQUE_BRANCH=develop
 USER=***
 PASS=***
modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5575,7 +5575,7 @@
 
 [[package]]
 name = "opal-runtime"
-version = "0.1.0"
+version = "0.9.18"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
@@ -8709,7 +8709,7 @@
 
 [[package]]
 name = "quartz-runtime"
-version = "0.1.0"
+version = "0.9.18"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
@@ -8723,13 +8723,10 @@
  "fp-evm-mapping",
  "fp-rpc",
  "fp-self-contained",
- "frame-benchmarking",
  "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
- "hex-literal",
  "orml-vesting",
  "pallet-aura",
  "pallet-balances",
@@ -12551,7 +12548,7 @@
 
 [[package]]
 name = "unique-runtime"
-version = "0.9.17"
+version = "0.9.18"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
@@ -12627,7 +12624,7 @@
 
 [[package]]
 name = "unique-runtime-common"
-version = "0.1.0"
+version = "0.9.18"
 dependencies = [
  "fp-rpc",
  "frame-support",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,8 +5,11 @@
     'pallets/*',
     'client/*',
     'primitives/*',
-    'runtime/*',
     'crates/*',
 ]
+exclude = [
+    "runtime/unique",
+    "runtime/quartz"
+]
 [profile.release]
 panic = 'unwind'
modifiedDockerfile-parachaindiffbeforeafterboth
--- a/Dockerfile-parachain
+++ b/Dockerfile-parachain
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM phusion/baseimage:focal-1.0.0 as rust-builder
+FROM phusion/baseimage:focal-1.1.0 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ARG RUST_TOOLCHAIN=nightly-2021-11-11
@@ -77,7 +77,7 @@
 
 # ===== RUN ======
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:focal-1.1.0
 
 ARG PROFILE=release
 
modifiedREADME.mddiffbeforeafterboth
--- a/README.md
+++ b/README.md
@@ -63,12 +63,7 @@
 
 5. Build:
 ```bash
-cargo build
-```
-
-optionally, build in release:
-```bash
-cargo build --release
+cargo build --features=unique-runtime,quartz-runtime --release
 ```
 
 ## Building as Parachain locally
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -312,7 +312,7 @@
 unique-rpc = { default-features = false, path = "../rpc" }
 
 [features]
-default = ["unique-runtime", "quartz-runtime"]
+default = []
 runtime-benchmarks = [
     'unique-runtime/runtime-benchmarks',
     'polkadot-service/runtime-benchmarks',
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use cumulus_primitives_core::ParaId;
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
 use sp_core::{sr25519, Pair, Public};
@@ -26,6 +25,15 @@
 
 use unique_runtime_common::types::*;
 
+#[cfg(feature = "unique-runtime")]
+use unique_runtime as default_runtime;
+
+#[cfg(all(not(feature = "unique-runtime"), feature = "quartz-runtime"))]
+use quartz_runtime as default_runtime;
+
+#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))]
+use opal_runtime as default_runtime;
+
 /// The `ChainSpec` parameterized for the unique runtime.
 #[cfg(feature = "unique-runtime")]
 pub type UniqueChainSpec = sc_service::GenericChainSpec<unique_runtime::GenesisConfig, Extensions>;
@@ -37,9 +45,22 @@
 /// The `ChainSpec` parameterized for the opal runtime.
 pub type OpalChainSpec = sc_service::GenericChainSpec<opal_runtime::GenesisConfig, Extensions>;
 
+#[cfg(feature = "unique-runtime")]
+pub type DefaultChainSpec = UniqueChainSpec;
+
+#[cfg(all(not(feature = "unique-runtime"), feature = "quartz-runtime"))]
+pub type DefaultChainSpec = QuartzChainSpec;
+
+#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))]
+pub type DefaultChainSpec = OpalChainSpec;
+
 pub enum RuntimeId {
+	#[cfg(feature = "unique-runtime")]
 	Unique,
+
+	#[cfg(feature = "quartz-runtime")]
 	Quartz,
+
 	Opal,
 	Unknown(String),
 }
@@ -51,12 +72,12 @@
 impl RuntimeIdentification for Box<dyn sc_service::ChainSpec> {
 	fn runtime_id(&self) -> RuntimeId {
 		#[cfg(feature = "unique-runtime")]
-		if self.id().starts_with("unique") {
+		if self.id().starts_with("unique") || self.id().starts_with("unq") {
 			return RuntimeId::Unique;
 		}
 
 		#[cfg(feature = "quartz-runtime")]
-		if self.id().starts_with("quartz") {
+		if self.id().starts_with("quartz") || self.id().starts_with("qtz") {
 			return RuntimeId::Quartz;
 		}
 
@@ -121,20 +142,66 @@
 	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
 
+macro_rules! testnet_genesis {
+	(
+		$runtime:path,
+		$root_key:expr,
+		$initial_authorities:expr,
+		$endowed_accounts:expr,
+		$id:expr
+	) => {{
+		use $runtime::*;
+
+		GenesisConfig {
+			system: SystemConfig {
+				code: WASM_BINARY
+					.expect("WASM binary was not build, please build it!")
+					.to_vec(),
+			},
+			balances: BalancesConfig {
+				balances: $endowed_accounts
+					.iter()
+					.cloned()
+					// 1e13 UNQ
+					.map(|k| (k, 1 << 100))
+					.collect(),
+			},
+			treasury: Default::default(),
+			sudo: SudoConfig {
+				key: Some($root_key),
+			},
+			vesting: VestingConfig { vesting: vec![] },
+			parachain_info: ParachainInfoConfig {
+				parachain_id: $id.into(),
+			},
+			parachain_system: Default::default(),
+			aura: AuraConfig {
+				authorities: $initial_authorities,
+			},
+			aura_ext: Default::default(),
+			evm: EVMConfig {
+				accounts: BTreeMap::new(),
+			},
+			ethereum: EthereumConfig {},
+		}
+	}};
+}
+
 pub fn development_config() -> OpalChainSpec {
 	let mut properties = Map::new();
-	properties.insert("tokenSymbol".into(), "OPL".into());
-	properties.insert("tokenDecimals".into(), 15.into());
-	properties.insert("ss58Format".into(), 42.into());
+	properties.insert("tokenSymbol".into(), opal_runtime::TOKEN_SYMBOL.into());
+	properties.insert("tokenDecimals".into(), 18.into());
+	properties.insert("ss58Format".into(), opal_runtime::SS58Prefix::get().into());
 
 	OpalChainSpec::from_genesis(
 		// Name
-		"Development",
+		"OPAL by UNIQUE",
 		// ID
-		"dev",
+		"opal_dev",
 		ChainType::Local,
 		move || {
-			testnet_genesis(
+			testnet_genesis!(
+				opal_runtime,
 				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				vec![
@@ -146,7 +213,7 @@
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
 					get_account_id_from_seed::<sr25519::Public>("Bob"),
 				],
-				1000.into(),
+				1000
 			)
 		},
 		// Bootnodes
@@ -166,15 +233,33 @@
 	)
 }
 
-pub fn local_testnet_rococo_config() -> OpalChainSpec {
-	OpalChainSpec::from_genesis(
+pub fn local_testnet_rococo_config() -> DefaultChainSpec {
+	let mut properties = Map::new();
+	properties.insert("tokenSymbol".into(), default_runtime::TOKEN_SYMBOL.into());
+	properties.insert("tokenDecimals".into(), 18.into());
+	properties.insert(
+		"ss58Format".into(),
+		default_runtime::SS58Prefix::get().into(),
+	);
+
+	DefaultChainSpec::from_genesis(
 		// Name
-		"Local Testnet",
+		format!(
+			"{}{}",
+			default_runtime::RUNTIME_NAME.to_uppercase(),
+			if cfg!(feature = "unique-runtime") {
+				""
+			} else {
+				" by UNIQUE"
+			}
+		)
+		.as_str(),
 		// ID
-		"local_testnet",
+		format!("{}_local", default_runtime::RUNTIME_NAME).as_str(),
 		ChainType::Local,
 		move || {
-			testnet_genesis(
+			testnet_genesis!(
+				default_runtime,
 				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				vec![
@@ -196,7 +281,7 @@
 					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 				],
-				1000.into(),
+				1000
 			)
 		},
 		// Bootnodes
@@ -207,51 +292,11 @@
 		None,
 		None,
 		// Properties
-		None,
+		Some(properties),
 		// Extensions
 		Extensions {
 			relay_chain: "rococo-local".into(),
 			para_id: 1000,
 		},
 	)
-}
-
-fn testnet_genesis(
-	root_key: AccountId,
-	initial_authorities: Vec<AuraId>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> opal_runtime::GenesisConfig {
-	use opal_runtime::*;
-
-	GenesisConfig {
-		system: SystemConfig {
-			code: WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-		},
-		balances: BalancesConfig {
-			balances: endowed_accounts
-				.iter()
-				.cloned()
-				// 1e13 UNQ
-				.map(|k| (k, 1 << 100))
-				.collect(),
-		},
-		treasury: Default::default(),
-		sudo: SudoConfig {
-			key: Some(root_key),
-		},
-		vesting: VestingConfig { vesting: vec![] },
-		parachain_info: ParachainInfoConfig { parachain_id: id },
-		parachain_system: Default::default(),
-		aura: AuraConfig {
-			authorities: initial_authorities,
-		},
-		aura_ext: Default::default(),
-		evm: EVMConfig {
-			accounts: BTreeMap::new(),
-		},
-		ethereum: EthereumConfig {},
-	}
 }
modifiednode/cli/src/service.rsdiffbeforeafterboth
before · node/cli/src/service.rs
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//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.1819// std20use std::sync::Arc;21use std::sync::Mutex;22use std::collections::BTreeMap;23use std::time::Duration;24use fc_rpc_core::types::FeeHistoryCache;25use futures::StreamExt;2627use unique_rpc::overrides_handle;2829use serde::{Serialize, Deserialize};3031// Cumulus Imports32use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};33use cumulus_client_consensus_common::ParachainConsensus;34use cumulus_client_service::{35	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,36};37use cumulus_client_cli::CollatorOptions;38use cumulus_client_network::BlockAnnounceValidator;39use cumulus_primitives_core::ParaId;40use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;41use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};42use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface;4344// Substrate Imports45use sc_client_api::ExecutorProvider;46use sc_executor::NativeElseWasmExecutor;47use sc_executor::NativeExecutionDispatch;48use sc_network::NetworkService;49use sc_service::{BasePath, Configuration, PartialComponents, Role, TaskManager};50use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};51use sp_keystore::SyncCryptoStorePtr;52use sp_runtime::traits::BlakeTwo256;53use substrate_prometheus_endpoint::Registry;54use sc_client_api::BlockchainEvents;5556use polkadot_service::CollatorPair;5758// Frontier Imports59use fc_rpc_core::types::FilterPool;60use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};6162use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};6364/// Native executor instance.65pub struct UniqueRuntimeExecutor;66pub struct QuartzRuntimeExecutor;67pub struct OpalRuntimeExecutor;6869#[cfg(feature = "unique-runtime")]70impl NativeExecutionDispatch for UniqueRuntimeExecutor {71	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;7273	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {74		unique_runtime::api::dispatch(method, data)75	}7677	fn native_version() -> sc_executor::NativeVersion {78		unique_runtime::native_version()79	}80}8182#[cfg(feature = "quartz-runtime")]83impl NativeExecutionDispatch for QuartzRuntimeExecutor {84	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;8586	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {87		quartz_runtime::api::dispatch(method, data)88	}8990	fn native_version() -> sc_executor::NativeVersion {91		quartz_runtime::native_version()92	}93}9495impl NativeExecutionDispatch for OpalRuntimeExecutor {96	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;9798	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {99		opal_runtime::api::dispatch(method, data)100	}101102	fn native_version() -> sc_executor::NativeVersion {103		opal_runtime::native_version()104	}105}106107pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {108	let config_dir = config109		.base_path110		.as_ref()111		.map(|base_path| base_path.config_dir(config.chain_spec.id()))112		.unwrap_or_else(|| {113			BasePath::from_project("", "", "unique").config_dir(config.chain_spec.id())114		});115	let database_dir = config_dir.join("frontier").join("db");116117	Ok(Arc::new(fc_db::Backend::<Block>::new(118		&fc_db::DatabaseSettings {119			source: fc_db::DatabaseSettingsSrc::RocksDb {120				path: database_dir,121				cache_size: 0,122			},123		},124	)?))125}126127type FullClient<RuntimeApi, ExecutorDispatch> =128	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;129type FullBackend = sc_service::TFullBackend<Block>;130type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;131132/// Starts a `ServiceBuilder` for a full service.133///134/// Use this macro if you don't actually need the full service, but just the builder in order to135/// be able to perform chain operations.136#[allow(clippy::type_complexity)]137pub fn new_partial<RuntimeApi, ExecutorDispatch, BIQ>(138	config: &Configuration,139	build_import_queue: BIQ,140) -> Result<141	PartialComponents<142		FullClient<RuntimeApi, ExecutorDispatch>,143		FullBackend,144		FullSelectChain,145		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,146		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,147		(148			Option<Telemetry>,149			Option<FilterPool>,150			Arc<fc_db::Backend<Block>>,151			Option<TelemetryWorkerHandle>,152			FeeHistoryCache,153		),154	>,155	sc_service::Error,156>157where158	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,159	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>160		+ Send161		+ Sync162		+ 'static,163	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,164	ExecutorDispatch: NativeExecutionDispatch + 'static,165	BIQ: FnOnce(166		Arc<FullClient<RuntimeApi, ExecutorDispatch>>,167		&Configuration,168		Option<TelemetryHandle>,169		&TaskManager,170	) -> Result<171		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,172		sc_service::Error,173	>,174{175	let _telemetry = config176		.telemetry_endpoints177		.clone()178		.filter(|x| !x.is_empty())179		.map(|endpoints| -> Result<_, sc_telemetry::Error> {180			let worker = TelemetryWorker::new(16)?;181			let telemetry = worker.handle().new_telemetry(endpoints);182			Ok((worker, telemetry))183		})184		.transpose()?;185186	let telemetry = config187		.telemetry_endpoints188		.clone()189		.filter(|x| !x.is_empty())190		.map(|endpoints| -> Result<_, sc_telemetry::Error> {191			let worker = TelemetryWorker::new(16)?;192			let telemetry = worker.handle().new_telemetry(endpoints);193			Ok((worker, telemetry))194		})195		.transpose()?;196197	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(198		config.wasm_method,199		config.default_heap_pages,200		config.max_runtime_instances,201		config.runtime_cache_size,202	);203204	let (client, backend, keystore_container, task_manager) =205		sc_service::new_full_parts::<Block, RuntimeApi, _>(206			config,207			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),208			executor,209		)?;210	let client = Arc::new(client);211212	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());213214	let telemetry = telemetry.map(|(worker, telemetry)| {215		task_manager216			.spawn_handle()217			.spawn("telemetry", None, worker.run());218		telemetry219	});220221	let select_chain = sc_consensus::LongestChain::new(backend.clone());222223	let transaction_pool = sc_transaction_pool::BasicPool::new_full(224		config.transaction_pool.clone(),225		config.role.is_authority().into(),226		config.prometheus_registry(),227		task_manager.spawn_essential_handle(),228		client.clone(),229	);230231	let filter_pool: Option<FilterPool> = Some(Arc::new(Mutex::new(BTreeMap::new())));232233	let frontier_backend = open_frontier_backend(config)?;234235	let import_queue = build_import_queue(236		client.clone(),237		config,238		telemetry.as_ref().map(|telemetry| telemetry.handle()),239		&task_manager,240	)?;241	let fee_history_cache: FeeHistoryCache = Arc::new(Mutex::new(BTreeMap::new()));242243	let params = PartialComponents {244		backend,245		client,246		import_queue,247		keystore_container,248		task_manager,249		transaction_pool,250		select_chain,251		other: (252			telemetry,253			filter_pool,254			frontier_backend,255			telemetry_worker_handle,256			fee_history_cache,257		),258	};259260	Ok(params)261}262263async fn build_relay_chain_interface(264	polkadot_config: Configuration,265	parachain_config: &Configuration,266	telemetry_worker_handle: Option<TelemetryWorkerHandle>,267	task_manager: &mut TaskManager,268	collator_options: CollatorOptions,269) -> RelayChainResult<(270	Arc<(dyn RelayChainInterface + 'static)>,271	Option<CollatorPair>,272)> {273	match collator_options.relay_chain_rpc_url {274		Some(relay_chain_url) => Ok((275			Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>,276			None,277		)),278		None => build_inprocess_relay_chain(279			polkadot_config,280			parachain_config,281			telemetry_worker_handle,282			task_manager,283		),284	}285}286287/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.288///289/// This is the actual implementation that is abstract over the executor and the runtime api.290#[sc_tracing::logging::prefix_logs_with("Parachain")]291async fn start_node_impl<Runtime, RuntimeApi, ExecutorDispatch, BIQ, BIC>(292	parachain_config: Configuration,293	polkadot_config: Configuration,294	collator_options: CollatorOptions,295	id: ParaId,296	build_import_queue: BIQ,297	build_consensus: BIC,298) -> sc_service::error::Result<(TaskManager, Arc<FullClient<RuntimeApi, ExecutorDispatch>>)>299where300	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,301	Runtime: RuntimeInstance + Send + Sync + 'static,302	<Runtime as RuntimeInstance>::CrossAccountId: Serialize,303	for<'de> <Runtime as RuntimeInstance>::CrossAccountId: Deserialize<'de>,304	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>305		+ Send306		+ Sync307		+ 'static,308	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>309		+ fp_rpc::EthereumRuntimeRPCApi<Block>310		+ sp_session::SessionKeys<Block>311		+ sp_block_builder::BlockBuilder<Block>312		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>313		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>314		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>315		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>316		+ sp_api::Metadata<Block>317		+ sp_offchain::OffchainWorkerApi<Block>318		+ cumulus_primitives_core::CollectCollationInfo<Block>,319	ExecutorDispatch: NativeExecutionDispatch + 'static,320	BIQ: FnOnce(321		Arc<FullClient<RuntimeApi, ExecutorDispatch>>,322		&Configuration,323		Option<TelemetryHandle>,324		&TaskManager,325	) -> Result<326		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,327		sc_service::Error,328	>,329	BIC: FnOnce(330		Arc<FullClient<RuntimeApi, ExecutorDispatch>>,331		Option<&Registry>,332		Option<TelemetryHandle>,333		&TaskManager,334		Arc<dyn RelayChainInterface>,335		Arc<sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>>,336		Arc<NetworkService<Block, Hash>>,337		SyncCryptoStorePtr,338		bool,339	) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,340{341	if matches!(parachain_config.role, Role::Light) {342		return Err("Light client not supported!".into());343	}344345	let parachain_config = prepare_node_config(parachain_config);346347	let params =348		new_partial::<RuntimeApi, ExecutorDispatch, BIQ>(&parachain_config, build_import_queue)?;349	let (mut telemetry, filter_pool, frontier_backend, telemetry_worker_handle, fee_history_cache) =350		params.other;351352	let client = params.client.clone();353	let backend = params.backend.clone();354	let mut task_manager = params.task_manager;355356	let (relay_chain_interface, collator_key) = build_relay_chain_interface(357		polkadot_config,358		&parachain_config,359		telemetry_worker_handle,360		&mut task_manager,361		collator_options.clone(),362	)363	.await364	.map_err(|e| match e {365		RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x,366		s => s.to_string().into(),367	})?;368369	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);370371	let force_authoring = parachain_config.force_authoring;372	let validator = parachain_config.role.is_authority();373	let prometheus_registry = parachain_config.prometheus_registry().cloned();374	let transaction_pool = params.transaction_pool.clone();375	let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue);376377	let (network, system_rpc_tx, start_network) =378		sc_service::build_network(sc_service::BuildNetworkParams {379			config: &parachain_config,380			client: client.clone(),381			transaction_pool: transaction_pool.clone(),382			spawn_handle: task_manager.spawn_handle(),383			import_queue: import_queue.clone(),384			block_announce_validator_builder: Some(Box::new(|_| {385				Box::new(block_announce_validator)386			})),387			warp_sync: None,388		})?;389390	let subscription_executor = sc_rpc::SubscriptionTaskExecutor::new(task_manager.spawn_handle());391	let rpc_client = client.clone();392	let rpc_pool = transaction_pool.clone();393	let select_chain = params.select_chain.clone();394	let rpc_network = network.clone();395396	let rpc_frontier_backend = frontier_backend.clone();397398	let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(399		task_manager.spawn_handle(),400		overrides_handle::<_, _, Runtime>(client.clone()),401		50,402		50,403	));404405	let rpc_extensions_builder = Box::new(move |deny_unsafe, _| {406		let full_deps = unique_rpc::FullDeps {407			backend: rpc_frontier_backend.clone(),408			deny_unsafe,409			client: rpc_client.clone(),410			pool: rpc_pool.clone(),411			graph: rpc_pool.pool().clone(),412			// TODO: Unhardcode413			enable_dev_signer: false,414			filter_pool: filter_pool.clone(),415			network: rpc_network.clone(),416			select_chain: select_chain.clone(),417			is_authority: validator,418			// TODO: Unhardcode419			max_past_logs: 10000,420			block_data_cache: block_data_cache.clone(),421			fee_history_cache: fee_history_cache.clone(),422			// TODO: Unhardcode423			fee_history_limit: 2048,424		};425426		Ok(427			unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(428				full_deps,429				subscription_executor.clone(),430			),431		)432	});433434	task_manager.spawn_essential_handle().spawn(435		"frontier-mapping-sync-worker",436		None,437		MappingSyncWorker::new(438			client.import_notification_stream(),439			Duration::new(6, 0),440			client.clone(),441			backend.clone(),442			frontier_backend.clone(),443			SyncStrategy::Normal,444		)445		.for_each(|()| futures::future::ready(())),446	);447448	sc_service::spawn_tasks(sc_service::SpawnTasksParams {449		rpc_extensions_builder,450		client: client.clone(),451		transaction_pool: transaction_pool.clone(),452		task_manager: &mut task_manager,453		config: parachain_config,454		keystore: params.keystore_container.sync_keystore(),455		backend: backend.clone(),456		network: network.clone(),457		system_rpc_tx,458		telemetry: telemetry.as_mut(),459	})?;460461	let announce_block = {462		let network = network.clone();463		Arc::new(move |hash, data| network.announce_block(hash, data))464	};465466	let relay_chain_slot_duration = Duration::from_secs(6);467468	if validator {469		let parachain_consensus = build_consensus(470			client.clone(),471			prometheus_registry.as_ref(),472			telemetry.as_ref().map(|t| t.handle()),473			&task_manager,474			relay_chain_interface.clone(),475			transaction_pool,476			network,477			params.keystore_container.sync_keystore(),478			force_authoring,479		)?;480481		let spawner = task_manager.spawn_handle();482483		let params = StartCollatorParams {484			para_id: id,485			block_status: client.clone(),486			announce_block,487			client: client.clone(),488			task_manager: &mut task_manager,489			spawner,490			parachain_consensus,491			import_queue,492			collator_key: collator_key.expect("Command line arguments do not allow this. qed"),493			relay_chain_interface,494			relay_chain_slot_duration,495		};496497		start_collator(params).await?;498	} else {499		let params = StartFullNodeParams {500			client: client.clone(),501			announce_block,502			task_manager: &mut task_manager,503			para_id: id,504			import_queue,505			relay_chain_interface,506			relay_chain_slot_duration,507			collator_options,508		};509510		start_full_node(params)?;511	}512513	start_network.start_network();514515	Ok((task_manager, client))516}517518/// Build the import queue for the the parachain runtime.519pub fn parachain_build_import_queue<RuntimeApi, ExecutorDispatch>(520	client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,521	config: &Configuration,522	telemetry: Option<TelemetryHandle>,523	task_manager: &TaskManager,524) -> Result<525	sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,526	sc_service::Error,527>528where529	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>530		+ Send531		+ Sync532		+ 'static,533	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>534		+ sp_block_builder::BlockBuilder<Block>535		+ sp_consensus_aura::AuraApi<Block, AuraId>536		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>,537	ExecutorDispatch: NativeExecutionDispatch + 'static,538{539	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;540541	cumulus_client_consensus_aura::import_queue::<542		sp_consensus_aura::sr25519::AuthorityPair,543		_,544		_,545		_,546		_,547		_,548		_,549	>(cumulus_client_consensus_aura::ImportQueueParams {550		block_import: client.clone(),551		client: client.clone(),552		create_inherent_data_providers: move |_, _| async move {553			let time = sp_timestamp::InherentDataProvider::from_system_time();554555			let slot =556				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(557					*time,558					slot_duration,559				);560561			Ok((time, slot))562		},563		registry: config.prometheus_registry(),564		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),565		spawner: &task_manager.spawn_essential_handle(),566		telemetry,567	})568	.map_err(Into::into)569}570571/// Start a normal parachain node.572pub async fn start_node<Runtime, RuntimeApi, ExecutorDispatch>(573	parachain_config: Configuration,574	polkadot_config: Configuration,575	collator_options: CollatorOptions,576	id: ParaId,577) -> sc_service::error::Result<(TaskManager, Arc<FullClient<RuntimeApi, ExecutorDispatch>>)>578where579	Runtime: RuntimeInstance + Send + Sync + 'static,580	<Runtime as RuntimeInstance>::CrossAccountId: Serialize,581	for<'de> <Runtime as RuntimeInstance>::CrossAccountId: Deserialize<'de>,582	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>583		+ Send584		+ Sync585		+ 'static,586	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>587		+ fp_rpc::EthereumRuntimeRPCApi<Block>588		+ sp_session::SessionKeys<Block>589		+ sp_block_builder::BlockBuilder<Block>590		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>591		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>592		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>593		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>594		+ sp_api::Metadata<Block>595		+ sp_offchain::OffchainWorkerApi<Block>596		+ cumulus_primitives_core::CollectCollationInfo<Block>597		+ sp_consensus_aura::AuraApi<Block, AuraId>,598	ExecutorDispatch: NativeExecutionDispatch + 'static,599{600	start_node_impl::<Runtime, RuntimeApi, ExecutorDispatch, _, _>(601		parachain_config,602		polkadot_config,603		collator_options,604		id,605		parachain_build_import_queue,606		|client,607		 prometheus_registry,608		 telemetry,609		 task_manager,610		 relay_chain_interface,611		 transaction_pool,612		 sync_oracle,613		 keystore,614		 force_authoring| {615			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;616617			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(618				task_manager.spawn_handle(),619				client.clone(),620				transaction_pool,621				prometheus_registry,622				telemetry.clone(),623			);624625			Ok(AuraConsensus::build::<626				sp_consensus_aura::sr25519::AuthorityPair,627				_,628				_,629				_,630				_,631				_,632				_,633			>(BuildAuraConsensusParams {634				proposer_factory,635				create_inherent_data_providers: move |_, (relay_parent, validation_data)| {636					let relay_chain_interface = relay_chain_interface.clone();637					async move {638						let parachain_inherent =639						cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(640							relay_parent,641							&relay_chain_interface,642							&validation_data,643							id,644						).await;645646						let time = sp_timestamp::InherentDataProvider::from_system_time();647648						let slot =649						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(650							*time,651							slot_duration,652						);653654						let parachain_inherent = parachain_inherent.ok_or_else(|| {655							Box::<dyn std::error::Error + Send + Sync>::from(656								"Failed to create parachain inherent",657							)658						})?;659						Ok((time, slot, parachain_inherent))660					}661				},662				block_import: client.clone(),663				para_client: client,664				backoff_authoring_blocks: Option::<()>::None,665				sync_oracle,666				keystore,667				force_authoring,668				slot_duration,669				// We got around 500ms for proposing670				block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),671				telemetry,672				max_block_proposal_slot_portion: None,673			}))674		},675	)676	.await677}678679fn dev_build_import_queue<RuntimeApi, ExecutorDispatch>(680	client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,681	config: &Configuration,682	_: Option<TelemetryHandle>,683	task_manager: &TaskManager,684) -> Result<685	sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,686	sc_service::Error,687>688where689	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>690		+ Send691		+ Sync692		+ 'static,693	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>694		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>,695	ExecutorDispatch: NativeExecutionDispatch + 'static,696{697	Ok(sc_consensus_manual_seal::import_queue(698		Box::new(client.clone()),699		&task_manager.spawn_essential_handle(),700		config.prometheus_registry(),701	))702}703704/// Builds a new development service. This service uses instant seal, and mocks705/// the parachain inherent706pub fn start_dev_node<Runtime, RuntimeApi, ExecutorDispatch>(707	config: Configuration,708) -> sc_service::error::Result<TaskManager>709where710	Runtime: RuntimeInstance + Send + Sync + 'static,711	<Runtime as RuntimeInstance>::CrossAccountId: Serialize,712	for<'de> <Runtime as RuntimeInstance>::CrossAccountId: Deserialize<'de>,713	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>714		+ Send715		+ Sync716		+ 'static,717	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>718		+ fp_rpc::EthereumRuntimeRPCApi<Block>719		+ sp_session::SessionKeys<Block>720		+ sp_block_builder::BlockBuilder<Block>721		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>722		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>723		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>724		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>725		+ sp_api::Metadata<Block>726		+ sp_offchain::OffchainWorkerApi<Block>727		+ cumulus_primitives_core::CollectCollationInfo<Block>728		+ sp_consensus_aura::AuraApi<Block, AuraId>,729	ExecutorDispatch: NativeExecutionDispatch + 'static,730{731	use futures::Stream;732	use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};733	use fc_consensus::FrontierBlockImport;734	use sc_client_api::HeaderBackend;735736	let sc_service::PartialComponents {737		client,738		backend,739		mut task_manager,740		import_queue,741		keystore_container,742		select_chain: maybe_select_chain,743		transaction_pool,744		other:745			(telemetry, filter_pool, frontier_backend, _telemetry_worker_handle, fee_history_cache),746	} = new_partial::<RuntimeApi, ExecutorDispatch, _>(747		&config,748		dev_build_import_queue::<RuntimeApi, ExecutorDispatch>,749	)?;750751	let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(752		task_manager.spawn_handle(),753		overrides_handle::<_, _, Runtime>(client.clone()),754		50,755		50,756	));757758	let (network, system_rpc_tx, network_starter) =759		sc_service::build_network(sc_service::BuildNetworkParams {760			config: &config,761			client: client.clone(),762			transaction_pool: transaction_pool.clone(),763			spawn_handle: task_manager.spawn_handle(),764			import_queue,765			block_announce_validator_builder: None,766			warp_sync: None,767		})?;768769	if config.offchain_worker.enabled {770		sc_service::build_offchain_workers(771			&config,772			task_manager.spawn_handle(),773			client.clone(),774			network.clone(),775		);776	}777778	let prometheus_registry = config.prometheus_registry().cloned();779	let collator = config.role.is_authority();780781	let select_chain = maybe_select_chain.clone();782783	if collator {784		let block_import =785			FrontierBlockImport::new(client.clone(), client.clone(), frontier_backend.clone());786787		let env = sc_basic_authorship::ProposerFactory::new(788			task_manager.spawn_handle(),789			client.clone(),790			transaction_pool.clone(),791			prometheus_registry.as_ref(),792			telemetry.as_ref().map(|x| x.handle()),793		);794795		let commands_stream: Box<dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin> =796			Box::new(797				// This bit cribbed from the implementation of instant seal.798				transaction_pool799					.pool()800					.validated_pool()801					.import_notification_stream()802					.map(|_| EngineCommand::SealNewBlock {803						create_empty: true, // was false in Moonbeam804						finalize: false,805						parent_hash: None,806						sender: None,807					}),808			);809810		let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;811		let client_set_aside_for_cidp = client.clone();812813		task_manager.spawn_essential_handle().spawn_blocking(814			"authorship_task",815			Some("block-authoring"),816			run_manual_seal(ManualSealParams {817				block_import,818				env,819				client: client.clone(),820				pool: transaction_pool.clone(),821				commands_stream,822				select_chain: select_chain.clone(),823				consensus_data_provider: None,824				create_inherent_data_providers: move |block: Hash, ()| {825					let current_para_block = client_set_aside_for_cidp826						.number(block)827						.expect("Header lookup should succeed")828						.expect("Header passed in as parent should be present in backend.");829830					let client_for_xcm = client_set_aside_for_cidp.clone();831					async move {832						let time = sp_timestamp::InherentDataProvider::from_system_time();833834						let mocked_parachain = cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider {835							current_para_block,836							relay_offset: 1000,837							relay_blocks_per_para_block: 2,838							xcm_config: cumulus_primitives_parachain_inherent::MockXcmConfig::new(839								&*client_for_xcm,840								block,841								Default::default(),842								Default::default(),843							),844							raw_downward_messages: vec![],845							raw_horizontal_messages: vec![],846						};847848						let slot =849						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(850							*time,851							slot_duration,852						);853854						Ok((time, slot, mocked_parachain))855					}856				},857			}),858		);859	}860861	task_manager.spawn_essential_handle().spawn(862		"frontier-mapping-sync-worker",863		Some("block-authoring"),864		MappingSyncWorker::new(865			client.import_notification_stream(),866			Duration::new(6, 0),867			client.clone(),868			backend.clone(),869			frontier_backend.clone(),870			SyncStrategy::Normal,871		)872		.for_each(|()| futures::future::ready(())),873	);874875	let subscription_executor = sc_rpc::SubscriptionTaskExecutor::new(task_manager.spawn_handle());876	let rpc_client = client.clone();877	let rpc_pool = transaction_pool.clone();878	let rpc_network = network.clone();879	let rpc_frontier_backend = frontier_backend.clone();880	let rpc_extensions_builder = Box::new(move |deny_unsafe, _| {881		let full_deps = unique_rpc::FullDeps {882			backend: rpc_frontier_backend.clone(),883			deny_unsafe,884			client: rpc_client.clone(),885			pool: rpc_pool.clone(),886			graph: rpc_pool.pool().clone(),887			// TODO: Unhardcode888			enable_dev_signer: false,889			filter_pool: filter_pool.clone(),890			network: rpc_network.clone(),891			select_chain: select_chain.clone(),892			is_authority: collator,893			// TODO: Unhardcode894			max_past_logs: 10000,895			block_data_cache: block_data_cache.clone(),896			fee_history_cache: fee_history_cache.clone(),897			// TODO: Unhardcode898			fee_history_limit: 2048,899		};900901		Ok(902			unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(903				full_deps,904				subscription_executor.clone(),905			),906		)907	});908909	sc_service::spawn_tasks(sc_service::SpawnTasksParams {910		network,911		client,912		keystore: keystore_container.sync_keystore(),913		task_manager: &mut task_manager,914		transaction_pool,915		rpc_extensions_builder,916		backend,917		system_rpc_tx,918		config,919		telemetry: None,920	})?;921922	network_starter.start_network();923	Ok(task_manager)924}
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -24,12 +24,13 @@
 use up_sponsorship::SponsorshipHandler;
 use core::marker::PhantomData;
 use core::convert::TryInto;
-use up_data_structs::TokenId;
 use pallet_evm::account::CrossAccountId;
 
-use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};
+use pallet_nonfungible::erc::{
+	UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call,
+};
 use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
-use up_data_structs::{CreateItemData, CreateNftData};
+use up_data_structs::{TokenId, CreateItemData, CreateNftData};
 
 pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
 impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
@@ -50,6 +51,18 @@
 						let token_id: TokenId = token_id.try_into().ok()?;
 						withdraw_transfer::<T>(&collection, &who, &token_id).map(|()| sponsor)
 					}
+					UniqueNFTCall::ERC721Mintable(
+						ERC721MintableCall::Mint { token_id, .. }
+						| ERC721MintableCall::MintWithTokenUri { token_id, .. },
+					) => {
+						let _token_id: TokenId = token_id.try_into().ok()?;
+						withdraw_create_item::<T>(
+							&collection,
+							&who,
+							&CreateItemData::NFT(CreateNftData::default()),
+						)
+						.map(|()| sponsor)
+					}
 					UniqueNFTCall::ERC721(ERC721Call::TransferFrom { token_id, from, .. }) => {
 						let token_id: TokenId = token_id.try_into().ok()?;
 						let from = T::CrossAccountId::from_eth(from);
@@ -60,18 +73,6 @@
 						withdraw_approve::<T>(&collection, who.as_sub(), &token_id)
 							.map(|()| sponsor)
 					}
-					UniqueNFTCall::ERC721Mintable(call) => match call {
-						pallet_nonfungible::erc::ERC721MintableCall::Mint { .. }
-						| pallet_nonfungible::erc::ERC721MintableCall::MintWithTokenUri {
-							..
-						} => withdraw_create_item(
-							&collection,
-							who.as_sub(),
-							&CreateItemData::NFT(CreateNftData::default()),
-						)
-						.map(|()| sponsor),
-						_ => None,
-					},
 					_ => None,
 				}
 			}
modifiedpallets/unique/src/sponsorship.rsdiffbeforeafterboth
--- a/pallets/unique/src/sponsorship.rs
+++ b/pallets/unique/src/sponsorship.rs
@@ -103,7 +103,7 @@
 
 pub fn withdraw_create_item<T: Config>(
 	collection: &CollectionHandle<T>,
-	who: &T::AccountId,
+	who: &T::CrossAccountId,
 	_properties: &CreateItemData,
 ) -> Option<()> {
 	if _properties.data_size() as u32 > collection.limits.sponsored_data_size() {
@@ -120,14 +120,14 @@
 			CreateItemData::ReFungible(_) => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
 		});
 
-	if let Some(last_tx_block) = <CreateItemBasket<T>>::get((collection.id, &who)) {
+	if let Some(last_tx_block) = <CreateItemBasket<T>>::get((collection.id, who.as_sub())) {
 		let timeout = last_tx_block + limit.into();
 		if block_number < timeout {
 			return None;
 		}
 	}
 
-	CreateItemBasket::<T>::insert((collection.id, who.clone()), block_number);
+	CreateItemBasket::<T>::insert((collection.id, who.as_sub()), block_number);
 
 	Some(())
 }
@@ -246,7 +246,12 @@
 				..
 			} => {
 				let (sponsor, collection) = load(*collection_id)?;
-				withdraw_create_item::<T>(&collection, who, data).map(|()| sponsor)
+				withdraw_create_item::<T>(
+					&collection,
+					&T::CrossAccountId::from_sub(who.clone()),
+					data,
+				)
+				.map(|()| sponsor)
 			}
 			Call::transfer {
 				collection_id,
modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -6,7 +6,7 @@
 license = 'All Rights Reserved'
 name = 'unique-runtime-common'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.1.0'
+version = '0.9.18'
 
 [features]
 default = ['std']
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -10,7 +10,7 @@
 license = 'GPLv3'
 name = 'opal-runtime'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.1.0'
+version = '0.9.18'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -116,7 +116,8 @@
 
 use unique_runtime_common::{impl_common_runtime_apis, types::*, constants::*};
 
-pub const RUNTIME_NAME: &str = "Opal";
+pub const RUNTIME_NAME: &str = "opal";
+pub const TOKEN_SYMBOL: &str = "OPL";
 
 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
@@ -168,7 +169,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 917004,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -10,7 +10,7 @@
 license = 'GPLv3'
 name = 'quartz-runtime'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.1.0'
+version = '0.9.18'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -116,7 +116,8 @@
 
 use unique_runtime_common::{impl_common_runtime_apis, types::*, constants::*};
 
-pub const RUNTIME_NAME: &str = "Quartz";
+pub const RUNTIME_NAME: &str = "quartz";
+pub const TOKEN_SYMBOL: &str = "QTZ";
 
 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
@@ -153,7 +154,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 917004,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -10,7 +10,7 @@
 license = 'GPLv3'
 name = 'unique-runtime'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.9.17'
+version = '0.9.18'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -115,7 +115,8 @@
 
 use unique_runtime_common::{impl_common_runtime_apis, types::*, constants::*};
 
-pub const RUNTIME_NAME: &str = "Unique";
+pub const RUNTIME_NAME: &str = "unique";
+pub const TOKEN_SYMBOL: &str = "UNQ";
 
 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
@@ -152,7 +153,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 917004,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,