difftreelog
Merge pull request #426 from UniqueNetwork/feature/token_owners
in: master
31 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5953,7 +5953,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"ethereum",
"evm-coder",
@@ -6198,7 +6198,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"ethereum",
"evm-coder",
@@ -12377,7 +12377,7 @@
[[package]]
name = "uc-rpc"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -12682,7 +12682,7 @@
[[package]]
name = "unique-runtime-common"
-version = "0.9.24"
+version = "0.9.25"
dependencies = [
"evm-coder",
"fp-rpc",
@@ -12754,7 +12754,7 @@
[[package]]
name = "up-rpc"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"pallet-common",
"pallet-evm",
client/rpc/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/client/rpc/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2022-07-14
+
+### Added
+
+ - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
+
\ No newline at end of file
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "uc-rpc"
-version = "0.1.0"
+version = "0.1.1"
license = "GPLv3"
edition = "2021"
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 up_data_structs::{27 RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,28 PropertyKeyPermission, TokenData, TokenChild,29};30use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};31use sp_blockchain::HeaderBackend;32use up_rpc::UniqueApi as UniqueRuntimeApi;3334// RMRK35use rmrk_rpc::RmrkApi as RmrkRuntimeApi;36use up_data_structs::{37 RmrkCollectionId, RmrkNftId, RmrkBaseId, RmrkNftChild, RmrkThemeName, RmrkResourceId,38};3940pub use rmrk_unique_rpc::RmrkApiServer;4142#[rpc(server)]43#[async_trait]44pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {45 #[method(name = "unique_accountTokens")]46 fn account_tokens(47 &self,48 collection: CollectionId,49 account: CrossAccountId,50 at: Option<BlockHash>,51 ) -> Result<Vec<TokenId>>;52 #[method(name = "unique_collectionTokens")]53 fn collection_tokens(54 &self,55 collection: CollectionId,56 at: Option<BlockHash>,57 ) -> Result<Vec<TokenId>>;58 #[method(name = "unique_tokenExists")]59 fn token_exists(60 &self,61 collection: CollectionId,62 token: TokenId,63 at: Option<BlockHash>,64 ) -> Result<bool>;6566 #[method(name = "unique_tokenOwner")]67 fn token_owner(68 &self,69 collection: CollectionId,70 token: TokenId,71 at: Option<BlockHash>,72 ) -> Result<Option<CrossAccountId>>;73 #[method(name = "unique_topmostTokenOwner")]74 fn topmost_token_owner(75 &self,76 collection: CollectionId,77 token: TokenId,78 at: Option<BlockHash>,79 ) -> Result<Option<CrossAccountId>>;80 #[method(name = "unique_tokenChildren")]81 fn token_children(82 &self,83 collection: CollectionId,84 token: TokenId,85 at: Option<BlockHash>,86 ) -> Result<Vec<TokenChild>>;8788 #[method(name = "unique_collectionProperties")]89 fn collection_properties(90 &self,91 collection: CollectionId,92 keys: Option<Vec<String>>,93 at: Option<BlockHash>,94 ) -> Result<Vec<Property>>;9596 #[method(name = "unique_tokenProperties")]97 fn token_properties(98 &self,99 collection: CollectionId,100 token_id: TokenId,101 keys: Option<Vec<String>>,102 at: Option<BlockHash>,103 ) -> Result<Vec<Property>>;104105 #[method(name = "unique_propertyPermissions")]106 fn property_permissions(107 &self,108 collection: CollectionId,109 keys: Option<Vec<String>>,110 at: Option<BlockHash>,111 ) -> Result<Vec<PropertyKeyPermission>>;112113 #[method(name = "unique_tokenData")]114 fn token_data(115 &self,116 collection: CollectionId,117 token_id: TokenId,118 keys: Option<Vec<String>>,119 at: Option<BlockHash>,120 ) -> Result<TokenData<CrossAccountId>>;121122 #[method(name = "unique_totalSupply")]123 fn total_supply(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;124 #[method(name = "unique_accountBalance")]125 fn account_balance(126 &self,127 collection: CollectionId,128 account: CrossAccountId,129 at: Option<BlockHash>,130 ) -> Result<u32>;131 #[method(name = "unique_balance")]132 fn balance(133 &self,134 collection: CollectionId,135 account: CrossAccountId,136 token: TokenId,137 at: Option<BlockHash>,138 ) -> Result<String>;139 #[method(name = "unique_allowance")]140 fn allowance(141 &self,142 collection: CollectionId,143 sender: CrossAccountId,144 spender: CrossAccountId,145 token: TokenId,146 at: Option<BlockHash>,147 ) -> Result<String>;148149 #[method(name = "unique_adminlist")]150 fn adminlist(151 &self,152 collection: CollectionId,153 at: Option<BlockHash>,154 ) -> Result<Vec<CrossAccountId>>;155 #[method(name = "unique_allowlist")]156 fn allowlist(157 &self,158 collection: CollectionId,159 at: Option<BlockHash>,160 ) -> Result<Vec<CrossAccountId>>;161 #[method(name = "unique_allowed")]162 fn allowed(163 &self,164 collection: CollectionId,165 user: CrossAccountId,166 at: Option<BlockHash>,167 ) -> Result<bool>;168 #[method(name = "unique_lastTokenId")]169 fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;170 #[method(name = "unique_collectionById")]171 fn collection_by_id(172 &self,173 collection: CollectionId,174 at: Option<BlockHash>,175 ) -> Result<Option<RpcCollection<AccountId>>>;176 #[method(name = "unique_collectionStats")]177 fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;178179 #[method(name = "unique_nextSponsored")]180 fn next_sponsored(181 &self,182 collection: CollectionId,183 account: CrossAccountId,184 token: TokenId,185 at: Option<BlockHash>,186 ) -> Result<Option<u64>>;187188 #[method(name = "unique_effectiveCollectionLimits")]189 fn effective_collection_limits(190 &self,191 collection_id: CollectionId,192 at: Option<BlockHash>,193 ) -> Result<Option<CollectionLimits>>;194195 #[method(name = "unique_totalPieces")]196 fn total_pieces(197 &self,198 collection_id: CollectionId,199 token_id: TokenId,200 at: Option<BlockHash>,201 ) -> Result<Option<u128>>;202}203204mod rmrk_unique_rpc {205 use super::*;206207 #[rpc(server)]208 #[async_trait]209 pub trait RmrkApi<210 BlockHash,211 AccountId,212 CollectionInfo,213 NftInfo,214 ResourceInfo,215 PropertyInfo,216 BaseInfo,217 PartType,218 Theme,219 >220 {221 #[method(name = "rmrk_lastCollectionIdx")]222 /// Get the latest created collection id223 fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;224225 #[method(name = "rmrk_collectionById")]226 /// Get collection by id227 fn collection_by_id(228 &self,229 id: RmrkCollectionId,230 at: Option<BlockHash>,231 ) -> Result<Option<CollectionInfo>>;232233 #[method(name = "rmrk_nftById")]234 /// Get NFT by collection id and NFT id235 fn nft_by_id(236 &self,237 collection_id: RmrkCollectionId,238 nft_id: RmrkNftId,239 at: Option<BlockHash>,240 ) -> Result<Option<NftInfo>>;241242 #[method(name = "rmrk_accountTokens")]243 /// Get tokens owned by an account in a collection244 fn account_tokens(245 &self,246 account_id: AccountId,247 collection_id: RmrkCollectionId,248 at: Option<BlockHash>,249 ) -> Result<Vec<RmrkNftId>>;250251 #[method(name = "rmrk_nftChildren")]252 /// Get NFT children253 fn nft_children(254 &self,255 collection_id: RmrkCollectionId,256 nft_id: RmrkNftId,257 at: Option<BlockHash>,258 ) -> Result<Vec<RmrkNftChild>>;259260 #[method(name = "rmrk_collectionProperties")]261 /// Get collection properties262 fn collection_properties(263 &self,264 collection_id: RmrkCollectionId,265 filter_keys: Option<Vec<String>>,266 at: Option<BlockHash>,267 ) -> Result<Vec<PropertyInfo>>;268269 #[method(name = "rmrk_nftProperties")]270 /// Get NFT properties271 fn nft_properties(272 &self,273 collection_id: RmrkCollectionId,274 nft_id: RmrkNftId,275 filter_keys: Option<Vec<String>>,276 at: Option<BlockHash>,277 ) -> Result<Vec<PropertyInfo>>;278279 #[method(name = "rmrk_nftResources")]280 /// Get NFT resources281 fn nft_resources(282 &self,283 collection_id: RmrkCollectionId,284 nft_id: RmrkNftId,285 at: Option<BlockHash>,286 ) -> Result<Vec<ResourceInfo>>;287288 #[method(name = "rmrk_nftResourcePriority")]289 /// Get NFT resource priority290 fn nft_resource_priority(291 &self,292 collection_id: RmrkCollectionId,293 nft_id: RmrkNftId,294 resource_id: RmrkResourceId,295 at: Option<BlockHash>,296 ) -> Result<Option<u32>>;297298 #[method(name = "rmrk_base")]299 /// Get base info300 fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;301302 #[method(name = "rmrk_baseParts")]303 /// Get all Base's parts304 fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;305306 #[method(name = "rmrk_themeNames")]307 fn theme_names(308 &self,309 base_id: RmrkBaseId,310 at: Option<BlockHash>,311 ) -> Result<Vec<RmrkThemeName>>;312313 #[method(name = "rmrk_themes")]314 fn theme(315 &self,316 base_id: RmrkBaseId,317 theme_name: String,318 filter_keys: Option<Vec<String>>,319 at: Option<BlockHash>,320 ) -> Result<Option<Theme>>;321 }322}323324pub struct Unique<C, P> {325 client: Arc<C>,326 _marker: std::marker::PhantomData<P>,327}328329impl<C, P> Unique<C, P> {330 pub fn new(client: Arc<C>) -> Self {331 Self {332 client,333 _marker: Default::default(),334 }335 }336}337338pub struct Rmrk<C, P> {339 client: Arc<C>,340 _marker: std::marker::PhantomData<P>,341}342343impl<C, P> Rmrk<C, P> {344 pub fn new(client: Arc<C>) -> Self {345 Self {346 client,347 _marker: Default::default(),348 }349 }350}351352macro_rules! pass_method {353 (354 $method_name:ident(355 $($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?356 ) -> $result:ty $(=> $mapper:expr)?,357 //$runtime_name:ident $(<$($lt: tt),+>)*358 $runtime_api_macro:ident359 $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*360 ) => {361 fn $method_name(362 &self,363 $(364 $name: $ty,365 )*366 at: Option<<Block as BlockT>::Hash>,367 ) -> Result<$result> {368 let api = self.client.runtime_api();369 let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));370 let _api_version = if let Ok(Some(api_version)) =371 api.api_version::<$runtime_api_macro!()>(&at)372 {373 api_version374 } else {375 // unreachable for our runtime376 return Err(anyhow!("api is not available").into())377 };378379 let result = $(if _api_version < $ver {380 api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))381 } else)*382 { api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };383384 Ok(result385 .map_err(|e| anyhow!("unable to query: {e}"))?386 .map_err(|e| anyhow!("runtime error: {e:?}"))$(.map($mapper))??)387 }388 };389}390391macro_rules! unique_api {392 () => {393 dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>394 };395}396397macro_rules! rmrk_api {398 () => {399 dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>400 };401}402403#[allow(deprecated)]404impl<C, Block, CrossAccountId, AccountId>405 UniqueApiServer<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>406where407 Block: BlockT,408 AccountId: Decode,409 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,410 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,411 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,412{413 pass_method!(414 account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api415 );416 pass_method!(417 collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api418 );419 pass_method!(420 token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api421 );422 pass_method!(423 token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api424 );425 pass_method!(426 topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api427 );428 pass_method!(token_children(collection: CollectionId, token: TokenId) -> Vec<TokenChild>, unique_api);429 pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);430 pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);431 pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);432 pass_method!(433 allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),434 unique_api435 );436437 pass_method!(collection_properties(438 collection: CollectionId,439440 #[map(|keys| string_keys_to_bytes_keys(keys))]441 keys: Option<Vec<String>>442 ) -> Vec<Property>, unique_api);443444 pass_method!(token_properties(445 collection: CollectionId,446 token_id: TokenId,447448 #[map(|keys| string_keys_to_bytes_keys(keys))]449 keys: Option<Vec<String>>450 ) -> Vec<Property>, unique_api);451452 pass_method!(property_permissions(453 collection: CollectionId,454455 #[map(|keys| string_keys_to_bytes_keys(keys))]456 keys: Option<Vec<String>>457 ) -> Vec<PropertyKeyPermission>, unique_api);458459 pass_method!(token_data(460 collection: CollectionId,461 token_id: TokenId,462463 #[map(|keys| string_keys_to_bytes_keys(keys))]464 keys: Option<Vec<String>>,465 ) -> TokenData<CrossAccountId>, unique_api);466467 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);468 pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);469 pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);470 pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);471 pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);472 pass_method!(collection_stats() -> CollectionStats, unique_api);473 pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);474 pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);475 pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128>, unique_api);476}477478#[allow(deprecated)]479impl<480 C,481 Block,482 AccountId,483 CollectionInfo,484 NftInfo,485 ResourceInfo,486 PropertyInfo,487 BaseInfo,488 PartType,489 Theme,490 >491 rmrk_unique_rpc::RmrkApiServer<492 <Block as BlockT>::Hash,493 AccountId,494 CollectionInfo,495 NftInfo,496 ResourceInfo,497 PropertyInfo,498 BaseInfo,499 PartType,500 Theme,501 > for Rmrk<C, Block>502where503 C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,504 C::Api: RmrkRuntimeApi<505 Block,506 AccountId,507 CollectionInfo,508 NftInfo,509 ResourceInfo,510 PropertyInfo,511 BaseInfo,512 PartType,513 Theme,514 >,515 AccountId: Decode + Encode,516 CollectionInfo: Decode,517 NftInfo: Decode,518 ResourceInfo: Decode,519 PropertyInfo: Decode,520 BaseInfo: Decode,521 PartType: Decode,522 Theme: Decode,523 Block: BlockT,524{525 pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);526 pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);527 pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);528 pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);529 pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);530 pass_method!(531 collection_properties(532 collection_id: RmrkCollectionId,533534 #[map(|keys| string_keys_to_bytes_keys(keys))]535 filter_keys: Option<Vec<String>>536 ) -> Vec<PropertyInfo>,537 rmrk_api538 );539 pass_method!(540 nft_properties(541 collection_id: RmrkCollectionId,542 nft_id: RmrkNftId,543544 #[map(|keys| string_keys_to_bytes_keys(keys))]545 filter_keys: Option<Vec<String>>546 ) -> Vec<PropertyInfo>,547 rmrk_api548 );549 pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);550 pass_method!(nft_resource_priority(collection_id: RmrkCollectionId, nft_id: RmrkNftId, resource_id: RmrkResourceId) -> Option<u32>, rmrk_api);551 pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);552 pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);553 pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);554 pass_method!(555 theme(556 base_id: RmrkBaseId,557558 #[map(|n| n.into_bytes())]559 theme_name: String,560561 #[map(|keys| string_keys_to_bytes_keys(keys))]562 filter_keys: Option<Vec<String>>563 ) -> Option<Theme>, rmrk_api);564}565566fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {567 keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())568}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 up_data_structs::{27 RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,28 PropertyKeyPermission, TokenData, TokenChild,29};30use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};31use sp_blockchain::HeaderBackend;32use up_rpc::UniqueApi as UniqueRuntimeApi;3334// RMRK35use rmrk_rpc::RmrkApi as RmrkRuntimeApi;36use up_data_structs::{37 RmrkCollectionId, RmrkNftId, RmrkBaseId, RmrkNftChild, RmrkThemeName, RmrkResourceId,38};3940pub use rmrk_unique_rpc::RmrkApiServer;4142#[rpc(server)]43#[async_trait]44pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {45 #[method(name = "unique_accountTokens")]46 fn account_tokens(47 &self,48 collection: CollectionId,49 account: CrossAccountId,50 at: Option<BlockHash>,51 ) -> Result<Vec<TokenId>>;52 #[method(name = "unique_collectionTokens")]53 fn collection_tokens(54 &self,55 collection: CollectionId,56 at: Option<BlockHash>,57 ) -> Result<Vec<TokenId>>;58 #[method(name = "unique_tokenExists")]59 fn token_exists(60 &self,61 collection: CollectionId,62 token: TokenId,63 at: Option<BlockHash>,64 ) -> Result<bool>;6566 #[method(name = "unique_tokenOwner")]67 fn token_owner(68 &self,69 collection: CollectionId,70 token: TokenId,71 at: Option<BlockHash>,72 ) -> Result<Option<CrossAccountId>>;7374 /// Returns 10 tokens owners in no particular order.75 #[method(name = "unique_tokenOwners")]76 fn token_owners(77 &self,78 collection: CollectionId,79 token: TokenId,80 at: Option<BlockHash>,81 ) -> Result<Vec<CrossAccountId>>;8283 #[method(name = "unique_topmostTokenOwner")]84 fn topmost_token_owner(85 &self,86 collection: CollectionId,87 token: TokenId,88 at: Option<BlockHash>,89 ) -> Result<Option<CrossAccountId>>;90 #[method(name = "unique_tokenChildren")]91 fn token_children(92 &self,93 collection: CollectionId,94 token: TokenId,95 at: Option<BlockHash>,96 ) -> Result<Vec<TokenChild>>;9798 #[method(name = "unique_collectionProperties")]99 fn collection_properties(100 &self,101 collection: CollectionId,102 keys: Option<Vec<String>>,103 at: Option<BlockHash>,104 ) -> Result<Vec<Property>>;105106 #[method(name = "unique_tokenProperties")]107 fn token_properties(108 &self,109 collection: CollectionId,110 token_id: TokenId,111 keys: Option<Vec<String>>,112 at: Option<BlockHash>,113 ) -> Result<Vec<Property>>;114115 #[method(name = "unique_propertyPermissions")]116 fn property_permissions(117 &self,118 collection: CollectionId,119 keys: Option<Vec<String>>,120 at: Option<BlockHash>,121 ) -> Result<Vec<PropertyKeyPermission>>;122123 #[method(name = "unique_tokenData")]124 fn token_data(125 &self,126 collection: CollectionId,127 token_id: TokenId,128 keys: Option<Vec<String>>,129 at: Option<BlockHash>,130 ) -> Result<TokenData<CrossAccountId>>;131132 #[method(name = "unique_totalSupply")]133 fn total_supply(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;134 #[method(name = "unique_accountBalance")]135 fn account_balance(136 &self,137 collection: CollectionId,138 account: CrossAccountId,139 at: Option<BlockHash>,140 ) -> Result<u32>;141 #[method(name = "unique_balance")]142 fn balance(143 &self,144 collection: CollectionId,145 account: CrossAccountId,146 token: TokenId,147 at: Option<BlockHash>,148 ) -> Result<String>;149 #[method(name = "unique_allowance")]150 fn allowance(151 &self,152 collection: CollectionId,153 sender: CrossAccountId,154 spender: CrossAccountId,155 token: TokenId,156 at: Option<BlockHash>,157 ) -> Result<String>;158159 #[method(name = "unique_adminlist")]160 fn adminlist(161 &self,162 collection: CollectionId,163 at: Option<BlockHash>,164 ) -> Result<Vec<CrossAccountId>>;165 #[method(name = "unique_allowlist")]166 fn allowlist(167 &self,168 collection: CollectionId,169 at: Option<BlockHash>,170 ) -> Result<Vec<CrossAccountId>>;171 #[method(name = "unique_allowed")]172 fn allowed(173 &self,174 collection: CollectionId,175 user: CrossAccountId,176 at: Option<BlockHash>,177 ) -> Result<bool>;178 #[method(name = "unique_lastTokenId")]179 fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;180 #[method(name = "unique_collectionById")]181 fn collection_by_id(182 &self,183 collection: CollectionId,184 at: Option<BlockHash>,185 ) -> Result<Option<RpcCollection<AccountId>>>;186 #[method(name = "unique_collectionStats")]187 fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;188189 #[method(name = "unique_nextSponsored")]190 fn next_sponsored(191 &self,192 collection: CollectionId,193 account: CrossAccountId,194 token: TokenId,195 at: Option<BlockHash>,196 ) -> Result<Option<u64>>;197198 #[method(name = "unique_effectiveCollectionLimits")]199 fn effective_collection_limits(200 &self,201 collection_id: CollectionId,202 at: Option<BlockHash>,203 ) -> Result<Option<CollectionLimits>>;204205 #[method(name = "unique_totalPieces")]206 fn total_pieces(207 &self,208 collection_id: CollectionId,209 token_id: TokenId,210 at: Option<BlockHash>,211 ) -> Result<Option<u128>>;212}213214mod rmrk_unique_rpc {215 use super::*;216217 #[rpc(server)]218 #[async_trait]219 pub trait RmrkApi<220 BlockHash,221 AccountId,222 CollectionInfo,223 NftInfo,224 ResourceInfo,225 PropertyInfo,226 BaseInfo,227 PartType,228 Theme,229 >230 {231 #[method(name = "rmrk_lastCollectionIdx")]232 /// Get the latest created collection id233 fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;234235 #[method(name = "rmrk_collectionById")]236 /// Get collection by id237 fn collection_by_id(238 &self,239 id: RmrkCollectionId,240 at: Option<BlockHash>,241 ) -> Result<Option<CollectionInfo>>;242243 #[method(name = "rmrk_nftById")]244 /// Get NFT by collection id and NFT id245 fn nft_by_id(246 &self,247 collection_id: RmrkCollectionId,248 nft_id: RmrkNftId,249 at: Option<BlockHash>,250 ) -> Result<Option<NftInfo>>;251252 #[method(name = "rmrk_accountTokens")]253 /// Get tokens owned by an account in a collection254 fn account_tokens(255 &self,256 account_id: AccountId,257 collection_id: RmrkCollectionId,258 at: Option<BlockHash>,259 ) -> Result<Vec<RmrkNftId>>;260261 #[method(name = "rmrk_nftChildren")]262 /// Get NFT children263 fn nft_children(264 &self,265 collection_id: RmrkCollectionId,266 nft_id: RmrkNftId,267 at: Option<BlockHash>,268 ) -> Result<Vec<RmrkNftChild>>;269270 #[method(name = "rmrk_collectionProperties")]271 /// Get collection properties272 fn collection_properties(273 &self,274 collection_id: RmrkCollectionId,275 filter_keys: Option<Vec<String>>,276 at: Option<BlockHash>,277 ) -> Result<Vec<PropertyInfo>>;278279 #[method(name = "rmrk_nftProperties")]280 /// Get NFT properties281 fn nft_properties(282 &self,283 collection_id: RmrkCollectionId,284 nft_id: RmrkNftId,285 filter_keys: Option<Vec<String>>,286 at: Option<BlockHash>,287 ) -> Result<Vec<PropertyInfo>>;288289 #[method(name = "rmrk_nftResources")]290 /// Get NFT resources291 fn nft_resources(292 &self,293 collection_id: RmrkCollectionId,294 nft_id: RmrkNftId,295 at: Option<BlockHash>,296 ) -> Result<Vec<ResourceInfo>>;297298 #[method(name = "rmrk_nftResourcePriority")]299 /// Get NFT resource priority300 fn nft_resource_priority(301 &self,302 collection_id: RmrkCollectionId,303 nft_id: RmrkNftId,304 resource_id: RmrkResourceId,305 at: Option<BlockHash>,306 ) -> Result<Option<u32>>;307308 #[method(name = "rmrk_base")]309 /// Get base info310 fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;311312 #[method(name = "rmrk_baseParts")]313 /// Get all Base's parts314 fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;315316 #[method(name = "rmrk_themeNames")]317 fn theme_names(318 &self,319 base_id: RmrkBaseId,320 at: Option<BlockHash>,321 ) -> Result<Vec<RmrkThemeName>>;322323 #[method(name = "rmrk_themes")]324 fn theme(325 &self,326 base_id: RmrkBaseId,327 theme_name: String,328 filter_keys: Option<Vec<String>>,329 at: Option<BlockHash>,330 ) -> Result<Option<Theme>>;331 }332}333334pub struct Unique<C, P> {335 client: Arc<C>,336 _marker: std::marker::PhantomData<P>,337}338339impl<C, P> Unique<C, P> {340 pub fn new(client: Arc<C>) -> Self {341 Self {342 client,343 _marker: Default::default(),344 }345 }346}347348pub struct Rmrk<C, P> {349 client: Arc<C>,350 _marker: std::marker::PhantomData<P>,351}352353impl<C, P> Rmrk<C, P> {354 pub fn new(client: Arc<C>) -> Self {355 Self {356 client,357 _marker: Default::default(),358 }359 }360}361362macro_rules! pass_method {363 (364 $method_name:ident(365 $($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?366 ) -> $result:ty $(=> $mapper:expr)?,367 //$runtime_name:ident $(<$($lt: tt),+>)*368 $runtime_api_macro:ident369 $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*370 ) => {371 fn $method_name(372 &self,373 $(374 $name: $ty,375 )*376 at: Option<<Block as BlockT>::Hash>,377 ) -> Result<$result> {378 let api = self.client.runtime_api();379 let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));380 let _api_version = if let Ok(Some(api_version)) =381 api.api_version::<$runtime_api_macro!()>(&at)382 {383 api_version384 } else {385 // unreachable for our runtime386 return Err(anyhow!("api is not available").into())387 };388389 let result = $(if _api_version < $ver {390 api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))391 } else)*392 { api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };393394 Ok(result395 .map_err(|e| anyhow!("unable to query: {e}"))?396 .map_err(|e| anyhow!("runtime error: {e:?}"))$(.map($mapper))??)397 }398 };399}400401macro_rules! unique_api {402 () => {403 dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>404 };405}406407macro_rules! rmrk_api {408 () => {409 dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>410 };411}412413#[allow(deprecated)]414impl<C, Block, CrossAccountId, AccountId>415 UniqueApiServer<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>416where417 Block: BlockT,418 AccountId: Decode,419 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,420 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,421 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,422{423 pass_method!(424 account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api425 );426 pass_method!(427 collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api428 );429 pass_method!(430 token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api431 );432 pass_method!(433 token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api434 );435 pass_method!(436 topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api437 );438 pass_method!(token_children(collection: CollectionId, token: TokenId) -> Vec<TokenChild>, unique_api);439 pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);440 pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);441 pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);442 pass_method!(443 allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),444 unique_api445 );446447 pass_method!(collection_properties(448 collection: CollectionId,449450 #[map(|keys| string_keys_to_bytes_keys(keys))]451 keys: Option<Vec<String>>452 ) -> Vec<Property>, unique_api);453454 pass_method!(token_properties(455 collection: CollectionId,456 token_id: TokenId,457458 #[map(|keys| string_keys_to_bytes_keys(keys))]459 keys: Option<Vec<String>>460 ) -> Vec<Property>, unique_api);461462 pass_method!(property_permissions(463 collection: CollectionId,464465 #[map(|keys| string_keys_to_bytes_keys(keys))]466 keys: Option<Vec<String>>467 ) -> Vec<PropertyKeyPermission>, unique_api);468469 pass_method!(token_data(470 collection: CollectionId,471 token_id: TokenId,472473 #[map(|keys| string_keys_to_bytes_keys(keys))]474 keys: Option<Vec<String>>,475 ) -> TokenData<CrossAccountId>, unique_api);476477 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);478 pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);479 pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);480 pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);481 pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);482 pass_method!(collection_stats() -> CollectionStats, unique_api);483 pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);484 pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);485 pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128>, unique_api);486 pass_method!(token_owners(collection: CollectionId, token: TokenId) -> Vec<CrossAccountId>, unique_api);487}488489#[allow(deprecated)]490impl<491 C,492 Block,493 AccountId,494 CollectionInfo,495 NftInfo,496 ResourceInfo,497 PropertyInfo,498 BaseInfo,499 PartType,500 Theme,501 >502 rmrk_unique_rpc::RmrkApiServer<503 <Block as BlockT>::Hash,504 AccountId,505 CollectionInfo,506 NftInfo,507 ResourceInfo,508 PropertyInfo,509 BaseInfo,510 PartType,511 Theme,512 > for Rmrk<C, Block>513where514 C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,515 C::Api: RmrkRuntimeApi<516 Block,517 AccountId,518 CollectionInfo,519 NftInfo,520 ResourceInfo,521 PropertyInfo,522 BaseInfo,523 PartType,524 Theme,525 >,526 AccountId: Decode + Encode,527 CollectionInfo: Decode,528 NftInfo: Decode,529 ResourceInfo: Decode,530 PropertyInfo: Decode,531 BaseInfo: Decode,532 PartType: Decode,533 Theme: Decode,534 Block: BlockT,535{536 pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);537 pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);538 pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);539 pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);540 pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);541 pass_method!(542 collection_properties(543 collection_id: RmrkCollectionId,544545 #[map(|keys| string_keys_to_bytes_keys(keys))]546 filter_keys: Option<Vec<String>>547 ) -> Vec<PropertyInfo>,548 rmrk_api549 );550 pass_method!(551 nft_properties(552 collection_id: RmrkCollectionId,553 nft_id: RmrkNftId,554555 #[map(|keys| string_keys_to_bytes_keys(keys))]556 filter_keys: Option<Vec<String>>557 ) -> Vec<PropertyInfo>,558 rmrk_api559 );560 pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);561 pass_method!(nft_resource_priority(collection_id: RmrkCollectionId, nft_id: RmrkNftId, resource_id: RmrkResourceId) -> Option<u32>, rmrk_api);562 pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);563 pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);564 pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);565 pass_method!(566 theme(567 base_id: RmrkBaseId,568569 #[map(|n| n.into_bytes())]570 theme_name: String,571572 #[map(|keys| string_keys_to_bytes_keys(keys))]573 filter_keys: Option<Vec<String>>574 ) -> Option<Theme>, rmrk_api);575}576577fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {578 keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())579}pallets/common/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/pallets/common/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2022-07-14
+
+### Added
+
+ - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
+
+
\ No newline at end of file
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1748,6 +1748,11 @@
/// * `token` - The token for which you need to find out the owner.
fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;
+ /// Returns 10 tokens owners in no particular order.
+ ///
+ /// * `token` - The token for which you need to find out the owners.
+ fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId>;
+
/// Get the value of the token property by key.
///
/// * `token` - Token with the property to get.
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/pallets/fungible/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2022-07-14
+
+### Added
+
+ - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
+
+
+
\ No newline at end of file
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.0"
+version = "0.1.1"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -362,6 +362,11 @@
None
}
+ /// Returns 10 tokens owners in no particular order.
+ fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
+ <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
+ }
+
fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
None
}
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -95,7 +95,7 @@
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-use sp_std::{collections::btree_map::BTreeMap};
+use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
pub use pallet::*;
@@ -613,4 +613,26 @@
nesting_budget,
)
}
+
+ /// Returns 10 tokens owners in no particular order
+ ///
+ /// There is no direct way to get token holders in ascending order,
+ /// since `iter_prefix` returns values in no particular order.
+ /// Therefore, getting the 10 largest holders with a large value of holders
+ /// can lead to impact memory allocation + sorting with `n * log (n)`.
+ pub fn token_owners(
+ collection: CollectionId,
+ _token: TokenId,
+ ) -> Option<Vec<T::CrossAccountId>> {
+ let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection,))
+ .map(|(owner, _amount)| owner)
+ .take(10)
+ .collect();
+
+ if res.is_empty() {
+ None
+ } else {
+ Some(res)
+ }
+ }
}
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2022-07-14
+
+### Added
+
+- Implementation of RPC method `token_owners`.
+ For reasons of compatibility with this pallet, returns only one owner if token exists.
+ This was an internal request to improve the web interface and support fractionalization event.
\ No newline at end of file
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.0"
+version = "0.1.1"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -26,7 +26,7 @@
weights::WeightInfo as _,
};
use sp_runtime::DispatchError;
-use sp_std::vec::Vec;
+use sp_std::{vec::Vec, vec};
use crate::{
AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,
@@ -422,6 +422,11 @@
<TokenData<T>>::get((self.id, token)).map(|t| t.owner)
}
+ /// Returns token owners.
+ fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
+ self.token_owner(token).map_or_else(|| vec![], |t| vec![t])
+ }
+
fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {
<Pallet<T>>::token_properties((self.id, token_id))
.get(key)
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -1,6 +1,18 @@
-## v0.1.2 - 2022-07
+# Change Log
-### Refungible Pallet
+All notable changes to this project will be documented in this file.
+## [v0.1.2] - 2022-07-14
+
+### Other changes
+
feat(refungible-pallet): add ERC-20 EVM API for RFT token pieces ([#413](https://github.com/UniqueNetwork/unique-chain/pull/413))
-test(refungible-pallet): add tests for ERC-20 EVM API for RFT token pieces ([#413](https://github.com/UniqueNetwork/unique-chain/pull/413))
\ No newline at end of file
+test(refungible-pallet): add tests for ERC-20 EVM API for RFT token pieces ([#413](https://github.com/UniqueNetwork/unique-chain/pull/413))
+
+## [v0.1.1] - 2022-07-14
+
+### Other changes
+
+- feat: RPC method `token_owners` returning 10 owners in no particular order.
+
+This was an internal request to improve the web interface and support fractionalization event.
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -438,6 +438,11 @@
<Pallet<T>>::token_owner(self.id, token)
}
+ /// Returns 10 token in no particular order.
+ fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
+ <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
+ }
+
fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
None
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1235,4 +1235,26 @@
) -> DispatchResult {
<PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)
}
+
+ /// Returns 10 token in no particular order.
+ ///
+ /// There is no direct way to get token holders in ascending order,
+ /// since `iter_prefix` returns values in no particular order.
+ /// Therefore, getting the 10 largest holders with a large value of holders
+ /// can lead to impact memory allocation + sorting with `n * log (n)`.
+ pub fn token_owners(
+ collection_id: CollectionId,
+ token: TokenId,
+ ) -> Option<Vec<T::CrossAccountId>> {
+ let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))
+ .map(|(owner, _amount)| owner)
+ .take(10)
+ .collect();
+
+ if res.is_empty() {
+ None
+ } else {
+ Some(res)
+ }
+ }
}
primitives/rpc/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/primitives/rpc/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2022-07-14
+
+### Added
+
+ - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
\ No newline at end of file
primitives/rpc/Cargo.tomldiffbeforeafterboth--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "up-rpc"
-version = "0.1.0"
+version = "0.1.1"
license = "GPLv3"
edition = "2021"
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -81,5 +81,6 @@
fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;
fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;
fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<Option<u128>>;
+ fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec<CrossAccountId>>;
}
}
runtime/common/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/runtime/common/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.9.25] - 2022-07-14
+
+### Added
+
+ - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
+
+
+
\ No newline at end of file
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -40,6 +40,11 @@
fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {
dispatch_unique_runtime!(collection.token_owner(token))
}
+
+ fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>, DispatchError> {
+ dispatch_unique_runtime!(collection.token_owners(token))
+ }
+
fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {
let budget = up_data_structs::budget::Value::new(10);
tests/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/tests/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## 2022-07-14
+
+### Added
+ - Integrintegration tests of RPC method `token_owners`.
+ - Integrintegration tests of Fungible Pallet.
+
+
\ No newline at end of file
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -80,6 +80,8 @@
"testLimits": "mocha --timeout 9999999 -r ts-node/register ./**/limits.test.ts",
"testEthCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/eth/createCollection.test.ts",
"testRFT": "mocha --timeout 9999999 -r ts-node/register ./**/refungible.test.ts",
+ "testFT": "mocha --timeout 9999999 -r ts-node/register ./**/fungible.test.ts",
+ "testRPC": "mocha --timeout 9999999 -r ts-node/register ./**/rpc.test.ts",
"polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",
"polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
"polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
tests/src/fungible.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/fungible.test.ts
@@ -0,0 +1,184 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import {default as usingApi} from './substrate/substrate-api';
+import {IKeyringPair} from '@polkadot/types/types';
+import {
+ getBalance,
+ createMultipleItemsExpectSuccess,
+ isTokenExists,
+ getLastTokenId,
+ getAllowance,
+ approve,
+ transferFrom,
+ createCollection,
+ transfer,
+ burnItem,
+ normalizeAccountId,
+ CrossAccountId,
+ createFungibleItemExpectSuccess,
+ U128_MAX,
+ burnFromExpectSuccess,
+} from './util/helpers';
+
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+let alice: IKeyringPair;
+let bob: IKeyringPair;
+
+describe('integration test: Fungible functionality:', () => {
+ before(async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ });
+ });
+
+ it('Create fungible collection and token', async () => {
+ await usingApi(async api => {
+ const createCollectionResult = await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}});
+ expect(createCollectionResult.success).to.be.true;
+ const collectionId = createCollectionResult.collectionId;
+ const defaultTokenId = await getLastTokenId(api, collectionId);
+ const aliceTokenId = await createFungibleItemExpectSuccess(alice, collectionId, {Value: U128_MAX}, alice.address);
+ const aliceBalance = await getBalance(api, collectionId, alice, aliceTokenId);
+ const itemCountAfter = await getLastTokenId(api, collectionId);
+
+ // What to expect
+ // tslint:disable-next-line:no-unused-expression
+ expect(itemCountAfter).to.be.equal(defaultTokenId);
+ expect(aliceBalance).to.be.equal(U128_MAX);
+ });
+ });
+
+ it('RPC method tokenOnewrs for fungible collection and token', async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
+ const facelessCrowd = Array.from(Array(7).keys()).map(i => normalizeAccountId(privateKeyWrapper(i.toString())));
+
+ const createCollectionResult = await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}});
+ const collectionId = createCollectionResult.collectionId;
+ const aliceTokenId = await createFungibleItemExpectSuccess(alice, collectionId, {Value: U128_MAX}, alice.address);
+
+ await transfer(api, collectionId, aliceTokenId, alice, bob, 1000n);
+ await transfer(api, collectionId, aliceTokenId, alice, ethAcc, 900n);
+
+ for (let i = 0; i < 7; i++) {
+ await transfer(api, collectionId, aliceTokenId, alice, facelessCrowd[i], 1);
+ }
+
+ const owners = await api.rpc.unique.tokenOwners(collectionId, aliceTokenId);
+ const ids = (owners.toJSON() as CrossAccountId[]).map(s => normalizeAccountId(s));
+ const aliceID = normalizeAccountId(alice);
+ const bobId = normalizeAccountId(bob);
+
+ // What to expect
+ // tslint:disable-next-line:no-unused-expression
+ expect(ids).to.deep.include.members([aliceID, ethAcc, bobId, ...facelessCrowd]);
+ expect(owners.length == 10).to.be.true;
+
+ const eleven = privateKeyWrapper('11');
+ expect(await transfer(api, collectionId, aliceTokenId, alice, eleven, 10n)).to.be.true;
+ expect((await api.rpc.unique.tokenOwners(collectionId, aliceTokenId)).length).to.be.equal(10);
+ });
+ });
+
+ it('Transfer token', async () => {
+ await usingApi(async api => {
+ const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
+ const collectionId = (await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}})).collectionId;
+ const tokenId = await createFungibleItemExpectSuccess(alice, collectionId, {Value: 500n}, alice.address);
+
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(500n);
+ expect(await transfer(api, collectionId, tokenId, alice, bob, 60n)).to.be.true;
+ expect(await transfer(api, collectionId, tokenId, alice, ethAcc, 140n)).to.be.true;
+
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(300n);
+ expect(await getBalance(api, collectionId, bob, tokenId)).to.be.equal(60n);
+ expect(await getBalance(api, collectionId, ethAcc, tokenId)).to.be.equal(140n);
+ await expect(transfer(api, collectionId, tokenId, alice, bob, 350n)).to.eventually.be.rejected;
+ });
+ });
+
+ it('Tokens multiple creation', async () => {
+ await usingApi(async api => {
+ const collectionId = (await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}})).collectionId;
+
+ const args = [
+ {Fungible: {Value: 500n}},
+ {Fungible: {Value: 400n}},
+ {Fungible: {Value: 300n}},
+ ];
+
+ await createMultipleItemsExpectSuccess(alice, collectionId, args);
+ expect(await getBalance(api, collectionId, alice, 0)).to.be.equal(1200n);
+ });
+ });
+
+ it('Burn some tokens ', async () => {
+ await usingApi(async api => {
+ const collectionId = (await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}})).collectionId;
+ const tokenId = (await createFungibleItemExpectSuccess(alice, collectionId, {Value: 500n}, alice.address));
+ expect(await isTokenExists(api, collectionId, tokenId)).to.be.true;
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(500n);
+ expect(await burnItem(api, alice, collectionId, tokenId, 499n)).to.be.true;
+ expect(await isTokenExists(api, collectionId, tokenId)).to.be.true;
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(1n);
+ });
+ });
+
+ it('Burn all tokens ', async () => {
+ await usingApi(async api => {
+ const collectionId = (await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}})).collectionId;
+ const tokenId = (await createFungibleItemExpectSuccess(alice, collectionId, {Value: 500n}, alice.address));
+ expect(await isTokenExists(api, collectionId, tokenId)).to.be.true;
+ expect(await burnItem(api, alice, collectionId, tokenId, 500n)).to.be.true;
+ expect(await isTokenExists(api, collectionId, tokenId)).to.be.true;
+
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(0n);
+ expect((await api.rpc.unique.totalPieces(collectionId, tokenId)).value.toBigInt()).to.be.equal(0n);
+ });
+ });
+
+ it('Set allowance for token', async () => {
+ await usingApi(async api => {
+ const collectionId = (await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}})).collectionId;
+ const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
+
+ const tokenId = (await createFungibleItemExpectSuccess(alice, collectionId, {Value: 100n}, alice.address));
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(100n);
+
+ expect(await approve(api, collectionId, tokenId, alice, bob, 60n)).to.be.true;
+ expect(await getAllowance(api, collectionId, alice, bob, tokenId)).to.be.equal(60n);
+ expect(await getBalance(api, collectionId, bob, tokenId)).to.be.equal(0n);
+
+ expect(await transferFrom(api, collectionId, tokenId, bob, alice, bob, 20n)).to.be.true;
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(80n);
+ expect(await getBalance(api, collectionId, bob, tokenId)).to.be.equal(20n);
+ expect(await getAllowance(api, collectionId, alice, bob, tokenId)).to.be.equal(40n);
+
+ await burnFromExpectSuccess(bob, alice, collectionId, tokenId, 10n);
+
+ expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(70n);
+ expect(await getAllowance(api, collectionId, alice, bob, tokenId)).to.be.equal(30n);
+ expect(await transferFrom(api, collectionId, tokenId, bob, alice, ethAcc, 10n)).to.be.true;
+ expect(await getBalance(api, collectionId, ethAcc, tokenId)).to.be.equal(10n);
+ });
+ });
+});
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -29,7 +29,13 @@
[key: string]: Codec;
};
common: {
+ /**
+ * Maximum admins per collection.
+ **/
collectionAdminsLimit: u32 & AugmentedConst<ApiType>;
+ /**
+ * Set price to create a collection.
+ **/
collectionCreationPrice: u128 & AugmentedConst<ApiType>;
/**
* Generic const
tests/src/interfaces/augment-api-events.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-events.ts
+++ b/tests/src/interfaces/augment-api-events.ts
@@ -59,82 +59,47 @@
};
common: {
/**
- * * collection_id
- *
- * * item_id
- *
- * * sender
- *
- * * spender
- *
- * * amount
+ * Amount pieces of token owned by `sender` was approved for `spender`.
**/
Approved: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
/**
* New collection was created
- *
- * # Arguments
- *
- * * collection_id: Globally unique identifier of newly created collection.
- *
- * * mode: [CollectionMode] converted into u8.
- *
- * * account_id: Collection owner.
**/
CollectionCreated: AugmentedEvent<ApiType, [u32, u8, AccountId32]>;
/**
* New collection was destroyed
- *
- * # Arguments
- *
- * * collection_id: Globally unique identifier of collection.
**/
CollectionDestroyed: AugmentedEvent<ApiType, [u32]>;
+ /**
+ * The property has been deleted.
+ **/
CollectionPropertyDeleted: AugmentedEvent<ApiType, [u32, Bytes]>;
+ /**
+ * The colletion property has been set.
+ **/
CollectionPropertySet: AugmentedEvent<ApiType, [u32, Bytes]>;
/**
* New item was created.
- *
- * # Arguments
- *
- * * collection_id: Id of the collection where item was created.
- *
- * * item_id: Id of an item. Unique within the collection.
- *
- * * recipient: Owner of newly created item
- *
- * * amount: Always 1 for NFT
**/
ItemCreated: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
/**
* Collection item was burned.
- *
- * # Arguments
- *
- * * collection_id.
- *
- * * item_id: Identifier of burned NFT.
- *
- * * owner: which user has destroyed its tokens
- *
- * * amount: Always 1 for NFT
**/
ItemDestroyed: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
+ /**
+ * The colletion property permission has been set.
+ **/
PropertyPermissionSet: AugmentedEvent<ApiType, [u32, Bytes]>;
+ /**
+ * The token property has been deleted.
+ **/
TokenPropertyDeleted: AugmentedEvent<ApiType, [u32, u32, Bytes]>;
+ /**
+ * The token property has been set.
+ **/
TokenPropertySet: AugmentedEvent<ApiType, [u32, u32, Bytes]>;
/**
* Item was transferred
- *
- * * collection_id: Id of collection to which item is belong
- *
- * * item_id: Id of an item
- *
- * * sender: Original owner of item
- *
- * * recipient: New owner of item
- *
- * * amount: Always 1 for NFT
**/
Transfer: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
/**
tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -69,24 +69,36 @@
[key: string]: QueryableStorageEntry<ApiType>;
};
common: {
+ /**
+ * Storage of collection admins count.
+ **/
adminAmount: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
/**
* Allowlisted collection users
**/
allowlist: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
/**
- * Collection info
+ * Storage of collection info.
**/
collectionById: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<Option<UpDataStructsCollection>>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
/**
- * Collection properties
+ * Storage of collection properties.
**/
collectionProperties: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<UpDataStructsProperties>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
+ /**
+ * Storage of collection properties permissions.
+ **/
collectionPropertyPermissions: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<BTreeMap<Bytes, UpDataStructsPropertyPermission>>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
+ /**
+ * Storage of the count of created collections.
+ **/
createdCollectionCount: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;
+ /**
+ * Storage of the count of deleted collections.
+ **/
destroyedCollectionCount: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;
/**
- * Not used by code, exists only to provide some types to metadata
+ * Not used by code, exists only to provide some types to metadata.
**/
dummyStorageValue: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[UpDataStructsCollectionStats, u32, u32, UpDataStructsTokenChild, PhantomTypeUpDataStructs]>>>, []> & QueryableStorageEntry<ApiType, []>;
/**
@@ -231,20 +243,42 @@
[key: string]: QueryableStorageEntry<ApiType>;
};
nonfungible: {
+ /**
+ * Amount of tokens owned by account.
+ **/
accountBalance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u32>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
+ /**
+ * Allowance set by an owner for a spender for a token.
+ **/
allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletEvmAccountBasicCrossAccountIdRepr>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
/**
- * Used to enumerate tokens owned by account
+ * Used to enumerate tokens owned by account.
**/
owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]>;
+ /**
+ * Custom data that is serialized to bytes and attached to a token property.
+ * Currently used to store RMRK data.
+ **/
tokenAuxProperties: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: UpDataStructsPropertyScope | 'None' | 'Rmrk' | number | Uint8Array, arg4: Bytes | string | Uint8Array) => Observable<Option<Bytes>>, [u32, u32, UpDataStructsPropertyScope, Bytes]> & QueryableStorageEntry<ApiType, [u32, u32, UpDataStructsPropertyScope, Bytes]>;
/**
- * Used to enumerate token's children
+ * Used to enumerate token's children.
**/
tokenChildren: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: ITuple<[u32, u32]> | [u32 | AnyNumber | Uint8Array, u32 | AnyNumber | Uint8Array]) => Observable<bool>, [u32, u32, ITuple<[u32, u32]>]> & QueryableStorageEntry<ApiType, [u32, u32, ITuple<[u32, u32]>]>;
+ /**
+ * Custom data serialized to bytes for token.
+ **/
tokenData: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletNonfungibleItemData>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
+ /**
+ * Key-Value map stored for token.
+ **/
tokenProperties: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<UpDataStructsProperties>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
+ /**
+ * Amount of burnt tokens for collection.
+ **/
tokensBurnt: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
+ /**
+ * Amount of tokens minted for collection.
+ **/
tokensMinted: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
/**
* Generic query
@@ -430,6 +464,9 @@
**/
tokenData: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<PalletRefungibleItemData>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
tokenProperties: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<UpDataStructsProperties>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
+ /**
+ * Amount of burnt tokens for collection
+ **/
tokensBurnt: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
/**
* Amount of tokens minted for collection
tests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -709,6 +709,10 @@
**/
tokenOwner: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<PalletEvmAccountBasicCrossAccountIdRepr>>>;
/**
+ * Returns 10 tokens owners in no particular order
+ **/
+ tokenOwners: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletEvmAccountBasicCrossAccountIdRepr>>>;
+ /**
* Get token properties
**/
tokenProperties: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, propertyKeys?: Vec<Text> | (Text | string)[], at?: Hash | string | Uint8Array) => Observable<Vec<UpDataStructsProperty>>>;
tests/src/interfaces/unique/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -49,6 +49,7 @@
balance: fun('Get amount of specific account token', [collectionParam, crossAccountParam(), tokenParam], 'u128'),
allowance: fun('Get allowed amount', [collectionParam, crossAccountParam('sender'), crossAccountParam('spender'), tokenParam], 'u128'),
tokenOwner: fun('Get token owner', [collectionParam, tokenParam], `Option<${CROSS_ACCOUNT_ID_TYPE}>`),
+ tokenOwners: fun('Returns 10 tokens owners in no particular order', [collectionParam, tokenParam], `Vec<${CROSS_ACCOUNT_ID_TYPE}>`),
topmostTokenOwner: fun('Get token owner, in case of nested token - find parent recursive', [collectionParam, tokenParam], `Option<${CROSS_ACCOUNT_ID_TYPE}>`),
tokenChildren: fun('Get tokens nested directly into the token', [collectionParam, tokenParam], 'Vec<UpDataStructsTokenChild>'),
constMetadata: fun('Get token constant metadata', [collectionParam, tokenParam], 'Vec<u8>'),
tests/src/refungible.test.tsdiffbeforeafterboth--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -32,6 +32,8 @@
repartitionRFT,
createCollectionWithPropsExpectSuccess,
getDetailedCollectionInfo,
+ normalizeAccountId,
+ CrossAccountId,
getCreateItemsResult,
getDestroyItemsResult,
} from './util/helpers';
@@ -55,14 +57,14 @@
it('Create refungible collection and token', async () => {
await usingApi(async api => {
const createCollectionResult = await createCollection(api, alice, {mode: {type: 'ReFungible'}});
- expect(createCollectionResult.success).to.be.true;
+ expect(createCollectionResult.success).to.be.true;
const collectionId = createCollectionResult.collectionId;
-
+
const itemCountBefore = await getLastTokenId(api, collectionId);
const result = await createRefungibleToken(api, alice, collectionId, 100n);
-
+
const itemCountAfter = await getLastTokenId(api, collectionId);
-
+
// What to expect
// tslint:disable-next-line:no-unused-expression
expect(result.success).to.be.true;
@@ -71,7 +73,43 @@
expect(itemCountAfter.toString()).to.be.equal(result.itemId.toString());
});
});
-
+
+ it('RPC method tokenOnewrs for refungible collection and token', async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
+ const facelessCrowd = Array.from(Array(7).keys()).map(i => normalizeAccountId(privateKeyWrapper(i.toString())));
+
+ const createCollectionResult = await createCollection(api, alice, {mode: {type: 'ReFungible'}});
+ const collectionId = createCollectionResult.collectionId;
+
+ const result = await createRefungibleToken(api, alice, collectionId, 10_000n);
+ const aliceTokenId = result.itemId;
+
+
+ await transfer(api, collectionId, aliceTokenId, alice, bob, 1000n);
+ await transfer(api, collectionId, aliceTokenId, alice, ethAcc, 900n);
+
+ for (let i = 0; i < 7; i++) {
+ await transfer(api, collectionId, aliceTokenId, alice, facelessCrowd[i], 50*(i+1));
+ }
+
+ const owners = await api.rpc.unique.tokenOwners(collectionId, aliceTokenId);
+ const ids = (owners.toJSON() as CrossAccountId[]).map(s => normalizeAccountId(s));
+
+ const aliceID = normalizeAccountId(alice);
+ const bobId = normalizeAccountId(bob);
+
+ // What to expect
+ // tslint:disable-next-line:no-unused-expression
+ expect(ids).to.deep.include.members([aliceID, ethAcc, bobId, ...facelessCrowd]);
+ expect(owners.length).to.be.equal(10);
+
+ const eleven = privateKeyWrapper('11');
+ expect(await transfer(api, collectionId, aliceTokenId, alice, eleven, 10n)).to.be.true;
+ expect((await api.rpc.unique.tokenOwners(collectionId, aliceTokenId)).length).to.be.equal(10);
+ });
+ });
+
it('Transfer token pieces', async () => {
await usingApi(async api => {
const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;
tests/src/rpc.test.tsdiffbeforeafterboth--- a/tests/src/rpc.test.ts
+++ b/tests/src/rpc.test.ts
@@ -1,12 +1,57 @@
+import {IKeyringPair} from '@polkadot/types/types';
import {expect} from 'chai';
import usingApi from './substrate/substrate-api';
-import {createCollectionExpectSuccess, getTokenOwner} from './util/helpers';
+import {createCollection, createCollectionExpectSuccess, createFungibleItemExpectSuccess, CrossAccountId, getTokenOwner, normalizeAccountId, transfer, U128_MAX} from './util/helpers';
+
+let alice: IKeyringPair;
+let bob: IKeyringPair;
-describe('getTokenOwner', () => {
+
+describe('integration test: RPC methods', () => {
+ before(async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
+ });
+ });
+
+
it('returns None for fungible collection', async () => {
await usingApi(async api => {
const collection = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
await expect(getTokenOwner(api, collection, 0)).to.be.rejectedWith(/^owner == null$/);
});
});
+
+ it('RPC method tokenOwners for fungible collection and token', async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
+ const facelessCrowd = Array.from(Array(7).keys()).map(i => normalizeAccountId(privateKeyWrapper(i.toString())));
+
+ const createCollectionResult = await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}});
+ const collectionId = createCollectionResult.collectionId;
+ const aliceTokenId = await createFungibleItemExpectSuccess(alice, collectionId, {Value: U128_MAX}, alice.address);
+
+ await transfer(api, collectionId, aliceTokenId, alice, bob, 1000n);
+ await transfer(api, collectionId, aliceTokenId, alice, ethAcc, 900n);
+
+ for (let i = 0; i < 7; i++) {
+ await transfer(api, collectionId, aliceTokenId, alice, facelessCrowd[i], 1);
+ }
+
+ const owners = await api.rpc.unique.tokenOwners(collectionId, aliceTokenId);
+ const ids = (owners.toJSON() as CrossAccountId[]).map(s => normalizeAccountId(s));
+ const aliceID = normalizeAccountId(alice);
+ const bobId = normalizeAccountId(bob);
+
+ // What to expect
+ // tslint:disable-next-line:no-unused-expression
+ expect(ids).to.deep.include.members([aliceID, ethAcc, bobId, ...facelessCrowd]);
+ expect(owners.length == 10).to.be.true;
+
+ const eleven = privateKeyWrapper('11');
+ expect(await transfer(api, collectionId, aliceTokenId, alice, eleven, 10n)).to.be.true;
+ expect((await api.rpc.unique.tokenOwners(collectionId, aliceTokenId)).length).to.be.equal(10);
+ });
+ });
});
\ No newline at end of file