git.delta.rocks / unique-network / refs/commits / 2f30e2f1b171

--- a/crates/evm-coder/src/events.rs
+++ b/crates/evm-coder/src/events.rs
@@ -61,7 +61,7 @@
 	}
 }
 
-impl ToTopic for uint32 {
+impl ToTopic for u32 {
 	fn to_topic(&self) -> H256 {
 		let mut out = [0u8; 32];
 		out[28..32].copy_from_slice(&self.to_be_bytes());

--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -132,11 +132,6 @@
 	use primitive_types::{U256, H160, H256};
 
 	pub type address = H160;
-	pub type uint8 = u8;
-	pub type uint16 = u16;
-	pub type uint32 = u32;
-	pub type uint64 = u64;
-	pub type uint128 = u128;
 	pub type uint256 = U256;
 	pub type bytes4 = [u8; 4];
 	pub type topic = H256;
@@ -148,10 +143,6 @@
 
 	#[derive(Default, Debug, PartialEq, Eq, Clone)]
 	pub struct bytes(pub Vec<u8>);
-
-	/// Solidity doesn't have `void` type, however we have special implementation
-	/// for empty tuple return type
-	pub type void = ();
 
 	//#region Special types
 	/// Makes function payable

93	/// @param value Propery value.93	/// @param value Propery value.
94	#[solidity(hide)]94	#[solidity(hide)]
95	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]95	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]
96	fn set_collection_property(96	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {
97		&mut self,
98		caller: caller,
99		key: string,
100		value: bytes,
101	) -> Result<void> {
102		let caller = T::CrossAccountId::from_eth(caller);97		let caller = T::CrossAccountId::from_eth(caller);
103		let key = <Vec<u8>>::from(key)98		let key = <Vec<u8>>::from(key)
104			.try_into()99			.try_into()
117		&mut self,112		&mut self,
118		caller: caller,113		caller: caller,
119		properties: Vec<eth::Property>,114		properties: Vec<eth::Property>,
120	) -> Result<void> {115	) -> Result<()> {
121		let caller = T::CrossAccountId::from_eth(caller);116		let caller = T::CrossAccountId::from_eth(caller);
122117
123		let properties = properties118		let properties = properties
212	///207	///
213	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.208	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
214	#[solidity(hide)]209	#[solidity(hide)]
215	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {210	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<()> {
216		self.consume_store_reads_and_writes(1, 1)?;211		self.consume_store_reads_and_writes(1, 1)?;
217212
218		let caller = T::CrossAccountId::from_eth(caller);213		let caller = T::CrossAccountId::from_eth(caller);
231		&mut self,226		&mut self,
232		caller: caller,227		caller: caller,
233		sponsor: eth::CrossAddress,228		sponsor: eth::CrossAddress,
234	) -> Result<void> {229	) -> Result<()> {
235		self.consume_store_reads_and_writes(1, 1)?;230		self.consume_store_reads_and_writes(1, 1)?;
236231
237		let caller = T::CrossAccountId::from_eth(caller);232		let caller = T::CrossAccountId::from_eth(caller);
252	/// Collection sponsorship confirmation.247	/// Collection sponsorship confirmation.
253	///248	///
254	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.249	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
255	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {250	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<()> {
256		self.consume_store_writes(1)?;251		self.consume_store_writes(1)?;
257252
258		let caller = T::CrossAccountId::from_eth(caller);253		let caller = T::CrossAccountId::from_eth(caller);
261	}256	}
262257
263	/// Remove collection sponsor.258	/// Remove collection sponsor.
264	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {259	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<()> {
265		self.consume_store_reads_and_writes(1, 1)?;260		self.consume_store_reads_and_writes(1, 1)?;
266		let caller = T::CrossAccountId::from_eth(caller);261		let caller = T::CrossAccountId::from_eth(caller);
267		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)262		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)
343	/// @dev Throws error if limit not found.338	/// @dev Throws error if limit not found.
344	/// @param limit Some limit.339	/// @param limit Some limit.
345	#[solidity(rename_selector = "setCollectionLimit")]340	#[solidity(rename_selector = "setCollectionLimit")]
346	fn set_collection_limit(341	fn set_collection_limit(&mut self, caller: caller, limit: eth::CollectionLimit) -> Result<()> {
347		&mut self,
348		caller: caller,
349		limit: eth::CollectionLimit,
350	) -> Result<void> {
351		self.consume_store_reads_and_writes(1, 1)?;342		self.consume_store_reads_and_writes(1, 1)?;
352343
353		if !limit.has_value() {344		if !limit.has_value() {
369		&mut self,360		&mut self,
370		caller: caller,361		caller: caller,
371		new_admin: eth::CrossAddress,362		new_admin: eth::CrossAddress,
372	) -> Result<void> {363	) -> Result<()> {
373		self.consume_store_reads_and_writes(2, 2)?;364		self.consume_store_reads_and_writes(2, 2)?;
374365
375		let caller = T::CrossAccountId::from_eth(caller);366		let caller = T::CrossAccountId::from_eth(caller);
384		&mut self,375		&mut self,
385		caller: caller,376		caller: caller,
386		admin: eth::CrossAddress,377		admin: eth::CrossAddress,
387	) -> Result<void> {378	) -> Result<()> {
388		self.consume_store_reads_and_writes(2, 2)?;379		self.consume_store_reads_and_writes(2, 2)?;
389380
390		let caller = T::CrossAccountId::from_eth(caller);381		let caller = T::CrossAccountId::from_eth(caller);
396	/// Add collection admin.387	/// Add collection admin.
397	/// @param newAdmin Address of the added administrator.388	/// @param newAdmin Address of the added administrator.
398	#[solidity(hide)]389	#[solidity(hide)]
399	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {390	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<()> {
400		self.consume_store_reads_and_writes(2, 2)?;391		self.consume_store_reads_and_writes(2, 2)?;
401392
402		let caller = T::CrossAccountId::from_eth(caller);393		let caller = T::CrossAccountId::from_eth(caller);
409	///400	///
410	/// @param admin Address of the removed administrator.401	/// @param admin Address of the removed administrator.
411	#[solidity(hide)]402	#[solidity(hide)]
412	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {403	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<()> {
413		self.consume_store_reads_and_writes(2, 2)?;404		self.consume_store_reads_and_writes(2, 2)?;
414405
415		let caller = T::CrossAccountId::from_eth(caller);406		let caller = T::CrossAccountId::from_eth(caller);
422	///413	///
423	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'414	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'
424	#[solidity(rename_selector = "setCollectionNesting")]415	#[solidity(rename_selector = "setCollectionNesting")]
425	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {416	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<()> {
426		self.consume_store_reads_and_writes(1, 1)?;417		self.consume_store_reads_and_writes(1, 1)?;
427418
428		let caller = T::CrossAccountId::from_eth(caller);419		let caller = T::CrossAccountId::from_eth(caller);
446		caller: caller,437		caller: caller,
447		enable: bool,438		enable: bool,
448		collections: Vec<address>,439		collections: Vec<address>,
449	) -> Result<void> {440	) -> Result<()> {
450		self.consume_store_reads_and_writes(1, 1)?;441		self.consume_store_reads_and_writes(1, 1)?;
451442
452		if collections.is_empty() {443		if collections.is_empty() {
513	/// @param mode Access mode504	/// @param mode Access mode
514	/// 	0 for Normal505	/// 	0 for Normal
515	/// 	1 for AllowList506	/// 	1 for AllowList
516	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {507	fn set_collection_access(&mut self, caller: caller, mode: u8) -> Result<()> {
517		self.consume_store_reads_and_writes(1, 1)?;508		self.consume_store_reads_and_writes(1, 1)?;
518509
519		let caller = T::CrossAccountId::from_eth(caller);510		let caller = T::CrossAccountId::from_eth(caller);
540	///531	///
541	/// @param user Address of a trusted user.532	/// @param user Address of a trusted user.
542	#[solidity(hide)]533	#[solidity(hide)]
543	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {534	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {
544		self.consume_store_writes(1)?;535		self.consume_store_writes(1)?;
545536
546		let caller = T::CrossAccountId::from_eth(caller);537		let caller = T::CrossAccountId::from_eth(caller);
556		&mut self,547		&mut self,
557		caller: caller,548		caller: caller,
558		user: eth::CrossAddress,549		user: eth::CrossAddress,
559	) -> Result<void> {550	) -> Result<()> {
560		self.consume_store_writes(1)?;551		self.consume_store_writes(1)?;
561552
562		let caller = T::CrossAccountId::from_eth(caller);553		let caller = T::CrossAccountId::from_eth(caller);
569	///560	///
570	/// @param user Address of a removed user.561	/// @param user Address of a removed user.
571	#[solidity(hide)]562	#[solidity(hide)]
572	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {563	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {
573		self.consume_store_writes(1)?;564		self.consume_store_writes(1)?;
574565
575		let caller = T::CrossAccountId::from_eth(caller);566		let caller = T::CrossAccountId::from_eth(caller);
585		&mut self,576		&mut self,
586		caller: caller,577		caller: caller,
587		user: eth::CrossAddress,578		user: eth::CrossAddress,
588	) -> Result<void> {579	) -> Result<()> {
589		self.consume_store_writes(1)?;580		self.consume_store_writes(1)?;
590581
591		let caller = T::CrossAccountId::from_eth(caller);582		let caller = T::CrossAccountId::from_eth(caller);
597	/// Switch permission for minting.588	/// Switch permission for minting.
598	///589	///
599	/// @param mode Enable if "true".590	/// @param mode Enable if "true".
600	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {591	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<()> {
601		self.consume_store_reads_and_writes(1, 1)?;592		self.consume_store_reads_and_writes(1, 1)?;
602593
603		let caller = T::CrossAccountId::from_eth(caller);594		let caller = T::CrossAccountId::from_eth(caller);
654	/// @dev Owner can be changed only by current owner645	/// @dev Owner can be changed only by current owner
655	/// @param newOwner new owner account646	/// @param newOwner new owner account
656	#[solidity(hide, rename_selector = "changeCollectionOwner")]647	#[solidity(hide, rename_selector = "changeCollectionOwner")]
657	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {648	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<()> {
658		self.consume_store_writes(1)?;649		self.consume_store_writes(1)?;
659650
660		let caller = T::CrossAccountId::from_eth(caller);651		let caller = T::CrossAccountId::from_eth(caller);
682		&mut self,673		&mut self,
683		caller: caller,674		caller: caller,
684		new_owner: eth::CrossAddress,675		new_owner: eth::CrossAddress,
685	) -> Result<void> {676	) -> Result<()> {
686		self.consume_store_writes(1)?;677		self.consume_store_writes(1)?;
687678
688		let caller = T::CrossAccountId::from_eth(caller);679		let caller = T::CrossAccountId::from_eth(caller);

--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -108,7 +108,7 @@
 		caller: caller,
 		contract_address: address,
 		sponsor: address,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -125,7 +125,7 @@
 	/// Set contract as self sponsored.
 	///
 	/// @param contractAddress Contract for which a self sponsoring is being enabled.
-	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -146,7 +146,7 @@
 	/// Remove sponsor.
 	///
 	/// @param contractAddress Contract for which a sponsorship is being removed.
-	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -161,7 +161,7 @@
 	/// @dev Caller must be same that set via [`setSponsor`].
 	///
 	/// @param contractAddress Сontract for which need to confirm sponsorship.
-	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -210,7 +210,7 @@
 		caller: caller,
 		contract_address: address,
 		mode: SponsoringModeT,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -223,7 +223,7 @@
 	/// Get current contract sponsoring rate limit
 	/// @param contractAddress Contract to get sponsoring rate limit of
 	/// @return uint32 Amount of blocks between two sponsored transactions
-	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {
+	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {
 		self.recorder().consume_sload()?;
 
 		Ok(<SponsoringRateLimit<T>>::get(contract_address)
@@ -241,8 +241,8 @@
 		&mut self,
 		caller: caller,
 		contract_address: address,
-		rate_limit: uint32,
-	) -> Result<void> {
+		rate_limit: u32,
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -262,7 +262,7 @@
 		caller: caller,
 		contract_address: address,
 		fee_limit: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -304,7 +304,7 @@
 		contract_address: address,
 		user: address,
 		is_allowed: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -332,7 +332,7 @@
 		caller: caller,
 		contract_address: address,
 		enabled: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 

--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -72,7 +72,7 @@
 		Ok(<TotalSupply<T>>::get(self.id).into())
 	}
 
-	fn decimals(&self) -> Result<uint8> {
+	fn decimals(&self) -> Result<u8> {
 		Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
 			*decimals
 		} else {

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -423,7 +423,7 @@
 		_to: address,
 		_token_id: uint256,
 		_data: bytes,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -433,7 +433,7 @@
 		_from: address,
 		_to: address,
 		_token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -454,7 +454,7 @@
 		from: address,
 		to: address,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let to = T::CrossAccountId::from_eth(to);
@@ -475,7 +475,7 @@
 	/// @param approved The new approved NFT controller
 	/// @param tokenId The NFT to approve
 	#[weight(<SelfWeightOf<T>>::approve())]
-	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {
+	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let approved = T::CrossAccountId::from_eth(approved);
 		let token = token_id.try_into()?;
@@ -495,7 +495,7 @@
 		caller: caller,
 		operator: address,
 		approved: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
@@ -528,7 +528,7 @@
 	///  operator of the current owner.
 	/// @param tokenId The NFT to approve
 	#[weight(<SelfWeightOf<T>>::burn_item())]
-	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token = token_id.try_into()?;
 
@@ -773,7 +773,7 @@
 		caller: caller,
 		approved: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let approved = approved.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -789,7 +789,7 @@
 	/// @param to The new owner
 	/// @param tokenId The NFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer())]
-	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token = token_id.try_into()?;
@@ -812,7 +812,7 @@
 		caller: caller,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -837,7 +837,7 @@
 		from: eth::CrossAddress,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let to = to.into_sub_cross_account::<T>()?;
@@ -858,7 +858,7 @@
 	/// @param tokenId The NFT to transfer
 	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
-	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let token = token_id.try_into()?;
@@ -883,7 +883,7 @@
 		caller: caller,
 		from: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;

--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -424,7 +424,7 @@
 		_to: address,
 		_token_id: uint256,
 		_data: bytes,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -436,7 +436,7 @@
 		_from: address,
 		_to: address,
 		_token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -458,7 +458,7 @@
 		from: address,
 		to: address,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let to = T::CrossAccountId::from_eth(to);
@@ -477,7 +477,7 @@
 	}
 
 	/// @dev Not implemented
-	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {
+	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<()> {
 		Err("not implemented".into())
 	}
 
@@ -491,7 +491,7 @@
 		caller: caller,
 		operator: address,
 		approved: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
@@ -556,7 +556,7 @@
 	///  operator of the current owner.
 	/// @param tokenId The RFT to approve
 	#[weight(<SelfWeightOf<T>>::burn_item_fully())]
-	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token = token_id.try_into()?;
 
@@ -805,7 +805,7 @@
 	/// @param to The new owner
 	/// @param tokenId The RFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
-	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token = token_id.try_into()?;
@@ -833,7 +833,7 @@
 		caller: caller,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -862,7 +862,7 @@
 		from: eth::CrossAddress,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let to = to.into_sub_cross_account::<T>()?;
@@ -888,7 +888,7 @@
 	/// @param tokenId The RFT to transfer
 	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
-	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let token = token_id.try_into()?;
@@ -917,7 +917,7 @@
 		caller: caller,
 		from: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;

--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -109,7 +109,7 @@
 	}
 
 	/// @dev Not supported
-	fn decimals(&self) -> Result<uint8> {
+	fn decimals(&self) -> Result<u8> {
 		// Decimals aren't supported for refungible tokens
 		Ok(0)
 	}

--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -231,7 +231,7 @@
 		caller: caller,
 		value: value,
 		name: string,
-		decimals: uint8,
+		decimals: u8,
 		description: string,
 		token_prefix: string,
 	) -> Result<address> {
@@ -334,7 +334,7 @@
 	}
 
 	#[weight(<SelfWeightOf<T>>::destroy_collection())]
-	fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<void> {
+	fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 
 		let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
@@ -366,14 +366,14 @@
 	/// Returns address of a collection.
 	/// @param collectionId  - CollectionId  of the collection
 	/// @return eth mirror address of the collection
-	fn collection_address(&self, collection_id: uint32) -> Result<address> {
+	fn collection_address(&self, collection_id: u32) -> Result<address> {
 		Ok(collection_id_to_address(collection_id.into()))
 	}
 
 	/// Returns collectionId of a collection.
 	/// @param collectionAddress  - Eth address of the collection
 	/// @return collectionId of the collection
-	fn collection_id(&self, collection_address: address) -> Result<uint32> {
+	fn collection_id(&self, collection_address: address) -> Result<u32> {
 		map_eth_to_id(&collection_address)
 			.map(|id| id.0)
 			.ok_or(Error::Revert(format!(