difftreelog
CORE-178
in: master
7 files changed
client/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>);
}
pallets/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> {
pallets/unique/src/sponsorship.rsdiffbeforeafterboth--- a/pallets/unique/src/sponsorship.rs
+++ b/pallets/unique/src/sponsorship.rs
@@ -301,3 +301,80 @@
}
}
}
+
+use crate::SponsorshipPredict;
+use up_data_structs::SponsorshipState;
+pub struct UniqueSponsorshipPredict<T>(PhantomData<T>);
+
+impl<T> SponsorshipPredict<T> for UniqueSponsorshipPredict<T>
+where
+ T: Config,
+{
+ fn predict(collection_id: CollectionId, who: T::CrossAccountId, token: TokenId) -> Option<u64>
+ where
+ u64: From<<T as frame_system::Config>::BlockNumber>,
+ {
+ let collection = <CollectionHandle<T>>::try_get(collection_id).ok()?;
+
+ // preliminary sponsoring correctness check
+ match collection.sponsorship {
+ SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => return None,
+ _ => (),
+ }
+
+ // sponsor timeout
+ let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
+ let limit = collection
+ .limits
+ .sponsor_transfer_timeout(match collection.mode {
+ CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,
+ CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+ CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+ });
+
+ let last_tx_block = match collection.mode {
+ CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, token),
+ CollectionMode::Fungible(_) => {
+ <FungibleTransferBasket<T>>::get(collection.id, who.as_sub())
+ }
+ CollectionMode::ReFungible => {
+ <ReFungibleTransferBasket<T>>::get((collection.id, token, who.as_sub()))
+ }
+ };
+
+ if let Some(last_tx_block) = last_tx_block {
+ let timeout = last_tx_block + limit.into();
+ if block_number < timeout {
+ return Some((timeout - block_number).into());
+ }
+ return Some(0);
+ }
+
+ let token_exists = match collection.mode {
+ CollectionMode::NFT => {
+ <pallet_nonfungible::TokenData<T>>::contains_key((collection.id, token))
+ }
+ CollectionMode::Fungible(_) => true,
+ CollectionMode::ReFungible => {
+ <pallet_refungible::TotalSupply<T>>::contains_key((collection.id, token))
+ }
+ };
+
+ if token_exists {
+ Some(0)
+ } else {
+ None
+ }
+
+ // // existance check
+ // match collection.mode {
+ // CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, token),
+ // CollectionMode::Fungible(_) => {
+ // <FungibleTransferBasket<T>>::get(collection.id, who.as_sub())
+ // }
+ // CollectionMode::ReFungible => {
+ // <ReFungibleTransferBasket<T>>::get((collection.id, token, who.as_sub()))
+ // }
+ // };
+ }
+}
primitives/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>>;
}
}
runtime/common/src/runtime_apis.rsdiffbeforeafterboth1#[macro_export]2macro_rules! impl_common_runtime_apis {3 (4 $(5 #![custom_apis]67 $($custom_apis:tt)+8 )?9 ) => {10 impl_runtime_apis! {11 $($($custom_apis)+)?1213 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {14 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {15 dispatch_unique_runtime!(collection.account_tokens(account))16 }17 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {18 dispatch_unique_runtime!(collection.token_exists(token))19 }2021 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {22 dispatch_unique_runtime!(collection.token_owner(token))23 }24 fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {25 dispatch_unique_runtime!(collection.const_metadata(token))26 }27 fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {28 dispatch_unique_runtime!(collection.variable_metadata(token))29 }3031 fn collection_tokens(collection: CollectionId) -> Result<u32, DispatchError> {32 dispatch_unique_runtime!(collection.collection_tokens())33 }34 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {35 dispatch_unique_runtime!(collection.account_balance(account))36 }37 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {38 dispatch_unique_runtime!(collection.balance(account, token))39 }40 fn allowance(41 collection: CollectionId,42 sender: CrossAccountId,43 spender: CrossAccountId,44 token: TokenId,45 ) -> Result<u128, DispatchError> {46 dispatch_unique_runtime!(collection.allowance(sender, spender, token))47 }4849 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {50 <pallet_unique::UniqueErcSupport<Runtime>>::get_code(&account)51 .or_else(|| <pallet_evm_migration::OnMethodCall<Runtime>>::get_code(&account))52 .or_else(|| <pallet_evm_contract_helpers::HelpersOnMethodCall<Self>>::get_code(&account))53 }54 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {55 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))56 }57 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {58 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))59 }60 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {61 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))62 }63 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {64 dispatch_unique_runtime!(collection.last_token_id())65 }66 fn collection_by_id(collection: CollectionId) -> Result<Option<Collection<AccountId>>, DispatchError> {67 Ok(<pallet_common::CollectionById<Runtime>>::get(collection))68 }69 fn collection_stats() -> Result<CollectionStats, DispatchError> {70 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())71 }72 }7374 impl sp_api::Core<Block> for Runtime {75 fn version() -> RuntimeVersion {76 VERSION77 }7879 fn execute_block(block: Block) {80 Executive::execute_block(block)81 }8283 fn initialize_block(header: &<Block as BlockT>::Header) {84 Executive::initialize_block(header)85 }86 }8788 impl sp_api::Metadata<Block> for Runtime {89 fn metadata() -> OpaqueMetadata {90 OpaqueMetadata::new(Runtime::metadata().into())91 }92 }9394 impl sp_block_builder::BlockBuilder<Block> for Runtime {95 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {96 Executive::apply_extrinsic(extrinsic)97 }9899 fn finalize_block() -> <Block as BlockT>::Header {100 Executive::finalize_block()101 }102103 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {104 data.create_extrinsics()105 }106107 fn check_inherents(108 block: Block,109 data: sp_inherents::InherentData,110 ) -> sp_inherents::CheckInherentsResult {111 data.check_extrinsics(&block)112 }113114 // fn random_seed() -> <Block as BlockT>::Hash {115 // RandomnessCollectiveFlip::random_seed().0116 // }117 }118119 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {120 fn validate_transaction(121 source: TransactionSource,122 tx: <Block as BlockT>::Extrinsic,123 hash: <Block as BlockT>::Hash,124 ) -> TransactionValidity {125 Executive::validate_transaction(source, tx, hash)126 }127 }128129 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {130 fn offchain_worker(header: &<Block as BlockT>::Header) {131 Executive::offchain_worker(header)132 }133 }134135 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {136 fn chain_id() -> u64 {137 <Runtime as pallet_evm::Config>::ChainId::get()138 }139140 fn account_basic(address: H160) -> EVMAccount {141 EVM::account_basic(&address)142 }143144 fn gas_price() -> U256 {145 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()146 }147148 fn account_code_at(address: H160) -> Vec<u8> {149 EVM::account_codes(address)150 }151152 fn author() -> H160 {153 <pallet_evm::Pallet<Runtime>>::find_author()154 }155156 fn storage_at(address: H160, index: U256) -> H256 {157 let mut tmp = [0u8; 32];158 index.to_big_endian(&mut tmp);159 EVM::account_storages(address, H256::from_slice(&tmp[..]))160 }161162 #[allow(clippy::redundant_closure)]163 fn call(164 from: H160,165 to: H160,166 data: Vec<u8>,167 value: U256,168 gas_limit: U256,169 max_fee_per_gas: Option<U256>,170 max_priority_fee_per_gas: Option<U256>,171 nonce: Option<U256>,172 estimate: bool,173 access_list: Option<Vec<(H160, Vec<H256>)>>,174 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {175 let config = if estimate {176 let mut config = <Runtime as pallet_evm::Config>::config().clone();177 config.estimate = true;178 Some(config)179 } else {180 None181 };182183 <Runtime as pallet_evm::Config>::Runner::call(184 from,185 to,186 data,187 value,188 gas_limit.low_u64(),189 max_fee_per_gas,190 max_priority_fee_per_gas,191 nonce,192 access_list.unwrap_or_default(),193 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),194 ).map_err(|err| err.into())195 }196197 #[allow(clippy::redundant_closure)]198 fn create(199 from: H160,200 data: Vec<u8>,201 value: U256,202 gas_limit: U256,203 max_fee_per_gas: Option<U256>,204 max_priority_fee_per_gas: Option<U256>,205 nonce: Option<U256>,206 estimate: bool,207 access_list: Option<Vec<(H160, Vec<H256>)>>,208 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {209 let config = if estimate {210 let mut config = <Runtime as pallet_evm::Config>::config().clone();211 config.estimate = true;212 Some(config)213 } else {214 None215 };216217 <Runtime as pallet_evm::Config>::Runner::create(218 from,219 data,220 value,221 gas_limit.low_u64(),222 max_fee_per_gas,223 max_priority_fee_per_gas,224 nonce,225 access_list.unwrap_or_default(),226 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),227 ).map_err(|err| err.into())228 }229230 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {231 Ethereum::current_transaction_statuses()232 }233234 fn current_block() -> Option<pallet_ethereum::Block> {235 Ethereum::current_block()236 }237238 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {239 Ethereum::current_receipts()240 }241242 fn current_all() -> (243 Option<pallet_ethereum::Block>,244 Option<Vec<pallet_ethereum::Receipt>>,245 Option<Vec<TransactionStatus>>246 ) {247 (248 Ethereum::current_block(),249 Ethereum::current_receipts(),250 Ethereum::current_transaction_statuses()251 )252 }253254 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {255 xts.into_iter().filter_map(|xt| match xt.0.function {256 Call::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),257 _ => None258 }).collect()259 }260261 fn elasticity() -> Option<Permill> {262 None263 }264 }265266 impl sp_session::SessionKeys<Block> for Runtime {267 fn decode_session_keys(268 encoded: Vec<u8>,269 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {270 SessionKeys::decode_into_raw_public_keys(&encoded)271 }272273 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {274 SessionKeys::generate(seed)275 }276 }277278 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {279 fn slot_duration() -> sp_consensus_aura::SlotDuration {280 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())281 }282283 fn authorities() -> Vec<AuraId> {284 Aura::authorities().to_vec()285 }286 }287288 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {289 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {290 ParachainSystem::collect_collation_info(header)291 }292 }293294 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {295 fn account_nonce(account: AccountId) -> Index {296 System::account_nonce(account)297 }298 }299300 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {301 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {302 TransactionPayment::query_info(uxt, len)303 }304 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {305 TransactionPayment::query_fee_details(uxt, len)306 }307 }308309 /*310 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>311 for Runtime312 {313 fn call(314 origin: AccountId,315 dest: AccountId,316 value: Balance,317 gas_limit: u64,318 input_data: Vec<u8>,319 ) -> pallet_contracts_primitives::ContractExecResult {320 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)321 }322323 fn instantiate(324 origin: AccountId,325 endowment: Balance,326 gas_limit: u64,327 code: pallet_contracts_primitives::Code<Hash>,328 data: Vec<u8>,329 salt: Vec<u8>,330 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>331 {332 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)333 }334335 fn get_storage(336 address: AccountId,337 key: [u8; 32],338 ) -> pallet_contracts_primitives::GetStorageResult {339 Contracts::get_storage(address, key)340 }341342 fn rent_projection(343 address: AccountId,344 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {345 Contracts::rent_projection(address)346 }347 }348 */349350 #[cfg(feature = "runtime-benchmarks")]351 impl frame_benchmarking::Benchmark<Block> for Runtime {352 fn benchmark_metadata(extra: bool) -> (353 Vec<frame_benchmarking::BenchmarkList>,354 Vec<frame_support::traits::StorageInfo>,355 ) {356 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};357 use frame_support::traits::StorageInfoTrait;358359 let mut list = Vec::<BenchmarkList>::new();360361 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);362 list_benchmark!(list, extra, pallet_unique, Unique);363 list_benchmark!(list, extra, pallet_inflation, Inflation);364 list_benchmark!(list, extra, pallet_fungible, Fungible);365 list_benchmark!(list, extra, pallet_refungible, Refungible);366 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);367 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);368369 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();370371 return (list, storage_info)372 }373374 fn dispatch_benchmark(375 config: frame_benchmarking::BenchmarkConfig376 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {377 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};378379 let allowlist: Vec<TrackedStorageKey> = vec![380 // Block Number381 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),382 // Total Issuance383 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),384 // Execution Phase385 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),386 // Event Count387 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),388 // System Events389 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),390 ];391392 let mut batches = Vec::<BenchmarkBatch>::new();393 let params = (&config, &allowlist);394395 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);396 add_benchmark!(params, batches, pallet_unique, Unique);397 add_benchmark!(params, batches, pallet_inflation, Inflation);398 add_benchmark!(params, batches, pallet_fungible, Fungible);399 add_benchmark!(params, batches, pallet_refungible, Refungible);400 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);401 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);402403 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }404 Ok(batches)405 }406 }407 }408 }409}tests/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: {
/**
tests/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>'),
},
};