git.delta.rocks / unique-network / refs/commits / 25c961748e58

difftreelog

remove: getTotalStakingLocked from RPC.

Trubnikov Sergey2022-09-07parent: #d79c091.patch.diff
in: master

5 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
before · client/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/>.1617// Original License18use std::sync::Arc;1920use codec::{Decode, Encode};21use jsonrpsee::{22	core::{RpcResult as Result},23	proc_macros::rpc,24};25use anyhow::anyhow;26use sp_runtime::traits::{AtLeast32BitUnsigned, Member};27use up_data_structs::{28	RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,29	PropertyKeyPermission, TokenData, TokenChild,30};31use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};32use sp_blockchain::HeaderBackend;33use up_rpc::UniqueApi as UniqueRuntimeApi;34use app_promotion_rpc::AppPromotionApi as AppPromotionRuntimeApi;3536// RMRK37use rmrk_rpc::RmrkApi as RmrkRuntimeApi;38use up_data_structs::{39	RmrkCollectionId, RmrkNftId, RmrkBaseId, RmrkNftChild, RmrkThemeName, RmrkResourceId,40};4142pub use app_promotion_unique_rpc::AppPromotionApiServer;43pub use rmrk_unique_rpc::RmrkApiServer;4445#[rpc(server)]46#[async_trait]47pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {48	/// Get tokens owned by account.49	#[method(name = "unique_accountTokens")]50	fn account_tokens(51		&self,52		collection: CollectionId,53		account: CrossAccountId,54		at: Option<BlockHash>,55	) -> Result<Vec<TokenId>>;5657	/// Get tokens contained within a collection.58	#[method(name = "unique_collectionTokens")]59	fn collection_tokens(60		&self,61		collection: CollectionId,62		at: Option<BlockHash>,63	) -> Result<Vec<TokenId>>;6465	/// Check if the token exists.66	#[method(name = "unique_tokenExists")]67	fn token_exists(68		&self,69		collection: CollectionId,70		token: TokenId,71		at: Option<BlockHash>,72	) -> Result<bool>;7374	/// Get the token owner.75	#[method(name = "unique_tokenOwner")]76	fn token_owner(77		&self,78		collection: CollectionId,79		token: TokenId,80		at: Option<BlockHash>,81	) -> Result<Option<CrossAccountId>>;8283	/// Returns 10 tokens owners in no particular order.84	#[method(name = "unique_tokenOwners")]85	fn token_owners(86		&self,87		collection: CollectionId,88		token: TokenId,89		at: Option<BlockHash>,90	) -> Result<Vec<CrossAccountId>>;9192	/// Get the topmost token owner in the hierarchy of a possibly nested token.93	#[method(name = "unique_topmostTokenOwner")]94	fn topmost_token_owner(95		&self,96		collection: CollectionId,97		token: TokenId,98		at: Option<BlockHash>,99	) -> Result<Option<CrossAccountId>>;100101	/// Get tokens nested directly into the token.102	#[method(name = "unique_tokenChildren")]103	fn token_children(104		&self,105		collection: CollectionId,106		token: TokenId,107		at: Option<BlockHash>,108	) -> Result<Vec<TokenChild>>;109110	/// Get collection properties, optionally limited to the provided keys.111	#[method(name = "unique_collectionProperties")]112	fn collection_properties(113		&self,114		collection: CollectionId,115		keys: Option<Vec<String>>,116		at: Option<BlockHash>,117	) -> Result<Vec<Property>>;118119	/// Get token properties, optionally limited to the provided keys.120	#[method(name = "unique_tokenProperties")]121	fn token_properties(122		&self,123		collection: CollectionId,124		token_id: TokenId,125		keys: Option<Vec<String>>,126		at: Option<BlockHash>,127	) -> Result<Vec<Property>>;128129	/// Get property permissions, optionally limited to the provided keys.130	#[method(name = "unique_propertyPermissions")]131	fn property_permissions(132		&self,133		collection: CollectionId,134		keys: Option<Vec<String>>,135		at: Option<BlockHash>,136	) -> Result<Vec<PropertyKeyPermission>>;137138	/// Get token data, including properties, optionally limited to the provided keys, and total pieces for an RFT.139	#[method(name = "unique_tokenData")]140	fn token_data(141		&self,142		collection: CollectionId,143		token_id: TokenId,144		keys: Option<Vec<String>>,145		at: Option<BlockHash>,146	) -> Result<TokenData<CrossAccountId>>;147148	/// Get the amount of distinctive tokens present in a collection.149	#[method(name = "unique_totalSupply")]150	fn total_supply(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;151152	/// Get the amount of any user tokens owned by an account.153	#[method(name = "unique_accountBalance")]154	fn account_balance(155		&self,156		collection: CollectionId,157		account: CrossAccountId,158		at: Option<BlockHash>,159	) -> Result<u32>;160161	/// Get the amount of a specific token owned by an account.162	#[method(name = "unique_balance")]163	fn balance(164		&self,165		collection: CollectionId,166		account: CrossAccountId,167		token: TokenId,168		at: Option<BlockHash>,169	) -> Result<String>;170171	/// Get the amount of currently possible sponsored transactions on a token for the fee to be taken off a sponsor.172	#[method(name = "unique_allowance")]173	fn allowance(174		&self,175		collection: CollectionId,176		sender: CrossAccountId,177		spender: CrossAccountId,178		token: TokenId,179		at: Option<BlockHash>,180	) -> Result<String>;181182	/// Get the list of admin accounts of a collection.183	#[method(name = "unique_adminlist")]184	fn adminlist(185		&self,186		collection: CollectionId,187		at: Option<BlockHash>,188	) -> Result<Vec<CrossAccountId>>;189190	/// Get the list of accounts allowed to operate within a collection.191	#[method(name = "unique_allowlist")]192	fn allowlist(193		&self,194		collection: CollectionId,195		at: Option<BlockHash>,196	) -> Result<Vec<CrossAccountId>>;197198	/// Check if a user is allowed to operate within a collection.199	#[method(name = "unique_allowed")]200	fn allowed(201		&self,202		collection: CollectionId,203		user: CrossAccountId,204		at: Option<BlockHash>,205	) -> Result<bool>;206207	/// Get the last token ID created in a collection.208	#[method(name = "unique_lastTokenId")]209	fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;210211	/// Get collection info by the specified ID.212	#[method(name = "unique_collectionById")]213	fn collection_by_id(214		&self,215		collection: CollectionId,216		at: Option<BlockHash>,217	) -> Result<Option<RpcCollection<AccountId>>>;218219	/// Get chain stats about collections.220	#[method(name = "unique_collectionStats")]221	fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;222223	/// Get the number of blocks until sponsoring a transaction is available.224	#[method(name = "unique_nextSponsored")]225	fn next_sponsored(226		&self,227		collection: CollectionId,228		account: CrossAccountId,229		token: TokenId,230		at: Option<BlockHash>,231	) -> Result<Option<u64>>;232233	/// Get effective collection limits. If not explicitly set, get the chain defaults.234	#[method(name = "unique_effectiveCollectionLimits")]235	fn effective_collection_limits(236		&self,237		collection_id: CollectionId,238		at: Option<BlockHash>,239	) -> Result<Option<CollectionLimits>>;240241	/// Get the total amount of pieces of an RFT.242	#[method(name = "unique_totalPieces")]243	fn total_pieces(244		&self,245		collection_id: CollectionId,246		token_id: TokenId,247		at: Option<BlockHash>,248	) -> Result<Option<String>>;249}250251mod app_promotion_unique_rpc {252	use super::*;253254	#[rpc(server)]255	#[async_trait]256	pub trait AppPromotionApi<BlockHash, BlockNumber, CrossAccountId, AccountId> {257		/// Returns the total amount of staked tokens.258		#[method(name = "appPromotion_totalStaked")]259		fn total_staked(260			&self,261			staker: Option<CrossAccountId>,262			at: Option<BlockHash>,263		) -> Result<String>;264265		///Returns the total amount of staked tokens per block when staked.266		#[method(name = "appPromotion_totalStakedPerBlock")]267		fn total_staked_per_block(268			&self,269			staker: CrossAccountId,270			at: Option<BlockHash>,271		) -> Result<Vec<(BlockNumber, String)>>;272273		/// Returns the total amount locked by staking tokens.274		#[method(name = "appPromotion_totalStakingLocked")]275		fn total_staking_locked(276			&self,277			staker: CrossAccountId,278			at: Option<BlockHash>,279		) -> Result<String>;280281		/// Returns the total amount of tokens pending withdrawal from staking.282		#[method(name = "appPromotion_pendingUnstake")]283		fn pending_unstake(284			&self,285			staker: Option<CrossAccountId>,286			at: Option<BlockHash>,287		) -> Result<String>;288289		/// Returns the total amount of tokens pending withdrawal from staking per block.290		#[method(name = "appPromotion_pendingUnstakePerBlock")]291		fn pending_unstake_per_block(292			&self,293			staker: CrossAccountId,294			at: Option<BlockHash>,295		) -> Result<Vec<(BlockNumber, String)>>;296	}297}298299mod rmrk_unique_rpc {300	use super::*;301302	#[rpc(server)]303	#[async_trait]304	pub trait RmrkApi<305		BlockHash,306		AccountId,307		CollectionInfo,308		NftInfo,309		ResourceInfo,310		PropertyInfo,311		BaseInfo,312		PartType,313		Theme,314	>315	{316		/// Get the latest created collection ID.317		#[method(name = "rmrk_lastCollectionIdx")]318		fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;319320		/// Get collection info by ID.321		#[method(name = "rmrk_collectionById")]322		fn collection_by_id(323			&self,324			id: RmrkCollectionId,325			at: Option<BlockHash>,326		) -> Result<Option<CollectionInfo>>;327328		/// Get NFT info by collection and NFT IDs.329		#[method(name = "rmrk_nftById")]330		fn nft_by_id(331			&self,332			collection_id: RmrkCollectionId,333			nft_id: RmrkNftId,334			at: Option<BlockHash>,335		) -> Result<Option<NftInfo>>;336337		/// Get tokens owned by an account in a collection.338		#[method(name = "rmrk_accountTokens")]339		fn account_tokens(340			&self,341			account_id: AccountId,342			collection_id: RmrkCollectionId,343			at: Option<BlockHash>,344		) -> Result<Vec<RmrkNftId>>;345346		/// Get tokens nested in an NFT - its direct children (not the children's children).347		#[method(name = "rmrk_nftChildren")]348		fn nft_children(349			&self,350			collection_id: RmrkCollectionId,351			nft_id: RmrkNftId,352			at: Option<BlockHash>,353		) -> Result<Vec<RmrkNftChild>>;354355		/// Get collection properties, created by the user - not the proxy-specific properties.356		#[method(name = "rmrk_collectionProperties")]357		fn collection_properties(358			&self,359			collection_id: RmrkCollectionId,360			filter_keys: Option<Vec<String>>,361			at: Option<BlockHash>,362		) -> Result<Vec<PropertyInfo>>;363364		/// Get NFT properties, created by the user - not the proxy-specific properties.365		#[method(name = "rmrk_nftProperties")]366		fn nft_properties(367			&self,368			collection_id: RmrkCollectionId,369			nft_id: RmrkNftId,370			filter_keys: Option<Vec<String>>,371			at: Option<BlockHash>,372		) -> Result<Vec<PropertyInfo>>;373374		/// Get data of resources of an NFT.375		#[method(name = "rmrk_nftResources")]376		fn nft_resources(377			&self,378			collection_id: RmrkCollectionId,379			nft_id: RmrkNftId,380			at: Option<BlockHash>,381		) -> Result<Vec<ResourceInfo>>;382383		/// Get the priority of a resource in an NFT.384		#[method(name = "rmrk_nftResourcePriority")]385		fn nft_resource_priority(386			&self,387			collection_id: RmrkCollectionId,388			nft_id: RmrkNftId,389			resource_id: RmrkResourceId,390			at: Option<BlockHash>,391		) -> Result<Option<u32>>;392393		/// Get base info by its ID.394		#[method(name = "rmrk_base")]395		fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;396397		/// Get all parts of a base.398		#[method(name = "rmrk_baseParts")]399		fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;400401		/// Get the theme names belonging to a base.402		#[method(name = "rmrk_themeNames")]403		fn theme_names(404			&self,405			base_id: RmrkBaseId,406			at: Option<BlockHash>,407		) -> Result<Vec<RmrkThemeName>>;408409		/// Get theme info, including properties, optionally limited to the provided keys.410		#[method(name = "rmrk_themes")]411		fn theme(412			&self,413			base_id: RmrkBaseId,414			theme_name: String,415			filter_keys: Option<Vec<String>>,416			at: Option<BlockHash>,417		) -> Result<Option<Theme>>;418	}419}420421macro_rules! define_struct_for_server_api {422	($name:ident) => {423		pub struct $name<C, P> {424			client: Arc<C>,425			_marker: std::marker::PhantomData<P>,426		}427428		impl<C, P> $name<C, P> {429			pub fn new(client: Arc<C>) -> Self {430				Self {431					client,432					_marker: Default::default(),433				}434			}435		}436	};437}438439define_struct_for_server_api!(Unique);440define_struct_for_server_api!(AppPromotion);441define_struct_for_server_api!(Rmrk);442443macro_rules! pass_method {444	(445		$method_name:ident(446			$($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?447		) -> $result:ty $(=> $mapper:expr)?,448		//$runtime_name:ident $(<$($lt: tt),+>)*449		$runtime_api_macro:ident450		$(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*451	) => {452		fn $method_name(453			&self,454			$(455				$name: $ty,456			)*457			at: Option<<Block as BlockT>::Hash>,458		) -> Result<$result> {459			let api = self.client.runtime_api();460			let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));461			let _api_version = if let Ok(Some(api_version)) =462				api.api_version::<$runtime_api_macro!()>(&at)463			{464				api_version465			} else {466				// unreachable for our runtime467				return Err(anyhow!("api is not available").into())468			};469470			let result = $(if _api_version < $ver {471				api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))472			} else)*473			{ api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };474475			Ok(result476				.map_err(|e| anyhow!("unable to query: {e}"))?477				.map_err(|e| anyhow!("runtime error: {e:?}"))$(.map($mapper))??)478		}479	};480}481482macro_rules! unique_api {483	() => {484		dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>485	};486}487488macro_rules! app_promotion_api {489	() => {490		dyn AppPromotionRuntimeApi<Block, BlockNumber, CrossAccountId, AccountId>491	};492}493494macro_rules! rmrk_api {495	() => {496		dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>497	};498}499500#[allow(deprecated)]501impl<C, Block, CrossAccountId, AccountId>502	UniqueApiServer<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>503where504	Block: BlockT,505	AccountId: Decode,506	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,507	C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,508	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,509{510	pass_method!(511		account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api512	);513	pass_method!(514		collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api515	);516	pass_method!(517		token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api518	);519	pass_method!(520		token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api521	);522	pass_method!(523		topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api524	);525	pass_method!(token_children(collection: CollectionId, token: TokenId) -> Vec<TokenChild>, unique_api);526	pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);527	pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);528	pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);529	pass_method!(530		allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),531		unique_api532	);533534	pass_method!(collection_properties(535		collection: CollectionId,536537		#[map(|keys| string_keys_to_bytes_keys(keys))]538		keys: Option<Vec<String>>539	) -> Vec<Property>, unique_api);540541	pass_method!(token_properties(542		collection: CollectionId,543		token_id: TokenId,544545		#[map(|keys| string_keys_to_bytes_keys(keys))]546		keys: Option<Vec<String>>547	) -> Vec<Property>, unique_api);548549	pass_method!(property_permissions(550		collection: CollectionId,551552		#[map(|keys| string_keys_to_bytes_keys(keys))]553		keys: Option<Vec<String>>554	) -> Vec<PropertyKeyPermission>, unique_api);555556	pass_method!(token_data(557		collection: CollectionId,558		token_id: TokenId,559560		#[map(|keys| string_keys_to_bytes_keys(keys))]561		keys: Option<Vec<String>>,562	) -> TokenData<CrossAccountId>, unique_api);563564	pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);565	pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);566	pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);567	pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);568	pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);569	pass_method!(collection_stats() -> CollectionStats, unique_api);570	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);571	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);572	pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<String> => |o| o.map(|number| number.to_string()) , unique_api);573	pass_method!(token_owners(collection: CollectionId, token: TokenId) -> Vec<CrossAccountId>, unique_api);574}575576impl<C, Block, BlockNumber, CrossAccountId, AccountId>577	app_promotion_unique_rpc::AppPromotionApiServer<578		<Block as BlockT>::Hash,579		BlockNumber,580		CrossAccountId,581		AccountId,582	> for AppPromotion<C, Block>583where584	Block: BlockT,585	BlockNumber: Decode + Member + AtLeast32BitUnsigned,586	AccountId: Decode,587	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,588	C::Api: AppPromotionRuntimeApi<Block, BlockNumber, CrossAccountId, AccountId>,589	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,590{591	pass_method!(total_staked(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);592	pass_method!(total_staked_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>593		|v| v594		.into_iter()595		.map(|(b, a)| (b, a.to_string()))596		.collect::<Vec<_>>(), app_promotion_api);597	pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), app_promotion_api);598	pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);599	pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>600		|v| v601		.into_iter()602		.map(|(b, a)| (b, a.to_string()))603		.collect::<Vec<_>>(), app_promotion_api);604}605606#[allow(deprecated)]607impl<608		C,609		Block,610		AccountId,611		CollectionInfo,612		NftInfo,613		ResourceInfo,614		PropertyInfo,615		BaseInfo,616		PartType,617		Theme,618	>619	rmrk_unique_rpc::RmrkApiServer<620		<Block as BlockT>::Hash,621		AccountId,622		CollectionInfo,623		NftInfo,624		ResourceInfo,625		PropertyInfo,626		BaseInfo,627		PartType,628		Theme,629	> for Rmrk<C, Block>630where631	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,632	C::Api: RmrkRuntimeApi<633		Block,634		AccountId,635		CollectionInfo,636		NftInfo,637		ResourceInfo,638		PropertyInfo,639		BaseInfo,640		PartType,641		Theme,642	>,643	AccountId: Decode + Encode,644	CollectionInfo: Decode,645	NftInfo: Decode,646	ResourceInfo: Decode,647	PropertyInfo: Decode,648	BaseInfo: Decode,649	PartType: Decode,650	Theme: Decode,651	Block: BlockT,652{653	pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);654	pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);655	pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);656	pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);657	pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);658	pass_method!(659		collection_properties(660			collection_id: RmrkCollectionId,661662			#[map(|keys| string_keys_to_bytes_keys(keys))]663			filter_keys: Option<Vec<String>>664		) -> Vec<PropertyInfo>,665		rmrk_api666	);667	pass_method!(668		nft_properties(669			collection_id: RmrkCollectionId,670			nft_id: RmrkNftId,671672			#[map(|keys| string_keys_to_bytes_keys(keys))]673			filter_keys: Option<Vec<String>>674		) -> Vec<PropertyInfo>,675		rmrk_api676	);677	pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);678	pass_method!(nft_resource_priority(collection_id: RmrkCollectionId, nft_id: RmrkNftId, resource_id: RmrkResourceId) -> Option<u32>, rmrk_api);679	pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);680	pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);681	pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);682	pass_method!(683		theme(684			base_id: RmrkBaseId,685686			#[map(|n| n.into_bytes())]687			theme_name: String,688689			#[map(|keys| string_keys_to_bytes_keys(keys))]690			filter_keys: Option<Vec<String>>691		) -> Option<Theme>, rmrk_api);692}693694fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {695	keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())696}
modifiedprimitives/app_promotion_rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/app_promotion_rpc/src/lib.rs
+++ b/primitives/app_promotion_rpc/src/lib.rs
@@ -35,7 +35,6 @@
 	{
 		fn total_staked(staker: Option<CrossAccountId>) -> Result<u128>;
 		fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
-		fn total_staking_locked(staker: CrossAccountId) -> Result<u128>;
 		fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128>;
 		fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
 	}
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -206,14 +206,6 @@
                     return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked_per_block(staker));
                 }
 
