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
66use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};66use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
6767
68// RMRK68// RMRK
69/* TODO free RMRK! use up_data_structs::{69use up_data_structs::{
70	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,70	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
71	RmrkPartType, RmrkTheme,71	RmrkPartType, RmrkTheme,
72};*/72};
7373
74/// Unique native executor instance.74/// Unique native executor instance.
75#[cfg(feature = "unique-runtime")]75#[cfg(feature = "unique-runtime")]
354		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>354		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
355		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>355		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
356		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>356		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
357		/* TODO free RMRK!357		+ rmrk_rpc::RmrkApi<
358		+ rmrk_rpc::RmrkApi<358			Block,
359			Block,359			AccountId,
360			AccountId,360			RmrkCollectionInfo<AccountId>,
361			RmrkCollectionInfo<AccountId>,361			RmrkInstanceInfo<AccountId>,
362			RmrkInstanceInfo<AccountId>,362			RmrkResourceInfo,
363			RmrkResourceInfo,363			RmrkPropertyInfo,
364			RmrkPropertyInfo,364			RmrkBaseInfo<AccountId>,
365			RmrkBaseInfo<AccountId>,365			RmrkPartType,
366			RmrkPartType,366			RmrkTheme,
367			RmrkTheme,367		>
368		>*/
369		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>368		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
370		+ sp_api::Metadata<Block>369		+ sp_api::Metadata<Block>
371		+ sp_offchain::OffchainWorkerApi<Block>370		+ sp_offchain::OffchainWorkerApi<Block>
661		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>660		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
662		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>661		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
663		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>662		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
664		/* TODO free RMRK!663		+ rmrk_rpc::RmrkApi<
665		+ rmrk_rpc::RmrkApi<664			Block,
666			Block,665			AccountId,
667			AccountId,666			RmrkCollectionInfo<AccountId>,
668			RmrkCollectionInfo<AccountId>,667			RmrkInstanceInfo<AccountId>,
669			RmrkInstanceInfo<AccountId>,668			RmrkResourceInfo,
670			RmrkResourceInfo,669			RmrkPropertyInfo,
671			RmrkPropertyInfo,670			RmrkBaseInfo<AccountId>,
672			RmrkBaseInfo<AccountId>,671			RmrkPartType,
673			RmrkPartType,672			RmrkTheme,
674			RmrkTheme,673		>
675		>*/
676		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>674		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
677		+ sp_api::Metadata<Block>675		+ sp_api::Metadata<Block>
678		+ sp_offchain::OffchainWorkerApi<Block>676		+ sp_offchain::OffchainWorkerApi<Block>
807		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>805		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
808		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>806		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
809		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>807		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
810		/* TODO free RMRK!808		+ rmrk_rpc::RmrkApi<
811		+ rmrk_rpc::RmrkApi<809			Block,
812			Block,810			AccountId,
813			AccountId,811			RmrkCollectionInfo<AccountId>,
814			RmrkCollectionInfo<AccountId>,812			RmrkInstanceInfo<AccountId>,
815			RmrkInstanceInfo<AccountId>,813			RmrkResourceInfo,
816			RmrkResourceInfo,814			RmrkPropertyInfo,
817			RmrkPropertyInfo,815			RmrkBaseInfo<AccountId>,
818			RmrkBaseInfo<AccountId>,816			RmrkPartType,
819			RmrkPartType,817			RmrkTheme,
820			RmrkTheme,818		>
821		>*/
822		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>819		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
823		+ sp_api::Metadata<Block>820		+ sp_api::Metadata<Block>
824		+ sp_offchain::OffchainWorkerApi<Block>821		+ sp_offchain::OffchainWorkerApi<Block>
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -44,10 +44,10 @@
 	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
 };
 // RMRK
-/* TODO free RMRK! use up_data_structs::{
+use up_data_structs::{
 	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
 	RmrkPartType, RmrkTheme,
-};*/
+};
 
 /// Extra dependencies for GRANDPA
 pub struct GrandpaDeps<B> {
@@ -146,7 +146,6 @@
 	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
 	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,
 	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
-	/* TODO free RMRK!
 	C::Api: rmrk_rpc::RmrkApi<
 		Block,
 		AccountId,
@@ -157,7 +156,7 @@
 		RmrkBaseInfo<AccountId>,
 		RmrkPartType,
 		RmrkTheme,
-	>,*/
+	>,
 	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
 	P: TransactionPool<Block = Block> + 'static,
@@ -223,10 +222,8 @@
 		.into_rpc(),
 	)?;
 
-	// todo look into
-	//let unique = Unique::new(client.clone());
 	io.merge(Unique::new(client.clone()).into_rpc())?;
-	// TODO free RMRK! io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));
+	// TODO RMRK
 
 	if let Some(filter_pool) = filter_pool {
 		io.merge(
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',