git.delta.rocks / unique-network / refs/commits / e4de689ce26b

difftreelog

feat impl dispatchable methods

Trubnikov Sergey2023-04-26parent: #82643c5.patch.diff
in: master

5 files changed

modifiedpallets/balances-adapter/src/common.rsdiffbeforeafterboth
after · pallets/balances-adapter/src/common.rs
1use alloc::{vec, vec::Vec};2use core::marker::PhantomData;3use crate::{Config, NativeFungibleHandle};4use frame_support::{5	traits::{Currency, ExistenceRequirement},6	fail,7};8use pallet_common::{erc::CrossAccountId, CommonCollectionOperations, CommonWeightInfo, with_weight};9use up_data_structs::TokenId;1011pub struct CommonWeights<T: Config>(PhantomData<T>);12impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {13	fn create_multiple_items(14		amount: &[up_data_structs::CreateItemData],15	) -> frame_support::weights::Weight {16		todo!()17	}1819	fn create_multiple_items_ex(20		cost: &up_data_structs::CreateItemExData<T::CrossAccountId>,21	) -> frame_support::weights::Weight {22		todo!()23	}2425	fn burn_item() -> frame_support::weights::Weight {26		todo!()27	}2829	fn set_collection_properties(amount: u32) -> frame_support::weights::Weight {30		todo!()31	}3233	fn delete_collection_properties(amount: u32) -> frame_support::weights::Weight {34		todo!()35	}3637	fn set_token_properties(amount: u32) -> frame_support::weights::Weight {38		todo!()39	}4041	fn delete_token_properties(amount: u32) -> frame_support::weights::Weight {42		todo!()43	}4445	fn set_token_property_permissions(amount: u32) -> frame_support::weights::Weight {46		todo!()47	}4849	fn transfer() -> frame_support::weights::Weight {50		todo!()51	}5253	fn approve() -> frame_support::weights::Weight {54		todo!()55	}5657	fn approve_from() -> frame_support::weights::Weight {58		todo!()59	}6061	fn transfer_from() -> frame_support::weights::Weight {62		todo!()63	}6465	fn burn_from() -> frame_support::weights::Weight {66		todo!()67	}6869	fn burn_recursively_self_raw() -> frame_support::weights::Weight {70		todo!()71	}7273	fn burn_recursively_breadth_raw(amount: u32) -> frame_support::weights::Weight {74		todo!()75	}7677	fn token_owner() -> frame_support::weights::Weight {78		todo!()79	}8081	fn set_allowance_for_all() -> frame_support::weights::Weight {82		todo!()83	}8485	fn force_repair_item() -> frame_support::weights::Weight {86		todo!()87	}88}8990/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete91/// methods and adds weight info.92impl<T: Config> CommonCollectionOperations<T> for NativeFungibleHandle<T> {93	fn create_item(94		&self,95		sender: <T>::CrossAccountId,96		to: <T>::CrossAccountId,97		data: up_data_structs::CreateItemData,98		nesting_budget: &dyn up_data_structs::budget::Budget,99	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {100		fail!(<pallet_common::Error<T>>::UnsupportedOperation);101	}102103	fn create_multiple_items(104		&self,105		sender: <T>::CrossAccountId,106		to: <T>::CrossAccountId,107		data: Vec<up_data_structs::CreateItemData>,108		nesting_budget: &dyn up_data_structs::budget::Budget,109	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {110		fail!(<pallet_common::Error<T>>::UnsupportedOperation);111	}112113	fn create_multiple_items_ex(114		&self,115		sender: <T>::CrossAccountId,116		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,117		nesting_budget: &dyn up_data_structs::budget::Budget,118	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {119		fail!(<pallet_common::Error<T>>::UnsupportedOperation);120	}121122	fn burn_item(123		&self,124		sender: <T>::CrossAccountId,125		token: TokenId,126		amount: u128,127	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {128		fail!(<pallet_common::Error<T>>::UnsupportedOperation);129	}130131	fn burn_item_recursively(132		&self,133		sender: <T>::CrossAccountId,134		token: TokenId,135		self_budget: &dyn up_data_structs::budget::Budget,136		breadth_budget: &dyn up_data_structs::budget::Budget,137	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {138		fail!(<pallet_common::Error<T>>::UnsupportedOperation);139	}140141	fn set_collection_properties(142		&self,143		sender: <T>::CrossAccountId,144		properties: Vec<up_data_structs::Property>,145	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {146		fail!(<pallet_common::Error<T>>::UnsupportedOperation);147	}148149	fn delete_collection_properties(150		&self,151		sender: &<T>::CrossAccountId,152		property_keys: Vec<up_data_structs::PropertyKey>,153	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {154		fail!(<pallet_common::Error<T>>::UnsupportedOperation);155	}156157	fn set_token_properties(158		&self,159		sender: <T>::CrossAccountId,160		token_id: TokenId,161		properties: Vec<up_data_structs::Property>,162		budget: &dyn up_data_structs::budget::Budget,163	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {164		fail!(<pallet_common::Error<T>>::UnsupportedOperation);165	}166167	fn delete_token_properties(168		&self,169		sender: <T>::CrossAccountId,170		token_id: TokenId,171		property_keys: Vec<up_data_structs::PropertyKey>,172		budget: &dyn up_data_structs::budget::Budget,173	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {174		fail!(<pallet_common::Error<T>>::UnsupportedOperation);175	}176177	fn set_token_property_permissions(178		&self,179		sender: &<T>::CrossAccountId,180		property_permissions: Vec<up_data_structs::PropertyKeyPermission>,181	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {182		fail!(<pallet_common::Error<T>>::UnsupportedOperation);183	}184185	fn transfer(186		&self,187		sender: <T>::CrossAccountId,188		to: <T>::CrossAccountId,189		token: TokenId,190		amount: u128,191		budget: &dyn up_data_structs::budget::Budget,192	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {193		with_weight(194			<T as Config>::Currency::transfer(195				sender.as_sub(),196				to.as_sub(),197				amount.into(),198				ExistenceRequirement::KeepAlive,199			),200			Default::default(),201		)202	}203204	fn approve(205		&self,206		sender: <T>::CrossAccountId,207		spender: <T>::CrossAccountId,208		token: TokenId,209		amount: u128,210	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {211		fail!(<pallet_common::Error<T>>::UnsupportedOperation);212	}213214	fn approve_from(215		&self,216		sender: <T>::CrossAccountId,217		from: <T>::CrossAccountId,218		to: <T>::CrossAccountId,219		token: TokenId,220		amount: u128,221	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {222		fail!(<pallet_common::Error<T>>::UnsupportedOperation);223	}224225	fn transfer_from(226		&self,227		sender: <T>::CrossAccountId,228		from: <T>::CrossAccountId,229		to: <T>::CrossAccountId,230		token: TokenId,231		amount: u128,232		budget: &dyn up_data_structs::budget::Budget,233	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {234		with_weight(235			<T as Config>::Currency::transfer(236				sender.as_sub(),237				to.as_sub(),238				amount.into(),239				ExistenceRequirement::KeepAlive,240			),241			Default::default(),242		)243	}244245	fn burn_from(246		&self,247		sender: <T>::CrossAccountId,248		from: <T>::CrossAccountId,249		token: TokenId,250		amount: u128,251		budget: &dyn up_data_structs::budget::Budget,252	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {253		fail!(<pallet_common::Error<T>>::UnsupportedOperation);254	}255256	fn check_nesting(257		&self,258		sender: <T>::CrossAccountId,259		from: (up_data_structs::CollectionId, TokenId),260		under: TokenId,261		budget: &dyn up_data_structs::budget::Budget,262	) -> frame_support::sp_runtime::DispatchResult {263		fail!(<pallet_common::Error<T>>::UnsupportedOperation);264	}265266	fn nest(&self, under: TokenId, to_nest: (up_data_structs::CollectionId, TokenId)) {}267268	fn unnest(&self, under: TokenId, to_nest: (up_data_structs::CollectionId, TokenId)) {}269270	fn account_tokens(&self, account: <T>::CrossAccountId) -> Vec<TokenId> {271		let balance = <T as Config>::Currency::total_balance(account.as_sub());272		if balance != 0 {273			vec![TokenId::default()]274		} else {275			vec![]276		}277	}278279	fn collection_tokens(&self) -> Vec<TokenId> {280		vec![TokenId::default()]281	}282283	fn token_exists(&self, token: TokenId) -> bool {284		token == TokenId::default()285	}286287	fn last_token_id(&self) -> TokenId {288		TokenId::default()289	}290291	fn token_owner(292		&self,293		token: TokenId,294	) -> Result<<T>::CrossAccountId, up_data_structs::TokenOwnerError> {295		Err(up_data_structs::TokenOwnerError::MultipleOwners)296	}297298	fn token_owners(&self, token: TokenId) -> Vec<<T>::CrossAccountId> {299		vec![]300	}301302	fn token_property(303		&self,304		token_id: TokenId,305		key: &up_data_structs::PropertyKey,306	) -> Option<up_data_structs::PropertyValue> {307		None308	}309310	fn token_properties(311		&self,312		token: TokenId,313		keys: Option<Vec<up_data_structs::PropertyKey>>,314	) -> Vec<up_data_structs::Property> {315		vec![]316	}317318	fn total_supply(&self) -> u32 {319		1320	}321322	fn account_balance(&self, account: <T>::CrossAccountId) -> u32 {323		let balance: u128 = <T as Config>::Currency::free_balance(account.as_sub()).into();324		(balance != 0).into()325	}326327	fn balance(&self, account: <T>::CrossAccountId, token: TokenId) -> u128 {328		if token != TokenId::default() {329			return 0;330		}331		<T as Config>::Currency::free_balance(account.as_sub()).into()332	}333334	fn total_pieces(&self, token: TokenId) -> Option<u128> {335		if token != TokenId::default() {336			return None;337		}338		let total = <T as Config>::Currency::total_issuance();339		Some(total.into())340	}341342	fn allowance(343		&self,344		sender: <T>::CrossAccountId,345		spender: <T>::CrossAccountId,346		token: TokenId,347	) -> u128 {348		0349	}350351	fn refungible_extensions(&self) -> Option<&dyn pallet_common::RefungibleExtensions<T>> {352		None353	}354355	fn set_allowance_for_all(356		&self,357		owner: <T>::CrossAccountId,358		operator: <T>::CrossAccountId,359		approve: bool,360	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {361		fail!(<pallet_common::Error<T>>::UnsupportedOperation);362	}363364	fn allowance_for_all(&self, owner: <T>::CrossAccountId, operator: <T>::CrossAccountId) -> bool {365		false366	}367368	fn repair_item(369		&self,370		token: TokenId,371	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {372		fail!(<pallet_common::Error<T>>::UnsupportedOperation);373	}374}
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -44,7 +44,7 @@
 			Self::AccountId,
 			Balance = Self::CurrencyBalance,
 		>;
