difftreelog
Merge pull request #368 from UniqueNetwork/feature/CORE-386_1
in: master
Feature/core 386 1
27 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -22,7 +22,9 @@
pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};
use pallet_evm_coder_substrate::dispatch_to_evm;
use sp_std::vec::Vec;
-use up_data_structs::{Property, SponsoringRateLimit, OwnerRestrictedSet, AccessMode};
+use up_data_structs::{
+ Property, SponsoringRateLimit, OwnerRestrictedSet, AccessMode, CollectionPermissions,
+};
use alloc::format;
use crate::{Pallet, CollectionHandle, Config, CollectionProperties};
@@ -47,10 +49,15 @@
#[solidity_interface(name = "Collection")]
impl<T: Config> CollectionHandle<T>
-// where
-// T::AccountId: From<H256>
+where
+ T::AccountId: From<[u8; 32]>,
{
- fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {
+ fn set_collection_property(
+ &mut self,
+ caller: caller,
+ key: string,
+ value: bytes,
+ ) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
let key = <Vec<u8>>::from(key)
.try_into()
@@ -83,7 +90,7 @@
}
fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {
- check_is_owner(caller, self)?;
+ check_is_owner_or_admin(caller, self)?;
let sponsor = T::CrossAccountId::from_eth(sponsor);
self.set_sponsor(sponsor.as_sub().clone())
@@ -97,14 +104,14 @@
.confirm_sponsorship(caller.as_sub())
.map_err(dispatch_to_evm::<T>)?
{
- return Err(Error::Revert("Caller is not set as sponsor".into()));
+ return Err("caller is not set as sponsor".into());
}
save(self)
}
#[solidity(rename_selector = "setCollectionLimit")]
fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {
- check_is_owner(caller, self)?;
+ check_is_owner_or_admin(caller, self)?;
let mut limits = self.limits.clone();
match limit.as_str() {
@@ -128,7 +135,7 @@
}
_ => {
return Err(Error::Revert(format!(
- "Unknown integer limit \"{}\"",
+ "unknown integer limit \"{}\"",
limit
)))
}
@@ -140,7 +147,7 @@
#[solidity(rename_selector = "setCollectionLimit")]
fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {
- check_is_owner(caller, self)?;
+ check_is_owner_or_admin(caller, self)?;
let mut limits = self.limits.clone();
match limit.as_str() {
@@ -155,7 +162,7 @@
}
_ => {
return Err(Error::Revert(format!(
- "Unknown boolean limit \"{}\"",
+ "unknown boolean limit \"{}\"",
limit
)))
}
@@ -169,52 +176,48 @@
Ok(crate::eth::collection_id_to_address(self.id))
}
- // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {
- // let mut new_admin_h256 = H256::default();
- // new_admin.to_little_endian(&mut new_admin_h256.0);
- // let account_id = T::AccountId::from(new_admin_h256);
- // let caller = T::CrossAccountId::from_eth(caller);
- // let new_admin = T::CrossAccountId::from_sub(account_id);
- // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)
- // .map_err(dispatch_to_evm::<T>)?;
- // Ok(())
- // }
+ fn add_collection_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let mut new_admin_arr: [u8; 32] = Default::default();
+ new_admin.to_big_endian(&mut new_admin_arr);
+ let account_id = T::AccountId::from(new_admin_arr);
+ let new_admin = T::CrossAccountId::from_sub(account_id);
+ <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;
+ Ok(())
+ }
- // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {
- // let mut new_admin_h256 = H256::default();
- // new_admin.to_little_endian(&mut new_admin_h256.0);
- // let account_id = T::AccountId::from(new_admin_h256);
- // let caller = T::CrossAccountId::from_eth(caller);
- // let new_admin = T::CrossAccountId::from_sub(account_id);
- // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)
- // .map_err(dispatch_to_evm::<T>)?;
- // Ok(())
- // }
+ fn remove_collection_admin_substrate(
+ &self,
+ caller: caller,
+ new_admin: uint256,
+ ) -> Result<void> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let mut new_admin_arr: [u8; 32] = Default::default();
+ new_admin.to_big_endian(&mut new_admin_arr);
+ let account_id = T::AccountId::from(new_admin_arr);
+ let new_admin = T::CrossAccountId::from_sub(account_id);
+ <Pallet<T>>::toggle_admin(self, &caller, &new_admin, false)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(())
+ }
fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
- self.check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
let new_admin = T::CrossAccountId::from_eth(new_admin);
- <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)
- .map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
- self.check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
let admin = T::CrossAccountId::from_eth(admin);
- <Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
#[solidity(rename_selector = "setCollectionNesting")]
fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {
- let caller = T::CrossAccountId::from_eth(caller);
- self.check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
+ check_is_owner_or_admin(caller, self)?;
let mut permissions = self.collection.permissions.clone();
let mut nesting = permissions.nesting().clone();
@@ -240,11 +243,9 @@
collections: Vec<address>,
) -> Result<void> {
if collections.is_empty() {
- return Err("No addresses provided".into());
+ return Err("no addresses provided".into());
}
- let caller = T::CrossAccountId::from_eth(caller);
- self.check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
+ check_is_owner_or_admin(caller, self)?;
let mut permissions = self.collection.permissions.clone();
match enable {
@@ -280,27 +281,34 @@
}
fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {
- let caller = T::CrossAccountId::from_eth(caller);
- self.check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
- self.collection.permissions.access = Some(match mode {
- 0 => AccessMode::Normal,
- 1 => AccessMode::AllowList,
- _ => return Err("Not supported access mode".into()),
- });
- save(self)?;
- Ok(())
+ check_is_owner_or_admin(caller, self)?;
+ let permissions = CollectionPermissions {
+ access: Some(match mode {
+ 0 => AccessMode::Normal,
+ 1 => AccessMode::AllowList,
+ _ => return Err("not supported access mode".into()),
+ }),
+ ..Default::default()
+ };
+ self.collection.permissions = <Pallet<T>>::clamp_permissions(
+ self.collection.mode.clone(),
+ &self.collection.permissions,
+ permissions,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ save(self)
}
fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
- let caller = check_is_owner_or_admin(caller, self)?;
+ let caller = T::CrossAccountId::from_eth(caller);
let user = T::CrossAccountId::from_eth(user);
<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
- let caller = check_is_owner_or_admin(caller, self)?;
+ let caller = T::CrossAccountId::from_eth(caller);
let user = T::CrossAccountId::from_eth(user);
<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;
Ok(())
@@ -308,18 +316,19 @@
fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
check_is_owner_or_admin(caller, self)?;
- self.collection.permissions.mint_mode = Some(mode);
- save(self)?;
- Ok(())
- }
-}
+ let permissions = CollectionPermissions {
+ mint_mode: Some(mode),
+ ..Default::default()
+ };
+ self.collection.permissions = <Pallet<T>>::clamp_permissions(
+ self.collection.mode.clone(),
+ &self.collection.permissions,
+ permissions,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
-fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {
- let caller = T::CrossAccountId::from_eth(caller);
- collection
- .check_is_owner(&caller)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
- Ok(())
+ save(self)
+ }
}
fn check_is_owner_or_admin<T: Config>(
pallets/common/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819extern crate alloc;2021use core::ops::{Deref, DerefMut};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use sp_std::vec::Vec;24use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};25use evm_coder::ToLog;26use frame_support::{27 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},28 ensure,29 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},30 weights::Pays,31 transactional,32};33use pallet_evm::GasWeightMapping;34use up_data_structs::{35 COLLECTION_NUMBER_LIMIT,36 Collection,37 RpcCollection,38 CollectionId,39 CreateItemData,40 MAX_TOKEN_PREFIX_LENGTH,41 COLLECTION_ADMINS_LIMIT,42 TokenId,43 TokenChild,44 CollectionStats,45 MAX_TOKEN_OWNERSHIP,46 CollectionMode,47 NFT_SPONSOR_TRANSFER_TIMEOUT,48 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,49 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,50 MAX_SPONSOR_TIMEOUT,51 CUSTOM_DATA_LIMIT,52 CollectionLimits,53 CreateCollectionData,54 SponsorshipState,55 CreateItemExData,56 SponsoringRateLimit,57 budget::Budget,58 PhantomType,59 Property,60 Properties,61 PropertiesPermissionMap,62 PropertyKey,63 PropertyValue,64 PropertyPermission,65 PropertiesError,66 PropertyKeyPermission,67 TokenData,68 TrySetProperty,69 PropertyScope,70 // RMRK71 RmrkCollectionInfo,72 RmrkInstanceInfo,73 RmrkResourceInfo,74 RmrkPropertyInfo,75 RmrkBaseInfo,76 RmrkPartType,77 RmrkTheme,78 RmrkNftChild,79 CollectionPermissions,80 SchemaVersion,81};8283pub use pallet::*;84use sp_core::H160;85use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};86#[cfg(feature = "runtime-benchmarks")]87pub mod benchmarking;88pub mod dispatch;89pub mod erc;90pub mod eth;91pub mod weights;9293pub type SelfWeightOf<T> = <T as Config>::WeightInfo;9495#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]96pub struct CollectionHandle<T: Config> {97 pub id: CollectionId,98 collection: Collection<T::AccountId>,99 pub recorder: SubstrateRecorder<T>,100}101impl<T: Config> WithRecorder<T> for CollectionHandle<T> {102 fn recorder(&self) -> &SubstrateRecorder<T> {103 &self.recorder104 }105 fn into_recorder(self) -> SubstrateRecorder<T> {106 self.recorder107 }108}109impl<T: Config> CollectionHandle<T> {110 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {111 <CollectionById<T>>::get(id).map(|collection| Self {112 id,113 collection,114 recorder: SubstrateRecorder::new(gas_limit),115 })116 }117118 pub fn new_with_recorder(id: CollectionId, recorder: SubstrateRecorder<T>) -> Option<Self> {119 <CollectionById<T>>::get(id).map(|collection| Self {120 id,121 collection,122 recorder,123 })124 }125126 pub fn new(id: CollectionId) -> Option<Self> {127 Self::new_with_gas_limit(id, u64::MAX)128 }129130 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {131 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)132 }133134 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {135 self.recorder136 .consume_gas(T::GasWeightMapping::weight_to_gas(137 <T as frame_system::Config>::DbWeight::get()138 .read139 .saturating_mul(reads),140 ))141 }142143 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {144 self.recorder145 .consume_gas(T::GasWeightMapping::weight_to_gas(146 <T as frame_system::Config>::DbWeight::get()147 .write148 .saturating_mul(writes),149 ))150 }151 pub fn save(self) -> Result<(), DispatchError> {152 <CollectionById<T>>::insert(self.id, self.collection);153 Ok(())154 }155156 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {157 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);158 Ok(())159 }160161 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {162 if self.collection.sponsorship.pending_sponsor() != Some(sender) {163 return Ok(false);164 }165166 self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());167 Ok(true)168 }169170 /// Checks that the collection was created with, and must be operated upon through **Unique API**.171 /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.172 pub fn check_is_internal(&self) -> DispatchResult {173 if self.external_collection {174 return Err(<Error<T>>::CollectionIsExternal)?;175 }176177 Ok(())178 }179180 /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.181 /// Now check only the `external_collection` flag and if it's **false**, then return `CollectionIsInternal` error.182 pub fn check_is_external(&self) -> DispatchResult {183 if !self.external_collection {184 return Err(<Error<T>>::CollectionIsInternal)?;185 }186187 Ok(())188 }189}190191impl<T: Config> Deref for CollectionHandle<T> {192 type Target = Collection<T::AccountId>;193194 fn deref(&self) -> &Self::Target {195 &self.collection196 }197}198199impl<T: Config> DerefMut for CollectionHandle<T> {200 fn deref_mut(&mut self) -> &mut Self::Target {201 &mut self.collection202 }203}204205impl<T: Config> CollectionHandle<T> {206 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {207 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);208 Ok(())209 }210 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {211 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))212 }213 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {214 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);215 Ok(())216 }217 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {218 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)219 }220 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {221 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)222 }223 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {224 ensure!(225 <Allowlist<T>>::get((self.id, user)),226 <Error<T>>::AddressNotInAllowlist227 );228 Ok(())229 }230}231232#[frame_support::pallet]233pub mod pallet {234 use super::*;235 use pallet_evm::account;236 use dispatch::CollectionDispatch;237 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};238 use frame_system::pallet_prelude::*;239 use frame_support::traits::Currency;240 use up_data_structs::{TokenId, mapping::TokenAddressMapping};241 use scale_info::TypeInfo;242 use weights::WeightInfo;243244 #[pallet::config]245 pub trait Config:246 frame_system::Config247 + pallet_evm_coder_substrate::Config248 + pallet_evm::Config249 + TypeInfo250 + account::Config251 {252 type WeightInfo: WeightInfo;253 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;254255 type Currency: Currency<Self::AccountId>;256257 #[pallet::constant]258 type CollectionCreationPrice: Get<259 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,260 >;261 type CollectionDispatch: CollectionDispatch<Self>;262263 type TreasuryAccountId: Get<Self::AccountId>;264 type ContractAddress: Get<H160>;265266 type EvmTokenAddressMapping: TokenAddressMapping<H160>;267 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;268 }269270 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);271272 #[pallet::pallet]273 #[pallet::storage_version(STORAGE_VERSION)]274 #[pallet::generate_store(pub(super) trait Store)]275 pub struct Pallet<T>(_);276277 #[pallet::extra_constants]278 impl<T: Config> Pallet<T> {279 pub fn collection_admins_limit() -> u32 {280 COLLECTION_ADMINS_LIMIT281 }282 }283284 #[pallet::event]285 #[pallet::generate_deposit(pub fn deposit_event)]286 pub enum Event<T: Config> {287 /// New collection was created288 ///289 /// # Arguments290 ///291 /// * collection_id: Globally unique identifier of newly created collection.292 ///293 /// * mode: [CollectionMode] converted into u8.294 ///295 /// * account_id: Collection owner.296 CollectionCreated(CollectionId, u8, T::AccountId),297298 /// New collection was destroyed299 ///300 /// # Arguments301 ///302 /// * collection_id: Globally unique identifier of collection.303 CollectionDestroyed(CollectionId),304305 /// New item was created.306 ///307 /// # Arguments308 ///309 /// * collection_id: Id of the collection where item was created.310 ///311 /// * item_id: Id of an item. Unique within the collection.312 ///313 /// * recipient: Owner of newly created item314 ///315 /// * amount: Always 1 for NFT316 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),317318 /// Collection item was burned.319 ///320 /// # Arguments321 ///322 /// * collection_id.323 ///324 /// * item_id: Identifier of burned NFT.325 ///326 /// * owner: which user has destroyed its tokens327 ///328 /// * amount: Always 1 for NFT329 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),330331 /// Item was transferred332 ///333 /// * collection_id: Id of collection to which item is belong334 ///335 /// * item_id: Id of an item336 ///337 /// * sender: Original owner of item338 ///339 /// * recipient: New owner of item340 ///341 /// * amount: Always 1 for NFT342 Transfer(343 CollectionId,344 TokenId,345 T::CrossAccountId,346 T::CrossAccountId,347 u128,348 ),349350 /// * collection_id351 ///352 /// * item_id353 ///354 /// * sender355 ///356 /// * spender357 ///358 /// * amount359 Approved(360 CollectionId,361 TokenId,362 T::CrossAccountId,363 T::CrossAccountId,364 u128,365 ),366367 CollectionPropertySet(CollectionId, PropertyKey),368369 CollectionPropertyDeleted(CollectionId, PropertyKey),370371 TokenPropertySet(CollectionId, TokenId, PropertyKey),372373 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),374375 PropertyPermissionSet(CollectionId, PropertyKey),376 }377378 #[pallet::error]379 pub enum Error<T> {380 /// This collection does not exist.381 CollectionNotFound,382 /// Sender parameter and item owner must be equal.383 MustBeTokenOwner,384 /// No permission to perform action385 NoPermission,386 /// Destroying only empty collections is allowed387 CantDestroyNotEmptyCollection,388 /// Collection is not in mint mode.389 PublicMintingNotAllowed,390 /// Address is not in allow list.391 AddressNotInAllowlist,392393 /// Collection name can not be longer than 63 char.394 CollectionNameLimitExceeded,395 /// Collection description can not be longer than 255 char.396 CollectionDescriptionLimitExceeded,397 /// Token prefix can not be longer than 15 char.398 CollectionTokenPrefixLimitExceeded,399 /// Total collections bound exceeded.400 TotalCollectionsLimitExceeded,401 /// Exceeded max admin count402 CollectionAdminCountExceeded,403 /// Collection limit bounds per collection exceeded404 CollectionLimitBoundsExceeded,405 /// Tried to enable permissions which are only permitted to be disabled406 OwnerPermissionsCantBeReverted,407 /// Collection settings not allowing items transferring408 TransferNotAllowed,409 /// Account token limit exceeded per collection410 AccountTokenLimitExceeded,411 /// Collection token limit exceeded412 CollectionTokenLimitExceeded,413 /// Metadata flag frozen414 MetadataFlagFrozen,415416 /// Item not exists.417 TokenNotFound,418 /// Item balance not enough.419 TokenValueTooLow,420 /// Requested value more than approved.421 ApprovedValueTooLow,422 /// Tried to approve more than owned423 CantApproveMoreThanOwned,424425 /// Can't transfer tokens to ethereum zero address426 AddressIsZero,427 /// Target collection doesn't supports this operation428 UnsupportedOperation,429430 /// Not sufficient funds to perform action431 NotSufficientFounds,432433 /// User not passed nesting rule434 UserIsNotAllowedToNest,435 /// Only tokens from specific collections may nest tokens under this436 SourceCollectionIsNotAllowedToNest,437438 /// Tried to store more data than allowed in collection field439 CollectionFieldSizeExceeded,440441 /// Tried to store more property data than allowed442 NoSpaceForProperty,443444 /// Tried to store more property keys than allowed445 PropertyLimitReached,446447 /// Property key is too long448 PropertyKeyIsTooLong,449450 /// Only ASCII letters, digits, and '_', '-' are allowed451 InvalidCharacterInPropertyKey,452453 /// Empty property keys are forbidden454 EmptyPropertyKey,455456 /// Tried to access an external collection with an internal API457 CollectionIsExternal,458459 /// Tried to access an internal collection with an external API460 CollectionIsInternal,461 }462463 #[pallet::storage]464 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;465 #[pallet::storage]466 pub type DestroyedCollectionCount<T> =467 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;468469 /// Collection info470 #[pallet::storage]471 pub type CollectionById<T> = StorageMap<472 Hasher = Blake2_128Concat,473 Key = CollectionId,474 Value = Collection<<T as frame_system::Config>::AccountId>,475 QueryKind = OptionQuery,476 >;477478 /// Collection properties479 #[pallet::storage]480 #[pallet::getter(fn collection_properties)]481 pub type CollectionProperties<T> = StorageMap<482 Hasher = Blake2_128Concat,483 Key = CollectionId,484 Value = Properties,485 QueryKind = ValueQuery,486 OnEmpty = up_data_structs::CollectionProperties,487 >;488489 #[pallet::storage]490 #[pallet::getter(fn property_permissions)]491 pub type CollectionPropertyPermissions<T> = StorageMap<492 Hasher = Blake2_128Concat,493 Key = CollectionId,494 Value = PropertiesPermissionMap,495 QueryKind = ValueQuery,496 >;497498 #[pallet::storage]499 pub type AdminAmount<T> = StorageMap<500 Hasher = Blake2_128Concat,501 Key = CollectionId,502 Value = u32,503 QueryKind = ValueQuery,504 >;505506 /// List of collection admins507 #[pallet::storage]508 pub type IsAdmin<T: Config> = StorageNMap<509 Key = (510 Key<Blake2_128Concat, CollectionId>,511 Key<Blake2_128Concat, T::CrossAccountId>,512 ),513 Value = bool,514 QueryKind = ValueQuery,515 >;516517 /// Allowlisted collection users518 #[pallet::storage]519 pub type Allowlist<T: Config> = StorageNMap<520 Key = (521 Key<Blake2_128Concat, CollectionId>,522 Key<Blake2_128Concat, T::CrossAccountId>,523 ),524 Value = bool,525 QueryKind = ValueQuery,526 >;527528 /// Not used by code, exists only to provide some types to metadata529 #[pallet::storage]530 pub type DummyStorageValue<T: Config> = StorageValue<531 Value = (532 CollectionStats,533 CollectionId,534 TokenId,535 TokenChild,536 PhantomType<(537 TokenData<T::CrossAccountId>,538 RpcCollection<T::AccountId>,539 // RMRK540 RmrkCollectionInfo<T::AccountId>,541 RmrkInstanceInfo<T::AccountId>,542 RmrkResourceInfo,543 RmrkPropertyInfo,544 RmrkBaseInfo<T::AccountId>,545 RmrkPartType,546 RmrkTheme,547 RmrkNftChild,548 )>,549 ),550 QueryKind = OptionQuery,551 >;552553 #[pallet::hooks]554 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {555 fn on_runtime_upgrade() -> Weight {556 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {557 use up_data_structs::{CollectionVersion1, CollectionVersion2};558 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {559 let mut props = Vec::new();560 if !v.offchain_schema.is_empty() {561 props.push(Property {562 key: b"_old_offchainSchema".to_vec().try_into().unwrap(),563 value: v564 .offchain_schema565 .clone()566 .into_inner()567 .try_into()568 .expect("offchain schema too big"),569 });570 }571 if !v.variable_on_chain_schema.is_empty() {572 props.push(Property {573 key: b"_old_variableOnChainSchema".to_vec().try_into().unwrap(),574 value: v575 .variable_on_chain_schema576 .clone()577 .into_inner()578 .try_into()579 .expect("offchain schema too big"),580 });581 }582 if !v.const_on_chain_schema.is_empty() {583 props.push(Property {584 key: b"_old_constOnChainSchema".to_vec().try_into().unwrap(),585 value: v586 .const_on_chain_schema587 .clone()588 .into_inner()589 .try_into()590 .expect("offchain schema too big"),591 });592 }593 props.push(Property {594 key: b"_old_schemaVersion".to_vec().try_into().unwrap(),595 value: match v.schema_version {596 SchemaVersion::ImageURL => b"ImageUrl".as_slice(),597 SchemaVersion::Unique => b"Unique".as_slice(),598 }599 .to_vec()600 .try_into()601 .unwrap(),602 });603 Self::set_scoped_collection_properties(604 id,605 PropertyScope::None,606 props.into_iter(),607 )608 .expect("existing data larger than properties");609 let mut new = CollectionVersion2::from(v.clone());610 new.permissions.access = Some(v.access);611 new.permissions.mint_mode = Some(v.mint_mode);612 Some(new)613 });614 }615616 0617 }618 }619}620621impl<T: Config> Pallet<T> {622 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens623 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {624 ensure!(625 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,626 <Error<T>>::AddressIsZero627 );628 Ok(())629 }630 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {631 <IsAdmin<T>>::iter_prefix((collection,))632 .map(|(a, _)| a)633 .collect()634 }635 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {636 <Allowlist<T>>::iter_prefix((collection,))637 .map(|(a, _)| a)638 .collect()639 }640 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {641 <Allowlist<T>>::get((collection, user))642 }643 pub fn collection_stats() -> CollectionStats {644 let created = <CreatedCollectionCount<T>>::get();645 let destroyed = <DestroyedCollectionCount<T>>::get();646 CollectionStats {647 created: created.0,648 destroyed: destroyed.0,649 alive: created.0 - destroyed.0,650 }651 }652653 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {654 let collection = <CollectionById<T>>::get(collection);655 if collection.is_none() {656 return None;657 }658659 let collection = collection.unwrap();660 let limits = collection.limits;661 let effective_limits = CollectionLimits {662 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),663 sponsored_data_size: Some(limits.sponsored_data_size()),664 sponsored_data_rate_limit: Some(665 limits666 .sponsored_data_rate_limit667 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),668 ),669 token_limit: Some(limits.token_limit()),670 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(671 match collection.mode {672 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,673 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,674 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,675 },676 )),677 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),678 owner_can_transfer: Some(limits.owner_can_transfer()),679 owner_can_destroy: Some(limits.owner_can_destroy()),680 transfers_enabled: Some(limits.transfers_enabled()),681 };682683 Some(effective_limits)684 }685686 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {687 let Collection {688 name,689 description,690 owner,691 mode,692 token_prefix,693 sponsorship,694 limits,695 permissions,696 external_collection,697 } = <CollectionById<T>>::get(collection)?;698699 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)700 .into_iter()701 .map(|(key, permission)| PropertyKeyPermission { key, permission })702 .collect();703704 let properties = <CollectionProperties<T>>::get(collection)705 .into_iter()706 .map(|(key, value)| Property { key, value })707 .collect();708709 let permissions = CollectionPermissions {710 access: Some(permissions.access()),711 mint_mode: Some(permissions.mint_mode()),712 nesting: Some(permissions.nesting().clone()),713 };714715 Some(RpcCollection {716 name: name.into_inner(),717 description: description.into_inner(),718 owner,719 mode,720 token_prefix: token_prefix.into_inner(),721 sponsorship,722 limits,723 permissions,724 token_property_permissions,725 properties,726 read_only: external_collection,727 })728 }729}730731macro_rules! limit_default {732 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{733 $(734 if let Some($new) = $new.$field {735 let $old = $old.$field($($arg)?);736 let _ = $new;737 let _ = $old;738 $check739 } else {740 $new.$field = $old.$field741 }742 )*743 }};744}745macro_rules! limit_default_clone {746 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{747 $(748 if let Some($new) = $new.$field.clone() {749 let $old = $old.$field($($arg)?);750 let _ = $new;751 let _ = $old;752 $check753 } else {754 $new.$field = $old.$field.clone()755 }756 )*757 }};758}759760impl<T: Config> Pallet<T> {761 pub fn init_collection(762 owner: T::CrossAccountId,763 data: CreateCollectionData<T::AccountId>,764 is_external: bool,765 ) -> Result<CollectionId, DispatchError> {766 {767 ensure!(768 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,769 Error::<T>::CollectionTokenPrefixLimitExceeded770 );771 }772773 let created_count = <CreatedCollectionCount<T>>::get()774 .0775 .checked_add(1)776 .ok_or(ArithmeticError::Overflow)?;777 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;778 let id = CollectionId(created_count);779780 // bound Total number of collections781 ensure!(782 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,783 <Error<T>>::TotalCollectionsLimitExceeded784 );785786 // =========787788 let collection = Collection {789 owner: owner.as_sub().clone(),790 name: data.name,791 mode: data.mode.clone(),792 description: data.description,793 token_prefix: data.token_prefix,794 sponsorship: data795 .pending_sponsor796 .map(SponsorshipState::Unconfirmed)797 .unwrap_or_default(),798 limits: data799 .limits800 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))801 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,802 permissions: data803 .permissions804 .map(|permissions| {805 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)806 })807 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,808 external_collection: is_external,809 };810811 let mut collection_properties = up_data_structs::CollectionProperties::get();812 collection_properties813 .try_set_from_iter(data.properties.into_iter())814 .map_err(<Error<T>>::from)?;815816 CollectionProperties::<T>::insert(id, collection_properties);817818 let mut token_props_permissions = PropertiesPermissionMap::new();819 token_props_permissions820 .try_set_from_iter(data.token_property_permissions.into_iter())821 .map_err(<Error<T>>::from)?;822823 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);824825 // Take a (non-refundable) deposit of collection creation826 {827 let mut imbalance =828 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();829 imbalance.subsume(830 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(831 &T::TreasuryAccountId::get(),832 T::CollectionCreationPrice::get(),833 ),834 );835 <T as Config>::Currency::settle(836 &owner.as_sub(),837 imbalance,838 WithdrawReasons::TRANSFER,839 ExistenceRequirement::KeepAlive,840 )841 .map_err(|_| Error::<T>::NotSufficientFounds)?;842 }843844 <CreatedCollectionCount<T>>::put(created_count);845 <Pallet<T>>::deposit_event(Event::CollectionCreated(846 id,847 data.mode.id(),848 owner.as_sub().clone(),849 ));850 <PalletEvm<T>>::deposit_log(851 erc::CollectionHelpersEvents::CollectionCreated {852 owner: *owner.as_eth(),853 collection_id: eth::collection_id_to_address(id),854 }855 .to_log(T::ContractAddress::get()),856 );857 <CollectionById<T>>::insert(id, collection);858 Ok(id)859 }860861 pub fn destroy_collection(862 collection: CollectionHandle<T>,863 sender: &T::CrossAccountId,864 ) -> DispatchResult {865 ensure!(866 collection.limits.owner_can_destroy(),867 <Error<T>>::NoPermission,868 );869 collection.check_is_owner(sender)?;870871 let destroyed_collections = <DestroyedCollectionCount<T>>::get()872 .0873 .checked_add(1)874 .ok_or(ArithmeticError::Overflow)?;875876 // =========877878 <DestroyedCollectionCount<T>>::put(destroyed_collections);879 <CollectionById<T>>::remove(collection.id);880 <AdminAmount<T>>::remove(collection.id);881 <IsAdmin<T>>::remove_prefix((collection.id,), None);882 <Allowlist<T>>::remove_prefix((collection.id,), None);883 <CollectionProperties<T>>::remove(collection.id);884885 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));886 Ok(())887 }888889 pub fn set_collection_property(890 collection: &CollectionHandle<T>,891 sender: &T::CrossAccountId,892 property: Property,893 ) -> DispatchResult {894 collection.check_is_owner_or_admin(sender)?;895896 CollectionProperties::<T>::try_mutate(collection.id, |properties| {897 let property = property.clone();898 properties.try_set(property.key, property.value)899 })900 .map_err(<Error<T>>::from)?;901902 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));903904 Ok(())905 }906907 pub fn set_scoped_collection_property(908 collection_id: CollectionId,909 scope: PropertyScope,910 property: Property,911 ) -> DispatchResult {912 CollectionProperties::<T>::try_mutate(collection_id, |properties| {913 properties.try_scoped_set(scope, property.key, property.value)914 })915 .map_err(<Error<T>>::from)?;916917 Ok(())918 }919920 pub fn set_scoped_collection_properties(921 collection_id: CollectionId,922 scope: PropertyScope,923 properties: impl Iterator<Item = Property>,924 ) -> DispatchResult {925 CollectionProperties::<T>::try_mutate(collection_id, |stored_properties| {926 stored_properties.try_scoped_set_from_iter(scope, properties)927 })928 .map_err(<Error<T>>::from)?;929930 Ok(())931 }932933 #[transactional]934 pub fn set_collection_properties(935 collection: &CollectionHandle<T>,936 sender: &T::CrossAccountId,937 properties: Vec<Property>,938 ) -> DispatchResult {939 for property in properties {940 Self::set_collection_property(collection, sender, property)?;941 }942943 Ok(())944 }945946 pub fn delete_collection_property(947 collection: &CollectionHandle<T>,948 sender: &T::CrossAccountId,949 property_key: PropertyKey,950 ) -> DispatchResult {951 collection.check_is_owner_or_admin(sender)?;952953 CollectionProperties::<T>::try_mutate(collection.id, |properties| {954 properties.remove(&property_key)955 })956 .map_err(<Error<T>>::from)?;957958 Self::deposit_event(Event::CollectionPropertyDeleted(959 collection.id,960 property_key,961 ));962963 Ok(())964 }965966 #[transactional]967 pub fn delete_collection_properties(968 collection: &CollectionHandle<T>,969 sender: &T::CrossAccountId,970 property_keys: Vec<PropertyKey>,971 ) -> DispatchResult {972 for key in property_keys {973 Self::delete_collection_property(collection, sender, key)?;974 }975976 Ok(())977 }978979 // For migrations980 pub fn set_property_permission_unchecked(981 collection: CollectionId,982 property_permission: PropertyKeyPermission,983 ) -> DispatchResult {984 <CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {985 permissions.try_set(property_permission.key, property_permission.permission)986 })987 .map_err(<Error<T>>::from)?;988 Ok(())989 }990991 pub fn set_property_permission(992 collection: &CollectionHandle<T>,993 sender: &T::CrossAccountId,994 property_permission: PropertyKeyPermission,995 ) -> DispatchResult {996 collection.check_is_owner_or_admin(sender)?;997998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);999 let current_permission = all_permissions.get(&property_permission.key);1000 if matches![1001 current_permission,1002 Some(PropertyPermission { mutable: false, .. })1003 ] {1004 return Err(<Error<T>>::NoPermission.into());1005 }10061007 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {1008 let property_permission = property_permission.clone();1009 permissions.try_set(property_permission.key, property_permission.permission)1010 })1011 .map_err(<Error<T>>::from)?;10121013 Self::deposit_event(Event::PropertyPermissionSet(1014 collection.id,1015 property_permission.key,1016 ));10171018 Ok(())1019 }10201021 #[transactional]1022 pub fn set_property_permissions(1023 collection: &CollectionHandle<T>,1024 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1027 for prop_pemission in property_permissions {1028 Self::set_property_permission(collection, sender, prop_pemission)?;1029 }10301031 Ok(())1032 }10331034 pub fn get_collection_property(1035 collection_id: CollectionId,1036 key: &PropertyKey,1037 ) -> Option<PropertyValue> {1038 Self::collection_properties(collection_id).get(key).cloned()1039 }10401041 pub fn bytes_keys_to_property_keys(1042 keys: Vec<Vec<u8>>,1043 ) -> Result<Vec<PropertyKey>, DispatchError> {1044 keys.into_iter()1045 .map(|key| -> Result<PropertyKey, DispatchError> {1046 key.try_into()1047 .map_err(|_| <Error<T>>::PropertyKeyIsTooLong.into())1048 })1049 .collect::<Result<Vec<PropertyKey>, DispatchError>>()1050 }10511052 pub fn filter_collection_properties(1053 collection_id: CollectionId,1054 keys: Option<Vec<PropertyKey>>,1055 ) -> Result<Vec<Property>, DispatchError> {1056 let properties = Self::collection_properties(collection_id);10571058 let properties = keys1059 .map(|keys| {1060 keys.into_iter()1061 .filter_map(|key| {1062 properties.get(&key).map(|value| Property {1063 key,1064 value: value.clone(),1065 })1066 })1067 .collect()1068 })1069 .unwrap_or_else(|| {1070 properties1071 .into_iter()1072 .map(|(key, value)| Property { key, value })1073 .collect()1074 });10751076 Ok(properties)1077 }10781079 pub fn filter_property_permissions(1080 collection_id: CollectionId,1081 keys: Option<Vec<PropertyKey>>,1082 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {1083 let permissions = Self::property_permissions(collection_id);10841085 let key_permissions = keys1086 .map(|keys| {1087 keys.into_iter()1088 .filter_map(|key| {1089 permissions1090 .get(&key)1091 .map(|permission| PropertyKeyPermission {1092 key,1093 permission: permission.clone(),1094 })1095 })1096 .collect()1097 })1098 .unwrap_or_else(|| {1099 permissions1100 .into_iter()1101 .map(|(key, permission)| PropertyKeyPermission { key, permission })1102 .collect()1103 });11041105 Ok(key_permissions)1106 }11071108 pub fn toggle_allowlist(1109 collection: &CollectionHandle<T>,1110 sender: &T::CrossAccountId,1111 user: &T::CrossAccountId,1112 allowed: bool,1113 ) -> DispatchResult {1114 collection.check_is_owner_or_admin(sender)?;11151116 // =========11171118 if allowed {1119 <Allowlist<T>>::insert((collection.id, user), true);1120 } else {1121 <Allowlist<T>>::remove((collection.id, user));1122 }11231124 Ok(())1125 }11261127 pub fn toggle_admin(1128 collection: &CollectionHandle<T>,1129 sender: &T::CrossAccountId,1130 user: &T::CrossAccountId,1131 admin: bool,1132 ) -> DispatchResult {1133 collection.check_is_owner(sender)?;11341135 let was_admin = <IsAdmin<T>>::get((collection.id, user));1136 if was_admin == admin {1137 return Ok(());1138 }1139 let amount = <AdminAmount<T>>::get(collection.id);11401141 if admin {1142 let amount = amount1143 .checked_add(1)1144 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;1145 ensure!(1146 amount <= Self::collection_admins_limit(),1147 <Error<T>>::CollectionAdminCountExceeded,1148 );11491150 // =========11511152 <AdminAmount<T>>::insert(collection.id, amount);1153 <IsAdmin<T>>::insert((collection.id, user), true);1154 } else {1155 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1156 <IsAdmin<T>>::remove((collection.id, user));1157 }11581159 Ok(())1160 }11611162 pub fn clamp_limits(1163 mode: CollectionMode,1164 old_limit: &CollectionLimits,1165 mut new_limit: CollectionLimits,1166 ) -> Result<CollectionLimits, DispatchError> {1167 limit_default!(old_limit, new_limit,1168 account_token_ownership_limit => ensure!(1169 new_limit <= MAX_TOKEN_OWNERSHIP,1170 <Error<T>>::CollectionLimitBoundsExceeded,1171 ),1172 sponsored_data_size => ensure!(1173 new_limit <= CUSTOM_DATA_LIMIT,1174 <Error<T>>::CollectionLimitBoundsExceeded,1175 ),11761177 sponsored_data_rate_limit => {},1178 token_limit => ensure!(1179 old_limit >= new_limit && new_limit > 0,1180 <Error<T>>::CollectionTokenLimitExceeded1181 ),11821183 sponsor_transfer_timeout(match mode {1184 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1185 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1186 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1187 }) => ensure!(1188 new_limit <= MAX_SPONSOR_TIMEOUT,1189 <Error<T>>::CollectionLimitBoundsExceeded,1190 ),1191 sponsor_approve_timeout => {},1192 owner_can_transfer => ensure!(1193 old_limit || !new_limit,1194 <Error<T>>::OwnerPermissionsCantBeReverted,1195 ),1196 owner_can_destroy => ensure!(1197 old_limit || !new_limit,1198 <Error<T>>::OwnerPermissionsCantBeReverted,1199 ),1200 transfers_enabled => {},1201 );1202 Ok(new_limit)1203 }12041205 pub fn clamp_permissions(1206 _mode: CollectionMode,1207 old_limit: &CollectionPermissions,1208 mut new_limit: CollectionPermissions,1209 ) -> Result<CollectionPermissions, DispatchError> {1210 limit_default_clone!(old_limit, new_limit,1211 access => {},1212 mint_mode => {},1213 nesting => ensure!(1214 // Permissive is only allowed for tests and internal usage of chain for now1215 old_limit.permissive || !new_limit.permissive,1216 <Error<T>>::NoPermission,1217 ),1218 );1219 Ok(new_limit)1220 }1221}12221223#[macro_export]1224macro_rules! unsupported {1225 () => {1226 Err(<Error<T>>::UnsupportedOperation.into())1227 };1228}12291230/// Worst cases1231pub trait CommonWeightInfo<CrossAccountId> {1232 fn create_item() -> Weight;1233 fn create_multiple_items(amount: &[CreateItemData]) -> Weight;1234 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1235 fn burn_item() -> Weight;1236 fn set_collection_properties(amount: u32) -> Weight;1237 fn delete_collection_properties(amount: u32) -> Weight;1238 fn set_token_properties(amount: u32) -> Weight;1239 fn delete_token_properties(amount: u32) -> Weight;1240 fn set_property_permissions(amount: u32) -> Weight;1241 fn transfer() -> Weight;1242 fn approve() -> Weight;1243 fn transfer_from() -> Weight;1244 fn burn_from() -> Weight;12451246 /// Differs from burn_item in case of Fungible and Refungible, as it should burn1247 /// whole users's balance1248 ///1249 /// This method shouldn't be used directly, as it doesn't count breadth price, use `burn_recursively` instead1250 fn burn_recursively_self_raw() -> Weight;1251 /// Cost of iterating over `amount` children while burning, without counting child burning itself1252 ///1253 /// This method shouldn't be used directly, as it doesn't count depth price, use `burn_recursively` instead1254 fn burn_recursively_breadth_raw(amount: u32) -> Weight;12551256 fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {1257 Self::burn_recursively_self_raw()1258 .saturating_mul(max_selfs.max(1) as u64)1259 .saturating_add(Self::burn_recursively_breadth_raw(max_breadth))1260 }1261}12621263pub trait CommonCollectionOperations<T: Config> {1264 fn create_item(1265 &self,1266 sender: T::CrossAccountId,1267 to: T::CrossAccountId,1268 data: CreateItemData,1269 nesting_budget: &dyn Budget,1270 ) -> DispatchResultWithPostInfo;1271 fn create_multiple_items(1272 &self,1273 sender: T::CrossAccountId,1274 to: T::CrossAccountId,1275 data: Vec<CreateItemData>,1276 nesting_budget: &dyn Budget,1277 ) -> DispatchResultWithPostInfo;1278 fn create_multiple_items_ex(1279 &self,1280 sender: T::CrossAccountId,1281 data: CreateItemExData<T::CrossAccountId>,1282 nesting_budget: &dyn Budget,1283 ) -> DispatchResultWithPostInfo;1284 fn burn_item(1285 &self,1286 sender: T::CrossAccountId,1287 token: TokenId,1288 amount: u128,1289 ) -> DispatchResultWithPostInfo;1290 fn burn_item_recursively(1291 &self,1292 sender: T::CrossAccountId,1293 token: TokenId,1294 self_budget: &dyn Budget,1295 breadth_budget: &dyn Budget,1296 ) -> DispatchResultWithPostInfo;1297 fn set_collection_properties(1298 &self,1299 sender: T::CrossAccountId,1300 properties: Vec<Property>,1301 ) -> DispatchResultWithPostInfo;1302 fn delete_collection_properties(1303 &self,1304 sender: &T::CrossAccountId,1305 property_keys: Vec<PropertyKey>,1306 ) -> DispatchResultWithPostInfo;1307 fn set_token_properties(1308 &self,1309 sender: T::CrossAccountId,1310 token_id: TokenId,1311 property: Vec<Property>,1312 ) -> DispatchResultWithPostInfo;1313 fn delete_token_properties(1314 &self,1315 sender: T::CrossAccountId,1316 token_id: TokenId,1317 property_keys: Vec<PropertyKey>,1318 ) -> DispatchResultWithPostInfo;1319 fn set_property_permissions(1320 &self,1321 sender: &T::CrossAccountId,1322 property_permissions: Vec<PropertyKeyPermission>,1323 ) -> DispatchResultWithPostInfo;1324 fn transfer(1325 &self,1326 sender: T::CrossAccountId,1327 to: T::CrossAccountId,1328 token: TokenId,1329 amount: u128,1330 nesting_budget: &dyn Budget,1331 ) -> DispatchResultWithPostInfo;1332 fn approve(1333 &self,1334 sender: T::CrossAccountId,1335 spender: T::CrossAccountId,1336 token: TokenId,1337 amount: u128,1338 ) -> DispatchResultWithPostInfo;1339 fn transfer_from(1340 &self,1341 sender: T::CrossAccountId,1342 from: T::CrossAccountId,1343 to: T::CrossAccountId,1344 token: TokenId,1345 amount: u128,1346 nesting_budget: &dyn Budget,1347 ) -> DispatchResultWithPostInfo;1348 fn burn_from(1349 &self,1350 sender: T::CrossAccountId,1351 from: T::CrossAccountId,1352 token: TokenId,1353 amount: u128,1354 nesting_budget: &dyn Budget,1355 ) -> DispatchResultWithPostInfo;13561357 fn check_nesting(1358 &self,1359 sender: T::CrossAccountId,1360 from: (CollectionId, TokenId),1361 under: TokenId,1362 budget: &dyn Budget,1363 ) -> DispatchResult;13641365 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13661367 fn unnest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13681369 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1370 fn collection_tokens(&self) -> Vec<TokenId>;1371 fn token_exists(&self, token: TokenId) -> bool;1372 fn last_token_id(&self) -> TokenId;13731374 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1375 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;1376 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;1377 /// Amount of unique collection tokens1378 fn total_supply(&self) -> u32;1379 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1380 fn account_balance(&self, account: T::CrossAccountId) -> u32;1381 /// Amount of specific token account have (Applicable to fungible/refungible)1382 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1383 fn allowance(1384 &self,1385 sender: T::CrossAccountId,1386 spender: T::CrossAccountId,1387 token: TokenId,1388 ) -> u128;1389}13901391// Flexible enough for implementing CommonCollectionOperations1392pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1393 let post_info = PostDispatchInfo {1394 actual_weight: Some(weight),1395 pays_fee: Pays::Yes,1396 };1397 match res {1398 Ok(()) => Ok(post_info),1399 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1400 }1401}14021403impl<T: Config> From<PropertiesError> for Error<T> {1404 fn from(error: PropertiesError) -> Self {1405 match error {1406 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1407 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1408 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1409 PropertiesError::PropertyKeyIsTooLong => Self::PropertyKeyIsTooLong,1410 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1411 }1412 }1413}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819extern crate alloc;2021use core::ops::{Deref, DerefMut};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use sp_std::vec::Vec;24use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};25use evm_coder::ToLog;26use frame_support::{27 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},28 ensure,29 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},30 weights::Pays,31 transactional,32};33use pallet_evm::GasWeightMapping;34use up_data_structs::{35 COLLECTION_NUMBER_LIMIT,36 Collection,37 RpcCollection,38 CollectionId,39 CreateItemData,40 MAX_TOKEN_PREFIX_LENGTH,41 COLLECTION_ADMINS_LIMIT,42 TokenId,43 TokenChild,44 CollectionStats,45 MAX_TOKEN_OWNERSHIP,46 CollectionMode,47 NFT_SPONSOR_TRANSFER_TIMEOUT,48 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,49 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,50 MAX_SPONSOR_TIMEOUT,51 CUSTOM_DATA_LIMIT,52 CollectionLimits,53 CreateCollectionData,54 SponsorshipState,55 CreateItemExData,56 SponsoringRateLimit,57 budget::Budget,58 PhantomType,59 Property,60 Properties,61 PropertiesPermissionMap,62 PropertyKey,63 PropertyValue,64 PropertyPermission,65 PropertiesError,66 PropertyKeyPermission,67 TokenData,68 TrySetProperty,69 PropertyScope,70 // RMRK71 RmrkCollectionInfo,72 RmrkInstanceInfo,73 RmrkResourceInfo,74 RmrkPropertyInfo,75 RmrkBaseInfo,76 RmrkPartType,77 RmrkTheme,78 RmrkNftChild,79 CollectionPermissions,80 SchemaVersion,81};8283pub use pallet::*;84use sp_core::H160;85use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};86#[cfg(feature = "runtime-benchmarks")]87pub mod benchmarking;88pub mod dispatch;89pub mod erc;90pub mod eth;91pub mod weights;9293pub type SelfWeightOf<T> = <T as Config>::WeightInfo;9495#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]96pub struct CollectionHandle<T: Config> {97 pub id: CollectionId,98 collection: Collection<T::AccountId>,99 pub recorder: SubstrateRecorder<T>,100}101impl<T: Config> WithRecorder<T> for CollectionHandle<T> {102 fn recorder(&self) -> &SubstrateRecorder<T> {103 &self.recorder104 }105 fn into_recorder(self) -> SubstrateRecorder<T> {106 self.recorder107 }108}109impl<T: Config> CollectionHandle<T> {110 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {111 <CollectionById<T>>::get(id).map(|collection| Self {112 id,113 collection,114 recorder: SubstrateRecorder::new(gas_limit),115 })116 }117118 pub fn new_with_recorder(id: CollectionId, recorder: SubstrateRecorder<T>) -> Option<Self> {119 <CollectionById<T>>::get(id).map(|collection| Self {120 id,121 collection,122 recorder,123 })124 }125126 pub fn new(id: CollectionId) -> Option<Self> {127 Self::new_with_gas_limit(id, u64::MAX)128 }129130 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {131 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)132 }133134 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {135 self.recorder136 .consume_gas(T::GasWeightMapping::weight_to_gas(137 <T as frame_system::Config>::DbWeight::get()138 .read139 .saturating_mul(reads),140 ))141 }142143 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {144 self.recorder145 .consume_gas(T::GasWeightMapping::weight_to_gas(146 <T as frame_system::Config>::DbWeight::get()147 .write148 .saturating_mul(writes),149 ))150 }151 pub fn save(self) -> DispatchResult {152 <CollectionById<T>>::insert(self.id, self.collection);153 Ok(())154 }155156 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {157 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);158 Ok(())159 }160161 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {162 if self.collection.sponsorship.pending_sponsor() != Some(sender) {163 return Ok(false);164 }165166 self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());167 Ok(true)168 }169170 /// Checks that the collection was created with, and must be operated upon through **Unique API**.171 /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.172 pub fn check_is_internal(&self) -> DispatchResult {173 if self.external_collection {174 return Err(<Error<T>>::CollectionIsExternal)?;175 }176177 Ok(())178 }179180 /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.181 /// Now check only the `external_collection` flag and if it's **false**, then return `CollectionIsInternal` error.182 pub fn check_is_external(&self) -> DispatchResult {183 if !self.external_collection {184 return Err(<Error<T>>::CollectionIsInternal)?;185 }186187 Ok(())188 }189}190191impl<T: Config> Deref for CollectionHandle<T> {192 type Target = Collection<T::AccountId>;193194 fn deref(&self) -> &Self::Target {195 &self.collection196 }197}198199impl<T: Config> DerefMut for CollectionHandle<T> {200 fn deref_mut(&mut self) -> &mut Self::Target {201 &mut self.collection202 }203}204205impl<T: Config> CollectionHandle<T> {206 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {207 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);208 Ok(())209 }210 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {211 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))212 }213 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {214 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);215 Ok(())216 }217 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {218 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)219 }220 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {221 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)222 }223 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {224 ensure!(225 <Allowlist<T>>::get((self.id, user)),226 <Error<T>>::AddressNotInAllowlist227 );228 Ok(())229 }230}231232#[frame_support::pallet]233pub mod pallet {234 use super::*;235 use pallet_evm::account;236 use dispatch::CollectionDispatch;237 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};238 use frame_system::pallet_prelude::*;239 use frame_support::traits::Currency;240 use up_data_structs::{TokenId, mapping::TokenAddressMapping};241 use scale_info::TypeInfo;242 use weights::WeightInfo;243244 #[pallet::config]245 pub trait Config:246 frame_system::Config247 + pallet_evm_coder_substrate::Config248 + pallet_evm::Config249 + TypeInfo250 + account::Config251 {252 type WeightInfo: WeightInfo;253 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;254255 type Currency: Currency<Self::AccountId>;256257 #[pallet::constant]258 type CollectionCreationPrice: Get<259 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,260 >;261 type CollectionDispatch: CollectionDispatch<Self>;262263 type TreasuryAccountId: Get<Self::AccountId>;264 type ContractAddress: Get<H160>;265266 type EvmTokenAddressMapping: TokenAddressMapping<H160>;267 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;268 }269270 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);271272 #[pallet::pallet]273 #[pallet::storage_version(STORAGE_VERSION)]274 #[pallet::generate_store(pub(super) trait Store)]275 pub struct Pallet<T>(_);276277 #[pallet::extra_constants]278 impl<T: Config> Pallet<T> {279 pub fn collection_admins_limit() -> u32 {280 COLLECTION_ADMINS_LIMIT281 }282 }283284 #[pallet::event]285 #[pallet::generate_deposit(pub fn deposit_event)]286 pub enum Event<T: Config> {287 /// New collection was created288 ///289 /// # Arguments290 ///291 /// * collection_id: Globally unique identifier of newly created collection.292 ///293 /// * mode: [CollectionMode] converted into u8.294 ///295 /// * account_id: Collection owner.296 CollectionCreated(CollectionId, u8, T::AccountId),297298 /// New collection was destroyed299 ///300 /// # Arguments301 ///302 /// * collection_id: Globally unique identifier of collection.303 CollectionDestroyed(CollectionId),304305 /// New item was created.306 ///307 /// # Arguments308 ///309 /// * collection_id: Id of the collection where item was created.310 ///311 /// * item_id: Id of an item. Unique within the collection.312 ///313 /// * recipient: Owner of newly created item314 ///315 /// * amount: Always 1 for NFT316 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),317318 /// Collection item was burned.319 ///320 /// # Arguments321 ///322 /// * collection_id.323 ///324 /// * item_id: Identifier of burned NFT.325 ///326 /// * owner: which user has destroyed its tokens327 ///328 /// * amount: Always 1 for NFT329 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),330331 /// Item was transferred332 ///333 /// * collection_id: Id of collection to which item is belong334 ///335 /// * item_id: Id of an item336 ///337 /// * sender: Original owner of item338 ///339 /// * recipient: New owner of item340 ///341 /// * amount: Always 1 for NFT342 Transfer(343 CollectionId,344 TokenId,345 T::CrossAccountId,346 T::CrossAccountId,347 u128,348 ),349350 /// * collection_id351 ///352 /// * item_id353 ///354 /// * sender355 ///356 /// * spender357 ///358 /// * amount359 Approved(360 CollectionId,361 TokenId,362 T::CrossAccountId,363 T::CrossAccountId,364 u128,365 ),366367 CollectionPropertySet(CollectionId, PropertyKey),368369 CollectionPropertyDeleted(CollectionId, PropertyKey),370371 TokenPropertySet(CollectionId, TokenId, PropertyKey),372373 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),374375 PropertyPermissionSet(CollectionId, PropertyKey),376 }377378 #[pallet::error]379 pub enum Error<T> {380 /// This collection does not exist.381 CollectionNotFound,382 /// Sender parameter and item owner must be equal.383 MustBeTokenOwner,384 /// No permission to perform action385 NoPermission,386 /// Destroying only empty collections is allowed387 CantDestroyNotEmptyCollection,388 /// Collection is not in mint mode.389 PublicMintingNotAllowed,390 /// Address is not in allow list.391 AddressNotInAllowlist,392393 /// Collection name can not be longer than 63 char.394 CollectionNameLimitExceeded,395 /// Collection description can not be longer than 255 char.396 CollectionDescriptionLimitExceeded,397 /// Token prefix can not be longer than 15 char.398 CollectionTokenPrefixLimitExceeded,399 /// Total collections bound exceeded.400 TotalCollectionsLimitExceeded,401 /// Exceeded max admin count402 CollectionAdminCountExceeded,403 /// Collection limit bounds per collection exceeded404 CollectionLimitBoundsExceeded,405 /// Tried to enable permissions which are only permitted to be disabled406 OwnerPermissionsCantBeReverted,407 /// Collection settings not allowing items transferring408 TransferNotAllowed,409 /// Account token limit exceeded per collection410 AccountTokenLimitExceeded,411 /// Collection token limit exceeded412 CollectionTokenLimitExceeded,413 /// Metadata flag frozen414 MetadataFlagFrozen,415416 /// Item not exists.417 TokenNotFound,418 /// Item balance not enough.419 TokenValueTooLow,420 /// Requested value more than approved.421 ApprovedValueTooLow,422 /// Tried to approve more than owned423 CantApproveMoreThanOwned,424425 /// Can't transfer tokens to ethereum zero address426 AddressIsZero,427 /// Target collection doesn't supports this operation428 UnsupportedOperation,429430 /// Not sufficient funds to perform action431 NotSufficientFounds,432433 /// User not passed nesting rule434 UserIsNotAllowedToNest,435 /// Only tokens from specific collections may nest tokens under this436 SourceCollectionIsNotAllowedToNest,437438 /// Tried to store more data than allowed in collection field439 CollectionFieldSizeExceeded,440441 /// Tried to store more property data than allowed442 NoSpaceForProperty,443444 /// Tried to store more property keys than allowed445 PropertyLimitReached,446447 /// Property key is too long448 PropertyKeyIsTooLong,449450 /// Only ASCII letters, digits, and '_', '-' are allowed451 InvalidCharacterInPropertyKey,452453 /// Empty property keys are forbidden454 EmptyPropertyKey,455456 /// Tried to access an external collection with an internal API457 CollectionIsExternal,458459 /// Tried to access an internal collection with an external API460 CollectionIsInternal,461 }462463 #[pallet::storage]464 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;465 #[pallet::storage]466 pub type DestroyedCollectionCount<T> =467 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;468469 /// Collection info470 #[pallet::storage]471 pub type CollectionById<T> = StorageMap<472 Hasher = Blake2_128Concat,473 Key = CollectionId,474 Value = Collection<<T as frame_system::Config>::AccountId>,475 QueryKind = OptionQuery,476 >;477478 /// Collection properties479 #[pallet::storage]480 #[pallet::getter(fn collection_properties)]481 pub type CollectionProperties<T> = StorageMap<482 Hasher = Blake2_128Concat,483 Key = CollectionId,484 Value = Properties,485 QueryKind = ValueQuery,486 OnEmpty = up_data_structs::CollectionProperties,487 >;488489 #[pallet::storage]490 #[pallet::getter(fn property_permissions)]491 pub type CollectionPropertyPermissions<T> = StorageMap<492 Hasher = Blake2_128Concat,493 Key = CollectionId,494 Value = PropertiesPermissionMap,495 QueryKind = ValueQuery,496 >;497498 #[pallet::storage]499 pub type AdminAmount<T> = StorageMap<500 Hasher = Blake2_128Concat,501 Key = CollectionId,502 Value = u32,503 QueryKind = ValueQuery,504 >;505506 /// List of collection admins507 #[pallet::storage]508 pub type IsAdmin<T: Config> = StorageNMap<509 Key = (510 Key<Blake2_128Concat, CollectionId>,511 Key<Blake2_128Concat, T::CrossAccountId>,512 ),513 Value = bool,514 QueryKind = ValueQuery,515 >;516517 /// Allowlisted collection users518 #[pallet::storage]519 pub type Allowlist<T: Config> = StorageNMap<520 Key = (521 Key<Blake2_128Concat, CollectionId>,522 Key<Blake2_128Concat, T::CrossAccountId>,523 ),524 Value = bool,525 QueryKind = ValueQuery,526 >;527528 /// Not used by code, exists only to provide some types to metadata529 #[pallet::storage]530 pub type DummyStorageValue<T: Config> = StorageValue<531 Value = (532 CollectionStats,533 CollectionId,534 TokenId,535 TokenChild,536 PhantomType<(537 TokenData<T::CrossAccountId>,538 RpcCollection<T::AccountId>,539 // RMRK540 RmrkCollectionInfo<T::AccountId>,541 RmrkInstanceInfo<T::AccountId>,542 RmrkResourceInfo,543 RmrkPropertyInfo,544 RmrkBaseInfo<T::AccountId>,545 RmrkPartType,546 RmrkTheme,547 RmrkNftChild,548 )>,549 ),550 QueryKind = OptionQuery,551 >;552553 #[pallet::hooks]554 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {555 fn on_runtime_upgrade() -> Weight {556 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {557 use up_data_structs::{CollectionVersion1, CollectionVersion2};558 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {559 let mut props = Vec::new();560 if !v.offchain_schema.is_empty() {561 props.push(Property {562 key: b"_old_offchainSchema".to_vec().try_into().unwrap(),563 value: v564 .offchain_schema565 .clone()566 .into_inner()567 .try_into()568 .expect("offchain schema too big"),569 });570 }571 if !v.variable_on_chain_schema.is_empty() {572 props.push(Property {573 key: b"_old_variableOnChainSchema".to_vec().try_into().unwrap(),574 value: v575 .variable_on_chain_schema576 .clone()577 .into_inner()578 .try_into()579 .expect("offchain schema too big"),580 });581 }582 if !v.const_on_chain_schema.is_empty() {583 props.push(Property {584 key: b"_old_constOnChainSchema".to_vec().try_into().unwrap(),585 value: v586 .const_on_chain_schema587 .clone()588 .into_inner()589 .try_into()590 .expect("offchain schema too big"),591 });592 }593 props.push(Property {594 key: b"_old_schemaVersion".to_vec().try_into().unwrap(),595 value: match v.schema_version {596 SchemaVersion::ImageURL => b"ImageUrl".as_slice(),597 SchemaVersion::Unique => b"Unique".as_slice(),598 }599 .to_vec()600 .try_into()601 .unwrap(),602 });603 Self::set_scoped_collection_properties(604 id,605 PropertyScope::None,606 props.into_iter(),607 )608 .expect("existing data larger than properties");609 let mut new = CollectionVersion2::from(v.clone());610 new.permissions.access = Some(v.access);611 new.permissions.mint_mode = Some(v.mint_mode);612 Some(new)613 });614 }615616 0617 }618 }619}620621impl<T: Config> Pallet<T> {622 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens623 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {624 ensure!(625 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,626 <Error<T>>::AddressIsZero627 );628 Ok(())629 }630 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {631 <IsAdmin<T>>::iter_prefix((collection,))632 .map(|(a, _)| a)633 .collect()634 }635 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {636 <Allowlist<T>>::iter_prefix((collection,))637 .map(|(a, _)| a)638 .collect()639 }640 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {641 <Allowlist<T>>::get((collection, user))642 }643 pub fn collection_stats() -> CollectionStats {644 let created = <CreatedCollectionCount<T>>::get();645 let destroyed = <DestroyedCollectionCount<T>>::get();646 CollectionStats {647 created: created.0,648 destroyed: destroyed.0,649 alive: created.0 - destroyed.0,650 }651 }652653 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {654 let collection = <CollectionById<T>>::get(collection);655 if collection.is_none() {656 return None;657 }658659 let collection = collection.unwrap();660 let limits = collection.limits;661 let effective_limits = CollectionLimits {662 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),663 sponsored_data_size: Some(limits.sponsored_data_size()),664 sponsored_data_rate_limit: Some(665 limits666 .sponsored_data_rate_limit667 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),668 ),669 token_limit: Some(limits.token_limit()),670 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(671 match collection.mode {672 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,673 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,674 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,675 },676 )),677 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),678 owner_can_transfer: Some(limits.owner_can_transfer()),679 owner_can_destroy: Some(limits.owner_can_destroy()),680 transfers_enabled: Some(limits.transfers_enabled()),681 };682683 Some(effective_limits)684 }685686 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {687 let Collection {688 name,689 description,690 owner,691 mode,692 token_prefix,693 sponsorship,694 limits,695 permissions,696 external_collection,697 } = <CollectionById<T>>::get(collection)?;698699 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)700 .into_iter()701 .map(|(key, permission)| PropertyKeyPermission { key, permission })702 .collect();703704 let properties = <CollectionProperties<T>>::get(collection)705 .into_iter()706 .map(|(key, value)| Property { key, value })707 .collect();708709 let permissions = CollectionPermissions {710 access: Some(permissions.access()),711 mint_mode: Some(permissions.mint_mode()),712 nesting: Some(permissions.nesting().clone()),713 };714715 Some(RpcCollection {716 name: name.into_inner(),717 description: description.into_inner(),718 owner,719 mode,720 token_prefix: token_prefix.into_inner(),721 sponsorship,722 limits,723 permissions,724 token_property_permissions,725 properties,726 read_only: external_collection,727 })728 }729}730731macro_rules! limit_default {732 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{733 $(734 if let Some($new) = $new.$field {735 let $old = $old.$field($($arg)?);736 let _ = $new;737 let _ = $old;738 $check739 } else {740 $new.$field = $old.$field741 }742 )*743 }};744}745macro_rules! limit_default_clone {746 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{747 $(748 if let Some($new) = $new.$field.clone() {749 let $old = $old.$field($($arg)?);750 let _ = $new;751 let _ = $old;752 $check753 } else {754 $new.$field = $old.$field.clone()755 }756 )*757 }};758}759760impl<T: Config> Pallet<T> {761 pub fn init_collection(762 owner: T::CrossAccountId,763 data: CreateCollectionData<T::AccountId>,764 is_external: bool,765 ) -> Result<CollectionId, DispatchError> {766 {767 ensure!(768 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,769 Error::<T>::CollectionTokenPrefixLimitExceeded770 );771 }772773 let created_count = <CreatedCollectionCount<T>>::get()774 .0775 .checked_add(1)776 .ok_or(ArithmeticError::Overflow)?;777 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;778 let id = CollectionId(created_count);779780 // bound Total number of collections781 ensure!(782 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,783 <Error<T>>::TotalCollectionsLimitExceeded784 );785786 // =========787788 let collection = Collection {789 owner: owner.as_sub().clone(),790 name: data.name,791 mode: data.mode.clone(),792 description: data.description,793 token_prefix: data.token_prefix,794 sponsorship: data795 .pending_sponsor796 .map(SponsorshipState::Unconfirmed)797 .unwrap_or_default(),798 limits: data799 .limits800 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))801 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,802 permissions: data803 .permissions804 .map(|permissions| {805 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)806 })807 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,808 external_collection: is_external,809 };810811 let mut collection_properties = up_data_structs::CollectionProperties::get();812 collection_properties813 .try_set_from_iter(data.properties.into_iter())814 .map_err(<Error<T>>::from)?;815816 CollectionProperties::<T>::insert(id, collection_properties);817818 let mut token_props_permissions = PropertiesPermissionMap::new();819 token_props_permissions820 .try_set_from_iter(data.token_property_permissions.into_iter())821 .map_err(<Error<T>>::from)?;822823 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);824825 // Take a (non-refundable) deposit of collection creation826 {827 let mut imbalance =828 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();829 imbalance.subsume(830 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(831 &T::TreasuryAccountId::get(),832 T::CollectionCreationPrice::get(),833 ),834 );835 <T as Config>::Currency::settle(836 &owner.as_sub(),837 imbalance,838 WithdrawReasons::TRANSFER,839 ExistenceRequirement::KeepAlive,840 )841 .map_err(|_| Error::<T>::NotSufficientFounds)?;842 }843844 <CreatedCollectionCount<T>>::put(created_count);845 <Pallet<T>>::deposit_event(Event::CollectionCreated(846 id,847 data.mode.id(),848 owner.as_sub().clone(),849 ));850 <PalletEvm<T>>::deposit_log(851 erc::CollectionHelpersEvents::CollectionCreated {852 owner: *owner.as_eth(),853 collection_id: eth::collection_id_to_address(id),854 }855 .to_log(T::ContractAddress::get()),856 );857 <CollectionById<T>>::insert(id, collection);858 Ok(id)859 }860861 pub fn destroy_collection(862 collection: CollectionHandle<T>,863 sender: &T::CrossAccountId,864 ) -> DispatchResult {865 ensure!(866 collection.limits.owner_can_destroy(),867 <Error<T>>::NoPermission,868 );869 collection.check_is_owner(sender)?;870871 let destroyed_collections = <DestroyedCollectionCount<T>>::get()872 .0873 .checked_add(1)874 .ok_or(ArithmeticError::Overflow)?;875876 // =========877878 <DestroyedCollectionCount<T>>::put(destroyed_collections);879 <CollectionById<T>>::remove(collection.id);880 <AdminAmount<T>>::remove(collection.id);881 <IsAdmin<T>>::remove_prefix((collection.id,), None);882 <Allowlist<T>>::remove_prefix((collection.id,), None);883 <CollectionProperties<T>>::remove(collection.id);884885 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));886 Ok(())887 }888889 pub fn set_collection_property(890 collection: &CollectionHandle<T>,891 sender: &T::CrossAccountId,892 property: Property,893 ) -> DispatchResult {894 collection.check_is_owner_or_admin(sender)?;895896 CollectionProperties::<T>::try_mutate(collection.id, |properties| {897 let property = property.clone();898 properties.try_set(property.key, property.value)899 })900 .map_err(<Error<T>>::from)?;901902 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));903904 Ok(())905 }906907 pub fn set_scoped_collection_property(908 collection_id: CollectionId,909 scope: PropertyScope,910 property: Property,911 ) -> DispatchResult {912 CollectionProperties::<T>::try_mutate(collection_id, |properties| {913 properties.try_scoped_set(scope, property.key, property.value)914 })915 .map_err(<Error<T>>::from)?;916917 Ok(())918 }919920 pub fn set_scoped_collection_properties(921 collection_id: CollectionId,922 scope: PropertyScope,923 properties: impl Iterator<Item = Property>,924 ) -> DispatchResult {925 CollectionProperties::<T>::try_mutate(collection_id, |stored_properties| {926 stored_properties.try_scoped_set_from_iter(scope, properties)927 })928 .map_err(<Error<T>>::from)?;929930 Ok(())931 }932933 #[transactional]934 pub fn set_collection_properties(935 collection: &CollectionHandle<T>,936 sender: &T::CrossAccountId,937 properties: Vec<Property>,938 ) -> DispatchResult {939 for property in properties {940 Self::set_collection_property(collection, sender, property)?;941 }942943 Ok(())944 }945946 pub fn delete_collection_property(947 collection: &CollectionHandle<T>,948 sender: &T::CrossAccountId,949 property_key: PropertyKey,950 ) -> DispatchResult {951 collection.check_is_owner_or_admin(sender)?;952953 CollectionProperties::<T>::try_mutate(collection.id, |properties| {954 properties.remove(&property_key)955 })956 .map_err(<Error<T>>::from)?;957958 Self::deposit_event(Event::CollectionPropertyDeleted(959 collection.id,960 property_key,961 ));962963 Ok(())964 }965966 #[transactional]967 pub fn delete_collection_properties(968 collection: &CollectionHandle<T>,969 sender: &T::CrossAccountId,970 property_keys: Vec<PropertyKey>,971 ) -> DispatchResult {972 for key in property_keys {973 Self::delete_collection_property(collection, sender, key)?;974 }975976 Ok(())977 }978979 // For migrations980 pub fn set_property_permission_unchecked(981 collection: CollectionId,982 property_permission: PropertyKeyPermission,983 ) -> DispatchResult {984 <CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {985 permissions.try_set(property_permission.key, property_permission.permission)986 })987 .map_err(<Error<T>>::from)?;988 Ok(())989 }990991 pub fn set_property_permission(992 collection: &CollectionHandle<T>,993 sender: &T::CrossAccountId,994 property_permission: PropertyKeyPermission,995 ) -> DispatchResult {996 collection.check_is_owner_or_admin(sender)?;997998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);999 let current_permission = all_permissions.get(&property_permission.key);1000 if matches![1001 current_permission,1002 Some(PropertyPermission { mutable: false, .. })1003 ] {1004 return Err(<Error<T>>::NoPermission.into());1005 }10061007 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {1008 let property_permission = property_permission.clone();1009 permissions.try_set(property_permission.key, property_permission.permission)1010 })1011 .map_err(<Error<T>>::from)?;10121013 Self::deposit_event(Event::PropertyPermissionSet(1014 collection.id,1015 property_permission.key,1016 ));10171018 Ok(())1019 }10201021 #[transactional]1022 pub fn set_property_permissions(1023 collection: &CollectionHandle<T>,1024 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1027 for prop_pemission in property_permissions {1028 Self::set_property_permission(collection, sender, prop_pemission)?;1029 }10301031 Ok(())1032 }10331034 pub fn get_collection_property(1035 collection_id: CollectionId,1036 key: &PropertyKey,1037 ) -> Option<PropertyValue> {1038 Self::collection_properties(collection_id).get(key).cloned()1039 }10401041 pub fn bytes_keys_to_property_keys(1042 keys: Vec<Vec<u8>>,1043 ) -> Result<Vec<PropertyKey>, DispatchError> {1044 keys.into_iter()1045 .map(|key| -> Result<PropertyKey, DispatchError> {1046 key.try_into()1047 .map_err(|_| <Error<T>>::PropertyKeyIsTooLong.into())1048 })1049 .collect::<Result<Vec<PropertyKey>, DispatchError>>()1050 }10511052 pub fn filter_collection_properties(1053 collection_id: CollectionId,1054 keys: Option<Vec<PropertyKey>>,1055 ) -> Result<Vec<Property>, DispatchError> {1056 let properties = Self::collection_properties(collection_id);10571058 let properties = keys1059 .map(|keys| {1060 keys.into_iter()1061 .filter_map(|key| {1062 properties.get(&key).map(|value| Property {1063 key,1064 value: value.clone(),1065 })1066 })1067 .collect()1068 })1069 .unwrap_or_else(|| {1070 properties1071 .into_iter()1072 .map(|(key, value)| Property { key, value })1073 .collect()1074 });10751076 Ok(properties)1077 }10781079 pub fn filter_property_permissions(1080 collection_id: CollectionId,1081 keys: Option<Vec<PropertyKey>>,1082 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {1083 let permissions = Self::property_permissions(collection_id);10841085 let key_permissions = keys1086 .map(|keys| {1087 keys.into_iter()1088 .filter_map(|key| {1089 permissions1090 .get(&key)1091 .map(|permission| PropertyKeyPermission {1092 key,1093 permission: permission.clone(),1094 })1095 })1096 .collect()1097 })1098 .unwrap_or_else(|| {1099 permissions1100 .into_iter()1101 .map(|(key, permission)| PropertyKeyPermission { key, permission })1102 .collect()1103 });11041105 Ok(key_permissions)1106 }11071108 pub fn toggle_allowlist(1109 collection: &CollectionHandle<T>,1110 sender: &T::CrossAccountId,1111 user: &T::CrossAccountId,1112 allowed: bool,1113 ) -> DispatchResult {1114 collection.check_is_owner_or_admin(sender)?;11151116 // =========11171118 if allowed {1119 <Allowlist<T>>::insert((collection.id, user), true);1120 } else {1121 <Allowlist<T>>::remove((collection.id, user));1122 }11231124 Ok(())1125 }11261127 pub fn toggle_admin(1128 collection: &CollectionHandle<T>,1129 sender: &T::CrossAccountId,1130 user: &T::CrossAccountId,1131 admin: bool,1132 ) -> DispatchResult {1133 collection.check_is_owner(sender)?;11341135 let was_admin = <IsAdmin<T>>::get((collection.id, user));1136 if was_admin == admin {1137 return Ok(());1138 }1139 let amount = <AdminAmount<T>>::get(collection.id);11401141 if admin {1142 let amount = amount1143 .checked_add(1)1144 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;1145 ensure!(1146 amount <= Self::collection_admins_limit(),1147 <Error<T>>::CollectionAdminCountExceeded,1148 );11491150 // =========11511152 <AdminAmount<T>>::insert(collection.id, amount);1153 <IsAdmin<T>>::insert((collection.id, user), true);1154 } else {1155 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1156 <IsAdmin<T>>::remove((collection.id, user));1157 }11581159 Ok(())1160 }11611162 pub fn clamp_limits(1163 mode: CollectionMode,1164 old_limit: &CollectionLimits,1165 mut new_limit: CollectionLimits,1166 ) -> Result<CollectionLimits, DispatchError> {1167 limit_default!(old_limit, new_limit,1168 account_token_ownership_limit => ensure!(1169 new_limit <= MAX_TOKEN_OWNERSHIP,1170 <Error<T>>::CollectionLimitBoundsExceeded,1171 ),1172 sponsored_data_size => ensure!(1173 new_limit <= CUSTOM_DATA_LIMIT,1174 <Error<T>>::CollectionLimitBoundsExceeded,1175 ),11761177 sponsored_data_rate_limit => {},1178 token_limit => ensure!(1179 old_limit >= new_limit && new_limit > 0,1180 <Error<T>>::CollectionTokenLimitExceeded1181 ),11821183 sponsor_transfer_timeout(match mode {1184 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1185 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1186 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1187 }) => ensure!(1188 new_limit <= MAX_SPONSOR_TIMEOUT,1189 <Error<T>>::CollectionLimitBoundsExceeded,1190 ),1191 sponsor_approve_timeout => {},1192 owner_can_transfer => ensure!(1193 old_limit || !new_limit,1194 <Error<T>>::OwnerPermissionsCantBeReverted,1195 ),1196 owner_can_destroy => ensure!(1197 old_limit || !new_limit,1198 <Error<T>>::OwnerPermissionsCantBeReverted,1199 ),1200 transfers_enabled => {},1201 );1202 Ok(new_limit)1203 }12041205 pub fn clamp_permissions(1206 _mode: CollectionMode,1207 old_limit: &CollectionPermissions,1208 mut new_limit: CollectionPermissions,1209 ) -> Result<CollectionPermissions, DispatchError> {1210 limit_default_clone!(old_limit, new_limit,1211 access => {},1212 mint_mode => {},1213 nesting => ensure!(1214 // Permissive is only allowed for tests and internal usage of chain for now1215 old_limit.permissive || !new_limit.permissive,1216 <Error<T>>::NoPermission,1217 ),1218 );1219 Ok(new_limit)1220 }1221}12221223#[macro_export]1224macro_rules! unsupported {1225 () => {1226 Err(<Error<T>>::UnsupportedOperation.into())1227 };1228}12291230/// Worst cases1231pub trait CommonWeightInfo<CrossAccountId> {1232 fn create_item() -> Weight;1233 fn create_multiple_items(amount: &[CreateItemData]) -> Weight;1234 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1235 fn burn_item() -> Weight;1236 fn set_collection_properties(amount: u32) -> Weight;1237 fn delete_collection_properties(amount: u32) -> Weight;1238 fn set_token_properties(amount: u32) -> Weight;1239 fn delete_token_properties(amount: u32) -> Weight;1240 fn set_property_permissions(amount: u32) -> Weight;1241 fn transfer() -> Weight;1242 fn approve() -> Weight;1243 fn transfer_from() -> Weight;1244 fn burn_from() -> Weight;12451246 /// Differs from burn_item in case of Fungible and Refungible, as it should burn1247 /// whole users's balance1248 ///1249 /// This method shouldn't be used directly, as it doesn't count breadth price, use `burn_recursively` instead1250 fn burn_recursively_self_raw() -> Weight;1251 /// Cost of iterating over `amount` children while burning, without counting child burning itself1252 ///1253 /// This method shouldn't be used directly, as it doesn't count depth price, use `burn_recursively` instead1254 fn burn_recursively_breadth_raw(amount: u32) -> Weight;12551256 fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {1257 Self::burn_recursively_self_raw()1258 .saturating_mul(max_selfs.max(1) as u64)1259 .saturating_add(Self::burn_recursively_breadth_raw(max_breadth))1260 }1261}12621263pub trait CommonCollectionOperations<T: Config> {1264 fn create_item(1265 &self,1266 sender: T::CrossAccountId,1267 to: T::CrossAccountId,1268 data: CreateItemData,1269 nesting_budget: &dyn Budget,1270 ) -> DispatchResultWithPostInfo;1271 fn create_multiple_items(1272 &self,1273 sender: T::CrossAccountId,1274 to: T::CrossAccountId,1275 data: Vec<CreateItemData>,1276 nesting_budget: &dyn Budget,1277 ) -> DispatchResultWithPostInfo;1278 fn create_multiple_items_ex(1279 &self,1280 sender: T::CrossAccountId,1281 data: CreateItemExData<T::CrossAccountId>,1282 nesting_budget: &dyn Budget,1283 ) -> DispatchResultWithPostInfo;1284 fn burn_item(1285 &self,1286 sender: T::CrossAccountId,1287 token: TokenId,1288 amount: u128,1289 ) -> DispatchResultWithPostInfo;1290 fn burn_item_recursively(1291 &self,1292 sender: T::CrossAccountId,1293 token: TokenId,1294 self_budget: &dyn Budget,1295 breadth_budget: &dyn Budget,1296 ) -> DispatchResultWithPostInfo;1297 fn set_collection_properties(1298 &self,1299 sender: T::CrossAccountId,1300 properties: Vec<Property>,1301 ) -> DispatchResultWithPostInfo;1302 fn delete_collection_properties(1303 &self,1304 sender: &T::CrossAccountId,1305 property_keys: Vec<PropertyKey>,1306 ) -> DispatchResultWithPostInfo;1307 fn set_token_properties(1308 &self,1309 sender: T::CrossAccountId,1310 token_id: TokenId,1311 property: Vec<Property>,1312 ) -> DispatchResultWithPostInfo;1313 fn delete_token_properties(1314 &self,1315 sender: T::CrossAccountId,1316 token_id: TokenId,1317 property_keys: Vec<PropertyKey>,1318 ) -> DispatchResultWithPostInfo;1319 fn set_property_permissions(1320 &self,1321 sender: &T::CrossAccountId,1322 property_permissions: Vec<PropertyKeyPermission>,1323 ) -> DispatchResultWithPostInfo;1324 fn transfer(1325 &self,1326 sender: T::CrossAccountId,1327 to: T::CrossAccountId,1328 token: TokenId,1329 amount: u128,1330 nesting_budget: &dyn Budget,1331 ) -> DispatchResultWithPostInfo;1332 fn approve(1333 &self,1334 sender: T::CrossAccountId,1335 spender: T::CrossAccountId,1336 token: TokenId,1337 amount: u128,1338 ) -> DispatchResultWithPostInfo;1339 fn transfer_from(1340 &self,1341 sender: T::CrossAccountId,1342 from: T::CrossAccountId,1343 to: T::CrossAccountId,1344 token: TokenId,1345 amount: u128,1346 nesting_budget: &dyn Budget,1347 ) -> DispatchResultWithPostInfo;1348 fn burn_from(1349 &self,1350 sender: T::CrossAccountId,1351 from: T::CrossAccountId,1352 token: TokenId,1353 amount: u128,1354 nesting_budget: &dyn Budget,1355 ) -> DispatchResultWithPostInfo;13561357 fn check_nesting(1358 &self,1359 sender: T::CrossAccountId,1360 from: (CollectionId, TokenId),1361 under: TokenId,1362 budget: &dyn Budget,1363 ) -> DispatchResult;13641365 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13661367 fn unnest(&self, under: TokenId, to_nest: (CollectionId, TokenId));13681369 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1370 fn collection_tokens(&self) -> Vec<TokenId>;1371 fn token_exists(&self, token: TokenId) -> bool;1372 fn last_token_id(&self) -> TokenId;13731374 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1375 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;1376 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;1377 /// Amount of unique collection tokens1378 fn total_supply(&self) -> u32;1379 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1380 fn account_balance(&self, account: T::CrossAccountId) -> u32;1381 /// Amount of specific token account have (Applicable to fungible/refungible)1382 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1383 fn allowance(1384 &self,1385 sender: T::CrossAccountId,1386 spender: T::CrossAccountId,1387 token: TokenId,1388 ) -> u128;1389}13901391// Flexible enough for implementing CommonCollectionOperations1392pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1393 let post_info = PostDispatchInfo {1394 actual_weight: Some(weight),1395 pays_fee: Pays::Yes,1396 };1397 match res {1398 Ok(()) => Ok(post_info),1399 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1400 }1401}14021403impl<T: Config> From<PropertiesError> for Error<T> {1404 fn from(error: PropertiesError) -> Self {1405 match error {1406 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1407 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1408 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1409 PropertiesError::PropertyKeyIsTooLong => Self::PropertyKeyIsTooLong,1410 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1411 }1412 }1413}pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -152,12 +152,15 @@
via("CollectionHandle<T>", common_mut, Collection)
)
)]
-impl<T: Config> FungibleHandle<T> {}
+impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);
generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);
-impl<T: Config> CommonEvmHandler for FungibleHandle<T> {
+impl<T: Config> CommonEvmHandler for FungibleHandle<T>
+where
+ T::AccountId: From<[u8; 32]>,
+{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");
fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -583,13 +583,16 @@
TokenProperties,
)
)]
-impl<T: Config> NonfungibleHandle<T> {}
+impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
// Not a tests, but code generators
generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);
generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);
-impl<T: Config> CommonEvmHandler for NonfungibleHandle<T> {
+impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>
+where
+ T::AccountId: From<[u8; 32]>,
+{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");
fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -297,7 +297,40 @@
}
}
-// Selector: 6aea9834
+// Selector: 780e9d63
+contract ERC721Enumerable is Dummy, ERC165 {
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) public view returns (uint256) {
+ require(false, stub_error);
+ index;
+ dummy;
+ return 0;
+ }
+
+ // Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ public
+ view
+ returns (uint256)
+ {
+ require(false, stub_error);
+ owner;
+ index;
+ dummy;
+ return 0;
+ }
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+}
+
+// Selector: 7d9262e6
contract Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -366,6 +399,20 @@
return 0x0000000000000000000000000000000000000000;
}
+ // Selector: addCollectionAdminSubstrate(uint256) 5730062b
+ function addCollectionAdminSubstrate(uint256 newAdmin) public view {
+ require(false, stub_error);
+ newAdmin;
+ dummy;
+ }
+
+ // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
+ function removeCollectionAdminSubstrate(uint256 newAdmin) public view {
+ require(false, stub_error);
+ newAdmin;
+ dummy;
+ }
+
// Selector: addCollectionAdmin(address) 92e462c7
function addCollectionAdmin(address newAdmin) public view {
require(false, stub_error);
@@ -423,39 +470,6 @@
require(false, stub_error);
mode;
dummy = 0;
- }
-}
-
-// Selector: 780e9d63
-contract ERC721Enumerable is Dummy, ERC165 {
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) public view returns (uint256) {
- require(false, stub_error);
- index;
- dummy;
- return 0;
- }
-
- // Not implemented
- //
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- public
- view
- returns (uint256)
- {
- require(false, stub_error);
- owner;
- index;
- dummy;
- return 0;
- }
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
}
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -491,7 +491,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.check_is_owner(&sender)?;
+ target_collection.check_is_owner_or_admin(&sender)?;
target_collection.check_is_internal()?;
target_collection.set_sponsor(new_sponsor.clone())?;
@@ -867,7 +867,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_internal()?;
- target_collection.check_is_owner(&sender)?;
+ target_collection.check_is_owner_or_admin(&sender)?;
let old_limit = &target_collection.limits;
target_collection.limits = <PalletCommon<T>>::clamp_limits(target_collection.mode.clone(), &old_limit, new_limit)?;
@@ -889,7 +889,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_internal()?;
- target_collection.check_is_owner(&sender)?;
+ target_collection.check_is_owner_or_admin(&sender)?;
let old_limit = &target_collection.permissions;
target_collection.permissions = <PalletCommon<T>>::clamp_permissions(target_collection.mode.clone(), &old_limit, new_limit)?;
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -812,7 +812,7 @@
for byte in key.as_slice().iter() {
let byte = *byte;
- if !byte.is_ascii_alphanumeric() && byte != b'_' && byte != b'-' {
+ if !byte.is_ascii_alphanumeric() && byte != b'_' && byte != b'-' && byte != b'.' {
return Err(PropertiesError::InvalidCharacterInPropertyKey);
}
}
runtime/common/src/dispatch.rsdiffbeforeafterboth--- a/runtime/common/src/dispatch.rs
+++ b/runtime/common/src/dispatch.rs
@@ -112,6 +112,7 @@
+ pallet_fungible::Config
+ pallet_nonfungible::Config
+ pallet_refungible::Config,
+ T::AccountId: From<[u8; 32]>,
{
fn is_reserved(target: &H160) -> bool {
map_eth_to_id(target).is_some()
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -1264,7 +1264,6 @@
let collection1_id =
create_test_collection_for_owner(&CollectionMode::NFT, 1, CollectionId(1));
let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
// Add collection admins 2 and 3
assert_ok!(Unique::add_collection_admin(
@@ -1273,7 +1272,7 @@
account(2)
));
assert_ok!(Unique::add_collection_admin(
- origin1,
+ origin1.clone(),
collection1_id,
account(3)
));
@@ -1289,7 +1288,7 @@
// remove admin 3
assert_ok!(Unique::remove_collection_admin(
- origin2,
+ origin1,
CollectionId(1),
account(3)
));
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -174,7 +174,24 @@
function finishMinting() external returns (bool);
}
-// Selector: 6aea9834
+// Selector: 780e9d63
+interface ERC721Enumerable is Dummy, ERC165 {
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) external view returns (uint256);
+
+ // Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ external
+ view
+ returns (uint256);
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() external view returns (uint256);
+}
+
+// Selector: 7d9262e6
interface Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -206,6 +223,12 @@
// Selector: contractAddress() f6b4dfb4
function contractAddress() external view returns (address);
+ // Selector: addCollectionAdminSubstrate(uint256) 5730062b
+ function addCollectionAdminSubstrate(uint256 newAdmin) external view;
+
+ // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
+ function removeCollectionAdminSubstrate(uint256 newAdmin) external view;
+
// Selector: addCollectionAdmin(address) 92e462c7
function addCollectionAdmin(address newAdmin) external view;
@@ -230,23 +253,6 @@
// Selector: setCollectionMintMode(bool) 00018e84
function setCollectionMintMode(bool mode) external;
-}
-
-// Selector: 780e9d63
-interface ERC721Enumerable is Dummy, ERC165 {
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) external view returns (uint256);
-
- // Not implemented
- //
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- external
- view
- returns (uint256);
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() external view returns (uint256);
}
// Selector: d74d154f
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -0,0 +1,296 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import {expect} from 'chai';
+import privateKey from '../substrate/privateKey';
+import {
+ createEthAccount,
+ createEthAccountWithBalance,
+ evmCollection,
+ evmCollectionHelpers,
+ getCollectionAddressFromResult,
+ itWeb3,
+} from './util/helpers';
+
+describe('Add collection admins', () => {
+ itWeb3('Add admin by owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const newAdmin = await createEthAccount(web3);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
+ .to.be.eq(newAdmin.toLocaleLowerCase());
+ });
+
+ itWeb3('Add substrate admin by owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const newAdmin = privateKey('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())
+ .to.be.eq(newAdmin.address.toLocaleLowerCase());
+ });
+
+ itWeb3('(!negative tests!) Add admin by ADMIN is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const admin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdmin(admin).send();
+
+ const user = await createEthAccount(web3);
+ await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: admin}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(1);
+ expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
+ .to.be.eq(admin.toLocaleLowerCase());
+ });
+
+ itWeb3('(!negative tests!) Add admin by USER is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const notAdmin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ const user = await createEthAccount(web3);
+ await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: notAdmin}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(0);
+ });
+
+ itWeb3('(!negative tests!) Add substrate admin by ADMIN is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const admin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdmin(admin).send();
+
+ const notAdmin = privateKey('//Alice');
+ await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin.addressRaw).call({from: admin}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(1);
+ expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
+ .to.be.eq(admin.toLocaleLowerCase());
+ });
+
+ itWeb3('(!negative tests!) Add substrate admin by USER is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const notAdmin0 = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ const notAdmin1 = privateKey('//Alice');
+ await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin1.addressRaw).call({from: notAdmin0}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(0);
+ });
+});
+
+describe('Remove collection admins', () => {
+ itWeb3('Remove admin by owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const newAdmin = await createEthAccount(web3);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
+ {
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(1);
+ expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
+ .to.be.eq(newAdmin.toLocaleLowerCase());
+ }
+
+ await collectionEvm.methods.removeCollectionAdmin(newAdmin).send();
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(0);
+ });
+
+ itWeb3('Remove substrate admin by owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const newAdmin = privateKey('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();
+ {
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())
+ .to.be.eq(newAdmin.address.toLocaleLowerCase());
+ }
+
+ await collectionEvm.methods.removeCollectionAdminSubstrate(newAdmin.addressRaw).send();
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(0);
+ });
+
+ itWeb3('(!negative tests!) Remove admin by ADMIN is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ const admin0 = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ await collectionEvm.methods.addCollectionAdmin(admin0).send();
+ const admin1 = await createEthAccount(web3);
+ await collectionEvm.methods.addCollectionAdmin(admin1).send();
+
+ await expect(collectionEvm.methods.removeCollectionAdmin(admin1).call({from: admin0}))
+ .to.be.rejectedWith('NoPermission');
+ {
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(2);
+ expect(adminList.toString().toLocaleLowerCase())
+ .to.be.deep.contains(admin0.toLocaleLowerCase())
+ .to.be.deep.contains(admin1.toLocaleLowerCase());
+ }
+ });
+
+ itWeb3('(!negative tests!) Remove admin by USER is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ const admin = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ await collectionEvm.methods.addCollectionAdmin(admin).send();
+ const notAdmin = await createEthAccount(web3);
+
+ await expect(collectionEvm.methods.removeCollectionAdmin(admin).call({from: notAdmin}))
+ .to.be.rejectedWith('NoPermission');
+ {
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
+ .to.be.eq(admin.toLocaleLowerCase());
+ expect(adminList.length).to.be.eq(1);
+ }
+ });
+
+ itWeb3('(!negative tests!) Remove substrate admin by ADMIN is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const adminSub = privateKey('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();
+ const adminEth = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ await collectionEvm.methods.addCollectionAdmin(adminEth).send();
+
+ await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: adminEth}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(2);
+ expect(adminList.toString().toLocaleLowerCase())
+ .to.be.deep.contains(adminSub.address.toLocaleLowerCase())
+ .to.be.deep.contains(adminEth.toLocaleLowerCase());
+ });
+
+ itWeb3('(!negative tests!) Remove substrate admin by USER is not allowed', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+
+ const adminSub = privateKey('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();
+ const notAdminEth = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+
+ await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: notAdminEth}))
+ .to.be.rejectedWith('NoPermission');
+
+ const adminList = await api.rpc.unique.adminlist(collectionId);
+ expect(adminList.length).to.be.eq(1);
+ expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())
+ .to.be.eq(adminSub.address.toLocaleLowerCase());
+ });
+});
\ No newline at end of file
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -233,7 +233,7 @@
const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));
- await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
@@ -241,14 +241,13 @@
expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));
const user = createEthAccount(web3);
- let nextTokenId = await collectionEvm.methods.nextTokenId().call();
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
expect(nextTokenId).to.be.equal('1');
const oldPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();
expect(oldPermissions.mintMode).to.be.false;
expect(oldPermissions.access).to.be.equal('Normal');
- //TODO: change value, when enum generated
await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});
await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
@@ -260,34 +259,35 @@
const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
- nextTokenId = await collectionEvm.methods.nextTokenId().call({from: user});
- expect(nextTokenId).to.be.equal('1');
- result = await collectionEvm.methods.mintWithTokenURI(
- user,
- nextTokenId,
- 'Test URI',
- ).send({from: user});
- const events = normalizeEvents(result.events);
- events[0].address = events[0].address.toLocaleLowerCase();
+ {
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+ const result = await collectionEvm.methods.mintWithTokenURI(
+ user,
+ nextTokenId,
+ 'Test URI',
+ ).send({from: user});
+ const events = normalizeEvents(result.events);
- expect(events).to.be.deep.equal([
- {
- address: collectionIdAddress.toLocaleLowerCase(),
- event: 'Transfer',
- args: {
- from: '0x0000000000000000000000000000000000000000',
- to: user,
- tokenId: nextTokenId,
+ expect(events).to.be.deep.equal([
+ {
+ address: collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: user,
+ tokenId: nextTokenId,
+ },
},
- },
- ]);
+ ]);
- expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ const ownerBalanceAfter = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);
- const ownerBalanceAfter = await ethBalanceViaSub(api, owner);
- expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);
- const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);
- expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;
+ expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);
+ expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;
+ }
});
itWeb3('Check that transaction via EVM spend money from sponsor address', async ({api, web3, privateKeyWrapper}) => {
@@ -302,7 +302,7 @@
const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));
- await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
await sponsorCollection.methods.confirmCollectionSponsorship().send();
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
@@ -314,6 +314,7 @@
const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
+
const userCollectionEvm = evmCollection(web3, user, collectionIdAddress);
const nextTokenId = await userCollectionEvm.methods.nextTokenId().call();
tests/src/eth/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -80,7 +80,7 @@
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));
- await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
await sponsorCollection.methods.confirmCollectionSponsorship().send();
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
@@ -208,7 +208,7 @@
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
await expect(sponsorCollection.methods
.confirmCollectionSponsorship()
- .call()).to.be.rejectedWith('Caller is not set as sponsor');
+ .call()).to.be.rejectedWith('caller is not set as sponsor');
}
{
await expect(contractEvmFromNotOwner.methods
@@ -225,6 +225,6 @@
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
await expect(collectionEvm.methods
.setCollectionLimit('badLimit', 'true')
- .call()).to.be.rejectedWith('Unknown boolean limit "badLimit"');
+ .call()).to.be.rejectedWith('unknown boolean limit "badLimit"');
});
});
\ No newline at end of file
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -91,6 +91,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "newAdmin", "type": "uint256" }
+ ],
+ "name": "addCollectionAdminSubstrate",
+ "outputs": [],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
"name": "addToCollectionAllowList",
@@ -300,6 +309,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "newAdmin", "type": "uint256" }
+ ],
+ "name": "removeCollectionAdminSubstrate",
+ "outputs": [],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
"name": "removeFromCollectionAllowList",
tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -5,7 +5,7 @@
import type { BTreeMap, Bytes, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PalletUnqSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsTokenChild } from '@polkadot/types/lookup';
+import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PalletUniqueSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsTokenChild } from '@polkadot/types/lookup';
import type { Observable } from '@polkadot/types/types';
declare module '@polkadot/api-base/types/storage' {
@@ -436,7 +436,7 @@
/**
* Items to be executed, indexed by the block number that they should be executed on.
**/
- agenda: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<Vec<Option<PalletUnqSchedulerScheduledV3>>>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
+ agenda: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<Vec<Option<PalletUniqueSchedulerScheduledV3>>>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
/**
* Lookup from identity to the block number and index of the task.
**/
tests/src/interfaces/augment-types.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
/* eslint-disable */
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUnqSchedulerCall, PalletUnqSchedulerError, PalletUnqSchedulerEvent, PalletUnqSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
+import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
import type { Data, StorageKey } from '@polkadot/types';
import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
@@ -819,10 +819,10 @@
PalletUniqueCall: PalletUniqueCall;
PalletUniqueError: PalletUniqueError;
PalletUniqueRawEvent: PalletUniqueRawEvent;
- PalletUnqSchedulerCall: PalletUnqSchedulerCall;
- PalletUnqSchedulerError: PalletUnqSchedulerError;
- PalletUnqSchedulerEvent: PalletUnqSchedulerEvent;
- PalletUnqSchedulerScheduledV3: PalletUnqSchedulerScheduledV3;
+ PalletUniqueSchedulerCall: PalletUniqueSchedulerCall;
+ PalletUniqueSchedulerError: PalletUniqueSchedulerError;
+ PalletUniqueSchedulerEvent: PalletUniqueSchedulerEvent;
+ PalletUniqueSchedulerScheduledV3: PalletUniqueSchedulerScheduledV3;
PalletVersion: PalletVersion;
PalletXcmCall: PalletXcmCall;
PalletXcmError: PalletXcmError;
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -1784,8 +1784,8 @@
readonly type: 'CollectionSponsorRemoved' | 'CollectionAdminAdded' | 'CollectionOwnedChanged' | 'CollectionSponsorSet' | 'SponsorshipConfirmed' | 'CollectionAdminRemoved' | 'AllowListAddressRemoved' | 'AllowListAddressAdded' | 'CollectionLimitSet' | 'CollectionPermissionSet';
}
-/** @name PalletUnqSchedulerCall */
-export interface PalletUnqSchedulerCall extends Enum {
+/** @name PalletUniqueSchedulerCall */
+export interface PalletUniqueSchedulerCall extends Enum {
readonly isScheduleNamed: boolean;
readonly asScheduleNamed: {
readonly id: U8aFixed;
@@ -1809,8 +1809,8 @@
readonly type: 'ScheduleNamed' | 'CancelNamed' | 'ScheduleNamedAfter';
}
-/** @name PalletUnqSchedulerError */
-export interface PalletUnqSchedulerError extends Enum {
+/** @name PalletUniqueSchedulerError */
+export interface PalletUniqueSchedulerError extends Enum {
readonly isFailedToSchedule: boolean;
readonly isNotFound: boolean;
readonly isTargetBlockNumberInPast: boolean;
@@ -1818,8 +1818,8 @@
readonly type: 'FailedToSchedule' | 'NotFound' | 'TargetBlockNumberInPast' | 'RescheduleNoChange';
}
-/** @name PalletUnqSchedulerEvent */
-export interface PalletUnqSchedulerEvent extends Enum {
+/** @name PalletUniqueSchedulerEvent */
+export interface PalletUniqueSchedulerEvent extends Enum {
readonly isScheduled: boolean;
readonly asScheduled: {
readonly when: u32;
@@ -1845,8 +1845,8 @@
readonly type: 'Scheduled' | 'Canceled' | 'Dispatched' | 'CallLookupFailed';
}
-/** @name PalletUnqSchedulerScheduledV3 */
-export interface PalletUnqSchedulerScheduledV3 extends Struct {
+/** @name PalletUniqueSchedulerScheduledV3 */
+export interface PalletUniqueSchedulerScheduledV3 extends Struct {
readonly maybeId: Option<U8aFixed>;
readonly priority: u8;
readonly call: FrameSupportScheduleMaybeHashed;
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1526,9 +1526,9 @@
users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>'
},
/**
- * Lookup206: pallet_unq_scheduler::pallet::Call<T>
+ * Lookup206: pallet_unique_scheduler::pallet::Call<T>
**/
- PalletUnqSchedulerCall: {
+ PalletUniqueSchedulerCall: {
_enum: {
schedule_named: {
id: '[u8;16]',
@@ -2181,9 +2181,9 @@
}
},
/**
- * Lookup283: pallet_unq_scheduler::pallet::Event<T>
+ * Lookup283: pallet_unique_scheduler::pallet::Event<T>
**/
- PalletUnqSchedulerEvent: {
+ PalletUniqueSchedulerEvent: {
_enum: {
Scheduled: {
when: 'u32',
@@ -2589,9 +2589,9 @@
_enum: ['CollectionDecimalPointLimitExceeded', 'ConfirmUnsetSponsorFail', 'EmptyArgument']
},
/**
- * Lookup344: pallet_unq_scheduler::ScheduledV3<frame_support::traits::schedule::MaybeHashed<opal_runtime::Call, primitive_types::H256>, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32>
+ * Lookup344: pallet_unique_scheduler::ScheduledV3<frame_support::traits::schedule::MaybeHashed<opal_runtime::Call, primitive_types::H256>, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32>
**/
- PalletUnqSchedulerScheduledV3: {
+ PalletUniqueSchedulerScheduledV3: {
maybeId: 'Option<[u8;16]>',
priority: 'u8',
call: 'FrameSupportScheduleMaybeHashed',
@@ -2748,9 +2748,9 @@
**/
SpCoreVoid: 'Null',
/**
- * Lookup351: pallet_unq_scheduler::pallet::Error<T>
+ * Lookup351: pallet_unique_scheduler::pallet::Error<T>
**/
- PalletUnqSchedulerError: {
+ PalletUniqueSchedulerError: {
_enum: ['FailedToSchedule', 'NotFound', 'TargetBlockNumberInPast', 'RescheduleNoChange']
},
/**
tests/src/interfaces/registry.tsdiffbeforeafterboth--- a/tests/src/interfaces/registry.ts
+++ b/tests/src/interfaces/registry.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
/* eslint-disable */
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUnqSchedulerCall, PalletUnqSchedulerError, PalletUnqSchedulerEvent, PalletUnqSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
+import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
declare module '@polkadot/types/types/registry' {
export interface InterfaceTypes {
@@ -133,10 +133,10 @@
PalletUniqueCall: PalletUniqueCall;
PalletUniqueError: PalletUniqueError;
PalletUniqueRawEvent: PalletUniqueRawEvent;
- PalletUnqSchedulerCall: PalletUnqSchedulerCall;
- PalletUnqSchedulerError: PalletUnqSchedulerError;
- PalletUnqSchedulerEvent: PalletUnqSchedulerEvent;
- PalletUnqSchedulerScheduledV3: PalletUnqSchedulerScheduledV3;
+ PalletUniqueSchedulerCall: PalletUniqueSchedulerCall;
+ PalletUniqueSchedulerError: PalletUniqueSchedulerError;
+ PalletUniqueSchedulerEvent: PalletUniqueSchedulerEvent;
+ PalletUniqueSchedulerScheduledV3: PalletUniqueSchedulerScheduledV3;
PalletXcmCall: PalletXcmCall;
PalletXcmError: PalletXcmError;
PalletXcmEvent: PalletXcmEvent;
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -1650,8 +1650,8 @@
readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
}
- /** @name PalletUnqSchedulerCall (206) */
- export interface PalletUnqSchedulerCall extends Enum {
+ /** @name PalletUniqueSchedulerCall (206) */
+ export interface PalletUniqueSchedulerCall extends Enum {
readonly isScheduleNamed: boolean;
readonly asScheduleNamed: {
readonly id: U8aFixed;
@@ -2350,8 +2350,8 @@
readonly type: 'CollectionSponsorRemoved' | 'CollectionAdminAdded' | 'CollectionOwnedChanged' | 'CollectionSponsorSet' | 'SponsorshipConfirmed' | 'CollectionAdminRemoved' | 'AllowListAddressRemoved' | 'AllowListAddressAdded' | 'CollectionLimitSet' | 'CollectionPermissionSet';
}
- /** @name PalletUnqSchedulerEvent (283) */
- export interface PalletUnqSchedulerEvent extends Enum {
+ /** @name PalletUniqueSchedulerEvent (283) */
+ export interface PalletUniqueSchedulerEvent extends Enum {
readonly isScheduled: boolean;
readonly asScheduled: {
readonly when: u32;
@@ -2805,8 +2805,8 @@
readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument';
}
- /** @name PalletUnqSchedulerScheduledV3 (344) */
- export interface PalletUnqSchedulerScheduledV3 extends Struct {
+ /** @name PalletUniqueSchedulerScheduledV3 (344) */
+ export interface PalletUniqueSchedulerScheduledV3 extends Struct {
readonly maybeId: Option<U8aFixed>;
readonly priority: u8;
readonly call: FrameSupportScheduleMaybeHashed;
@@ -2864,8 +2864,8 @@
/** @name SpCoreVoid (350) */
export type SpCoreVoid = Null;
- /** @name PalletUnqSchedulerError (351) */
- export interface PalletUnqSchedulerError extends Enum {
+ /** @name PalletUniqueSchedulerError (351) */
+ export interface PalletUniqueSchedulerError extends Enum {
readonly isFailedToSchedule: boolean;
readonly isNotFound: boolean;
readonly isTargetBlockNumberInPast: boolean;
tests/src/nesting/properties.test.tsdiffbeforeafterboth--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -106,6 +106,58 @@
});
});
+ it('Check valid names for collection properties keys', async () => {
+ await usingApi(async api => {
+ const events = await executeTransaction(api, bob, api.tx.unique.createCollectionEx({mode: 'NFT'}));
+ const {collectionId} = getCreateCollectionResult(events);
+
+ // alpha symbols
+ await expect(executeTransaction(
+ api,
+ bob,
+ api.tx.unique.setCollectionProperties(collectionId, [{key: 'alpha'}]),
+ )).to.not.be.rejected;
+
+ // numeric symbols
+ await expect(executeTransaction(
+ api,
+ bob,
+ api.tx.unique.setCollectionProperties(collectionId, [{key: '123'}]),
+ )).to.not.be.rejected;
+
+ // underscore symbol
+ await expect(executeTransaction(
+ api,
+ bob,
+ api.tx.unique.setCollectionProperties(collectionId, [{key: 'black_hole'}]),
+ )).to.not.be.rejected;
+
+ // dash symbol
+ await expect(executeTransaction(
+ api,
+ bob,
+ api.tx.unique.setCollectionProperties(collectionId, [{key: 'semi-automatic'}]),
+ )).to.not.be.rejected;
+
+ // underscore symbol
+ await expect(executeTransaction(
+ api,
+ bob,
+ api.tx.unique.setCollectionProperties(collectionId, [{key: 'build.rs'}]),
+ )).to.not.be.rejected;
+
+ const propertyKeys = ['alpha', '123', 'black_hole', 'semi-automatic', 'build.rs'];
+ const properties = (await api.rpc.unique.collectionProperties(collectionId, propertyKeys)).toHuman();
+ expect(properties).to.be.deep.equal([
+ {key: 'alpha', value: ''},
+ {key: '123', value: ''},
+ {key: 'black_hole', value: ''},
+ {key: 'semi-automatic', value: ''},
+ {key: 'build.rs', value: ''},
+ ]);
+ });
+ });
+
it('Changes properties of a collection', async () => {
await usingApi(async api => {
const collection = await createCollectionExpectSuccess();
@@ -241,7 +293,7 @@
const invalidProperties = [
[{key: 'electron', value: 'negative'}, {key: 'string theory', value: 'understandable'}],
- [{key: 'Mr.Sandman', value: 'Bring me a gene'}],
+ [{key: 'Mr/Sandman', value: 'Bring me a gene'}],
[{key: 'déjà vu', value: 'hmm...'}],
];
tests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -118,11 +118,17 @@
const bob = privateKeyWrapper('//Bob');
const charlie = privateKeyWrapper('//Charlie');
+ const addBobAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
+ await submitTransactionAsync(alice, addBobAdminTx);
+ const addCharlieAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(charlie.address));
+ await submitTransactionAsync(alice, addCharlieAdminTx);
+
const adminListAfterAddAdmin = await getAdminList(api, collectionId);
expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
+ expect(adminListAfterAddAdmin).to.be.deep.contains(normalizeAccountId(charlie.address));
const removeAdminTx = api.tx.unique.removeCollectionAdmin(collectionId, normalizeAccountId(bob.address));
- await expect(submitTransactionAsync(charlie, removeAdminTx)).to.be.rejected;
+ await expect(submitTransactionExpectFailAsync(charlie, removeAdminTx)).to.be.rejected;
const adminListAfterRemoveAdmin = await getAdminList(api, collectionId);
expect(adminListAfterRemoveAdmin).to.be.deep.contains(normalizeAccountId(bob.address));
tests/src/setCollectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionLimits.test.ts
+++ b/tests/src/setCollectionLimits.test.ts
@@ -46,6 +46,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
collectionIdForTesting = await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
});
});
@@ -115,6 +116,21 @@
});
});
+ it('execute setCollectionLimits from admin collection', async () => {
+ await addCollectionAdminExpectSuccess(alice, collectionIdForTesting, bob.address);
+ await usingApi(async (api: ApiPromise) => {
+ tx = api.tx.unique.setCollectionLimits(
+ collectionIdForTesting,
+ {
+ accountTokenOwnershipLimit,
+ sponsoredDataSize,
+ // sponsoredMintSize,
+ tokenLimit,
+ },
+ );
+ await expect(submitTransactionAsync(bob, tx)).to.be.not.rejected;
+ });
+ });
});
describe('setCollectionLimits negative', () => {
@@ -143,21 +159,6 @@
});
});
it('execute setCollectionLimits from user who is not owner of this collection', async () => {
- await usingApi(async (api: ApiPromise) => {
- tx = api.tx.unique.setCollectionLimits(
- collectionIdForTesting,
- {
- accountTokenOwnershipLimit,
- sponsoredDataSize,
- // sponsoredMintSize,
- tokenLimit,
- },
- );
- await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
- });
- });
- it('execute setCollectionLimits from admin collection', async () => {
- await addCollectionAdminExpectSuccess(alice, collectionIdForTesting, bob.address);
await usingApi(async (api: ApiPromise) => {
tx = api.tx.unique.setCollectionLimits(
collectionIdForTesting,
tests/src/setCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionSponsor.test.ts
+++ b/tests/src/setCollectionSponsor.test.ts
@@ -65,6 +65,11 @@
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await setCollectionSponsorExpectSuccess(collectionId, charlie.address);
});
+ it('Collection admin add sponsor', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
+ await setCollectionSponsorExpectSuccess(collectionId, charlie.address, '//Bob');
+ });
});
describe('(!negative test!) integration test: ext. setCollectionSponsor():', () => {
@@ -93,10 +98,5 @@
const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
await setCollectionSponsorExpectFailure(collectionId, bob.address);
- });
- it('(!negative test!) Collection admin add sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess();
- await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- await setCollectionSponsorExpectFailure(collectionId, charlie.address, '//Bob');
});
});
tests/src/setMintPermission.test.tsdiffbeforeafterboth--- a/tests/src/setMintPermission.test.ts
+++ b/tests/src/setMintPermission.test.ts
@@ -67,6 +67,14 @@
await setMintPermissionExpectSuccess(alice, collectionId, false);
});
});
+
+ it('Collection admin success on set', async () => {
+ await usingApi(async () => {
+ const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
+ await setMintPermissionExpectSuccess(bob, collectionId, true);
+ });
+ });
});
describe('Negative Integration Test setMintPermission', () => {
@@ -100,14 +108,6 @@
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await enableAllowListExpectSuccess(alice, collectionId);
await setMintPermissionExpectFailure(bob, collectionId, true);
- });
-
- it('Collection admin fails on set', async () => {
- await usingApi(async () => {
- const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
- await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- await setMintPermissionExpectFailure(bob, collectionId, true);
- });
});
it('ensure non-allow-listed non-privileged address can\'t mint tokens', async () => {
tests/src/setPublicAccessMode.test.tsdiffbeforeafterboth--- a/tests/src/setPublicAccessMode.test.ts
+++ b/tests/src/setPublicAccessMode.test.ts
@@ -103,22 +103,23 @@
await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
});
});
-});
-describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
- before(async () => {
- await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper('//Alice');
- bob = privateKeyWrapper('//Bob');
- });
- });
it('setPublicAccessMode by collection admin', async () => {
await usingApi(async (api: ApiPromise) => {
// tslint:disable-next-line: no-bitwise
const collectionId = await createCollectionExpectSuccess();
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const tx = api.tx.unique.setCollectionPermissions(collectionId, {access: 'AllowList'});
- await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
+ await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.not.rejected;
+ });
+ });
+});
+
+describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
+ before(async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
});