difftreelog
Add rpc method for total_pieces
in: master
8 files changed
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -184,12 +184,21 @@
token: TokenId,
at: Option<BlockHash>,
) -> Result<Option<u64>>;
+
#[method(name = "unique_effectiveCollectionLimits")]
fn effective_collection_limits(
&self,
collection_id: CollectionId,
at: Option<BlockHash>,
) -> Result<Option<CollectionLimits>>;
+
+ #[method(name = "unique_totalPieces")]
+ fn total_pieces(
+ &self,
+ collection_id: CollectionId,
+ token_id: TokenId,
+ at: Option<BlockHash>,
+ ) -> Result<u128>;
}
mod rmrk_unique_rpc {
@@ -463,6 +472,7 @@
pass_method!(collection_stats() -> CollectionStats, unique_api);
pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);
pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);
+ pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> u128, unique_api);
}
#[allow(deprecated)]
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1382,6 +1382,8 @@
fn account_balance(&self, account: T::CrossAccountId) -> u32;
/// Amount of specific token account have (Applicable to fungible/refungible)
fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;
+ /// Amount of token pieces
+ fn total_pieces(&self, token: TokenId) -> u128;
fn allowance(
&self,
sender: T::CrossAccountId,
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -403,4 +403,8 @@
fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
None
}
+
+ fn total_pieces(&self, _token: TokenId) -> u128 {
+ 0
+ }
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -472,4 +472,8 @@
fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
None
}
+
+ fn total_pieces(&self, _token: TokenId) -> u128 {
+ 1
+ }
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -409,6 +409,10 @@
fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
Some(self)
}
+
+ fn total_pieces(&self, token: TokenId) -> u128 {
+ <Pallet<T>>::total_pieces(self.id, token)
+ }
}
impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -710,4 +710,9 @@
<TotalSupply<T>>::insert((collection.id, token), amount);
Ok(())
}
+
+ fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> u128 {
+ // Not "try_fold" because total count of pieces is limited by 'MAX_REFUNGIBLE_PIECES'.
+ <Balance<T>>::iter_prefix((collection_id, token_id)).fold(0, |total, piece| total + piece.1)
+ }
}
primitives/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#![cfg_attr(not(feature = "std"), no_std)]1819use up_data_structs::{20 CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,21 PropertyKeyPermission, TokenData, TokenChild,22};23use sp_std::vec::Vec;24use codec::Decode;25use sp_runtime::DispatchError;2627type Result<T> = core::result::Result<T, DispatchError>;2829sp_api::decl_runtime_apis! {30 #[api_version(2)]31 pub trait UniqueApi<CrossAccountId, AccountId> where32 AccountId: Decode,33 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,34 {35 #[changed_in(2)]36 fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;3738 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;39 fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>>;40 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;4142 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;43 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;44 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>>;4546 fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;4748 fn token_properties(49 collection: CollectionId,50 token_id: TokenId,51 properties: Option<Vec<Vec<u8>>>52 ) -> Result<Vec<Property>>;5354 fn property_permissions(55 collection: CollectionId,56 properties: Option<Vec<Vec<u8>>>57 ) -> Result<Vec<PropertyKeyPermission>>;5859 fn token_data(60 collection: CollectionId,61 token_id: TokenId,62 keys: Option<Vec<Vec<u8>>>63 ) -> Result<TokenData<CrossAccountId>>;6465 fn total_supply(collection: CollectionId) -> Result<u32>;66 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;67 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;68 fn allowance(69 collection: CollectionId,70 sender: CrossAccountId,71 spender: CrossAccountId,72 token: TokenId,73 ) -> Result<u128>;7475 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;76 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;77 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool>;78 fn last_token_id(collection: CollectionId) -> Result<TokenId>;79 fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;80 fn collection_stats() -> Result<CollectionStats>;81 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;82 fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;83 }84}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#![cfg_attr(not(feature = "std"), no_std)]1819use up_data_structs::{20 CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,21 PropertyKeyPermission, TokenData, TokenChild,22};23use sp_std::vec::Vec;24use codec::Decode;25use sp_runtime::DispatchError;2627type Result<T> = core::result::Result<T, DispatchError>;2829sp_api::decl_runtime_apis! {30 #[api_version(2)]31 pub trait UniqueApi<CrossAccountId, AccountId> where32 AccountId: Decode,33 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,34 {35 #[changed_in(2)]36 fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;3738 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;39 fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>>;40 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;4142 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;43 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;44 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>>;4546 fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;4748 fn token_properties(49 collection: CollectionId,50 token_id: TokenId,51 properties: Option<Vec<Vec<u8>>>52 ) -> Result<Vec<Property>>;5354 fn property_permissions(55 collection: CollectionId,56 properties: Option<Vec<Vec<u8>>>57 ) -> Result<Vec<PropertyKeyPermission>>;5859 fn token_data(60 collection: CollectionId,61 token_id: TokenId,62 keys: Option<Vec<Vec<u8>>>63 ) -> Result<TokenData<CrossAccountId>>;6465 fn total_supply(collection: CollectionId) -> Result<u32>;66 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;67 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;68 fn allowance(69 collection: CollectionId,70 sender: CrossAccountId,71 spender: CrossAccountId,72 token: TokenId,73 ) -> Result<u128>;7475 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;76 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;77 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool>;78 fn last_token_id(collection: CollectionId) -> Result<TokenId>;79 fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;80 fn collection_stats() -> Result<CollectionStats>;81 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;82 fn effective_collection_limits(collection_id: CollectionId) -> Result<Option<CollectionLimits>>;83 fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Result<u128>;84 }85}runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -142,6 +142,10 @@
fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {
Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))
}
+
+ fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<u128, DispatchError> {
+ dispatch_unique_runtime!(collection.total_pieces(token_id))
+ }
}
impl sp_api::Core<Block> for Runtime {