-                fn total_staking_locked(staker: CrossAccountId) -> Result<u128, DispatchError> {
-                    #[cfg(not(feature = "app-promotion"))]
-                    return unsupported!();
-
-                    #[cfg(feature = "app-promotion")]
-                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_locked_balance(staker));
-                }
-
                 fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {
                     #[cfg(not(feature = "app-promotion"))]
                     return unsupported!();
modifiedtests/src/interfaces/appPromotion/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/appPromotion/definitions.ts
+++ b/tests/src/interfaces/appPromotion/definitions.ts
@@ -22,9 +22,6 @@
 
 const CROSS_ACCOUNT_ID_TYPE = 'PalletEvmAccountBasicCrossAccountIdRepr';
 
-const collectionParam = {name: 'collection', type: 'u32'};
-const tokenParam = {name: 'tokenId', type: 'u32'};
-const propertyKeysParam = {name: 'propertyKeys', type: 'Vec<String>', isOptional: true};
 const crossAccountParam = (name = 'account') => ({name, type: CROSS_ACCOUNT_ID_TYPE});
 const atParam = {name: 'at', type: 'Hash', isOptional: true};
 
@@ -46,11 +43,6 @@
       'Returns the total amount of staked tokens per block when staked',
       [crossAccountParam('staker')],
       'Vec<(u32, u128)>',
-    ),
-    totalStakingLocked: fun(
-      'Return the total amount locked by staking tokens',
-      [crossAccountParam('staker')],
-      'u128',
     ),
     pendingUnstake: fun(
       'Returns the total amount of unstaked tokens',
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -52,10 +52,6 @@
        * Returns the total amount of staked tokens per block when staked
        **/
       totalStakedPerBlock: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<ITuple<[u32, u128]>>>>;
-      /**
-       * Return the total amount locked by staking tokens
-       **/
-      totalStakingLocked: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
     };
     author: {
       /**