git.delta.rocks / unique-network / refs/commits / 1eed41e9dfea

difftreelog

fix restore foreign flag, minor fixes

Daniel Shiposha2023-10-19parent: #56fde60.patch.diff
in: master

11 files changed

modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -121,7 +121,7 @@
 		owner,
 		CollectionMode::NFT,
 		|owner: T::CrossAccountId, data| {
-			<Pallet<T>>::init_collection(owner.clone(), Some(owner), data)
+			<Pallet<T>>::init_collection(owner.clone(), Some(owner), false, data)
 		},
 		|h| h,
 	)
modifiedpallets/common/src/dispatch.rsdiffbeforeafterboth
--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -78,6 +78,21 @@
 		sender: T::CrossAccountId,
 		payer: Option<T::CrossAccountId>,
 		data: CreateCollectionData<T::CrossAccountId>,
+	) -> Result<CollectionId, DispatchError> {
+		Self::create_internal(sender, payer, false, data)
+	}
+
+	/// Create a collection. The collection will be created according to the value of [`data.mode`](CreateCollectionData::mode).
+	///
+	/// * `sender` - The user who will become the owner of the collection.
+	/// * `payer` - If set, the user who pays the collection creation deposit.
+	/// * `data` - Description of the created collection.
+	/// * `is_special_collection` -- Whether this collection is a system one, i.e. can have special flags set.
+	fn create_internal(
+		sender: T::CrossAccountId,
+		payer: Option<T::CrossAccountId>,
+		is_special_collection: bool,
+		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError>;
 
 	/// Delete the collection.
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1088,6 +1088,7 @@
 			read_only: flags.external,
 
 			flags: RpcCollectionFlags {
+				foreign: flags.foreign,
 				erc721metadata: flags.erc721metadata,
 			},
 		})
@@ -1129,12 +1130,16 @@
 	/// * `owner` - The owner of the collection.
 	/// * `payer` - If set, the user that will pay a deposit for the collection creation.
 	/// * `data` - Description of the created collection.
