difftreelog
style fix clippy/rustfmt warnings
in: master
35 files changed
crates/evm-coder-macros/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder-macros/src/lib.rs
+++ b/crates/evm-coder-macros/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
use darling::FromMeta;
use inflector::cases;
use proc_macro::TokenStream;
crates/evm-coder-macros/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder-macros/src/solidity_interface.rs
+++ b/crates/evm-coder-macros/src/solidity_interface.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
use quote::quote;
use darling::FromMeta;
use inflector::cases;
@@ -545,6 +547,7 @@
#(
#call_inner
)*
+ #[allow(unreachable_code)] // In case of no inner calls
fn call(&mut self, c: Msg<#call_name>) -> ::core::result::Result<::evm_coder::abi::AbiWriter, Self::Error> {
use ::evm_coder::abi::AbiWrite;
type InternalCall = #call_name;
crates/evm-coder/tests/a.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/a.rs
+++ b/crates/evm-coder/tests/a.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)] // This test only checks that macros is not panicking
+
use evm_coder::{solidity_interface, types::*, ToLog};
use evm_coder_macros::solidity;
node/cli/build.rsdiffbeforeafterboth--- a/node/cli/build.rs
+++ b/node/cli/build.rs
@@ -6,7 +6,7 @@
use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
fn main() {
- generate_cargo_keys();
+ generate_cargo_keys();
- rerun_if_git_head_changed();
+ rerun_if_git_head_changed();
}
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -64,20 +64,22 @@
// ID
"dev",
ChainType::Local,
- move || testnet_genesis(
- // Sudo account
- get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
- get_from_seed::<AuraId>("Alice"),
- get_from_seed::<AuraId>("Bob"),
- ],
- // Pre-funded accounts
- vec![
+ move || {
+ testnet_genesis(
+ // Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
- get_account_id_from_seed::<sr25519::Public>("Bob"),
- ],
- id,
- ),
+ vec![
+ get_from_seed::<AuraId>("Alice"),
+ get_from_seed::<AuraId>("Bob"),
+ ],
+ // Pre-funded accounts
+ vec![
+ get_account_id_from_seed::<sr25519::Public>("Alice"),
+ get_account_id_from_seed::<sr25519::Public>("Bob"),
+ ],
+ id,
+ )
+ },
// Bootnodes
vec![],
// Telemetry
@@ -101,30 +103,32 @@
// ID
"local_testnet",
ChainType::Local,
- move || testnet_genesis(
- // Sudo account
- get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
- get_from_seed::<AuraId>("Alice"),
- get_from_seed::<AuraId>("Bob"),
- ],
- // Pre-funded accounts
- vec![
+ move || {
+ testnet_genesis(
+ // Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
- get_account_id_from_seed::<sr25519::Public>("Bob"),
- get_account_id_from_seed::<sr25519::Public>("Charlie"),
- get_account_id_from_seed::<sr25519::Public>("Dave"),
- get_account_id_from_seed::<sr25519::Public>("Eve"),
- get_account_id_from_seed::<sr25519::Public>("Ferdie"),
- get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
- get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
- get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
- get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
- get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
- get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
- ],
- id,
- ),
+ vec![
+ get_from_seed::<AuraId>("Alice"),
+ get_from_seed::<AuraId>("Bob"),
+ ],
+ // Pre-funded accounts
+ vec![
+ get_account_id_from_seed::<sr25519::Public>("Alice"),
+ get_account_id_from_seed::<sr25519::Public>("Bob"),
+ get_account_id_from_seed::<sr25519::Public>("Charlie"),
+ get_account_id_from_seed::<sr25519::Public>("Dave"),
+ get_account_id_from_seed::<sr25519::Public>("Eve"),
+ get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+ get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+ get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+ ],
+ id,
+ )
+ },
// Bootnodes
vec![],
// Telemetry
@@ -142,75 +146,74 @@
}
fn testnet_genesis(
- root_key: AccountId,
+ root_key: AccountId,
initial_authorities: Vec<AuraId>,
- endowed_accounts: Vec<AccountId>,
+ endowed_accounts: Vec<AccountId>,
id: ParaId,
) -> GenesisConfig {
-
- let vested_accounts = vec![
- get_account_id_from_seed::<sr25519::Public>("Bob"),
- ];
+ let vested_accounts = vec![get_account_id_from_seed::<sr25519::Public>("Bob")];
- GenesisConfig {
+ GenesisConfig {
system: nft_runtime::SystemConfig {
code: nft_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
changes_trie_config: Default::default(),
},
- pallet_balances: BalancesConfig {
- balances: endowed_accounts
- .iter()
- .cloned()
- .map(|k| (k, 1 << 70))
- .collect(),
- },
+ pallet_balances: BalancesConfig {
+ balances: endowed_accounts
+ .iter()
+ .cloned()
+ .map(|k| (k, 1 << 70))
+ .collect(),
+ },
pallet_treasury: Default::default(),
pallet_sudo: SudoConfig { key: root_key },
pallet_vesting: VestingConfig {
- vesting: vested_accounts
- .iter()
- .cloned()
- .map(|k| (k, 1000, 100, 1 << 98))
- .collect(),
- },
- pallet_nft: NftConfig {
- collection_id: vec![(
- 1,
- Collection {
- owner: get_account_id_from_seed::<sr25519::Public>("Alice"),
- mode: CollectionMode::NFT,
- access: AccessMode::Normal,
- decimal_points: 0,
- name: vec![],
- description: vec![],
- token_prefix: vec![],
- mint_mode: false,
+ vesting: vested_accounts
+ .iter()
+ .cloned()
+ .map(|k| (k, 1000, 100, 1 << 98))
+ .collect(),
+ },
+ pallet_nft: NftConfig {
+ collection_id: vec![(
+ 1,
+ Collection {
+ owner: get_account_id_from_seed::<sr25519::Public>("Alice"),
+ mode: CollectionMode::NFT,
+ access: AccessMode::Normal,
+ decimal_points: 0,
+ name: vec![],
+ description: vec![],
+ token_prefix: vec![],
+ mint_mode: false,
offchain_schema: vec![],
schema_version: SchemaVersion::default(),
- sponsorship: SponsorshipState::Confirmed(get_account_id_from_seed::<sr25519::Public>("Alice")),
- const_on_chain_schema: vec![],
+ sponsorship: SponsorshipState::Confirmed(get_account_id_from_seed::<
+ sr25519::Public,
+ >("Alice")),
+ const_on_chain_schema: vec![],
variable_on_chain_schema: vec![],
- limits: CollectionLimits::default()
- },
- )],
- nft_item_id: vec![],
- fungible_item_id: vec![],
- refungible_item_id: vec![],
- chain_limit: ChainLimits {
- collection_numbers_limit: 100000,
- account_token_ownership_limit: 1000000,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
+ limits: CollectionLimits::default(),
+ },
+ )],
+ nft_item_id: vec![],
+ fungible_item_id: vec![],
+ refungible_item_id: vec![],
+ chain_limit: ChainLimits {
+ collection_numbers_limit: 100000,
+ account_token_ownership_limit: 1000000,
+ collections_admins_limit: 5,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
refungible_sponsor_transfer_timeout: 15,
offchain_schema_limit: 1024,
variable_on_chain_schema_limit: 1024,
const_on_chain_schema_limit: 1024,
- },
- },
+ },
+ },
parachain_info: nft_runtime::ParachainInfoConfig { parachain_id: id },
pallet_aura: nft_runtime::AuraConfig {
authorities: initial_authorities,
@@ -220,5 +223,5 @@
accounts: BTreeMap::new(),
},
pallet_ethereum: EthereumConfig {},
- }
+ }
}
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -18,7 +18,7 @@
use crate::{
chain_spec,
cli::{Cli, RelayChainCli, Subcommand},
- service::{new_partial, ParachainRuntimeExecutor}
+ service::{new_partial, ParachainRuntimeExecutor},
};
use codec::Encode;
use cumulus_primitives_core::ParaId;
@@ -31,7 +31,7 @@
NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
};
use sc_service::{
- config::{BasePath, PrometheusConfig}
+ config::{BasePath, PrometheusConfig},
};
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::Block as BlockT;
@@ -251,7 +251,7 @@
}
Ok(())
- },
+ }
Some(Subcommand::Benchmark(cmd)) => {
if cfg!(feature = "runtime-benchmarks") {
let runner = cli.create_runner(cmd)?;
@@ -259,9 +259,10 @@
runner.sync_run(|config| cmd.run::<Block, ParachainRuntimeExecutor>(config))
} else {
Err("Benchmarking wasn't enabled when building the node. \
- You can enable it with `--features runtime-benchmarks`.".into())
+ You can enable it with `--features runtime-benchmarks`."
+ .into())
}
- },
+ }
None => {
let runner = cli.create_runner(&cli.run.normalize())?;
@@ -289,12 +290,9 @@
let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
let task_executor = config.task_executor.clone();
- let polkadot_config = SubstrateCli::create_configuration(
- &polkadot_cli,
- &polkadot_cli,
- task_executor,
- )
- .map_err(|err| format!("Relay chain argument error: {}", err))?;
+ let polkadot_config =
+ SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
+ .map_err(|err| format!("Relay chain argument error: {}", err))?;
info!("Parachain id: {:?}", id);
info!("Parachain Account: {}", parachain_account);
@@ -443,4 +441,4 @@
) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {
self.base.base.telemetry_endpoints(chain_spec)
}
-}
\ No newline at end of file
+}
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -15,9 +15,7 @@
use nft_runtime::RuntimeApi;
// Cumulus Imports
-use cumulus_client_consensus_aura::{
- build_aura_consensus, BuildAuraConsensusParams, SlotProportion,
-};
+use cumulus_client_consensus_aura::{build_aura_consensus, BuildAuraConsensusParams, SlotProportion};
use cumulus_client_consensus_common::ParachainConsensus;
use cumulus_client_network::build_block_announce_validator;
use cumulus_client_service::{
@@ -59,20 +57,23 @@
);
pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {
- let config_dir = config.base_path.as_ref()
+ let config_dir = config
+ .base_path
+ .as_ref()
.map(|base_path| base_path.config_dir(config.chain_spec.id()))
.unwrap_or_else(|| {
- BasePath::from_project("", "", "nft")
- .config_dir(config.chain_spec.id())
+ BasePath::from_project("", "", "nft").config_dir(config.chain_spec.id())
});
let database_dir = config_dir.join("frontier").join("db");
- Ok(Arc::new(fc_db::Backend::<Block>::new(&fc_db::DatabaseSettings {
- source: fc_db::DatabaseSettingsSrc::RocksDb {
- path: database_dir,
- cache_size: 0,
- }
- })?))
+ Ok(Arc::new(fc_db::Backend::<Block>::new(
+ &fc_db::DatabaseSettings {
+ source: fc_db::DatabaseSettingsSrc::RocksDb {
+ path: database_dir,
+ cache_size: 0,
+ },
+ },
+ )?))
}
type Executor = ParachainRuntimeExecutor;
@@ -85,6 +86,7 @@
///
/// Use this macro if you don't actually need the full service, but just the builder in order to
/// be able to perform chain operations.
+#[allow(clippy::type_complexity)]
pub fn new_partial<BIQ>(
config: &Configuration,
build_import_queue: BIQ,
@@ -95,7 +97,13 @@
FullSelectChain,
sp_consensus::DefaultImportQueue<Block, FullClient>,
sc_transaction_pool::FullPool<Block, FullClient>,
- (Option<Telemetry>, PendingTransactions, Option<FilterPool>, Arc<fc_db::Backend<Block>>, Option<TelemetryWorkerHandle>),
+ (
+ Option<Telemetry>,
+ PendingTransactions,
+ Option<FilterPool>,
+ Arc<fc_db::Backend<Block>>,
+ Option<TelemetryWorkerHandle>,
+ ),
>,
sc_service::Error,
>
@@ -107,12 +115,9 @@
&Configuration,
Option<TelemetryHandle>,
&TaskManager,
- ) -> Result<
- sp_consensus::DefaultImportQueue<Block, FullClient>,
- sc_service::Error,
- >,
+ ) -> Result<sp_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,
{
- let telemetry = config
+ let _telemetry = config
.telemetry_endpoints
.clone()
.filter(|x| !x.is_empty())
@@ -123,7 +128,9 @@
})
.transpose()?;
- let telemetry = config.telemetry_endpoints.clone()
+ let telemetry = config
+ .telemetry_endpoints
+ .clone()
.filter(|x| !x.is_empty())
.map(|endpoints| -> Result<_, sc_telemetry::Error> {
let worker = TelemetryWorker::new(16)?;
@@ -158,8 +165,7 @@
let pending_transactions: PendingTransactions = Some(Arc::new(Mutex::new(HashMap::new())));
- let filter_pool: Option<FilterPool>
- = Some(Arc::new(Mutex::new(BTreeMap::new())));
+ let filter_pool: Option<FilterPool> = Some(Arc::new(Mutex::new(BTreeMap::new())));
let frontier_backend = open_frontier_backend(config)?;
@@ -178,7 +184,13 @@
task_manager,
transaction_pool,
select_chain,
- other: (telemetry, pending_transactions, filter_pool, frontier_backend, telemetry_worker_handle),
+ other: (
+ telemetry,
+ pending_transactions,
+ filter_pool,
+ frontier_backend,
+ telemetry_worker_handle,
+ ),
};
Ok(params)
@@ -204,10 +216,7 @@
&Configuration,
Option<TelemetryHandle>,
&TaskManager,
- ) -> Result<
- sp_consensus::DefaultImportQueue<Block, FullClient>,
- sc_service::Error,
- >,
+ ) -> Result<sp_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,
BIC: FnOnce(
Arc<FullClient>,
Option<&Registry>,
@@ -227,7 +236,13 @@
let parachain_config = prepare_node_config(parachain_config);
let params = new_partial::<BIQ>(¶chain_config, build_import_queue)?;
- let (mut telemetry, pending_transactions, filter_pool, frontier_backend, telemetry_worker_handle) = params.other;
+ let (
+ mut telemetry,
+ pending_transactions,
+ filter_pool,
+ frontier_backend,
+ telemetry_worker_handle,
+ ) = params.other;
let relay_chain_full_node = cumulus_client_service::build_polkadot_full_node(
polkadot_config,
@@ -283,7 +298,7 @@
network: rpc_network.clone(),
pending_transactions: pending_transactions.clone(),
select_chain: select_chain.clone(),
- is_authority: is_authority.clone(),
+ is_authority,
// TODO: Unhardcode
max_past_logs: 10000,
};
@@ -364,16 +379,9 @@
config: &Configuration,
telemetry: Option<TelemetryHandle>,
task_manager: &TaskManager,
-) -> Result<
- sp_consensus::DefaultImportQueue<
- Block,
- FullClient,
- >,
- sc_service::Error,
-> {
+) -> Result<sp_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error> {
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
cumulus_client_consensus_aura::import_queue::<
sp_consensus_aura::sr25519::AuthorityPair,
_,
@@ -383,7 +391,7 @@
_,
_,
>(cumulus_client_consensus_aura::ImportQueueParams {
- block_import: client.clone(),
+ block_import: client.clone(),
client: client.clone(),
create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time();
@@ -396,7 +404,7 @@
Ok((time, slot))
},
- registry: config.prometheus_registry().clone(),
+ registry: config.prometheus_registry(),
can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
spawner: &task_manager.spawn_essential_handle(),
telemetry,
@@ -432,7 +440,7 @@
task_manager.spawn_handle(),
client.clone(),
transaction_pool,
- prometheus_registry.clone(),
+ prometheus_registry,
telemetry.clone(),
);
@@ -480,7 +488,7 @@
block_import: client.clone(),
relay_chain_client: relay_chain_node.client.clone(),
relay_chain_backend: relay_chain_node.backend.clone(),
- para_client: client.clone(),
+ para_client: client,
backoff_authoring_blocks: Option::<()>::None,
sync_oracle,
keystore,
@@ -493,4 +501,4 @@
},
)
.await
-}
\ No newline at end of file
+}
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -189,7 +189,7 @@
pool.clone(),
nft_runtime::TransactionConverter,
network.clone(),
- pending_transactions.clone(),
+ pending_transactions,
signers,
overrides.clone(),
backend,
@@ -200,8 +200,8 @@
if let Some(filter_pool) = filter_pool {
io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new(
client.clone(),
- filter_pool.clone(),
- 500 as usize, // max stored filters
+ filter_pool,
+ 500_usize, // max stored filters
overrides.clone(),
max_past_logs,
)));
@@ -217,9 +217,9 @@
io.extend_with(Web3ApiServer::to_delegate(Web3Api::new(client.clone())));
io.extend_with(EthPubSubApiServer::to_delegate(EthPubSubApi::new(
- pool.clone(),
- client.clone(),
- network.clone(),
+ pool,
+ client,
+ network,
SubscriptionManager::<HexEncodedIdProvider>::with_id_provider(
HexEncodedIdProvider::default(),
Arc::new(subscription_task_executor),
pallets/contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/contract-helpers/src/lib.rs
+++ b/pallets/contract-helpers/src/lib.rs
@@ -15,11 +15,11 @@
use sp_std::vec::Vec;
use up_sponsorship::SponsorshipHandler;
- #[pallet::error]
- pub enum Error<T> {
- /// Should be contract owner
- NoPermission,
- }
+ #[pallet::error]
+ pub enum Error<T> {
+ /// Should be contract owner
+ NoPermission,
+ }
#[pallet::config]
pub trait Config: frame_system::Config + pallet_contracts::Config {}
@@ -81,7 +81,10 @@
sponsoring: bool,
) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(<Owner<T>>::get(&contract) == sender, <Error<T>>::NoPermission);
+ ensure!(
+ <Owner<T>>::get(&contract) == sender,
+ <Error<T>>::NoPermission
+ );
if sponsoring {
<SelfSponsoring<T>>::insert(contract, true);
@@ -98,7 +101,10 @@
enabled: bool,
) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(<Owner<T>>::get(&contract) == sender, <Error<T>>::NoPermission);
+ ensure!(
+ <Owner<T>>::get(&contract) == sender,
+ <Error<T>>::NoPermission
+ );
if enabled {
<AllowlistEnabled<T>>::insert(contract, true);
@@ -116,7 +122,10 @@
allowed: bool,
) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(<Owner<T>>::get(&contract) == sender, <Error<T>>::NoPermission);
+ ensure!(
+ <Owner<T>>::get(&contract) == sender,
+ <Error<T>>::NoPermission
+ );
if allowed {
<Allowlist<T>>::insert(contract, user, true);
@@ -133,7 +142,10 @@
rate_limit: T::BlockNumber,
) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(<Owner<T>>::get(&contract) == sender, <Error<T>>::NoPermission);
+ ensure!(
+ <Owner<T>>::get(&contract) == sender,
+ <Error<T>>::NoPermission
+ );
<SponsoringRateLimit<T>>::insert(contract, rate_limit);
Ok(())
@@ -174,19 +186,17 @@
_info: &DispatchInfoOf<Self::Call>,
_len: usize,
) -> transaction_validity::TransactionValidity {
- match IsSubType::<pallet_contracts::Call<T>>::is_sub_type(call) {
- Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) => {
- let called_contract: T::AccountId =
- T::Lookup::lookup((*dest).clone()).unwrap_or(T::AccountId::default());
- if <AllowlistEnabled<T>>::get(&called_contract) {
- if !<Allowlist<T>>::get(&called_contract, who)
- && &<Owner<T>>::get(&called_contract) != who
- {
- return Err(transaction_validity::InvalidTransaction::Call.into());
- }
- }
+ if let Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) =
+ IsSubType::<pallet_contracts::Call<T>>::is_sub_type(call)
+ {
+ let called_contract: T::AccountId =
+ T::Lookup::lookup((*dest).clone()).unwrap_or_default();
+ if <AllowlistEnabled<T>>::get(&called_contract)
+ && !<Allowlist<T>>::get(&called_contract, who)
+ && &<Owner<T>>::get(&called_contract) != who
+ {
+ return Err(transaction_validity::InvalidTransaction::Call.into());
}
- _ => {}
}
Ok(transaction_validity::ValidTransaction::default())
}
@@ -200,11 +210,11 @@
) -> Result<Self::Pre, TransactionValidityError> {
match IsSubType::<pallet_contracts::Call<T>>::is_sub_type(call) {
Some(pallet_contracts::Call::instantiate(_, _, code_hash, _, salt)) => {
- Ok(Some((who.clone(), code_hash.clone(), salt.clone())))
+ Ok(Some((who.clone(), *code_hash, salt.clone())))
}
Some(pallet_contracts::Call::instantiate_with_code(_, _, code, _, salt)) => {
let code_hash = &T::Hashing::hash(&code);
- Ok(Some((who.clone(), code_hash.clone(), salt.clone())))
+ Ok(Some((who.clone(), *code_hash, salt.clone())))
}
_ => Ok(None),
}
@@ -236,24 +246,22 @@
T::AccountId: AsRef<[u8]>,
{
fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {
- match IsSubType::<pallet_contracts::Call<T>>::is_sub_type(call) {
- Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) => {
- let called_contract: T::AccountId =
- T::Lookup::lookup((*dest).clone()).unwrap_or_default();
- if <SelfSponsoring<T>>::get(&called_contract) {
- let last_tx_block = SponsorBasket::<T>::get(&called_contract, &who);
- let block_number =
- <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
- let rate_limit = SponsoringRateLimit::<T>::get(&called_contract);
- let limit_time = last_tx_block + rate_limit;
+ if let Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) =
+ IsSubType::<pallet_contracts::Call<T>>::is_sub_type(call)
+ {
+ let called_contract: T::AccountId =
+ T::Lookup::lookup((*dest).clone()).unwrap_or_default();
+ if <SelfSponsoring<T>>::get(&called_contract) {
+ let last_tx_block = SponsorBasket::<T>::get(&called_contract, &who);
+ let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
+ let rate_limit = SponsoringRateLimit::<T>::get(&called_contract);
+ let limit_time = last_tx_block + rate_limit;
- if block_number >= limit_time {
- SponsorBasket::<T>::insert(&called_contract, who, block_number);
- return Some(called_contract);
- }
+ if block_number >= limit_time {
+ SponsorBasket::<T>::insert(&called_contract, who, block_number);
+ return Some(called_contract);
}
}
- _ => {}
}
None
}
pallets/inflation/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/inflation/src/benchmarking.rs
+++ b/pallets/inflation/src/benchmarking.rs
@@ -5,15 +5,15 @@
use sp_std::prelude::*;
use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks};
+use frame_benchmarking::{benchmarks};
use frame_support::traits::OnInitialize;
benchmarks! {
on_initialize {
- let block1: T::BlockNumber = T::BlockNumber::from(1u32);
- let block2: T::BlockNumber = T::BlockNumber::from(2u32);
- Inflation::<T>::on_initialize(block1); // Create Treasury account
+ let block1: T::BlockNumber = T::BlockNumber::from(1u32);
+ let block2: T::BlockNumber = T::BlockNumber::from(2u32);
+ Inflation::<T>::on_initialize(block1); // Create Treasury account
}: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path
}
pallets/inflation/src/lib.rsdiffbeforeafterboth--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -4,7 +4,6 @@
//
#![recursion_limit = "1024"]
-
#![cfg_attr(not(feature = "std"), no_std)]
#[cfg(feature = "std")]
@@ -19,8 +18,7 @@
mod tests;
pub use frame_support::{
- construct_runtime, decl_module, decl_storage,
- ensure,
+ construct_runtime, decl_module, decl_storage, ensure,
traits::{
Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,
Randomness, IsSubType, WithdrawReasons,
@@ -30,8 +28,7 @@
DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
WeightToFeePolynomial, DispatchClass,
},
- StorageValue,
- transactional,
+ StorageValue, transactional,
};
// #[cfg(feature = "runtime-benchmarks")]
@@ -39,7 +36,7 @@
use sp_runtime::{
Perbill,
- traits::{Zero}
+ traits::{Zero},
};
use sp_std::convert::TryInto;
@@ -71,13 +68,13 @@
}
decl_module! {
- pub struct Module<T: Config> for enum Call
- where
+ pub struct Module<T: Config> for enum Call
+ where
origin: T::Origin,
{
const InflationBlockInterval: T::BlockNumber = T::InflationBlockInterval::get();
- fn on_initialize(now: T::BlockNumber) -> Weight
+ fn on_initialize(now: T::BlockNumber) -> Weight
{
let mut consumed_weight = 0;
let mut add_weight = |reads, writes, weight| {
@@ -95,14 +92,14 @@
if current_year <= TOTAL_YEARS_UNTIL_FLAT {
let amount: BalanceOf<T> = Perbill::from_rational(
- block_interval * (START_INFLATION_PERCENT * TOTAL_YEARS_UNTIL_FLAT - current_year * (START_INFLATION_PERCENT - END_INFLATION_PERCENT)),
+ block_interval * (START_INFLATION_PERCENT * TOTAL_YEARS_UNTIL_FLAT - current_year * (START_INFLATION_PERCENT - END_INFLATION_PERCENT)),
YEAR * TOTAL_YEARS_UNTIL_FLAT
) * ( one_percent * T::Currency::total_issuance() );
<BlockInflation<T>>::put(amount);
}
else {
let amount: BalanceOf<T> = Perbill::from_rational(
- block_interval * END_INFLATION_PERCENT,
+ block_interval * END_INFLATION_PERCENT,
YEAR
) * (one_percent * T::Currency::total_issuance());
<BlockInflation<T>>::put(amount);
pallets/inflation/src/tests.rsdiffbeforeafterboth--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -1,242 +1,242 @@
-#[cfg(test)]
-mod tests {
- use crate as pallet_inflation;
+#![cfg(test)]
+#![allow(clippy::from_over_into)]
+use crate as pallet_inflation;
- use frame_system;
- use frame_support::{traits::{Currency}, parameter_types};
- use frame_support::{traits::OnInitialize};
- use sp_core::H256;
- use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use frame_support::{
+ traits::{Currency},
+ parameter_types,
+};
+use frame_support::{traits::OnInitialize};
+use sp_core::H256;
+use sp_runtime::{
+ traits::{BlakeTwo256, IdentityLookup},
+ testing::Header,
+};
- type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
- type Block = frame_system::mocking::MockBlock<Test>;
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
- const YEAR: u64 = 5_259_600;
+const YEAR: u64 = 5_259_600;
- parameter_types! {
- pub const ExistentialDeposit: u64 = 1;
- pub const MaxLocks: u32 = 50;
- }
-
- impl pallet_balances::Config for Test {
- type AccountStore = System;
- type Balance = u64;
- type DustRemoval = ();
- type Event = ();
- type ExistentialDeposit = ExistentialDeposit;
- type WeightInfo = ();
- type MaxLocks = MaxLocks;
- }
-
- frame_support::construct_runtime!(
- pub enum Test where
- Block = Block,
- NodeBlock = Block,
- UncheckedExtrinsic = UncheckedExtrinsic,
- {
- Balances: pallet_balances::{Pallet, Call, Storage},
- System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
- Inflation: pallet_inflation::{Pallet, Call, Storage},
- }
- );
+parameter_types! {
+ pub const ExistentialDeposit: u64 = 1;
+ pub const MaxLocks: u32 = 50;
+}
- parameter_types! {
- pub const BlockHashCount: u64 = 250;
- pub BlockWeights: frame_system::limits::BlockWeights =
- frame_system::limits::BlockWeights::simple_max(1024);
- pub const SS58Prefix: u8 = 42;
- }
+impl pallet_balances::Config for Test {
+ type AccountStore = System;
+ type Balance = u64;
+ type DustRemoval = ();
+ type Event = ();
+ type ExistentialDeposit = ExistentialDeposit;
+ type WeightInfo = ();
+ type MaxLocks = MaxLocks;
+}
- impl frame_system::Config for Test {
- type BaseCallFilter = ();
- type BlockWeights = ();
- type BlockLength = ();
- type DbWeight = ();
- type Origin = Origin;
- type Call = Call;
- type Index = u64;
- type BlockNumber = u64;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = u64;
- type Lookup = IdentityLookup<Self::AccountId>;
- type Header = Header;
- type Event = ();
- type BlockHashCount = BlockHashCount;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = pallet_balances::AccountData<u64>;
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type SystemWeightInfo = ();
- type SS58Prefix = SS58Prefix;
- type OnSetCode = ();
+frame_support::construct_runtime!(
+ pub enum Test where
+ Block = Block,
+ NodeBlock = Block,
+ UncheckedExtrinsic = UncheckedExtrinsic,
+ {
+ Balances: pallet_balances::{Pallet, Call, Storage},
+ System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+ Inflation: pallet_inflation::{Pallet, Call, Storage},
}
+);
+
+parameter_types! {
+ pub const BlockHashCount: u64 = 250;
+ pub BlockWeights: frame_system::limits::BlockWeights =
+ frame_system::limits::BlockWeights::simple_max(1024);
+ pub const SS58Prefix: u8 = 42;
+}
+
+impl frame_system::Config for Test {
+ type BaseCallFilter = ();
+ type BlockWeights = ();
+ type BlockLength = ();
+ type DbWeight = ();
+ type Origin = Origin;
+ type Call = Call;
+ type Index = u64;
+ type BlockNumber = u64;
+ type Hash = H256;
+ type Hashing = BlakeTwo256;
+ type AccountId = u64;
+ type Lookup = IdentityLookup<Self::AccountId>;
+ type Header = Header;
+ type Event = ();
+ type BlockHashCount = BlockHashCount;
+ type Version = ();
+ type PalletInfo = PalletInfo;
+ type AccountData = pallet_balances::AccountData<u64>;
+ type OnNewAccount = ();
+ type OnKilledAccount = ();
+ type SystemWeightInfo = ();
+ type SS58Prefix = SS58Prefix;
+ type OnSetCode = ();
+}
- parameter_types! {
- pub TreasuryAccountId: u64 = 1234;
- pub const InflationBlockInterval: u32 = 100; // every time per how many blocks inflation is applied
- }
-
- impl pallet_inflation::Config for Test {
- type Currency = Balances;
- type TreasuryAccountId = TreasuryAccountId;
- type InflationBlockInterval = InflationBlockInterval;
- }
+parameter_types! {
+ pub TreasuryAccountId: u64 = 1234;
+ pub const InflationBlockInterval: u32 = 100; // every time per how many blocks inflation is applied
+}
- // Build genesis storage according to the mock runtime.
- pub fn new_test_ext() -> sp_io::TestExternalities {
- frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
- }
+impl pallet_inflation::Config for Test {
+ type Currency = Balances;
+ type TreasuryAccountId = TreasuryAccountId;
+ type InflationBlockInterval = InflationBlockInterval;
+}
- #[test]
- fn inflation_works() {
- new_test_ext().execute_with(|| {
- // Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
+// Build genesis storage according to the mock runtime.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+ frame_system::GenesisConfig::default()
+ .build_storage::<Test>()
+ .unwrap()
+ .into()
+}
- // BlockInflation should be set after 1st block and
- // first inflation deposit should be equal to BlockInflation
- Inflation::on_initialize(1);
- assert!(Inflation::block_inflation() > 0);
- assert_eq!(Balances::free_balance(1234) - initial_issuance, Inflation::block_inflation());
- });
- }
+#[test]
+fn inflation_works() {
+ new_test_ext().execute_with(|| {
+ // Total issuance = 1_000_000_000
+ let initial_issuance: u64 = 1_000_000_000;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
- #[test]
- fn inflation_second_deposit() {
- new_test_ext().execute_with(|| {
- // Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
- Inflation::on_initialize(1);
+ // BlockInflation should be set after 1st block and
+ // first inflation deposit should be equal to BlockInflation
+ Inflation::on_initialize(1);
+ assert!(Inflation::block_inflation() > 0);
+ assert_eq!(
+ Balances::free_balance(1234) - initial_issuance,
+ Inflation::block_inflation()
+ );
+ });
+}
- // Next inflation deposit happens when block is multiple of InflationBlockInterval
- let mut block: u32 = 2;
- let balance_before: u64 = Balances::free_balance(1234);
- while block % InflationBlockInterval::get() != 0 {
- Inflation::on_initialize(block as u64);
- block += 1;
- }
- let balance_just_before: u64 = Balances::free_balance(1234);
- assert_eq!(balance_before, balance_just_before);
+#[test]
+fn inflation_second_deposit() {
+ new_test_ext().execute_with(|| {
+ // Total issuance = 1_000_000_000
+ let initial_issuance: u64 = 1_000_000_000;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
+ Inflation::on_initialize(1);
- // The block with inflation
+ // Next inflation deposit happens when block is multiple of InflationBlockInterval
+ let mut block: u32 = 2;
+ let balance_before: u64 = Balances::free_balance(1234);
+ while block % InflationBlockInterval::get() != 0 {
Inflation::on_initialize(block as u64);
- let balance_after: u64 = Balances::free_balance(1234);
- assert_eq!(balance_after - balance_just_before, Inflation::block_inflation());
- });
- }
+ block += 1;
+ }
+ let balance_just_before: u64 = Balances::free_balance(1234);
+ assert_eq!(balance_before, balance_just_before);
- #[test]
- fn inflation_in_1_year() {
- new_test_ext().execute_with(|| {
- // Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
- Inflation::on_initialize(1);
- let block_inflation_year_0 = Inflation::block_inflation();
+ // The block with inflation
+ Inflation::on_initialize(block as u64);
+ let balance_after: u64 = Balances::free_balance(1234);
+ assert_eq!(
+ balance_after - balance_just_before,
+ Inflation::block_inflation()
+ );
+ });
+}
- Inflation::on_initialize(YEAR);
- let block_inflation_year_1 = Inflation::block_inflation();
+#[test]
+fn inflation_in_1_year() {
+ new_test_ext().execute_with(|| {
+ // Total issuance = 1_000_000_000
+ let initial_issuance: u64 = 1_000_000_000;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
+ Inflation::on_initialize(1);
+ let block_inflation_year_0 = Inflation::block_inflation();
- // Assert that year 1 inflation is less than year 0
- assert!(block_inflation_year_0 > block_inflation_year_1);
- });
- }
+ Inflation::on_initialize(YEAR);
+ let block_inflation_year_1 = Inflation::block_inflation();
- #[test]
- fn inflation_in_1_to_9_years() {
- new_test_ext().execute_with(|| {
- // Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
- Inflation::on_initialize(1);
+ // Assert that year 1 inflation is less than year 0
+ assert!(block_inflation_year_0 > block_inflation_year_1);
+ });
+}
- for year in 1..=9 {
- let block_inflation_year_before = Inflation::block_inflation();
- Inflation::on_initialize(YEAR * year);
- let block_inflation_year_after = Inflation::block_inflation();
+#[test]
+fn inflation_in_1_to_9_years() {
+ new_test_ext().execute_with(|| {
+ // Total issuance = 1_000_000_000
+ let initial_issuance: u64 = 1_000_000_000;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
+ Inflation::on_initialize(1);
- // Assert that next year inflation is less than previous year inflation
- assert!(block_inflation_year_before > block_inflation_year_after);
- }
+ for year in 1..=9 {
+ let block_inflation_year_before = Inflation::block_inflation();
+ Inflation::on_initialize(YEAR * year);
+ let block_inflation_year_after = Inflation::block_inflation();
- });
- }
+ // Assert that next year inflation is less than previous year inflation
+ assert!(block_inflation_year_before > block_inflation_year_after);
+ }
+ });
+}
- #[test]
- fn inflation_after_year_10_is_flat() {
- new_test_ext().execute_with(|| {
- // Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
- Inflation::on_initialize(YEAR * 9);
+#[test]
+fn inflation_after_year_10_is_flat() {
+ new_test_ext().execute_with(|| {
+ // Total issuance = 1_000_000_000
+ let initial_issuance: u64 = 1_000_000_000;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
+ Inflation::on_initialize(YEAR * 9);
- for year in 10..=20 {
- let block_inflation_year_before = Inflation::block_inflation();
- Inflation::on_initialize(YEAR * year);
- let block_inflation_year_after = Inflation::block_inflation();
+ for year in 10..=20 {
+ let block_inflation_year_before = Inflation::block_inflation();
+ Inflation::on_initialize(YEAR * year);
+ let block_inflation_year_after = Inflation::block_inflation();
- // Assert that next year inflation is equal to previous year inflation
- assert_eq!(block_inflation_year_before, block_inflation_year_after);
- }
- });
- }
+ // Assert that next year inflation is equal to previous year inflation
+ assert_eq!(block_inflation_year_before, block_inflation_year_after);
+ }
+ });
+}
- #[test]
- fn inflation_rate_by_year() {
- new_test_ext().execute_with(|| {
- let payouts: u64 = YEAR / InflationBlockInterval::get() as u64;
+#[test]
+fn inflation_rate_by_year() {
+ new_test_ext().execute_with(|| {
+ let payouts: u64 = YEAR / InflationBlockInterval::get() as u64;
- // Inflation starts at 10% and does down by 2/3% every year until year 9 (included),
- // then it is flat.
- let payout_by_year: [u64; 11] = [
- 1000,
- 933,
- 867,
- 800,
- 733,
- 667,
- 600,
- 533,
- 467,
- 400,
- 400
- ];
+ // Inflation starts at 10% and does down by 2/3% every year until year 9 (included),
+ // then it is flat.
+ let payout_by_year: [u64; 11] = [1000, 933, 867, 800, 733, 667, 600, 533, 467, 400, 400];
- // For accuracy total issuance = payout0 * payouts * 10;
- let initial_issuance: u64 = payout_by_year[0] * payouts * 10;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
- assert_eq!(Balances::free_balance(1234), initial_issuance);
+ // For accuracy total issuance = payout0 * payouts * 10;
+ let initial_issuance: u64 = payout_by_year[0] * payouts * 10;
+ let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ assert_eq!(Balances::free_balance(1234), initial_issuance);
- for year in 0..=10 {
- // Year first block
- Inflation::on_initialize(year*YEAR);
- let mut actual_payout = Inflation::block_inflation();
- assert_eq!(actual_payout, payout_by_year[year as usize]);
+ for year in 0..=10 {
+ // Year first block
+ Inflation::on_initialize(year * YEAR);
+ let mut actual_payout = Inflation::block_inflation();
+ assert_eq!(actual_payout, payout_by_year[year as usize]);
- // Year second block
- Inflation::on_initialize(year*YEAR+1);
- actual_payout = Inflation::block_inflation();
- assert_eq!(actual_payout, payout_by_year[year as usize]);
+ // Year second block
+ Inflation::on_initialize(year * YEAR + 1);
+ actual_payout = Inflation::block_inflation();
+ assert_eq!(actual_payout, payout_by_year[year as usize]);
- // Year middle block
- Inflation::on_initialize(year*YEAR + YEAR/2);
- actual_payout = Inflation::block_inflation();
- assert_eq!(actual_payout, payout_by_year[year as usize]);
+ // Year middle block
+ Inflation::on_initialize(year * YEAR + YEAR / 2);
+ actual_payout = Inflation::block_inflation();
+ assert_eq!(actual_payout, payout_by_year[year as usize]);
- // Year last block
- Inflation::on_initialize((year + 1)*YEAR-1);
- actual_payout = Inflation::block_inflation();
- assert_eq!(actual_payout, payout_by_year[year as usize]);
- }
- });
- }
+ // Year last block
+ Inflation::on_initialize((year + 1) * YEAR - 1);
+ actual_payout = Inflation::block_inflation();
+ assert_eq!(actual_payout, payout_by_year[year as usize]);
+ }
+ });
}
pallets/nft-charge-transaction/src/lib.rsdiffbeforeafterboth--- a/pallets/nft-charge-transaction/src/lib.rs
+++ b/pallets/nft-charge-transaction/src/lib.rs
@@ -11,47 +11,38 @@
#[cfg(feature = "std")]
pub use serde::*;
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking;
-
use codec::{Decode, Encode};
use frame_support::traits::Get;
use frame_support::{
decl_module, decl_storage,
- weights::{
- DispatchInfo, PostDispatchInfo, DispatchClass
- }
+ weights::{DispatchInfo, PostDispatchInfo, DispatchClass},
};
use sp_runtime::{
- traits::{
- DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Saturating, SaturatedConversion, SignedExtension, Zero,
+ traits::{
+ DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Saturating, SaturatedConversion,
+ SignedExtension, Zero,
},
- transaction_validity::{
+ transaction_validity::{
TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransaction,
},
- FixedPointOperand, DispatchResult
+ FixedPointOperand, DispatchResult,
};
use pallet_transaction_payment::OnChargeTransaction;
use sp_std::prelude::*;
-
-pub trait Config: frame_system::Config +
- pallet_nft_transaction_payment::Config
-{
-
-}
+pub trait Config: frame_system::Config + pallet_nft_transaction_payment::Config {}
decl_storage! {
- trait Store for Module<T: Config> as NftTransactionPayment
- {}
+ trait Store for Module<T: Config> as NftTransactionPayment
+ {}
}
decl_module! {
- pub struct Module<T: Config> for enum Call
- where
+ pub struct Module<T: Config> for enum Call
+ where
origin: T::Origin,
- {}
+ {}
}
type BalanceOf<T> = <<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::Balance;
@@ -61,9 +52,7 @@
#[derive(Encode, Decode, Clone, Eq, PartialEq)]
pub struct ChargeTransactionPayment<T: Config>(#[codec(compact)] BalanceOf<T>);
-impl<T: Config + Send + Sync> sp_std::fmt::Debug
- for ChargeTransactionPayment<T>
-{
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
#[cfg(feature = "std")]
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
write!(f, "ChargeTransactionPayment<{:?}>", self.0)
@@ -76,32 +65,37 @@
impl<T: Config> ChargeTransactionPayment<T>
where
- T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
- BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
+ T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
+ BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
{
- fn traditional_fee(
- len: usize,
- info: &DispatchInfoOf<T::Call>,
- tip: BalanceOf<T>,
- ) -> BalanceOf<T>
- where
- T::Call: Dispatchable<Info = DispatchInfo>,
- {
- <pallet_transaction_payment::Module<T>>::compute_fee(len as u32, info, tip)
- }
+ fn traditional_fee(
+ len: usize,
+ info: &DispatchInfoOf<T::Call>,
+ tip: BalanceOf<T>,
+ ) -> BalanceOf<T>
+ where
+ T::Call: Dispatchable<Info = DispatchInfo>,
+ {
+ <pallet_transaction_payment::Module<T>>::compute_fee(len as u32, info, tip)
+ }
- fn get_priority(len: usize, info: &DispatchInfoOf<T::Call>, final_fee: BalanceOf<T>) -> TransactionPriority {
- let weight_saturation = T::BlockWeights::get().max_block / info.weight.max(1);
- let max_block_length = *T::BlockLength::get().max.get(DispatchClass::Normal);
- let len_saturation = max_block_length as u64 / (len as u64).max(1);
- let coefficient: BalanceOf<T> = weight_saturation
- .min(len_saturation)
- .saturated_into::<BalanceOf<T>>();
- final_fee
- .saturating_mul(coefficient)
- .saturated_into::<TransactionPriority>()
- }
+ fn get_priority(
+ len: usize,
+ info: &DispatchInfoOf<T::Call>,
+ final_fee: BalanceOf<T>,
+ ) -> TransactionPriority {
+ let weight_saturation = T::BlockWeights::get().max_block / info.weight.max(1);
+ let max_block_length = *T::BlockLength::get().max.get(DispatchClass::Normal);
+ let len_saturation = max_block_length as u64 / (len as u64).max(1);
+ let coefficient: BalanceOf<T> = weight_saturation
+ .min(len_saturation)
+ .saturated_into::<BalanceOf<T>>();
+ final_fee
+ .saturating_mul(coefficient)
+ .saturated_into::<TransactionPriority>()
+ }
+ #[allow(clippy::type_complexity)]
fn withdraw_fee(
&self,
who: &T::AccountId,
@@ -114,39 +108,38 @@
<<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::LiquidityInfo,
),
TransactionValidityError,
- > {
- let tip = self.0;
+ >{
+ let tip = self.0;
- let fee = Self::traditional_fee(len, info, tip);
+ let fee = Self::traditional_fee(len, info, tip);
- // Only mess with balances if fee is not zero.
- if fee.is_zero() {
- return <<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
+ // Only mess with balances if fee is not zero.
+ if fee.is_zero() {
+ return <<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
.map(|i| (fee, i));
- }
+ }
- // Determine who is paying transaction fee based on ecnomic model
- // Parse call to extract collection ID and access collection sponsor
+ // Determine who is paying transaction fee based on ecnomic model
+ // Parse call to extract collection ID and access collection sponsor
let sponsor = <pallet_nft_transaction_payment::Module<T>>::withdraw_type(who, call);
- let who_pays_fee = sponsor.unwrap_or_else(|| who.clone());
+ let who_pays_fee = sponsor.unwrap_or_else(|| who.clone());
<<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::withdraw_fee(&who_pays_fee, call, info, fee, tip)
.map(|i| (fee, i))
- }
+ }
}
-impl<T: Config + Send + Sync> SignedExtension
- for ChargeTransactionPayment<T>
+impl<T: Config + Send + Sync> SignedExtension for ChargeTransactionPayment<T>
where
- BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
- T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+ BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
+ T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
{
- const IDENTIFIER: &'static str = "ChargeTransactionPayment";
- type AccountId = T::AccountId;
- type Call = T::Call;
- type AdditionalSigned = ();
- type Pre = (
+ const IDENTIFIER: &'static str = "ChargeTransactionPayment";
+ type AccountId = T::AccountId;
+ type Call = T::Call;
+ type AdditionalSigned = ();
+ type Pre = (
// tip
BalanceOf<T>,
// who pays fee
@@ -154,50 +147,49 @@
// imbalance resulting from withdrawing the fee
<<T as pallet_transaction_payment::Config>::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction<T>>::LiquidityInfo,
);
- fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
- Ok(())
- }
+ fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+ Ok(())
+ }
- fn validate(
- &self,
- who: &Self::AccountId,
- call: &Self::Call,
- info: &DispatchInfoOf<Self::Call>,
- len: usize,
- ) -> TransactionValidity {
+ fn validate(
+ &self,
+ who: &Self::AccountId,
+ call: &Self::Call,
+ info: &DispatchInfoOf<Self::Call>,
+ len: usize,
+ ) -> TransactionValidity {
let (fee, _) = self.withdraw_fee(who, call, info, len)?;
Ok(ValidTransaction {
priority: Self::get_priority(len, info, fee),
..Default::default()
})
- }
+ }
- fn pre_dispatch(
- self,
- who: &Self::AccountId,
- call: &Self::Call,
- info: &DispatchInfoOf<Self::Call>,
- len: usize,
- ) -> Result<Self::Pre, TransactionValidityError> {
- let (_fee, imbalance) = self.withdraw_fee(who, call, info, len)?;
- Ok((self.0, who.clone(), imbalance))
- }
+ fn pre_dispatch(
+ self,
+ who: &Self::AccountId,
+ call: &Self::Call,
+ info: &DispatchInfoOf<Self::Call>,
+ len: usize,
+ ) -> Result<Self::Pre, TransactionValidityError> {
+ let (_fee, imbalance) = self.withdraw_fee(who, call, info, len)?;
+ Ok((self.0, who.clone(), imbalance))
+ }
- fn post_dispatch(
- pre: Self::Pre,
- info: &DispatchInfoOf<Self::Call>,
- post_info: &PostDispatchInfoOf<Self::Call>,
- len: usize,
- _result: &DispatchResult,
- ) -> Result<(), TransactionValidityError> {
+ fn post_dispatch(
+ pre: Self::Pre,
+ info: &DispatchInfoOf<Self::Call>,
+ post_info: &PostDispatchInfoOf<Self::Call>,
+ len: usize,
+ _result: &DispatchResult,
+ ) -> Result<(), TransactionValidityError> {
let (tip, who, imbalance) = pre;
let actual_fee = pallet_transaction_payment::Pallet::<T>::compute_actual_fee(
- len as u32,
- info,
- post_info,
- tip,
+ len as u32, info, post_info, tip,
);
- <T as pallet_transaction_payment::Config>::OnChargeTransaction::correct_and_deposit_fee(&who, info, post_info, actual_fee, tip, imbalance)?;
+ <T as pallet_transaction_payment::Config>::OnChargeTransaction::correct_and_deposit_fee(
+ &who, info, post_info, actual_fee, tip, imbalance,
+ )?;
Ok(())
- }
-}
\ No newline at end of file
+ }
+}
pallets/nft-transaction-payment/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nft-transaction-payment/src/benchmarking.rs
+++ b/pallets/nft-transaction-payment/src/benchmarking.rs
@@ -4,15 +4,15 @@
use sp_std::prelude::*;
use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks};
+use frame_benchmarking::{benchmarks};
use frame_support::traits::OnInitialize;
benchmarks! {
// on_initialize {
- // let block1: T::BlockNumber = T::BlockNumber::from(1u32);
- // let block2: T::BlockNumber = T::BlockNumber::from(2u32);
- // Inflation::<T>::on_initialize(block1); // Create Treasury account
+ // let block1: T::BlockNumber = T::BlockNumber::from(1u32);
+ // let block2: T::BlockNumber = T::BlockNumber::from(2u32);
+ // Inflation::<T>::on_initialize(block1); // Create Treasury account
// }: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path
}
pallets/nft-transaction-payment/src/lib.rsdiffbeforeafterboth--- a/pallets/nft-transaction-payment/src/lib.rs
+++ b/pallets/nft-transaction-payment/src/lib.rs
@@ -28,18 +28,15 @@
}
decl_module! {
- pub struct Module<T: Config> for enum Call
- where
+ pub struct Module<T: Config> for enum Call
+ where
origin: T::Origin,
- {
+ {
}
}
impl<T: Config> Module<T> {
- pub fn withdraw_type(
- who: &T::AccountId,
- call: &T::Call
- ) -> Option<T::AccountId> {
+ pub fn withdraw_type(who: &T::AccountId, call: &T::Call) -> Option<T::AccountId> {
T::SponsorshipHandler::get_sponsor(who, call)
}
-}
\ No newline at end of file
+}
pallets/nft/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nft/src/benchmarking.rs
+++ b/pallets/nft/src/benchmarking.rs
@@ -5,415 +5,415 @@
use sp_std::prelude::*;
use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller}; // , TrackedStorageKey,
+use frame_benchmarking::{benchmarks, account, whitelisted_caller}; // , TrackedStorageKey,
const SEED: u32 = 1;
/*
fn default_nft_data() -> CreateItemData {
- CreateItemData::NFT(CreateNftData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })
+ CreateItemData::NFT(CreateNftData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })
}
fn default_fungible_data () -> CreateItemData {
- CreateItemData::Fungible(CreateFungibleData { })
+ CreateItemData::Fungible(CreateFungibleData { })
}
fn default_re_fungible_data () -> CreateItemData {
- CreateItemData::ReFungible(CreateReFungibleData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })
+ CreateItemData::ReFungible(CreateReFungibleData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] })
}
*/
benchmarks! {
- create_collection {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = account("caller", 0, SEED);
- }: _(RawOrigin::Signed(caller.clone()), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode)
+ create_collection {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = account("caller", 0, SEED);
+ }: _(RawOrigin::Signed(caller.clone()), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode)
/*
- verify {
- assert_eq!(Nft::<T>::collection_id(2).owner, caller);
- }
- destroy_collection {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: _(RawOrigin::Signed(caller.clone()), 2)
+ verify {
+ assert_eq!(Nft::<T>::collection_id(2).owner, caller);
+ }
+ destroy_collection {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: _(RawOrigin::Signed(caller.clone()), 2)
- add_to_white_list {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- let whitelist_account: T::AccountId = account("admin", 0, SEED);
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: add_to_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)
+ add_to_white_list {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ let whitelist_account: T::AccountId = account("admin", 0, SEED);
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: add_to_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)
- remove_from_white_list {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- let whitelist_account: T::AccountId = account("admin", 0, SEED);
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- Nft::<T>::add_to_white_list(RawOrigin::Signed(caller.clone()).into(), 2, whitelist_account.clone())?;
- }: remove_from_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)
+ remove_from_white_list {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ let whitelist_account: T::AccountId = account("admin", 0, SEED);
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ Nft::<T>::add_to_white_list(RawOrigin::Signed(caller.clone()).into(), 2, whitelist_account.clone())?;
+ }: remove_from_white_list(RawOrigin::Signed(caller.clone()), 2, whitelist_account)
- set_public_access_mode {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_public_access_mode(RawOrigin::Signed(caller.clone()), 2, AccessMode::WhiteList)
+ set_public_access_mode {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_public_access_mode(RawOrigin::Signed(caller.clone()), 2, AccessMode::WhiteList)
- set_mint_permission {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_mint_permission(RawOrigin::Signed(caller.clone()), 2, true)
+ set_mint_permission {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_mint_permission(RawOrigin::Signed(caller.clone()), 2, true)
- change_collection_owner {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let new_owner: T::AccountId = account("admin", 0, SEED);
- }: change_collection_owner(RawOrigin::Signed(caller.clone()), 2, new_owner)
+ change_collection_owner {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let new_owner: T::AccountId = account("admin", 0, SEED);
+ }: change_collection_owner(RawOrigin::Signed(caller.clone()), 2, new_owner)
- add_collection_admin {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let new_admin: T::AccountId = account("admin", 0, SEED);
- }: add_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)
+ add_collection_admin {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let new_admin: T::AccountId = account("admin", 0, SEED);
+ }: add_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)
- remove_collection_admin {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let new_admin: T::AccountId = account("admin", 0, SEED);
- Nft::<T>::add_collection_admin(RawOrigin::Signed(caller.clone()).into(), 2, new_admin.clone())?;
- }: remove_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)
+ remove_collection_admin {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let new_admin: T::AccountId = account("admin", 0, SEED);
+ Nft::<T>::add_collection_admin(RawOrigin::Signed(caller.clone()).into(), 2, new_admin.clone())?;
+ }: remove_collection_admin(RawOrigin::Signed(caller.clone()), 2, new_admin)
- set_collection_sponsor {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_collection_sponsor(RawOrigin::Signed(caller.clone()), 2, caller.clone())
+ set_collection_sponsor {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_collection_sponsor(RawOrigin::Signed(caller.clone()), 2, caller.clone())
- confirm_sponsorship {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;
- }: confirm_sponsorship(RawOrigin::Signed(caller.clone()), 2)
+ confirm_sponsorship {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;
+ }: confirm_sponsorship(RawOrigin::Signed(caller.clone()), 2)
- remove_collection_sponsor {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;
- Nft::<T>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), 2)?;
- }: remove_collection_sponsor(RawOrigin::Signed(caller.clone()), 2)
+ remove_collection_sponsor {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ Nft::<T>::set_collection_sponsor(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone())?;
+ Nft::<T>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), 2)?;
+ }: remove_collection_sponsor(RawOrigin::Signed(caller.clone()), 2)
- // nft item
- create_item_nft {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_nft_data();
-
- }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+ // nft item
+ create_item_nft {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_nft_data();
- #[extra]
- create_item_nft_large {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- let mut nft_data = CreateNftData {
- const_data: vec![],
- variable_data: vec![]
- };
- for i in 0..1998 {
- nft_data.const_data.push(10);
- nft_data.variable_data.push(10);
- }
- let data = CreateItemData::NFT(nft_data);
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+
+ #[extra]
+ create_item_nft_large {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ let mut nft_data = CreateNftData {
+ const_data: vec![],
+ variable_data: vec![]
+ };
+ for i in 0..1998 {
+ nft_data.const_data.push(10);
+ nft_data.variable_data.push(10);
+ }
+ let data = CreateItemData::NFT(nft_data);
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+
+ }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
- }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+ // fungible item
+ create_item_fungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::Fungible(3);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_fungible_data();
+
+ }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+
+ // refungible item
+ create_item_refungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_re_fungible_data();
- // fungible item
- create_item_fungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::Fungible(3);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_fungible_data();
+ }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
- }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+ burn_item {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_nft_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- // refungible item
- create_item_refungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_re_fungible_data();
+ }: burn_item(RawOrigin::Signed(caller.clone()), 2, 1)
- }: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
+ transfer_nft {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_nft_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- burn_item {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_nft_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
- }: burn_item(RawOrigin::Signed(caller.clone()), 2, 1)
+ transfer_fungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::Fungible(3);
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_fungible_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- transfer_nft {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_nft_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
- }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
-
- transfer_fungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::Fungible(3);
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_fungible_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ transfer_refungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_re_fungible_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
+ }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
- transfer_refungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_re_fungible_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ approve {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_re_fungible_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- }: transfer(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1, 1)
+ }: approve(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1)
- approve {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_re_fungible_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ // Nft
+ transfer_from_nft {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_nft_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
- }: approve(RawOrigin::Signed(caller.clone()), recipient.clone(), 2, 1)
+ }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
- // Nft
- transfer_from_nft {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_nft_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
+ // Fungible
+ transfer_from_fungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::Fungible(3);
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_fungible_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
- }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
+ }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
- // Fungible
- transfer_from_fungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::Fungible(3);
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_fungible_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
+ // ReFungible
+ transfer_from_refungible {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let recipient: T::AccountId = account("recipient", 0, SEED);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_re_fungible_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
- }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
+ }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
- // ReFungible
- transfer_from_refungible {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let recipient: T::AccountId = account("recipient", 0, SEED);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_re_fungible_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- Nft::<T>::approve(RawOrigin::Signed(caller.clone()).into(), recipient.clone(), 2, 1)?;
+ enable_contract_sponsoring {
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- }: transfer_from(RawOrigin::Signed(caller.clone()), caller.clone(), recipient.clone(), 2, 1, 1)
+ }: enable_contract_sponsoring(RawOrigin::Signed(caller.clone()), caller.clone(), true)
- enable_contract_sponsoring {
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ set_offchain_schema {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: enable_contract_sponsoring(RawOrigin::Signed(caller.clone()), caller.clone(), true)
+ }: set_offchain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
- set_offchain_schema {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ set_const_on_chain_schema {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_const_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
- }: set_offchain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
+ set_variable_on_chain_schema {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::ReFungible(3);
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_variable_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
- set_const_on_chain_schema {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_const_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
-
- set_variable_on_chain_schema {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::ReFungible(3);
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_variable_on_chain_schema(RawOrigin::Signed(caller.clone()), 2, [1,2,3].to_vec())
+ set_variable_meta_data {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let data = default_nft_data();
+ Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
- set_variable_meta_data {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let data = default_nft_data();
- Nft::<T>::create_item(RawOrigin::Signed(caller.clone()).into(), 2, caller.clone(), data)?;
+ }: set_variable_meta_data(RawOrigin::Signed(caller.clone()), 2, 1, [1, 2, 3].to_vec())
- }: set_variable_meta_data(RawOrigin::Signed(caller.clone()), 2, 1, [1, 2, 3].to_vec())
+ set_schema_version {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ }: set_schema_version(RawOrigin::Signed(caller.clone()), 2, SchemaVersion::Unique)
- set_schema_version {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- }: set_schema_version(RawOrigin::Signed(caller.clone()), 2, SchemaVersion::Unique)
+ set_chain_limits {
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ let limits = ChainLimits {
+ collection_numbers_limit: 0,
+ account_token_ownership_limit: 0,
+ collections_admins_limit: 0,
+ custom_data_limit: 0,
+ nft_sponsor_transfer_timeout: 0,
+ fungible_sponsor_transfer_timeout: 0,
+ refungible_sponsor_transfer_timeout: 0
+ };
+ }: set_chain_limits(RawOrigin::Signed(caller.clone()), limits)
- set_chain_limits {
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- let limits = ChainLimits {
- collection_numbers_limit: 0,
- account_token_ownership_limit: 0,
- collections_admins_limit: 0,
- custom_data_limit: 0,
- nft_sponsor_transfer_timeout: 0,
- fungible_sponsor_transfer_timeout: 0,
- refungible_sponsor_transfer_timeout: 0
- };
- }: set_chain_limits(RawOrigin::Signed(caller.clone()), limits)
+ set_contract_sponsoring_rate_limit {
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
+ let block_number: T::BlockNumber = 0.into();
+ }: set_contract_sponsoring_rate_limit(RawOrigin::Signed(caller.clone()), caller.clone(), block_number)
- set_contract_sponsoring_rate_limit {
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- let block_number: T::BlockNumber = 0.into();
- }: set_contract_sponsoring_rate_limit(RawOrigin::Signed(caller.clone()), caller.clone(), block_number)
+ set_collection_limits{
+ let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT;
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
- set_collection_limits{
- let col_name1: Vec<u16> = "Test1".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
- let mode: CollectionMode = CollectionMode::NFT;
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
-
- let cl = CollectionLimits {
- account_token_ownership_limit: 0,
- sponsored_data_size: 0,
- token_limit: 0,
- sponsor_transfer_timeout: 0
- };
+ let cl = CollectionLimits {
+ account_token_ownership_limit: 0,
+ sponsored_data_size: 0,
+ token_limit: 0,
+ sponsor_transfer_timeout: 0
+ };
- }: set_collection_limits(RawOrigin::Signed(caller.clone()), 2, cl)
+ }: set_collection_limits(RawOrigin::Signed(caller.clone()), 2, cl)
- add_to_contract_white_list{
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- }: add_to_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), caller.clone())
+ add_to_contract_white_list{
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ }: add_to_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), caller.clone())
- remove_from_contract_white_list{
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- Nft::<T>::add_to_contract_white_list(RawOrigin::Signed(caller.clone()).into(), caller.clone(), caller.clone())?;
- }: remove_from_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), caller.clone())
+ remove_from_contract_white_list{
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ Nft::<T>::add_to_contract_white_list(RawOrigin::Signed(caller.clone()).into(), caller.clone(), caller.clone())?;
+ }: remove_from_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), caller.clone())
- toggle_contract_white_list{
- let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- }: toggle_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), true)
+ toggle_contract_white_list{
+ let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
+ }: toggle_contract_white_list(RawOrigin::Signed(caller.clone()), caller.clone(), true)
*/
}
pallets/nft/src/default_weights.rsdiffbeforeafterboth--- a/pallets/nft/src/default_weights.rs
+++ b/pallets/nft/src/default_weights.rs
@@ -2,154 +2,154 @@
impl crate::WeightInfo for () {
fn create_collection() -> Weight {
- (70_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(7 as Weight))
- .saturating_add(DbWeight::get().writes(5 as Weight))
+ 70_000_000_u64
+ .saturating_add(DbWeight::get().reads(7_u64))
+ .saturating_add(DbWeight::get().writes(5_u64))
}
fn destroy_collection() -> Weight {
- (90_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(5 as Weight))
+ 90_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(5_u64))
}
fn add_to_white_list() -> Weight {
- (30_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn remove_from_white_list() -> Weight {
- (35_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 30_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn remove_from_white_list() -> Weight {
+ 35_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn set_public_access_mode() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn set_mint_permission() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn change_collection_owner() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn add_collection_admin() -> Weight {
- (32_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 32_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn remove_collection_admin() -> Weight {
- (50_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_collection_sponsor() -> Weight {
- (32_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn confirm_sponsorship() -> Weight {
- (22_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn remove_collection_sponsor() -> Weight {
- (24_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn create_item(s: usize, ) -> Weight {
- (130_000_000 as Weight)
- .saturating_add((2135 as Weight).saturating_mul(s as Weight).saturating_mul(500 as Weight)) // 500 is temporary multiplier, fee for storage
- .saturating_add(DbWeight::get().reads(10 as Weight))
- .saturating_add(DbWeight::get().writes(8 as Weight))
- }
- fn burn_item() -> Weight {
- (170_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(9 as Weight))
- .saturating_add(DbWeight::get().writes(7 as Weight))
- }
- fn transfer() -> Weight {
- (125_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(7 as Weight))
- .saturating_add(DbWeight::get().writes(7 as Weight))
- }
- fn approve() -> Weight {
- (45_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn transfer_from() -> Weight {
- (150_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(9 as Weight))
- .saturating_add(DbWeight::get().writes(8 as Weight))
- }
- fn set_offchain_schema() -> Weight {
- (33_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_const_on_chain_schema() -> Weight {
- (11_100_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_variable_on_chain_schema() -> Weight {
- (11_100_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_variable_meta_data() -> Weight {
- (17_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn enable_contract_sponsoring() -> Weight {
- (13_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_schema_version() -> Weight {
- (8_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_chain_limits() -> Weight {
- (1_300_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_contract_sponsoring_rate_limit() -> Weight {
- (3_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn set_variable_meta_data_sponsoring_rate_limit() -> Weight {
- (3_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn toggle_contract_white_list() -> Weight {
- (3_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn add_to_contract_white_list() -> Weight {
- (3_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn remove_from_contract_white_list() -> Weight {
- (3_200_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn set_collection_limits() -> Weight {
- (8_900_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
+ 50_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_collection_sponsor() -> Weight {
+ 32_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn confirm_sponsorship() -> Weight {
+ 22_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn remove_collection_sponsor() -> Weight {
+ 24_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn create_item(s: usize) -> Weight {
+ 130_000_000_u64
+ .saturating_add(2135_u64.saturating_mul(s as Weight).saturating_mul(500_u64)) // 500 is temporary multiplier, fee for storage
+ .saturating_add(DbWeight::get().reads(10_u64))
+ .saturating_add(DbWeight::get().writes(8_u64))
+ }
+ fn burn_item() -> Weight {
+ 170_000_000_u64
+ .saturating_add(DbWeight::get().reads(9_u64))
+ .saturating_add(DbWeight::get().writes(7_u64))
+ }
+ fn transfer() -> Weight {
+ 125_000_000_u64
+ .saturating_add(DbWeight::get().reads(7_u64))
+ .saturating_add(DbWeight::get().writes(7_u64))
+ }
+ fn approve() -> Weight {
+ 45_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn transfer_from() -> Weight {
+ 150_000_000_u64
+ .saturating_add(DbWeight::get().reads(9_u64))
+ .saturating_add(DbWeight::get().writes(8_u64))
+ }
+ fn set_offchain_schema() -> Weight {
+ 33_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_const_on_chain_schema() -> Weight {
+ 11_100_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_variable_on_chain_schema() -> Weight {
+ 11_100_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_variable_meta_data() -> Weight {
+ 17_500_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn enable_contract_sponsoring() -> Weight {
+ 13_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_schema_version() -> Weight {
+ 8_500_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_chain_limits() -> Weight {
+ 1_300_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_contract_sponsoring_rate_limit() -> Weight {
+ 3_500_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn set_variable_meta_data_sponsoring_rate_limit() -> Weight {
+ 3_500_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn toggle_contract_white_list() -> Weight {
+ 3_000_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn add_to_contract_white_list() -> Weight {
+ 3_000_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn remove_from_contract_white_list() -> Weight {
+ 3_200_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn set_collection_limits() -> Weight {
+ 8_900_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
}
pallets/nft/src/eth/account.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/account.rs
+++ b/pallets/nft/src/eth/account.rs
@@ -8,128 +8,129 @@
use sp_std::vec::Vec;
use sp_std::clone::Clone;
-pub trait CrossAccountId<AccountId>:
- Encode + EncodeLike + Decode +
- Clone + PartialEq + Ord + core::fmt::Debug // +
- // Serialize + Deserialize<'static>
+pub trait CrossAccountId<AccountId>:
+ Encode + EncodeLike + Decode + Clone + PartialEq + Ord + core::fmt::Debug
+// +
+// Serialize + Deserialize<'static>
{
- fn as_sub(&self) -> &AccountId;
- fn as_eth(&self) -> &H160;
+ fn as_sub(&self) -> &AccountId;
+ fn as_eth(&self) -> &H160;
- fn from_sub(account: AccountId) -> Self;
- fn from_eth(account: H160) -> Self;
+ fn from_sub(account: AccountId) -> Self;
+ fn from_eth(account: H160) -> Self;
}
-#[derive(Eq)]
-#[derive(Serialize, Deserialize)]
+#[derive(Eq, Serialize, Deserialize)]
pub struct BasicCrossAccountId<T: Config> {
- /// If true - then ethereum is canonical encoding
- from_ethereum: bool,
- substrate: T::AccountId,
- ethereum: H160,
+ /// If true - then ethereum is canonical encoding
+ from_ethereum: bool,
+ substrate: T::AccountId,
+ ethereum: H160,
}
impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {
- fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
- if self.from_ethereum {
- fmt.debug_tuple("CrossAccountId::Ethereum")
- .field(&self.ethereum)
- .finish()
- } else {
- fmt.debug_tuple("CrossAccountId::Substrate")
- .field(&self.substrate)
- .finish()
- }
- }
+ fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
+ if self.from_ethereum {
+ fmt.debug_tuple("CrossAccountId::Ethereum")
+ .field(&self.ethereum)
+ .finish()
+ } else {
+ fmt.debug_tuple("CrossAccountId::Substrate")
+ .field(&self.substrate)
+ .finish()
+ }
+ }
}
impl<T: Config> PartialOrd for BasicCrossAccountId<T> {
- fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- Some(self.substrate.cmp(&other.substrate))
- }
+ fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+ Some(self.substrate.cmp(&other.substrate))
+ }
}
impl<T: Config> Ord for BasicCrossAccountId<T> {
- fn cmp(&self, other: &Self) -> Ordering {
- self.partial_cmp(other).expect("substrate account is total ordered")
- }
+ fn cmp(&self, other: &Self) -> Ordering {
+ self.partial_cmp(other)
+ .expect("substrate account is total ordered")
+ }
}
impl<T: Config> PartialEq for BasicCrossAccountId<T> {
- fn eq(&self, other: &Self) -> bool {
- if self.from_ethereum == other.from_ethereum {
- self.substrate == other.substrate && self.ethereum == other.ethereum
- } else if self.from_ethereum {
- // ethereum is canonical encoding, but we need to compare derived address
- self.substrate == other.substrate
- } else {
- self.ethereum == other.ethereum
- }
- }
+ fn eq(&self, other: &Self) -> bool {
+ if self.from_ethereum == other.from_ethereum {
+ self.substrate == other.substrate && self.ethereum == other.ethereum
+ } else if self.from_ethereum {
+ // ethereum is canonical encoding, but we need to compare derived address
+ self.substrate == other.substrate
+ } else {
+ self.ethereum == other.ethereum
+ }
+ }
}
impl<T: Config> Clone for BasicCrossAccountId<T> {
- fn clone(&self) -> Self {
- Self {
- from_ethereum: self.from_ethereum,
- substrate: self.substrate.clone(),
- ethereum: self.ethereum,
- }
- }
+ fn clone(&self) -> Self {
+ Self {
+ from_ethereum: self.from_ethereum,
+ substrate: self.substrate.clone(),
+ ethereum: self.ethereum,
+ }
+ }
}
impl<T: Config> Encode for BasicCrossAccountId<T> {
- fn encode(&self) -> Vec<u8> {
- let as_result = if !self.from_ethereum {
- Ok(self.substrate.clone())
- } else {
- Err(self.ethereum)
- };
- as_result.encode()
- }
+ fn encode(&self) -> Vec<u8> {
+ let as_result = if !self.from_ethereum {
+ Ok(self.substrate.clone())
+ } else {
+ Err(self.ethereum)
+ };
+ as_result.encode()
+ }
}
impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}
impl<T: Config> Decode for BasicCrossAccountId<T> {
- fn decode<I>(input: &mut I) -> Result<Self, codec::Error>
- where I: codec::Input
- {
- Ok(match <Result<T::AccountId, H160>>::decode(input)? {
- Ok(s) => Self::from_sub(s),
- Err(e) => Self::from_eth(e),
- })
- }
+ fn decode<I>(input: &mut I) -> Result<Self, codec::Error>
+ where
+ I: codec::Input,
+ {
+ Ok(match <Result<T::AccountId, H160>>::decode(input)? {
+ Ok(s) => Self::from_sub(s),
+ Err(e) => Self::from_eth(e),
+ })
+ }
}
impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {
- fn as_sub(&self) -> &T::AccountId {
- &self.substrate
- }
- fn as_eth(&self) -> &H160 {
- &self.ethereum
- }
- fn from_sub(substrate: T::AccountId) -> Self {
- Self {
- ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),
- substrate,
- from_ethereum: false,
- }
- }
- fn from_eth(ethereum: H160) -> Self {
- Self {
- ethereum,
- substrate: T::EvmAddressMapping::into_account_id(ethereum),
- from_ethereum: true,
- }
- }
+ fn as_sub(&self) -> &T::AccountId {
+ &self.substrate
+ }
+ fn as_eth(&self) -> &H160 {
+ &self.ethereum
+ }
+ fn from_sub(substrate: T::AccountId) -> Self {
+ Self {
+ ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),
+ substrate,
+ from_ethereum: false,
+ }
+ }
+ fn from_eth(ethereum: H160) -> Self {
+ Self {
+ ethereum,
+ substrate: T::EvmAddressMapping::into_account_id(ethereum),
+ from_ethereum: true,
+ }
+ }
}
pub trait EvmBackwardsAddressMapping<AccountId> {
- fn from_account_id(account_id: AccountId) -> H160;
+ fn from_account_id(account_id: AccountId) -> H160;
}
/// Should have same mapping as EnsureAddressTruncated
pub struct MapBackwardsAddressTruncated;
impl EvmBackwardsAddressMapping<AccountId32> for MapBackwardsAddressTruncated {
- fn from_account_id(account_id: AccountId32) -> H160 {
- let mut out = [0; 20];
- out.copy_from_slice(&(account_id.as_ref() as &[u8])[0..20]);
- H160(out)
- }
-}
\ No newline at end of file
+ fn from_account_id(account_id: AccountId32) -> H160 {
+ let mut out = [0; 20];
+ out.copy_from_slice(&(account_id.as_ref() as &[u8])[0..20]);
+ H160(out)
+ }
+}
pallets/nft/src/eth/erc.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/erc.rs
+++ b/pallets/nft/src/eth/erc.rs
@@ -3,132 +3,199 @@
#[solidity_interface]
pub trait InlineNameSymbol {
- type Error;
+ type Error;
- fn name(&self) -> Result<string, Self::Error>;
- fn symbol(&self) -> Result<string, Self::Error>;
+ fn name(&self) -> Result<string, Self::Error>;
+ fn symbol(&self) -> Result<string, Self::Error>;
}
#[solidity_interface]
pub trait InlineTotalSupply {
- type Error;
+ type Error;
- fn total_supply(&self) -> Result<uint256, Self::Error>;
+ fn total_supply(&self) -> Result<uint256, Self::Error>;
}
#[solidity_interface]
pub trait ERC165 {
- type Error;
+ type Error;
- fn supports_interface(&self, interface_id: bytes4) -> Result<bool, Self::Error>;
+ fn supports_interface(&self, interface_id: bytes4) -> Result<bool, Self::Error>;
}
#[solidity_interface(inline_is(InlineNameSymbol))]
pub trait ERC721Metadata {
- type Error;
+ type Error;
- #[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: uint256) -> Result<string, Self::Error>;
+ #[solidity(rename_selector = "tokenURI")]
+ fn token_uri(&self, token_id: uint256) -> Result<string, Self::Error>;
}
#[solidity_interface(inline_is(InlineTotalSupply))]
pub trait ERC721Enumerable {
- type Error;
+ type Error;
- fn token_by_index(&self, index: uint256) -> Result<uint256, Self::Error>;
- fn token_of_owner_by_index(&self, owner: address, index: uint256) -> Result<uint256, Self::Error>;
+ fn token_by_index(&self, index: uint256) -> Result<uint256, Self::Error>;
+ fn token_of_owner_by_index(
+ &self,
+ owner: address,
+ index: uint256,
+ ) -> Result<uint256, Self::Error>;
}
-
#[derive(ToLog)]
pub enum ERC721Events {
- Transfer {
- #[indexed] from: address,
- #[indexed] to: address,
- #[indexed] token_id: uint256,
- },
- Approval {
- #[indexed] owner: address,
- #[indexed] approved: address,
- #[indexed] token_id: uint256,
- },
- #[allow(dead_code)]
- ApprovalForAll {
- #[indexed] owner: address,
- #[indexed] operator: address,
- approved: bool,
- }
+ Transfer {
+ #[indexed]
+ from: address,
+ #[indexed]
+ to: address,
+ #[indexed]
+ token_id: uint256,
+ },
+ Approval {
+ #[indexed]
+ owner: address,
+ #[indexed]
+ approved: address,
+ #[indexed]
+ token_id: uint256,
+ },
+ #[allow(dead_code)]
+ ApprovalForAll {
+ #[indexed]
+ owner: address,
+ #[indexed]
+ operator: address,
+ approved: bool,
+ },
}
#[solidity_interface(is(ERC165), events(ERC721Events))]
pub trait ERC721 {
- type Error;
+ type Error;
- fn balance_of(&self, owner: address) -> Result<uint256, Self::Error>;
- fn owner_of(&self, token_id: uint256) -> Result<address, Self::Error>;
+ fn balance_of(&self, owner: address) -> Result<uint256, Self::Error>;
+ fn owner_of(&self, token_id: uint256) -> Result<address, Self::Error>;
- #[solidity(rename_selector = "safeTransferFrom")]
- fn safe_transfer_from_with_data(&mut self, from: address, to: address, token_id: uint256, data: bytes, value: value) -> Result<void, Self::Error>;
- fn safe_transfer_from(&mut self, from: address, to: address, token_id: uint256, value: value) -> Result<void, Self::Error>;
+ #[solidity(rename_selector = "safeTransferFrom")]
+ fn safe_transfer_from_with_data(
+ &mut self,
+ from: address,
+ to: address,
+ token_id: uint256,
+ data: bytes,
+ value: value,
+ ) -> Result<void, Self::Error>;
+ fn safe_transfer_from(
+ &mut self,
+ from: address,
+ to: address,
+ token_id: uint256,
+ value: value,
+ ) -> Result<void, Self::Error>;
- fn transfer_from(&mut self, caller: caller, from: address, to: address, token_id: uint256, value: value) -> Result<void, Self::Error>;
- fn approve(&mut self, caller: caller, approved: address, token_id: uint256, value: value) -> Result<void, Self::Error>;
- fn set_approval_for_all(&mut self, caller: caller, operator: address, approved: bool) -> Result<void, Self::Error>;
+ fn transfer_from(
+ &mut self,
+ caller: caller,
+ from: address,
+ to: address,
+ token_id: uint256,
+ value: value,
+ ) -> Result<void, Self::Error>;
+ fn approve(
+ &mut self,
+ caller: caller,
+ approved: address,
+ token_id: uint256,
+ value: value,
+ ) -> Result<void, Self::Error>;
+ fn set_approval_for_all(
+ &mut self,
+ caller: caller,
+ operator: address,
+ approved: bool,
+ ) -> Result<void, Self::Error>;
- fn get_approved(&self, token_id: uint256) -> Result<address, Self::Error>;
- fn is_approved_for_all(&self, owner: address, operator: address) -> Result<address, Self::Error>;
+ fn get_approved(&self, token_id: uint256) -> Result<address, Self::Error>;
+ fn is_approved_for_all(
+ &self,
+ owner: address,
+ operator: address,
+ ) -> Result<address, Self::Error>;
}
#[solidity_interface]
pub trait ERC721UniqueExtensions {
- type Error;
+ type Error;
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256, value: value) -> Result<void, Self::Error>;
+ fn transfer(
+ &mut self,
+ caller: caller,
+ to: address,
+ token_id: uint256,
+ value: value,
+ ) -> Result<void, Self::Error>;
}
-#[solidity_interface(is(ERC165, ERC721, ERC721Metadata, ERC721Enumerable, ERC721UniqueExtensions))]
+#[solidity_interface(is(
+ ERC165,
+ ERC721,
+ ERC721Metadata,
+ ERC721Enumerable,
+ ERC721UniqueExtensions
+))]
pub trait UniqueNFT {
- type Error;
+ type Error;
}
#[derive(ToLog)]
pub enum ERC20Events {
- Transfer {
- #[indexed] from: address,
- #[indexed] to: address,
- value: uint256,
- },
- Approval {
- #[indexed] owner: address,
- #[indexed] spender: address,
- value: uint256,
- }
+ Transfer {
+ #[indexed]
+ from: address,
+ #[indexed]
+ to: address,
+ value: uint256,
+ },
+ Approval {
+ #[indexed]
+ owner: address,
+ #[indexed]
+ spender: address,
+ value: uint256,
+ },
}
#[solidity_interface(inline_is(InlineNameSymbol, InlineTotalSupply), events(ERC20Events))]
pub trait ERC20 {
- type Error;
-
- fn decimals(&self) -> Result<uint8, Self::Error>;
- fn balance_of(&self, owner: address) -> Result<uint256, Self::Error>;
- fn transfer(&mut self, caller: caller, to: address, value: uint256) -> Result<bool, Self::Error>;
- fn transfer_from(&mut self, caller: caller, from: address, to: address, value: uint256) -> Result<bool, Self::Error>;
- fn approve(&mut self, caller: caller, spender: address, value: uint256) -> Result<bool, Self::Error>;
- fn allowance(&self, owner: address, spender: address) -> Result<uint256, Self::Error>;
+ type Error;
+
+ fn decimals(&self) -> Result<uint8, Self::Error>;
+ fn balance_of(&self, owner: address) -> Result<uint256, Self::Error>;
+ fn transfer(
+ &mut self,
+ caller: caller,
+ to: address,
+ value: uint256,
+ ) -> Result<bool, Self::Error>;
+ fn transfer_from(
+ &mut self,
+ caller: caller,
+ from: address,
+ to: address,
+ value: uint256,
+ ) -> Result<bool, Self::Error>;
+ fn approve(
+ &mut self,
+ caller: caller,
+ spender: address,
+ value: uint256,
+ ) -> Result<bool, Self::Error>;
+ fn allowance(&self, owner: address, spender: address) -> Result<uint256, Self::Error>;
}
#[solidity_interface(is(ERC165, ERC20))]
pub trait UniqueFungible {
- type Error;
+ type Error;
}
-
-/// Runtime metadata like helpers for evm
-#[solidity_interface]
-trait UniqueHelpers {
- type Error;
-
- /// Returns interface for NFT collections
- fn nft_interface(&self) -> Result<string, Self::Error>;
- /// Returns interface for Fungible collections
- fn fungible_interface(&self) -> Result<string, Self::Error>;
-}
\ No newline at end of file
pallets/nft/src/eth/erc_impl.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/erc_impl.rs
+++ b/pallets/nft/src/eth/erc_impl.rs
@@ -56,7 +56,7 @@
Ok(index)
}
- fn token_of_owner_by_index(&self, owner: address, index: uint256) -> Result<uint256> {
+ fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -77,7 +77,7 @@
fn owner_of(&self, token_id: uint256) -> Result<address> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let token = <NftItemList<T>>::get(self.id, token_id).ok_or("unknown token")?;
- Ok(token.owner.as_eth().clone())
+ Ok(*token.owner.as_eth())
}
fn safe_transfer_from_with_data(
&mut self,
@@ -170,7 +170,7 @@
caller: caller,
to: address,
token_id: uint256,
- value: value,
+ _value: value,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
pallets/nft/src/eth/log.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/log.rs
+++ b/pallets/nft/src/eth/log.rs
@@ -1,19 +1,19 @@
use sp_std::cell::RefCell;
use sp_std::vec::Vec;
-use sp_core::{H160, H256};
+
use ethereum::Log;
#[derive(Default)]
pub struct LogRecorder(RefCell<Vec<Log>>);
impl LogRecorder {
- pub fn is_empty(&self) -> bool {
- self.0.borrow().is_empty()
- }
- pub fn log(&self, log: Log) {
- self.0.borrow_mut().push(log);
- }
- pub fn retrieve_logs(self) -> Vec<Log> {
- self.0.into_inner()
- }
+ pub fn is_empty(&self) -> bool {
+ self.0.borrow().is_empty()
+ }
+ pub fn log(&self, log: Log) {
+ self.0.borrow_mut().push(log);
+ }
+ pub fn retrieve_logs(self) -> Vec<Log> {
+ self.0.into_inner()
+ }
}
pallets/nft/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/mod.rs
+++ b/pallets/nft/src/eth/mod.rs
@@ -28,7 +28,7 @@
];
fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {
- if ð[0..16] != ETH_ACCOUNT_PREFIX {
+ if eth[0..16] != ETH_ACCOUNT_PREFIX {
return None;
}
let mut id_bytes = [0; 4];
@@ -92,12 +92,9 @@
},
)?))
}
- _ => {
- return Err(StringError::from(
- "erc calls only supported to fungible and nft collections for now",
- )
- .into())
- }
+ _ => Err(StringError::from(
+ "erc calls only supported to fungible and nft collections for now",
+ )),
}
}
@@ -156,11 +153,10 @@
// TODO: This function is slow, and output can be memoized
pub fn generate_transaction(collection_id: u32, chain_id: u64) -> ethereum::Transaction {
- let contract = collection_id_to_address(collection_id);
-
// FIXME: Can be done on wasm runtime with https://github.com/paritytech/substrate/pull/8728
#[cfg(feature = "std")]
{
+ let contract = collection_id_to_address(collection_id);
let signed = ethereum_tx_sign::RawTransaction {
nonce: 0.into(),
to: Some(contract.0.into()),
@@ -183,6 +179,6 @@
}
#[cfg(not(feature = "std"))]
{
- panic!("transaction generation not yet supported by wasm runtime")
+ panic!("transaction generation not yet supported by wasm runtime while generating transaction for collection_id {}, chain_id {}", collection_id, chain_id)
}
}
pallets/nft/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/sponsoring.rs
+++ b/pallets/nft/src/eth/sponsoring.rs
@@ -1,142 +1,170 @@
//! Implements EVM sponsoring logic via OnChargeEVMTransaction
-use crate::{Collection, ChainLimit, CollectionById, Config, NftTransferBasket, FungibleTransferBasket, eth::account::EvmBackwardsAddressMapping};
+use crate::{
+ Collection, ChainLimit, CollectionById, Config, NftTransferBasket, FungibleTransferBasket,
+ eth::account::EvmBackwardsAddressMapping,
+};
use evm_coder::abi::AbiReader;
-use frame_support::{storage::{StorageMap, StorageDoubleMap, StorageValue}, traits::Currency};
+use frame_support::{
+ storage::{StorageMap, StorageDoubleMap, StorageValue},
+ traits::Currency,
+};
use pallet_evm::{EVMCurrencyAdapter, WithdrawReason};
use sp_core::{H160, U256};
use sp_std::prelude::*;
-use super::{account::CrossAccountId, erc::{UniqueFungibleCall, UniqueNFTCall, ERC721Call, ERC20Call, ERC721UniqueExtensionsCall}};
+use super::{
+ account::CrossAccountId,
+ erc::{UniqueFungibleCall, UniqueNFTCall, ERC721Call, ERC20Call, ERC721UniqueExtensionsCall},
+};
use core::convert::TryInto;
type NegativeImbalanceOf<C, T> =
- <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+ <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
pub struct ChargeEvmTransaction;
pub struct ChargeEvmLiquidityInfo<T>
where
- T: Config,
- T: pallet_evm::Config,
+ T: Config,
+ T: pallet_evm::Config,
{
- who: H160,
- negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,
+ who: H160,
+ negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,
}
struct AnyError;
-fn try_sponsor<T: Config>(caller: &H160, collection_id: u32, collection: &Collection<T>, call: &[u8]) -> Result<(), AnyError> {
- let (method_id, mut reader) = AbiReader::new_call(call).map_err(|_| AnyError)?;
- match &collection.mode {
- crate::CollectionMode::NFT => {
- let call: UniqueNFTCall = UniqueNFTCall::parse(method_id, &mut reader).map_err(|_| AnyError)?.ok_or(AnyError)?;
- match call {
- UniqueNFTCall::ERC721UniqueExtensions(ERC721UniqueExtensionsCall::Transfer {token_id, ..}) | UniqueNFTCall::ERC721(ERC721Call::TransferFrom {token_id, ..}) => {
- let token_id: u32 = token_id.try_into().map_err(|_| AnyError)?;
- let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
- let collection_limits = &collection.limits;
- let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
- collection_limits.sponsor_transfer_timeout
- } else {
- ChainLimit::get().nft_sponsor_transfer_timeout
- };
+fn try_sponsor<T: Config>(
+ caller: &H160,
+ collection_id: u32,
+ collection: &Collection<T>,
+ call: &[u8],
+) -> Result<(), AnyError> {
+ let (method_id, mut reader) = AbiReader::new_call(call).map_err(|_| AnyError)?;
+ match &collection.mode {
+ crate::CollectionMode::NFT => {
+ let call: UniqueNFTCall = UniqueNFTCall::parse(method_id, &mut reader)
+ .map_err(|_| AnyError)?
+ .ok_or(AnyError)?;
+ match call {
+ UniqueNFTCall::ERC721UniqueExtensions(ERC721UniqueExtensionsCall::Transfer {
+ token_id,
+ ..
+ })
+ | UniqueNFTCall::ERC721(ERC721Call::TransferFrom { token_id, .. }) => {
+ let token_id: u32 = token_id.try_into().map_err(|_| AnyError)?;
+ let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
+ let collection_limits = &collection.limits;
+ let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
+ collection_limits.sponsor_transfer_timeout
+ } else {
+ ChainLimit::get().nft_sponsor_transfer_timeout
+ };
- let mut sponsor = true;
- if <NftTransferBasket<T>>::contains_key(collection_id, token_id) {
- let last_tx_block = <NftTransferBasket<T>>::get(collection_id, token_id);
- let limit_time = last_tx_block + limit.into();
- if block_number <= limit_time {
- sponsor = false;
- }
- }
- if sponsor {
- <NftTransferBasket<T>>::insert(collection_id, token_id, block_number);
- return Ok(())
- }
- },
- _ => {},
- }
- },
- crate::CollectionMode::Fungible(_) => {
- let call: UniqueFungibleCall = UniqueFungibleCall::parse(method_id, &mut reader).map_err(|_| AnyError)?.ok_or(AnyError)?;
- match call {
- UniqueFungibleCall::ERC20(ERC20Call::Transfer {..}) => {
- let who = T::CrossAccountId::from_eth(caller.clone());
- let collection_limits = &collection.limits;
- let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
- collection_limits.sponsor_transfer_timeout
- } else {
- ChainLimit::get().fungible_sponsor_transfer_timeout
- };
+ let mut sponsor = true;
+ if <NftTransferBasket<T>>::contains_key(collection_id, token_id) {
+ let last_tx_block = <NftTransferBasket<T>>::get(collection_id, token_id);
+ let limit_time = last_tx_block + limit.into();
+ if block_number <= limit_time {
+ sponsor = false;
+ }
+ }
+ if sponsor {
+ <NftTransferBasket<T>>::insert(collection_id, token_id, block_number);
+ return Ok(());
+ }
+ }
+ _ => {}
+ }
+ }
+ crate::CollectionMode::Fungible(_) => {
+ let call: UniqueFungibleCall = UniqueFungibleCall::parse(method_id, &mut reader)
+ .map_err(|_| AnyError)?
+ .ok_or(AnyError)?;
+ #[allow(clippy::single_match)]
+ match call {
+ UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {
+ let who = T::CrossAccountId::from_eth(*caller);
+ let collection_limits = &collection.limits;
+ let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
+ collection_limits.sponsor_transfer_timeout
+ } else {
+ ChainLimit::get().fungible_sponsor_transfer_timeout
+ };
- let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
- let mut sponsored = true;
- if <FungibleTransferBasket<T>>::contains_key(collection_id, who.as_sub()) {
- let last_tx_block = <FungibleTransferBasket<T>>::get(collection_id, who.as_sub());
- let limit_time = last_tx_block + limit.into();
- if block_number <= limit_time {
- sponsored = false;
- }
- }
- if sponsored {
- <FungibleTransferBasket<T>>::insert(collection_id, who.as_sub(), block_number);
- return Ok(())
- }
- },
- _ => {},
- }
- },
- _ => {},
- }
- return Err(AnyError)
+ let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
+ let mut sponsored = true;
+ if <FungibleTransferBasket<T>>::contains_key(collection_id, who.as_sub()) {
+ let last_tx_block =
+ <FungibleTransferBasket<T>>::get(collection_id, who.as_sub());
+ let limit_time = last_tx_block + limit.into();
+ if block_number <= limit_time {
+ sponsored = false;
+ }
+ }
+ if sponsored {
+ <FungibleTransferBasket<T>>::insert(
+ collection_id,
+ who.as_sub(),
+ block_number,
+ );
+ return Ok(());
+ }
+ }
+ _ => {}
+ }
+ }
+ _ => {}
+ }
+ Err(AnyError)
}
impl<T> pallet_evm::OnChargeEVMTransaction<T> for ChargeEvmTransaction
where
- T: Config,
- T: pallet_evm::Config,
+ T: Config,
+ T: pallet_evm::Config,
{
- type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
+ type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
- fn withdraw_fee(
- who: &H160,
- reason: WithdrawReason,
- fee: U256,
- ) -> Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
- let mut who_pays_fee = *who;
- if let WithdrawReason::Call { target, input } = &reason {
- if let Some(collection_id) = crate::eth::map_eth_to_id(&target) {
- if let Some(collection) = <CollectionById<T>>::get(collection_id) {
- if let Some(sponsor) = collection.sponsorship.sponsor() {
- if try_sponsor(who, collection_id, &collection, &input).is_ok() {
- who_pays_fee =
- T::EvmBackwardsAddressMapping::from_account_id(sponsor.clone());
- }
- }
- }
- }
- }
+ fn withdraw_fee(
+ who: &H160,
+ reason: WithdrawReason,
+ fee: U256,
+ ) -> Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
+ let mut who_pays_fee = *who;
+ if let WithdrawReason::Call { target, input } = &reason {
+ if let Some(collection_id) = crate::eth::map_eth_to_id(&target) {
+ if let Some(collection) = <CollectionById<T>>::get(collection_id) {
+ if let Some(sponsor) = collection.sponsorship.sponsor() {
+ if try_sponsor(who, collection_id, &collection, &input).is_ok() {
+ who_pays_fee =
+ T::EvmBackwardsAddressMapping::from_account_id(sponsor.clone());
+ }
+ }
+ }
+ }
+ }
- // TODO: Pay fee from substrate address
- let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
- &who_pays_fee,
- reason,
- fee,
- )?;
- Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
- who: who_pays_fee,
- negative_imbalance: i,
- }))
- }
+ // TODO: Pay fee from substrate address
+ let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
+ &who_pays_fee,
+ reason,
+ fee,
+ )?;
+ Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
+ who: who_pays_fee,
+ negative_imbalance: i,
+ }))
+ }
- fn correct_and_deposit_fee(
- who: &H160,
- corrected_fee: U256,
- already_withdrawn: Self::LiquidityInfo,
- ) -> Result<(), pallet_evm::Error<T>> {
- EVMCurrencyAdapter::<<T as Config>::Currency, ()>::correct_and_deposit_fee(
- &already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),
- corrected_fee,
- already_withdrawn.map(|e| e.negative_imbalance),
- )
- }
+ fn correct_and_deposit_fee(
+ who: &H160,
+ corrected_fee: U256,
+ already_withdrawn: Self::LiquidityInfo,
+ ) -> Result<(), pallet_evm::Error<T>> {
+ EVMCurrencyAdapter::<<T as Config>::Currency, ()>::correct_and_deposit_fee(
+ &already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),
+ corrected_fee,
+ already_withdrawn.map(|e| e.negative_imbalance),
+ )
+ }
}
pallets/nft/src/lib.rsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56#![recursion_limit = "1024"]78#![cfg_attr(not(feature = "std"), no_std)]910extern crate alloc;1112pub use serde::{Serialize, Deserialize};1314pub use frame_support::{15 construct_runtime, decl_event, decl_module, decl_storage, decl_error,16 dispatch::DispatchResult,17 ensure, fail, parameter_types,18 traits::{19 Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,20 Randomness, IsSubType, WithdrawReasons,21 },22 weights::{23 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},24 DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,25 WeightToFeePolynomial, DispatchClass,26 },27 StorageValue,28 transactional,29};3031use frame_system::{self as system, ensure_signed, ensure_root};32use sp_core::H160;33use sp_runtime::sp_std::prelude::Vec;34use core::ops::{Deref, DerefMut};35use core::cell::RefCell;36use nft_data_structs::{37 MAX_DECIMAL_POINTS, MAX_SPONSOR_TIMEOUT, MAX_TOKEN_OWNERSHIP, MAX_REFUNGIBLE_PIECES,38 AccessMode, ChainLimits, Collection, CreateItemData, CollectionLimits,39 CollectionId, CollectionMode, TokenId, 40 SchemaVersion, SponsorshipState, Ownership,41 NftItemType, FungibleItemType, ReFungibleItemType42};43use pallet_ethereum::EthereumTransactionSender;4445#[cfg(test)]46mod mock;4748#[cfg(test)]49mod tests;5051mod default_weights;52mod eth;53mod sponsorship;54pub use sponsorship::NftSponsorshipHandler;5556pub use eth::NftErcSupport;57pub use eth::account::*;58use eth::erc::{ERC20Events, ERC721Events};5960#[cfg(feature = "runtime-benchmarks")]61mod benchmarking;6263pub trait WeightInfo {64 fn create_collection() -> Weight;65 fn destroy_collection() -> Weight;66 fn add_to_white_list() -> Weight;67 fn remove_from_white_list() -> Weight;68 fn set_public_access_mode() -> Weight;69 fn set_mint_permission() -> Weight;70 fn change_collection_owner() -> Weight;71 fn add_collection_admin() -> Weight;72 fn remove_collection_admin() -> Weight;73 fn set_collection_sponsor() -> Weight;74 fn confirm_sponsorship() -> Weight;75 fn remove_collection_sponsor() -> Weight;76 fn create_item(s: usize) -> Weight;77 fn burn_item() -> Weight;78 fn transfer() -> Weight;79 fn approve() -> Weight;80 fn transfer_from() -> Weight;81 fn set_offchain_schema() -> Weight;82 fn set_const_on_chain_schema() -> Weight;83 fn set_variable_on_chain_schema() -> Weight;84 fn set_variable_meta_data() -> Weight;85 fn enable_contract_sponsoring() -> Weight;86 fn set_schema_version() -> Weight;87 fn set_chain_limits() -> Weight;88 fn set_contract_sponsoring_rate_limit() -> Weight;89 fn set_variable_meta_data_sponsoring_rate_limit() -> Weight;90 fn toggle_contract_white_list() -> Weight;91 fn add_to_contract_white_list() -> Weight;92 fn remove_from_contract_white_list() -> Weight;93 fn set_collection_limits() -> Weight;94}9596decl_error! {97 /// Error for non-fungible-token module.98 pub enum Error for Module<T: Config> {99 /// Total collections bound exceeded.100 TotalCollectionsLimitExceeded,101 /// Decimal_points parameter must be lower than MAX_DECIMAL_POINTS constant, currently it is 30.102 CollectionDecimalPointLimitExceeded, 103 /// Collection name can not be longer than 63 char.104 CollectionNameLimitExceeded, 105 /// Collection description can not be longer than 255 char.106 CollectionDescriptionLimitExceeded, 107 /// Token prefix can not be longer than 15 char.108 CollectionTokenPrefixLimitExceeded,109 /// This collection does not exist.110 CollectionNotFound,111 /// Item not exists.112 TokenNotFound,113 /// Admin not found114 AdminNotFound,115 /// Arithmetic calculation overflow.116 NumOverflow, 117 /// Account already has admin role.118 AlreadyAdmin, 119 /// You do not own this collection.120 NoPermission,121 /// This address is not set as sponsor, use setCollectionSponsor first.122 ConfirmUnsetSponsorFail,123 /// Collection is not in mint mode.124 PublicMintingNotAllowed,125 /// Sender parameter and item owner must be equal.126 MustBeTokenOwner,127 /// Item balance not enough.128 TokenValueTooLow,129 /// Size of item is too large.130 NftSizeLimitExceeded,131 /// No approve found132 ApproveNotFound,133 /// Requested value more than approved.134 TokenValueNotEnough,135 /// Only approved addresses can call this method.136 ApproveRequired,137 /// Address is not in white list.138 AddresNotInWhiteList,139 /// Number of collection admins bound exceeded.140 CollectionAdminsLimitExceeded,141 /// Owned tokens by a single address bound exceeded.142 AddressOwnershipLimitExceeded,143 /// Length of items properties must be greater than 0.144 EmptyArgument,145 /// const_data exceeded data limit.146 TokenConstDataLimitExceeded,147 /// variable_data exceeded data limit.148 TokenVariableDataLimitExceeded,149 /// Not NFT item data used to mint in NFT collection.150 NotNftDataUsedToMintNftCollectionToken,151 /// Not Fungible item data used to mint in Fungible collection.152 NotFungibleDataUsedToMintFungibleCollectionToken,153 /// Not Re Fungible item data used to mint in Re Fungible collection.154 NotReFungibleDataUsedToMintReFungibleCollectionToken,155 /// Unexpected collection type.156 UnexpectedCollectionType,157 /// Can't store metadata in fungible tokens.158 CantStoreMetadataInFungibleTokens,159 /// Collection token limit exceeded160 CollectionTokenLimitExceeded,161 /// Account token limit exceeded per collection162 AccountTokenLimitExceeded,163 /// Collection limit bounds per collection exceeded164 CollectionLimitBoundsExceeded,165 /// Tried to enable permissions which are only permitted to be disabled166 OwnerPermissionsCantBeReverted,167 /// Schema data size limit bound exceeded168 SchemaDataLimitExceeded,169 /// Maximum refungibility exceeded170 WrongRefungiblePieces,171 /// createRefungible should be called with one owner172 BadCreateRefungibleCall,173 /// Gas limit exceeded174 OutOfGas,175 }176}177178pub struct CollectionHandle<T: Config> {179 pub id: CollectionId,180 collection: Collection<T>,181 logs: eth::log::LogRecorder,182 evm_address: H160,183 gas_limit: RefCell<u64>,184}185impl<T: Config> CollectionHandle<T> {186 pub fn get_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {187 <CollectionById<T>>::get(id)188 .map(|collection| Self {189 id,190 collection,191 logs: eth::log::LogRecorder::default(),192 evm_address: eth::collection_id_to_address(id),193 gas_limit: RefCell::new(gas_limit),194 })195 }196 pub fn get(id: CollectionId) -> Option<Self> {197 Self::get_with_gas_limit(id, u64::MAX)198 }199 pub fn gas_left(&self) -> u64 {200 *self.gas_limit.borrow()201 }202 pub fn consume_gas(&self, gas: u64) -> DispatchResult {203 let mut gas_limit = self.gas_limit.borrow_mut();204 if *gas_limit < gas {205 fail!(Error::<T>::OutOfGas);206 }207 *gas_limit -= gas;208 Ok(())209 }210 pub fn log(&self, log: impl evm_coder::ToLog) {211 self.logs.log(log.to_log(self.evm_address))212 }213 pub fn into_inner(self) -> Collection<T> {214 self.collection.clone()215 }216}217impl<T: Config> Deref for CollectionHandle<T> {218 type Target = Collection<T>;219220 fn deref(&self) -> &Self::Target {221 &self.collection222 }223}224225impl<T: Config> DerefMut for CollectionHandle<T> {226 fn deref_mut(&mut self) -> &mut Self::Target {227 &mut self.collection228 }229}230231pub trait Config: system::Config + Sized {232 type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;233234 /// Weight information for extrinsics in this pallet.235 type WeightInfo: WeightInfo;236237 type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;238 type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;239240 type CrossAccountId: CrossAccountId<Self::AccountId>;241 type Currency: Currency<Self::AccountId>;242 type CollectionCreationPrice: Get<<<Self as Config>::Currency as Currency<Self::AccountId>>::Balance>;243 type TreasuryAccountId: Get<Self::AccountId>;244245 type EthereumChainId: Get<u64>;246 type EthereumTransactionSender: pallet_ethereum::EthereumTransactionSender;247}248249// # Used definitions250//251// ## User control levels252//253// chain-controlled - key is uncontrolled by user254// i.e autoincrementing index255// can use non-cryptographic hash256// real - key is controlled by user257// but it is hard to generate enough colliding values, i.e owner of signed txs258// can use non-cryptographic hash259// controlled - key is completly controlled by users260// i.e maps with mutable keys261// should use cryptographic hash262//263// ## User control level downgrade reasons264//265// ?1 - chain-controlled -> controlled266// collections/tokens can be destroyed, resulting in massive holes267// ?2 - chain-controlled -> controlled268// same as ?1, but can be only added, resulting in easier exploitation269// ?3 - real -> controlled270// no confirmation required, so addresses can be easily generated271decl_storage! {272 trait Store for Module<T: Config> as Nft {273274 //#region Private members275 /// Id of next collection276 CreatedCollectionCount: u32;277 /// Used for migrations278 ChainVersion: u64;279 /// Id of last collection token280 /// Collection id (controlled?1)281 ItemListIndex: map hasher(blake2_128_concat) CollectionId => TokenId;282 //#endregion283284 //#region Chain limits struct285 pub ChainLimit get(fn chain_limit) config(): ChainLimits;286 //#endregion287288 //#region Bound counters289 /// Amount of collections destroyed, used for total amount tracking with290 /// CreatedCollectionCount291 DestroyedCollectionCount: u32;292 /// Total amount of account owned tokens (NFTs + RFTs + unique fungibles)293 /// Account id (real)294 pub AccountItemCount get(fn account_item_count): map hasher(twox_64_concat) T::AccountId => u32;295 //#endregion296297 //#region Basic collections298 /// Collection info299 /// Collection id (controlled?1)300 pub CollectionById get(fn collection_id) config(): map hasher(blake2_128_concat) CollectionId => Option<Collection<T>> = None;301 /// List of collection admins302 /// Collection id (controlled?2)303 pub AdminList get(fn admin_list_collection): map hasher(blake2_128_concat) CollectionId => Vec<T::CrossAccountId>;304 /// Whitelisted collection users305 /// Collection id (controlled?2), user id (controlled?3)306 pub WhiteList get(fn white_list): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) T::AccountId => bool;307 //#endregion308309 /// How many of collection items user have310 /// Collection id (controlled?2), account id (real)311 pub Balance get(fn balance_count): double_map hasher(blake2_128_concat) CollectionId, hasher(twox_64_concat) T::AccountId => u128;312313 /// Amount of items which spender can transfer out of owners account (via transferFrom)314 /// Collection id (controlled?2), (token id (controlled ?2) + owner account id (real) + spender account id (controlled?3))315 /// TODO: Off chain worker should remove from this map when token gets removed316 pub Allowances get(fn approved): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) (TokenId, T::AccountId, T::AccountId) => u128;317318 //#region Item collections319 /// Collection id (controlled?2), token id (controlled?1)320 pub NftItemList get(fn nft_item_id) config(): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) TokenId => Option<NftItemType<T::CrossAccountId>>;321 /// Collection id (controlled?2), owner (controlled?2)322 pub FungibleItemList get(fn fungible_item_id) config(): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) T::AccountId => FungibleItemType;323 /// Collection id (controlled?2), token id (controlled?1)324 pub ReFungibleItemList get(fn refungible_item_id) config(): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) TokenId => Option<ReFungibleItemType<T::CrossAccountId>>;325 //#endregion326327 //#region Index list328 /// Collection id (controlled?2), tokens owner (controlled?2)329 pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) T::AccountId => Vec<TokenId>;330 //#endregion331332 //#region Tokens transfer rate limit baskets333 /// (Collection id (controlled?2), who created (real))334 /// TODO: Off chain worker should remove from this map when collection gets removed335 pub CreateItemBasket get(fn create_item_basket): map hasher(blake2_128_concat) (CollectionId, T::AccountId) => T::BlockNumber;336 /// Collection id (controlled?2), token id (controlled?2)337 pub NftTransferBasket get(fn nft_transfer_basket): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) TokenId => T::BlockNumber;338 /// Collection id (controlled?2), owning user (real)339 pub FungibleTransferBasket get(fn fungible_transfer_basket): double_map hasher(blake2_128_concat) CollectionId, hasher(twox_64_concat) T::AccountId => T::BlockNumber;340 /// Collection id (controlled?2), token id (controlled?2)341 pub ReFungibleTransferBasket get(fn refungible_transfer_basket): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) TokenId => T::BlockNumber;342 //#endregion343344 /// Variable metadata sponsoring345 /// Collection id (controlled?2), token id (controlled?2)346 pub VariableMetaDataBasket get(fn variable_meta_data_basket): double_map hasher(blake2_128_concat) CollectionId, hasher(blake2_128_concat) TokenId => Option<T::BlockNumber> = None;347 }348 add_extra_genesis {349 build(|config: &GenesisConfig<T>| {350 // Modification of storage351 for (_num, _c) in &config.collection_id {352 <Module<T>>::init_collection(_c);353 }354355 for (_num, _c, _i) in &config.nft_item_id {356 <Module<T>>::init_nft_token(*_c, _i);357 }358359 for (collection_id, account_id, fungible_item) in &config.fungible_item_id {360 <Module<T>>::init_fungible_token(*collection_id, &T::CrossAccountId::from_sub(account_id.clone()), fungible_item);361 }362363 for (_num, _c, _i) in &config.refungible_item_id {364 <Module<T>>::init_refungible_token(*_c, _i);365 }366 })367 }368}369370decl_event!(371 pub enum Event<T>372 where373 AccountId = <T as frame_system::Config>::AccountId,374 CrossAccountId = <T as Config>::CrossAccountId,375 {376 /// New collection was created377 /// 378 /// # Arguments379 /// 380 /// * collection_id: Globally unique identifier of newly created collection.381 /// 382 /// * mode: [CollectionMode] converted into u8.383 /// 384 /// * account_id: Collection owner.385 CollectionCreated(CollectionId, u8, AccountId),386387 /// New item was created.388 /// 389 /// # Arguments390 /// 391 /// * collection_id: Id of the collection where item was created.392 /// 393 /// * item_id: Id of an item. Unique within the collection.394 ///395 /// * recipient: Owner of newly created item 396 ItemCreated(CollectionId, TokenId, CrossAccountId),397398 /// Collection item was burned.399 /// 400 /// # Arguments401 /// 402 /// collection_id.403 /// 404 /// item_id: Identifier of burned NFT.405 ItemDestroyed(CollectionId, TokenId),406407 /// Item was transferred408 ///409 /// * collection_id: Id of collection to which item is belong410 ///411 /// * item_id: Id of an item412 ///413 /// * sender: Original owner of item414 ///415 /// * recipient: New owner of item416 ///417 /// * amount: Always 1 for NFT418 Transfer(CollectionId, TokenId, CrossAccountId, CrossAccountId, u128),419420 /// * collection_id421 ///422 /// * item_id423 ///424 /// * sender425 ///426 /// * spender427 ///428 /// * amount429 Approved(CollectionId, TokenId, CrossAccountId, CrossAccountId, u128),430 }431);432433decl_module! {434 pub struct Module<T: Config> for enum Call 435 where 436 origin: T::Origin437 {438 fn deposit_event() = default;439 type Error = Error<T>;440441 fn on_initialize(_now: T::BlockNumber) -> Weight {442 0443 }444445 /// This method creates a Collection of NFTs. Each Token may have multiple properties encoded as an array of bytes of certain length. The initial owner and admin of the collection are set to the address that signed the transaction. Both addresses can be changed later.446 /// 447 /// # Permissions448 /// 449 /// * Anyone.450 /// 451 /// # Arguments452 /// 453 /// * collection_name: UTF-16 string with collection name (limit 64 characters), will be stored as zero-terminated.454 /// 455 /// * collection_description: UTF-16 string with collection description (limit 256 characters), will be stored as zero-terminated.456 /// 457 /// * token_prefix: UTF-8 string with token prefix.458 /// 459 /// * mode: [CollectionMode] collection type and type dependent data.460 // returns collection ID461 #[weight = <T as Config>::WeightInfo::create_collection()]462 #[transactional]463 pub fn create_collection(origin,464 collection_name: Vec<u16>,465 collection_description: Vec<u16>,466 token_prefix: Vec<u8>,467 mode: CollectionMode) -> DispatchResult {468469 // Anyone can create a collection470 let who = ensure_signed(origin)?;471472 // Take a (non-refundable) deposit of collection creation473 let mut imbalance = <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();474 imbalance.subsume(<<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(475 &T::TreasuryAccountId::get(),476 T::CollectionCreationPrice::get(),477 ));478 <T as Config>::Currency::settle(479 &who,480 imbalance,481 WithdrawReasons::TRANSFER,482 ExistenceRequirement::KeepAlive,483 ).map_err(|_| Error::<T>::NoPermission)?;484485 let decimal_points = match mode {486 CollectionMode::Fungible(points) => points,487 _ => 0488 };489490 let chain_limit = ChainLimit::get();491492 let created_count = CreatedCollectionCount::get();493 let destroyed_count = DestroyedCollectionCount::get();494495 // bound Total number of collections496 ensure!(created_count - destroyed_count < chain_limit.collection_numbers_limit, Error::<T>::TotalCollectionsLimitExceeded);497498 // check params499 ensure!(decimal_points <= MAX_DECIMAL_POINTS, Error::<T>::CollectionDecimalPointLimitExceeded);500 ensure!(collection_name.len() <= 64, Error::<T>::CollectionNameLimitExceeded);501 ensure!(collection_description.len() <= 256, Error::<T>::CollectionDescriptionLimitExceeded);502 ensure!(token_prefix.len() <= 16, Error::<T>::CollectionTokenPrefixLimitExceeded);503504 // Generate next collection ID505 let next_id = created_count506 .checked_add(1)507 .ok_or(Error::<T>::NumOverflow)?;508509 CreatedCollectionCount::put(next_id);510511 let limits = CollectionLimits {512 sponsored_data_size: chain_limit.custom_data_limit,513 ..Default::default()514 };515516 // Create new collection517 let new_collection = Collection {518 owner: who.clone(),519 name: collection_name,520 mode: mode.clone(),521 mint_mode: false,522 access: AccessMode::Normal,523 description: collection_description,524 decimal_points: decimal_points,525 token_prefix: token_prefix,526 offchain_schema: Vec::new(),527 schema_version: SchemaVersion::ImageURL,528 sponsorship: SponsorshipState::Disabled,529 variable_on_chain_schema: Vec::new(),530 const_on_chain_schema: Vec::new(),531 limits,532 };533534 // Add new collection to map535 <CollectionById<T>>::insert(next_id, new_collection);536537 // call event538 Self::deposit_event(RawEvent::CollectionCreated(next_id, mode.into(), who));539540 Ok(())541 }542543 /// **DANGEROUS**: Destroys collection and all NFTs within this collection. Users irrecoverably lose their assets and may lose real money.544 /// 545 /// # Permissions546 /// 547 /// * Collection Owner.548 /// 549 /// # Arguments550 /// 551 /// * collection_id: collection to destroy.552 #[weight = <T as Config>::WeightInfo::destroy_collection()]553 #[transactional]554 pub fn destroy_collection(origin, collection_id: CollectionId) -> DispatchResult {555556 let sender = ensure_signed(origin)?;557 let collection = Self::get_collection(collection_id)?;558 Self::check_owner_permissions(&collection, &sender)?;559 if !collection.limits.owner_can_destroy {560 fail!(Error::<T>::NoPermission);561 }562563 <AddressTokens<T>>::remove_prefix(collection_id);564 <Allowances<T>>::remove_prefix(collection_id);565 <Balance<T>>::remove_prefix(collection_id);566 <ItemListIndex>::remove(collection_id);567 <AdminList<T>>::remove(collection_id);568 <CollectionById<T>>::remove(collection_id);569 <WhiteList<T>>::remove_prefix(collection_id);570571 <NftItemList<T>>::remove_prefix(collection_id);572 <FungibleItemList<T>>::remove_prefix(collection_id);573 <ReFungibleItemList<T>>::remove_prefix(collection_id);574575 <NftTransferBasket<T>>::remove_prefix(collection_id);576 <FungibleTransferBasket<T>>::remove_prefix(collection_id);577 <ReFungibleTransferBasket<T>>::remove_prefix(collection_id);578579 <VariableMetaDataBasket<T>>::remove_prefix(collection_id);580581 DestroyedCollectionCount::put(DestroyedCollectionCount::get()582 .checked_add(1)583 .ok_or(Error::<T>::NumOverflow)?);584585 Ok(())586 }587588 /// Add an address to white list.589 /// 590 /// # Permissions591 /// 592 /// * Collection Owner593 /// * Collection Admin594 /// 595 /// # Arguments596 /// 597 /// * collection_id.598 /// 599 /// * address.600 #[weight = <T as Config>::WeightInfo::add_to_white_list()]601 #[transactional]602 pub fn add_to_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{603604 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);605 let collection = Self::get_collection(collection_id)?;606607 Self::toggle_white_list_internal(608 &sender,609 &collection,610 &address,611 true,612 )?;613614 Ok(())615 }616617 /// Remove an address from white list.618 /// 619 /// # Permissions620 /// 621 /// * Collection Owner622 /// * Collection Admin623 /// 624 /// # Arguments625 /// 626 /// * collection_id.627 /// 628 /// * address.629 #[weight = <T as Config>::WeightInfo::remove_from_white_list()]630 #[transactional]631 pub fn remove_from_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{632633 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);634 let collection = Self::get_collection(collection_id)?;635636 Self::toggle_white_list_internal(637 &sender,638 &collection,639 &address,640 false,641 )?;642643 Ok(())644 }645646 /// Toggle between normal and white list access for the methods with access for `Anyone`.647 /// 648 /// # Permissions649 /// 650 /// * Collection Owner.651 /// 652 /// # Arguments653 /// 654 /// * collection_id.655 /// 656 /// * mode: [AccessMode]657 #[weight = <T as Config>::WeightInfo::set_public_access_mode()]658 #[transactional]659 pub fn set_public_access_mode(origin, collection_id: CollectionId, mode: AccessMode) -> DispatchResult660 {661 let sender = ensure_signed(origin)?;662663 let mut target_collection = Self::get_collection(collection_id)?;664 Self::check_owner_permissions(&target_collection, &sender)?;665 target_collection.access = mode;666 Self::save_collection(target_collection);667668 Ok(())669 }670671 /// Allows Anyone to create tokens if:672 /// * White List is enabled, and673 /// * Address is added to white list, and674 /// * This method was called with True parameter675 /// 676 /// # Permissions677 /// * Collection Owner678 ///679 /// # Arguments680 /// 681 /// * collection_id.682 /// 683 /// * mint_permission: Boolean parameter. If True, allows minting to Anyone with conditions above.684 #[weight = <T as Config>::WeightInfo::set_mint_permission()]685 #[transactional]686 pub fn set_mint_permission(origin, collection_id: CollectionId, mint_permission: bool) -> DispatchResult687 {688 let sender = ensure_signed(origin)?;689690 let mut target_collection = Self::get_collection(collection_id)?;691 Self::check_owner_permissions(&target_collection, &sender)?;692 target_collection.mint_mode = mint_permission;693 Self::save_collection(target_collection);694695 Ok(())696 }697698 /// Change the owner of the collection.699 /// 700 /// # Permissions701 /// 702 /// * Collection Owner.703 /// 704 /// # Arguments705 /// 706 /// * collection_id.707 /// 708 /// * new_owner.709 #[weight = <T as Config>::WeightInfo::change_collection_owner()]710 #[transactional]711 pub fn change_collection_owner(origin, collection_id: CollectionId, new_owner: T::AccountId) -> DispatchResult {712713 let sender = ensure_signed(origin)?;714 let mut target_collection = Self::get_collection(collection_id)?;715 Self::check_owner_permissions(&target_collection, &sender)?;716 target_collection.owner = new_owner;717 Self::save_collection(target_collection);718719 Ok(())720 }721722 /// Adds an admin of the Collection.723 /// NFT Collection can be controlled by multiple admin addresses (some which can also be servers, for example). Admins can issue and burn NFTs, as well as add and remove other admins, but cannot change NFT or Collection ownership. 724 /// 725 /// # Permissions726 /// 727 /// * Collection Owner.728 /// * Collection Admin.729 /// 730 /// # Arguments731 /// 732 /// * collection_id: ID of the Collection to add admin for.733 /// 734 /// * new_admin_id: Address of new admin to add.735 #[weight = <T as Config>::WeightInfo::add_collection_admin()]736 #[transactional]737 pub fn add_collection_admin(origin, collection_id: CollectionId, new_admin_id: T::CrossAccountId) -> DispatchResult {738 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);739 let collection = Self::get_collection(collection_id)?;740 Self::check_owner_or_admin_permissions(&collection, &sender)?;741 let mut admin_arr = <AdminList<T>>::get(collection_id);742743 match admin_arr.binary_search(&new_admin_id) {744 Ok(_) => {},745 Err(idx) => {746 let limits = ChainLimit::get();747 ensure!(admin_arr.len() < limits.collections_admins_limit as usize, Error::<T>::CollectionAdminsLimitExceeded);748 admin_arr.insert(idx, new_admin_id);749 <AdminList<T>>::insert(collection_id, admin_arr);750 }751 }752 Ok(())753 }754755 /// Remove admin address of the Collection. An admin address can remove itself. List of admins may become empty, in which case only Collection Owner will be able to add an Admin.756 ///757 /// # Permissions758 /// 759 /// * Collection Owner.760 /// * Collection Admin.761 /// 762 /// # Arguments763 /// 764 /// * collection_id: ID of the Collection to remove admin for.765 /// 766 /// * account_id: Address of admin to remove.767 #[weight = <T as Config>::WeightInfo::remove_collection_admin()]768 #[transactional]769 pub fn remove_collection_admin(origin, collection_id: CollectionId, account_id: T::CrossAccountId) -> DispatchResult {770 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);771 let collection = Self::get_collection(collection_id)?;772 Self::check_owner_or_admin_permissions(&collection, &sender)?;773 let mut admin_arr = <AdminList<T>>::get(collection_id);774775 match admin_arr.binary_search(&account_id) {776 Ok(idx) => {777 admin_arr.remove(idx);778 <AdminList<T>>::insert(collection_id, admin_arr);779 },780 Err(_) => {}781 }782 Ok(())783 }784785 /// # Permissions786 /// 787 /// * Collection Owner788 /// 789 /// # Arguments790 /// 791 /// * collection_id.792 /// 793 /// * new_sponsor.794 #[weight = <T as Config>::WeightInfo::set_collection_sponsor()]795 #[transactional]796 pub fn set_collection_sponsor(origin, collection_id: CollectionId, new_sponsor: T::AccountId) -> DispatchResult {797 let sender = ensure_signed(origin)?;798 let mut target_collection = Self::get_collection(collection_id)?;799 Self::check_owner_permissions(&target_collection, &sender)?;800801 target_collection.sponsorship = SponsorshipState::Unconfirmed(new_sponsor);802 Self::save_collection(target_collection);803804 Ok(())805 }806807 /// # Permissions808 /// 809 /// * Sponsor.810 /// 811 /// # Arguments812 /// 813 /// * collection_id.814 #[weight = <T as Config>::WeightInfo::confirm_sponsorship()]815 #[transactional]816 pub fn confirm_sponsorship(origin, collection_id: CollectionId) -> DispatchResult {817 let sender = ensure_signed(origin)?;818819 let mut target_collection = Self::get_collection(collection_id)?;820 ensure!(821 target_collection.sponsorship.pending_sponsor() == Some(&sender),822 Error::<T>::ConfirmUnsetSponsorFail823 );824825 target_collection.sponsorship = SponsorshipState::Confirmed(sender);826 Self::save_collection(target_collection);827828 Ok(())829 }830831 /// Switch back to pay-per-own-transaction model.832 ///833 /// # Permissions834 ///835 /// * Collection owner.836 /// 837 /// # Arguments838 /// 839 /// * collection_id.840 #[weight = <T as Config>::WeightInfo::remove_collection_sponsor()]841 #[transactional]842 pub fn remove_collection_sponsor(origin, collection_id: CollectionId) -> DispatchResult {843 let sender = ensure_signed(origin)?;844845 let mut target_collection = Self::get_collection(collection_id)?;846 Self::check_owner_permissions(&target_collection, &sender)?;847848 target_collection.sponsorship = SponsorshipState::Disabled;849 Self::save_collection(target_collection);850851 Ok(())852 }853854 /// This method creates a concrete instance of NFT Collection created with CreateCollection method.855 /// 856 /// # Permissions857 /// 858 /// * Collection Owner.859 /// * Collection Admin.860 /// * Anyone if861 /// * White List is enabled, and862 /// * Address is added to white list, and863 /// * MintPermission is enabled (see SetMintPermission method)864 /// 865 /// # Arguments866 /// 867 /// * collection_id: ID of the collection.868 /// 869 /// * owner: Address, initial owner of the NFT.870 ///871 /// * data: Token data to store on chain.872 // #[weight =873 // (130_000_000 as Weight)874 // .saturating_add((2135 as Weight).saturating_mul((properties.len() as u64) as Weight))875 // .saturating_add(RocksDbWeight::get().reads(10 as Weight))876 // .saturating_add(RocksDbWeight::get().writes(8 as Weight))]877878 #[weight = <T as Config>::WeightInfo::create_item(data.len())]879 #[transactional]880 pub fn create_item(origin, collection_id: CollectionId, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResult {881 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);882 let collection = Self::get_collection(collection_id)?;883884 Self::create_item_internal(&sender, &collection, &owner, data)?;885886 Self::submit_logs(collection)?;887 Ok(())888 }889890 /// This method creates multiple items in a collection created with CreateCollection method.891 /// 892 /// # Permissions893 /// 894 /// * Collection Owner.895 /// * Collection Admin.896 /// * Anyone if897 /// * White List is enabled, and898 /// * Address is added to white list, and899 /// * MintPermission is enabled (see SetMintPermission method)900 /// 901 /// # Arguments902 /// 903 /// * collection_id: ID of the collection.904 /// 905 /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].906 /// 907 /// * owner: Address, initial owner of the NFT.908 #[weight = <T as Config>::WeightInfo::create_item(items_data.into_iter()909 .map(|data| { data.len() })910 .sum())]911 #[transactional]912 pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResult {913914 ensure!(items_data.len() > 0, Error::<T>::EmptyArgument);915 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);916 let collection = Self::get_collection(collection_id)?;917918 Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;919920 Self::submit_logs(collection)?;921 Ok(())922 }923924 /// Destroys a concrete instance of NFT.925 /// 926 /// # Permissions927 /// 928 /// * Collection Owner.929 /// * Collection Admin.930 /// * Current NFT Owner.931 /// 932 /// # Arguments933 /// 934 /// * collection_id: ID of the collection.935 /// 936 /// * item_id: ID of NFT to burn.937 #[weight = <T as Config>::WeightInfo::burn_item()]938 #[transactional]939 pub fn burn_item(origin, collection_id: CollectionId, item_id: TokenId, value: u128) -> DispatchResult {940941 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);942 let target_collection = Self::get_collection(collection_id)?;943944 Self::burn_item_internal(&sender, &target_collection, item_id, value)?;945946 Self::submit_logs(target_collection)?;947 Ok(())948 }949950 /// Change ownership of the token.951 /// 952 /// # Permissions953 /// 954 /// * Collection Owner955 /// * Collection Admin956 /// * Current NFT owner957 ///958 /// # Arguments959 /// 960 /// * recipient: Address of token recipient.961 /// 962 /// * collection_id.963 /// 964 /// * item_id: ID of the item965 /// * Non-Fungible Mode: Required.966 /// * Fungible Mode: Ignored.967 /// * Re-Fungible Mode: Required.968 /// 969 /// * value: Amount to transfer.970 /// * Non-Fungible Mode: Ignored971 /// * Fungible Mode: Must specify transferred amount972 /// * Re-Fungible Mode: Must specify transferred portion (between 0 and 1)973 #[weight = <T as Config>::WeightInfo::transfer()]974 #[transactional]975 pub fn transfer(origin, recipient: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, value: u128) -> DispatchResult {976 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);977 let collection = Self::get_collection(collection_id)?;978979 Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;980981 Self::submit_logs(collection)?;982 Ok(())983 }984985 /// Set, change, or remove approved address to transfer the ownership of the NFT.986 /// 987 /// # Permissions988 /// 989 /// * Collection Owner990 /// * Collection Admin991 /// * Current NFT owner992 /// 993 /// # Arguments994 /// 995 /// * approved: Address that is approved to transfer this NFT or zero (if needed to remove approval).996 /// 997 /// * collection_id.998 /// 999 /// * item_id: ID of the item.1000 #[weight = <T as Config>::WeightInfo::approve()]1001 #[transactional]1002 pub fn approve(origin, spender: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, amount: u128) -> DispatchResult {1003 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1004 let collection = Self::get_collection(collection_id)?;10051006 Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;10071008 Self::submit_logs(collection)?;1009 Ok(())1010 }1011 1012 /// Change ownership of a NFT on behalf of the owner. See Approve method for additional information. After this method executes, the approval is removed so that the approved address will not be able to transfer this NFT again from this owner.1013 /// 1014 /// # Permissions1015 /// * Collection Owner1016 /// * Collection Admin1017 /// * Current NFT owner1018 /// * Address approved by current NFT owner1019 /// 1020 /// # Arguments1021 /// 1022 /// * from: Address that owns token.1023 /// 1024 /// * recipient: Address of token recipient.1025 /// 1026 /// * collection_id.1027 /// 1028 /// * item_id: ID of the item.1029 /// 1030 /// * value: Amount to transfer.1031 #[weight = <T as Config>::WeightInfo::transfer_from()]1032 #[transactional]1033 pub fn transfer_from(origin, from: T::CrossAccountId, recipient: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, value: u128 ) -> DispatchResult {1034 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1035 let collection = Self::get_collection(collection_id)?;10361037 Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;10381039 Self::submit_logs(collection)?;1040 Ok(())1041 }1042 // #[weight = 0]1043 // // let no_perm_mes = "You do not have permissions to modify this collection";1044 // // ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);1045 // // let list_itm = <ApprovedList<T>>::get((collection_id, item_id));1046 // // ensure!(list_itm.contains(&new_owner.clone()), no_perm_mes);10471048 // // // on_nft_received call10491050 // // Self::transfer(origin, collection_id, item_id, new_owner)?;10511052 // Ok(())1053 // }10541055 /// Set off-chain data schema.1056 /// 1057 /// # Permissions1058 /// 1059 /// * Collection Owner1060 /// * Collection Admin1061 /// 1062 /// # Arguments1063 /// 1064 /// * collection_id.1065 /// 1066 /// * schema: String representing the offchain data schema.1067 #[weight = <T as Config>::WeightInfo::set_variable_meta_data()]1068 #[transactional]1069 pub fn set_variable_meta_data (1070 origin,1071 collection_id: CollectionId,1072 item_id: TokenId,1073 data: Vec<u8>1074 ) -> DispatchResult {1075 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1076 1077 let collection = Self::get_collection(collection_id)?;10781079 Self::set_variable_meta_data_internal(&sender, &collection, item_id, data)?;10801081 Ok(())1082 }1083 1084 /// Set schema standard1085 /// ImageURL1086 /// Unique1087 /// 1088 /// # Permissions1089 /// 1090 /// * Collection Owner1091 /// * Collection Admin1092 /// 1093 /// # Arguments1094 /// 1095 /// * collection_id.1096 /// 1097 /// * schema: SchemaVersion: enum1098 #[weight = <T as Config>::WeightInfo::set_schema_version()]1099 #[transactional]1100 pub fn set_schema_version(1101 origin,1102 collection_id: CollectionId,1103 version: SchemaVersion1104 ) -> DispatchResult {1105 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1106 let mut target_collection = Self::get_collection(collection_id)?;1107 Self::check_owner_or_admin_permissions(&target_collection, &sender)?;1108 target_collection.schema_version = version;1109 Self::save_collection(target_collection);11101111 Ok(())1112 }11131114 /// Set off-chain data schema.1115 /// 1116 /// # Permissions1117 /// 1118 /// * Collection Owner1119 /// * Collection Admin1120 /// 1121 /// # Arguments1122 /// 1123 /// * collection_id.1124 /// 1125 /// * schema: String representing the offchain data schema.1126 #[weight = <T as Config>::WeightInfo::set_offchain_schema()]1127 #[transactional]1128 pub fn set_offchain_schema(1129 origin,1130 collection_id: CollectionId,1131 schema: Vec<u8>1132 ) -> DispatchResult {1133 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1134 let mut target_collection = Self::get_collection(collection_id)?;1135 Self::check_owner_or_admin_permissions(&target_collection, &sender)?;11361137 // check schema limit1138 ensure!(schema.len() as u32 <= ChainLimit::get().offchain_schema_limit, "");11391140 target_collection.offchain_schema = schema;1141 Self::save_collection(target_collection);11421143 Ok(())1144 }11451146 /// Set const on-chain data schema.1147 /// 1148 /// # Permissions1149 /// 1150 /// * Collection Owner1151 /// * Collection Admin1152 /// 1153 /// # Arguments1154 /// 1155 /// * collection_id.1156 /// 1157 /// * schema: String representing the const on-chain data schema.1158 #[weight = <T as Config>::WeightInfo::set_const_on_chain_schema()]1159 #[transactional]1160 pub fn set_const_on_chain_schema (1161 origin,1162 collection_id: CollectionId,1163 schema: Vec<u8>1164 ) -> DispatchResult {1165 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1166 let mut target_collection = Self::get_collection(collection_id)?;1167 Self::check_owner_or_admin_permissions(&target_collection, &sender)?;11681169 // check schema limit1170 ensure!(schema.len() as u32 <= ChainLimit::get().const_on_chain_schema_limit, "");11711172 target_collection.const_on_chain_schema = schema;1173 Self::save_collection(target_collection);11741175 Ok(())1176 }11771178 /// Set variable on-chain data schema.1179 /// 1180 /// # Permissions1181 /// 1182 /// * Collection Owner1183 /// * Collection Admin1184 /// 1185 /// # Arguments1186 /// 1187 /// * collection_id.1188 /// 1189 /// * schema: String representing the variable on-chain data schema.1190 #[weight = <T as Config>::WeightInfo::set_const_on_chain_schema()]1191 #[transactional]1192 pub fn set_variable_on_chain_schema (1193 origin,1194 collection_id: CollectionId,1195 schema: Vec<u8>1196 ) -> DispatchResult {1197 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1198 let mut target_collection = Self::get_collection(collection_id)?;1199 Self::check_owner_or_admin_permissions(&target_collection, &sender)?;12001201 // check schema limit1202 ensure!(schema.len() as u32 <= ChainLimit::get().variable_on_chain_schema_limit, "");12031204 target_collection.variable_on_chain_schema = schema;1205 Self::save_collection(target_collection);12061207 Ok(())1208 }12091210 // Sudo permissions function1211 #[weight = <T as Config>::WeightInfo::set_chain_limits()]1212 #[transactional]1213 pub fn set_chain_limits(1214 origin,1215 limits: ChainLimits1216 ) -> DispatchResult {12171218 #[cfg(not(feature = "runtime-benchmarks"))]1219 ensure_root(origin)?;12201221 <ChainLimit>::put(limits);1222 Ok(())1223 }12241225 #[weight = <T as Config>::WeightInfo::set_collection_limits()]1226 #[transactional]1227 pub fn set_collection_limits(1228 origin,1229 collection_id: u32,1230 new_limits: CollectionLimits<T::BlockNumber>,1231 ) -> DispatchResult {1232 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1233 let mut target_collection = Self::get_collection(collection_id)?;1234 Self::check_owner_permissions(&target_collection, &sender.as_sub())?;1235 let old_limits = &target_collection.limits;1236 let chain_limits = ChainLimit::get();12371238 // collection bounds1239 ensure!(new_limits.sponsor_transfer_timeout <= MAX_SPONSOR_TIMEOUT &&1240 new_limits.account_token_ownership_limit <= MAX_TOKEN_OWNERSHIP && 1241 new_limits.sponsored_data_size <= chain_limits.custom_data_limit,1242 Error::<T>::CollectionLimitBoundsExceeded);12431244 // token_limit check prev1245 ensure!(old_limits.token_limit >= new_limits.token_limit, Error::<T>::CollectionTokenLimitExceeded);1246 ensure!(new_limits.token_limit > 0, Error::<T>::CollectionTokenLimitExceeded);12471248 ensure!(1249 (old_limits.owner_can_transfer || !new_limits.owner_can_transfer) &&1250 (old_limits.owner_can_destroy || !new_limits.owner_can_destroy),1251 Error::<T>::OwnerPermissionsCantBeReverted,1252 );12531254 target_collection.limits = new_limits;1255 Self::save_collection(target_collection);12561257 Ok(())1258 } 1259 }1260}12611262impl<T: Config> Module<T> {1263 pub fn create_item_internal(sender: &T::CrossAccountId, collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {1264 Self::can_create_items_in_collection(&collection, &sender, &owner, 1)?;1265 Self::validate_create_item_args(&collection, &data)?;1266 Self::create_item_no_validation(&collection, owner, data)?;12671268 Ok(())1269 }12701271 pub fn transfer_internal(sender: &T::CrossAccountId, recipient: &T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId, value: u128) -> DispatchResult {1272 target_collection.consume_gas(2000000)?;1273 // Limits check1274 Self::is_correct_transfer(target_collection, &recipient)?;12751276 // Transfer permissions check1277 ensure!(Self::is_item_owner(&sender, target_collection, item_id) ||1278 Self::is_owner_or_admin_permissions(target_collection, &sender),1279 Error::<T>::NoPermission);12801281 if target_collection.access == AccessMode::WhiteList {1282 Self::check_white_list(target_collection, &sender)?;1283 Self::check_white_list(target_collection, &recipient)?;1284 }12851286 match target_collection.mode1287 {1288 CollectionMode::NFT => Self::transfer_nft(target_collection, item_id, sender.clone(), recipient.clone())?,1289 CollectionMode::Fungible(_) => Self::transfer_fungible(target_collection, value, &sender, &recipient)?,1290 CollectionMode::ReFungible => Self::transfer_refungible(target_collection, item_id, value, sender.clone(), recipient.clone())?,1291 _ => ()1292 };12931294 Self::deposit_event(RawEvent::Transfer(target_collection.id, item_id, sender.clone(), recipient.clone(), value));12951296 Ok(())1297 }12981299 pub fn approve_internal(1300 sender: &T::CrossAccountId,1301 spender: &T::CrossAccountId,1302 collection: &CollectionHandle<T>,1303 item_id: TokenId,1304 amount: u1281305 ) -> DispatchResult {1306 collection.consume_gas(2000000)?;1307 Self::token_exists(&collection, item_id)?;13081309 // Transfer permissions check1310 let bypasses_limits = collection.limits.owner_can_transfer &&1311 Self::is_owner_or_admin_permissions(1312 &collection,1313 &sender,1314 );13151316 let allowance_limit = if bypasses_limits {1317 None1318 } else if let Some(amount) = Self::owned_amount(1319 &sender,1320 &collection,1321 item_id,1322 ) {1323 Some(amount)1324 } else {1325 fail!(Error::<T>::NoPermission);1326 };13271328 if collection.access == AccessMode::WhiteList {1329 Self::check_white_list(&collection, &sender)?;1330 Self::check_white_list(&collection, &spender)?;1331 }13321333 let allowance: u128 = amount1334 .checked_add(<Allowances<T>>::get(collection.id, (item_id, sender.as_sub(), spender.as_sub())))1335 .ok_or(Error::<T>::NumOverflow)?;1336 if let Some(limit) = allowance_limit {1337 ensure!(limit >= allowance, Error::<T>::TokenValueTooLow);1338 }1339 <Allowances<T>>::insert(collection.id, (item_id, sender.as_sub(), spender.as_sub()), allowance);13401341 if matches!(collection.mode, CollectionMode::NFT) {1342 // TODO: NFT: only one owner may exist for token in ERC7211343 collection.log(ERC721Events::Approval {1344 owner: *sender.as_eth(),1345 approved: *spender.as_eth(),1346 token_id: item_id.into(),1347 });1348 }13491350 if matches!(collection.mode, CollectionMode::Fungible(_)) {1351 // TODO: NFT: only one owner may exist for token in ERC201352 collection.log(ERC20Events::Approval {1353 owner: *sender.as_eth(),1354 spender: *spender.as_eth(),1355 value: allowance.into()1356 });1357 }13581359 Self::deposit_event(RawEvent::Approved(collection.id, item_id, sender.clone(), spender.clone(), allowance));1360 Ok(())1361 }13621363 pub fn transfer_from_internal(1364 sender: &T::CrossAccountId,1365 from: &T::CrossAccountId,1366 recipient: &T::CrossAccountId,1367 collection: &CollectionHandle<T>,1368 item_id: TokenId,1369 amount: u128,1370 ) -> DispatchResult {1371 collection.consume_gas(2000000)?;1372 // Check approval1373 let approval: u128 = <Allowances<T>>::get(collection.id, (item_id, from.as_sub(), sender.as_sub()));13741375 // Limits check1376 Self::is_correct_transfer(&collection, &recipient)?;13771378 // Transfer permissions check1379 ensure!(1380 approval >= amount || 1381 (1382 collection.limits.owner_can_transfer &&1383 Self::is_owner_or_admin_permissions(&collection, &sender)1384 ),1385 Error::<T>::NoPermission1386 );13871388 if collection.access == AccessMode::WhiteList {1389 Self::check_white_list(&collection, &sender)?;1390 Self::check_white_list(&collection, &recipient)?;1391 }13921393 // Reduce approval by transferred amount or remove if remaining approval drops to 01394 let allowance = approval.saturating_sub(amount);1395 if allowance > 0 {1396 <Allowances<T>>::insert(collection.id, (item_id, from.as_sub(), sender.as_sub()), allowance);1397 } else {1398 <Allowances<T>>::remove(collection.id, (item_id, from.as_sub(), sender.as_sub()));1399 }14001401 match collection.mode {1402 CollectionMode::NFT => {1403 Self::transfer_nft(&collection, item_id, from.clone(), recipient.clone())?1404 }1405 CollectionMode::Fungible(_) => {1406 Self::transfer_fungible(&collection, amount, &from, &recipient)?1407 }1408 CollectionMode::ReFungible => {1409 Self::transfer_refungible(&collection, item_id, amount, from.clone(), recipient.clone())?1410 }1411 _ => ()1412 };14131414 if matches!(collection.mode, CollectionMode::Fungible(_)) {1415 collection.log(ERC20Events::Approval {1416 owner: *from.as_eth(),1417 spender: *sender.as_eth(),1418 value: allowance.into()1419 });1420 }14211422 Ok(())1423 }14241425 pub fn set_variable_meta_data_internal(1426 sender: &T::CrossAccountId,1427 collection: &CollectionHandle<T>, 1428 item_id: TokenId,1429 data: Vec<u8>,1430 ) -> DispatchResult {1431 Self::token_exists(&collection, item_id)?;14321433 ensure!(ChainLimit::get().custom_data_limit >= data.len() as u32, Error::<T>::TokenVariableDataLimitExceeded);14341435 // Modify permissions check1436 ensure!(Self::is_item_owner(&sender, &collection, item_id) ||1437 Self::is_owner_or_admin_permissions(&collection, &sender),1438 Error::<T>::NoPermission);14391440 match collection.mode1441 {1442 CollectionMode::NFT => Self::set_nft_variable_data(&collection, item_id, data)?,1443 CollectionMode::ReFungible => Self::set_re_fungible_variable_data(&collection, item_id, data)?,1444 CollectionMode::Fungible(_) => fail!(Error::<T>::CantStoreMetadataInFungibleTokens),1445 _ => fail!(Error::<T>::UnexpectedCollectionType)1446 };14471448 Ok(())1449 }14501451 pub fn create_multiple_items_internal(1452 sender: &T::CrossAccountId,1453 collection: &CollectionHandle<T>,1454 owner: &T::CrossAccountId,1455 items_data: Vec<CreateItemData>,1456 ) -> DispatchResult {1457 Self::can_create_items_in_collection(&collection, &sender, &owner, items_data.len() as u32)?;14581459 for data in &items_data {1460 Self::validate_create_item_args(&collection, data)?;1461 }1462 for data in &items_data {1463 Self::create_item_no_validation(&collection, owner, data.clone())?;1464 }14651466 Ok(())1467 }14681469 pub fn burn_item_internal(1470 sender: &T::CrossAccountId,1471 collection: &CollectionHandle<T>,1472 item_id: TokenId,1473 value: u128,1474 ) -> DispatchResult {1475 ensure!(1476 Self::is_item_owner(&sender, &collection, item_id) ||1477 (1478 collection.limits.owner_can_transfer &&1479 Self::is_owner_or_admin_permissions(&collection, &sender)1480 ),1481 Error::<T>::NoPermission1482 );14831484 if collection.access == AccessMode::WhiteList {1485 Self::check_white_list(&collection, &sender)?;1486 }14871488 match collection.mode1489 {1490 CollectionMode::NFT => Self::burn_nft_item(&collection, item_id)?,1491 CollectionMode::Fungible(_) => Self::burn_fungible_item(&sender, &collection, value)?,1492 CollectionMode::ReFungible => Self::burn_refungible_item(&collection, item_id, &sender)?,1493 _ => ()1494 };14951496 Ok(())1497 }14981499 pub fn toggle_white_list_internal(1500 sender: &T::CrossAccountId,1501 collection: &CollectionHandle<T>,1502 address: &T::CrossAccountId,1503 whitelisted: bool,1504 ) -> DispatchResult {1505 Self::check_owner_or_admin_permissions(&collection, &sender)?;15061507 if whitelisted {1508 <WhiteList<T>>::insert(collection.id, address.as_sub(), true);1509 } else {1510 <WhiteList<T>>::remove(collection.id, address.as_sub());1511 }15121513 Ok(())1514 }15151516 fn is_correct_transfer(collection: &CollectionHandle<T>, recipient: &T::CrossAccountId) -> DispatchResult {1517 let collection_id = collection.id;15181519 // check token limit and account token limit1520 let account_items: u32 = <AddressTokens<T>>::get(collection_id, recipient.as_sub()).len() as u32;1521 ensure!(collection.limits.account_token_ownership_limit > account_items, Error::<T>::AccountTokenLimitExceeded);1522 1523 Ok(())1524 }15251526 fn can_create_items_in_collection(collection: &CollectionHandle<T>, sender: &T::CrossAccountId, owner: &T::CrossAccountId, amount: u32) -> DispatchResult {1527 let collection_id = collection.id;15281529 // check token limit and account token limit1530 let total_items: u32 = ItemListIndex::get(collection_id)1531 .checked_add(amount)1532 .ok_or(Error::<T>::CollectionTokenLimitExceeded)?;1533 let account_items: u32 = (<AddressTokens<T>>::get(collection_id, owner.as_sub()).len() as u32)1534 .checked_add(amount)1535 .ok_or(Error::<T>::AccountTokenLimitExceeded)?;1536 ensure!(collection.limits.token_limit >= total_items, Error::<T>::CollectionTokenLimitExceeded);1537 ensure!(collection.limits.account_token_ownership_limit >= account_items, Error::<T>::AccountTokenLimitExceeded);15381539 if !Self::is_owner_or_admin_permissions(collection, &sender) {1540 ensure!(collection.mint_mode == true, Error::<T>::PublicMintingNotAllowed);1541 Self::check_white_list(collection, owner)?;1542 Self::check_white_list(collection, sender)?;1543 }15441545 Ok(())1546 }15471548 fn validate_create_item_args(target_collection: &CollectionHandle<T>, data: &CreateItemData) -> DispatchResult {1549 match target_collection.mode1550 {1551 CollectionMode::NFT => {1552 if let CreateItemData::NFT(data) = data {1553 // check sizes1554 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, Error::<T>::TokenConstDataLimitExceeded);1555 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, Error::<T>::TokenVariableDataLimitExceeded);1556 } else {1557 fail!(Error::<T>::NotNftDataUsedToMintNftCollectionToken);1558 }1559 },1560 CollectionMode::Fungible(_) => {1561 if let CreateItemData::Fungible(_) = data {1562 } else {1563 fail!(Error::<T>::NotFungibleDataUsedToMintFungibleCollectionToken);1564 }1565 },1566 CollectionMode::ReFungible => {1567 if let CreateItemData::ReFungible(data) = data {15681569 // check sizes1570 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, Error::<T>::TokenConstDataLimitExceeded);1571 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, Error::<T>::TokenVariableDataLimitExceeded);15721573 // Check refungibility limits1574 ensure!(data.pieces <= MAX_REFUNGIBLE_PIECES, Error::<T>::WrongRefungiblePieces);1575 ensure!(data.pieces > 0, Error::<T>::WrongRefungiblePieces);1576 } else {1577 fail!(Error::<T>::NotReFungibleDataUsedToMintReFungibleCollectionToken);1578 }1579 },1580 _ => { fail!(Error::<T>::UnexpectedCollectionType); }1581 };15821583 Ok(())1584 }15851586 fn create_item_no_validation(collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {1587 match data1588 {1589 CreateItemData::NFT(data) => {1590 let item = NftItemType {1591 owner: owner.clone(),1592 const_data: data.const_data,1593 variable_data: data.variable_data1594 };15951596 Self::add_nft_item(collection, item)?;1597 },1598 CreateItemData::Fungible(data) => {1599 Self::add_fungible_item(collection, &owner, data.value)?;1600 },1601 CreateItemData::ReFungible(data) => {1602 let mut owner_list = Vec::new();1603 owner_list.push(Ownership {owner: owner.clone(), fraction: data.pieces});16041605 let item = ReFungibleItemType {1606 owner: owner_list,1607 const_data: data.const_data,1608 variable_data: data.variable_data1609 };16101611 Self::add_refungible_item(collection, item)?;1612 }1613 };16141615 Ok(())1616 }16171618 fn add_fungible_item(collection: &CollectionHandle<T>, owner: &T::CrossAccountId, value: u128) -> DispatchResult {1619 let collection_id = collection.id;16201621 // Does new owner already have an account?1622 let balance: u128 = <FungibleItemList<T>>::get(collection_id, owner.as_sub()).value;16231624 // Mint 1625 let item = FungibleItemType {1626 value: balance.checked_add(value).ok_or(Error::<T>::NumOverflow)?,1627 };1628 <FungibleItemList<T>>::insert(collection_id, owner.as_sub(), item);16291630 // Update balance1631 let new_balance = <Balance<T>>::get(collection_id, owner.as_sub())1632 .checked_add(value)1633 .ok_or(Error::<T>::NumOverflow)?;1634 <Balance<T>>::insert(collection_id, owner.as_sub(), new_balance);16351636 Self::deposit_event(RawEvent::ItemCreated(collection_id, 0, owner.clone()));1637 Ok(())1638 }16391640 fn add_refungible_item(collection: &CollectionHandle<T>, item: ReFungibleItemType<T::CrossAccountId>) -> DispatchResult {1641 let collection_id = collection.id;16421643 let current_index = <ItemListIndex>::get(collection_id)1644 .checked_add(1)1645 .ok_or(Error::<T>::NumOverflow)?;1646 let itemcopy = item.clone();16471648 ensure!(1649 item.owner.len() == 1,1650 Error::<T>::BadCreateRefungibleCall,1651 );1652 let item_owner = item.owner.first().expect("only one owner is defined");16531654 let value = item_owner.fraction;1655 let owner = item_owner.owner.clone();16561657 Self::add_token_index(collection_id, current_index, &owner)?;16581659 <ItemListIndex>::insert(collection_id, current_index);1660 <ReFungibleItemList<T>>::insert(collection_id, current_index, itemcopy);16611662 // Update balance1663 let new_balance = <Balance<T>>::get(collection_id, owner.as_sub())1664 .checked_add(value)1665 .ok_or(Error::<T>::NumOverflow)?;1666 <Balance<T>>::insert(collection_id, owner.as_sub(), new_balance);16671668 Self::deposit_event(RawEvent::ItemCreated(collection_id, current_index, owner));1669 Ok(())1670 }16711672 fn add_nft_item(collection: &CollectionHandle<T>, item: NftItemType<T::CrossAccountId>) -> DispatchResult {1673 let collection_id = collection.id;16741675 let current_index = <ItemListIndex>::get(collection_id)1676 .checked_add(1)1677 .ok_or(Error::<T>::NumOverflow)?;16781679 let item_owner = item.owner.clone();1680 Self::add_token_index(collection_id, current_index, &item.owner)?;16811682 <ItemListIndex>::insert(collection_id, current_index);1683 <NftItemList<T>>::insert(collection_id, current_index, item);16841685 // Update balance1686 let new_balance = <Balance<T>>::get(collection_id, item_owner.as_sub())1687 .checked_add(1)1688 .ok_or(Error::<T>::NumOverflow)?;1689 <Balance<T>>::insert(collection_id, item_owner.as_sub(), new_balance);16901691 collection.log(ERC721Events::Transfer {1692 from: H160::default(),1693 to: *item_owner.as_eth(),1694 token_id: current_index.into(),1695 });1696 Self::deposit_event(RawEvent::ItemCreated(collection_id, current_index, item_owner));1697 Ok(())1698 }16991700 fn burn_refungible_item(1701 collection: &CollectionHandle<T>,1702 item_id: TokenId,1703 owner: &T::CrossAccountId,1704 ) -> DispatchResult {1705 let collection_id = collection.id;17061707 let mut token = <ReFungibleItemList<T>>::get(collection_id, item_id)1708 .ok_or(Error::<T>::TokenNotFound)?;1709 let rft_balance = token1710 .owner1711 .iter()1712 .find(|&i| i.owner == *owner)1713 .ok_or(Error::<T>::TokenNotFound)?;1714 Self::remove_token_index(collection_id, item_id, owner)?;17151716 // update balance1717 let new_balance = <Balance<T>>::get(collection_id, rft_balance.owner.as_sub())1718 .checked_sub(rft_balance.fraction)1719 .ok_or(Error::<T>::NumOverflow)?;1720 <Balance<T>>::insert(collection_id, rft_balance.owner.as_sub(), new_balance);17211722 // Re-create owners list with sender removed1723 let index = token1724 .owner1725 .iter()1726 .position(|i| i.owner == *owner)1727 .expect("owned item is exists");1728 token.owner.remove(index);1729 let owner_count = token.owner.len();17301731 // Burn the token completely if this was the last (only) owner1732 if owner_count == 0 {1733 <ReFungibleItemList<T>>::remove(collection_id, item_id);1734 <VariableMetaDataBasket<T>>::remove(collection_id, item_id);1735 }1736 else {1737 <ReFungibleItemList<T>>::insert(collection_id, item_id, token);1738 }17391740 Ok(())1741 }17421743 fn burn_nft_item(collection: &CollectionHandle<T>, item_id: TokenId) -> DispatchResult {1744 let collection_id = collection.id;17451746 let item = <NftItemList<T>>::get(collection_id, item_id)1747 .ok_or(Error::<T>::TokenNotFound)?;1748 Self::remove_token_index(collection_id, item_id, &item.owner)?;17491750 // update balance1751 let new_balance = <Balance<T>>::get(collection_id, item.owner.as_sub())1752 .checked_sub(1)1753 .ok_or(Error::<T>::NumOverflow)?;1754 <Balance<T>>::insert(collection_id, item.owner.as_sub(), new_balance);1755 <NftItemList<T>>::remove(collection_id, item_id);1756 <VariableMetaDataBasket<T>>::remove(collection_id, item_id);17571758 Self::deposit_event(RawEvent::ItemDestroyed(collection.id, item_id));1759 Ok(())1760 }17611762 fn burn_fungible_item(owner: &T::CrossAccountId, collection: &CollectionHandle<T>, value: u128) -> DispatchResult {1763 let collection_id = collection.id;17641765 let mut balance = <FungibleItemList<T>>::get(collection_id, owner.as_sub());1766 ensure!(balance.value >= value, Error::<T>::TokenValueNotEnough);17671768 // update balance1769 let new_balance = <Balance<T>>::get(collection_id, owner.as_sub())1770 .checked_sub(value)1771 .ok_or(Error::<T>::NumOverflow)?;1772 <Balance<T>>::insert(collection_id, owner.as_sub(), new_balance);17731774 if balance.value - value > 0 {1775 balance.value -= value;1776 <FungibleItemList<T>>::insert(collection_id, owner.as_sub(), balance);1777 }1778 else {1779 <FungibleItemList<T>>::remove(collection_id, owner.as_sub());1780 }17811782 collection.log(ERC20Events::Transfer {1783 from: *owner.as_eth(),1784 to: H160::default(),1785 value: value.into(),1786 });1787 Ok(())1788 }17891790 pub fn get_collection(collection_id: CollectionId) -> Result<CollectionHandle<T>, sp_runtime::DispatchError> {1791 Ok(<CollectionHandle<T>>::get(collection_id)1792 .ok_or(Error::<T>::CollectionNotFound)?)1793 }17941795 fn save_collection(collection: CollectionHandle<T>) {1796 <CollectionById<T>>::insert(collection.id, collection.into_inner());1797 }17981799 pub fn submit_logs(collection: CollectionHandle<T>) -> DispatchResult {1800 if collection.logs.is_empty() {1801 return Ok(())1802 }1803 T::EthereumTransactionSender::submit_logs_transaction(1804 eth::generate_transaction(collection.id, T::EthereumChainId::get()),1805 collection.logs.retrieve_logs(),1806 )1807 }18081809 fn check_owner_permissions(target_collection: &CollectionHandle<T>, subject: &T::AccountId) -> DispatchResult {1810 ensure!(1811 *subject == target_collection.owner,1812 Error::<T>::NoPermission1813 );18141815 Ok(())1816 }18171818 fn is_owner_or_admin_permissions(collection: &CollectionHandle<T>, subject: &T::CrossAccountId) -> bool {1819 *subject.as_sub() == collection.owner || <AdminList<T>>::get(collection.id).contains(&subject)1820 }18211822 fn check_owner_or_admin_permissions(1823 collection: &CollectionHandle<T>,1824 subject: &T::CrossAccountId,1825 ) -> DispatchResult {1826 ensure!(Self::is_owner_or_admin_permissions(collection, subject), Error::<T>::NoPermission);18271828 Ok(())1829 }18301831 fn owned_amount(1832 subject: &T::CrossAccountId,1833 target_collection: &CollectionHandle<T>,1834 item_id: TokenId,1835 ) -> Option<u128> {1836 let collection_id = target_collection.id;18371838 match target_collection.mode {1839 CollectionMode::NFT => (<NftItemList<T>>::get(collection_id, item_id)?.owner == *subject)1840 .then(|| 1),1841 CollectionMode::Fungible(_) => Some(<FungibleItemList<T>>::get(collection_id, &subject.as_sub())1842 .value),1843 CollectionMode::ReFungible => <ReFungibleItemList<T>>::get(collection_id, item_id)?1844 .owner1845 .iter()1846 .find(|i| i.owner == *subject)1847 .map(|i| i.fraction),1848 CollectionMode::Invalid => None,1849 }1850 }18511852 fn is_item_owner(subject: &T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId) -> bool {1853 match target_collection.mode {1854 CollectionMode::Fungible(_) => true,1855 _ => Self::owned_amount(&subject, target_collection, item_id).is_some(),1856 }1857 }18581859 fn check_white_list(collection: &CollectionHandle<T>, address: &T::CrossAccountId) -> DispatchResult {1860 let collection_id = collection.id;18611862 let mes = Error::<T>::AddresNotInWhiteList;1863 ensure!(<WhiteList<T>>::contains_key(collection_id, address.as_sub()), mes);18641865 Ok(())1866 }18671868 /// Check if token exists. In case of Fungible, check if there is an entry for 1869 /// the owner in fungible balances double map1870 fn token_exists(1871 target_collection: &CollectionHandle<T>,1872 item_id: TokenId,1873 ) -> DispatchResult {1874 let collection_id = target_collection.id;1875 let exists = match target_collection.mode1876 {1877 CollectionMode::NFT => <NftItemList<T>>::contains_key(collection_id, item_id),1878 CollectionMode::Fungible(_) => true,1879 CollectionMode::ReFungible => <ReFungibleItemList<T>>::contains_key(collection_id, item_id),1880 _ => false1881 };18821883 ensure!(exists == true, Error::<T>::TokenNotFound);1884 Ok(())1885 }18861887 fn transfer_fungible(1888 collection: &CollectionHandle<T>,1889 value: u128,1890 owner: &T::CrossAccountId,1891 recipient: &T::CrossAccountId,1892 ) -> DispatchResult {1893 let collection_id = collection.id;18941895 let mut balance = <FungibleItemList<T>>::get(collection_id, owner.as_sub());1896 ensure!(balance.value >= value, Error::<T>::TokenValueTooLow);18971898 // Send balance to recipient (updates balanceOf of recipient)1899 Self::add_fungible_item(collection, recipient, value)?;19001901 // update balanceOf of sender1902 <Balance<T>>::insert(collection_id, owner.as_sub(), balance.value - value);19031904 // Reduce or remove sender1905 if balance.value == value {1906 <FungibleItemList<T>>::remove(collection_id, owner.as_sub());1907 }1908 else {1909 balance.value -= value;1910 <FungibleItemList<T>>::insert(collection_id, owner.as_sub(), balance);1911 }19121913 collection.log(ERC20Events::Transfer {1914 from: *owner.as_eth(),1915 to: *recipient.as_eth(),1916 value: value.into(),1917 });1918 Self::deposit_event(RawEvent::Transfer(collection.id, 1, owner.clone(), recipient.clone(), value));19191920 Ok(())1921 }19221923 fn transfer_refungible(1924 collection: &CollectionHandle<T>,1925 item_id: TokenId,1926 value: u128,1927 owner: T::CrossAccountId,1928 new_owner: T::CrossAccountId,1929 ) -> DispatchResult {1930 let collection_id = collection.id;1931 let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id)1932 .ok_or(Error::<T>::TokenNotFound)?;19331934 let item = full_item1935 .owner1936 .iter()1937 .filter(|i| i.owner == owner)1938 .next()1939 .ok_or(Error::<T>::TokenNotFound)?;1940 let amount = item.fraction;19411942 ensure!(amount >= value, Error::<T>::TokenValueTooLow);19431944 // update balance1945 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.as_sub())1946 .checked_sub(value)1947 .ok_or(Error::<T>::NumOverflow)?;1948 <Balance<T>>::insert(collection_id, item.owner.as_sub(), balance_old_owner);19491950 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.as_sub())1951 .checked_add(value)1952 .ok_or(Error::<T>::NumOverflow)?;1953 <Balance<T>>::insert(collection_id, new_owner.as_sub(), balance_new_owner);19541955 let old_owner = item.owner.clone();1956 let new_owner_has_account = full_item.owner.iter().any(|i| i.owner == new_owner);19571958 // transfer1959 if amount == value && !new_owner_has_account {1960 // change owner1961 // new owner do not have account1962 let mut new_full_item = full_item.clone();1963 new_full_item1964 .owner1965 .iter_mut()1966 .find(|i| i.owner == owner)1967 .expect("old owner does present in refungible")1968 .owner = new_owner.clone();1969 <ReFungibleItemList<T>>::insert(collection_id, item_id, new_full_item);19701971 // update index collection1972 Self::move_token_index(collection_id, item_id, &old_owner, &new_owner)?;1973 } else {1974 let mut new_full_item = full_item.clone();1975 new_full_item1976 .owner1977 .iter_mut()1978 .find(|i| i.owner == owner)1979 .expect("old owner does present in refungible")1980 .fraction -= value;19811982 // separate amount1983 if new_owner_has_account {1984 // new owner has account1985 new_full_item1986 .owner1987 .iter_mut()1988 .find(|i| i.owner == new_owner)1989 .expect("new owner has account")1990 .fraction += value;1991 } else {1992 // new owner do not have account1993 new_full_item.owner.push(Ownership {1994 owner: new_owner.clone(),1995 fraction: value,1996 });1997 Self::add_token_index(collection_id, item_id, &new_owner)?;1998 }19992000 <ReFungibleItemList<T>>::insert(collection_id, item_id, new_full_item);2001 }20022003 Self::deposit_event(RawEvent::Transfer(collection.id, item_id, owner, new_owner, amount));20042005 Ok(())2006 }20072008 fn transfer_nft(2009 collection: &CollectionHandle<T>,2010 item_id: TokenId,2011 sender: T::CrossAccountId,2012 new_owner: T::CrossAccountId,2013 ) -> DispatchResult {2014 let collection_id = collection.id;2015 let mut item = <NftItemList<T>>::get(collection_id, item_id)2016 .ok_or(Error::<T>::TokenNotFound)?;20172018 ensure!(2019 sender == item.owner,2020 Error::<T>::MustBeTokenOwner2021 );20222023 // update balance2024 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.as_sub())2025 .checked_sub(1)2026 .ok_or(Error::<T>::NumOverflow)?;2027 <Balance<T>>::insert(collection_id, item.owner.as_sub(), balance_old_owner);20282029 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.as_sub())2030 .checked_add(1)2031 .ok_or(Error::<T>::NumOverflow)?;2032 <Balance<T>>::insert(collection_id, new_owner.as_sub(), balance_new_owner);20332034 // change owner2035 let old_owner = item.owner.clone();2036 item.owner = new_owner.clone();2037 <NftItemList<T>>::insert(collection_id, item_id, item);20382039 // update index collection2040 Self::move_token_index(collection_id, item_id, &old_owner, &new_owner)?;20412042 collection.log(ERC721Events::Transfer {2043 from: *sender.as_eth(),2044 to: *new_owner.as_eth(),2045 token_id: item_id.into(),2046 });2047 Self::deposit_event(RawEvent::Transfer(collection.id, item_id, sender, new_owner, 1));20482049 Ok(())2050 }2051 2052 fn set_re_fungible_variable_data(2053 collection: &CollectionHandle<T>,2054 item_id: TokenId,2055 data: Vec<u8>2056 ) -> DispatchResult {2057 let collection_id = collection.id;2058 let mut item = <ReFungibleItemList<T>>::get(collection_id, item_id)2059 .ok_or(Error::<T>::TokenNotFound)?;20602061 item.variable_data = data;20622063 <ReFungibleItemList<T>>::insert(collection_id, item_id, item);20642065 Ok(())2066 }20672068 fn set_nft_variable_data(2069 collection: &CollectionHandle<T>,2070 item_id: TokenId,2071 data: Vec<u8>2072 ) -> DispatchResult {2073 let collection_id = collection.id;2074 let mut item = <NftItemList<T>>::get(collection_id, item_id)2075 .ok_or(Error::<T>::TokenNotFound)?;2076 2077 item.variable_data = data;20782079 <NftItemList<T>>::insert(collection_id, item_id, item);2080 2081 Ok(())2082 }20832084 #[allow(dead_code)]2085 fn init_collection(item: &Collection<T>) {2086 // check params2087 assert!(2088 item.decimal_points <= MAX_DECIMAL_POINTS,2089 "decimal_points parameter must be lower than MAX_DECIMAL_POINTS"2090 );2091 assert!(2092 item.name.len() <= 64,2093 "Collection name can not be longer than 63 char"2094 );2095 assert!(2096 item.name.len() <= 256,2097 "Collection description can not be longer than 255 char"2098 );2099 assert!(2100 item.token_prefix.len() <= 16,2101 "Token prefix can not be longer than 15 char"2102 );21032104 // Generate next collection ID2105 let next_id = CreatedCollectionCount::get()2106 .checked_add(1)2107 .unwrap();21082109 CreatedCollectionCount::put(next_id);2110 }21112112 #[allow(dead_code)]2113 fn init_nft_token(collection_id: CollectionId, item: &NftItemType<T::CrossAccountId>) {2114 let current_index = <ItemListIndex>::get(collection_id)2115 .checked_add(1)2116 .unwrap();21172118 Self::add_token_index(collection_id, current_index, &item.owner).unwrap();21192120 <ItemListIndex>::insert(collection_id, current_index);21212122 // Update balance2123 let new_balance = <Balance<T>>::get(collection_id, item.owner.as_sub())2124 .checked_add(1)2125 .unwrap();2126 <Balance<T>>::insert(collection_id, item.owner.as_sub(), new_balance);2127 }21282129 #[allow(dead_code)]2130 fn init_fungible_token(collection_id: CollectionId, owner: &T::CrossAccountId, item: &FungibleItemType) {2131 let current_index = <ItemListIndex>::get(collection_id)2132 .checked_add(1)2133 .unwrap();21342135 Self::add_token_index(collection_id, current_index, owner).unwrap();21362137 <ItemListIndex>::insert(collection_id, current_index);21382139 // Update balance2140 let new_balance = <Balance<T>>::get(collection_id, owner.as_sub())2141 .checked_add(item.value)2142 .unwrap();2143 <Balance<T>>::insert(collection_id, owner.as_sub(), new_balance);2144 }21452146 #[allow(dead_code)]2147 fn init_refungible_token(collection_id: CollectionId, item: &ReFungibleItemType<T::CrossAccountId>) {2148 let current_index = <ItemListIndex>::get(collection_id)2149 .checked_add(1)2150 .unwrap();21512152 let value = item.owner.first().unwrap().fraction;2153 let owner = item.owner.first().unwrap().owner.clone();21542155 Self::add_token_index(collection_id, current_index, &owner).unwrap();21562157 <ItemListIndex>::insert(collection_id, current_index);21582159 // Update balance2160 let new_balance = <Balance<T>>::get(collection_id, &owner.as_sub())2161 .checked_add(value)2162 .unwrap();2163 <Balance<T>>::insert(collection_id, owner.as_sub(), new_balance);2164 }21652166 fn add_token_index(collection_id: CollectionId, item_index: TokenId, owner: &T::CrossAccountId) -> DispatchResult {2167 // add to account limit2168 if <AccountItemCount<T>>::contains_key(owner.as_sub()) {21692170 // bound Owned tokens by a single address2171 let count = <AccountItemCount<T>>::get(owner.as_sub());2172 ensure!(count < ChainLimit::get().account_token_ownership_limit, Error::<T>::AddressOwnershipLimitExceeded);21732174 <AccountItemCount<T>>::insert(owner.as_sub(), count2175 .checked_add(1)2176 .ok_or(Error::<T>::NumOverflow)?);2177 }2178 else {2179 <AccountItemCount<T>>::insert(owner.as_sub(), 1);2180 }21812182 let list_exists = <AddressTokens<T>>::contains_key(collection_id, owner.as_sub());2183 if list_exists {2184 let mut list = <AddressTokens<T>>::get(collection_id, owner.as_sub());2185 let item_contains = list.contains(&item_index.clone());21862187 if !item_contains {2188 list.push(item_index.clone());2189 }21902191 <AddressTokens<T>>::insert(collection_id, owner.as_sub(), list);2192 } else {2193 let mut itm = Vec::new();2194 itm.push(item_index.clone());2195 <AddressTokens<T>>::insert(collection_id, owner.as_sub(), itm);2196 }21972198 Ok(())2199 }22002201 fn remove_token_index(2202 collection_id: CollectionId,2203 item_index: TokenId,2204 owner: &T::CrossAccountId,2205 ) -> DispatchResult {22062207 // update counter2208 <AccountItemCount<T>>::insert(owner.as_sub(), 2209 <AccountItemCount<T>>::get(owner.as_sub())2210 .checked_sub(1)2211 .ok_or(Error::<T>::NumOverflow)?);221222132214 let list_exists = <AddressTokens<T>>::contains_key(collection_id, owner.as_sub());2215 if list_exists {2216 let mut list = <AddressTokens<T>>::get(collection_id, owner.as_sub());2217 let item_contains = list.contains(&item_index.clone());22182219 if item_contains {2220 list.retain(|&item| item != item_index);2221 <AddressTokens<T>>::insert(collection_id, owner.as_sub(), list);2222 }2223 }22242225 Ok(())2226 }22272228 fn move_token_index(2229 collection_id: CollectionId,2230 item_index: TokenId,2231 old_owner: &T::CrossAccountId,2232 new_owner: &T::CrossAccountId,2233 ) -> DispatchResult {2234 Self::remove_token_index(collection_id, item_index, old_owner)?;2235 Self::add_token_index(collection_id, item_index, new_owner)?;22362237 Ok(())2238 }2239}22402241sp_api::decl_runtime_apis! {2242 pub trait NftApi {2243 /// Used for ethereum integration2244 fn eth_contract_code(account: H160) -> Option<Vec<u8>>;2245 }2246}pallets/nft/src/mock.rsdiffbeforeafterboth--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -1,22 +1,21 @@
+#![allow(clippy::from_over_into)]
+
use crate as pallet_template;
use sp_core::H256;
-use frame_support::{
- parameter_types,
- weights::IdentityFee,
-};
+use frame_support::{parameter_types, weights::IdentityFee};
use sp_runtime::{
- traits::{BlakeTwo256, IdentityLookup},
- testing::Header,
+ traits::{BlakeTwo256, IdentityLookup},
+ testing::Header,
Perbill,
};
-use pallet_transaction_payment::{ CurrencyAdapter};
+use pallet_transaction_payment::{CurrencyAdapter};
use frame_system as system;
use pallet_evm::AddressMapping;
use crate::{EvmBackwardsAddressMapping, CrossAccountId};
use codec::{Encode, Decode};
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
// Configure a mock runtime to test the pallet.
frame_support::construct_runtime!(
@@ -59,7 +58,7 @@
type OnKilledAccount = ();
type SystemWeightInfo = ();
type SS58Prefix = SS58Prefix;
- type OnSetCode = ();
+ type OnSetCode = ();
}
parameter_types! {
@@ -68,10 +67,10 @@
}
//frame_system::Module<Test>;
impl pallet_balances::Config for Test {
- type AccountStore = System;
- type Balance = u64;
- type DustRemoval = ();
- type Event = ();
+ type AccountStore = System;
+ type Balance = u64;
+ type DustRemoval = ();
+ type Event = ();
type ExistentialDeposit = ExistentialDeposit;
type WeightInfo = ();
type MaxLocks = MaxLocks;
@@ -132,70 +131,76 @@
type ChainExtension = ();
type WeightPrice = ();
type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
- type Schedule = Schedule;
- type CallStack = [pallet_contracts::Frame<Self>; 31];
+ type Schedule = Schedule;
+ type CallStack = [pallet_contracts::Frame<Self>; 31];
}
parameter_types! {
pub const CollectionCreationPrice: u32 = 0;
- pub TreasuryAccountId: u64 = 1234;
- pub EthereumChainId: u32 = 1111;
+ pub TreasuryAccountId: u64 = 1234;
+ pub EthereumChainId: u32 = 1111;
}
pub struct TestEvmAddressMapping;
impl AddressMapping<u64> for TestEvmAddressMapping {
- fn into_account_id(addr: sp_core::H160) -> u64 {
- unimplemented!()
- }
+ fn into_account_id(_addr: sp_core::H160) -> u64 {
+ unimplemented!()
+ }
}
pub struct TestEvmBackwardsAddressMapping;
impl EvmBackwardsAddressMapping<u64> for TestEvmBackwardsAddressMapping {
- fn from_account_id(account_id: u64) -> sp_core::H160 {
- unimplemented!()
- }
+ fn from_account_id(_account_id: u64) -> sp_core::H160 {
+ unimplemented!()
+ }
}
#[derive(Encode, Decode, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
pub struct TestCrossAccountId(u64, sp_core::H160);
impl CrossAccountId<u64> for TestCrossAccountId {
- fn from_sub(sub: u64) -> Self {
- let mut eth = [0; 20];
- eth[12..20].copy_from_slice(&sub.to_be_bytes());
- Self(sub, sp_core::H160(eth))
- }
- fn as_sub(&self) -> &u64 {
- &self.0
- }
- fn from_eth(eth: sp_core::H160) -> Self {
- unimplemented!()
- }
- fn as_eth(&self) -> &sp_core::H160 {
- &self.1
- }
+ fn from_sub(sub: u64) -> Self {
+ let mut eth = [0; 20];
+ eth[12..20].copy_from_slice(&sub.to_be_bytes());
+ Self(sub, sp_core::H160(eth))
+ }
+ fn as_sub(&self) -> &u64 {
+ &self.0
+ }
+ fn from_eth(_eth: sp_core::H160) -> Self {
+ unimplemented!()
+ }
+ fn as_eth(&self) -> &sp_core::H160 {
+ &self.1
+ }
}
pub struct TestEtheremTransactionSender;
impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {
- fn submit_logs_transaction(tx: pallet_ethereum::Transaction, logs: Vec<pallet_ethereum::Log>) -> Result<(), sp_runtime::DispatchError> {
- Ok(())
- }
+ fn submit_logs_transaction(
+ _tx: pallet_ethereum::Transaction,
+ _logs: Vec<pallet_ethereum::Log>,
+ ) -> Result<(), sp_runtime::DispatchError> {
+ Ok(())
+ }
}
impl pallet_template::Config for Test {
type Event = ();
type WeightInfo = ();
type CollectionCreationPrice = CollectionCreationPrice;
- type Currency = pallet_balances::Pallet<Test>;
- type TreasuryAccountId = TreasuryAccountId;
- type EvmAddressMapping = TestEvmAddressMapping;
- type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;
- type CrossAccountId = TestCrossAccountId;
- type EthereumChainId = EthereumChainId;
- type EthereumTransactionSender = TestEtheremTransactionSender;
+ type Currency = pallet_balances::Pallet<Test>;
+ type TreasuryAccountId = TreasuryAccountId;
+ type EvmAddressMapping = TestEvmAddressMapping;
+ type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;
+ type CrossAccountId = TestCrossAccountId;
+ type EthereumChainId = EthereumChainId;
+ type EthereumTransactionSender = TestEtheremTransactionSender;
}
// Build genesis storage according to the mock runtime.
pub fn new_test_ext() -> sp_io::TestExternalities {
- system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
-}
\ No newline at end of file
+ system::GenesisConfig::default()
+ .build_storage::<Test>()
+ .unwrap()
+ .into()
+}
pallets/nft/src/sponsorship.rsdiffbeforeafterboth--- a/pallets/nft/src/sponsorship.rs
+++ b/pallets/nft/src/sponsorship.rs
@@ -1,4 +1,8 @@
-use crate::{Config, Call, CollectionById, CreateItemBasket, VariableMetaDataBasket, ReFungibleTransferBasket, FungibleTransferBasket, NftTransferBasket, ChainLimit, CreateItemData, CollectionMode};
+use crate::{
+ Config, Call, CollectionById, CreateItemBasket, VariableMetaDataBasket,
+ ReFungibleTransferBasket, FungibleTransferBasket, NftTransferBasket, ChainLimit,
+ CreateItemData, CollectionMode,
+};
use core::marker::PhantomData;
use up_sponsorship::SponsorshipHandler;
use frame_support::{
@@ -6,7 +10,6 @@
storage::{StorageMap, StorageDoubleMap, StorageValue},
};
use nft_data_structs::{TokenId, CollectionId};
-use alloc::vec::Vec;
pub struct NftSponsorshipHandler<T>(PhantomData<T>);
impl<T: Config> NftSponsorshipHandler<T> {
@@ -15,7 +18,6 @@
collection_id: &CollectionId,
_properties: &CreateItemData,
) -> Option<T::AccountId> {
-
let collection = CollectionById::<T>::get(collection_id)?;
// sponsor timeout
@@ -32,9 +34,8 @@
CreateItemBasket::<T>::insert((collection_id, who.clone()), block_number);
// check free create limit
- if collection.limits.sponsored_data_size >= (_properties.len() as u32) {
- collection.sponsorship.sponsor()
- .cloned()
+ if collection.limits.sponsored_data_size >= (_properties.data_size() as u32) {
+ collection.sponsorship.sponsor().cloned()
} else {
None
}
@@ -45,13 +46,11 @@
collection_id: &CollectionId,
item_id: &TokenId,
) -> Option<T::AccountId> {
-
let collection = CollectionById::<T>::get(collection_id)?;
let limits = ChainLimit::get();
let mut sponsor_transfer = false;
if collection.sponsorship.confirmed() {
-
let collection_limits = collection.limits.clone();
let collection_mode = collection.mode.clone();
@@ -59,7 +58,6 @@
let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
sponsor_transfer = match collection_mode {
CollectionMode::NFT => {
-
// get correct limit
let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
collection_limits.sponsor_transfer_timeout
@@ -82,7 +80,6 @@
sponsored
}
CollectionMode::Fungible(_) => {
-
// get correct limit
let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
collection_limits.sponsor_transfer_timeout
@@ -106,7 +103,6 @@
sponsored
}
CollectionMode::ReFungible => {
-
// get correct limit
let limit: u32 = if collection_limits.sponsor_transfer_timeout > 0 {
collection_limits.sponsor_transfer_timeout
@@ -116,7 +112,8 @@
let mut sponsored = true;
if ReFungibleTransferBasket::<T>::contains_key(collection_id, item_id) {
- let last_tx_block = ReFungibleTransferBasket::<T>::get(collection_id, item_id);
+ let last_tx_block =
+ ReFungibleTransferBasket::<T>::get(collection_id, item_id);
let limit_time = last_tx_block + limit.into();
if block_number <= limit_time {
sponsored = false;
@@ -128,32 +125,27 @@
sponsored
}
- _ => {
- false
- },
+ _ => false,
};
}
if !sponsor_transfer {
None
} else {
- collection.sponsorship.sponsor()
- .cloned()
+ collection.sponsorship.sponsor().cloned()
}
}
-
+
pub fn withdraw_set_variable_meta_data(
collection_id: &CollectionId,
item_id: &TokenId,
- data: &Vec<u8>,
+ data: &[u8],
) -> Option<T::AccountId> {
-
let mut sponsor_metadata_changes = false;
let collection = CollectionById::<T>::get(collection_id)?;
- if
- collection.sponsorship.confirmed() &&
+ if collection.sponsorship.confirmed() &&
// Can't sponsor fungible collection, this tx will be rejected
// as invalid
!matches!(collection.mode, CollectionMode::Fungible(_)) &&
@@ -164,7 +156,7 @@
if VariableMetaDataBasket::<T>::get(collection_id, item_id)
.map(|last_block| block_number - last_block > rate_limit)
- .unwrap_or(true)
+ .unwrap_or(true)
{
sponsor_metadata_changes = true;
VariableMetaDataBasket::<T>::insert(collection_id, item_id, block_number);
@@ -177,27 +169,26 @@
} else {
collection.sponsorship.sponsor().cloned()
}
-
}
}
impl<T, C> SponsorshipHandler<T::AccountId, C> for NftSponsorshipHandler<T>
-where
- T: Config,
- C: IsSubType<Call<T>>
+where
+ T: Config,
+ C: IsSubType<Call<T>>,
{
- fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {
- match IsSubType::<Call<T>>::is_sub_type(call)? {
- Call::create_item(collection_id, _owner, _properties) => {
- Self::withdraw_create_item(who, collection_id, &_properties)
- },
- Call::transfer(_new_owner, collection_id, item_id, _value) => {
- Self::withdraw_transfer(who, collection_id, item_id)
- },
- Call::set_variable_meta_data(collection_id, item_id, data) => {
- Self::withdraw_set_variable_meta_data(collection_id, item_id, &data)
- },
+ fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {
+ match IsSubType::<Call<T>>::is_sub_type(call)? {
+ Call::create_item(collection_id, _owner, _properties) => {
+ Self::withdraw_create_item(who, collection_id, &_properties)
+ }
+ Call::transfer(_new_owner, collection_id, item_id, _value) => {
+ Self::withdraw_transfer(who, collection_id, item_id)
+ }
+ Call::set_variable_meta_data(collection_id, item_id, data) => {
+ Self::withdraw_set_variable_meta_data(collection_id, item_id, &data)
+ }
_ => None,
- }
- }
-}
\ No newline at end of file
+ }
+ }
+}
pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -1,90 +1,109 @@
// Tests to be written here
use super::*;
use crate::mock::*;
-use crate::{
- AccessMode, CollectionMode,
- Ownership, ChainLimits, CreateItemData,
-};
+use crate::{AccessMode, CollectionMode, Ownership, ChainLimits, CreateItemData};
use nft_data_structs::{
- CreateNftData, CreateFungibleData, CreateReFungibleData,
- CollectionId, TokenId, MAX_DECIMAL_POINTS,
+ CreateNftData, CreateFungibleData, CreateReFungibleData, CollectionId, TokenId,
+ MAX_DECIMAL_POINTS,
};
use frame_support::{assert_noop, assert_ok};
-use frame_system::{ RawOrigin };
+use frame_system::{RawOrigin};
fn default_collection_numbers_limit() -> u32 {
- 10
+ 10
}
fn default_limits() {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: default_collection_numbers_limit(),
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: default_collection_numbers_limit(),
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
}
fn default_nft_data() -> CreateNftData {
- CreateNftData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1] }
+ CreateNftData {
+ const_data: vec![1, 2, 3],
+ variable_data: vec![3, 2, 1],
+ }
}
-fn default_fungible_data () -> CreateFungibleData {
- CreateFungibleData { value: 5 }
+fn default_fungible_data() -> CreateFungibleData {
+ CreateFungibleData { value: 5 }
}
-fn default_re_fungible_data () -> CreateReFungibleData {
- CreateReFungibleData { const_data: vec![1, 2, 3], variable_data: vec![3, 2, 1], pieces: 1023 }
+fn default_re_fungible_data() -> CreateReFungibleData {
+ CreateReFungibleData {
+ const_data: vec![1, 2, 3],
+ variable_data: vec![3, 2, 1],
+ pieces: 1023,
+ }
}
-fn create_test_collection_for_owner(mode: &CollectionMode, owner: u64, id: CollectionId) -> CollectionId {
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+fn create_test_collection_for_owner(
+ mode: &CollectionMode,
+ owner: u64,
+ id: CollectionId,
+) -> CollectionId {
+ let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- let origin1 = Origin::signed(owner);
- assert_ok!(TemplateModule::create_collection(
- origin1.clone(),
- col_name1.clone(),
- col_desc1.clone(),
- token_prefix1.clone(),
- mode.clone()
- ));
+ let origin1 = Origin::signed(owner);
+ assert_ok!(TemplateModule::create_collection(
+ origin1,
+ col_name1,
+ col_desc1,
+ token_prefix1,
+ mode.clone()
+ ));
- let saved_col_name: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let saved_description: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let saved_prefix: Vec<u8> = b"token_prefix1\0".to_vec();
- assert_eq!(TemplateModule::collection_id(id).unwrap().owner, owner);
- assert_eq!(TemplateModule::collection_id(id).unwrap().name, saved_col_name);
- assert_eq!(TemplateModule::collection_id(id).unwrap().mode, *mode);
- assert_eq!(TemplateModule::collection_id(id).unwrap().description, saved_description);
- assert_eq!(TemplateModule::collection_id(id).unwrap().token_prefix, saved_prefix);
- id
+ let saved_col_name: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+ let saved_description: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+ let saved_prefix: Vec<u8> = b"token_prefix1\0".to_vec();
+ assert_eq!(TemplateModule::collection_id(id).unwrap().owner, owner);
+ assert_eq!(
+ TemplateModule::collection_id(id).unwrap().name,
+ saved_col_name
+ );
+ assert_eq!(TemplateModule::collection_id(id).unwrap().mode, *mode);
+ assert_eq!(
+ TemplateModule::collection_id(id).unwrap().description,
+ saved_description
+ );
+ assert_eq!(
+ TemplateModule::collection_id(id).unwrap().token_prefix,
+ saved_prefix
+ );
+ id
}
fn create_test_collection(mode: &CollectionMode, id: CollectionId) -> CollectionId {
- create_test_collection_for_owner(&mode, 1, id)
+ create_test_collection_for_owner(&mode, 1, id)
}
fn create_test_item(collection_id: CollectionId, data: &CreateItemData) {
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_item(
- origin1.clone(),
- collection_id,
- account(1),
- data.clone()
- ));
-
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::create_item(
+ origin1,
+ collection_id,
+ account(1),
+ data.clone()
+ ));
}
fn account(sub: u64) -> TestCrossAccountId {
- TestCrossAccountId::from_sub(sub)
+ TestCrossAccountId::from_sub(sub)
}
// Use cases tests region
@@ -92,149 +111,166 @@
#[test]
fn set_version_schema() {
- new_test_ext().execute_with(|| {
- default_limits();
- let origin1 = Origin::signed(1);
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-
- assert_ok!(TemplateModule::set_schema_version(origin1, collection_id, SchemaVersion::Unique));
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().schema_version, SchemaVersion::Unique);
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+ let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ assert_ok!(TemplateModule::set_schema_version(
+ origin1,
+ collection_id,
+ SchemaVersion::Unique
+ ));
+ assert_eq!(
+ TemplateModule::collection_id(collection_id)
+ .unwrap()
+ .schema_version,
+ SchemaVersion::Unique
+ );
+ });
}
#[test]
fn create_fungible_collection_fails_with_large_decimal_numbers() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+ let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- let origin1 = Origin::signed(1);
- assert_noop!(TemplateModule::create_collection(
- origin1,
- col_name1,
- col_desc1,
- token_prefix1,
- CollectionMode::Fungible(MAX_DECIMAL_POINTS + 1)
- ), Error::<Test>::CollectionDecimalPointLimitExceeded);
- });
+ let origin1 = Origin::signed(1);
+ assert_noop!(
+ TemplateModule::create_collection(
+ origin1,
+ col_name1,
+ col_desc1,
+ token_prefix1,
+ CollectionMode::Fungible(MAX_DECIMAL_POINTS + 1)
+ ),
+ Error::<Test>::CollectionDecimalPointLimitExceeded
+ );
+ });
}
#[test]
fn create_nft_item() {
- new_test_ext().execute_with(|| {
- default_limits();
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.clone().into());
- let item = TemplateModule::nft_item_id(collection_id, 1).unwrap();
- assert_eq!(item.const_data, data.const_data);
- assert_eq!(item.variable_data, data.variable_data);
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.clone().into());
+ let item = TemplateModule::nft_item_id(collection_id, 1).unwrap();
+ assert_eq!(item.const_data, data.const_data);
+ assert_eq!(item.variable_data, data.variable_data);
+ });
}
// Use cases tests region
// #region
#[test]
fn create_nft_multiple_items() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ create_test_collection(&CollectionMode::NFT, 1);
- let items_data = vec![default_nft_data(), default_nft_data(), default_nft_data()];
+ let origin1 = Origin::signed(1);
+
+ let items_data = vec![default_nft_data(), default_nft_data(), default_nft_data()];
- assert_ok!(TemplateModule::create_multiple_items(
- origin1.clone(),
- 1,
- account(1),
- items_data.clone().into_iter().map(|d| { d.into() }).collect()
- ));
- for (index, data) in items_data.iter().enumerate() {
- let item = TemplateModule::nft_item_id(1, (index + 1) as TokenId).unwrap();
- assert_eq!(item.const_data.to_vec(), data.const_data);
- assert_eq!(item.variable_data.to_vec(), data.variable_data);
- }
- });
+ assert_ok!(TemplateModule::create_multiple_items(
+ origin1,
+ 1,
+ account(1),
+ items_data
+ .clone()
+ .into_iter()
+ .map(|d| { d.into() })
+ .collect()
+ ));
+ for (index, data) in items_data.iter().enumerate() {
+ let item = TemplateModule::nft_item_id(1, (index + 1) as TokenId).unwrap();
+ assert_eq!(item.const_data.to_vec(), data.const_data);
+ assert_eq!(item.variable_data.to_vec(), data.variable_data);
+ }
+ });
}
#[test]
fn create_refungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- let data = default_re_fungible_data();
- create_test_item(collection_id, &data.clone().into());
- let item = TemplateModule::refungible_item_id(collection_id, 1).unwrap();
- assert_eq!(
- item.const_data,
- data.const_data
- );
- assert_eq!(
- item.variable_data,
- data.variable_data
- );
- assert_eq!(
- item.owner[0],
- Ownership {
- owner: account(1),
- fraction: 1023
- }
- );
- });
+ let data = default_re_fungible_data();
+ create_test_item(collection_id, &data.clone().into());
+ let item = TemplateModule::refungible_item_id(collection_id, 1).unwrap();
+ assert_eq!(item.const_data, data.const_data);
+ assert_eq!(item.variable_data, data.variable_data);
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: account(1),
+ fraction: 1023
+ }
+ );
+ });
}
#[test]
fn create_multiple_refungible_items() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- create_test_collection(&CollectionMode::ReFungible, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ create_test_collection(&CollectionMode::ReFungible, 1);
- let items_data = vec![default_re_fungible_data(), default_re_fungible_data(), default_re_fungible_data()];
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::create_multiple_items(
- origin1.clone(),
- 1,
- account(1),
- items_data.clone().into_iter().map(|d| { d.into() }).collect()
- ));
- for (index, data) in items_data.iter().enumerate() {
+ let items_data = vec![
+ default_re_fungible_data(),
+ default_re_fungible_data(),
+ default_re_fungible_data(),
+ ];
- let item = TemplateModule::refungible_item_id(1, (index + 1) as TokenId).unwrap();
- assert_eq!(item.const_data.to_vec(), data.const_data);
- assert_eq!(item.variable_data.to_vec(), data.variable_data);
- assert_eq!(
- item.owner[0],
- Ownership {
- owner: account(1),
- fraction: 1023
- }
- );
- }
- });
+ assert_ok!(TemplateModule::create_multiple_items(
+ origin1,
+ 1,
+ account(1),
+ items_data
+ .clone()
+ .into_iter()
+ .map(|d| { d.into() })
+ .collect()
+ ));
+ for (index, data) in items_data.iter().enumerate() {
+ let item = TemplateModule::refungible_item_id(1, (index + 1) as TokenId).unwrap();
+ assert_eq!(item.const_data.to_vec(), data.const_data);
+ assert_eq!(item.variable_data.to_vec(), data.variable_data);
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: account(1),
+ fraction: 1023
+ }
+ );
+ }
+ });
}
#[test]
fn create_fungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_fungible_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
- assert_eq!(TemplateModule::fungible_item_id(collection_id, 1).value, 5);
- });
+ let data = default_fungible_data();
+ create_test_item(collection_id, &data.into());
+
+ assert_eq!(TemplateModule::fungible_item_id(collection_id, 1).value, 5);
+ });
}
//#[test]
@@ -254,7 +290,7 @@
// 1,
// items_data.clone().into_iter().map(|d| { d.into() }).collect()
// ));
-
+
// for (index, _) in items_data.iter().enumerate() {
// assert_eq!(TemplateModule::fungible_item_id(1, (index + 1) as TokenId).value, 5);
// }
@@ -265,636 +301,746 @@
#[test]
fn transfer_fungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- let data = default_fungible_data();
- create_test_item(collection_id, &data.into());
+ let data = default_fungible_data();
+ create_test_item(collection_id, &data.into());
- assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 5);
- assert_eq!(TemplateModule::balance_count(1, 1), 5);
+ assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 5);
+ assert_eq!(TemplateModule::balance_count(1, 1), 5);
- // change owner scenario
- assert_ok!(TemplateModule::transfer(origin1.clone(), account(2), 1, 1, 5));
- assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 0);
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- assert_eq!(TemplateModule::balance_count(1, 2), 5);
+ // change owner scenario
+ assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 5));
+ assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 0);
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ assert_eq!(TemplateModule::balance_count(1, 2), 5);
- // split item scenario
- assert_ok!(TemplateModule::transfer(origin2.clone(), account(3), 1, 1, 3));
- assert_eq!(TemplateModule::balance_count(1, 2), 2);
- assert_eq!(TemplateModule::balance_count(1, 3), 3);
+ // split item scenario
+ assert_ok!(TemplateModule::transfer(
+ origin2.clone(),
+ account(3),
+ 1,
+ 1,
+ 3
+ ));
+ assert_eq!(TemplateModule::balance_count(1, 2), 2);
+ assert_eq!(TemplateModule::balance_count(1, 3), 3);
- // split item and new owner has account scenario
- assert_ok!(TemplateModule::transfer(origin2.clone(), account(3), 1, 1, 1));
- assert_eq!(TemplateModule::fungible_item_id(1, 2).value, 1);
- assert_eq!(TemplateModule::fungible_item_id(1, 3).value, 4);
- assert_eq!(TemplateModule::balance_count(1, 2), 1);
- assert_eq!(TemplateModule::balance_count(1, 3), 4);
- });
+ // split item and new owner has account scenario
+ assert_ok!(TemplateModule::transfer(origin2, account(3), 1, 1, 1));
+ assert_eq!(TemplateModule::fungible_item_id(1, 2).value, 1);
+ assert_eq!(TemplateModule::fungible_item_id(1, 3).value, 4);
+ assert_eq!(TemplateModule::balance_count(1, 2), 1);
+ assert_eq!(TemplateModule::balance_count(1, 3), 4);
+ });
}
#[test]
fn transfer_refungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_re_fungible_data();
- create_test_item(collection_id, &data.clone().into());
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
- {
- let item = TemplateModule::refungible_item_id(collection_id, 1).unwrap();
- assert_eq!(
- item.const_data,
- data.const_data
- );
- assert_eq!(
- item.variable_data,
- data.variable_data
- );
- assert_eq!(
- item.owner[0],
- Ownership {
- owner: account(1),
- fraction: 1023
- }
- );
- }
- assert_eq!(TemplateModule::balance_count(1, 1), 1023);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ let data = default_re_fungible_data();
+ create_test_item(collection_id, &data.clone().into());
- // change owner scenario
- assert_ok!(TemplateModule::transfer(origin1.clone(), account(2), 1, 1, 1023));
- assert_eq!(
- TemplateModule::refungible_item_id(1, 1).unwrap().owner[0],
- Ownership {
- owner: account(2),
- fraction: 1023
- }
- );
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- assert_eq!(TemplateModule::balance_count(1, 2), 1023);
- // assert_eq!(TemplateModule::address_tokens(1, 1), []);
- assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
+ {
+ let item = TemplateModule::refungible_item_id(collection_id, 1).unwrap();
+ assert_eq!(item.const_data, data.const_data);
+ assert_eq!(item.variable_data, data.variable_data);
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: account(1),
+ fraction: 1023
+ }
+ );
+ }
+ assert_eq!(TemplateModule::balance_count(1, 1), 1023);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+
+ // change owner scenario
+ assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1023));
+ assert_eq!(
+ TemplateModule::refungible_item_id(1, 1).unwrap().owner[0],
+ Ownership {
+ owner: account(2),
+ fraction: 1023
+ }
+ );
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ assert_eq!(TemplateModule::balance_count(1, 2), 1023);
+ // assert_eq!(TemplateModule::address_tokens(1, 1), []);
+ assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
- // split item scenario
- assert_ok!(TemplateModule::transfer(origin2.clone(), account(3), 1, 1, 500));
- {
- let item = TemplateModule::refungible_item_id(1, 1).unwrap();
- assert_eq!(
- item.owner[0],
- Ownership {
- owner: account(2),
- fraction: 523
- }
- );
- assert_eq!(
- item.owner[1],
- Ownership {
- owner: account(3),
- fraction: 500
- }
- );
- }
- assert_eq!(TemplateModule::balance_count(1, 2), 523);
- assert_eq!(TemplateModule::balance_count(1, 3), 500);
- assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
- assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
+ // split item scenario
+ assert_ok!(TemplateModule::transfer(
+ origin2.clone(),
+ account(3),
+ 1,
+ 1,
+ 500
+ ));
+ {
+ let item = TemplateModule::refungible_item_id(1, 1).unwrap();
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: account(2),
+ fraction: 523
+ }
+ );
+ assert_eq!(
+ item.owner[1],
+ Ownership {
+ owner: account(3),
+ fraction: 500
+ }
+ );
+ }
+ assert_eq!(TemplateModule::balance_count(1, 2), 523);
+ assert_eq!(TemplateModule::balance_count(1, 3), 500);
+ assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+ assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
- // split item and new owner has account scenario
- assert_ok!(TemplateModule::transfer(origin2.clone(), account(3), 1, 1, 200));
- {
- let item = TemplateModule::refungible_item_id(1, 1).unwrap();
- assert_eq!(
- item.owner[0],
- Ownership {
- owner: account(2),
- fraction: 323
- }
- );
- assert_eq!(
- item.owner[1],
- Ownership {
- owner: account(3),
- fraction: 700
- }
- );
- }
- assert_eq!(TemplateModule::balance_count(1, 2), 323);
- assert_eq!(TemplateModule::balance_count(1, 3), 700);
- assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
- assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
- });
+ // split item and new owner has account scenario
+ assert_ok!(TemplateModule::transfer(origin2, account(3), 1, 1, 200));
+ {
+ let item = TemplateModule::refungible_item_id(1, 1).unwrap();
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: account(2),
+ fraction: 323
+ }
+ );
+ assert_eq!(
+ item.owner[1],
+ Ownership {
+ owner: account(3),
+ fraction: 700
+ }
+ );
+ }
+ assert_eq!(TemplateModule::balance_count(1, 2), 323);
+ assert_eq!(TemplateModule::balance_count(1, 3), 700);
+ assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+ assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
+ });
}
#[test]
fn transfer_nft_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
- assert_eq!(TemplateModule::balance_count(1, 1), 1);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- let origin1 = Origin::signed(1);
- // default scenario
- assert_ok!(TemplateModule::transfer(origin1.clone(), account(2), 1, 1, 1000));
- assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- assert_eq!(TemplateModule::balance_count(1, 2), 1);
- // assert_eq!(TemplateModule::address_tokens(1, 1), []);
- assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
- });
+ let origin1 = Origin::signed(1);
+ // default scenario
+ assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));
+ assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ assert_eq!(TemplateModule::balance_count(1, 2), 1);
+ // assert_eq!(TemplateModule::address_tokens(1, 1), []);
+ assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+ });
}
#[test]
fn nft_approve_and_transfer_from() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_eq!(TemplateModule::balance_count(1, 1), 1);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- // neg transfer
- assert_noop!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(2),
- 1,
- 1,
- 1), Error::<Test>::NoPermission);
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
- assert_eq!(
- TemplateModule::approved(1, (1, 1, 2)),
- 5
- );
+ // neg transfer
+ assert_noop!(
+ TemplateModule::transfer_from(origin2.clone(), account(1), account(2), 1, 1, 1),
+ Error::<Test>::NoPermission
+ );
- assert_ok!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(3),
- 1,
- 1,
- 1
- ));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 4);
- });
+ // do approve
+ assert_ok!(TemplateModule::approve(origin1, account(2), 1, 1, 5));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
+
+ assert_ok!(TemplateModule::transfer_from(
+ origin2,
+ account(1),
+ account(3),
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 4);
+ });
}
#[test]
fn nft_approve_and_transfer_from_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- let data = default_nft_data();
- create_test_item(collection_id, &data.clone().into());
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.clone().into());
- assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().const_data, data.const_data);
- assert_eq!(TemplateModule::balance_count(1, 1), 1);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ assert_eq!(
+ TemplateModule::nft_item_id(1, 1).unwrap().const_data,
+ data.const_data
+ );
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- 1,
- true
- ));
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- 1,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(3)));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ 1,
+ true
+ ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ 1,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(3)
+ ));
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
- assert_ok!(TemplateModule::approve(origin1.clone(), account(3), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 3)), 5);
+ // do approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(2),
+ 1,
+ 1,
+ 5
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
+ assert_ok!(TemplateModule::approve(origin1, account(3), 1, 1, 5));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 3)), 5);
- assert_ok!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(3),
- 1,
- 1,
- 1
- ));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 4);
- });
+ assert_ok!(TemplateModule::transfer_from(
+ origin2,
+ account(1),
+ account(3),
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 4);
+ });
}
#[test]
fn refungible_approve_and_transfer_from() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
-
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_re_fungible_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- assert_eq!(TemplateModule::balance_count(1, 1), 1023);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- 1,
- true
- ));
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- 1,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(3)));
+ let data = default_re_fungible_data();
+ create_test_item(collection_id, &data.into());
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 1023));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1023);
+ assert_eq!(TemplateModule::balance_count(1, 1), 1023);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_ok!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(3),
- 1,
- 1,
- 100
- ));
- assert_eq!(TemplateModule::balance_count(1, 1), 923);
- assert_eq!(TemplateModule::balance_count(1, 3), 100);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ 1,
+ true
+ ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ 1,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(3)
+ ));
- assert_eq!(
- TemplateModule::approved(1, (1, 1, 2)),
- 923
- );
- });
+ // do approve
+ assert_ok!(TemplateModule::approve(origin1, account(2), 1, 1, 1023));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1023);
+
+ assert_ok!(TemplateModule::transfer_from(
+ origin2,
+ account(1),
+ account(3),
+ 1,
+ 1,
+ 100
+ ));
+ assert_eq!(TemplateModule::balance_count(1, 1), 923);
+ assert_eq!(TemplateModule::balance_count(1, 3), 100);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ assert_eq!(TemplateModule::address_tokens(1, 3), [1]);
+
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 923);
+ });
}
#[test]
fn fungible_approve_and_transfer_from() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
-
- let data = default_fungible_data();
- create_test_item(collection_id, &data.into());
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+
+ let data = default_fungible_data();
+ create_test_item(collection_id, &data.into());
+
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_eq!(TemplateModule::balance_count(1, 1), 5);
+ assert_eq!(TemplateModule::balance_count(1, 1), 5);
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- 1,
- true
- ));
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- 1,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(3)));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ 1,
+ true
+ ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ 1,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(3)
+ ));
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
- assert_ok!(TemplateModule::approve(origin1.clone(), account(3), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 3)), 5);
- assert_eq!(
- TemplateModule::approved(1, (1, 1, 2)),
- 5
- );
+ // do approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(2),
+ 1,
+ 1,
+ 5
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
+ assert_ok!(TemplateModule::approve(origin1, account(3), 1, 1, 5));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 3)), 5);
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 5);
- assert_ok!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(3),
- 1,
- 1,
- 4
- ));
- assert_eq!(TemplateModule::balance_count(1, 1), 1);
- assert_eq!(TemplateModule::balance_count(1, 3), 4);
+ assert_ok!(TemplateModule::transfer_from(
+ origin2.clone(),
+ account(1),
+ account(3),
+ 1,
+ 1,
+ 4
+ ));
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::balance_count(1, 3), 4);
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
- assert_noop!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(3),
- 1,
- 1,
- 4
- ), Error::<Test>::NoPermission);
- });
+ assert_noop!(
+ TemplateModule::transfer_from(origin2, account(1), account(3), 1, 1, 4),
+ Error::<Test>::NoPermission
+ );
+ });
}
#[test]
fn change_collection_owner() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::change_collection_owner(
- origin1.clone(),
- collection_id,
- 2
- ));
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().owner, 2);
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::change_collection_owner(
+ origin1,
+ collection_id,
+ 2
+ ));
+ assert_eq!(
+ TemplateModule::collection_id(collection_id).unwrap().owner,
+ 2
+ );
+ });
}
#[test]
fn destroy_collection() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::destroy_collection(origin1.clone(), collection_id));
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::destroy_collection(origin1, collection_id));
+ });
}
#[test]
fn burn_nft_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- // check balance (collection with id = 1, user id = 1)
- assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
- // burn item
- assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
- assert_noop!(
- TemplateModule::burn_item(origin1.clone(), 1, 1, 5),
- Error::<Test>::TokenNotFound
- );
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+
+ // check balance (collection with id = 1, user id = 1)
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+
+ // burn item
+ assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
+ assert_noop!(
+ TemplateModule::burn_item(origin1, 1, 1, 5),
+ Error::<Test>::TokenNotFound
+ );
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- });
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ });
}
#[test]
fn burn_fungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
-
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
-
- let data = default_fungible_data();
- create_test_item(collection_id, &data.into());
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+
+ let data = default_fungible_data();
+ create_test_item(collection_id, &data.into());
- // check balance (collection with id = 1, user id = 1)
- assert_eq!(TemplateModule::balance_count(1, 1), 5);
+ // check balance (collection with id = 1, user id = 1)
+ assert_eq!(TemplateModule::balance_count(1, 1), 5);
- // burn item
- assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
- assert_noop!(
- TemplateModule::burn_item(origin1.clone(), 1, 1, 5),
- Error::<Test>::TokenValueNotEnough
- );
+ // burn item
+ assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
+ assert_noop!(
+ TemplateModule::burn_item(origin1, 1, 1, 5),
+ Error::<Test>::TokenValueNotEnough
+ );
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- });
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ });
}
#[test]
fn burn_refungible_item() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- let origin1 = Origin::signed(1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- true
- ));
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, account(2)));
-
- let data = default_re_fungible_data();
- create_test_item(collection_id, &data.into());
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ true
+ ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+
+ let data = default_re_fungible_data();
+ create_test_item(collection_id, &data.into());
- // check balance (collection with id = 1, user id = 2)
- assert_eq!(TemplateModule::balance_count(1, 1), 1023);
+ // check balance (collection with id = 1, user id = 2)
+ assert_eq!(TemplateModule::balance_count(1, 1), 1023);
- // burn item
- assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 1023));
- assert_noop!(
- TemplateModule::burn_item(origin1.clone(), 1, 1, 1023),
- Error::<Test>::TokenNotFound
- );
+ // burn item
+ assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 1023));
+ assert_noop!(
+ TemplateModule::burn_item(origin1, 1, 1, 1023),
+ Error::<Test>::TokenNotFound
+ );
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- });
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ });
}
#[test]
fn add_collection_admin() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection1_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
- create_test_collection_for_owner(&CollectionMode::NFT, 2, 2);
- create_test_collection_for_owner(&CollectionMode::NFT, 3, 3);
-
- let origin1 = Origin::signed(1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- // collection admin
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection1_id, account(2)));
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection1_id, account(3)));
+ let collection1_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
+ create_test_collection_for_owner(&CollectionMode::NFT, 2, 2);
+ create_test_collection_for_owner(&CollectionMode::NFT, 3, 3);
+
+ let origin1 = Origin::signed(1);
+
+ // collection admin
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection1_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection1_id,
+ account(3)
+ ));
- assert_eq!(TemplateModule::admin_list_collection(collection1_id).contains(&account(2)), true);
- assert_eq!(TemplateModule::admin_list_collection(collection1_id).contains(&account(3)), true);
- });
+ assert!(TemplateModule::admin_list_collection(collection1_id).contains(&account(2)),);
+ assert!(TemplateModule::admin_list_collection(collection1_id).contains(&account(3)),);
+ });
}
#[test]
fn remove_collection_admin() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection1_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
- create_test_collection_for_owner(&CollectionMode::NFT, 2, 2);
- create_test_collection_for_owner(&CollectionMode::NFT, 3, 3);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection1_id = create_test_collection_for_owner(&CollectionMode::NFT, 1, 1);
+ create_test_collection_for_owner(&CollectionMode::NFT, 2, 2);
+ create_test_collection_for_owner(&CollectionMode::NFT, 3, 3);
- // collection admin
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection1_id, account(2)));
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection1_id, account(3)));
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_eq!(TemplateModule::admin_list_collection(1).contains(&account(2)), true);
- assert_eq!(TemplateModule::admin_list_collection(1).contains(&account(3)), true);
+ // collection admin
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection1_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection1_id,
+ account(3)
+ ));
- // remove admin
- assert_ok!(TemplateModule::remove_collection_admin(
- origin2.clone(),
- 1,
- account(3)
- ));
- assert_eq!(TemplateModule::admin_list_collection(1).contains(&account(3)), false);
- });
+ assert!(TemplateModule::admin_list_collection(1).contains(&account(2)),);
+ assert!(TemplateModule::admin_list_collection(1).contains(&account(3)),);
+
+ // remove admin
+ assert_ok!(TemplateModule::remove_collection_admin(
+ origin2,
+ 1,
+ account(3)
+ ));
+ assert!(!TemplateModule::admin_list_collection(1).contains(&account(3)),);
+ });
}
#[test]
fn balance_of() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let nft_collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let fungible_collection_id = create_test_collection(&CollectionMode::Fungible(3), 2);
- let re_fungible_collection_id = create_test_collection(&CollectionMode::ReFungible, 3);
-
- // check balance before
- assert_eq!(TemplateModule::balance_count(nft_collection_id, 1), 0);
- assert_eq!(TemplateModule::balance_count(fungible_collection_id, 1), 0);
- assert_eq!(TemplateModule::balance_count(re_fungible_collection_id, 1), 0);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let nft_collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let fungible_collection_id = create_test_collection(&CollectionMode::Fungible(3), 2);
+ let re_fungible_collection_id = create_test_collection(&CollectionMode::ReFungible, 3);
+
+ // check balance before
+ assert_eq!(TemplateModule::balance_count(nft_collection_id, 1), 0);
+ assert_eq!(TemplateModule::balance_count(fungible_collection_id, 1), 0);
+ assert_eq!(
+ TemplateModule::balance_count(re_fungible_collection_id, 1),
+ 0
+ );
+
+ let nft_data = default_nft_data();
+ create_test_item(nft_collection_id, &nft_data.into());
+
+ let fungible_data = default_fungible_data();
+ create_test_item(fungible_collection_id, &fungible_data.into());
- let nft_data = default_nft_data();
- create_test_item(nft_collection_id, &nft_data.into());
-
- let fungible_data = default_fungible_data();
- create_test_item(fungible_collection_id, &fungible_data.into());
-
- let re_fungible_data = default_re_fungible_data();
- create_test_item(re_fungible_collection_id, &re_fungible_data.into());
+ let re_fungible_data = default_re_fungible_data();
+ create_test_item(re_fungible_collection_id, &re_fungible_data.into());
- // check balance (collection with id = 1, user id = 1)
- assert_eq!(TemplateModule::balance_count(nft_collection_id, 1), 1);
- assert_eq!(TemplateModule::balance_count(fungible_collection_id, 1), 5);
- assert_eq!(TemplateModule::balance_count(re_fungible_collection_id, 1), 1023);
- assert_eq!(TemplateModule::nft_item_id(nft_collection_id, 1).unwrap().owner, account(1));
- assert_eq!(TemplateModule::fungible_item_id(fungible_collection_id, 1).value, 5);
- assert_eq!(TemplateModule::refungible_item_id(re_fungible_collection_id, 1).unwrap().owner[0].owner, account(1));
- });
+ // check balance (collection with id = 1, user id = 1)
+ assert_eq!(TemplateModule::balance_count(nft_collection_id, 1), 1);
+ assert_eq!(TemplateModule::balance_count(fungible_collection_id, 1), 5);
+ assert_eq!(
+ TemplateModule::balance_count(re_fungible_collection_id, 1),
+ 1023
+ );
+ assert_eq!(
+ TemplateModule::nft_item_id(nft_collection_id, 1)
+ .unwrap()
+ .owner,
+ account(1)
+ );
+ assert_eq!(
+ TemplateModule::fungible_item_id(fungible_collection_id, 1).value,
+ 5
+ );
+ assert_eq!(
+ TemplateModule::refungible_item_id(re_fungible_collection_id, 1)
+ .unwrap()
+ .owner[0]
+ .owner,
+ account(1)
+ );
+ });
}
#[test]
fn approve() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
-
- // approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 1));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
- });
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+
+ let origin1 = Origin::signed(1);
+
+ // approve
+ assert_ok!(TemplateModule::approve(origin1, account(2), 1, 1, 1));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
+ });
}
#[test]
fn transfer_from() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- // approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(2), 1, 1, 1));
- assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- 1,
- true
- ));
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- 1,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(3)));
+ // approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(2),
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 2)), 1);
- assert_ok!(TemplateModule::transfer_from(
- origin2.clone(),
- account(1),
- account(2),
- 1,
- 1,
- 1
- ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ 1,
+ true
+ ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ 1,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(origin1, 1, account(3)));
- // after transfer
- assert_eq!(TemplateModule::balance_count(1, 1), 0);
- assert_eq!(TemplateModule::balance_count(1, 2), 1);
- });
+ assert_ok!(TemplateModule::transfer_from(
+ origin2,
+ account(1),
+ account(2),
+ 1,
+ 1,
+ 1
+ ));
+
+ // after transfer
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ assert_eq!(TemplateModule::balance_count(1, 2), 1);
+ });
}
// #endregion
@@ -904,1093 +1050,1304 @@
#[test]
fn owner_can_add_address_to_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_eq!(TemplateModule::white_list(collection_id, 2), true);
- });
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert!(TemplateModule::white_list(collection_id, 2));
+ });
}
#[test]
fn admin_can_add_address_to_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin2.clone(), collection_id, account(3)));
- assert_eq!(TemplateModule::white_list(collection_id, 3), true);
- });
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
+
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin2,
+ collection_id,
+ account(3)
+ ));
+ assert!(TemplateModule::white_list(collection_id, 3));
+ });
}
#[test]
fn nonprivileged_user_cannot_add_address_to_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin2 = Origin::signed(2);
- assert_noop!(
- TemplateModule::add_to_white_list(origin2.clone(), collection_id, account(3)),
- Error::<Test>::NoPermission
- );
- });
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin2 = Origin::signed(2);
+ assert_noop!(
+ TemplateModule::add_to_white_list(origin2, collection_id, account(3)),
+ Error::<Test>::NoPermission
+ );
+ });
}
#[test]
fn nobody_can_add_address_to_white_list_of_nonexisting_collection() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- assert_noop!(
- TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)),
- Error::<Test>::CollectionNotFound
- );
- });
+ assert_noop!(
+ TemplateModule::add_to_white_list(origin1, 1, account(2)),
+ Error::<Test>::CollectionNotFound
+ );
+ });
}
#[test]
fn nobody_can_add_address_to_white_list_of_deleted_collection() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::destroy_collection(origin1.clone(), collection_id));
- assert_noop!(
- TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)),
- Error::<Test>::CollectionNotFound
- );
- });
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::destroy_collection(
+ origin1.clone(),
+ collection_id
+ ));
+ assert_noop!(
+ TemplateModule::add_to_white_list(origin1, collection_id, account(2)),
+ Error::<Test>::CollectionNotFound
+ );
+ });
}
// If address is already added to white list, nothing happens
#[test]
fn address_is_already_added_to_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
-
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_eq!(TemplateModule::white_list(collection_id, 2), true);
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert!(TemplateModule::white_list(collection_id, 2));
+ });
}
#[test]
fn owner_can_remove_address_from_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::remove_from_white_list(
- origin1.clone(),
- collection_id,
- account(2)
- ));
- assert_eq!(TemplateModule::white_list(collection_id, 2), false);
- });
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert!(!TemplateModule::white_list(collection_id, 2));
+ });
}
#[test]
fn admin_can_remove_address_from_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(3)));
- assert_ok!(TemplateModule::remove_from_white_list(
- origin2.clone(),
- collection_id,
- account(3)
- ));
- assert_eq!(TemplateModule::white_list(collection_id, 3), false);
- });
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(3)
+ ));
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin2,
+ collection_id,
+ account(3)
+ ));
+ assert!(!TemplateModule::white_list(collection_id, 3));
+ });
}
#[test]
fn nonprivileged_user_cannot_remove_address_from_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_noop!(
- TemplateModule::remove_from_white_list(origin2.clone(), collection_id, account(2)),
- Error::<Test>::NoPermission
- );
- assert_eq!(TemplateModule::white_list(collection_id, 2), true);
- });
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert_noop!(
+ TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),
+ Error::<Test>::NoPermission
+ );
+ assert!(TemplateModule::white_list(collection_id, 2));
+ });
}
#[test]
fn nobody_can_remove_address_from_white_list_of_nonexisting_collection() {
- new_test_ext().execute_with(|| {
- default_limits();
- let origin1 = Origin::signed(1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+ let origin1 = Origin::signed(1);
- assert_noop!(
- TemplateModule::remove_from_white_list(origin1.clone(), 1, account(2)),
- Error::<Test>::CollectionNotFound
- );
- });
+ assert_noop!(
+ TemplateModule::remove_from_white_list(origin1, 1, account(2)),
+ Error::<Test>::CollectionNotFound
+ );
+ });
}
#[test]
fn nobody_can_remove_address_from_white_list_of_deleted_collection() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::destroy_collection(origin1.clone(), collection_id));
- assert_noop!(
- TemplateModule::remove_from_white_list(origin2.clone(), collection_id, account(2)),
- Error::<Test>::CollectionNotFound
- );
- assert_eq!(TemplateModule::white_list(collection_id, 2), false);
- });
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
+
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::destroy_collection(origin1, collection_id));
+ assert_noop!(
+ TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),
+ Error::<Test>::CollectionNotFound
+ );
+ assert!(!TemplateModule::white_list(collection_id, 2));
+ });
}
// If address is already removed from white list, nothing happens
#[test]
fn address_is_already_removed_from_white_list() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::remove_from_white_list(
- origin1.clone(),
- collection_id,
- account(2)
- ));
- assert_ok!(TemplateModule::remove_from_white_list(
- origin1.clone(),
- collection_id,
- account(2)
- ));
- assert_eq!(TemplateModule::white_list(collection_id, 2), false);
- });
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
+
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+ assert!(!TemplateModule::white_list(collection_id, 2));
+ });
}
// If Public Access mode is set to WhiteList, tokens can’t be transferred from a non-whitelisted address with transfer or transferFrom (2 tests)
#[test]
fn white_list_test_1() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
- assert_noop!(
- TemplateModule::transfer(origin1.clone(), account(3), 1, 1, 1),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_noop!(
+ TemplateModule::transfer(origin1, account(3), 1, 1, 1),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
#[test]
fn white_list_test_2() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(2)));
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(1), 1, 1, 1));
- assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_ok!(TemplateModule::remove_from_white_list(
- origin1.clone(),
- 1,
- account(1)
- ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(2)
+ ));
+
+ // do approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(1),
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
- assert_noop!(
- TemplateModule::transfer_from(origin1.clone(), account(1), account(3), 1, 1, 1),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
+
+ assert_noop!(
+ TemplateModule::transfer_from(origin1, account(1), account(3), 1, 1, 1),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
// If Public Access mode is set to WhiteList, tokens can’t be transferred to a non-whitelisted address with transfer or transferFrom (2 tests)
#[test]
fn white_list_test_3() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
- let origin1 = Origin::signed(1);
-
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, account(1)));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ 1,
+ account(1)
+ ));
- assert_noop!(
- TemplateModule::transfer(origin1.clone(), account(3), 1, 1, 1),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_noop!(
+ TemplateModule::transfer(origin1, account(3), 1, 1, 1),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
#[test]
fn white_list_test_4() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(1), 1, 1, 1));
- assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+
+ // do approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(1),
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
- assert_ok!(TemplateModule::remove_from_white_list(
- origin1.clone(),
- collection_id,
- account(2)
- ));
+ assert_ok!(TemplateModule::remove_from_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
- assert_noop!(
- TemplateModule::transfer_from(origin1.clone(), account(1), account(3), 1, 1, 1),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_noop!(
+ TemplateModule::transfer_from(origin1, account(1), account(3), 1, 1, 1),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
// If Public Access mode is set to WhiteList, tokens can’t be destroyed by a non-whitelisted address (even if it owned them before enabling WhiteList mode)
#[test]
fn white_list_test_5() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_noop!(
- TemplateModule::burn_item(origin1.clone(), 1, 1, 5),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_noop!(
+ TemplateModule::burn_item(origin1, 1, 1, 5),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
// If Public Access mode is set to WhiteList, token transfers can’t be Approved by a non-whitelisted address (see Approve method).
#[test]
fn white_list_test_6() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
- // do approve
- assert_noop!(
- TemplateModule::approve(origin1.clone(), account(1), 1, 1, 5),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ // do approve
+ assert_noop!(
+ TemplateModule::approve(origin1, account(1), 1, 1, 5),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
// If Public Access mode is set to WhiteList, tokens can be transferred from a whitelisted address with transfer or transferFrom (2 tests) and
// tokens can be transferred from a whitelisted address with transfer or transferFrom (2 tests)
#[test]
fn white_list_test_7() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
-
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
- assert_ok!(TemplateModule::transfer(origin1.clone(), account(2), 1, 1, 1));
- });
+ assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1));
+ });
}
#[test]
fn white_list_test_8() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
-
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(1)));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
- // do approve
- assert_ok!(TemplateModule::approve(origin1.clone(), account(1), 1, 1, 5));
- assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 5);
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::transfer_from(
- origin1.clone(),
- account(1),
- account(2),
- 1,
- 1,
- 1
- ));
- });
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(1)
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+
+ // do approve
+ assert_ok!(TemplateModule::approve(
+ origin1.clone(),
+ account(1),
+ 1,
+ 1,
+ 5
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 5);
+
+ assert_ok!(TemplateModule::transfer_from(
+ origin1,
+ account(1),
+ account(2),
+ 1,
+ 1,
+ 1
+ ));
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens can be created by owner.
#[test]
fn white_list_test_9() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- false
- ));
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let origin1 = Origin::signed(1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
- });
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1,
+ collection_id,
+ false
+ ));
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens can be created by admin.
#[test]
fn white_list_test_10() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- false
- ));
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ false
+ ));
- assert_ok!(TemplateModule::create_item(
- origin2.clone(),
- collection_id,
- account(2),
- default_nft_data().into()
- ));
- });
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+
+ assert_ok!(TemplateModule::create_item(
+ origin2,
+ collection_id,
+ account(2),
+ default_nft_data().into()
+ ));
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens cannot be created by non-privileged and white listed address.
#[test]
fn white_list_test_11() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- false
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_noop!(
- TemplateModule::create_item(origin2.clone(), 1, account(2), default_nft_data().into()),
- Error::<Test>::PublicMintingNotAllowed
- );
- });
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ false
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
+
+ assert_noop!(
+ TemplateModule::create_item(origin2, 1, account(2), default_nft_data().into()),
+ Error::<Test>::PublicMintingNotAllowed
+ );
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens cannot be created by non-privileged and non-white listed address.
#[test]
fn white_list_test_12() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- false
- ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1,
+ collection_id,
+ false
+ ));
- assert_noop!(
- TemplateModule::create_item(origin2.clone(), 1, account(2), default_nft_data().into()),
- Error::<Test>::PublicMintingNotAllowed
- );
- });
+ assert_noop!(
+ TemplateModule::create_item(origin2, 1, account(2), default_nft_data().into()),
+ Error::<Test>::PublicMintingNotAllowed
+ );
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by owner.
#[test]
fn white_list_test_13() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- true
- ));
+ let origin1 = Origin::signed(1);
+
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1,
+ collection_id,
+ true
+ ));
- let data = default_nft_data();
- create_test_item(collection_id, &data.into());
- });
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by admin.
#[test]
fn white_list_test_14() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- true
- ));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ true
+ ));
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection_id,
+ account(2)
+ ));
- assert_ok!(TemplateModule::create_item(
- origin2.clone(),
- 1,
- account(2),
- default_nft_data().into()
- ));
- });
+ assert_ok!(TemplateModule::create_item(
+ origin2,
+ 1,
+ account(2),
+ default_nft_data().into()
+ ));
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens cannot be created by non-privileged and non-white listed address.
#[test]
fn white_list_test_15() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- true
- ));
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_noop!(
- TemplateModule::create_item(origin2.clone(), 1, account(2), default_nft_data().into()),
- Error::<Test>::AddresNotInWhiteList
- );
- });
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1,
+ collection_id,
+ true
+ ));
+
+ assert_noop!(
+ TemplateModule::create_item(origin2, 1, account(2), default_nft_data().into()),
+ Error::<Test>::AddresNotInWhiteList
+ );
+ });
}
// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by non-privileged and white listed address.
#[test]
fn white_list_test_16() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::set_public_access_mode(
- origin1.clone(),
- collection_id,
- AccessMode::WhiteList
- ));
- assert_ok!(TemplateModule::set_mint_permission(
- origin1.clone(),
- collection_id,
- true
- ));
- assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, account(2)));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::WhiteList
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ true
+ ));
+ assert_ok!(TemplateModule::add_to_white_list(
+ origin1,
+ collection_id,
+ account(2)
+ ));
- assert_ok!(TemplateModule::create_item(
- origin2.clone(),
- 1,
- account(2),
- default_nft_data().into()
- ));
- });
+ assert_ok!(TemplateModule::create_item(
+ origin2,
+ 1,
+ account(2),
+ default_nft_data().into()
+ ));
+ });
}
// Total number of collections. Positive test
#[test]
fn total_number_collections_bound() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- create_test_collection(&CollectionMode::NFT, 1);
- });
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ create_test_collection(&CollectionMode::NFT, 1);
+ });
}
// Total number of collections. Negotive test
#[test]
fn total_number_collections_bound_neg() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- for i in 0..default_collection_numbers_limit() {
- create_test_collection(&CollectionMode::NFT, i + 1);
- }
+ for i in 0..default_collection_numbers_limit() {
+ create_test_collection(&CollectionMode::NFT, i + 1);
+ }
- let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
- let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
- let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+ let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
- // 11-th collection in chain. Expects error
- assert_noop!(TemplateModule::create_collection(
- origin1.clone(),
- col_name1.clone(),
- col_desc1.clone(),
- token_prefix1.clone(),
- CollectionMode::NFT
- ), Error::<Test>::TotalCollectionsLimitExceeded);
- });
+ // 11-th collection in chain. Expects error
+ assert_noop!(
+ TemplateModule::create_collection(
+ origin1,
+ col_name1,
+ col_desc1,
+ token_prefix1,
+ CollectionMode::NFT
+ ),
+ Error::<Test>::TotalCollectionsLimitExceeded
+ );
+ });
}
// Owned tokens by a single address. Positive test
#[test]
fn owned_tokens_bound() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.clone().into());
- create_test_item(collection_id, &data.into());
- });
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.clone().into());
+ create_test_item(collection_id, &data.into());
+ });
}
// Owned tokens by a single address. Negotive test
#[test]
fn owned_tokens_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 1,
- collections_admins_limit: 5,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 1,
+ collections_admins_limit: 5,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let origin1 = Origin::signed(1);
- let data = default_nft_data();
- create_test_item(collection_id, &data.clone().into());
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_noop!(TemplateModule::create_item(
- origin1.clone(),
- 1,
- account(1),
- data.into()
- ), Error::<Test>::AddressOwnershipLimitExceeded);
- });
+ let origin1 = Origin::signed(1);
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.clone().into());
+
+ assert_noop!(
+ TemplateModule::create_item(origin1, 1, account(1), data.into()),
+ Error::<Test>::AddressOwnershipLimitExceeded
+ );
+ });
}
// Number of collection admins. Positive test
#[test]
fn collection_admins_bound() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 2,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 2,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
- let origin1 = Origin::signed(1);
-
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(3)));
- });
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1,
+ collection_id,
+ account(3)
+ ));
+ });
}
// Number of collection admins. Negotive test
#[test]
fn collection_admins_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 1,
- collections_admins_limit: 1,
- custom_data_limit: 2048,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 1,
+ collections_admins_limit: 1,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let origin1 = Origin::signed(1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(2)));
- assert_noop!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, account(3)), Error::<Test>::CollectionAdminsLimitExceeded);
- });
+ assert_ok!(TemplateModule::add_collection_admin(
+ origin1.clone(),
+ collection_id,
+ account(2)
+ ));
+ assert_noop!(
+ TemplateModule::add_collection_admin(origin1, collection_id, account(3)),
+ Error::<Test>::CollectionAdminsLimitExceeded
+ );
+ });
}
// NFT custom data size. Negative test const_data.
#[test]
fn custom_data_size_nft_const_data_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let too_big_const_data = CreateItemData::NFT(CreateNftData{
- const_data: vec![1, 2, 3, 4],
- variable_data: vec![]
- });
+ let origin1 = Origin::signed(1);
+ let too_big_const_data = CreateItemData::NFT(CreateNftData {
+ const_data: vec![1, 2, 3, 4],
+ variable_data: vec![],
+ });
- assert_noop!(TemplateModule::create_item(
- origin1.clone(),
- collection_id,
- account(1),
- too_big_const_data
- ), Error::<Test>::TokenConstDataLimitExceeded);
- });
+ assert_noop!(
+ TemplateModule::create_item(origin1, collection_id, account(1), too_big_const_data),
+ Error::<Test>::TokenConstDataLimitExceeded
+ );
+ });
}
// NFT custom data size. Negative test variable_data.
#[test]
fn custom_data_size_nft_variable_data_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let too_big_const_data = CreateItemData::NFT(CreateNftData{
- const_data: vec![],
- variable_data: vec![1, 2, 3, 4]
- });
+ let origin1 = Origin::signed(1);
+ let too_big_const_data = CreateItemData::NFT(CreateNftData {
+ const_data: vec![],
+ variable_data: vec![1, 2, 3, 4],
+ });
- assert_noop!(TemplateModule::create_item(
- origin1.clone(),
- collection_id,
- account(1),
- too_big_const_data
- ), Error::<Test>::TokenVariableDataLimitExceeded);
- });
+ assert_noop!(
+ TemplateModule::create_item(origin1, collection_id, account(1), too_big_const_data),
+ Error::<Test>::TokenVariableDataLimitExceeded
+ );
+ });
}
// Re fungible custom data size. Negative test const_data.
#[test]
fn custom_data_size_re_fungible_const_data_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let too_big_const_data = CreateItemData::NFT(CreateNftData{
- const_data: vec![1, 2, 3, 4],
- variable_data: vec![]
- });
+ let origin1 = Origin::signed(1);
+ let too_big_const_data = CreateItemData::NFT(CreateNftData {
+ const_data: vec![1, 2, 3, 4],
+ variable_data: vec![],
+ });
- assert_noop!(TemplateModule::create_item(
- origin1.clone(),
- collection_id,
- account(1),
- too_big_const_data
- ), Error::<Test>::TokenConstDataLimitExceeded);
- });
+ assert_noop!(
+ TemplateModule::create_item(origin1, collection_id, account(1), too_big_const_data),
+ Error::<Test>::TokenConstDataLimitExceeded
+ );
+ });
}
// Re fungible custom data size. Negative test variable_data.
#[test]
fn custom_data_size_re_fungible_variable_data_bound_neg() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: 10,
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 2,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- let too_big_const_data = CreateItemData::NFT(CreateNftData{
- const_data: vec![],
- variable_data: vec![1, 2, 3, 4]
- });
+ let origin1 = Origin::signed(1);
+ let too_big_const_data = CreateItemData::NFT(CreateNftData {
+ const_data: vec![],
+ variable_data: vec![1, 2, 3, 4],
+ });
- assert_noop!(TemplateModule::create_item(
- origin1.clone(),
- collection_id,
- account(1),
- too_big_const_data
- ), Error::<Test>::TokenVariableDataLimitExceeded);
- });
+ assert_noop!(
+ TemplateModule::create_item(origin1, collection_id, account(1), too_big_const_data),
+ Error::<Test>::TokenVariableDataLimitExceeded
+ );
+ });
}
// #endregion
#[test]
fn set_const_on_chain_schema() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::set_const_on_chain_schema(origin1, collection_id, b"test const on chain schema".to_vec()));
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::set_const_on_chain_schema(
+ origin1,
+ collection_id,
+ b"test const on chain schema".to_vec()
+ ));
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().const_on_chain_schema, b"test const on chain schema".to_vec());
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().variable_on_chain_schema, b"".to_vec());
- });
+ assert_eq!(
+ TemplateModule::collection_id(collection_id)
+ .unwrap()
+ .const_on_chain_schema,
+ b"test const on chain schema".to_vec()
+ );
+ assert_eq!(
+ TemplateModule::collection_id(collection_id)
+ .unwrap()
+ .variable_on_chain_schema,
+ b"".to_vec()
+ );
+ });
}
#[test]
fn set_variable_on_chain_schema() {
- new_test_ext().execute_with(|| {
- default_limits();
-
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ new_test_ext().execute_with(|| {
+ default_limits();
- let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::set_variable_on_chain_schema(origin1, collection_id, b"test variable on chain schema".to_vec()));
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().const_on_chain_schema, b"".to_vec());
- assert_eq!(TemplateModule::collection_id(collection_id).unwrap().variable_on_chain_schema, b"test variable on chain schema".to_vec());
- });
+ let origin1 = Origin::signed(1);
+ assert_ok!(TemplateModule::set_variable_on_chain_schema(
+ origin1,
+ collection_id,
+ b"test variable on chain schema".to_vec()
+ ));
+
+ assert_eq!(
+ TemplateModule::collection_id(collection_id)
+ .unwrap()
+ .const_on_chain_schema,
+ b"".to_vec()
+ );
+ assert_eq!(
+ TemplateModule::collection_id(collection_id)
+ .unwrap()
+ .variable_on_chain_schema,
+ b"test variable on chain schema".to_vec()
+ );
+ });
}
#[test]
fn set_variable_meta_data_on_nft_token_stores_variable_meta_data() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
-
- let data = default_nft_data();
- create_test_item(1, &data.into());
-
- let variable_data = b"test set_variable_meta_data method.".to_vec();
- assert_ok!(TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data.clone()));
+ let origin1 = Origin::signed(1);
- assert_eq!(TemplateModule::nft_item_id(collection_id, 1).unwrap().variable_data, variable_data);
- });
+ let data = default_nft_data();
+ create_test_item(1, &data.into());
+
+ let variable_data = b"test set_variable_meta_data method.".to_vec();
+ assert_ok!(TemplateModule::set_variable_meta_data(
+ origin1,
+ collection_id,
+ 1,
+ variable_data.clone()
+ ));
+
+ assert_eq!(
+ TemplateModule::nft_item_id(collection_id, 1)
+ .unwrap()
+ .variable_data,
+ variable_data
+ );
+ });
}
#[test]
fn set_variable_meta_data_on_re_fungible_token_stores_variable_meta_data() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- let data = default_re_fungible_data();
- create_test_item(1, &data.into());
+ let data = default_re_fungible_data();
+ create_test_item(1, &data.into());
- let variable_data = b"test set_variable_meta_data method.".to_vec();
- assert_ok!(TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data.clone()));
+ let variable_data = b"test set_variable_meta_data method.".to_vec();
+ assert_ok!(TemplateModule::set_variable_meta_data(
+ origin1,
+ collection_id,
+ 1,
+ variable_data.clone()
+ ));
- assert_eq!(TemplateModule::refungible_item_id(collection_id, 1).unwrap().variable_data, variable_data);
- });
+ assert_eq!(
+ TemplateModule::refungible_item_id(collection_id, 1)
+ .unwrap()
+ .variable_data,
+ variable_data
+ );
+ });
}
-
#[test]
fn set_variable_meta_data_on_fungible_token_fails() {
- new_test_ext().execute_with(|| {
- default_limits();
+ new_test_ext().execute_with(|| {
+ default_limits();
- let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
+ let collection_id = create_test_collection(&CollectionMode::Fungible(3), 1);
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- let data = default_fungible_data();
- create_test_item(1, &data.into());
+ let data = default_fungible_data();
+ create_test_item(1, &data.into());
- let variable_data = b"test set_variable_meta_data method.".to_vec();
- assert_noop!(TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data.clone()), Error::<Test>::CantStoreMetadataInFungibleTokens);
- });
+ let variable_data = b"test set_variable_meta_data method.".to_vec();
+ assert_noop!(
+ TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data),
+ Error::<Test>::CantStoreMetadataInFungibleTokens
+ );
+ });
}
#[test]
fn set_variable_meta_data_on_nft_token_fails_for_big_data() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: default_collection_numbers_limit(),
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 10,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: default_collection_numbers_limit(),
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 10,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
- let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
- let origin1 = Origin::signed(1);
+ let origin1 = Origin::signed(1);
- let data = default_nft_data();
- create_test_item(1, &data.into());
+ let data = default_nft_data();
+ create_test_item(1, &data.into());
- let variable_data = b"test set_variable_meta_data method, bigger than limits.".to_vec();
- assert_noop!(TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data), Error::<Test>::TokenVariableDataLimitExceeded);
- });
+ let variable_data = b"test set_variable_meta_data method, bigger than limits.".to_vec();
+ assert_noop!(
+ TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data),
+ Error::<Test>::TokenVariableDataLimitExceeded
+ );
+ });
}
#[test]
fn set_variable_meta_data_on_re_fungible_token_fails_for_big_data() {
- new_test_ext().execute_with(|| {
- assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
- collection_numbers_limit: default_collection_numbers_limit(),
- account_token_ownership_limit: 10,
- collections_admins_limit: 5,
- custom_data_limit: 10,
- nft_sponsor_transfer_timeout: 15,
- fungible_sponsor_transfer_timeout: 15,
- refungible_sponsor_transfer_timeout: 15,
- const_on_chain_schema_limit: 1024,
- offchain_schema_limit: 1024,
- variable_on_chain_schema_limit: 1024,
- }));
+ new_test_ext().execute_with(|| {
+ assert_ok!(TemplateModule::set_chain_limits(
+ RawOrigin::Root.into(),
+ ChainLimits {
+ collection_numbers_limit: default_collection_numbers_limit(),
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 10,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ const_on_chain_schema_limit: 1024,
+ offchain_schema_limit: 1024,
+ variable_on_chain_schema_limit: 1024,
+ }
+ ));
+ let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
- let collection_id = create_test_collection(&CollectionMode::ReFungible, 1);
+ let origin1 = Origin::signed(1);
- let origin1 = Origin::signed(1);
-
- let data = default_re_fungible_data();
- create_test_item(1, &data.into());
+ let data = default_re_fungible_data();
+ create_test_item(1, &data.into());
- let variable_data = b"test set_variable_meta_data method, bigger than limits.".to_vec();
- assert_noop!(TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data), Error::<Test>::TokenVariableDataLimitExceeded);
- });
+ let variable_data = b"test set_variable_meta_data method, bigger than limits.".to_vec();
+ assert_noop!(
+ TemplateModule::set_variable_meta_data(origin1, collection_id, 1, variable_data),
+ Error::<Test>::TokenVariableDataLimitExceeded
+ );
+ });
}
pallets/scheduler/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -31,7 +31,7 @@
const BLOCK_NUMBER: u32 = 2;
// Add `n` named items to the schedule
-fn fill_schedule<T: Config> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
+fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
// Essentially a no-op call.
let call = frame_system::Call::set_storage(vec![]);
for i in 0..n {
@@ -47,7 +47,10 @@
call.clone().into(),
)?;
}
- ensure!(Agenda::<T>::get(when).len() == n as usize, "didn't fill schedule");
+ ensure!(
+ Agenda::<T>::get(when).len() == n as usize,
+ "didn't fill schedule"
+ );
Ok(())
}
@@ -141,8 +144,4 @@
}
}
-impl_benchmark_test_suite!(
- Scheduler,
- crate::tests::new_test_ext(),
- crate::tests::Test,
-);
+impl_benchmark_test_suite!(Scheduler, crate::tests::new_test_ext(), crate::tests::Test,);
pallets/scheduler/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -50,17 +50,25 @@
// Ensure we're `no_std` when compiling for Wasm.
#![cfg_attr(not(feature = "std"), no_std)]
+#![allow(clippy::type_complexity, clippy::boxed_local, clippy::unused_unit)]
mod benchmarking;
pub mod weights;
use sp_std::{prelude::*, marker::PhantomData, borrow::Borrow};
use codec::{Encode, Decode, Codec};
-use sp_runtime::{RuntimeDebug, traits::{Zero, One, BadOrigin, Saturating}};
+use sp_runtime::{
+ RuntimeDebug,
+ traits::{Zero, One, BadOrigin, Saturating},
+};
use frame_support::{
decl_module, decl_storage, decl_event, decl_error, IterableStorageMap,
dispatch::{Dispatchable, DispatchError, DispatchResult, Parameter},
- traits::{Get, schedule::{self, DispatchTime}, OriginTrait, EnsureOrigin, IsType},
+ traits::{
+ Get,
+ schedule::{self, DispatchTime},
+ OriginTrait, EnsureOrigin, IsType,
+ },
weights::{GetDispatchInfo, Weight},
};
use frame_system::{self as system, ensure_signed};
@@ -72,22 +80,24 @@
/// should be added to our implied traits list.
///
/// `system::Config` should always be included in our implied traits.
-/// //
-pub trait Config: system::Config
-{
-
+/// //
+pub trait Config: system::Config {
/// The overarching event type.
type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
/// The aggregated origin which the dispatch will take.
type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
- + From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
+ + From<Self::PalletsOrigin>
+ + IsType<<Self as system::Config>::Origin>;
/// The caller origin, overarching type of all pallets origins.
type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
/// The aggregated call type.
- type Call: Parameter + Dispatchable<Origin=<Self as Config>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
+ type Call: Parameter
+ + Dispatchable<Origin = <Self as Config>::Origin>
+ + GetDispatchInfo
+ + From<system::Call<Self>>;
/// The maximum weight that may be scheduled per block for any dispatchables of less priority
/// than `schedule::HARD_DEADLINE`.
@@ -141,7 +151,8 @@
}
/// The current version of Scheduled struct.
-pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> = ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId>;
+pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> =
+ ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId>;
// A value placed in storage that represents the current version of the Scheduler storage.
// This value is used by the `on_runtime_upgrade` logic to determine whether we run
@@ -160,7 +171,6 @@
#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
pub struct CallSpec {
-
module: u32,
method: u32,
}
@@ -172,7 +182,7 @@
=> Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
pub SpecAgenda: map hasher(twox_64_concat) T::BlockNumber
- => Vec<Option<CallSpec>>;
+ => Vec<Option<CallSpec>>;
/// Lookup from identity to the block number and index of the task.
Lookup: map hasher(twox_64_concat) Vec<u8> => Option<TaskAddress<T::BlockNumber>>;
@@ -210,8 +220,8 @@
decl_module! {
/// Scheduler module declaration.
- pub struct Module<T: Config> for enum Call
- where
+ pub struct Module<T: Config> for enum Call
+ where
origin: <T as system::Config>::Origin
{
type Error = Error<T>;
@@ -234,7 +244,7 @@
maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
priority: schedule::Priority,
call: Box<<T as Config>::Call>,
- )
+ )
{
let origin = <T as Config>::Origin::from(origin);
Self::do_schedule(DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call)?;
@@ -402,12 +412,12 @@
let origin = <<T as Config>::Origin as From<T::PalletsOrigin>>::from(
s.origin.clone()
).into();
- let sender = ensure_signed(origin).unwrap_or(T::AccountId::default());
+ let sender = ensure_signed(origin).unwrap_or_default();
let who_will_pay = T::SponsorshipHandler::get_sponsor(&sender, &s.call).unwrap_or(sender);
let sponsor = T::PalletsOrigin::from(system::RawOrigin::Signed(who_will_pay));
let r = s.call.clone().dispatch(sponsor.into());
let maybe_id = s.maybe_id.clone();
- if let &Some((period, count)) = &s.maybe_periodic {
+ if let Some((period, count)) = s.maybe_periodic {
if count > 1 {
s.maybe_periodic = Some((period, count - 1));
} else {
@@ -420,11 +430,9 @@
Lookup::<T>::insert(id, (next, next_index as u32));
}
Agenda::<T>::append(next, Some(s));
- } else {
- if let Some(ref id) = s.maybe_id {
- Lookup::<T>::remove(id);
- }
- }
+ } else if let Some(ref id) = s.maybe_id {
+ Lookup::<T>::remove(id);
+ }
Self::deposit_event(RawEvent::Dispatched(
(now, index),
maybe_id,
@@ -454,20 +462,25 @@
StorageVersion::put(Releases::V2);
Agenda::<T>::translate::<
- Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>, _
- >(|_, agenda| Some(
- agenda
- .into_iter()
- .map(|schedule| schedule.map(|schedule| ScheduledV2 {
- maybe_id: schedule.maybe_id,
- priority: schedule.priority,
- call: schedule.call,
- maybe_periodic: schedule.maybe_periodic,
- origin: system::RawOrigin::Root.into(),
- _phantom: Default::default(),
- }))
- .collect::<Vec<_>>()
- ));
+ Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>,
+ _,
+ >(|_, agenda| {
+ Some(
+ agenda
+ .into_iter()
+ .map(|schedule| {
+ schedule.map(|schedule| ScheduledV2 {
+ maybe_id: schedule.maybe_id,
+ priority: schedule.priority,
+ call: schedule.call,
+ maybe_periodic: schedule.maybe_periodic,
+ origin: system::RawOrigin::Root.into(),
+ _phantom: Default::default(),
+ })
+ })
+ .collect::<Vec<_>>(),
+ )
+ });
true
} else {
@@ -478,20 +491,25 @@
/// Helper to migrate scheduler when the pallet origin type has changed.
pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {
Agenda::<T>::translate::<
- Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
- >(|_, agenda| Some(
- agenda
- .into_iter()
- .map(|schedule| schedule.map(|schedule| Scheduled {
- maybe_id: schedule.maybe_id,
- priority: schedule.priority,
- call: schedule.call,
- maybe_periodic: schedule.maybe_periodic,
- origin: schedule.origin.into(),
- _phantom: Default::default(),
- }))
- .collect::<Vec<_>>()
- ));
+ Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>,
+ _,
+ >(|_, agenda| {
+ Some(
+ agenda
+ .into_iter()
+ .map(|schedule| {
+ schedule.map(|schedule| Scheduled {
+ maybe_id: schedule.maybe_id,
+ priority: schedule.priority,
+ call: schedule.call,
+ maybe_periodic: schedule.maybe_periodic,
+ origin: schedule.origin.into(),
+ _phantom: Default::default(),
+ })
+ })
+ .collect::<Vec<_>>(),
+ )
+ });
}
fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {
@@ -501,11 +519,11 @@
DispatchTime::At(x) => x,
// The current block has already completed it's scheduled tasks, so
// Schedule the task at lest one block after this current block.
- DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one())
+ DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one()),
};
if when <= now {
- return Err(Error::<T>::TargetBlockNumberInPast.into())
+ return Err(Error::<T>::TargetBlockNumberInPast.into());
}
Ok(when)
@@ -516,7 +534,7 @@
maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
priority: schedule::Priority,
origin: T::PalletsOrigin,
- call: <T as Config>::Call
+ call: <T as Config>::Call,
) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
let when = Self::resolve_time(when)?;
@@ -526,7 +544,12 @@
// Remove one from the number of repetitions since we will schedule one now.
.map(|(p, c)| (p, c - 1));
let s = Some(Scheduled {
- maybe_id: None, priority, call, maybe_periodic, origin, _phantom: PhantomData::<T::AccountId>::default(),
+ maybe_id: None,
+ priority,
+ call,
+ maybe_periodic,
+ origin,
+ _phantom: PhantomData::<T::AccountId>::default(),
});
Agenda::<T>::append(when, s);
let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
@@ -544,22 +567,21 @@
fn do_cancel(
origin: Option<T::PalletsOrigin>,
- (when, index): TaskAddress<T::BlockNumber>
+ (when, index): TaskAddress<T::BlockNumber>,
) -> Result<(), DispatchError> {
- let scheduled = Agenda::<T>::try_mutate(
- when,
- |agenda| {
- agenda.get_mut(index as usize)
- .map_or(Ok(None), |s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {
- if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
- if *o != s.origin {
- return Err(BadOrigin.into());
- }
- };
- Ok(s.take())
- })
- },
- )?;
+ let scheduled = Agenda::<T>::try_mutate(when, |agenda| {
+ agenda.get_mut(index as usize).map_or(
+ Ok(None),
+ |s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {
+ if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
+ if *o != s.origin {
+ return Err(BadOrigin.into());
+ }
+ };
+ Ok(s.take())
+ },
+ )
+ })?;
if let Some(s) = scheduled {
if let Some(id) = s.maybe_id {
Lookup::<T>::remove(id);
@@ -567,7 +589,7 @@
Self::deposit_event(RawEvent::Canceled(when, index));
Ok(())
} else {
- Err(Error::<T>::NotFound)?
+ Err(Error::<T>::NotFound.into())
}
}
@@ -605,7 +627,7 @@
) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
// ensure id it is unique
if Lookup::<T>::contains_key(&id) {
- return Err(Error::<T>::FailedToSchedule)?
+ return Err(Error::<T>::FailedToSchedule.into());
}
let when = Self::resolve_time(when)?;
@@ -617,7 +639,12 @@
.map(|(p, c)| (p, c - 1));
let s = Scheduled {
- maybe_id: Some(id.clone()), priority, call, maybe_periodic, origin, _phantom: Default::default()
+ maybe_id: Some(id.clone()),
+ priority,
+ call,
+ maybe_periodic,
+ origin,
+ _phantom: Default::default(),
};
Agenda::<T>::append(when, Some(s));
let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
@@ -653,7 +680,7 @@
Self::deposit_event(RawEvent::Canceled(when, index));
Ok(())
} else {
- Err(Error::<T>::NotFound)?
+ Err(Error::<T>::NotFound.into())
}
})
}
@@ -664,33 +691,38 @@
) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
let new_time = Self::resolve_time(new_time)?;
- Lookup::<T>::try_mutate_exists(id, |lookup| -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
- let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;
+ Lookup::<T>::try_mutate_exists(
+ id,
+ |lookup| -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+ let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;
- if new_time == when {
- return Err(Error::<T>::RescheduleNoChange.into());
- }
+ if new_time == when {
+ return Err(Error::<T>::RescheduleNoChange.into());
+ }
- Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
- let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;
- let task = task.take().ok_or(Error::<T>::NotFound)?;
- Agenda::<T>::append(new_time, Some(task));
+ Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
+ let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;
+ let task = task.take().ok_or(Error::<T>::NotFound)?;
+ Agenda::<T>::append(new_time, Some(task));
- Ok(())
- })?;
+ Ok(())
+ })?;
- let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;
- Self::deposit_event(RawEvent::Canceled(when, index));
- Self::deposit_event(RawEvent::Scheduled(new_time, new_index));
+ let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;
+ Self::deposit_event(RawEvent::Canceled(when, index));
+ Self::deposit_event(RawEvent::Scheduled(new_time, new_index));
- *lookup = Some((new_time, new_index));
+ *lookup = Some((new_time, new_index));
- Ok((new_time, new_index))
- })
+ Ok((new_time, new_index))
+ },
+ )
}
}
-impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>
+ for Module<T>
+{
type Address = TaskAddress<T::BlockNumber>;
fn schedule(
@@ -698,7 +730,7 @@
maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
priority: schedule::Priority,
origin: T::PalletsOrigin,
- call: <T as Config>::Call
+ call: <T as Config>::Call,
) -> Result<Self::Address, DispatchError> {
Self::do_schedule(when, maybe_periodic, priority, origin, call)
}
@@ -715,11 +747,16 @@
}
fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, ()> {
- Agenda::<T>::get(when).get(index as usize).ok_or(()).map(|_| when)
+ Agenda::<T>::get(when)
+ .get(index as usize)
+ .ok_or(())
+ .map(|_| when)
}
}
-impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>
+ for Module<T>
+{
type Address = TaskAddress<T::BlockNumber>;
fn schedule_named(
@@ -745,17 +782,19 @@
}
fn next_dispatch_time(id: Vec<u8>) -> Result<T::BlockNumber, ()> {
- Lookup::<T>::get(id).and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when)).ok_or(())
+ Lookup::<T>::get(id)
+ .and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when))
+ .ok_or(())
}
}
#[cfg(test)]
+#[allow(clippy::from_over_into)]
mod tests {
use super::*;
use frame_support::{
- parameter_types, assert_ok, ord_parameter_types,
- assert_noop, assert_err, Hashable,
+ parameter_types, assert_ok, ord_parameter_types, assert_noop, assert_err, Hashable,
traits::{OnInitialize, OnFinalize, Filter},
weights::constants::RocksDbWeight,
};
@@ -887,11 +926,13 @@
type ScheduleOrigin = EnsureOneOf<u64, EnsureRoot<u64>, EnsureSignedBy<One, u64>>;
type MaxScheduledPerBlock = MaxScheduledPerBlock;
type WeightInfo = ();
- type SponsorshipHandler = ();
+ type SponsorshipHandler = ();
}
pub fn new_test_ext() -> sp_io::TestExternalities {
- let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
+ let t = system::GenesisConfig::default()
+ .build_storage::<Test>()
+ .unwrap();
t.into()
}
@@ -911,8 +952,16 @@
fn basic_scheduling_works() {
new_test_ext().execute_with(|| {
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
- assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
+ assert_ok!(Scheduler::do_schedule(
+ DispatchTime::At(4),
+ None,
+ 127,
+ root(),
+ call
+ ));
run_to_block(3);
assert!(logger::log().is_empty());
run_to_block(4);
@@ -927,9 +976,17 @@
new_test_ext().execute_with(|| {
run_to_block(2);
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
- assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
+ assert_ok!(Scheduler::do_schedule(
+ DispatchTime::After(3),
+ None,
+ 127,
+ root(),
+ call
+ ));
run_to_block(5);
assert!(logger::log().is_empty());
run_to_block(6);
@@ -944,8 +1001,16 @@
new_test_ext().execute_with(|| {
run_to_block(2);
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
- assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
+ assert_ok!(Scheduler::do_schedule(
+ DispatchTime::After(0),
+ None,
+ 127,
+ root(),
+ call
+ ));
// Will trigger on the next block.
run_to_block(3);
assert_eq!(logger::log(), vec![(root(), 42u32)]);
@@ -959,7 +1024,11 @@
new_test_ext().execute_with(|| {
// at #4, every 3 blocks, 3 times.
assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4), Some((3, 3)), 127, root(), Call::Logger(logger::Call::log(42, 1000))
+ DispatchTime::At(4),
+ Some((3, 3)),
+ 127,
+ root(),
+ Call::Logger(logger::Call::log(42, 1000))
));
run_to_block(3);
assert!(logger::log().is_empty());
@@ -972,9 +1041,15 @@
run_to_block(9);
assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
run_to_block(10);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
});
}
@@ -982,15 +1057,26 @@
fn reschedule_works() {
new_test_ext().execute_with(|| {
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
- assert_eq!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(), (4, 0));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
+ assert_eq!(
+ Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(),
+ (4, 0)
+ );
run_to_block(3);
assert!(logger::log().is_empty());
- assert_eq!(Scheduler::do_reschedule((4, 0), DispatchTime::At(6)).unwrap(), (6, 0));
+ assert_eq!(
+ Scheduler::do_reschedule((4, 0), DispatchTime::At(6)).unwrap(),
+ (6, 0)
+ );
- assert_noop!(Scheduler::do_reschedule((6, 0), DispatchTime::At(6)), Error::<Test>::RescheduleNoChange);
+ assert_noop!(
+ Scheduler::do_reschedule((6, 0), DispatchTime::At(6)),
+ Error::<Test>::RescheduleNoChange
+ );
run_to_block(4);
assert!(logger::log().is_empty());
@@ -1007,17 +1093,34 @@
fn reschedule_named_works() {
new_test_ext().execute_with(|| {
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
- assert_eq!(Scheduler::do_schedule_named(
- 1u32.encode(), DispatchTime::At(4), None, 127, root(), call
- ).unwrap(), (4, 0));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
+ assert_eq!(
+ Scheduler::do_schedule_named(
+ 1u32.encode(),
+ DispatchTime::At(4),
+ None,
+ 127,
+ root(),
+ call
+ )
+ .unwrap(),
+ (4, 0)
+ );
run_to_block(3);
assert!(logger::log().is_empty());
- assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(), (6, 0));
+ assert_eq!(
+ Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
+ (6, 0)
+ );
- assert_noop!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)), Error::<Test>::RescheduleNoChange);
+ assert_noop!(
+ Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)),
+ Error::<Test>::RescheduleNoChange
+ );
run_to_block(4);
assert!(logger::log().is_empty());
@@ -1034,16 +1137,33 @@
fn reschedule_named_perodic_works() {
new_test_ext().execute_with(|| {
let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
- assert_eq!(Scheduler::do_schedule_named(
- 1u32.encode(), DispatchTime::At(4), Some((3, 3)), 127, root(), call
- ).unwrap(), (4, 0));
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+ &call
+ ));
+ assert_eq!(
+ Scheduler::do_schedule_named(
+ 1u32.encode(),
+ DispatchTime::At(4),
+ Some((3, 3)),
+ 127,
+ root(),
+ call
+ )
+ .unwrap(),
+ (4, 0)
+ );
run_to_block(3);
assert!(logger::log().is_empty());
- assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(5)).unwrap(), (5, 0));
- assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(), (6, 0));
+ assert_eq!(
+ Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(5)).unwrap(),
+ (5, 0)
+ );
+ assert_eq!(
+ Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
+ (6, 0)
+ );
run_to_block(5);
assert!(logger::log().is_empty());
@@ -1051,7 +1171,10 @@
run_to_block(6);
assert_eq!(logger::log(), vec![(root(), 42u32)]);
- assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(10)).unwrap(), (10, 0));
+ assert_eq!(
+ Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(10)).unwrap(),
+ (10, 0)
+ );
run_to_block(9);
assert_eq!(logger::log(), vec![(root(), 42u32)]);
@@ -1060,10 +1183,16 @@
assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
run_to_block(13);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
});
}
@@ -1072,11 +1201,22 @@
new_test_ext().execute_with(|| {
// at #4.
Scheduler::do_schedule_named(
- 1u32.encode(), DispatchTime::At(4), None, 127, root(), Call::Logger(logger::Call::log(69, 1000))
- ).unwrap();
+ 1u32.encode(),
+ DispatchTime::At(4),
+ None,
+ 127,
+ root(),
+ Call::Logger(logger::Call::log(69, 1000)),
+ )
+ .unwrap();
let i = Scheduler::do_schedule(
- DispatchTime::At(4), None, 127, root(), Call::Logger(logger::Call::log(42, 1000))
- ).unwrap();
+ DispatchTime::At(4),
+ None,
+ 127,
+ root(),
+ Call::Logger(logger::Call::log(42, 1000)),
+ )
+ .unwrap();
run_to_block(3);
assert!(logger::log().is_empty());
assert_ok!(Scheduler::do_cancel_named(None, 1u32.encode()));
@@ -1096,8 +1236,9 @@
Some((3, 3)),
127,
root(),
- Call::Logger(logger::Call::log(42, 1000))
- ).unwrap();
+ Call::Logger(logger::Call::log(42, 1000)),
+ )
+ .unwrap();
// same id results in error.
assert!(Scheduler::do_schedule_named(
1u32.encode(),
@@ -1106,11 +1247,18 @@
127,
root(),
Call::Logger(logger::Call::log(69, 1000))
- ).is_err());
+ )
+ .is_err());
// different id is ok.
Scheduler::do_schedule_named(
- 2u32.encode(), DispatchTime::At(8), None, 127, root(), Call::Logger(logger::Call::log(69, 1000))
- ).unwrap();
+ 2u32.encode(),
+ DispatchTime::At(8),
+ None,
+ 127,
+ root(),
+ Call::Logger(logger::Call::log(69, 1000)),
+ )
+ .unwrap();
run_to_block(3);
assert!(logger::log().is_empty());
run_to_block(4);
@@ -1136,7 +1284,8 @@
DispatchTime::At(4),
None,
127,
- root(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+ root(),
+ Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
));
// 69 and 42 do not fit together
run_to_block(4);
@@ -1198,19 +1347,22 @@
DispatchTime::At(4),
None,
255,
- root(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
+ root(),
+ Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
));
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
127,
- root(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+ root(),
+ Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
));
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
126,
- root(), Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
+ root(),
+ Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
));
// 2600 does not fit with 69 or 42, but has higher priority, so will go through
@@ -1218,25 +1370,32 @@
assert_eq!(logger::log(), vec![(root(), 2600u32)]);
// 69 and 42 fit together
run_to_block(5);
- assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+ );
});
}
#[test]
fn on_initialize_weight_is_correct() {
new_test_ext().execute_with(|| {
- let base_weight: Weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
+ let base_weight: Weight =
+ <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
let base_multiplier = 0;
let named_multiplier = <Test as frame_system::Config>::DbWeight::get().writes(1);
- let periodic_multiplier = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
+ let periodic_multiplier =
+ <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
// Named
- assert_ok!(
- Scheduler::do_schedule_named(
- 1u32.encode(), DispatchTime::At(1), None, 255, root(),
- Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3))
- )
- );
+ assert_ok!(Scheduler::do_schedule_named(
+ 1u32.encode(),
+ DispatchTime::At(1),
+ None,
+ 255,
+ root(),
+ Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3))
+ ));
// Anon Periodic
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(1),
@@ -1255,29 +1414,53 @@
));
// Named Periodic
assert_ok!(Scheduler::do_schedule_named(
- 2u32.encode(), DispatchTime::At(1), Some((1000, 3)), 126, root(),
- Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2)))
- );
+ 2u32.encode(),
+ DispatchTime::At(1),
+ Some((1000, 3)),
+ 126,
+ root(),
+ Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
+ ));
// Will include the named periodic only
let actual_weight = Scheduler::on_initialize(1);
let call_weight = MaximumSchedulerWeight::get() / 2;
assert_eq!(
- actual_weight, call_weight + base_weight + base_multiplier + named_multiplier + periodic_multiplier
+ actual_weight,
+ call_weight
+ + base_weight + base_multiplier
+ + named_multiplier + periodic_multiplier
);
assert_eq!(logger::log(), vec![(root(), 2600u32)]);
// Will include anon and anon periodic
let actual_weight = Scheduler::on_initialize(2);
let call_weight = MaximumSchedulerWeight::get() / 2 + MaximumSchedulerWeight::get() / 3;
- assert_eq!(actual_weight, call_weight + base_weight + base_multiplier * 2 + periodic_multiplier);
- assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+ assert_eq!(
+ actual_weight,
+ call_weight + base_weight + base_multiplier * 2 + periodic_multiplier
+ );
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+ );
// Will include named only
let actual_weight = Scheduler::on_initialize(3);
let call_weight = MaximumSchedulerWeight::get() / 3;
- assert_eq!(actual_weight, call_weight + base_weight + base_multiplier + named_multiplier);
- assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32), (root(), 3u32)]);
+ assert_eq!(
+ actual_weight,
+ call_weight + base_weight + base_multiplier + named_multiplier
+ );
+ assert_eq!(
+ logger::log(),
+ vec![
+ (root(), 2600u32),
+ (root(), 69u32),
+ (root(), 42u32),
+ (root(), 3u32)
+ ]
+ );
// Will contain none
let actual_weight = Scheduler::on_initialize(4);
@@ -1290,7 +1473,14 @@
new_test_ext().execute_with(|| {
let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
- assert_ok!(Scheduler::schedule_named(Origin::root(), 1u32.encode(), 4, None, 127, call));
+ assert_ok!(Scheduler::schedule_named(
+ Origin::root(),
+ 1u32.encode(),
+ 4,
+ None,
+ 127,
+ call
+ ));
assert_ok!(Scheduler::schedule(Origin::root(), 4, None, 127, call2));
run_to_block(3);
// Scheduled calls are in the agenda.
@@ -1334,15 +1524,29 @@
new_test_ext().execute_with(|| {
let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
- assert_ok!(
- Scheduler::schedule_named(system::RawOrigin::Signed(1).into(), 1u32.encode(), 4, None, 127, call)
- );
- assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, 127, call2));
+ assert_ok!(Scheduler::schedule_named(
+ system::RawOrigin::Signed(1).into(),
+ 1u32.encode(),
+ 4,
+ None,
+ 127,
+ call
+ ));
+ assert_ok!(Scheduler::schedule(
+ system::RawOrigin::Signed(1).into(),
+ 4,
+ None,
+ 127,
+ call2
+ ));
run_to_block(3);
// Scheduled calls are in the agenda.
assert_eq!(Agenda::<Test>::get(4).len(), 2);
assert!(logger::log().is_empty());
- assert_ok!(Scheduler::cancel_named(system::RawOrigin::Signed(1).into(), 1u32.encode()));
+ assert_ok!(Scheduler::cancel_named(
+ system::RawOrigin::Signed(1).into(),
+ 1u32.encode()
+ ));
assert_ok!(Scheduler::cancel(system::RawOrigin::Signed(1).into(), 4, 1));
// Scheduled calls are made NONE, so should not effect state
run_to_block(100);
@@ -1356,10 +1560,20 @@
let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
assert_noop!(
- Scheduler::schedule_named(system::RawOrigin::Signed(2).into(), 1u32.encode(), 4, None, 127, call),
+ Scheduler::schedule_named(
+ system::RawOrigin::Signed(2).into(),
+ 1u32.encode(),
+ 4,
+ None,
+ 127,
+ call
+ ),
BadOrigin
);
- assert_noop!(Scheduler::schedule(system::RawOrigin::Signed(2).into(), 4, None, 127, call2), BadOrigin);
+ assert_noop!(
+ Scheduler::schedule(system::RawOrigin::Signed(2).into(), 4, None, 127, call2),
+ BadOrigin
+ );
});
}
@@ -1368,22 +1582,48 @@
new_test_ext().execute_with(|| {
let call = Box::new(Call::Logger(logger::Call::log_without_filter(69, 1000)));
let call2 = Box::new(Call::Logger(logger::Call::log_without_filter(42, 1000)));
- assert_ok!(
- Scheduler::schedule_named(system::RawOrigin::Signed(1).into(), 1u32.encode(), 4, None, 127, call)
- );
- assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, 127, call2));
+ assert_ok!(Scheduler::schedule_named(
+ system::RawOrigin::Signed(1).into(),
+ 1u32.encode(),
+ 4,
+ None,
+ 127,
+ call
+ ));
+ assert_ok!(Scheduler::schedule(
+ system::RawOrigin::Signed(1).into(),
+ 4,
+ None,
+ 127,
+ call2
+ ));
run_to_block(3);
// Scheduled calls are in the agenda.
assert_eq!(Agenda::<Test>::get(4).len(), 2);
assert!(logger::log().is_empty());
- assert_noop!(Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()), BadOrigin);
- assert_noop!(Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1), BadOrigin);
- assert_noop!(Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()), BadOrigin);
- assert_noop!(Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1), BadOrigin);
+ assert_noop!(
+ Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()),
+ BadOrigin
+ );
+ assert_noop!(
+ Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1),
+ BadOrigin
+ );
+ assert_noop!(
+ Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()),
+ BadOrigin
+ );
+ assert_noop!(
+ Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1),
+ BadOrigin
+ );
run_to_block(5);
assert_eq!(
logger::log(),
- vec![(system::RawOrigin::Signed(1).into(), 69u32), (system::RawOrigin::Signed(1).into(), 42u32)]
+ vec![
+ (system::RawOrigin::Signed(1).into(), 69u32),
+ (system::RawOrigin::Signed(1).into(), 42u32)
+ ]
);
});
}
@@ -1408,85 +1648,84 @@
maybe_periodic: Some((456u64, 10)),
}),
];
- frame_support::migration::put_storage_value(
- b"Scheduler",
- b"Agenda",
- &k,
- old,
- );
+ frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
}
assert_eq!(StorageVersion::get(), Releases::V1);
assert!(Scheduler::migrate_v1_to_t2());
- assert_eq_uvec!(Agenda::<Test>::iter().collect::<Vec<_>>(), vec![
- (
- 0,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]),
- (
- 1,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 11,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 2,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 12,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- )
- ]);
+ assert_eq_uvec!(
+ Agenda::<Test>::iter().collect::<Vec<_>>(),
+ vec![
+ (
+ 0,
+ vec![
+ Some(ScheduledV2 {
+ maybe_id: None,
+ priority: 10,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ ),
+ (
+ 1,
+ vec![
+ Some(ScheduledV2 {
+ maybe_id: None,
+ priority: 11,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ ),
+ (
+ 2,
+ vec![
+ Some(ScheduledV2 {
+ maybe_id: None,
+ priority: 12,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: root(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ )
+ ]
+ );
assert_eq!(StorageVersion::get(), Releases::V2);
});
@@ -1516,93 +1755,92 @@
_phantom: Default::default(),
}),
];
- frame_support::migration::put_storage_value(
- b"Scheduler",
- b"Agenda",
- &k,
- old,
- );
+ frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
}
- impl Into<OriginCaller> for u32 {
- fn into(self) -> OriginCaller {
- match self {
- 3u32 => system::RawOrigin::Root.into(),
- 2u32 => system::RawOrigin::None.into(),
- _ => unreachable!("test make no use of it"),
+ impl From<u32> for OriginCaller {
+ fn from(value: u32) -> Self {
+ match value {
+ 3 => system::RawOrigin::Root.into(),
+ 2 => system::RawOrigin::None.into(),
+ _ => unimplemented!(),
}
}
}
Scheduler::migrate_origin::<u32>();
- assert_eq_uvec!(Agenda::<Test>::iter().collect::<Vec<_>>(), vec![
- (
- 0,
- vec![
- Some(ScheduledV2::<_, _, OriginCaller, u64> {
- maybe_id: None,
- priority: 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]),
- (
- 1,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 11,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 2,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 12,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- )
- ]);
+ assert_eq_uvec!(
+ Agenda::<Test>::iter().collect::<Vec<_>>(),
+ vec![
+ (
+ 0,
+ vec![
+ Some(ScheduledV2::<_, _, OriginCaller, u64> {
+ maybe_id: None,
+ priority: 10,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: system::RawOrigin::Root.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: system::RawOrigin::None.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ ),
+ (
+ 1,
+ vec![
+ Some(ScheduledV2 {
+ maybe_id: None,
+ priority: 11,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: system::RawOrigin::Root.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: system::RawOrigin::None.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ ),
+ (
+ 2,
+ vec![
+ Some(ScheduledV2 {
+ maybe_id: None,
+ priority: 12,
+ call: Call::Logger(logger::Call::log(96, 100)),
+ maybe_periodic: None,
+ origin: system::RawOrigin::Root.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ None,
+ Some(ScheduledV2 {
+ maybe_id: Some(b"test".to_vec()),
+ priority: 123,
+ call: Call::Logger(logger::Call::log(69, 1000)),
+ maybe_periodic: Some((456u64, 10)),
+ origin: system::RawOrigin::None.into(),
+ _phantom: PhantomData::<u64>::default(),
+ }),
+ ]
+ )
+ ]
+ );
});
}
}
pallets/scheduler/src/weights.rsdiffbeforeafterboth--- a/pallets/scheduler/src/weights.rs
+++ b/pallets/scheduler/src/weights.rs
@@ -34,85 +34,76 @@
// --output=./frame/scheduler/src/weights.rs
// --template=./.maintain/frame-weight-template.hbs
-
#![allow(unused_parens)]
#![allow(unused_imports)]
-use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use frame_support::{
+ traits::Get,
+ weights::{Weight, constants::RocksDbWeight},
+};
use sp_std::marker::PhantomData;
/// Weight functions needed for pallet_scheduler.
pub trait WeightInfo {
- fn schedule(s: u32, ) -> Weight;
- fn cancel(s: u32, ) -> Weight;
- fn schedule_named(s: u32, ) -> Weight;
- fn cancel_named(s: u32, ) -> Weight;
-
+ fn schedule(s: u32) -> Weight;
+ fn cancel(s: u32) -> Weight;
+ fn schedule_named(s: u32) -> Weight;
+ fn cancel_named(s: u32) -> Weight;
}
/// Weights for pallet_scheduler using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
- fn schedule(s: u32, ) -> Weight {
- (35_029_000 as Weight)
- .saturating_add((77_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
-
+ fn schedule(s: u32) -> Weight {
+ 35_029_000_u64
+ .saturating_add(77_000_u64.saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(1_u64))
+ .saturating_add(T::DbWeight::get().writes(1_u64))
}
- fn cancel(s: u32, ) -> Weight {
- (31_419_000 as Weight)
- .saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
-
+ fn cancel(s: u32) -> Weight {
+ 31_419_000_u64
+ .saturating_add(4_015_000_u64.saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(1_u64))
+ .saturating_add(T::DbWeight::get().writes(2_u64))
}
- fn schedule_named(s: u32, ) -> Weight {
- (44_752_000 as Weight)
- .saturating_add((123_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
-
+ fn schedule_named(s: u32) -> Weight {
+ 44_752_000_u64
+ .saturating_add(123_000_u64.saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ .saturating_add(T::DbWeight::get().writes(2_u64))
}
- fn cancel_named(s: u32, ) -> Weight {
- (35_712_000 as Weight)
- .saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
-
+ fn cancel_named(s: u32) -> Weight {
+ 35_712_000_u64
+ .saturating_add(4_008_000_u64.saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ .saturating_add(T::DbWeight::get().writes(2_u64))
}
-
}
// For backwards compatibility and tests
impl WeightInfo for () {
- fn schedule(s: u32, ) -> Weight {
- (35_029_000 as Weight)
- .saturating_add((77_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
+ fn schedule(s: u32) -> Weight {
+ 35_029_000_u64
+ .saturating_add(77_000_u64.saturating_mul(s as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1_u64))
+ .saturating_add(RocksDbWeight::get().writes(1_u64))
}
- fn cancel(s: u32, ) -> Weight {
- (31_419_000 as Weight)
- .saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
+ fn cancel(s: u32) -> Weight {
+ 31_419_000_u64
+ .saturating_add(4_015_000_u64.saturating_mul(s as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1_u64))
+ .saturating_add(RocksDbWeight::get().writes(2_u64))
}
- fn schedule_named(s: u32, ) -> Weight {
- (44_752_000 as Weight)
- .saturating_add((123_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(RocksDbWeight::get().reads(2 as Weight))
- .saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
+ fn schedule_named(s: u32) -> Weight {
+ 44_752_000_u64
+ .saturating_add(123_000_u64.saturating_mul(s as Weight))
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ .saturating_add(RocksDbWeight::get().writes(2_u64))
}
- fn cancel_named(s: u32, ) -> Weight {
- (35_712_000 as Weight)
- .saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
- .saturating_add(RocksDbWeight::get().reads(2 as Weight))
- .saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
+ fn cancel_named(s: u32) -> Weight {
+ 35_712_000_u64
+ .saturating_add(4_008_000_u64.saturating_mul(s as Weight))
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ .saturating_add(RocksDbWeight::get().writes(2_u64))
}
-
}
primitives/nft/src/lib.rsdiffbeforeafterboth--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -1,26 +1,23 @@
-
#![cfg_attr(not(feature = "std"), no_std)]
pub use serde::{Serialize, Deserialize};
-use frame_system;
use sp_runtime::sp_std::prelude::Vec;
use codec::{Decode, Encode};
pub use frame_support::{
- construct_runtime, decl_event, decl_module, decl_storage, decl_error,
- dispatch::DispatchResult,
- ensure, fail, parameter_types,
- traits::{
- Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,
- Randomness, IsSubType, WithdrawReasons,
- },
- weights::{
- constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
- DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
- WeightToFeePolynomial, DispatchClass,
- },
- StorageValue,
- transactional,
+ construct_runtime, decl_event, decl_module, decl_storage, decl_error,
+ dispatch::DispatchResult,
+ ensure, fail, parameter_types,
+ traits::{
+ Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,
+ Randomness, IsSubType, WithdrawReasons,
+ },
+ weights::{
+ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+ DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
+ WeightToFeePolynomial, DispatchClass,
+ },
+ StorageValue, transactional,
};
pub const MAX_DECIMAL_POINTS: DecimalPoints = 30;
@@ -35,251 +32,245 @@
#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum CollectionMode {
- Invalid,
- NFT,
- // decimal points
- Fungible(DecimalPoints),
- ReFungible,
+ Invalid,
+ NFT,
+ // decimal points
+ Fungible(DecimalPoints),
+ ReFungible,
}
impl Default for CollectionMode {
- fn default() -> Self {
- Self::Invalid
- }
+ fn default() -> Self {
+ Self::Invalid
+ }
}
-impl Into<u8> for CollectionMode {
- fn into(self) -> u8 {
- match self {
- CollectionMode::Invalid => 0,
- CollectionMode::NFT => 1,
- CollectionMode::Fungible(_) => 2,
- CollectionMode::ReFungible => 3,
- }
- }
+impl CollectionMode {
+ pub fn id(&self) -> u8 {
+ match self {
+ CollectionMode::Invalid => 0,
+ CollectionMode::NFT => 1,
+ CollectionMode::Fungible(_) => 2,
+ CollectionMode::ReFungible => 3,
+ }
+ }
}
pub trait SponsoringResolve<AccountId, Call> {
- fn resolve(
- who: &AccountId,
- call: &Call) -> Option<AccountId>;
+ fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>;
}
#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum AccessMode {
- Normal,
- WhiteList,
+ Normal,
+ WhiteList,
}
impl Default for AccessMode {
- fn default() -> Self {
- Self::Normal
- }
+ fn default() -> Self {
+ Self::Normal
+ }
}
#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum SchemaVersion {
- ImageURL,
- Unique,
+ ImageURL,
+ Unique,
}
impl Default for SchemaVersion {
- fn default() -> Self {
- Self::ImageURL
- }
+ fn default() -> Self {
+ Self::ImageURL
+ }
}
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct Ownership<AccountId> {
- pub owner: AccountId,
- pub fraction: u128,
+ pub owner: AccountId,
+ pub fraction: u128,
}
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum SponsorshipState<AccountId> {
- /// The fees are applied to the transaction sender
- Disabled,
- Unconfirmed(AccountId),
- /// Transactions are sponsored by specified account
- Confirmed(AccountId),
+ /// The fees are applied to the transaction sender
+ Disabled,
+ Unconfirmed(AccountId),
+ /// Transactions are sponsored by specified account
+ Confirmed(AccountId),
}
impl<AccountId> SponsorshipState<AccountId> {
- pub fn sponsor(&self) -> Option<&AccountId> {
- match self {
- Self::Confirmed(sponsor) => Some(sponsor),
- _ => None,
- }
- }
+ pub fn sponsor(&self) -> Option<&AccountId> {
+ match self {
+ Self::Confirmed(sponsor) => Some(sponsor),
+ _ => None,
+ }
+ }
- pub fn pending_sponsor(&self) -> Option<&AccountId> {
- match self {
- Self::Unconfirmed(sponsor) | Self::Confirmed(sponsor) => Some(sponsor),
- _ => None,
- }
- }
+ pub fn pending_sponsor(&self) -> Option<&AccountId> {
+ match self {
+ Self::Unconfirmed(sponsor) | Self::Confirmed(sponsor) => Some(sponsor),
+ _ => None,
+ }
+ }
- pub fn confirmed(&self) -> bool {
- matches!(self, Self::Confirmed(_))
- }
+ pub fn confirmed(&self) -> bool {
+ matches!(self, Self::Confirmed(_))
+ }
}
impl<T> Default for SponsorshipState<T> {
- fn default() -> Self {
- Self::Disabled
- }
+ fn default() -> Self {
+ Self::Disabled
+ }
}
#[derive(Encode, Decode, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct Collection<T: frame_system::Config> {
- pub owner: T::AccountId,
- pub mode: CollectionMode,
- pub access: AccessMode,
- pub decimal_points: DecimalPoints,
- pub name: Vec<u16>, // 64 include null escape char
- pub description: Vec<u16>, // 256 include null escape char
- pub token_prefix: Vec<u8>, // 16 include null escape char
- pub mint_mode: bool,
- pub offchain_schema: Vec<u8>,
- pub schema_version: SchemaVersion,
- pub sponsorship: SponsorshipState<T::AccountId>,
- pub limits: CollectionLimits<T::BlockNumber>, // Collection private restrictions
- pub variable_on_chain_schema: Vec<u8>, //
- pub const_on_chain_schema: Vec<u8>, //
+ pub owner: T::AccountId,
+ pub mode: CollectionMode,
+ pub access: AccessMode,
+ pub decimal_points: DecimalPoints,
+ pub name: Vec<u16>, // 64 include null escape char
+ pub description: Vec<u16>, // 256 include null escape char
+ pub token_prefix: Vec<u8>, // 16 include null escape char
+ pub mint_mode: bool,
+ pub offchain_schema: Vec<u8>,
+ pub schema_version: SchemaVersion,
+ pub sponsorship: SponsorshipState<T::AccountId>,
+ pub limits: CollectionLimits<T::BlockNumber>, // Collection private restrictions
+ pub variable_on_chain_schema: Vec<u8>, //
+ pub const_on_chain_schema: Vec<u8>, //
}
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct NftItemType<AccountId> {
- pub owner: AccountId,
- pub const_data: Vec<u8>,
- pub variable_data: Vec<u8>,
+ pub owner: AccountId,
+ pub const_data: Vec<u8>,
+ pub variable_data: Vec<u8>,
}
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct FungibleItemType {
- pub value: u128,
+ pub value: u128,
}
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct ReFungibleItemType<AccountId> {
- pub owner: Vec<Ownership<AccountId>>,
- pub const_data: Vec<u8>,
- pub variable_data: Vec<u8>,
+ pub owner: Vec<Ownership<AccountId>>,
+ pub const_data: Vec<u8>,
+ pub variable_data: Vec<u8>,
}
-
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CollectionLimits<BlockNumber: Encode + Decode> {
- pub account_token_ownership_limit: u32,
- pub sponsored_data_size: u32,
- /// None - setVariableMetadata is not sponsored
- /// Some(v) - setVariableMetadata is sponsored
- /// if there is v block between txs
- pub sponsored_data_rate_limit: Option<BlockNumber>,
- pub token_limit: u32,
+ pub account_token_ownership_limit: u32,
+ pub sponsored_data_size: u32,
+ /// None - setVariableMetadata is not sponsored
+ /// Some(v) - setVariableMetadata is sponsored
+ /// if there is v block between txs
+ pub sponsored_data_rate_limit: Option<BlockNumber>,
+ pub token_limit: u32,
- // Timeouts for item types in passed blocks
- pub sponsor_transfer_timeout: u32,
- pub owner_can_transfer: bool,
- pub owner_can_destroy: bool,
+ // Timeouts for item types in passed blocks
+ pub sponsor_transfer_timeout: u32,
+ pub owner_can_transfer: bool,
+ pub owner_can_destroy: bool,
}
impl<BlockNumber: Encode + Decode> Default for CollectionLimits<BlockNumber> {
- fn default() -> Self {
- Self {
- account_token_ownership_limit: 10_000_000,
- token_limit: u32::max_value(),
- sponsored_data_size: u32::MAX,
- sponsored_data_rate_limit: None,
- sponsor_transfer_timeout: 14400,
- owner_can_transfer: true,
- owner_can_destroy: true
- }
- }
+ fn default() -> Self {
+ Self {
+ account_token_ownership_limit: 10_000_000,
+ token_limit: u32::max_value(),
+ sponsored_data_size: u32::MAX,
+ sponsored_data_rate_limit: None,
+ sponsor_transfer_timeout: 14400,
+ owner_can_transfer: true,
+ owner_can_destroy: true,
+ }
+ }
}
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct ChainLimits {
- pub collection_numbers_limit: u32,
- pub account_token_ownership_limit: u32,
- pub collections_admins_limit: u64,
- pub custom_data_limit: u32,
+ pub collection_numbers_limit: u32,
+ pub account_token_ownership_limit: u32,
+ pub collections_admins_limit: u64,
+ pub custom_data_limit: u32,
- // Timeouts for item types in passed blocks
- pub nft_sponsor_transfer_timeout: u32,
- pub fungible_sponsor_transfer_timeout: u32,
- pub refungible_sponsor_transfer_timeout: u32,
+ // Timeouts for item types in passed blocks
+ pub nft_sponsor_transfer_timeout: u32,
+ pub fungible_sponsor_transfer_timeout: u32,
+ pub refungible_sponsor_transfer_timeout: u32,
- // Schema limits
- pub offchain_schema_limit: u32,
- pub variable_on_chain_schema_limit: u32,
- pub const_on_chain_schema_limit: u32,
+ // Schema limits
+ pub offchain_schema_limit: u32,
+ pub variable_on_chain_schema_limit: u32,
+ pub const_on_chain_schema_limit: u32,
}
-
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CreateNftData {
- pub const_data: Vec<u8>,
- pub variable_data: Vec<u8>,
+ pub const_data: Vec<u8>,
+ pub variable_data: Vec<u8>,
}
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CreateFungibleData {
- pub value: u128,
+ pub value: u128,
}
#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CreateReFungibleData {
- pub const_data: Vec<u8>,
- pub variable_data: Vec<u8>,
- pub pieces: u128,
+ pub const_data: Vec<u8>,
+ pub variable_data: Vec<u8>,
+ pub pieces: u128,
}
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum CreateItemData {
- NFT(CreateNftData),
- Fungible(CreateFungibleData),
- ReFungible(CreateReFungibleData),
+ NFT(CreateNftData),
+ Fungible(CreateFungibleData),
+ ReFungible(CreateReFungibleData),
}
impl CreateItemData {
- pub fn len(&self) -> usize {
- let len = match self {
- CreateItemData::NFT(data) => data.variable_data.len() + data.const_data.len(),
- CreateItemData::ReFungible(data) => data.variable_data.len() + data.const_data.len(),
- _ => 0
- };
-
- return len;
- }
+ pub fn data_size(&self) -> usize {
+ match self {
+ CreateItemData::NFT(data) => data.variable_data.len() + data.const_data.len(),
+ CreateItemData::ReFungible(data) => data.variable_data.len() + data.const_data.len(),
+ _ => 0,
+ }
+ }
}
impl From<CreateNftData> for CreateItemData {
- fn from(item: CreateNftData) -> Self {
- CreateItemData::NFT(item)
- }
+ fn from(item: CreateNftData) -> Self {
+ CreateItemData::NFT(item)
+ }
}
impl From<CreateReFungibleData> for CreateItemData {
- fn from(item: CreateReFungibleData) -> Self {
- CreateItemData::ReFungible(item)
- }
+ fn from(item: CreateReFungibleData) -> Self {
+ CreateItemData::ReFungible(item)
+ }
}
impl From<CreateFungibleData> for CreateItemData {
- fn from(item: CreateFungibleData) -> Self {
- CreateItemData::Fungible(item)
- }
+ fn from(item: CreateFungibleData) -> Self {
+ CreateItemData::Fungible(item)
+ }
}
runtime/build.rsdiffbeforeafterboth--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -1,9 +1,9 @@
use substrate_wasm_builder::WasmBuilder;
fn main() {
- WasmBuilder::new()
- .with_current_project()
- .import_memory()
- .export_heap_base()
- .build()
-}
\ No newline at end of file
+ WasmBuilder::new()
+ .with_current_project()
+ .import_memory()
+ .export_heap_base()
+ .build()
+}
runtime/src/chain_extension.rsdiffbeforeafterboth--- a/runtime/src/chain_extension.rs
+++ b/runtime/src/chain_extension.rs
@@ -9,7 +9,7 @@
pub use pallet_contracts::chain_extension::RetVal;
use pallet_contracts::chain_extension::{
- ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,
+ ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,
};
pub use frame_support::debug;
@@ -25,56 +25,56 @@
/// Create item parameters
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtCreateItem<E: Ext> {
- pub owner: <E::T as SysConfig>::AccountId,
- pub collection_id: u32,
- pub data: CreateItemData,
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub data: CreateItemData,
}
/// Transfer parameters
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtTransfer<E: Ext> {
- pub recipient: <E::T as SysConfig>::AccountId,
- pub collection_id: u32,
- pub token_id: u32,
- pub amount: u128,
+ pub recipient: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub token_id: u32,
+ pub amount: u128,
}
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtCreateMultipleItems<E: Ext> {
- pub owner: <E::T as SysConfig>::AccountId,
- pub collection_id: u32,
- pub data: Vec<CreateItemData>,
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub data: Vec<CreateItemData>,
}
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtApprove<E: Ext> {
- pub spender: <E::T as SysConfig>::AccountId,
- pub collection_id: u32,
- pub item_id: u32,
- pub amount: u128,
+ pub spender: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub amount: u128,
}
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtTransferFrom<E: Ext> {
- pub owner: <E::T as SysConfig>::AccountId,
- pub recipient: <E::T as SysConfig>::AccountId,
- pub collection_id: u32,
- pub item_id: u32,
- pub amount: u128,
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub recipient: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub amount: u128,
}
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtSetVariableMetaData {
- pub collection_id: u32,
- pub item_id: u32,
- pub data: Vec<u8>,
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub data: Vec<u8>,
}
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtToggleWhiteList<E: Ext> {
- pub collection_id: u32,
- pub address: <E::T as SysConfig>::AccountId,
- pub whitelisted: bool,
+ pub collection_id: u32,
+ pub address: <E::T as SysConfig>::AccountId,
+ pub whitelisted: bool,
}
/// The chain Extension of NFT pallet
@@ -83,150 +83,146 @@
pub type NftWeightInfoOf<C> = <C as pallet_nft::Config>::WeightInfo;
impl<C: Config + pallet_contracts::Config> ChainExtension<C> for NFTExtension {
- fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>
- where
- E: Ext<T = C>,
- C: pallet_nft::Config,
- <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
- {
- // The memory of the vm stores buf in scale-codec
- match func_id {
- 0 => {
- let mut env = env.buf_in_buf_out();
- let input: NFTExtTransfer<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::transfer())?;
+ fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>
+ where
+ E: Ext<T = C>,
+ C: pallet_nft::Config,
+ <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+ {
+ // The memory of the vm stores buf in scale-codec
+ match func_id {
+ 0 => {
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtTransfer<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::transfer())?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::transfer_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &C::CrossAccountId::from_sub(input.recipient),
- &collection,
- input.token_id,
- input.amount,
- )?;
+ pallet_nft::Module::<C>::transfer_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &C::CrossAccountId::from_sub(input.recipient),
+ &collection,
+ input.token_id,
+ input.amount,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 1 => {
- // Create Item
- let mut env = env.buf_in_buf_out();
- let input: NFTExtCreateItem<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::create_item(input.data.len()))?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 1 => {
+ // Create Item
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtCreateItem<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::create_item(input.data.data_size()))?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::create_item_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &collection,
- &C::CrossAccountId::from_sub(input.owner),
- input.data,
- )?;
+ pallet_nft::Module::<C>::create_item_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ &C::CrossAccountId::from_sub(input.owner),
+ input.data,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 2 => {
- // Create multiple items
- let mut env = env.buf_in_buf_out();
- let input: NFTExtCreateMultipleItems<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::create_item(
- input.data.iter()
- .map(|i| i.len())
- .sum()
- ))?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 2 => {
+ // Create multiple items
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtCreateMultipleItems<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::create_item(
+ input.data.iter().map(|i| i.data_size()).sum(),
+ ))?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::create_multiple_items_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &collection,
- &C::CrossAccountId::from_sub(input.owner),
- input.data,
- )?;
+ pallet_nft::Module::<C>::create_multiple_items_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ &C::CrossAccountId::from_sub(input.owner),
+ input.data,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 3 => {
- // Approve
- let mut env = env.buf_in_buf_out();
- let input: NFTExtApprove<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::approve())?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 3 => {
+ // Approve
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtApprove<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::approve())?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::approve_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &C::CrossAccountId::from_sub(input.spender),
- &collection,
- input.item_id,
- input.amount,
- )?;
+ pallet_nft::Module::<C>::approve_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &C::CrossAccountId::from_sub(input.spender),
+ &collection,
+ input.item_id,
+ input.amount,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 4 => {
- // Transfer from
- let mut env = env.buf_in_buf_out();
- let input: NFTExtTransferFrom<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::transfer_from())?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 4 => {
+ // Transfer from
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtTransferFrom<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::transfer_from())?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::transfer_from_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &C::CrossAccountId::from_sub(input.owner),
- &C::CrossAccountId::from_sub(input.recipient),
- &collection,
- input.item_id,
- input.amount
- )?;
+ pallet_nft::Module::<C>::transfer_from_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &C::CrossAccountId::from_sub(input.owner),
+ &C::CrossAccountId::from_sub(input.recipient),
+ &collection,
+ input.item_id,
+ input.amount,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 5 => {
- // Set variable metadata
- let mut env = env.buf_in_buf_out();
- let input: NFTExtSetVariableMetaData = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::set_variable_meta_data())?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 5 => {
+ // Set variable metadata
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtSetVariableMetaData = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::set_variable_meta_data())?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::set_variable_meta_data_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &collection,
- input.item_id,
- input.data,
- )?;
+ pallet_nft::Module::<C>::set_variable_meta_data_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ input.item_id,
+ input.data,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- },
- 6 => {
- // Toggle whitelist
- let mut env = env.buf_in_buf_out();
- let input: NFTExtToggleWhiteList<E> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::add_to_white_list())?;
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ 6 => {
+ // Toggle whitelist
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtToggleWhiteList<E> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::add_to_white_list())?;
- let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- pallet_nft::Module::<C>::toggle_white_list_internal(
- &C::CrossAccountId::from_sub(env.ext().address().clone()),
- &collection,
- &C::CrossAccountId::from_sub(input.address),
- input.whitelisted,
- )?;
+ pallet_nft::Module::<C>::toggle_white_list_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ &C::CrossAccountId::from_sub(input.address),
+ input.whitelisted,
+ )?;
- pallet_nft::Module::<C>::submit_logs(collection)?;
- Ok(RetVal::Converging(0))
- }
- _ => {
- Err(DispatchError::Other("unknown chain_extension func_id"))
- }
- }
- }
+ pallet_nft::Module::<C>::submit_logs(collection)?;
+ Ok(RetVal::Converging(0))
+ }
+ _ => Err(DispatchError::Other("unknown chain_extension func_id")),
+ }
+ }
}
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -8,25 +8,25 @@
#![cfg_attr(not(feature = "std"), no_std)]
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit = "1024"]
-
+#![allow(clippy::from_over_into, clippy::identity_op)]
+#![allow(clippy::fn_to_numeric_cast_with_truncation)]
// Make the WASM binary available.
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
use sp_api::impl_runtime_apis;
-use sp_core::{ crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160 };
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};
// #[cfg(any(feature = "std", test))]
// pub use sp_runtime::BuildStorage;
use sp_runtime::{
- Permill, Perbill, Percent,
- create_runtime_str, generic, impl_opaque_keys,
- traits::{
- AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount,
- Verify, AccountIdConversion,
- },
- transaction_validity::{TransactionSource, TransactionValidity},
- ApplyExtrinsicResult, MultiSignature,
+ Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,
+ traits::{
+ AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,
+ AccountIdConversion,
+ },
+ transaction_validity::{TransactionSource, TransactionValidity},
+ ApplyExtrinsicResult, MultiSignature,
};
use sp_std::prelude::*;
@@ -34,48 +34,45 @@
#[cfg(feature = "std")]
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
-pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo};
+pub use pallet_transaction_payment::{
+ Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,
+};
// A few exports that help ease life for downstream crates.
pub use pallet_balances::Call as BalancesCall;
pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};
pub use frame_support::{
- construct_runtime,
- match_type,
- dispatch::DispatchResult,
- PalletId,
- parameter_types,
- StorageValue,
- ConsensusEngineId,
- traits::{
- All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier, OnUnbalanced, Randomness, FindAuthor
- },
- weights::{
- constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
- DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
- WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients
- },
+ construct_runtime, match_type,
+ dispatch::DispatchResult,
+ PalletId, parameter_types, StorageValue, ConsensusEngineId,
+ traits::{
+ All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,
+ OnUnbalanced, Randomness, FindAuthor,
+ },
+ weights::{
+ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+ DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
+ WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,
+ },
};
use nft_data_structs::*;
use pallet_contracts::weights::WeightInfo;
// #[cfg(any(feature = "std", test))]
use frame_system::{
- self as system,
- EnsureRoot, EnsureSigned,
+ self as system, EnsureRoot, EnsureSigned,
limits::{BlockWeights, BlockLength},
};
-use sp_arithmetic::{traits::{BaseArithmetic, Unsigned}};
+use sp_arithmetic::{
+ traits::{BaseArithmetic, Unsigned},
+};
use smallvec::smallvec;
use codec::{Encode, Decode};
use pallet_evm::{Account as EVMAccount, FeeCalculator, OnMethodCall};
use fp_rpc::TransactionStatus;
use sp_core::crypto::Public;
use sp_runtime::{
- traits::{
- Dispatchable,
- },
+ traits::{Dispatchable},
};
use pallet_contracts::chain_extension::UncheckedFrom;
-
pub use pallet_timestamp::Call as TimestampCall;
pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -93,10 +90,9 @@
SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
};
use xcm_executor::{Config, XcmExecutor};
-
mod chain_extension;
-use crate::chain_extension::{ NFTExtension, Imbalance };
+use crate::chain_extension::{NFTExtension, Imbalance};
/// Re-export a nft pallet
/// TODO: Check this re-export. Is this safe and good style?
@@ -144,16 +140,16 @@
pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
- /// Opaque block type.
- pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+ /// Opaque block type.
+ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
- pub type SessionHandlers = ();
+ pub type SessionHandlers = ();
impl_opaque_keys! {
- pub struct SessionKeys {
+ pub struct SessionKeys {
pub aura: Aura,
}
- }
+ }
}
/// This runtime version.
@@ -178,8 +174,8 @@
#[derive(codec::Encode, codec::Decode)]
pub enum XCMPMessage<XAccountId, XBalance> {
- /// Transfer tokens to the given account from the Parachain account.
- TransferToken(XAccountId, XBalance),
+ /// Transfer tokens to the given account from the Parachain account.
+ TransferToken(XAccountId, XBalance),
}
/// The version information used to identify this runtime when compiled natively.
@@ -195,7 +191,7 @@
pub struct DealWithFees;
impl OnUnbalanced<NegativeImbalance> for DealWithFees {
- fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item=NegativeImbalance>) {
+ fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {
if let Some(fees) = fees_then_tips.next() {
// for fees, 100% to treasury
let mut split = fees.ration(100, 0);
@@ -246,7 +242,6 @@
pub const SS58Prefix: u8 = 42;
}
-
parameter_types! {
pub const ChainId: u64 = 8888;
}
@@ -268,10 +263,10 @@
}
pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
-impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F>
-{
- fn find_author<'a, I>(digests: I) -> Option<H160> where
- I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
+ fn find_author<'a, I>(digests: I) -> Option<H160>
+ where
+ I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
{
if let Some(author_index) = F::find_author(digests) {
let authority_id = Aura::authorities()[author_index as usize].clone();
@@ -293,51 +288,51 @@
}
impl system::Config for Runtime {
- /// The data to be stored in an account.
- type AccountData = pallet_balances::AccountData<Balance>;
- /// The identifier used to distinguish between accounts.
- type AccountId = AccountId;
- /// The basic call filter to use in dispatchable.
- type BaseCallFilter = ();
- /// Maximum number of block number to block hash mappings to keep (oldest pruned first).
- type BlockHashCount = BlockHashCount;
- /// The maximum length of a block (in bytes).
+ /// The data to be stored in an account.
+ type AccountData = pallet_balances::AccountData<Balance>;
+ /// The identifier used to distinguish between accounts.
+ type AccountId = AccountId;
+ /// The basic call filter to use in dispatchable.
+ type BaseCallFilter = ();
+ /// Maximum number of block number to block hash mappings to keep (oldest pruned first).
+ type BlockHashCount = BlockHashCount;
+ /// The maximum length of a block (in bytes).
type BlockLength = RuntimeBlockLength;
- /// The index type for blocks.
- type BlockNumber = BlockNumber;
- /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.
+ /// The index type for blocks.
+ type BlockNumber = BlockNumber;
+ /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.
type BlockWeights = RuntimeBlockWeights;
- /// The aggregated dispatch type that is available for extrinsics.
- type Call = Call;
- /// The weight of database operations that the runtime can invoke.
- type DbWeight = RocksDbWeight;
- /// The ubiquitous event type.
- type Event = Event;
- /// The type for hashing blocks and tries.
- type Hash = Hash;
+ /// The aggregated dispatch type that is available for extrinsics.
+ type Call = Call;
+ /// The weight of database operations that the runtime can invoke.
+ type DbWeight = RocksDbWeight;
+ /// The ubiquitous event type.
+ type Event = Event;
+ /// The type for hashing blocks and tries.
+ type Hash = Hash;
/// The hashing algorithm used.
- type Hashing = BlakeTwo256;
- /// The header type.
- type Header = generic::Header<BlockNumber, BlakeTwo256>;
- /// The index type for storing how many extrinsics an account has signed.
- type Index = Index;
- /// The lookup mechanism to get account ID from whatever is passed in dispatchers.
- type Lookup = AccountIdLookup<AccountId, ()>;
- /// What to do if an account is fully reaped from the system.
- type OnKilledAccount = ();
- /// What to do if a new account is created.
- type OnNewAccount = ();
- type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
- /// The ubiquitous origin type.
- type Origin = Origin;
- /// This type is being generated by `construct_runtime!`.
- type PalletInfo = PalletInfo;
- /// This is used as an identifier of the chain. 42 is the generic substrate prefix.
+ type Hashing = BlakeTwo256;
+ /// The header type.
+ type Header = generic::Header<BlockNumber, BlakeTwo256>;
+ /// The index type for storing how many extrinsics an account has signed.
+ type Index = Index;
+ /// The lookup mechanism to get account ID from whatever is passed in dispatchers.
+ type Lookup = AccountIdLookup<AccountId, ()>;
+ /// What to do if an account is fully reaped from the system.
+ type OnKilledAccount = ();
+ /// What to do if a new account is created.
+ type OnNewAccount = ();
+ type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
+ /// The ubiquitous origin type.
+ type Origin = Origin;
+ /// This type is being generated by `construct_runtime!`.
+ type PalletInfo = PalletInfo;
+ /// This is used as an identifier of the chain. 42 is the generic substrate prefix.
type SS58Prefix = SS58Prefix;
/// Weight information for the extrinsics of this pallet.
- type SystemWeightInfo = system::weights::SubstrateWeight<Runtime>;
- /// Version of the runtime.
- type Version = Version;
+ type SystemWeightInfo = system::weights::SubstrateWeight<Runtime>;
+ /// Version of the runtime.
+ type Version = Version;
}
parameter_types! {
@@ -373,7 +368,7 @@
pub const MICROUNIQUE: Balance = 1_000_000_000;
pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;
pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;
-pub const UNIQUE: Balance = 100 * CENTIUNIQUE;
+pub const UNIQUE: Balance = 100 * CENTIUNIQUE;
pub const fn deposit(items: u32, bytes: u32) -> Balance {
items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE
@@ -437,8 +432,9 @@
/// Linear implementor of `WeightToFeePolynomial`
pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);
-impl<T> WeightToFeePolynomial for LinearFee<T> where
- T: BaseArithmetic + From<u32> + Copy + Unsigned
+impl<T> WeightToFeePolynomial for LinearFee<T>
+where
+ T: BaseArithmetic + From<u32> + Copy + Unsigned,
{
type Balance = T;
@@ -622,12 +618,12 @@
type AssetTransactor = LocalAssetTransactor;
type OriginConverter = XcmOriginToTransactDispatchOrigin;
type IsReserve = NativeAsset;
- type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC
+ type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC
type LocationInverter = LocationInverter<Ancestry>;
type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;
- type ResponseHandler = (); // Don't handle responses for now.
+ type ResponseHandler = (); // Don't handle responses for now.
}
// parameter_types! {
@@ -720,14 +716,13 @@
pub struct Sponsoring;
impl SponsoringResolve<AccountId, Call> for Sponsoring {
-
- fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>
- where
- Call: Dispatchable<Info=DispatchInfo>,
- Call: IsSubType<pallet_nft::Call<Runtime>>,
+ fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>
+ where
+ Call: Dispatchable<Info = DispatchInfo>,
+ Call: IsSubType<pallet_nft::Call<Runtime>>,
Call: IsSubType<pallet_contracts::Call<Runtime>>,
AccountId: AsRef<[u8]>,
- AccountId: UncheckedFrom<Hash>
+ AccountId: UncheckedFrom<Hash>,
{
pallet_nft_transaction_payment::Module::<Runtime>::withdraw_type(who, call)
}
@@ -735,7 +730,7 @@
type SponsorshipHandler = (
pallet_nft::NftSponsorshipHandler<Runtime>,
- pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,
+ pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,
);
impl pallet_scheduler::Config for Runtime {
@@ -759,20 +754,20 @@
impl pallet_contract_helpers::Config for Runtime {}
construct_runtime!(
- pub enum Runtime where
- Block = Block,
- NodeBlock = opaque::Block,
- UncheckedExtrinsic = UncheckedExtrinsic
- {
+ pub enum Runtime where
+ Block = Block,
+ NodeBlock = opaque::Block,
+ UncheckedExtrinsic = UncheckedExtrinsic
+ {
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
- Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
+ Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>},
System: system::{Pallet, Call, Storage, Config, Event<T>},
- Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>},
+ Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>},
ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
@@ -792,28 +787,36 @@
// Unique Pallets
- Inflation: pallet_inflation::{Pallet, Call, Storage},
+ Inflation: pallet_inflation::{Pallet, Call, Storage},
Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>},
Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage},
Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage },
ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage},
- }
+ }
);
pub struct TransactionConverter;
impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {
fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {
- UncheckedExtrinsic::new_unsigned(pallet_ethereum::Call::<Runtime>::transact(transaction).into())
+ UncheckedExtrinsic::new_unsigned(
+ pallet_ethereum::Call::<Runtime>::transact(transaction).into(),
+ )
}
}
impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {
- fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> opaque::UncheckedExtrinsic {
- let extrinsic = UncheckedExtrinsic::new_unsigned(pallet_ethereum::Call::<Runtime>::transact(transaction).into());
+ fn convert_transaction(
+ &self,
+ transaction: pallet_ethereum::Transaction,
+ ) -> opaque::UncheckedExtrinsic {
+ let extrinsic = UncheckedExtrinsic::new_unsigned(
+ pallet_ethereum::Call::<Runtime>::transact(transaction).into(),
+ );
let encoded = extrinsic.encode();
- opaque::UncheckedExtrinsic::decode(&mut &encoded[..]).expect("Encoded extrinsic is always valid")
+ opaque::UncheckedExtrinsic::decode(&mut &encoded[..])
+ .expect("Encoded extrinsic is always valid")
}
}
@@ -829,13 +832,13 @@
pub type BlockId = generic::BlockId<Block>;
/// The SignedExtension to the basic transaction logic.
pub type SignedExtra = (
- system::CheckSpecVersion<Runtime>,
- // system::CheckTxVersion<Runtime>,
- system::CheckGenesis<Runtime>,
- system::CheckEra<Runtime>,
- system::CheckNonce<Runtime>,
- system::CheckWeight<Runtime>,
- pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,
+ system::CheckSpecVersion<Runtime>,
+ // system::CheckTxVersion<Runtime>,
+ system::CheckGenesis<Runtime>,
+ system::CheckEra<Runtime>,
+ system::CheckNonce<Runtime>,
+ system::CheckWeight<Runtime>,
+ pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,
pallet_contract_helpers::ContractHelpersExtension<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
@@ -844,11 +847,11 @@
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
/// Executive: handles dispatch to the various modules.
pub type Executive = frame_executive::Executive<
- Runtime,
- Block,
- frame_system::ChainContext<Runtime>,
- Runtime,
- AllPallets,
+ Runtime,
+ Block,
+ frame_system::ChainContext<Runtime>,
+ Runtime,
+ AllPallets,
>;
impl_opaque_keys! {
@@ -866,59 +869,59 @@
}
}
- impl sp_api::Core<Block> for Runtime {
- fn version() -> RuntimeVersion {
- VERSION
- }
+ impl sp_api::Core<Block> for Runtime {
+ fn version() -> RuntimeVersion {
+ VERSION
+ }
- fn execute_block(block: Block) {
- Executive::execute_block(block)
- }
+ fn execute_block(block: Block) {
+ Executive::execute_block(block)
+ }
- fn initialize_block(header: &<Block as BlockT>::Header) {
- Executive::initialize_block(header)
- }
- }
+ fn initialize_block(header: &<Block as BlockT>::Header) {
+ Executive::initialize_block(header)
+ }
+ }
- impl sp_api::Metadata<Block> for Runtime {
- fn metadata() -> OpaqueMetadata {
- Runtime::metadata().into()
- }
- }
+ impl sp_api::Metadata<Block> for Runtime {
+ fn metadata() -> OpaqueMetadata {
+ Runtime::metadata().into()
+ }
+ }
- impl sp_block_builder::BlockBuilder<Block> for Runtime {
- fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
- Executive::apply_extrinsic(extrinsic)
- }
+ impl sp_block_builder::BlockBuilder<Block> for Runtime {
+ fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
+ Executive::apply_extrinsic(extrinsic)
+ }
- fn finalize_block() -> <Block as BlockT>::Header {
- Executive::finalize_block()
- }
+ fn finalize_block() -> <Block as BlockT>::Header {
+ Executive::finalize_block()
+ }
- fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
- data.create_extrinsics()
- }
+ fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
+ data.create_extrinsics()
+ }
- fn check_inherents(
- block: Block,
- data: sp_inherents::InherentData,
- ) -> sp_inherents::CheckInherentsResult {
- data.check_extrinsics(&block)
- }
+ fn check_inherents(
+ block: Block,
+ data: sp_inherents::InherentData,
+ ) -> sp_inherents::CheckInherentsResult {
+ data.check_extrinsics(&block)
+ }
- // fn random_seed() -> <Block as BlockT>::Hash {
- // RandomnessCollectiveFlip::random_seed().0
- // }
- }
+ // fn random_seed() -> <Block as BlockT>::Hash {
+ // RandomnessCollectiveFlip::random_seed().0
+ // }
+ }
- impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
- fn validate_transaction(
- source: TransactionSource,
- tx: <Block as BlockT>::Extrinsic,
- ) -> TransactionValidity {
- Executive::validate_transaction(source, tx)
- }
- }
+ impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
+ fn validate_transaction(
+ source: TransactionSource,
+ tx: <Block as BlockT>::Extrinsic,
+ ) -> TransactionValidity {
+ Executive::validate_transaction(source, tx)
+ }
+ }
impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
fn offchain_worker(header: &<Block as BlockT>::Header) {
@@ -979,7 +982,7 @@
gas_limit.low_u64(),
gas_price,
nonce,
- config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config()),
+ config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
).map_err(|err| err.into())
}
@@ -1007,7 +1010,7 @@
gas_limit.low_u64(),
gas_price,
nonce,
- config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config()),
+ config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
).map_err(|err| err.into())
}
@@ -1118,7 +1121,7 @@
}
}
- #[cfg(feature = "runtime-benchmarks")]
+ #[cfg(feature = "runtime-benchmarks")]
impl frame_benchmarking::Benchmark<Block> for Runtime {
fn dispatch_benchmark(
config: frame_benchmarking::BenchmarkConfig
runtime/src/nft_weights.rsdiffbeforeafterboth--- a/runtime/src/nft_weights.rs
+++ b/runtime/src/nft_weights.rs
@@ -8,154 +8,154 @@
pub struct WeightInfo;
impl pallet_nft::WeightInfo for WeightInfo {
fn create_collection() -> Weight {
- (70_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(7 as Weight))
- .saturating_add(DbWeight::get().writes(5 as Weight))
+ 70_000_000_u64
+ .saturating_add(DbWeight::get().reads(7_u64))
+ .saturating_add(DbWeight::get().writes(5_u64))
}
fn destroy_collection() -> Weight {
- (90_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(5 as Weight))
+ 90_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(5_u64))
}
fn add_to_white_list() -> Weight {
- (30_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn remove_from_white_list() -> Weight {
- (35_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 30_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn remove_from_white_list() -> Weight {
+ 35_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn set_public_access_mode() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn set_mint_permission() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn change_collection_owner() -> Weight {
- (27_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 27_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn add_collection_admin() -> Weight {
- (32_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
+ 32_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
}
fn remove_collection_admin() -> Weight {
- (50_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_collection_sponsor() -> Weight {
- (32_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn confirm_sponsorship() -> Weight {
- (22_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn remove_collection_sponsor() -> Weight {
- (24_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn create_item(s: usize, ) -> Weight {
- (130_000_000 as Weight)
- .saturating_add((2135 as Weight).saturating_mul(s as Weight).saturating_mul(500 as Weight)) // 500 is temparary multiplier, fee for storage
- .saturating_add(DbWeight::get().reads(10 as Weight))
- .saturating_add(DbWeight::get().writes(8 as Weight))
- }
- fn burn_item() -> Weight {
- (170_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(9 as Weight))
- .saturating_add(DbWeight::get().writes(7 as Weight))
- }
- fn transfer() -> Weight {
- (125_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(7 as Weight))
- .saturating_add(DbWeight::get().writes(7 as Weight))
- }
- fn approve() -> Weight {
- (45_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(3 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn transfer_from() -> Weight {
- (150_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(9 as Weight))
- .saturating_add(DbWeight::get().writes(8 as Weight))
- }
- fn set_offchain_schema() -> Weight {
- (33_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_const_on_chain_schema() -> Weight {
- (11_100_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_variable_on_chain_schema() -> Weight {
- (11_100_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_variable_meta_data() -> Weight {
- (17_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn enable_contract_sponsoring() -> Weight {
- (13_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_schema_version() -> Weight {
- (8_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_chain_limits() -> Weight {
- (1_300_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
- fn set_contract_sponsoring_rate_limit() -> Weight {
- (3_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn set_variable_meta_data_sponsoring_rate_limit() -> Weight {
- (3_500_000 as Weight)
- .saturating_add(DbWeight::get().reads(1 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn toggle_contract_white_list() -> Weight {
- (3_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn add_to_contract_white_list() -> Weight {
- (3_000_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn remove_from_contract_white_list() -> Weight {
- (3_200_000 as Weight)
- .saturating_add(DbWeight::get().reads(0 as Weight))
- .saturating_add(DbWeight::get().writes(2 as Weight))
- }
- fn set_collection_limits() -> Weight {
- (8_900_000 as Weight)
- .saturating_add(DbWeight::get().reads(2 as Weight))
- .saturating_add(DbWeight::get().writes(1 as Weight))
- }
+ 50_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_collection_sponsor() -> Weight {
+ 32_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn confirm_sponsorship() -> Weight {
+ 22_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn remove_collection_sponsor() -> Weight {
+ 24_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn create_item(s: usize) -> Weight {
+ 130_000_000_u64
+ .saturating_add(2135_u64.saturating_mul(s as Weight).saturating_mul(500_u64)) // 500 is temparary multiplier, fee for storage
+ .saturating_add(DbWeight::get().reads(10_u64))
+ .saturating_add(DbWeight::get().writes(8_u64))
+ }
+ fn burn_item() -> Weight {
+ 170_000_000_u64
+ .saturating_add(DbWeight::get().reads(9_u64))
+ .saturating_add(DbWeight::get().writes(7_u64))
+ }
+ fn transfer() -> Weight {
+ 125_000_000_u64
+ .saturating_add(DbWeight::get().reads(7_u64))
+ .saturating_add(DbWeight::get().writes(7_u64))
+ }
+ fn approve() -> Weight {
+ 45_000_000_u64
+ .saturating_add(DbWeight::get().reads(3_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn transfer_from() -> Weight {
+ 150_000_000_u64
+ .saturating_add(DbWeight::get().reads(9_u64))
+ .saturating_add(DbWeight::get().writes(8_u64))
+ }
+ fn set_offchain_schema() -> Weight {
+ 33_000_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_const_on_chain_schema() -> Weight {
+ 11_100_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_variable_on_chain_schema() -> Weight {
+ 11_100_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_variable_meta_data() -> Weight {
+ 17_500_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn enable_contract_sponsoring() -> Weight {
+ 13_000_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_schema_version() -> Weight {
+ 8_500_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_chain_limits() -> Weight {
+ 1_300_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
+ fn set_contract_sponsoring_rate_limit() -> Weight {
+ 3_500_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn set_variable_meta_data_sponsoring_rate_limit() -> Weight {
+ 3_500_000_u64
+ .saturating_add(DbWeight::get().reads(1_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn toggle_contract_white_list() -> Weight {
+ 3_000_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn add_to_contract_white_list() -> Weight {
+ 3_000_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn remove_from_contract_white_list() -> Weight {
+ 3_200_000_u64
+ .saturating_add(DbWeight::get().reads(0_u64))
+ .saturating_add(DbWeight::get().writes(2_u64))
+ }
+ fn set_collection_limits() -> Weight {
+ 8_900_000_u64
+ .saturating_add(DbWeight::get().reads(2_u64))
+ .saturating_add(DbWeight::get().writes(1_u64))
+ }
}