git.delta.rocks / unique-network / refs/commits / 1ac708f72a4b

--- 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<Option<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) -> Option<u128>, unique_api);
 }
 
 #[allow(deprecated)]

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1384,6 +1384,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) -> Option<u128>;
 	fn allowance(
 		&self,
 		sender: T::CrossAccountId,

--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -25,7 +25,8 @@
 use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};
 
 use crate::{
-	Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,
+	Allowance, TotalSupply, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,
+	weights::WeightInfo,
 };
 
 pub struct CommonWeights<T: Config>(PhantomData<T>);
@@ -405,4 +406,11 @@
 	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
 		None
 	}
+
+	fn total_pieces(&self, token: TokenId) -> Option<u128> {
+		if token != TokenId::default() {
+			return None;
+		}
+		<TotalSupply<T>>::try_get(self.id).ok()
+	}
 }

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -487,4 +487,12 @@
 	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
 		None
 	}
+
+	fn total_pieces(&self, token: TokenId) -> Option<u128> {
+		if <TokenData<T>>::contains_key((self.id, token)) {
+			Some(1)
+		} else {
+			None
+		}
+	}
 }

--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -411,6 +411,10 @@
 	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
 		Some(self)
 	}
+
+	fn total_pieces(&self, token: TokenId) -> Option<u128> {
+		<Pallet<T>>::total_pieces(self.id, token)
+	}
 }
 
 impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {

--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -710,4 +710,8 @@
 		<TotalSupply<T>>::insert((collection.id, token), amount);
 		Ok(())
 	}
+
+	fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {
+		<TotalSupply<T>>::try_get((collection_id, token_id)).ok()
+	}
 }

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -181,6 +181,7 @@
 pub struct TokenData<CrossAccountId> {
 	pub properties: Vec<Property>,
 	pub owner: Option<CrossAccountId>,
+	pub pieces: u128,
 }
 
 pub struct OverflowError;

--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -80,5 +80,6 @@
 		fn collection_stats() -> Result<CollectionStats>;
 		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>>;
 	}
 }

