git.delta.rocks / unique-network / refs/commits / 9d78c86ffab5

difftreelog

fmt

Trubnikov Sergey2022-08-25parent: #2ba119d.patch.diff
in: master

3 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -133,7 +133,11 @@
 	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
 	///
 	/// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
-	fn set_collection_sponsor_substrate(&mut self, caller: caller, sponsor: uint256) -> Result<void> {
+	fn set_collection_sponsor_substrate(
+		&mut self,
+		caller: caller,
+		sponsor: uint256,
+	) -> Result<void> {
 		check_is_owner_or_admin(caller, self)?;
 
 		let sponsor = convert_uint256_to_cross_account::<T>(sponsor);
@@ -144,7 +148,10 @@
 
 	// /// Whether there is a pending sponsor.
 	fn has_collection_pending_sponsor(&self) -> Result<bool> {
-		Ok(matches!(self.collection.sponsorship, SponsorshipState::Unconfirmed(_)))
+		Ok(matches!(
+			self.collection.sponsorship,
+			SponsorshipState::Unconfirmed(_)
+		))
 	}
 
 	/// Collection sponsorship confirmation.
@@ -173,7 +180,9 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	fn get_collection_sponsor(&self) -> Result<(address, uint256)> {
 		let sponsor = match self.collection.sponsorship {
-			SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => return Ok(Default::default()),
+			SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => {
+				return Ok(Default::default())
+			}
 			SponsorshipState::Confirmed(ref sponsor) => sponsor,
 		};
 		let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
before · pallets/common/src/eth.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//! The module contains a number of functions for converting and checking ethereum identifiers.1819use evm_coder::types::uint256;20pub use pallet_evm::account::{Config, CrossAccountId};21use sp_core::H160;22use up_data_structs::CollectionId;2324// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 125// TODO: Unhardcode prefix26const ETH_COLLECTION_PREFIX: [u8; 16] = [27	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,28];2930/// Maps the ethereum address of the collection in substrate.31pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {32	if eth[0..16] != ETH_COLLECTION_PREFIX {33		return None;34	}35	let mut id_bytes = [0; 4];36	id_bytes.copy_from_slice(&eth[16..20]);37	Some(CollectionId(u32::from_be_bytes(id_bytes)))38}3940/// Maps the substrate collection id in ethereum.41pub fn collection_id_to_address(id: CollectionId) -> H160 {42	let mut out = [0; 20];43	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);44	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));45	H160(out)46}4748/// Check if the ethereum address is a collection.49pub fn is_collection(address: &H160) -> bool {50	address[0..16] == ETH_COLLECTION_PREFIX51}5253/// Convert `CrossAccountId` to `uint256`.54pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint25655where56	T::AccountId: AsRef<[u8; 32]>,57{58	let slice = from.as_sub().as_ref();59	uint256::from_big_endian(slice)60}6162/// Convert `uint256` to `CrossAccountId`.63pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId 64where65	T::AccountId: From<[u8; 32]>,66{67	let mut new_admin_arr: [u8; 32] = Default::default();68	from.to_big_endian(&mut new_admin_arr);69	let account_id = T::AccountId::from(new_admin_arr);70	T::CrossAccountId::from_sub(account_id)71}
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -357,7 +357,7 @@
 
 		<SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);
 
-		Some(sponsor) 
+		Some(sponsor)
 	}
 }