difftreelog
feat(rpc) totalSupply
in: master
8 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/>.1617use std::sync::Arc;1819use codec::Decode;20use jsonrpc_core::{Error as RpcError, ErrorCode, Result};21use jsonrpc_derive::rpc;22use up_data_structs::{RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId};23use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};24use sp_blockchain::HeaderBackend;25use up_rpc::UniqueApi as UniqueRuntimeApi;2627#[rpc]28pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {29 #[rpc(name = "unique_accountTokens")]30 fn account_tokens(31 &self,32 collection: CollectionId,33 account: CrossAccountId,34 at: Option<BlockHash>,35 ) -> Result<Vec<TokenId>>;36 #[rpc(name = "unique_collectionTokens")]37 fn collection_tokens(38 &self,39 collection: CollectionId,40 at: Option<BlockHash>,41 ) -> Result<Vec<TokenId>>;42 #[rpc(name = "unique_tokenExists")]43 fn token_exists(44 &self,45 collection: CollectionId,46 token: TokenId,47 at: Option<BlockHash>,48 ) -> Result<bool>;4950 #[rpc(name = "unique_tokenOwner")]51 fn token_owner(52 &self,53 collection: CollectionId,54 token: TokenId,55 at: Option<BlockHash>,56 ) -> Result<Option<CrossAccountId>>;57 #[rpc(name = "unique_topmostTokenOwner")]58 fn topmost_token_owner(59 &self,60 collection: CollectionId,61 token: TokenId,62 at: Option<BlockHash>,63 ) -> Result<Option<CrossAccountId>>;64 #[rpc(name = "unique_constMetadata")]65 fn const_metadata(66 &self,67 collection: CollectionId,68 token: TokenId,69 at: Option<BlockHash>,70 ) -> Result<Vec<u8>>;71 #[rpc(name = "unique_variableMetadata")]72 fn variable_metadata(73 &self,74 collection: CollectionId,75 token: TokenId,76 at: Option<BlockHash>,77 ) -> Result<Vec<u8>>;7879 #[rpc(name = "unique_accountBalance")]80 fn account_balance(81 &self,82 collection: CollectionId,83 account: CrossAccountId,84 at: Option<BlockHash>,85 ) -> Result<u32>;86 #[rpc(name = "unique_balance")]87 fn balance(88 &self,89 collection: CollectionId,90 account: CrossAccountId,91 token: TokenId,92 at: Option<BlockHash>,93 ) -> Result<String>;94 #[rpc(name = "unique_allowance")]95 fn allowance(96 &self,97 collection: CollectionId,98 sender: CrossAccountId,99 spender: CrossAccountId,100 token: TokenId,101 at: Option<BlockHash>,102 ) -> Result<String>;103104 #[rpc(name = "unique_adminlist")]105 fn adminlist(106 &self,107 collection: CollectionId,108 at: Option<BlockHash>,109 ) -> Result<Vec<CrossAccountId>>;110 #[rpc(name = "unique_allowlist")]111 fn allowlist(112 &self,113 collection: CollectionId,114 at: Option<BlockHash>,115 ) -> Result<Vec<CrossAccountId>>;116 #[rpc(name = "unique_allowed")]117 fn allowed(118 &self,119 collection: CollectionId,120 user: CrossAccountId,121 at: Option<BlockHash>,122 ) -> Result<bool>;123 #[rpc(name = "unique_lastTokenId")]124 fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;125 #[rpc(name = "unique_collectionById")]126 fn collection_by_id(127 &self,128 collection: CollectionId,129 at: Option<BlockHash>,130 ) -> Result<Option<RpcCollection<AccountId>>>;131 #[rpc(name = "unique_collectionStats")]132 fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;133134 #[rpc(name = "unique_nextSponsored")]135 fn next_sponsored(136 &self,137 collection: CollectionId,138 account: CrossAccountId,139 token: TokenId,140 at: Option<BlockHash>,141 ) -> Result<Option<u64>>;142 #[rpc(name = "unique_effectiveCollectionLimits")]143 fn effective_collection_limits(144 &self,145 collection_id: CollectionId,146 at: Option<BlockHash>,147 ) -> Result<Option<CollectionLimits>>;148}149150pub struct Unique<C, P> {151 client: Arc<C>,152 _marker: std::marker::PhantomData<P>,153}154155impl<C, P> Unique<C, P> {156 pub fn new(client: Arc<C>) -> Self {157 Self {158 client,159 _marker: Default::default(),160 }161 }162}163164pub enum Error {165 RuntimeError,166}167168impl From<Error> for i64 {169 fn from(e: Error) -> i64 {170 match e {171 Error::RuntimeError => 1,172 }173 }174}175176macro_rules! pass_method {177 (178 $method_name:ident($($name:ident: $ty:ty),* $(,)?) -> $result:ty $(=> $mapper:expr)?179 $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*180 ) => {181 fn $method_name(182 &self,183 $(184 $name: $ty,185 )*186 at: Option<<Block as BlockT>::Hash>,187 ) -> Result<$result> {188 let api = self.client.runtime_api();189 let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));190 let _api_version = if let Ok(Some(api_version)) =191 api.api_version::<dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>>(&at)192 {193 api_version194 } else {195 // unreachable for our runtime196 return Err(RpcError {197 code: ErrorCode::InvalidParams,198 message: "Api is not available".into(),199 data: None,200 })201 };202203 let result = $(if _api_version < $ver {204 api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))205 } else)*206 { api.$method_name(&at, $($name),*) };207208 let result = result.map_err(|e| RpcError {209 code: ErrorCode::ServerError(Error::RuntimeError.into()),210 message: "Unable to query".into(),211 data: Some(format!("{:?}", e).into()),212 })?;213 result.map_err(|e| RpcError {214 code: ErrorCode::InvalidParams,215 message: "Runtime returned error".into(),216 data: Some(format!("{:?}", e).into()),217 })$(.map($mapper))?218 }219 };220}221222#[allow(deprecated)]223impl<C, Block, CrossAccountId, AccountId>224 UniqueApi<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>225where226 Block: BlockT,227 AccountId: Decode,228 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,229 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,230 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,231{232 pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);233 pass_method!(collection_tokens(collection: CollectionId) -> Vec<TokenId>);234 pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);235 pass_method!(236 token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>;237 changed_in 2, token_owner_before_version_2(collection, token) => |u| Some(u)238 );239 pass_method!(topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>);240 pass_method!(const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);241 pass_method!(variable_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);242 pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32);243 pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string());244 pass_method!(allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string());245246 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>);247 pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>);248 pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool);249 pass_method!(last_token_id(collection: CollectionId) -> TokenId);250 pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>);251 pass_method!(collection_stats() -> CollectionStats);252 pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>);253 pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>);254}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/>.1617use std::sync::Arc;1819use codec::Decode;20use jsonrpc_core::{Error as RpcError, ErrorCode, Result};21use jsonrpc_derive::rpc;22use up_data_structs::{RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId};23use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};24use sp_blockchain::HeaderBackend;25use up_rpc::UniqueApi as UniqueRuntimeApi;2627#[rpc]28pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {29 #[rpc(name = "unique_accountTokens")]30 fn account_tokens(31 &self,32 collection: CollectionId,33 account: CrossAccountId,34 at: Option<BlockHash>,35 ) -> Result<Vec<TokenId>>;36 #[rpc(name = "unique_collectionTokens")]37 fn collection_tokens(38 &self,39 collection: CollectionId,40 at: Option<BlockHash>,41 ) -> Result<Vec<TokenId>>;42 #[rpc(name = "unique_tokenExists")]43 fn token_exists(44 &self,45 collection: CollectionId,46 token: TokenId,47 at: Option<BlockHash>,48 ) -> Result<bool>;4950 #[rpc(name = "unique_tokenOwner")]51 fn token_owner(52 &self,53 collection: CollectionId,54 token: TokenId,55 at: Option<BlockHash>,56 ) -> Result<Option<CrossAccountId>>;57 #[rpc(name = "unique_topmostTokenOwner")]58 fn topmost_token_owner(59 &self,60 collection: CollectionId,61 token: TokenId,62 at: Option<BlockHash>,63 ) -> Result<Option<CrossAccountId>>;64 #[rpc(name = "unique_constMetadata")]65 fn const_metadata(66 &self,67 collection: CollectionId,68 token: TokenId,69 at: Option<BlockHash>,70 ) -> Result<Vec<u8>>;71 #[rpc(name = "unique_variableMetadata")]72 fn variable_metadata(73 &self,74 collection: CollectionId,75 token: TokenId,76 at: Option<BlockHash>,77 ) -> Result<Vec<u8>>;7879 #[rpc(name = "unique_totalSupply")]80 fn total_supply(81 &self,82 collection: CollectionId,83 at: Option<BlockHash>,84 ) -> Result<u32>;85 #[rpc(name = "unique_accountBalance")]86 fn account_balance(87 &self,88 collection: CollectionId,89 account: CrossAccountId,90 at: Option<BlockHash>,91 ) -> Result<u32>;92 #[rpc(name = "unique_balance")]93 fn balance(94 &self,95 collection: CollectionId,96 account: CrossAccountId,97 token: TokenId,98 at: Option<BlockHash>,99 ) -> Result<String>;100 #[rpc(name = "unique_allowance")]101 fn allowance(102 &self,103 collection: CollectionId,104 sender: CrossAccountId,105 spender: CrossAccountId,106 token: TokenId,107 at: Option<BlockHash>,108 ) -> Result<String>;109110 #[rpc(name = "unique_adminlist")]111 fn adminlist(112 &self,113 collection: CollectionId,114 at: Option<BlockHash>,115 ) -> Result<Vec<CrossAccountId>>;116 #[rpc(name = "unique_allowlist")]117 fn allowlist(118 &self,119 collection: CollectionId,120 at: Option<BlockHash>,121 ) -> Result<Vec<CrossAccountId>>;122 #[rpc(name = "unique_allowed")]123 fn allowed(124 &self,125 collection: CollectionId,126 user: CrossAccountId,127 at: Option<BlockHash>,128 ) -> Result<bool>;129 #[rpc(name = "unique_lastTokenId")]130 fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;131 #[rpc(name = "unique_collectionById")]132 fn collection_by_id(133 &self,134 collection: CollectionId,135 at: Option<BlockHash>,136 ) -> Result<Option<RpcCollection<AccountId>>>;137 #[rpc(name = "unique_collectionStats")]138 fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;139140 #[rpc(name = "unique_nextSponsored")]141 fn next_sponsored(142 &self,143 collection: CollectionId,144 account: CrossAccountId,145 token: TokenId,146 at: Option<BlockHash>,147 ) -> Result<Option<u64>>;148 #[rpc(name = "unique_effectiveCollectionLimits")]149 fn effective_collection_limits(150 &self,151 collection_id: CollectionId,152 at: Option<BlockHash>,153 ) -> Result<Option<CollectionLimits>>;154}155156pub struct Unique<C, P> {157 client: Arc<C>,158 _marker: std::marker::PhantomData<P>,159}160161impl<C, P> Unique<C, P> {162 pub fn new(client: Arc<C>) -> Self {163 Self {164 client,165 _marker: Default::default(),166 }167 }168}169170pub enum Error {171 RuntimeError,172}173174impl From<Error> for i64 {175 fn from(e: Error) -> i64 {176 match e {177 Error::RuntimeError => 1,178 }179 }180}181182macro_rules! pass_method {183 (184 $method_name:ident($($name:ident: $ty:ty),* $(,)?) -> $result:ty $(=> $mapper:expr)?185 $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*186 ) => {187 fn $method_name(188 &self,189 $(190 $name: $ty,191 )*192 at: Option<<Block as BlockT>::Hash>,193 ) -> Result<$result> {194 let api = self.client.runtime_api();195 let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));196 let _api_version = if let Ok(Some(api_version)) =197 api.api_version::<dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>>(&at)198 {199 api_version200 } else {201 // unreachable for our runtime202 return Err(RpcError {203 code: ErrorCode::InvalidParams,204 message: "Api is not available".into(),205 data: None,206 })207 };208209 let result = $(if _api_version < $ver {210 api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))211 } else)*212 { api.$method_name(&at, $($name),*) };213214 let result = result.map_err(|e| RpcError {215 code: ErrorCode::ServerError(Error::RuntimeError.into()),216 message: "Unable to query".into(),217 data: Some(format!("{:?}", e).into()),218 })?;219 result.map_err(|e| RpcError {220 code: ErrorCode::InvalidParams,221 message: "Runtime returned error".into(),222 data: Some(format!("{:?}", e).into()),223 })$(.map($mapper))?224 }225 };226}227228#[allow(deprecated)]229impl<C, Block, CrossAccountId, AccountId>230 UniqueApi<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>231where232 Block: BlockT,233 AccountId: Decode,234 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,235 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,236 CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,237{238 pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);239 pass_method!(collection_tokens(collection: CollectionId) -> Vec<TokenId>);240 pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);241 pass_method!(242 token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>;243 changed_in 2, token_owner_before_version_2(collection, token) => |u| Some(u)244 );245 pass_method!(topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>);246 pass_method!(const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);247 pass_method!(variable_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);248249 pass_method!(total_supply(collection: CollectionId) -> u32);250 pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32);251 pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string());252 pass_method!(allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string());253254 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>);255 pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>);256 pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool);257 pass_method!(last_token_id(collection: CollectionId) -> TokenId);258 pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>);259 pass_method!(collection_stats() -> CollectionStats);260 pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>);261 pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>);262}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -932,6 +932,8 @@
fn const_metadata(&self, token: TokenId) -> Vec<u8>;
fn variable_metadata(&self, token: TokenId) -> Vec<u8>;
+ /// Amount of unique collection tokens
+ fn total_supply(&self) -> u32;
/// Amount of different tokens account has (Applicable to nonfungible/refungible)
fn account_balance(&self, account: T::CrossAccountId) -> u32;
/// Amount of specific token account have (Applicable to fungible/refungible)
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -244,6 +244,10 @@
fail!(<Error<T>>::FungibleDisallowsNesting)
}
+ fn collection_tokens(&self) -> Vec<TokenId> {
+ vec![TokenId::default()]
+ }
+
fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {
if <Balance<T>>::get((self.id, account)) != 0 {
vec![TokenId::default()]
@@ -270,8 +274,8 @@
Vec::new()
}
- fn collection_tokens(&self) -> Vec<TokenId> {
- vec![TokenId::default()]
+ fn total_supply(&self) -> u32 {
+ 1
}
fn account_balance(&self, account: T::CrossAccountId) -> u32 {
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -294,6 +294,10 @@
.into_inner()
}
+ fn total_supply(&self) -> u32 {
+ <Pallet<T>>::total_supply(self)
+ }
+
fn account_balance(&self, account: T::CrossAccountId) -> u32 {
<AccountBalance<T>>::get((self.id, account))
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -301,6 +301,10 @@
.into_inner()
}
+ fn total_supply(&self) -> u32 {
+ <Pallet<T>>::total_supply(self)
+ }
+
fn account_balance(&self, account: T::CrossAccountId) -> u32 {
<AccountBalance<T>>::get((self.id, account))
}
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -41,6 +41,7 @@
fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;
fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;
+ fn total_supply(collection: CollectionId) -> Result<u32>;
fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;
fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;
fn allowance(
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -14,6 +14,9 @@
fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {
dispatch_unique_runtime!(collection.account_tokens(account))
}
+ fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {
+ dispatch_unique_runtime!(collection.collection_tokens())
+ }
fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {
dispatch_unique_runtime!(collection.token_exists(token))
}
@@ -33,8 +36,8 @@
dispatch_unique_runtime!(collection.variable_metadata(token))
}
- fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {
- dispatch_unique_runtime!(collection.collection_tokens())
+ fn total_supply(collection: CollectionId) -> Result<u32, DispatchError> {
+ dispatch_unique_runtime!(collection.total_supply())
}
fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {
dispatch_unique_runtime!(collection.account_balance(account))
tests/src/interfaces/unique/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -45,6 +45,7 @@
collectionTokens: fun('Get tokens contained in collection', [collectionParam], 'Vec<u32>'),
lastTokenId: fun('Get last token id', [collectionParam], 'u32'),
+ totalSupply: fun('Get amount of unique collection tokens', [collectionParam], 'u32'),
accountBalance: fun('Get amount of different user tokens', [collectionParam, crossAccountParam()], 'u32'),
balance: fun('Get amount of specific account token', [collectionParam, crossAccountParam(), tokenParam], 'u128'),
allowance: fun('Get allowed amount', [collectionParam, crossAccountParam('sender'), crossAccountParam('spender'), tokenParam], 'u128'),