-		type CurrencyBalance: Into<U256> + TryFrom<U256>;
+		type CurrencyBalance: Into<U256> + TryFrom<U256> + PartialEq<u128> + From<u128> + Into<u128>;
 
 		type Decimals: Get<u8>;
 		type Name: Get<String>;
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -462,6 +462,7 @@
 	}
 
 	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+	pub const NATIVE_FINGIBLE_COLLECTION_ID: CollectionId = CollectionId(0);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -440,6 +440,10 @@
 			collection_id: CollectionId,
 			address: T::CrossAccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
+
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			collection.check_is_internal()?;
@@ -467,6 +471,10 @@
 			collection_id: CollectionId,
 			address: T::CrossAccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
+
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			collection.check_is_internal()?;
@@ -493,6 +501,9 @@
 			collection_id: CollectionId,
 			new_owner: T::AccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let new_owner = T::CrossAccountId::from_sub(new_owner);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
@@ -522,6 +533,9 @@
 			collection_id: CollectionId,
 			new_admin_id: T::CrossAccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			<PalletCommon<T>>::toggle_admin(&collection, &sender, &new_admin_id, true)
@@ -548,6 +562,9 @@
 			collection_id: CollectionId,
 			account_id: T::CrossAccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			<PalletCommon<T>>::toggle_admin(&collection, &sender, &account_id, false)
