difftreelog
refactor remove meta update permission
in: master
11 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -22,7 +22,7 @@
use pallet_evm::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
- ensure, fail,
+ ensure,
traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},
BoundedVec,
weights::Pays,
@@ -30,7 +30,7 @@
use pallet_evm::GasWeightMapping;
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData,
- MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId,
+ MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, TokenId,
CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT,
FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,
CUSTOM_DATA_LIMIT, CollectionLimits, CreateCollectionData, SponsorshipState,
@@ -134,21 +134,6 @@
<Error<T>>::AddressNotInAllowlist
);
Ok(())
- }
-
- pub fn check_can_update_meta(
- &self,
- subject: &T::CrossAccountId,
- item_owner: &T::CrossAccountId,
- ) -> DispatchResult {
- match self.meta_update_permission {
- MetaUpdatePermission::ItemOwner => {
- ensure!(subject == item_owner, <Error<T>>::NoPermission);
- Ok(())
- }
- MetaUpdatePermission::Admin => self.check_is_owner_or_admin(subject),
- MetaUpdatePermission::None => fail!(<Error<T>>::NoPermission),
- }
}
}
@@ -565,7 +550,6 @@
schema_version,
sponsorship,
limits,
- meta_update_permission,
} = <CollectionById<T>>::get(collection)?;
let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -595,7 +579,6 @@
schema_version,
sponsorship,
limits,
- meta_update_permission,
offchain_schema: <CollectionData<T>>::get((
collection,
CollectionField::OffchainSchema,
@@ -656,7 +639,6 @@
.limits
.map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
.unwrap_or_else(|| Ok(CollectionLimits::default()))?,
- meta_update_permission: data.meta_update_permission.unwrap_or_default(),
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
pallets/unique/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -168,9 +168,4 @@
nesting_rule: None,
};
}: set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl)
-
- set_meta_update_permission_flag {
- let caller: T::AccountId = account("caller", 0, SEED);
- let collection = create_nft_collection::<T>(caller.clone())?;
- }: _(RawOrigin::Signed(caller.clone()), collection, MetaUpdatePermission::Admin)
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -38,12 +38,12 @@
CONST_ON_CHAIN_SCHEMA_LIMIT, OFFCHAIN_SCHEMA_LIMIT,
MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
AccessMode, CreateItemData, CollectionLimits, CollectionId, CollectionMode, TokenId,
- SchemaVersion, SponsorshipState, MetaUpdatePermission, CreateCollectionData,
+ SchemaVersion, SponsorshipState, CreateCollectionData,
CreateItemExData, budget, CollectionField, Property, PropertyKey, PropertyKeyPermission,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
- CollectionHandle, Pallet as PalletCommon, Error as CommonError, CommonWeightInfo,
+ CollectionHandle, Pallet as PalletCommon, CommonWeightInfo,
dispatch::dispatch_call, dispatch::CollectionDispatch,
};
@@ -925,34 +925,6 @@
let budget = budget::Value::new(2);
dispatch_call::<T, _>(collection_id, |d| d.transfer_from(sender, from, recipient, item_id, value, &budget))
- }
-
- /// Set meta_update_permission value for particular collection
- ///
- /// # Permissions
- ///
- /// * Collection Owner.
- ///
- /// # Arguments
- ///
- /// * collection_id: ID of the collection.
- ///
- /// * value: New flag value.
- #[weight = <SelfWeightOf<T>>::set_meta_update_permission_flag()]
- #[transactional]
- pub fn set_meta_update_permission_flag(origin, collection_id: CollectionId, value: MetaUpdatePermission) -> DispatchResult {
- let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
- let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-
- ensure!(
- target_collection.meta_update_permission != MetaUpdatePermission::None,
- <CommonError<T>>::MetadataFlagFrozen,
- );
- target_collection.check_is_owner(&sender)?;
-
- target_collection.meta_update_permission = value;
-
- target_collection.save()
}
/// Set schema standard
pallets/unique/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_unique4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// --pallet13// pallet-unique14// --wasm-execution15// compiled16// --extrinsic17// *18// --template19// .maintain/frame-weight-template.hbs20// --steps=5021// --repeat=20022// --heap-pages=409623// --output=./pallets/unique/src/weights.rs2425#![cfg_attr(rustfmt, rustfmt_skip)]26#![allow(unused_parens)]27#![allow(unused_imports)]28#![allow(clippy::unnecessary_cast)]2930use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};31use sp_std::marker::PhantomData;3233/// Weight functions needed for pallet_unique.34pub trait WeightInfo {35 fn create_collection() -> Weight;36 fn destroy_collection() -> Weight;37 fn add_to_allow_list() -> Weight;38 fn remove_from_allow_list() -> Weight;39 fn set_public_access_mode() -> Weight;40 fn set_mint_permission() -> Weight;41 fn change_collection_owner() -> Weight;42 fn add_collection_admin() -> Weight;43 fn remove_collection_admin() -> Weight;44 fn set_collection_sponsor() -> Weight;45 fn confirm_sponsorship() -> Weight;46 fn remove_collection_sponsor() -> Weight;47 fn set_transfers_enabled_flag() -> Weight;48 fn set_offchain_schema(b: u32, ) -> Weight;49 fn set_const_on_chain_schema(b: u32, ) -> Weight;50 fn set_schema_version() -> Weight;51 fn set_collection_limits() -> Weight;52 fn set_meta_update_permission_flag() -> Weight;53}5455/// Weights for pallet_unique using the Substrate node and recommended hardware.56pub struct SubstrateWeight<T>(PhantomData<T>);57impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {58 // Storage: Common CreatedCollectionCount (r:1 w:1)59 // Storage: Common DestroyedCollectionCount (r:1 w:0)60 // Storage: System Account (r:2 w:2)61 // Storage: Common CollectionById (r:0 w:1)62 fn create_collection() -> Weight {63 (28_929_000 as Weight)64 .saturating_add(T::DbWeight::get().reads(4 as Weight))65 .saturating_add(T::DbWeight::get().writes(4 as Weight))66 }67 // Storage: Common CollectionById (r:1 w:1)68 // Storage: Common DestroyedCollectionCount (r:1 w:1)69 // Storage: Nonfungible TokensMinted (r:0 w:1)70 // Storage: Nonfungible TokensBurnt (r:0 w:1)71 // Storage: Common AdminAmount (r:0 w:1)72 fn destroy_collection() -> Weight {73 (40_303_000 as Weight)74 .saturating_add(T::DbWeight::get().reads(2 as Weight))75 .saturating_add(T::DbWeight::get().writes(5 as Weight))76 }77 // Storage: Common CollectionById (r:1 w:0)78 // Storage: Common Allowlist (r:0 w:1)79 fn add_to_allow_list() -> Weight {80 (15_989_000 as Weight)81 .saturating_add(T::DbWeight::get().reads(1 as Weight))82 .saturating_add(T::DbWeight::get().writes(1 as Weight))83 }84 // Storage: Common CollectionById (r:1 w:0)85 // Storage: Common Allowlist (r:0 w:1)86 fn remove_from_allow_list() -> Weight {87 (15_582_000 as Weight)88 .saturating_add(T::DbWeight::get().reads(1 as Weight))89 .saturating_add(T::DbWeight::get().writes(1 as Weight))90 }91 // Storage: Common CollectionById (r:1 w:1)92 fn set_public_access_mode() -> Weight {93 (14_846_000 as Weight)94 .saturating_add(T::DbWeight::get().reads(1 as Weight))95 .saturating_add(T::DbWeight::get().writes(1 as Weight))96 }97 // Storage: Common CollectionById (r:1 w:1)98 fn set_mint_permission() -> Weight {99 (14_534_000 as Weight)100 .saturating_add(T::DbWeight::get().reads(1 as Weight))101 .saturating_add(T::DbWeight::get().writes(1 as Weight))102 }103 // Storage: Common CollectionById (r:1 w:1)104 fn change_collection_owner() -> Weight {105 (14_990_000 as Weight)106 .saturating_add(T::DbWeight::get().reads(1 as Weight))107 .saturating_add(T::DbWeight::get().writes(1 as Weight))108 }109 // Storage: Common CollectionById (r:1 w:0)110 // Storage: Common IsAdmin (r:1 w:1)111 // Storage: Common AdminAmount (r:1 w:1)112 fn add_collection_admin() -> Weight {113 (19_957_000 as Weight)114 .saturating_add(T::DbWeight::get().reads(3 as Weight))115 .saturating_add(T::DbWeight::get().writes(2 as Weight))116 }117 // Storage: Common CollectionById (r:1 w:0)118 // Storage: Common IsAdmin (r:1 w:1)119 // Storage: Common AdminAmount (r:1 w:1)120 fn remove_collection_admin() -> Weight {121 (21_209_000 as Weight)122 .saturating_add(T::DbWeight::get().reads(3 as Weight))123 .saturating_add(T::DbWeight::get().writes(2 as Weight))124 }125 // Storage: Common CollectionById (r:1 w:1)126 fn set_collection_sponsor() -> Weight {127 (14_963_000 as Weight)128 .saturating_add(T::DbWeight::get().reads(1 as Weight))129 .saturating_add(T::DbWeight::get().writes(1 as Weight))130 }131 // Storage: Common CollectionById (r:1 w:1)132 fn confirm_sponsorship() -> Weight {133 (14_478_000 as Weight)134 .saturating_add(T::DbWeight::get().reads(1 as Weight))135 .saturating_add(T::DbWeight::get().writes(1 as Weight))136 }137 // Storage: Common CollectionById (r:1 w:1)138 fn remove_collection_sponsor() -> Weight {139 (14_393_000 as Weight)140 .saturating_add(T::DbWeight::get().reads(1 as Weight))141 .saturating_add(T::DbWeight::get().writes(1 as Weight))142 }143 // Storage: Common CollectionById (r:1 w:1)144 fn set_transfers_enabled_flag() -> Weight {145 (7_309_000 as Weight)146 .saturating_add(T::DbWeight::get().reads(1 as Weight))147 .saturating_add(T::DbWeight::get().writes(1 as Weight))148 }149 // Storage: Common CollectionById (r:1 w:1)150 fn set_offchain_schema(_b: u32, ) -> Weight {151 (15_220_000 as Weight)152 .saturating_add(T::DbWeight::get().reads(1 as Weight))153 .saturating_add(T::DbWeight::get().writes(1 as Weight))154 }155 // Storage: Common CollectionById (r:1 w:1)156 fn set_const_on_chain_schema(_b: u32, ) -> Weight {157 (14_984_000 as Weight)158 .saturating_add(T::DbWeight::get().reads(1 as Weight))159 .saturating_add(T::DbWeight::get().writes(1 as Weight))160 }161 // Storage: Common CollectionById (r:1 w:1)162 fn set_schema_version() -> Weight {163 (14_596_000 as Weight)164 .saturating_add(T::DbWeight::get().reads(1 as Weight))165 .saturating_add(T::DbWeight::get().writes(1 as Weight))166 }167 // Storage: Common CollectionById (r:1 w:1)168 fn set_collection_limits() -> Weight {169 (15_339_000 as Weight)170 .saturating_add(T::DbWeight::get().reads(1 as Weight))171 .saturating_add(T::DbWeight::get().writes(1 as Weight))172 }173 // Storage: Common CollectionById (r:1 w:1)174 fn set_meta_update_permission_flag() -> Weight {175 (7_214_000 as Weight)176 .saturating_add(T::DbWeight::get().reads(1 as Weight))177 .saturating_add(T::DbWeight::get().writes(1 as Weight))178 }179}180181// For backwards compatibility and tests182impl WeightInfo for () {183 // Storage: Common CreatedCollectionCount (r:1 w:1)184 // Storage: Common DestroyedCollectionCount (r:1 w:0)185 // Storage: System Account (r:2 w:2)186 // Storage: Common CollectionById (r:0 w:1)187 fn create_collection() -> Weight {188 (28_929_000 as Weight)189 .saturating_add(RocksDbWeight::get().reads(4 as Weight))190 .saturating_add(RocksDbWeight::get().writes(4 as Weight))191 }192 // Storage: Common CollectionById (r:1 w:1)193 // Storage: Common DestroyedCollectionCount (r:1 w:1)194 // Storage: Nonfungible TokensMinted (r:0 w:1)195 // Storage: Nonfungible TokensBurnt (r:0 w:1)196 // Storage: Common AdminAmount (r:0 w:1)197 fn destroy_collection() -> Weight {198 (40_303_000 as Weight)199 .saturating_add(RocksDbWeight::get().reads(2 as Weight))200 .saturating_add(RocksDbWeight::get().writes(5 as Weight))201 }202 // Storage: Common CollectionById (r:1 w:0)203 // Storage: Common Allowlist (r:0 w:1)204 fn add_to_allow_list() -> Weight {205 (15_989_000 as Weight)206 .saturating_add(RocksDbWeight::get().reads(1 as Weight))207 .saturating_add(RocksDbWeight::get().writes(1 as Weight))208 }209 // Storage: Common CollectionById (r:1 w:0)210 // Storage: Common Allowlist (r:0 w:1)211 fn remove_from_allow_list() -> Weight {212 (15_582_000 as Weight)213 .saturating_add(RocksDbWeight::get().reads(1 as Weight))214 .saturating_add(RocksDbWeight::get().writes(1 as Weight))215 }216 // Storage: Common CollectionById (r:1 w:1)217 fn set_public_access_mode() -> Weight {218 (14_846_000 as Weight)219 .saturating_add(RocksDbWeight::get().reads(1 as Weight))220 .saturating_add(RocksDbWeight::get().writes(1 as Weight))221 }222 // Storage: Common CollectionById (r:1 w:1)223 fn set_mint_permission() -> Weight {224 (14_534_000 as Weight)225 .saturating_add(RocksDbWeight::get().reads(1 as Weight))226 .saturating_add(RocksDbWeight::get().writes(1 as Weight))227 }228 // Storage: Common CollectionById (r:1 w:1)229 fn change_collection_owner() -> Weight {230 (14_990_000 as Weight)231 .saturating_add(RocksDbWeight::get().reads(1 as Weight))232 .saturating_add(RocksDbWeight::get().writes(1 as Weight))233 }234 // Storage: Common CollectionById (r:1 w:0)235 // Storage: Common IsAdmin (r:1 w:1)236 // Storage: Common AdminAmount (r:1 w:1)237 fn add_collection_admin() -> Weight {238 (19_957_000 as Weight)239 .saturating_add(RocksDbWeight::get().reads(3 as Weight))240 .saturating_add(RocksDbWeight::get().writes(2 as Weight))241 }242 // Storage: Common CollectionById (r:1 w:0)243 // Storage: Common IsAdmin (r:1 w:1)244 // Storage: Common AdminAmount (r:1 w:1)245 fn remove_collection_admin() -> Weight {246 (21_209_000 as Weight)247 .saturating_add(RocksDbWeight::get().reads(3 as Weight))248 .saturating_add(RocksDbWeight::get().writes(2 as Weight))249 }250 // Storage: Common CollectionById (r:1 w:1)251 fn set_collection_sponsor() -> Weight {252 (14_963_000 as Weight)253 .saturating_add(RocksDbWeight::get().reads(1 as Weight))254 .saturating_add(RocksDbWeight::get().writes(1 as Weight))255 }256 // Storage: Common CollectionById (r:1 w:1)257 fn confirm_sponsorship() -> Weight {258 (14_478_000 as Weight)259 .saturating_add(RocksDbWeight::get().reads(1 as Weight))260 .saturating_add(RocksDbWeight::get().writes(1 as Weight))261 }262 // Storage: Common CollectionById (r:1 w:1)263 fn remove_collection_sponsor() -> Weight {264 (14_393_000 as Weight)265 .saturating_add(RocksDbWeight::get().reads(1 as Weight))266 .saturating_add(RocksDbWeight::get().writes(1 as Weight))267 }268 // Storage: Common CollectionById (r:1 w:1)269 fn set_transfers_enabled_flag() -> Weight {270 (7_309_000 as Weight)271 .saturating_add(RocksDbWeight::get().reads(1 as Weight))272 .saturating_add(RocksDbWeight::get().writes(1 as Weight))273 }274 // Storage: Common CollectionById (r:1 w:1)275 fn set_offchain_schema(_b: u32, ) -> Weight {276 (15_220_000 as Weight)277 .saturating_add(RocksDbWeight::get().reads(1 as Weight))278 .saturating_add(RocksDbWeight::get().writes(1 as Weight))279 }280 // Storage: Common CollectionById (r:1 w:1)281 fn set_const_on_chain_schema(_b: u32, ) -> Weight {282 (14_984_000 as Weight)283 .saturating_add(RocksDbWeight::get().reads(1 as Weight))284 .saturating_add(RocksDbWeight::get().writes(1 as Weight))285 }286 // Storage: Common CollectionById (r:1 w:1)287 fn set_schema_version() -> Weight {288 (14_596_000 as Weight)289 .saturating_add(RocksDbWeight::get().reads(1 as Weight))290 .saturating_add(RocksDbWeight::get().writes(1 as Weight))291 }292 // Storage: Common CollectionById (r:1 w:1)293 fn set_collection_limits() -> Weight {294 (15_339_000 as Weight)295 .saturating_add(RocksDbWeight::get().reads(1 as Weight))296 .saturating_add(RocksDbWeight::get().writes(1 as Weight))297 }298 // Storage: Common CollectionById (r:1 w:1)299 fn set_meta_update_permission_flag() -> Weight {300 (7_214_000 as Weight)301 .saturating_add(RocksDbWeight::get().reads(1 as Weight))302 .saturating_add(RocksDbWeight::get().writes(1 as Weight))303 }304}1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_unique4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// --pallet13// pallet-unique14// --wasm-execution15// compiled16// --extrinsic17// *18// --template19// .maintain/frame-weight-template.hbs20// --steps=5021// --repeat=20022// --heap-pages=409623// --output=./pallets/unique/src/weights.rs2425#![cfg_attr(rustfmt, rustfmt_skip)]26#![allow(unused_parens)]27#![allow(unused_imports)]28#![allow(clippy::unnecessary_cast)]2930use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};31use sp_std::marker::PhantomData;3233/// Weight functions needed for pallet_unique.34pub trait WeightInfo {35 fn create_collection() -> Weight;36 fn destroy_collection() -> Weight;37 fn add_to_allow_list() -> Weight;38 fn remove_from_allow_list() -> Weight;39 fn set_public_access_mode() -> Weight;40 fn set_mint_permission() -> Weight;41 fn change_collection_owner() -> Weight;42 fn add_collection_admin() -> Weight;43 fn remove_collection_admin() -> Weight;44 fn set_collection_sponsor() -> Weight;45 fn confirm_sponsorship() -> Weight;46 fn remove_collection_sponsor() -> Weight;47 fn set_transfers_enabled_flag() -> Weight;48 fn set_offchain_schema(b: u32, ) -> Weight;49 fn set_const_on_chain_schema(b: u32, ) -> Weight;50 fn set_schema_version() -> Weight;51 fn set_collection_limits() -> Weight;52}5354/// Weights for pallet_unique using the Substrate node and recommended hardware.55pub struct SubstrateWeight<T>(PhantomData<T>);56impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {57 // Storage: Common CreatedCollectionCount (r:1 w:1)58 // Storage: Common DestroyedCollectionCount (r:1 w:0)59 // Storage: System Account (r:2 w:2)60 // Storage: Common CollectionById (r:0 w:1)61 fn create_collection() -> Weight {62 (28_929_000 as Weight)63 .saturating_add(T::DbWeight::get().reads(4 as Weight))64 .saturating_add(T::DbWeight::get().writes(4 as Weight))65 }66 // Storage: Common CollectionById (r:1 w:1)67 // Storage: Common DestroyedCollectionCount (r:1 w:1)68 // Storage: Nonfungible TokensMinted (r:0 w:1)69 // Storage: Nonfungible TokensBurnt (r:0 w:1)70 // Storage: Common AdminAmount (r:0 w:1)71 fn destroy_collection() -> Weight {72 (40_303_000 as Weight)73 .saturating_add(T::DbWeight::get().reads(2 as Weight))74 .saturating_add(T::DbWeight::get().writes(5 as Weight))75 }76 // Storage: Common CollectionById (r:1 w:0)77 // Storage: Common Allowlist (r:0 w:1)78 fn add_to_allow_list() -> Weight {79 (15_989_000 as Weight)80 .saturating_add(T::DbWeight::get().reads(1 as Weight))81 .saturating_add(T::DbWeight::get().writes(1 as Weight))82 }83 // Storage: Common CollectionById (r:1 w:0)84 // Storage: Common Allowlist (r:0 w:1)85 fn remove_from_allow_list() -> Weight {86 (15_582_000 as Weight)87 .saturating_add(T::DbWeight::get().reads(1 as Weight))88 .saturating_add(T::DbWeight::get().writes(1 as Weight))89 }90 // Storage: Common CollectionById (r:1 w:1)91 fn set_public_access_mode() -> Weight {92 (14_846_000 as Weight)93 .saturating_add(T::DbWeight::get().reads(1 as Weight))94 .saturating_add(T::DbWeight::get().writes(1 as Weight))95 }96 // Storage: Common CollectionById (r:1 w:1)97 fn set_mint_permission() -> Weight {98 (14_534_000 as Weight)99 .saturating_add(T::DbWeight::get().reads(1 as Weight))100 .saturating_add(T::DbWeight::get().writes(1 as Weight))101 }102 // Storage: Common CollectionById (r:1 w:1)103 fn change_collection_owner() -> Weight {104 (14_990_000 as Weight)105 .saturating_add(T::DbWeight::get().reads(1 as Weight))106 .saturating_add(T::DbWeight::get().writes(1 as Weight))107 }108 // Storage: Common CollectionById (r:1 w:0)109 // Storage: Common IsAdmin (r:1 w:1)110 // Storage: Common AdminAmount (r:1 w:1)111 fn add_collection_admin() -> Weight {112 (19_957_000 as Weight)113 .saturating_add(T::DbWeight::get().reads(3 as Weight))114 .saturating_add(T::DbWeight::get().writes(2 as Weight))115 }116 // Storage: Common CollectionById (r:1 w:0)117 // Storage: Common IsAdmin (r:1 w:1)118 // Storage: Common AdminAmount (r:1 w:1)119 fn remove_collection_admin() -> Weight {120 (21_209_000 as Weight)121 .saturating_add(T::DbWeight::get().reads(3 as Weight))122 .saturating_add(T::DbWeight::get().writes(2 as Weight))123 }124 // Storage: Common CollectionById (r:1 w:1)125 fn set_collection_sponsor() -> Weight {126 (14_963_000 as Weight)127 .saturating_add(T::DbWeight::get().reads(1 as Weight))128 .saturating_add(T::DbWeight::get().writes(1 as Weight))129 }130 // Storage: Common CollectionById (r:1 w:1)131 fn confirm_sponsorship() -> Weight {132 (14_478_000 as Weight)133 .saturating_add(T::DbWeight::get().reads(1 as Weight))134 .saturating_add(T::DbWeight::get().writes(1 as Weight))135 }136 // Storage: Common CollectionById (r:1 w:1)137 fn remove_collection_sponsor() -> Weight {138 (14_393_000 as Weight)139 .saturating_add(T::DbWeight::get().reads(1 as Weight))140 .saturating_add(T::DbWeight::get().writes(1 as Weight))141 }142 // Storage: Common CollectionById (r:1 w:1)143 fn set_transfers_enabled_flag() -> Weight {144 (7_309_000 as Weight)145 .saturating_add(T::DbWeight::get().reads(1 as Weight))146 .saturating_add(T::DbWeight::get().writes(1 as Weight))147 }148 // Storage: Common CollectionById (r:1 w:1)149 fn set_offchain_schema(_b: u32, ) -> Weight {150 (15_220_000 as Weight)151 .saturating_add(T::DbWeight::get().reads(1 as Weight))152 .saturating_add(T::DbWeight::get().writes(1 as Weight))153 }154 // Storage: Common CollectionById (r:1 w:1)155 fn set_const_on_chain_schema(_b: u32, ) -> Weight {156 (14_984_000 as Weight)157 .saturating_add(T::DbWeight::get().reads(1 as Weight))158 .saturating_add(T::DbWeight::get().writes(1 as Weight))159 }160 // Storage: Common CollectionById (r:1 w:1)161 fn set_schema_version() -> Weight {162 (14_596_000 as Weight)163 .saturating_add(T::DbWeight::get().reads(1 as Weight))164 .saturating_add(T::DbWeight::get().writes(1 as Weight))165 }166 // Storage: Common CollectionById (r:1 w:1)167 fn set_collection_limits() -> Weight {168 (15_339_000 as Weight)169 .saturating_add(T::DbWeight::get().reads(1 as Weight))170 .saturating_add(T::DbWeight::get().writes(1 as Weight))171 }172}173174// For backwards compatibility and tests175impl WeightInfo for () {176 // Storage: Common CreatedCollectionCount (r:1 w:1)177 // Storage: Common DestroyedCollectionCount (r:1 w:0)178 // Storage: System Account (r:2 w:2)179 // Storage: Common CollectionById (r:0 w:1)180 fn create_collection() -> Weight {181 (28_929_000 as Weight)182 .saturating_add(RocksDbWeight::get().reads(4 as Weight))183 .saturating_add(RocksDbWeight::get().writes(4 as Weight))184 }185 // Storage: Common CollectionById (r:1 w:1)186 // Storage: Common DestroyedCollectionCount (r:1 w:1)187 // Storage: Nonfungible TokensMinted (r:0 w:1)188 // Storage: Nonfungible TokensBurnt (r:0 w:1)189 // Storage: Common AdminAmount (r:0 w:1)190 fn destroy_collection() -> Weight {191 (40_303_000 as Weight)192 .saturating_add(RocksDbWeight::get().reads(2 as Weight))193 .saturating_add(RocksDbWeight::get().writes(5 as Weight))194 }195 // Storage: Common CollectionById (r:1 w:0)196 // Storage: Common Allowlist (r:0 w:1)197 fn add_to_allow_list() -> Weight {198 (15_989_000 as Weight)199 .saturating_add(RocksDbWeight::get().reads(1 as Weight))200 .saturating_add(RocksDbWeight::get().writes(1 as Weight))201 }202 // Storage: Common CollectionById (r:1 w:0)203 // Storage: Common Allowlist (r:0 w:1)204 fn remove_from_allow_list() -> Weight {205 (15_582_000 as Weight)206 .saturating_add(RocksDbWeight::get().reads(1 as Weight))207 .saturating_add(RocksDbWeight::get().writes(1 as Weight))208 }209 // Storage: Common CollectionById (r:1 w:1)210 fn set_public_access_mode() -> Weight {211 (14_846_000 as Weight)212 .saturating_add(RocksDbWeight::get().reads(1 as Weight))213 .saturating_add(RocksDbWeight::get().writes(1 as Weight))214 }215 // Storage: Common CollectionById (r:1 w:1)216 fn set_mint_permission() -> Weight {217 (14_534_000 as Weight)218 .saturating_add(RocksDbWeight::get().reads(1 as Weight))219 .saturating_add(RocksDbWeight::get().writes(1 as Weight))220 }221 // Storage: Common CollectionById (r:1 w:1)222 fn change_collection_owner() -> Weight {223 (14_990_000 as Weight)224 .saturating_add(RocksDbWeight::get().reads(1 as Weight))225 .saturating_add(RocksDbWeight::get().writes(1 as Weight))226 }227 // Storage: Common CollectionById (r:1 w:0)228 // Storage: Common IsAdmin (r:1 w:1)229 // Storage: Common AdminAmount (r:1 w:1)230 fn add_collection_admin() -> Weight {231 (19_957_000 as Weight)232 .saturating_add(RocksDbWeight::get().reads(3 as Weight))233 .saturating_add(RocksDbWeight::get().writes(2 as Weight))234 }235 // Storage: Common CollectionById (r:1 w:0)236 // Storage: Common IsAdmin (r:1 w:1)237 // Storage: Common AdminAmount (r:1 w:1)238 fn remove_collection_admin() -> Weight {239 (21_209_000 as Weight)240 .saturating_add(RocksDbWeight::get().reads(3 as Weight))241 .saturating_add(RocksDbWeight::get().writes(2 as Weight))242 }243 // Storage: Common CollectionById (r:1 w:1)244 fn set_collection_sponsor() -> Weight {245 (14_963_000 as Weight)246 .saturating_add(RocksDbWeight::get().reads(1 as Weight))247 .saturating_add(RocksDbWeight::get().writes(1 as Weight))248 }249 // Storage: Common CollectionById (r:1 w:1)250 fn confirm_sponsorship() -> Weight {251 (14_478_000 as Weight)252 .saturating_add(RocksDbWeight::get().reads(1 as Weight))253 .saturating_add(RocksDbWeight::get().writes(1 as Weight))254 }255 // Storage: Common CollectionById (r:1 w:1)256 fn remove_collection_sponsor() -> Weight {257 (14_393_000 as Weight)258 .saturating_add(RocksDbWeight::get().reads(1 as Weight))259 .saturating_add(RocksDbWeight::get().writes(1 as Weight))260 }261 // Storage: Common CollectionById (r:1 w:1)262 fn set_transfers_enabled_flag() -> Weight {263 (7_309_000 as Weight)264 .saturating_add(RocksDbWeight::get().reads(1 as Weight))265 .saturating_add(RocksDbWeight::get().writes(1 as Weight))266 }267 // Storage: Common CollectionById (r:1 w:1)268 fn set_offchain_schema(_b: u32, ) -> Weight {269 (15_220_000 as Weight)270 .saturating_add(RocksDbWeight::get().reads(1 as Weight))271 .saturating_add(RocksDbWeight::get().writes(1 as Weight))272 }273 // Storage: Common CollectionById (r:1 w:1)274 fn set_const_on_chain_schema(_b: u32, ) -> Weight {275 (14_984_000 as Weight)276 .saturating_add(RocksDbWeight::get().reads(1 as Weight))277 .saturating_add(RocksDbWeight::get().writes(1 as Weight))278 }279 // Storage: Common CollectionById (r:1 w:1)280 fn set_schema_version() -> Weight {281 (14_596_000 as Weight)282 .saturating_add(RocksDbWeight::get().reads(1 as Weight))283 .saturating_add(RocksDbWeight::get().writes(1 as Weight))284 }285 // Storage: Common CollectionById (r:1 w:1)286 fn set_collection_limits() -> Weight {287 (15_339_000 as Weight)288 .saturating_add(RocksDbWeight::get().reads(1 as Weight))289 .saturating_add(RocksDbWeight::get().writes(1 as Weight))290 }291}primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -308,6 +308,7 @@
#[version(..2)]
pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
+ #[version(..2)]
pub meta_update_permission: MetaUpdatePermission,
}
@@ -327,7 +328,6 @@
pub sponsorship: SponsorshipState<AccountId>,
pub limits: CollectionLimits,
pub const_on_chain_schema: Vec<u8>,
- pub meta_update_permission: MetaUpdatePermission,
pub token_property_permissions: Vec<PropertyKeyPermission>,
pub properties: Vec<Property>,
}
@@ -353,7 +353,6 @@
pub pending_sponsor: Option<AccountId>,
pub limits: Option<CollectionLimits>,
pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
- pub meta_update_permission: Option<MetaUpdatePermission>,
pub token_property_permissions: CollectionPropertiesPermissionsVec,
pub properties: CollectionPropertiesVec,
}
@@ -493,17 +492,10 @@
}
#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum MetaUpdatePermission {
ItemOwner,
Admin,
None,
-}
-
-impl Default for MetaUpdatePermission {
- fn default() -> Self {
- Self::ItemOwner
- }
}
#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -18,7 +18,7 @@
use crate::{Test, TestCrossAccountId, CollectionCreationPrice, Origin, Unique, new_test_ext};
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, CollectionId, CreateItemData, CreateFungibleData, CreateNftData,
- CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission,
+ CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT,
TokenId, MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionField, SchemaVersion,
CollectionMode, AccessMode,
};
@@ -2467,32 +2467,6 @@
assert_eq!(
<pallet_nonfungible::AccountBalance<Test>>::get((collection_id, account(2))),
1
- );
- });
-}
-
-#[test]
-fn set_variable_meta_flag_after_freeze() {
- new_test_ext().execute_with(|| {
- // default_limits();
-
- let collection_id =
- create_test_collection_for_owner(&CollectionMode::NFT, 2, CollectionId(1));
-
- let origin2 = Origin::signed(2);
-
- assert_ok!(Unique::set_meta_update_permission_flag(
- origin2.clone(),
- collection_id,
- MetaUpdatePermission::None,
- ));
- assert_noop!(
- Unique::set_meta_update_permission_flag(
- origin2.clone(),
- collection_id,
- MetaUpdatePermission::Admin
- ),
- CommonError::<Test>::MetadataFlagFrozen
);
});
}
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -74,7 +74,6 @@
accountTokenOwnershipLimit: 3,
},
constOnChainSchema: '0x333333',
- metaUpdatePermission: 'Admin',
});
const events = await submitTransactionAsync(alice, tx);
const result = getCreateCollectionResult(events);
@@ -91,7 +90,6 @@
expect(collection.sponsorship.asUnconfirmed.toString()).to.equal(bob.address);
expect(collection.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.equal(3);
expect(collection.constOnChainSchema.toString()).to.equal('0x333333');
- expect(collection.metaUpdatePermission.isAdmin).to.be.true;
});
});
});
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
import privateKey from '../substrate/privateKey';
-import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE, setMetadataUpdatePermissionFlagExpectSuccess} from '../util/helpers';
+import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';
import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';
import nonFungibleAbi from './nonFungibleAbi.json';
import {expect} from 'chai';
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
import privateKey from '../../substrate/privateKey';
-import {createCollectionExpectSuccess, createItemExpectSuccess, setMetadataUpdatePermissionFlagExpectSuccess} from '../../util/helpers';
+import {createCollectionExpectSuccess, createItemExpectSuccess} from '../../util/helpers';
import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents} from '../util/helpers';
import nonFungibleAbi from '../nonFungibleAbi.json';
import {expect} from 'chai';
tests/src/nesting/migration-check.test.tsdiffbeforeafterboth--- a/tests/src/nesting/migration-check.test.ts
+++ b/tests/src/nesting/migration-check.test.ts
@@ -37,7 +37,6 @@
accountTokenOwnershipLimit: 3,
},
constOnChainSchema: '0x333333',
- metaUpdatePermission: 'Admin',
});
const events = await submitTransactionAsync(alice, tx);
const result = getCreateCollectionResult(events);
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -650,28 +650,6 @@
});
}
-export async function setMetadataUpdatePermissionFlagExpectSuccess(sender: IKeyringPair, collectionId: number, flag: string) {
-
- await usingApi(async (api) => {
- const tx = api.tx.unique.setMetaUpdatePermissionFlag(collectionId, flag as any);
- const events = await submitTransactionAsync(sender, tx);
- const result = getGenericResult(events);
-
- expect(result.success).to.be.true;
- });
-}
-
-export async function setMetadataUpdatePermissionFlagExpectFailure(sender: IKeyringPair, collectionId: number, flag: string) {
-
- await usingApi(async (api) => {
- const tx = api.tx.unique.setMetaUpdatePermissionFlag(collectionId, flag as any);
- const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
- const result = getGenericResult(events);
-
- expect(result.success).to.be.false;
- });
-}
-
export async function enableContractSponsoringExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {
await usingApi(async (api) => {
const tx = api.tx.unique.enableContractSponsoring(contractAddress, enable);