--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -89,7 +89,8 @@
                 ) -> Result<TokenData<CrossAccountId>, DispatchError> {
                     let token_data = TokenData {
                         properties: Self::token_properties(collection, token_id, keys)?,
-                        owner: Self::token_owner(collection, token_id)?
+                        owner: Self::token_owner(collection, token_id)?,
+                        pieces: Self::total_pieces(collection, token_id)?.unwrap_or(0),
                     };
 
                     Ok(token_data)
@@ -142,6 +143,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<Option<u128>, DispatchError> {
+                    dispatch_unique_runtime!(collection.total_pieces(token_id))
+                }
             }
 
             impl sp_api::Core<Block> for Runtime {

24  createCollectionWithPropsExpectSuccess,24  createCollectionWithPropsExpectSuccess,
25  createItemWithPropsExpectSuccess,25  createItemWithPropsExpectSuccess,
26  createItemWithPropsExpectFailure,26  createItemWithPropsExpectFailure,
27  createCollection,
28  transferExpectSuccess,
27} from './util/helpers';29} from './util/helpers';
2830
29const expect = chai.expect;31const expect = chai.expect;
96    await createItemWithPropsExpectSuccess(alice, newCollectionID, createMode, [{key: 'key1', value: 'val1'}]);98    await createItemWithPropsExpectSuccess(alice, newCollectionID, createMode, [{key: 'key1', value: 'val1'}]);
97  });99  });
100
101  it('Check total pieces of Fungible token', async () => {
102    await usingApi(async api => {
103      const createMode = 'Fungible';
104      const collectionId = await createCollectionExpectSuccess({mode: {type: createMode, decimalPoints: 0}});
105      const amountPieces = 10n;
106      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
107      {
108        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
109        expect(totalPieces.isSome).to.be.true;
110        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
111      }
112
113      await transferExpectSuccess(collectionId, tokenId, bob, alice, 1, createMode);
114      {
115        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
116        expect(totalPieces.isSome).to.be.true;
117        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
118      }
119
120      const totalPieces = (await api.rpc.unique.tokenData(collectionId, tokenId, [])).pieces;
121      expect(totalPieces.isSome).to.be.true;
122      expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
123    });
124  });
125
126  it('Check total pieces of NFT token', async () => {
127    await usingApi(async api => {
128      const createMode = 'NFT';
129      const collectionId = await createCollectionExpectSuccess({mode: {type: createMode}});
130      const amountPieces = 1n;
131      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
132      {
133        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
134        expect(totalPieces.isSome).to.be.true;
135        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
136      }
137
138      await transferExpectSuccess(collectionId, tokenId, bob, alice, 1, createMode);
139      {
140        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
141        expect(totalPieces.isSome).to.be.true;
142        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
143      }
144
145      const totalPieces = (await api.rpc.unique.tokenData(collectionId, tokenId, [])).pieces;
146      expect(totalPieces.isSome).to.be.true;
147      expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
148    });
149  });
150
151  it('Check total pieces of ReFungible token', async () => {
152    await usingApi(async api => {
153      const createMode = 'ReFungible';
154      const createCollectionResult = await createCollection(api, alice, {mode: {type: createMode}});
155      const collectionId  = createCollectionResult.collectionId;
156      const amountPieces = 100n;
157      const tokenId = await createItemExpectSuccess(alice, collectionId, createMode, bob.address);
158      {
159        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
160        expect(totalPieces.isSome).to.be.true;
161        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
162      }
163
164      await transferExpectSuccess(collectionId, tokenId, bob, alice, 60n, createMode);
165      {
166        const totalPieces = await api.rpc.unique.totalPieces(collectionId, tokenId);
167        expect(totalPieces.isSome).to.be.true;
168        expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
169      }
170
171      const totalPieces = (await api.rpc.unique.tokenData(collectionId, tokenId, [])).pieces;
172      expect(totalPieces.isSome).to.be.true;
173      expect(totalPieces.unwrap().toBigInt()).to.be.eq(amountPieces);
174    });
175  });
98});176});
99177
100describe('Negative integration test: ext. createItem():', () => {178describe('Negative integration test: ext. createItem():', () => {
170    });248    });
171  });249  });
250
251  it('Check total pieces for invalid Fungible token', async () => {
252    await usingApi(async api => {
253      const createCollectionResult = await createCollection(api, alice, {mode: {type: 'Fungible', decimalPoints: 0}});
254      const collectionId  = createCollectionResult.collectionId;
255      const invalidTokenId = 1000_000;
256      
257      expect((await api.rpc.unique.totalPieces(collectionId, invalidTokenId)).isNone).to.be.true;
258      expect((await api.rpc.unique.tokenData(collectionId, invalidTokenId, [])).pieces.isNone).to.be.true;
259    });
260  });
261
262  it('Check total pieces for invalid NFT token', async () => {
263    await usingApi(async api => {
264      const createCollectionResult = await createCollection(api, alice, {mode: {type: 'NFT'}});
265      const collectionId  = createCollectionResult.collectionId;
266      const invalidTokenId = 1000_000;
267      
268      expect((await api.rpc.unique.totalPieces(collectionId, invalidTokenId)).isNone).to.be.true;
269      expect((await api.rpc.unique.tokenData(collectionId, invalidTokenId, [])).pieces.isNone).to.be.true;
270    });
271  });
272
273  it('Check total pieces for invalid Refungible token', async () => {
274    await usingApi(async api => {
275      const createCollectionResult = await createCollection(api, alice, {mode: {type: 'ReFungible'}});
276      const collectionId  = createCollectionResult.collectionId;
277      const invalidTokenId = 1000_000;
278      
279      expect((await api.rpc.unique.totalPieces(collectionId, invalidTokenId)).isNone).to.be.true;
280      expect((await api.rpc.unique.tokenData(collectionId, invalidTokenId, [])).pieces.isNone).to.be.true;
281    });
282  });
172});283});
173284

--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -79,5 +79,6 @@
     allowed: fun('Check if user is allowed to use collection', [collectionParam, crossAccountParam()], 'bool'),
     nextSponsored: fun('Get number of blocks when sponsored transaction is available', [collectionParam, crossAccountParam(), tokenParam], 'Option<u64>'),
     effectiveCollectionLimits: fun('Get effective collection limits', [collectionParam], 'Option<UpDataStructsCollectionLimits>'),
+    totalPieces: fun('Get total pieces of token', [collectionParam, tokenParam], 'Option<u128>'),
   },
 };