git.delta.rocks / unique-network / refs/commits / 77bb9d1b095d

difftreelog

cargo fmt

Trubnikov Sergey2022-03-22parent: #310b60e.patch.diff
in: master

10 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -168,7 +168,9 @@
 	use scale_info::TypeInfo;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config {
+	pub trait Config:
+		frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config
+	{
 		type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
 
 		type Currency: Currency<Self::AccountId>;
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -18,7 +18,8 @@
 use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
 use pallet_evm::{
-	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, account::CrossAccountId
+	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,
+	account::CrossAccountId,
 };
 use sp_core::H160;
 use crate::{
@@ -179,7 +180,9 @@
 }
 
 pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
+	for HelpersContractSponsoring<T>
+{
 	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
 		let mode = <Pallet<T>>::sponsoring_mode(call.0);
 		if mode == SponsoringModeT::Disabled {
modifiedpallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -30,7 +30,9 @@
 	use sp_core::H160;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config {
+	pub trait Config:
+		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config
+	{
 		type ContractAddress: Get<H160>;
 		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
 	}
modifiedpallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -87,7 +87,8 @@
 		fee: U256,
 	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
 		let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {
-			T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())
+			T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
+				.unwrap_or(who.clone())
 		} else {
 			who.clone()
 		};
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
before · pallets/fungible/src/lib.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/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::ops::Deref;20use frame_support::{ensure};21use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};22use pallet_common::{23	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,24};25use pallet_evm::account::CrossAccountId;26use pallet_evm_coder_substrate::WithRecorder;27use sp_core::H160;28use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};29use sp_std::collections::btree_map::BTreeMap;3031pub use pallet::*;3233use crate::erc::ERC20Events;34#[cfg(feature = "runtime-benchmarks")]35pub mod benchmarking;36pub mod common;37pub mod erc;38pub mod weights;3940pub type CreateItemData<T> = (<T as pallet_evm::account::Config>::CrossAccountId, u128);41pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4243#[frame_support::pallet]44pub mod pallet {45	use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};46	use up_data_structs::CollectionId;47	use super::weights::WeightInfo;4849	#[pallet::error]50	pub enum Error<T> {51		/// Not Fungible item data used to mint in Fungible collection.52		NotFungibleDataUsedToMintFungibleCollectionToken,53		/// Not default id passed as TokenId argument54		FungibleItemsHaveNoId,55		/// Tried to set data for fungible item56		FungibleItemsDontHaveData,57	}5859	#[pallet::config]60	pub trait Config: frame_system::Config + pallet_common::Config {61		type WeightInfo: WeightInfo;62	}6364	#[pallet::pallet]65	#[pallet::generate_store(pub(super) trait Store)]66	pub struct Pallet<T>(_);6768	#[pallet::storage]69	pub type TotalSupply<T: Config> =70		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;7172	#[pallet::storage]73	pub type Balance<T: Config> = StorageNMap<74		Key = (75			Key<Twox64Concat, CollectionId>,76			Key<Blake2_128Concat, T::CrossAccountId>,77		),78		Value = u128,79		QueryKind = ValueQuery,80	>;8182	#[pallet::storage]83	pub type Allowance<T: Config> = StorageNMap<84		Key = (85			Key<Twox64Concat, CollectionId>,86			Key<Blake2_128, T::CrossAccountId>,87			Key<Blake2_128Concat, T::CrossAccountId>,88		),89		Value = u128,90		QueryKind = ValueQuery,91	>;92}9394pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);95impl<T: Config> FungibleHandle<T> {96	pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {97		Self(inner)98	}99	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {100		self.0101	}102}103impl<T: Config> WithRecorder<T> for FungibleHandle<T> {104	fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {105		self.0.recorder()106	}107	fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {108		self.0.into_recorder()109	}110}111impl<T: Config> Deref for FungibleHandle<T> {112	type Target = pallet_common::CollectionHandle<T>;113114	fn deref(&self) -> &Self::Target {115		&self.0116	}117}118119impl<T: Config> Pallet<T> {120	pub fn init_collection(121		owner: T::AccountId,122		data: CreateCollectionData<T::AccountId>,123	) -> Result<CollectionId, DispatchError> {124		<PalletCommon<T>>::init_collection(owner, data)125	}126	pub fn destroy_collection(127		collection: FungibleHandle<T>,128		sender: &T::CrossAccountId,129	) -> DispatchResult {130		let id = collection.id;131132		// =========133134		PalletCommon::destroy_collection(collection.0, sender)?;135136		<TotalSupply<T>>::remove(id);137		<Balance<T>>::remove_prefix((id,), None);138		<Allowance<T>>::remove_prefix((id,), None);139		Ok(())140	}141142	pub fn burn(143		collection: &FungibleHandle<T>,144		owner: &T::CrossAccountId,145		amount: u128,146	) -> DispatchResult {147		let total_supply = <TotalSupply<T>>::get(collection.id)148			.checked_sub(amount)149			.ok_or(<CommonError<T>>::TokenValueTooLow)?;150151		let balance = <Balance<T>>::get((collection.id, owner))152			.checked_sub(amount)153			.ok_or(<CommonError<T>>::TokenValueTooLow)?;154155		if collection.access == AccessMode::AllowList {156			collection.check_allowlist(owner)?;157		}158159		// =========160161		if balance == 0 {162			<Balance<T>>::remove((collection.id, owner));163		} else {164			<Balance<T>>::insert((collection.id, owner), balance);165		}166		<TotalSupply<T>>::insert(collection.id, total_supply);167168		collection.log_mirrored(ERC20Events::Transfer {169			from: *owner.as_eth(),170			to: H160::default(),171			value: amount.into(),172		});173		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(174			collection.id,175			TokenId::default(),176			owner.clone(),177			amount,178		));179		Ok(())180	}181182	pub fn transfer(183		collection: &FungibleHandle<T>,184		from: &T::CrossAccountId,185		to: &T::CrossAccountId,186		amount: u128,187	) -> DispatchResult {188		ensure!(189			collection.limits.transfers_enabled(),190			<CommonError<T>>::TransferNotAllowed,191		);192193		if collection.access == AccessMode::AllowList {194			collection.check_allowlist(from)?;195			collection.check_allowlist(to)?;196		}197		<PalletCommon<T>>::ensure_correct_receiver(to)?;198199		let balance_from = <Balance<T>>::get((collection.id, from))200			.checked_sub(amount)201			.ok_or(<CommonError<T>>::TokenValueTooLow)?;202		let balance_to = if from != to {203			Some(204				<Balance<T>>::get((collection.id, to))205					.checked_add(amount)206					.ok_or(ArithmeticError::Overflow)?,207			)208		} else {209			None210		};211212		// =========213214		if let Some(balance_to) = balance_to {215			// from != to216			if balance_from == 0 {217				<Balance<T>>::remove((collection.id, from));218			} else {219				<Balance<T>>::insert((collection.id, from), balance_from);220			}221			<Balance<T>>::insert((collection.id, to), balance_to);222		}223224		collection.log_mirrored(ERC20Events::Transfer {225			from: *from.as_eth(),226			to: *to.as_eth(),227			value: amount.into(),228		});229		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(230			collection.id,231			TokenId::default(),232			from.clone(),233			to.clone(),234			amount,235		));236		Ok(())237	}238239	pub fn create_multiple_items(240		collection: &FungibleHandle<T>,241		sender: &T::CrossAccountId,242		data: BTreeMap<T::CrossAccountId, u128>,243	) -> DispatchResult {244		if !collection.is_owner_or_admin(sender) {245			ensure!(246				collection.mint_mode,247				<CommonError<T>>::PublicMintingNotAllowed248			);249			collection.check_allowlist(sender)?;250251			for (owner, _) in data.iter() {252				collection.check_allowlist(owner)?;253			}254		}255256		let total_supply = data257			.iter()258			.map(|(_, v)| *v)259			.try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {260				acc.checked_add(v)261			})262			.ok_or(ArithmeticError::Overflow)?;263264		let mut balances = data;265		for (k, v) in balances.iter_mut() {266			*v = <Balance<T>>::get((collection.id, &k))267				.checked_add(*v)268				.ok_or(ArithmeticError::Overflow)?;269		}270271		// =========272273		<TotalSupply<T>>::insert(collection.id, total_supply);274		for (user, amount) in balances {275			<Balance<T>>::insert((collection.id, &user), amount);276277			collection.log_mirrored(ERC20Events::Transfer {278				from: H160::default(),279				to: *user.as_eth(),280				value: amount.into(),281			});282			<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(283				collection.id,284				TokenId::default(),285				user.clone(),286				amount,287			));288		}289290		Ok(())291	}292293	fn set_allowance_unchecked(294		collection: &FungibleHandle<T>,295		owner: &T::CrossAccountId,296		spender: &T::CrossAccountId,297		amount: u128,298	) {299		if amount == 0 {300			<Allowance<T>>::remove((collection.id, owner, spender));301		} else {302			<Allowance<T>>::insert((collection.id, owner, spender), amount);303		}304305		collection.log_mirrored(ERC20Events::Approval {306			owner: *owner.as_eth(),307			spender: *spender.as_eth(),308			value: amount.into(),309		});310		<PalletCommon<T>>::deposit_event(CommonEvent::Approved(311			collection.id,312			TokenId(0),313			owner.clone(),314			spender.clone(),315			amount,316		));317	}318319	pub fn set_allowance(320		collection: &FungibleHandle<T>,321		owner: &T::CrossAccountId,322		spender: &T::CrossAccountId,323		amount: u128,324	) -> DispatchResult {325		if collection.access == AccessMode::AllowList {326			collection.check_allowlist(owner)?;327			collection.check_allowlist(spender)?;328		}329330		if <Balance<T>>::get((collection.id, owner)) < amount {331			ensure!(332				collection.ignores_owned_amount(owner),333				<CommonError<T>>::CantApproveMoreThanOwned334			);335		}336337		// =========338339		Self::set_allowance_unchecked(collection, owner, spender, amount);340		Ok(())341	}342343	pub fn transfer_from(344		collection: &FungibleHandle<T>,345		spender: &T::CrossAccountId,346		from: &T::CrossAccountId,347		to: &T::CrossAccountId,348		amount: u128,349	) -> DispatchResult {350		if spender.conv_eq(from) {351			return Self::transfer(collection, from, to, amount);352		}353		if collection.access == AccessMode::AllowList {354			// `from`, `to` checked in [`transfer`]355			collection.check_allowlist(spender)?;356		}357358		let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);359		if allowance.is_none() {360			ensure!(361				collection.ignores_allowance(spender),362				<CommonError<T>>::ApprovedValueTooLow363			);364		}365366		// =========367368		Self::transfer(collection, from, to, amount)?;369		if let Some(allowance) = allowance {370			Self::set_allowance_unchecked(collection, from, spender, allowance);371		}372		Ok(())373	}374375	pub fn burn_from(376		collection: &FungibleHandle<T>,377		spender: &T::CrossAccountId,378		from: &T::CrossAccountId,379		amount: u128,380	) -> DispatchResult {381		if spender.conv_eq(from) {382			return Self::burn(collection, from, amount);383		}384		if collection.access == AccessMode::AllowList {385			// `from` checked in [`burn`]386			collection.check_allowlist(spender)?;387		}388389		let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);390		if allowance.is_none() {391			ensure!(392				collection.ignores_allowance(spender),393				<CommonError<T>>::ApprovedValueTooLow394			);395		}396397		// =========398399		Self::burn(collection, from, amount)?;400		if let Some(allowance) = allowance {401			Self::set_allowance_unchecked(collection, from, spender, allowance);402		}403		Ok(())404	}405406	/// Delegated to `create_multiple_items`407	pub fn create_item(408		collection: &FungibleHandle<T>,409		sender: &T::CrossAccountId,410		data: CreateItemData<T>,411	) -> DispatchResult {412		Self::create_multiple_items(collection, sender, [(data.0, data.1)].into_iter().collect())413	}414}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -21,9 +21,7 @@
 use up_data_structs::{
 	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
 };
-use pallet_common::{
-	Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,
-};
+use pallet_common::{Error as CommonError, Pallet as PalletCommon, Event as CommonEvent};
 use pallet_evm::account::CrossAccountId;
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
 use sp_core::H160;
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -21,9 +21,7 @@
 	AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
 	CreateCollectionData, CreateRefungibleExData,
 };
-use pallet_common::{
-	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
-};
+use pallet_common::{Error as CommonError, Event as CommonEvent, Pallet as PalletCommon};
 use pallet_evm::account::CrossAccountId;
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
 use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -32,7 +32,9 @@
 use up_data_structs::{CreateItemData, CreateNftData};
 
 pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
+	for UniqueEthSponsorshipHandler<T>
+{
 	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
 		let collection_id = map_eth_to_id(&call.0)?;
 		let collection = <CollectionHandle<T>>::new(collection_id)?;
@@ -59,16 +61,17 @@
 							.map(|()| sponsor)
 					}
 					UniqueNFTCall::ERC721Mintable(call) => match call {
-						pallet_nonfungible::erc::ERC721MintableCall::Mint { .. } |
-						pallet_nonfungible::erc::ERC721MintableCall::MintWithTokenUri { .. } => {
-							withdraw_create_item(
-								&collection, 
-								who.as_sub(), 
-								&CreateItemData::NFT(CreateNftData::default()))
-							.map(|()| sponsor)
-						}
+						pallet_nonfungible::erc::ERC721MintableCall::Mint { .. }
+						| pallet_nonfungible::erc::ERC721MintableCall::MintWithTokenUri {
+							..
+						} => withdraw_create_item(
+							&collection,
+							who.as_sub(),
+							&CreateItemData::NFT(CreateNftData::default()),
+						)
+						.map(|()| sponsor),
 						_ => None,
-    				}
+					},
 					_ => None,
 				}
 			}
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -53,10 +53,7 @@
 	CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
 	CreateCollectionData, CustomDataLimit, CreateItemExData,
 };
