--- 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 + sp_api::ApiExt> + up_rpc::UniqueApi - /* TODO free RMRK! + rmrk_rpc::RmrkApi< Block, AccountId, @@ -365,7 +364,7 @@ RmrkBaseInfo, RmrkPartType, RmrkTheme, - >*/ + > + substrate_frame_rpc_system::AccountNonceApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi @@ -661,7 +660,6 @@ + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi + sp_api::ApiExt> + up_rpc::UniqueApi - /* TODO free RMRK! + rmrk_rpc::RmrkApi< Block, AccountId, @@ -672,7 +670,7 @@ RmrkBaseInfo, RmrkPartType, RmrkTheme, - >*/ + > + substrate_frame_rpc_system::AccountNonceApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi @@ -807,7 +805,6 @@ + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi + sp_api::ApiExt> + up_rpc::UniqueApi - /* TODO free RMRK! + rmrk_rpc::RmrkApi< Block, AccountId, @@ -818,7 +815,7 @@ RmrkBaseInfo, RmrkPartType, RmrkTheme, - >*/ + > + substrate_frame_rpc_system::AccountNonceApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi --- 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 { @@ -146,7 +146,6 @@ C::Api: fp_rpc::EthereumRuntimeRPCApi, C::Api: fp_rpc::ConvertTransactionRuntimeApi, C::Api: up_rpc::UniqueApi::CrossAccountId, AccountId>, - /* TODO free RMRK! C::Api: rmrk_rpc::RmrkApi< Block, AccountId, @@ -157,7 +156,7 @@ RmrkBaseInfo, RmrkPartType, RmrkTheme, - >,*/ + >, B: sc_client_api::Backend + Send + Sync + 'static, B::State: sc_client_api::backend::StateBackend>, P: TransactionPool + '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( --- 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 for Runtime { fn version() -> RuntimeVersion { --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -914,15 +914,13 @@ type WeightInfo = pallet_nonfungible::weights::SubstrateWeight; } -/* -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} = 70, - /* TODO free RMRK! RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event} = 71, RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event} = 72, - */ // Frontier EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 100, --- 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; } -/* 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} = 70, - /* TODO free RMRK! RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event} = 71, - RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event} = 72,*/ + RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event} = 72, // Frontier EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 100, --- 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; } -/* 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} = 70, - /* TODO free RMRK! RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event} = 71, - RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event} = 72,*/ + RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event} = 72, // Frontier EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 100, --- a/tests/src/interfaces/definitions.ts +++ b/tests/src/interfaces/definitions.ts @@ -15,5 +15,5 @@ // along with Unique Network. If not, see . 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 --- 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',