difftreelog
feat external-internal api collection creation segreation
in: master
11 files changed
pallets/common/src/dispatch.rsdiffbeforeafterboth--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -36,6 +36,13 @@
},
error,
})?;
+ handle.check_is_internal().map_err(|error| DispatchErrorWithPostInfo {
+ post_info: PostDispatchInfo {
+ actual_weight: Some(dispatch_weight::<T>()),
+ pays_fee: Pays::Yes,
+ },
+ error,
+ })?;
let dispatched = T::CollectionDispatch::dispatch(handle);
let mut result = call(dispatched.as_dyn());
match &mut result {
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -316,8 +316,9 @@
}
fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {
+ // TODO possibly delete for the lack of transaction
collection
- .check_is_mutable()
+ .check_is_internal()
.map_err(dispatch_to_evm::<T>)?;
<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());
Ok(())
pallets/common/src/lib.rsdiffbeforeafterboth149 ))149 ))150 }150 }151 pub fn save(self) -> Result<(), DispatchError> {151 pub fn save(self) -> Result<(), DispatchError> {152 self.check_is_mutable()?;153 <CollectionById<T>>::insert(self.id, self.collection);152 <CollectionById<T>>::insert(self.id, self.collection);154 Ok(())153 Ok(())155 }154 }156155157 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {156 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {158 self.check_is_mutable()?;159 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);157 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);160 Ok(())158 Ok(())161 }159 }162160163 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {161 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {164 self.check_is_mutable()?;165166 if self.collection.sponsorship.pending_sponsor() != Some(sender) {162 if self.collection.sponsorship.pending_sponsor() != Some(sender) {167 return Ok(false);163 return Ok(false);171 Ok(true)167 Ok(true)172 }168 }173169174 /// Checks that collection is can be mutate.170 /// Checks that the collection was created with, and must be operated upon through **Unique API**.175 /// Now check only `external_collection` flag and if it **true**, than return `CollectionIsReadOnly` error.171 /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.176 pub fn check_is_mutable(&self) -> DispatchResult {172 pub fn check_is_internal(&self) -> DispatchResult {177 if self.external_collection {173 if self.external_collection {178 return Err(<Error<T>>::CollectionIsReadOnly)?;174 return Err(<Error<T>>::CollectionIsExternal)?;179 }175 }180176181 Ok(())177 Ok(())182 }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 }183}189}184190185impl<T: Config> Deref for CollectionHandle<T> {191impl<T: Config> Deref for CollectionHandle<T> {449 /// Empty property keys are forbidden455 /// Empty property keys are forbidden450 EmptyPropertyKey,456 EmptyPropertyKey,451457452 /// Collection is read only458 /// Tried to access an external collection with an internal API459 CollectionIsExternal,460461 /// Tried to access an internal collection with an external API453 CollectionIsReadOnly,462 CollectionIsInternal,454 }463 }455464456 #[pallet::storage]465 #[pallet::storage]754 pub fn init_collection(763 pub fn init_collection(755 owner: T::CrossAccountId,764 owner: T::CrossAccountId,756 data: CreateCollectionData<T::AccountId>,765 data: CreateCollectionData<T::AccountId>,766 is_external: bool,757 ) -> Result<CollectionId, DispatchError> {767 ) -> Result<CollectionId, DispatchError> {758 {768 {759 ensure!(769 ensure!(797 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)807 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)798 })808 })799 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,809 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,800 external_collection: false,810 external_collection: is_external,801 };811 };802812803 let mut collection_properties = up_data_structs::CollectionProperties::get();813 let mut collection_properties = up_data_structs::CollectionProperties::get();854 collection: CollectionHandle<T>,864 collection: CollectionHandle<T>,855 sender: &T::CrossAccountId,865 sender: &T::CrossAccountId,856 ) -> DispatchResult {866 ) -> DispatchResult {857 collection.check_is_mutable()?;858 ensure!(867 ensure!(859 collection.limits.owner_can_destroy(),868 collection.limits.owner_can_destroy(),860 <Error<T>>::NoPermission,869 <Error<T>>::NoPermission,884 sender: &T::CrossAccountId,893 sender: &T::CrossAccountId,885 property: Property,894 property: Property,886 ) -> DispatchResult {895 ) -> DispatchResult {887 collection.check_is_mutable()?;888 collection.check_is_owner_or_admin(sender)?;896 collection.check_is_owner_or_admin(sender)?;889897890 CollectionProperties::<T>::try_mutate(collection.id, |properties| {898 CollectionProperties::<T>::try_mutate(collection.id, |properties| {930 sender: &T::CrossAccountId,938 sender: &T::CrossAccountId,931 properties: Vec<Property>,939 properties: Vec<Property>,932 ) -> DispatchResult {940 ) -> DispatchResult {933 collection.check_is_mutable()?;934935 for property in properties {941 for property in properties {936 Self::set_collection_property(collection, sender, property)?;942 Self::set_collection_property(collection, sender, property)?;944 sender: &T::CrossAccountId,950 sender: &T::CrossAccountId,945 property_key: PropertyKey,951 property_key: PropertyKey,946 ) -> DispatchResult {952 ) -> DispatchResult {947 collection.check_is_mutable()?;948 collection.check_is_owner_or_admin(sender)?;953 collection.check_is_owner_or_admin(sender)?;949954950 CollectionProperties::<T>::try_mutate(collection.id, |properties| {955 CollectionProperties::<T>::try_mutate(collection.id, |properties| {966 sender: &T::CrossAccountId,971 sender: &T::CrossAccountId,967 property_keys: Vec<PropertyKey>,972 property_keys: Vec<PropertyKey>,968 ) -> DispatchResult {973 ) -> DispatchResult {969 collection.check_is_mutable()?;970971 for key in property_keys {974 for key in property_keys {972 Self::delete_collection_property(collection, sender, key)?;975 Self::delete_collection_property(collection, sender, key)?;992 sender: &T::CrossAccountId,995 sender: &T::CrossAccountId,993 property_permission: PropertyKeyPermission,996 property_permission: PropertyKeyPermission,994 ) -> DispatchResult {997 ) -> DispatchResult {995 collection.check_is_mutable()?;996 collection.check_is_owner_or_admin(sender)?;998 collection.check_is_owner_or_admin(sender)?;997999998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);1000 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);1024 sender: &T::CrossAccountId,1026 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1027 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1028 ) -> DispatchResult {1027 collection.check_is_mutable()?;10281029 for prop_pemission in property_permissions {1029 for prop_pemission in property_permissions {1030 Self::set_property_permission(collection, sender, prop_pemission)?;1030 Self::set_property_permission(collection, sender, prop_pemission)?;1113 user: &T::CrossAccountId,1113 user: &T::CrossAccountId,1114 allowed: bool,1114 allowed: bool,1115 ) -> DispatchResult {1115 ) -> DispatchResult {1116 collection.check_is_mutable()?;1117 collection.check_is_owner_or_admin(sender)?;1116 collection.check_is_owner_or_admin(sender)?;111811171119 // =========1118 // =========1133 user: &T::CrossAccountId,1132 user: &T::CrossAccountId,1134 admin: bool,1133 admin: bool,1135 ) -> DispatchResult {1134 ) -> DispatchResult {1136 collection.check_is_mutable()?;1137 collection.check_is_owner_or_admin(sender)?;1135 collection.check_is_owner_or_admin(sender)?;113811361139 let was_admin = <IsAdmin<T>>::get((collection.id, user));1137 let was_admin = <IsAdmin<T>>::get((collection.id, user));pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -137,7 +137,7 @@
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data)
+ <PalletCommon<T>>::init_collection(owner, data, false)
}
pub fn destroy_collection(
collection: FungibleHandle<T>,
@@ -168,8 +168,6 @@
owner: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
let total_supply = <TotalSupply<T>>::get(collection.id)
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -216,8 +214,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed,
@@ -287,8 +283,6 @@
data: BTreeMap<T::CrossAccountId, u128>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
if !collection.is_owner_or_admin(sender) {
ensure!(
collection.permissions.mint_mode(),
@@ -390,7 +384,6 @@
spender: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(owner)?;
collection.check_allowlist(spender)?;
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -304,8 +304,9 @@
pub fn init_collection(
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
+ is_external: bool,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data)
+ <PalletCommon<T>>::init_collection(owner, data, is_external)
}
pub fn destroy_collection(
collection: NonfungibleHandle<T>,
@@ -336,8 +337,6 @@
sender: &T::CrossAccountId,
token: TokenId,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
ensure!(
@@ -458,7 +457,6 @@
&property.key,
is_token_create,
)?;
- collection.check_is_mutable()?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
let property = property.clone();
@@ -496,7 +494,6 @@
token_id: TokenId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_mutable()?;
Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
@@ -574,8 +571,6 @@
token_id: TokenId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
for key in property_keys {
Self::delete_token_property(collection, sender, token_id, key)?;
}
@@ -622,8 +617,6 @@
token: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -902,8 +895,6 @@
token: TokenId,
spender: Option<&T::CrossAccountId>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
if let Some(spender) = spender {
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -235,6 +235,7 @@
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
<PalletNft<T>>::destroy_collection(collection, &cross_sender)
.map_err(Self::map_unique_err_to_proxy)?;
@@ -256,6 +257,9 @@
) -> DispatchResult {
let sender = ensure_signed(origin)?;
+ let collection = Self::get_nft_collection(Self::unique_collection_id(collection_id)?)?;
+ collection.check_is_external()?;
+
let new_issuer = T::Lookup::lookup(new_issuer)?;
Self::change_collection_owner(
@@ -287,6 +291,7 @@
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
Self::check_collection_owner(&collection, &cross_sender)?;
@@ -318,17 +323,18 @@
let sender = ensure_signed(origin)?;
let sender = T::CrossAccountId::from_sub(sender);
let cross_owner = T::CrossAccountId::from_sub(owner.clone());
-
- let royalty_info = royalty_amount.map(|amount| rmrk_traits::RoyaltyInfo {
- recipient: recipient.unwrap_or_else(|| owner.clone()),
- amount,
- });
let collection = Self::get_typed_nft_collection(
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
+ let royalty_info = royalty_amount.map(|amount| rmrk_traits::RoyaltyInfo {
+ recipient: recipient.unwrap_or_else(|| owner.clone()),
+ amount,
+ });
+
let nft_id = Self::create_nft(
&sender,
&cross_owner,
@@ -382,6 +388,12 @@
let sender = ensure_signed(origin)?;
let cross_sender = T::CrossAccountId::from_sub(sender.clone());
+ let collection = Self::get_typed_nft_collection(
+ Self::unique_collection_id(collection_id)?,
+ misc::CollectionType::Regular,
+ )?;
+ collection.check_is_external()?;
+
Self::destroy_nft(
cross_sender,
Self::unique_collection_id(collection_id)?,
@@ -411,13 +423,14 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let token_data =
<TokenData<T>>::get((collection_id, nft_id)).ok_or(<Error<T>>::NoAvailableNftId)?;
let from = token_data.owner;
-
- let collection =
- Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
ensure!(
Self::get_nft_property_decoded(collection_id, nft_id, RmrkProperty::Transferable)?,
@@ -516,6 +529,7 @@
let collection =
Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let new_cross_owner = match new_owner {
RmrkAccountIdOrCollectionNftTuple::AccountId(ref account_id) => {
@@ -581,6 +595,10 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
Self::destroy_nft(cross_sender, collection_id, nft_id).map_err(|err| {
if err == <CommonError<T>>::NoPermission.into()
|| err == <CommonError<T>>::ApprovedValueTooLow.into()
@@ -613,6 +631,9 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)
.map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let nft_id = rmrk_nft_id.into();
let resource_id = rmrk_resource_id.into();
@@ -666,6 +687,9 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)
.map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let nft_id = rmrk_nft_id.into();
let resource_id = rmrk_resource_id.into();
@@ -720,6 +744,10 @@
let sender = T::CrossAccountId::from_sub(sender);
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let budget = budget::Value::new(NESTING_BUDGET);
match maybe_nft_id {
@@ -775,6 +803,11 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let budget = budget::Value::new(NESTING_BUDGET);
Self::ensure_nft_type(collection_id, nft_id, NftType::Regular)?;
@@ -799,15 +832,20 @@
#[transactional]
pub fn add_basic_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource: RmrkBasicResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -831,16 +869,21 @@
#[transactional]
pub fn add_composable_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
_resource_id: RmrkBoundedResource,
resource: RmrkComposableResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -866,15 +909,20 @@
#[transactional]
pub fn add_slot_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource: RmrkSlotResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -900,18 +948,18 @@
#[transactional]
pub fn remove_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource_id: RmrkResourceId,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
- Self::resource_remove(
- sender,
- Self::unique_collection_id(collection_id)?,
- nft_id.into(),
- resource_id.into(),
- )?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
+ Self::resource_remove(sender, collection_id, nft_id.into(), resource_id.into())?;
Self::deposit_event(Event::ResourceRemoval {
nft_id,
@@ -968,7 +1016,7 @@
data: CreateCollectionData<T::AccountId>,
properties: impl Iterator<Item = Property>,
) -> Result<CollectionId, DispatchError> {
- let collection_id = <PalletNft<T>>::init_collection(sender, data);
+ let collection_id = <PalletNft<T>>::init_collection(sender, data, true);
if let Err(DispatchError::Arithmetic(_)) = &collection_id {
return Err(<Error<T>>::NoAvailableCollectionId.into());
pallets/proxy-rmrk-equip/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-equip/src/lib.rs
+++ b/pallets/proxy-rmrk-equip/src/lib.rs
@@ -94,7 +94,8 @@
..Default::default()
};
- let collection_id_res = <PalletNft<T>>::init_collection(cross_sender.clone(), data);
+ let collection_id_res =
+ <PalletNft<T>>::init_collection(cross_sender.clone(), data, true);
if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {
return Err(<Error<T>>::NoAvailableBaseId.into());
@@ -155,6 +156,7 @@
misc::CollectionType::Base,
)
.map_err(|_| <Error<T>>::BaseDoesntExist)?;
+ collection.check_is_external()?;
if theme.name.as_slice() == b"default" {
<BaseHasDefaultTheme<T>>::insert(collection_id, true);
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -200,7 +200,7 @@
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data)
+ <PalletCommon<T>>::init_collection(owner, data, false)
}
pub fn destroy_collection(
collection: RefungibleHandle<T>,
@@ -234,7 +234,6 @@
}
pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {
- collection.check_is_mutable()?;
let burnt = <TokensBurnt<T>>::get(collection.id)
.checked_add(1)
.ok_or(ArithmeticError::Overflow)?;
@@ -254,7 +253,6 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
let total_supply = <TotalSupply<T>>::get((collection.id, token))
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -327,7 +325,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -576,7 +573,6 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
collection.check_allowlist(spender)?;
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -92,8 +92,9 @@
..Default::default()
};
- let collection_id = <pallet_nonfungible::Pallet<T>>::init_collection(caller.clone(), data)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+ let collection_id =
+ <pallet_nonfungible::Pallet<T>>::init_collection(caller.clone(), data, false)
+ .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
let address = pallet_common::eth::collection_id_to_address(collection_id);
Ok(address)
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -304,7 +304,7 @@
pub fn destroy_collection(origin, collection_id: CollectionId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
- collection.check_is_mutable()?;
+ collection.check_is_internal()?;
// =========
@@ -339,6 +339,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<PalletCommon<T>>::toggle_allowlist(
&collection,
@@ -373,6 +374,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<PalletCommon<T>>::toggle_allowlist(
&collection,
@@ -407,7 +409,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.check_is_mutable()?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
target_collection.owner = new_owner.clone();
@@ -437,6 +439,7 @@
pub fn add_collection_admin(origin, collection_id: CollectionId, new_admin_id: T::CrossAccountId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionAdminAdded(
collection_id,
@@ -463,6 +466,7 @@
pub fn remove_collection_admin(origin, collection_id: CollectionId, account_id: T::CrossAccountId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionAdminRemoved(
collection_id,
@@ -488,6 +492,7 @@
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_owner(&sender)?;
+ target_collection.check_is_internal()?;
target_collection.set_sponsor(new_sponsor.clone())?;
@@ -512,6 +517,7 @@
let sender = ensure_signed(origin)?;
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
ensure!(
target_collection.confirm_sponsorship(&sender)?,
Error::<T>::ConfirmUnsetSponsorFail
@@ -540,6 +546,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.sponsorship = SponsorshipState::Disabled;
@@ -704,6 +711,7 @@
pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {
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)?;
// =========
@@ -858,6 +866,7 @@
) -> DispatchResult {
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)?;
let old_limit = &target_collection.limits;
@@ -879,6 +888,7 @@
) -> DispatchResult {
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)?;
let old_limit = &target_collection.permissions;
runtime/common/src/dispatch.rsdiffbeforeafterboth--- a/runtime/common/src/dispatch.rs
+++ b/runtime/common/src/dispatch.rs
@@ -35,7 +35,7 @@
data: CreateCollectionData<T::AccountId>,
) -> DispatchResult {
let _id = match data.mode {
- CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data)?,
+ CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data, false)?,
CollectionMode::Fungible(decimal_points) => {
// check params
ensure!(