-use pallet_common::{
-	CollectionHandle, Pallet as PalletCommon, Error as CommonError,
-	CommonWeightInfo,
-};
+use pallet_common::{CollectionHandle, Pallet as PalletCommon, Error as CommonError, CommonWeightInfo};
 use pallet_evm::account::CrossAccountId;
 use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
 use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
modifiedpallets/unique/src/tests.rsdiffbeforeafterboth
--- a/pallets/unique/src/tests.rs
+++ b/pallets/unique/src/tests.rs
@@ -2865,18 +2865,49 @@
 		let origin1 = Origin::signed(user1);
 		let origin2 = Origin::signed(user2);
 		let account2 = account(user2);
-		
-		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
-		assert_ok!(TemplateModule::set_collection_sponsor(origin1.clone(), collection_id, user1));
-		assert_ok!(TemplateModule::confirm_sponsorship(origin1.clone(), collection_id));
 
+		let collection_id =
+			create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
+		assert_ok!(TemplateModule::set_collection_sponsor(
+			origin1.clone(),
+			collection_id,
+			user1
+		));
+		assert_ok!(TemplateModule::confirm_sponsorship(
+			origin1.clone(),
+			collection_id
+		));
+
 		// Expect error while have no permissions
-		assert!(TemplateModule::create_item(origin2.clone(), collection_id, account2.clone(), default_nft_data().into()).is_err());
+		assert!(TemplateModule::create_item(
+			origin2.clone(),
+			collection_id,
+			account2.clone(),
+			default_nft_data().into()
+		)
+		.is_err());
 
-		assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), collection_id, AccessMode::AllowList));
-		assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));
-		assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));
-		
-		assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));
+		assert_ok!(TemplateModule::set_public_access_mode(
+			origin1.clone(),
+			collection_id,
+			AccessMode::AllowList
+		));
+		assert_ok!(TemplateModule::add_to_allow_list(
+			origin1.clone(),
+			collection_id,
+			account2.clone()
+		));
+		assert_ok!(TemplateModule::set_mint_permission(
+			origin1.clone(),
+			collection_id,
+			true
+		));
+
+		assert_ok!(TemplateModule::create_item(
+			origin2,
+			collection_id,
+			account2,
+			default_nft_data().into()
+		));
 	});
-}
\ No newline at end of file
+}