git.delta.rocks / unique-network / refs/commits / 79a50fe0450d

--- a/pallets/nft-charge-transaction/src/lib.rs
+++ b/pallets/nft-charge-transaction/src/lib.rs
@@ -135,10 +135,10 @@
         }
 
         // check errors
-        let error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);
-        match error {
-            Err(error) => return Err(error),
-            Ok(error) => {}
+        let _error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);
+        match _error {
+            Err(_error) => return Err(_error),
+            Ok(_error) => {}
         };
 
         // Determine who is paying transaction fee based on ecnomic model

140            },140            },
141            Some(pallet_nft::Call::set_variable_meta_data(collection_id, item_id, data)) => {141            Some(pallet_nft::Call::set_variable_meta_data(collection_id, item_id, data)) => {
142142
143                Self::withdraw_set_variable_meta_data(who, collection_id, item_id, &data)143                Self::withdraw_set_variable_meta_data(collection_id, item_id, &data)
144			},144			},
145			_ => None,145			_ => None,
146        };146        };
175		let collection = pallet_nft::CollectionById::<T>::get(collection_id)?;175		let collection = pallet_nft::CollectionById::<T>::get(collection_id)?;
176176
177		// sponsor timeout177		// sponsor timeout
178		let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;178		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
179179
180		let limit = collection.limits.sponsor_transfer_timeout;180		let limit = collection.limits.sponsor_transfer_timeout;
181		if pallet_nft::CreateItemBasket::<T>::contains_key((collection_id, &who)) {181		if pallet_nft::CreateItemBasket::<T>::contains_key((collection_id, &who)) {
212			let collection_mode = collection.mode.clone();212			let collection_mode = collection.mode.clone();
213213
214			// sponsor timeout214			// sponsor timeout
215			let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;215			let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
216			sponsor_transfer = match collection_mode {216			sponsor_transfer = match collection_mode {
217				CollectionMode::NFT => {217				CollectionMode::NFT => {
218218
246						limits.fungible_sponsor_transfer_timeout246						limits.fungible_sponsor_transfer_timeout
247					};247					};
248248
249					let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;249					let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
250					let mut sponsored = true;250					let mut sponsored = true;
251					if pallet_nft::FungibleTransferBasket::<T>::contains_key(collection_id, who) {251					if pallet_nft::FungibleTransferBasket::<T>::contains_key(collection_id, who) {
252						let last_tx_block = pallet_nft::FungibleTransferBasket::<T>::get(collection_id, who);252						let last_tx_block = pallet_nft::FungibleTransferBasket::<T>::get(collection_id, who);
299	}299	}
300	300	
301	pub fn withdraw_set_variable_meta_data(301	pub fn withdraw_set_variable_meta_data(
302		who: &T::AccountId,
303		collection_id: &CollectionId,302		collection_id: &CollectionId,
304		item_id: &TokenId,303		item_id: &TokenId,
305		data: &Vec<u8>,304		data: &Vec<u8>,
317			data.len() <= collection.limits.sponsored_data_size as usize316			data.len() <= collection.limits.sponsored_data_size as usize
318		{317		{
319			if let Some(rate_limit) = collection.limits.sponsored_data_rate_limit {318			if let Some(rate_limit) = collection.limits.sponsored_data_rate_limit {
320				let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;319				let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
321320
322				if pallet_nft::VariableMetaDataBasket::<T>::get(collection_id, item_id)321				if pallet_nft::VariableMetaDataBasket::<T>::get(collection_id, item_id)
323					.map(|last_block| block_number - last_block > rate_limit)322					.map(|last_block| block_number - last_block > rate_limit)
358		let mut sponsor_transfer = false;357		let mut sponsor_transfer = false;
359		if pallet_nft::ContractSponsoringRateLimit::<T>::contains_key(called_contract.clone()) {358		if pallet_nft::ContractSponsoringRateLimit::<T>::contains_key(called_contract.clone()) {
360			let last_tx_block = pallet_nft::ContractSponsorBasket::<T>::get((&called_contract, &who));359			let last_tx_block = pallet_nft::ContractSponsorBasket::<T>::get((&called_contract, &who));
361			let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;360			let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
362			let rate_limit = pallet_nft::ContractSponsoringRateLimit::<T>::get(&called_contract);361			let rate_limit = pallet_nft::ContractSponsoringRateLimit::<T>::get(&called_contract);
363			let limit_time = last_tx_block + rate_limit;362			let limit_time = last_tx_block + rate_limit;
364363
390	T::AccountId: UncheckedFrom<T::Hash>389	T::AccountId: UncheckedFrom<T::Hash>
391	{390	{
392391
393		let new_contract_address = <pallet_contracts::Module<T>>::contract_address(392		let new_contract_address = <pallet_contracts::Pallet<T>>::contract_address(
394			&who,393			&who,
395			code_hash,394			code_hash,
396			salt,395			salt,

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -13,7 +13,6 @@
 #[cfg(feature = "std")]
 pub use serde::*;
 
-use codec::{Decode, Encode};
 pub use frame_support::{
     construct_runtime, decl_event, decl_module, decl_storage, decl_error,
     dispatch::DispatchResult,

--- a/runtime/src/chain_extension.rs
+++ b/runtime/src/chain_extension.rs
@@ -18,10 +18,6 @@
 extern crate pallet_nft;
 pub use pallet_nft::*;
 use nft_data_structs::*;
-// use crate::Runtime;
-
-use sp_runtime::AccountId32;
-use crate::Vec;
 
 /// Create item parameters
 #[derive(Debug, PartialEq, Encode, Decode)]

--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -22,8 +22,8 @@
     Permill, Perbill, Percent,
     create_runtime_str, generic, impl_opaque_keys,
     traits::{
-        AccountIdLookup, Convert, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 
-		IdentityLookup, NumberFor, Verify, AccountIdConversion,
+        AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 
+		Verify, AccountIdConversion,
     },
     transaction_validity::{TransactionSource, TransactionValidity},
     ApplyExtrinsicResult, MultiSignature,
@@ -53,8 +53,6 @@
         WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients
     },
 };
-use pallet_nft_transaction_payment::*;
-use pallet_nft_charge_transaction::*;
 use nft_data_structs::*;
 use pallet_contracts::weights::WeightInfo;
 // #[cfg(any(feature = "std", test))]