git.delta.rocks / unique-network / refs/commits / 16474c6279e3

difftreelog

build(rmrk) rmrk freed

Fahrrader2022-05-31parent: #c557492.patch.diff
in: master

8 files changed

modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -66,10 +66,10 @@
 use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
 
 // RMRK
-/* TODO free RMRK! use up_data_structs::{
+use up_data_structs::{
 	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
 	RmrkPartType, RmrkTheme,
-};*/
+};
 
 /// Unique native executor instance.
 #[cfg(feature = "unique-runtime")]
@@ -354,7 +354,6 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
-		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -365,7 +364,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		>*/
+		>
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
@@ -661,7 +660,6 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
-		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -672,7 +670,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		>*/
+		>
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
@@ -807,7 +805,6 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
-		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -818,7 +815,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		>*/
+		>
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
before · node/rpc/src/lib.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/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20	StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26	backend::{AuxStore, StorageProvider},27	client::BlockchainEvents,28	StateBackend, Backend,29};30use sc_finality_grandpa::{31	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use unique_runtime_common::types::{44	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,45};46// RMRK47/* TODO free RMRK! use up_data_structs::{48	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,49	RmrkPartType, RmrkTheme,50};*/5152/// Extra dependencies for GRANDPA53pub struct GrandpaDeps<B> {54	/// Voting round info.55	pub shared_voter_state: SharedVoterState,56	/// Authority set info.57	pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,58	/// Receives notifications about justification events from Grandpa.59	pub justification_stream: GrandpaJustificationStream<Block>,60	/// Executor to drive the subscription manager in the Grandpa RPC handler.61	pub subscription_executor: SubscriptionTaskExecutor,62	/// Finality proof provider.63	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,64}6566/// Full client dependencies.67pub struct FullDeps<C, P, SC, CA: ChainApi> {68	/// The client instance to use.69	pub client: Arc<C>,70	/// Transaction pool instance.71	pub pool: Arc<P>,72	/// Graph pool instance.73	pub graph: Arc<Pool<CA>>,74	/// The SelectChain Strategy75	pub select_chain: SC,76	/// The Node authority flag77	pub is_authority: bool,78	/// Whether to enable dev signer79	pub enable_dev_signer: bool,80	/// Network service81	pub network: Arc<NetworkService<Block, Hash>>,82	/// Whether to deny unsafe calls83	pub deny_unsafe: DenyUnsafe,84	/// EthFilterApi pool.85	pub filter_pool: Option<FilterPool>,86	/// Backend.87	pub backend: Arc<fc_db::Backend<Block>>,88	/// Maximum number of logs in a query.89	pub max_past_logs: u32,90	/// Maximum fee history cache size.91	pub fee_history_limit: u64,92	/// Fee history cache.93	pub fee_history_cache: FeeHistoryCache,94	/// Cache for Ethereum block data.95	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,96}9798pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>99where100	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,101	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,102	C: Send + Sync + 'static,103	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,104	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,105	BE: Backend<Block> + 'static,106	BE::State: StateBackend<BlakeTwo256>,107	R: RuntimeInstance + Send + Sync + 'static,108{109	let mut overrides_map = BTreeMap::new();110	overrides_map.insert(111		EthereumStorageSchema::V1,112		Box::new(SchemaV1Override::new(client.clone()))113			as Box<dyn StorageOverride<_> + Send + Sync>,114	);115	overrides_map.insert(116		EthereumStorageSchema::V2,117		Box::new(SchemaV2Override::new(client.clone()))118			as Box<dyn StorageOverride<_> + Send + Sync>,119	);120	overrides_map.insert(121		EthereumStorageSchema::V3,122		Box::new(SchemaV3Override::new(client.clone()))123			as Box<dyn StorageOverride<_> + Send + Sync>,124	);125126	Arc::new(OverrideHandle {127		schemas: overrides_map,128		fallback: Box::new(RuntimeApiStorageOverride::new(client)),129	})130}131132/// Instantiate all Full RPC extensions.133pub fn create_full<C, P, SC, CA, R, A, B>(134	deps: FullDeps<C, P, SC, CA>,135	subscription_task_executor: SubscriptionTaskExecutor,136) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>137where138	C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,139	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,140	C: Send + Sync + 'static,141	C: BlockchainEvents<Block>,142	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,143	C::Api: BlockBuilder<Block>,144	// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,145	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,146	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,147	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,148	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,149	/* TODO free RMRK!150	C::Api: rmrk_rpc::RmrkApi<151		Block,152		AccountId,153		RmrkCollectionInfo<AccountId>,154		RmrkInstanceInfo<AccountId>,155		RmrkResourceInfo,156		RmrkPropertyInfo,157		RmrkBaseInfo<AccountId>,158		RmrkPartType,159		RmrkTheme,160	>,*/161	B: sc_client_api::Backend<Block> + Send + Sync + 'static,162	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,163	P: TransactionPool<Block = Block> + 'static,164	CA: ChainApi<Block = Block> + 'static,165	R: RuntimeInstance + Send + Sync + 'static,166	<R as RuntimeInstance>::CrossAccountId: serde::Serialize,167	for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,168{169	use fc_rpc::{170		Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,171		EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,172	};173	use uc_rpc::{UniqueApiServer, Unique};174	// use pallet_contracts_rpc::{Contracts, ContractsApi};175	use pallet_transaction_payment_rpc::{TransactionPaymentRpc, TransactionPaymentApiServer};176	use substrate_frame_rpc_system::{SystemRpc, SystemApiServer};177178	let mut io = RpcModule::new(());179	let FullDeps {180		client,181		pool,182		graph,183		select_chain: _,184		fee_history_limit,185		fee_history_cache,186		block_data_cache,187		enable_dev_signer,188		is_authority,189		network,190		deny_unsafe,191		filter_pool,192		backend,193		max_past_logs,194	} = deps;195196	io.merge(SystemRpc::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;197	io.merge(TransactionPaymentRpc::new(Arc::clone(&client)).into_rpc())?;198199	// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));200201	let mut signers = Vec::new();202	if enable_dev_signer {203		signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);204	}205206	let overrides = overrides_handle::<_, _, R>(client.clone());207208	io.merge(209		Eth::new(210			client.clone(),211			pool.clone(),212			graph,213			Some(<R as RuntimeInstance>::get_transaction_converter()),214			network.clone(),215			signers,216			overrides.clone(),217			backend.clone(),218			is_authority,219			block_data_cache.clone(),220			fee_history_cache,221			fee_history_limit,222		)223		.into_rpc(),224	)?;225226	// todo look into227	//let unique = Unique::new(client.clone());228	io.merge(Unique::new(client.clone()).into_rpc())?;229	// TODO free RMRK! io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));230231	if let Some(filter_pool) = filter_pool {232		io.merge(233			EthFilter::new(234				client.clone(),235				backend,236				filter_pool,237				500_usize, // max stored filters238				max_past_logs,239				block_data_cache,240			)241			.into_rpc(),242		)?;243	}244245	io.merge(246		Net::new(247			client.clone(),248			network.clone(),249			// Whether to format the `peer_count` response as Hex (default) or not.250			true,251		)252		.into_rpc(),253	)?;254255	io.merge(Web3::new(client.clone()).into_rpc())?;256257	io.merge(258		EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),259	)?;260261	Ok(io)262}
after · node/rpc/src/lib.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/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20	StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26	backend::{AuxStore, StorageProvider},27	client::BlockchainEvents,28	StateBackend, Backend,29};30use sc_finality_grandpa::{31	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use unique_runtime_common::types::{44	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,45};46// RMRK47use up_data_structs::{48	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,49	RmrkPartType, RmrkTheme,50};5152/// Extra dependencies for GRANDPA53pub struct GrandpaDeps<B> {54	/// Voting round info.55	pub shared_voter_state: SharedVoterState,56	/// Authority set info.57	pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,58	/// Receives notifications about justification events from Grandpa.59	pub justification_stream: GrandpaJustificationStream<Block>,60	/// Executor to drive the subscription manager in the Grandpa RPC handler.61	pub subscription_executor: SubscriptionTaskExecutor,62	/// Finality proof provider.63	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,64}6566/// Full client dependencies.67pub struct FullDeps<C, P, SC, CA: ChainApi> {68	/// The client instance to use.69	pub client: Arc<C>,70	/// Transaction pool instance.71	pub pool: Arc<P>,72	/// Graph pool instance.73	pub graph: Arc<Pool<CA>>,74	/// The SelectChain Strategy75	pub select_chain: SC,76	/// The Node authority flag77	pub is_authority: bool,78	/// Whether to enable dev signer79	pub enable_dev_signer: bool,80	/// Network service81	pub network: Arc<NetworkService<Block, Hash>>,82	/// Whether to deny unsafe calls83	pub deny_unsafe: DenyUnsafe,84	/// EthFilterApi pool.85	pub filter_pool: Option<FilterPool>,86	/// Backend.87	pub backend: Arc<fc_db::Backend<Block>>,88	/// Maximum number of logs in a query.89	pub max_past_logs: u32,90	/// Maximum fee history cache size.91	pub fee_history_limit: u64,92	/// Fee history cache.93	pub fee_history_cache: FeeHistoryCache,94	/// Cache for Ethereum block data.95	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,96}9798pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>99where100	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,101	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,102	C: Send + Sync + 'static,103	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,104	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,105	BE: Backend<Block> + 'static,106	BE::State: StateBackend<BlakeTwo256>,107	R: RuntimeInstance + Send + Sync + 'static,108{109	let mut overrides_map = BTreeMap::new();110	overrides_map.insert(111		EthereumStorageSchema::V1,112		Box::new(SchemaV1Override::new(client.clone()))113			as Box<dyn StorageOverride<_> + Send + Sync>,114	);115	overrides_map.insert(116		EthereumStorageSchema::V2,117		Box::new(SchemaV2Override::new(client.clone()))118			as Box<dyn StorageOverride<_> + Send + Sync>,119	);120	overrides_map.insert(121		EthereumStorageSchema::V3,122		Box::new(SchemaV3Override::new(client.clone()))123			as Box<dyn StorageOverride<_> + Send + Sync>,124	);125126	Arc::new(OverrideHandle {127		schemas: overrides_map,128		fallback: Box::new(RuntimeApiStorageOverride::new(client)),129	})130}131132/// Instantiate all Full RPC extensions.133pub fn create_full<C, P, SC, CA, R, A, B>(134	deps: FullDeps<C, P, SC, CA>,135	subscription_task_executor: SubscriptionTaskExecutor,136) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>137where138	C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,139	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,140	C: Send + Sync + 'static,141	C: BlockchainEvents<Block>,142	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,143	C::Api: BlockBuilder<Block>,144	// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,145	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,146	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,147	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,148	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,149	C::Api: rmrk_rpc::RmrkApi<150		Block,151		AccountId,152		RmrkCollectionInfo<AccountId>,153		RmrkInstanceInfo<AccountId>,154		RmrkResourceInfo,155		RmrkPropertyInfo,156		RmrkBaseInfo<AccountId>,157		RmrkPartType,158		RmrkTheme,159	>,160	B: sc_client_api::Backend<Block> + Send + Sync + 'static,161	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,162	P: TransactionPool<Block = Block> + 'static,163	CA: ChainApi<Block = Block> + 'static,164	R: RuntimeInstance + Send + Sync + 'static,165	<R as RuntimeInstance>::CrossAccountId: serde::Serialize,166	for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,167{168	use fc_rpc::{169		Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,170		EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,171	};172	use uc_rpc::{UniqueApiServer, Unique};173	// use pallet_contracts_rpc::{Contracts, ContractsApi};174	use pallet_transaction_payment_rpc::{TransactionPaymentRpc, TransactionPaymentApiServer};175	use substrate_frame_rpc_system::{SystemRpc, SystemApiServer};176177	let mut io = RpcModule::new(());178	let FullDeps {179		client,180		pool,181		graph,182		select_chain: _,183		fee_history_limit,184		fee_history_cache,185		block_data_cache,186		enable_dev_signer,187		is_authority,188		network,189		deny_unsafe,190		filter_pool,191		backend,192		max_past_logs,193	} = deps;194195	io.merge(SystemRpc::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;196	io.merge(TransactionPaymentRpc::new(Arc::clone(&client)).into_rpc())?;197198	// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));199200	let mut signers = Vec::new();201	if enable_dev_signer {202		signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);203	}204205	let overrides = overrides_handle::<_, _, R>(client.clone());206207	io.merge(208		Eth::new(209			client.clone(),210			pool.clone(),211			graph,212			Some(<R as RuntimeInstance>::get_transaction_converter()),213			network.clone(),214			signers,215			overrides.clone(),216			backend.clone(),217			is_authority,218			block_data_cache.clone(),219			fee_history_cache,220			fee_history_limit,221		)222		.into_rpc(),223	)?;224225	io.merge(Unique::new(client.clone()).into_rpc())?;226	// TODO RMRK227228	if let Some(filter_pool) = filter_pool {229		io.merge(230			EthFilter::new(231				client.clone(),232				backend,233				filter_pool,234				500_usize, // max stored filters235				max_past_logs,236				block_data_cache,237			)238			.into_rpc(),239		)?;240	}241242	io.merge(243		Net::new(244			client.clone(),245			network.clone(),246			// Whether to format the `peer_count` response as Hex (default) or not.247			true,248		)249		.into_rpc(),250	)?;251252	io.merge(Web3::new(client.clone()).into_rpc())?;253254	io.merge(255		EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),256	)?;257258	Ok(io)259}
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -128,8 +128,6 @@
                 }
             }
 
