git.delta.rocks / unique-network / refs/commits / 8bbc7539fcb3

difftreelog

CORE-178

str-mv2022-04-08parent: #219f5f0.patch.diff
in: master

7 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -119,6 +119,15 @@
 	) -> Result<Option<Collection<AccountId>>>;
 	#[rpc(name = "unique_collectionStats")]
 	fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;
+
+	#[rpc(name = "unique_nextSponsored")]
+	fn next_sponsored(
+		&self,
+		collection: CollectionId,
+		account: CrossAccountId,
+		token: TokenId,
+		at: Option<BlockHash>,
+	) -> Result<Option<u64>>;
 }
 
 pub struct Unique<C, P> {
@@ -222,4 +231,5 @@
 	pass_method!(last_token_id(collection: CollectionId) -> TokenId);
 	pass_method!(collection_by_id(collection: CollectionId) -> Option<Collection<AccountId>>);
 	pass_method!(collection_stats() -> CollectionStats);
+	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>);
 }
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -69,7 +69,7 @@
 
 mod eth;
 mod sponsorship;
-pub use sponsorship::UniqueSponsorshipHandler;
+pub use sponsorship::{UniqueSponsorshipHandler, UniqueSponsorshipPredict};
 pub use eth::sponsoring::UniqueEthSponsorshipHandler;
 
 pub use eth::UniqueErcSupport;
@@ -84,6 +84,12 @@
 pub mod weights;
 use weights::WeightInfo;
 
+pub trait SponsorshipPredict<T: Config> {
+	fn predict(collection: CollectionId, account: T::CrossAccountId, token: TokenId) -> Option<u64>
+	where
+		u64: From<<T as frame_system::Config>::BlockNumber>;
+}
+
 decl_error! {
 	/// Error for non-fungible-token module.
 	pub enum Error for Module<T: Config> {
modifiedpallets/unique/src/sponsorship.rsdiffbeforeafterboth
302 }302 }
303}303}
304
305use crate::SponsorshipPredict;
306use up_data_structs::SponsorshipState;
307pub struct UniqueSponsorshipPredict<T>(PhantomData<T>);
308
309impl<T> SponsorshipPredict<T> for UniqueSponsorshipPredict<T>
310where
311 T: Config,
312{
313 fn predict(collection_id: CollectionId, who: T::CrossAccountId, token: TokenId) -> Option<u64>
314 where
315 u64: From<<T as frame_system::Config>::BlockNumber>,
316 {
317 let collection = <CollectionHandle<T>>::try_get(collection_id).ok()?;
318
319 // preliminary sponsoring correctness check
320 match collection.sponsorship {
321 SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => return None,
322 _ => (),
323 }
324
325 // sponsor timeout
326 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
327 let limit = collection
328 .limits
329 .sponsor_transfer_timeout(match collection.mode {
330 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,
331 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
332 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
333 });
334
335 let last_tx_block = match collection.mode {
336 CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, token),
337 CollectionMode::Fungible(_) => {
338 <FungibleTransferBasket<T>>::get(collection.id, who.as_sub())
339 }
340 CollectionMode::ReFungible => {
341 <ReFungibleTransferBasket<T>>::get((collection.id, token, who.as_sub()))
342 }
343 };
344
345 if let Some(last_tx_block) = last_tx_block {
346 let timeout = last_tx_block + limit.into();
347 if block_number < timeout {
348 return Some((timeout - block_number).into());
349 }
350 return Some(0);
351 }
352
353 let token_exists = match collection.mode {
354 CollectionMode::NFT => {
355 <pallet_nonfungible::TokenData<T>>::contains_key((collection.id, token))
356 }
357 CollectionMode::Fungible(_) => true,
358 CollectionMode::ReFungible => {
359 <pallet_refungible::TotalSupply<T>>::contains_key((collection.id, token))
360 }
361 };
362
363 if token_exists {
364 Some(0)
365 } else {
366 None
367 }
368
369 // // existance check
370 // match collection.mode {
371 // CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, token),
372 // CollectionMode::Fungible(_) => {
373 // <FungibleTransferBasket<T>>::get(collection.id, who.as_sub())
374 // }
375 // CollectionMode::ReFungible => {
376 // <ReFungibleTransferBasket<T>>::get((collection.id, token, who.as_sub()))
377 // }
378 // };
379 }
380}
304381
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -59,5 +59,6 @@
 		fn last_token_id(collection: CollectionId) -> Result<TokenId>;
 		fn collection_by_id(collection: CollectionId) -> Result<Option<Collection<AccountId>>>;
 		fn collection_stats() -> Result<CollectionStats>;
+		fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>>;
 	}
 }
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -69,6 +69,13 @@
                 fn collection_stats() -> Result<CollectionStats, DispatchError> {
                     Ok(<pallet_common::Pallet<Runtime>>::collection_stats())
                 }
+                fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {
+                    Ok(<pallet_unique::UniqueSponsorshipPredict<Runtime> as
+                            pallet_unique::SponsorshipPredict<Runtime>>::predict(
+                        collection,
+                        account,
+                        token))
+                }
             }
 
             impl sp_api::Core<Block> for Runtime {
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -619,6 +619,10 @@
        * Get token variable metadata
        **/
       variableMetadata: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Bytes>>;
+      /**
+       * nextSponsored transaction
+       **/
+      nextSponsored: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array,  account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<u64>>>;
     };
     web3: {
       /**
modifiedtests/src/interfaces/unique/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -55,5 +55,6 @@
     collectionById: fun('Get collection by specified id', [collectionParam], 'Option<UpDataStructsCollection>'),
     collectionStats: fun('Get collection stats', [], 'UpDataStructsCollectionStats'),
     allowed: fun('Check if user is allowed to use collection', [collectionParam, crossAccountParam()], 'bool'),
+    nextSponsored: fun('Check if user is allowed to use collection', [collectionParam, crossAccountParam(), tokenParam], 'Option<u64>'),
   },
 };