@@ -573,6 +590,9 @@
 			collection_id: CollectionId,
 			new_sponsor: T::AccountId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			target_collection.set_sponsor(&sender, new_sponsor.clone())
@@ -597,6 +617,9 @@
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = ensure_signed(origin)?;
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			target_collection.confirm_sponsorship(&sender)
@@ -617,6 +640,9 @@
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			target_collection.remove_sponsor(&sender)
@@ -894,6 +920,9 @@
 			collection_id: CollectionId,
 			value: bool,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			target_collection.check_is_internal()?;
@@ -1146,6 +1175,9 @@
 			collection_id: CollectionId,
 			new_limit: CollectionLimits,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			<PalletCommon<T>>::update_limits(&sender, &mut target_collection, new_limit)
@@ -1170,6 +1202,9 @@
 			collection_id: CollectionId,
 			new_permission: CollectionPermissions,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			<PalletCommon<T>>::update_permissions(&sender, &mut target_collection, new_permission)
@@ -1238,6 +1273,9 @@
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
 		) -> DispatchResult {
+			if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+				fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+			}
 			ensure_root(origin)?;
 			<PalletCommon<T>>::repair_collection(collection_id)
 		}
modifiedruntime/common/dispatch.rsdiffbeforeafterboth
--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{dispatch::DispatchResult, ensure};
+use frame_support::{dispatch::DispatchResult, ensure, fail};
 use pallet_evm::{PrecompileHandle, PrecompileResult};
 use sp_core::H160;
 use sp_runtime::DispatchError;
@@ -100,6 +100,10 @@
 	}
 
 	fn destroy(sender: T::CrossAccountId, collection_id: CollectionId) -> DispatchResult {
+		if collection_id == pallet_common::NATIVE_FINGIBLE_COLLECTION_ID {
+			fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+		}
+
 		let collection = <CollectionHandle<T>>::try_get(collection_id)?;
 		collection.check_is_internal()?;