-            /*
-            TODO free RMRK!
             impl rmrk_rpc::RmrkApi<
                 Block,
                 AccountId,
@@ -463,7 +461,7 @@
 
                     Ok(Some(theme))
                 }
-            }*/
+            }
 
             impl sp_api::Core<Block> for Runtime {
                 fn version() -> RuntimeVersion {
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -914,15 +914,13 @@
 	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
 }
 
-/*
-TODO free RMRK!
 impl pallet_proxy_rmrk_core::Config for Runtime {
 	type Event = Event;
 }
 
 impl pallet_proxy_rmrk_equip::Config for Runtime {
 	type Event = Event;
-}*/
+}
 
 impl pallet_unique::Config for Runtime {
 	type Event = Event;
@@ -1164,10 +1162,8 @@
 		Refungible: pallet_refungible::{Pallet, Storage} = 68,
 		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
 		Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
-		/* TODO free RMRK!
 		RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
 		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
-		*/
 
 		// Frontier
 		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -912,14 +912,14 @@
 impl pallet_nonfungible::Config for Runtime {
 	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
 }
-/* TODO free RMRK!
+
 impl pallet_proxy_rmrk_core::Config for Runtime {
 	type Event = Event;
 }
 
 impl pallet_proxy_rmrk_equip::Config for Runtime {
 	type Event = Event;
-}*/
+}
 
 impl pallet_unique::Config for Runtime {
 	type Event = Event;
@@ -1160,9 +1160,8 @@
 		Refungible: pallet_refungible::{Pallet, Storage} = 68,
 		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
 		Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
-		/* TODO free RMRK!
 		RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
-		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/
+		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
 
 		// Frontier
 		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -911,14 +911,14 @@
 impl pallet_nonfungible::Config for Runtime {
 	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
 }
-/* TODO free RMRK!
+
 impl pallet_proxy_rmrk_core::Config for Runtime {
 	type Event = Event;
 }
 
 impl pallet_proxy_rmrk_equip::Config for Runtime {
 	type Event = Event;
-}*/
+}
 
 impl pallet_unique::Config for Runtime {
 	type Event = Event;
@@ -1159,9 +1159,8 @@
 		Refungible: pallet_refungible::{Pallet, Storage} = 68,
 		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
 		Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
-		/* TODO free RMRK!
 		RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
-		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/
+		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
 
 		// Frontier
 		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,
modifiedtests/src/interfaces/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/definitions.ts
+++ b/tests/src/interfaces/definitions.ts
@@ -15,5 +15,5 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 export {default as unique} from './unique/definitions';
-// TODO free RMRK! export {default as rmrk} from './rmrk/definitions';
+export {default as rmrk} from './rmrk/definitions';
 export {default as default} from './default/definitions';
\ No newline at end of file
modifiedtests/src/substrate/substrate-api.tsdiffbeforeafterboth
--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -42,7 +42,7 @@
     },
     rpc: {
       unique: defs.unique.rpc,
-      // TODO free RMRK! rmrk: defs.rmrk.rpc,
+      rmrk: defs.rmrk.rpc,
       eth: {
         feeHistory: {
           description: 'Dummy',