difftreelog
Warnings fixed
in: master
5 files changed
pallets/nft-charge-transaction/src/lib.rsdiffbeforeafterboth135 }135 }136136137 // check errors137 // check errors138 let error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);138 let _error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);139 match error {139 match _error {140 Err(error) => return Err(error),140 Err(_error) => return Err(_error),141 Ok(error) => {}141 Ok(_error) => {}142 };142 };143143144 // Determine who is paying transaction fee based on ecnomic model144 // Determine who is paying transaction fee based on ecnomic modelpallets/nft-transaction-payment/src/lib.rsdiffbeforeafterboth140 },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)) => {142142143 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)?;176176177 // sponsor timeout177 // sponsor timeout178 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;179179180 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();213213214 // sponsor timeout214 // sponsor timeout215 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 => {218218246 limits.fungible_sponsor_transfer_timeout246 limits.fungible_sponsor_transfer_timeout247 };247 };248248249 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 usize318 {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;321320322 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;364363390 T::AccountId: UncheckedFrom<T::Hash>389 T::AccountId: UncheckedFrom<T::Hash>391 {390 {392391393 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,pallets/nft/src/lib.rsdiffbeforeafterboth13#[cfg(feature = "std")]13#[cfg(feature = "std")]14pub use serde::*;14pub use serde::*;151516use codec::{Decode, Encode};17pub use frame_support::{16pub use frame_support::{18 construct_runtime, decl_event, decl_module, decl_storage, decl_error,17 construct_runtime, decl_event, decl_module, decl_storage, decl_error,19 dispatch::DispatchResult,18 dispatch::DispatchResult,runtime/src/chain_extension.rsdiffbeforeafterboth18extern crate pallet_nft;18extern crate pallet_nft;19pub use pallet_nft::*;19pub use pallet_nft::*;20use nft_data_structs::*;20use nft_data_structs::*;21// use crate::Runtime;2223use sp_runtime::AccountId32;24use crate::Vec;252126/// Create item parameters22/// Create item parameters27#[derive(Debug, PartialEq, Encode, Decode)]23#[derive(Debug, PartialEq, Encode, Decode)]runtime/src/lib.rsdiffbeforeafterboth22 Permill, Perbill, Percent,22 Permill, Perbill, Percent,23 create_runtime_str, generic, impl_opaque_keys,23 create_runtime_str, generic, impl_opaque_keys,24 traits::{24 traits::{25 AccountIdLookup, Convert, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 25 AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 26 IdentityLookup, NumberFor, Verify, AccountIdConversion,26 Verify, AccountIdConversion,27 },27 },28 transaction_validity::{TransactionSource, TransactionValidity},28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature,29 ApplyExtrinsicResult, MultiSignature,53 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients53 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients54 },54 },55};55};56use pallet_nft_transaction_payment::*;57use pallet_nft_charge_transaction::*;58use nft_data_structs::*;56use nft_data_structs::*;59use pallet_contracts::weights::WeightInfo;57use pallet_contracts::weights::WeightInfo;60// #[cfg(any(feature = "std", test))]58// #[cfg(any(feature = "std", test))]