+	/// * `is_special_collection` -- Whether this collection is a special one, i.e. can have special flags set.
 	pub fn init_collection(
 		owner: T::CrossAccountId,
 		payer: Option<T::CrossAccountId>,
+		is_special_collection: bool,
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
-		ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
+		if !is_special_collection {
+			ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
+		}
 
 		// Take a (non-refundable) deposit of collection creation
 		if let Some(payer) = payer {
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -153,9 +153,11 @@
 				.expect("description length < max description length; qed");
 
 			let payer = None;
-			let collection_id = T::CollectionDispatch::create(
+			let is_special_collection = true;
+			let collection_id = T::CollectionDispatch::create_internal(
 				foreign_collection_owner,
 				payer,
+				is_special_collection,
 				CreateCollectionData {
 					name,
 					description,
modifiedpallets/fungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -31,7 +31,7 @@
 		owner,
 		CollectionMode::Fungible(0),
 		|owner: T::CrossAccountId, data| {
-			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)
+			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
 		},
 		FungibleHandle::cast,
 	)
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
before · pallets/nonfungible/src/benchmarking.rs
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/>.1617use frame_benchmarking::v2::{account, benchmarks, BenchmarkError};18use pallet_common::{19	bench_init,20	benchmarking::{create_collection_raw, property_key, property_value},21	Pallet as PalletCommon,22};23use sp_std::prelude::*;24use up_data_structs::{25	budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,26	MAX_PROPERTIES_PER_ITEM,27};2829use super::*;30use crate::{Config, NonfungibleHandle, Pallet};3132const SEED: u32 = 1;3334fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {35	CreateItemData::<T> {36		owner,37		properties: Default::default(),38	}39}40fn create_max_item<T: Config>(41	collection: &NonfungibleHandle<T>,42	sender: &T::CrossAccountId,43	owner: T::CrossAccountId,44) -> Result<TokenId, DispatchError> {45	<Pallet<T>>::create_item(46		collection,47		sender,48		create_max_item_data::<T>(owner),49		&Unlimited,50	)?;51	Ok(TokenId(<TokensMinted<T>>::get(collection.id)))52}5354fn create_collection<T: Config>(55	owner: T::CrossAccountId,56) -> Result<NonfungibleHandle<T>, DispatchError> {57	create_collection_raw(58		owner,59		CollectionMode::NFT,60		|owner: T::CrossAccountId, data| {61			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)62		},63		NonfungibleHandle::cast,64	)65}6667#[benchmarks]68mod benchmarks {69	use super::*;7071	#[benchmark]72	fn create_item() -> Result<(), BenchmarkError> {73		bench_init! {74			owner: sub; collection: collection(owner);75			sender: cross_from_sub(owner); to: cross_sub;76		};7778		#[block]79		{80			create_max_item(&collection, &sender, to)?;81		}8283		Ok(())84	}8586	#[benchmark]87	fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {88		bench_init! {89			owner: sub; collection: collection(owner);90			sender: cross_from_sub(owner); to: cross_sub;91		};92		let data = (0..b)93			.map(|_| create_max_item_data::<T>(to.clone()))94			.collect();9596		#[block]97		{98			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;99		}100101		Ok(())102	}103104	#[benchmark]105	fn create_multiple_items_ex(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {106		bench_init! {107			owner: sub; collection: collection(owner);108			sender: cross_from_sub(owner);109		};110		let data = (0..b)111			.map(|i| {112				bench_init!(to: cross_sub(i););113				create_max_item_data::<T>(to)114			})115			.collect();116117		#[block]118		{119			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;120		}121122		Ok(())123	}124125	#[benchmark]126	fn burn_item() -> Result<(), BenchmarkError> {127		bench_init! {128			owner: sub; collection: collection(owner);129			sender: cross_from_sub(owner); burner: cross_sub;130		};131		let item = create_max_item(&collection, &sender, burner.clone())?;132133		#[block]134		{135			<Pallet<T>>::burn(&collection, &burner, item)?;136		}137138		Ok(())139	}140141	#[benchmark]142	fn transfer_raw() -> Result<(), BenchmarkError> {143		bench_init! {144			owner: sub; collection: collection(owner);145			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;146		};147		let item = create_max_item(&collection, &owner, sender.clone())?;148149		#[block]150		{151			<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?;152		}153154		Ok(())155	}156157	#[benchmark]158	fn approve() -> Result<(), BenchmarkError> {159		bench_init! {160			owner: sub; collection: collection(owner);161			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;162		};163		let item = create_max_item(&collection, &owner, sender.clone())?;164165		#[block]166		{167			<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;168		}169170		Ok(())171	}172173	#[benchmark]174	fn approve_from() -> Result<(), BenchmarkError> {175		bench_init! {176			owner: sub; collection: collection(owner);177			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;178		};179		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());180		let item = create_max_item(&collection, &owner, owner_eth.clone())?;181182		#[block]183		{184			<Pallet<T>>::set_allowance_from(185				&collection,186				&sender,187				&owner_eth,188				item,189				Some(&spender),190			)?;191		}192193		Ok(())194	}195196	#[benchmark]197	fn check_allowed_raw() -> Result<(), BenchmarkError> {198		bench_init! {199			owner: sub; collection: collection(owner);200			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;201		};202		let item = create_max_item(&collection, &owner, sender.clone())?;203		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;204205		#[block]206		{207			<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?;208		}209210		Ok(())211	}212213	#[benchmark]214	fn burn_from() -> Result<(), BenchmarkError> {215		bench_init! {216			owner: sub; collection: collection(owner);217			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;218		};219		let item = create_max_item(&collection, &owner, sender.clone())?;220		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;221222		#[block]223		{224			<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?;225		}226227		Ok(())228	}229230	#[benchmark]231	fn load_token_properties() -> Result<(), BenchmarkError> {232		bench_init! {233			owner: sub; collection: collection(owner);234			owner: cross_from_sub;235		};236237		let item = create_max_item(&collection, &owner, owner.clone())?;238239		#[block]240		{241			pallet_common::BenchmarkPropertyWriter::<T>::load_token_properties(&collection, item);242		}243244		Ok(())245	}246247	#[benchmark]248	fn write_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {249		bench_init! {250			owner: sub; collection: collection(owner);251			owner: cross_from_sub;252		};253254		let perms = (0..b)255			.map(|k| PropertyKeyPermission {256				key: property_key(k as usize),257				permission: PropertyPermission {258					mutable: false,259					collection_admin: true,260					token_owner: true,261				},262			})263			.collect::<Vec<_>>();264		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;265		let props = (0..b)266			.map(|k| Property {267				key: property_key(k as usize),268				value: property_value(),269			})270			.collect::<Vec<_>>();271		let item = create_max_item(&collection, &owner, owner.clone())?;272273		let lazy_collection_info =274			pallet_common::BenchmarkPropertyWriter::<T>::load_collection_info(&collection, &owner);275276		#[block]277		{278			let mut property_writer =279				pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);280281			property_writer.write_token_properties(282				item,283				props.into_iter(),284				crate::erc::ERC721TokenEvent::TokenChanged {285					token_id: item.into(),286				}287				.to_log(T::ContractAddress::get()),288			)?;289		}290291		Ok(())292	}293294	#[benchmark]295	fn set_token_property_permissions(296		b: Linear<0, MAX_PROPERTIES_PER_ITEM>,297	) -> Result<(), BenchmarkError> {298		bench_init! {299			owner: sub; collection: collection(owner);300			owner: cross_from_sub;301		};302		let perms = (0..b)303			.map(|k| PropertyKeyPermission {304				key: property_key(k as usize),305				permission: PropertyPermission {306					mutable: false,307					collection_admin: false,308					token_owner: false,309				},310			})311			.collect::<Vec<_>>();312313		#[block]314		{315			<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;316		}317318		Ok(())319	}320321	#[benchmark]322	fn set_allowance_for_all() -> Result<(), BenchmarkError> {323		bench_init! {324			owner: sub; collection: collection(owner); owner: cross_from_sub;325			operator: cross_sub;326		};327328		#[block]329		{330			<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;331		}332333		Ok(())334	}335336	#[benchmark]337	fn allowance_for_all() -> Result<(), BenchmarkError> {338		bench_init! {339			owner: sub; collection: collection(owner); owner: cross_from_sub;340			operator: cross_sub;341		};342343		#[block]344		{345			<Pallet<T>>::allowance_for_all(&collection, &owner, &operator);346		}347348		Ok(())349	}350351	#[benchmark]352	fn repair_item() -> Result<(), BenchmarkError> {353		bench_init! {354			owner: sub; collection: collection(owner);355			owner: cross_from_sub;356		};357		let item = create_max_item(&collection, &owner, owner.clone())?;358359		#[block]360		{361			<Pallet<T>>::repair_item(&collection, item)?;362		}363364		Ok(())365	}366}
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -20,6 +20,7 @@
 use pallet_common::{
 	bench_init,
 	benchmarking::{create_collection_raw, property_key, property_value},
+	Pallet as PalletCommon,
 };
 use sp_std::prelude::*;
 use up_data_structs::{
@@ -61,7 +62,9 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::ReFungible,
-		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+		|owner: T::CrossAccountId, data| {
+			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
+		},
 		RefungibleHandle::cast,
 	)
 }
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -103,7 +103,7 @@
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
 use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
 use up_data_structs::{
-	budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,
+	budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId,
 	CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,
 	PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,
 	TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES,
@@ -296,19 +296,6 @@
 
 // unchecked calls skips any permission checks
 impl<T: Config> Pallet<T> {
-	/// Create RFT collection
-	///
-	/// `init_collection` will take non-refundable deposit for collection creation.
-	///
-	/// - `data`: Contains settings for collection limits and permissions.
-	pub fn init_collection(
-		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
-		data: CreateCollectionData<T::CrossAccountId>,
-	) -> Result<CollectionId, DispatchError> {
-		<PalletCommon<T>>::init_collection(owner, Some(payer), data)
-	}
-
 	/// Destroy RFT collection
 	///
 	/// `destroy_collection` will throw error if collection contains any tokens.
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -380,7 +380,7 @@
 pub struct CollectionFlags {
 	/// Reserved flag
 	#[bondrewd(bits = "0..1")]
-	pub reserved_0: bool,
+	pub foreign: bool,
 	/// Supports ERC721Metadata
 	#[bondrewd(bits = "1..2")]
 	pub erc721metadata: bool,
@@ -395,7 +395,7 @@
 
 impl CollectionFlags {
 	pub fn is_allowed_for_user(self) -> bool {
-		!self.reserved_0 && !self.external && self.reserved == 0
+		!self.foreign && !self.external && self.reserved == 0
 	}
 }
 
@@ -461,6 +461,8 @@
 
 #[derive(Debug, Encode, Decode, Clone, PartialEq, TypeInfo, Serialize, Deserialize)]
 pub struct RpcCollectionFlags {
+	/// Is collection is foreign.
+	pub foreign: bool,
 	/// Collection supports ERC721Metadata.
 	pub erc721metadata: bool,
 }
@@ -503,7 +505,7 @@
 	pub read_only: bool,
 
 	/// Extra collection flags
-	#[version(2.., upper(RpcCollectionFlags {erc721metadata: false}))]
+	#[version(2.., upper(RpcCollectionFlags {foreign: false, erc721metadata: false}))]
 	pub flags: RpcCollectionFlags,
 }
 
@@ -540,6 +542,7 @@
 			read_only: true,
 
 			flags: RpcCollectionFlags {
+				foreign: false,
 				erc721metadata: false,
 			},
 		}
modifiedruntime/common/config/pallets/foreign_asset.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/foreign_asset.rs
+++ b/runtime/common/config/pallets/foreign_asset.rs
@@ -1,4 +1,6 @@
 use frame_support::{parameter_types, PalletId};
+#[cfg(not(feature = "governance"))]
+use frame_system::EnsureRoot;
 use pallet_evm::account::CrossAccountId;
 use sp_core::H160;
 use staging_xcm::prelude::*;
@@ -6,10 +8,6 @@
 
 #[cfg(feature = "governance")]
 use crate::runtime_common::config::governance;
-
-#[cfg(not(feature = "governance"))]
-use frame_system::EnsureRoot;
-
 use crate::{
 	runtime_common::config::{
 		ethereum::CrossAccountId as ConfigCrossAccountId,
modifiedruntime/common/dispatch.rsdiffbeforeafterboth
--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -66,9 +66,10 @@
 		}
 	}
 
-	fn create(
+	fn create_internal(
 		sender: T::CrossAccountId,
 		payer: Option<T::CrossAccountId>,
+		is_special_collection: bool,
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
 		match data.mode {
@@ -86,7 +87,7 @@
 			_ => {}
 		};
 
-		<PalletCommon<T>>::init_collection(sender, payer, data)
+		<PalletCommon<T>>::init_collection(sender, payer, is_special_collection, data)
 	}
 
 	fn destroy(sender: T::CrossAccountId, collection_id: CollectionId) -> DispatchResult {