difftreelog
Merge pull request #683 from UniqueNetwork/fix/collection-rpc-runtime-versioning
in: master
3 files changed
client/rpc/src/lib.rsdiffbeforeafterboth1// 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 of tokens pending withdrawal from staking.274 #[method(name = "appPromotion_pendingUnstake")]275 fn pending_unstake(276 &self,277 staker: Option<CrossAccountId>,278 at: Option<BlockHash>,279 ) -> Result<String>;280281 /// Returns the total amount of tokens pending withdrawal from staking per block.282 #[method(name = "appPromotion_pendingUnstakePerBlock")]283 fn pending_unstake_per_block(284 &self,285 staker: CrossAccountId,286 at: Option<BlockHash>,287 ) -> Result<Vec<(BlockNumber, String)>>;288 }289}290291mod rmrk_unique_rpc {292 use super::*;293294 #[rpc(server)]295 #[async_trait]296 pub trait RmrkApi<297 BlockHash,298 AccountId,299 CollectionInfo,300 NftInfo,301 ResourceInfo,302 PropertyInfo,303 BaseInfo,304 PartType,305 Theme,306 >307 {308 /// Get the latest created collection ID.309 #[method(name = "rmrk_lastCollectionIdx")]310 fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;311312 /// Get collection info by ID.313 #[method(name = "rmrk_collectionById")]314 fn collection_by_id(315 &self,316 id: RmrkCollectionId,317 at: Option<BlockHash>,318 ) -> Result<Option<CollectionInfo>>;319320 /// Get NFT info by collection and NFT IDs.321 #[method(name = "rmrk_nftById")]322 fn nft_by_id(323 &self,324 collection_id: RmrkCollectionId,325 nft_id: RmrkNftId,326 at: Option<BlockHash>,327 ) -> Result<Option<NftInfo>>;328329 /// Get tokens owned by an account in a collection.330 #[method(name = "rmrk_accountTokens")]331 fn account_tokens(332 &self,333 account_id: AccountId,334 collection_id: RmrkCollectionId,335 at: Option<BlockHash>,336 ) -> Result<Vec<RmrkNftId>>;337338 /// Get tokens nested in an NFT - its direct children (not the children's children).339 #[method(name = "rmrk_nftChildren")]340 fn nft_children(341 &self,342 collection_id: RmrkCollectionId,343 nft_id: RmrkNftId,344 at: Option<BlockHash>,345 ) -> Result<Vec<RmrkNftChild>>;346347 /// Get collection properties, created by the user - not the proxy-specific properties.348 #[method(name = "rmrk_collectionProperties")]349 fn collection_properties(350 &self,351 collection_id: RmrkCollectionId,352 filter_keys: Option<Vec<String>>,353 at: Option<BlockHash>,354 ) -> Result<Vec<PropertyInfo>>;355356 /// Get NFT properties, created by the user - not the proxy-specific properties.357 #[method(name = "rmrk_nftProperties")]358 fn nft_properties(359 &self,360 collection_id: RmrkCollectionId,361 nft_id: RmrkNftId,362 filter_keys: Option<Vec<String>>,363 at: Option<BlockHash>,364 ) -> Result<Vec<PropertyInfo>>;365366 /// Get data of resources of an NFT.367 #[method(name = "rmrk_nftResources")]368 fn nft_resources(369 &self,370 collection_id: RmrkCollectionId,371 nft_id: RmrkNftId,372 at: Option<BlockHash>,373 ) -> Result<Vec<ResourceInfo>>;374375 /// Get the priority of a resource in an NFT.376 #[method(name = "rmrk_nftResourcePriority")]377 fn nft_resource_priority(378 &self,379 collection_id: RmrkCollectionId,380 nft_id: RmrkNftId,381 resource_id: RmrkResourceId,382 at: Option<BlockHash>,383 ) -> Result<Option<u32>>;384385 /// Get base info by its ID.386 #[method(name = "rmrk_base")]387 fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;388389 /// Get all parts of a base.390 #[method(name = "rmrk_baseParts")]391 fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;392393 /// Get the theme names belonging to a base.394 #[method(name = "rmrk_themeNames")]395 fn theme_names(396 &self,397 base_id: RmrkBaseId,398 at: Option<BlockHash>,399 ) -> Result<Vec<RmrkThemeName>>;400401 /// Get theme info, including properties, optionally limited to the provided keys.402 #[method(name = "rmrk_themes")]403 fn theme(404 &self,405 base_id: RmrkBaseId,406 theme_name: String,407 filter_keys: Option<Vec<String>>,408 at: Option<BlockHash>,409 ) -> Result<Option<Theme>>;410 }411}412413macro_rules! define_struct_for_server_api {414 ($name:ident) => {415 pub struct $name<C, P> {416 client: Arc<C>,417 _marker: std::marker::PhantomData<P>,418 }419420 impl<C, P> $name<C, P> {421 pub fn new(client: Arc<C>) -> Self {422 Self {423 client,424 _marker: Default::default(),425 }426 }427 }428 };429}430431define_struct_for_server_api!(Unique);432define_struct_for_server_api!(AppPromotion);433define_struct_for_server_api!(Rmrk);434435macro_rules! pass_method {436 (437 $method_name:ident(438 $($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?439 ) -> $result:ty $(=> $mapper:expr)?,440 //$runtime_name:ident $(<$($lt: tt),+>)*441 $runtime_api_macro:ident442 $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*443 ) => {444 fn $method_name(445 &self,446 $(447 $name: $ty,448 )*449 at: Option<<Block as BlockT>::Hash>,450 ) -> Result<$result> {451 let api = self.client.runtime_api();452 let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));453 let _api_version = if let Ok(Some(api_version)) =454 api.api_version::<$runtime_api_macro!()>(&at)455 {456 api_version457 } else {458 // unreachable for our runtime459 return Err(anyhow!("api is not available").into())460 };461462 let result = $(if _api_version < $ver {463 api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))464 } else)*465 { api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };466467 Ok(result468 .map_err(|e| anyhow!("unable to query: {e}"))?469 .map_err(|e| anyhow!("runtime error: {e:?}"))$(.map($mapper))??)470 }471 };472}473474macro_rules! unique_api {475 () => {476 dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>477 };478}479480macro_rules! app_promotion_api {481 () => {482 dyn AppPromotionRuntimeApi<Block, BlockNumber, CrossAccountId, AccountId>483 };484}485486macro_rules! rmrk_api {487 () => {488 dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>489 };490}491492#[allow(deprecated)]493impl<C, Block, CrossAccountId, AccountId>494 UniqueApiServer<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>495where496 Block: BlockT,497 AccountId: Decode,498 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,499 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,500 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,501{502 pass_method!(503 account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api504 );505 pass_method!(506 collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api507 );508 pass_method!(509 token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api510 );511 pass_method!(512 token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api513 );514 pass_method!(515 topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api516 );517 pass_method!(token_children(collection: CollectionId, token: TokenId) -> Vec<TokenChild>, unique_api);518 pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);519 pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);520 pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);521 pass_method!(522 allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),523 unique_api524 );525526 pass_method!(collection_properties(527 collection: CollectionId,528529 #[map(|keys| string_keys_to_bytes_keys(keys))]530 keys: Option<Vec<String>>531 ) -> Vec<Property>, unique_api);532533 pass_method!(token_properties(534 collection: CollectionId,535 token_id: TokenId,536537 #[map(|keys| string_keys_to_bytes_keys(keys))]538 keys: Option<Vec<String>>539 ) -> Vec<Property>, unique_api);540541 pass_method!(property_permissions(542 collection: CollectionId,543544 #[map(|keys| string_keys_to_bytes_keys(keys))]545 keys: Option<Vec<String>>546 ) -> Vec<PropertyKeyPermission>, unique_api);547548 pass_method!(token_data(549 collection: CollectionId,550 token_id: TokenId,551552 #[map(|keys| string_keys_to_bytes_keys(keys))]553 keys: Option<Vec<String>>,554 ) -> TokenData<CrossAccountId>, unique_api);555556 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);557 pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);558 pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);559 pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);560 pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);561 pass_method!(collection_stats() -> CollectionStats, unique_api);562 pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);563 pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);564 pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<String> => |o| o.map(|number| number.to_string()) , unique_api);565 pass_method!(token_owners(collection: CollectionId, token: TokenId) -> Vec<CrossAccountId>, unique_api);566}567568impl<C, Block, BlockNumber, CrossAccountId, AccountId>569 app_promotion_unique_rpc::AppPromotionApiServer<570 <Block as BlockT>::Hash,571 BlockNumber,572 CrossAccountId,573 AccountId,574 > for AppPromotion<C, Block>575where576 Block: BlockT,577 BlockNumber: Decode + Member + AtLeast32BitUnsigned,578 AccountId: Decode,579 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,580 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,581 C::Api: AppPromotionRuntimeApi<Block, BlockNumber, CrossAccountId, AccountId>,582{583 pass_method!(total_staked(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);584 pass_method!(total_staked_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>585 |v| v586 .into_iter()587 .map(|(b, a)| (b, a.to_string()))588 .collect::<Vec<_>>(), app_promotion_api);589 pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);590 pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>591 |v| v592 .into_iter()593 .map(|(b, a)| (b, a.to_string()))594 .collect::<Vec<_>>(), app_promotion_api);595}596597#[allow(deprecated)]598impl<599 C,600 Block,601 AccountId,602 CollectionInfo,603 NftInfo,604 ResourceInfo,605 PropertyInfo,606 BaseInfo,607 PartType,608 Theme,609 >610 rmrk_unique_rpc::RmrkApiServer<611 <Block as BlockT>::Hash,612 AccountId,613 CollectionInfo,614 NftInfo,615 ResourceInfo,616 PropertyInfo,617 BaseInfo,618 PartType,619 Theme,620 > for Rmrk<C, Block>621where622 C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,623 C::Api: RmrkRuntimeApi<624 Block,625 AccountId,626 CollectionInfo,627 NftInfo,628 ResourceInfo,629 PropertyInfo,630 BaseInfo,631 PartType,632 Theme,633 >,634 AccountId: Decode + Encode,635 CollectionInfo: Decode,636 NftInfo: Decode,637 ResourceInfo: Decode,638 PropertyInfo: Decode,639 BaseInfo: Decode,640 PartType: Decode,641 Theme: Decode,642 Block: BlockT,643{644 pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);645 pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);646 pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);647 pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);648 pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);649 pass_method!(650 collection_properties(651 collection_id: RmrkCollectionId,652653 #[map(|keys| string_keys_to_bytes_keys(keys))]654 filter_keys: Option<Vec<String>>655 ) -> Vec<PropertyInfo>,656 rmrk_api657 );658 pass_method!(659 nft_properties(660 collection_id: RmrkCollectionId,661 nft_id: RmrkNftId,662663 #[map(|keys| string_keys_to_bytes_keys(keys))]664 filter_keys: Option<Vec<String>>665 ) -> Vec<PropertyInfo>,666 rmrk_api667 );668 pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);669 pass_method!(nft_resource_priority(collection_id: RmrkCollectionId, nft_id: RmrkNftId, resource_id: RmrkResourceId) -> Option<u32>, rmrk_api);670 pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);671 pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);672 pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);673 pass_method!(674 theme(675 base_id: RmrkBaseId,676677 #[map(|n| n.into_bytes())]678 theme_name: String,679680 #[map(|keys| string_keys_to_bytes_keys(keys))]681 filter_keys: Option<Vec<String>>682 ) -> Option<Theme>, rmrk_api);683}684685fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {686 keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())687}primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -447,6 +447,7 @@
}
/// Collection parameters, used in RPC calls (see [`Collection`] for the storage version).
+#[struct_versioning::versioned(version = 2, upper)]
#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub struct RpcCollection<AccountId> {
@@ -484,6 +485,7 @@
pub read_only: bool,
/// Extra collection flags
+ #[version(2.., upper(RpcCollectionFlags {foreign: false, erc721metadata: false}))]
pub flags: RpcCollectionFlags,
}
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -16,9 +16,11 @@
#![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+
use up_data_structs::{
CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
- PropertyKeyPermission, TokenData, TokenChild,
+ PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1,
};
use sp_std::vec::Vec;
@@ -28,15 +30,12 @@
type Result<T> = core::result::Result<T, DispatchError>;
sp_api::decl_runtime_apis! {
- #[api_version(2)]
+ #[api_version(3)]
/// Trait for generate rpc.
pub trait UniqueApi<CrossAccountId, AccountId> where
AccountId: Decode,
CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,
{
- #[changed_in(2)]
- fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
-
/// Get number of tokens in collection owned by account.
fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;
@@ -110,6 +109,9 @@
/// Get collection by id.
fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;
+ #[changed_in(3)]
+ fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollectionVersion1<AccountId>>>;
+
/// Get collection stats.
fn collection_stats() -> Result<CollectionStats>;