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

difftreelog

fmt

Trubnikov Sergey2022-09-13parent: #b5cee7d.patch.diff
in: master

3 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -74,7 +74,7 @@
 	///
 	/// @param key Property key.
 	/// @param value Propery value.
-	#[weight(<SelfWeightOf<T>>::set_collection_properties(1_u32))]
+	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]
 	fn set_collection_property(
 		&mut self,
 		caller: caller,
@@ -94,7 +94,7 @@
 	/// Delete collection property.
 	///
 	/// @param key Property key.
-	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1_u32))]
+	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]
 	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {
 		self.consume_store_reads_and_writes(1, 1)?;
 
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, address};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::CrossAccountId64where65	T::AccountId: From<[u8; 32]>,66{67	let mut new_admin_arr = [0_u8; 32];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}7273/// Convert `CrossAccountId` to `(address, uint256)`.74pub fn convert_cross_account_to_tuple<T: Config>(cross_account_id: &T::CrossAccountId) -> (address, uint256)75where76	T::AccountId: AsRef<[u8; 32]>77{78	if cross_account_id.is_canonical_substrate() {79		let sub = convert_cross_account_to_uint256::<T>(cross_account_id);80		(Default::default(), sub)81	} else {82		let eth = *cross_account_id.as_eth();83		(eth, Default::default())84	}85}
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -171,7 +171,9 @@
 	fn get_sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
 		let sponsor =
 			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
-		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(&sponsor))
+		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
+			&sponsor,
+		))
 	}
 
 	/// Check tat contract has confirmed sponsor.