difftreelog
misk: remove simple type aliases
in: master
9 files changed
crates/evm-coder/src/events.rsdiffbeforeafterboth--- 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());
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- 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
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -93,12 +93,7 @@
/// @param value Propery value.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]
- fn set_collection_property(
- &mut self,
- caller: caller,
- key: string,
- value: bytes,
- ) -> Result<void> {
+ fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let key = <Vec<u8>>::from(key)
.try_into()
@@ -117,7 +112,7 @@
&mut self,
caller: caller,
properties: Vec<eth::Property>,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let properties = properties
@@ -212,7 +207,7 @@
///
/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
#[solidity(hide)]
- fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {
+ fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -231,7 +226,7 @@
&mut self,
caller: caller,
sponsor: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -252,7 +247,7 @@
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
- fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {
+ fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -261,7 +256,7 @@
}
/// Remove collection sponsor.
- fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {
+ fn remove_collection_sponsor(&mut self, caller: caller) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)
@@ -343,11 +338,7 @@
/// @dev Throws error if limit not found.
/// @param limit Some limit.
#[solidity(rename_selector = "setCollectionLimit")]
- fn set_collection_limit(
- &mut self,
- caller: caller,
- limit: eth::CollectionLimit,
- ) -> Result<void> {
+ fn set_collection_limit(&mut self, caller: caller, limit: eth::CollectionLimit) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
if !limit.has_value() {
@@ -369,7 +360,7 @@
&mut self,
caller: caller,
new_admin: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_reads_and_writes(2, 2)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -384,7 +375,7 @@
&mut self,
caller: caller,
admin: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_reads_and_writes(2, 2)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -396,7 +387,7 @@
/// Add collection admin.
/// @param newAdmin Address of the added administrator.
#[solidity(hide)]
- fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {
+ fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<()> {
self.consume_store_reads_and_writes(2, 2)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -409,7 +400,7 @@
///
/// @param admin Address of the removed administrator.
#[solidity(hide)]
- fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {
+ fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<()> {
self.consume_store_reads_and_writes(2, 2)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -422,7 +413,7 @@
///
/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'
#[solidity(rename_selector = "setCollectionNesting")]
- fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {
+ fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -446,7 +437,7 @@
caller: caller,
enable: bool,
collections: Vec<address>,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
if collections.is_empty() {
@@ -513,7 +504,7 @@
/// @param mode Access mode
/// 0 for Normal
/// 1 for AllowList
- fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {
+ fn set_collection_access(&mut self, caller: caller, mode: u8) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -540,7 +531,7 @@
///
/// @param user Address of a trusted user.
#[solidity(hide)]
- fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {
+ fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -556,7 +547,7 @@
&mut self,
caller: caller,
user: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -569,7 +560,7 @@
///
/// @param user Address of a removed user.
#[solidity(hide)]
- fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {
+ fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -585,7 +576,7 @@
&mut self,
caller: caller,
user: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -597,7 +588,7 @@
/// Switch permission for minting.
///
/// @param mode Enable if "true".
- fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
+ fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -654,7 +645,7 @@
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
#[solidity(hide, rename_selector = "changeCollectionOwner")]
- fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {
+ fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
@@ -682,7 +673,7 @@
&mut self,
caller: caller,
new_owner: eth::CrossAddress,
- ) -> Result<void> {
+ ) -> Result<()> {
self.consume_store_writes(1)?;
let caller = T::CrossAccountId::from_eth(caller);
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- 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()?;
pallets/fungible/src/erc.rsdiffbeforeafterboth1// 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//! ERC-20 standart support implementation.1819extern crate alloc;20use core::char::{REPLACEMENT_CHARACTER, decode_utf16};21use core::convert::TryInto;22use evm_coder::{23 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,24 weight,25};26use up_data_structs::CollectionMode;27use pallet_common::{28 CollectionHandle,29 erc::{CommonEvmHandler, PrecompileResult, CollectionCall},30};31use sp_std::vec::Vec;32use pallet_evm::{account::CrossAccountId, PrecompileHandle};33use pallet_evm_coder_substrate::{call, dispatch_to_evm};34use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};35use sp_core::Get;3637use crate::{38 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,39 weights::WeightInfo,40};4142#[derive(ToLog)]43pub enum ERC20Events {44 Transfer {45 #[indexed]46 from: address,47 #[indexed]48 to: address,49 value: uint256,50 },51 Approval {52 #[indexed]53 owner: address,54 #[indexed]55 spender: address,56 value: uint256,57 },58}5960#[solidity_interface(name = ERC20, events(ERC20Events))]61impl<T: Config> FungibleHandle<T> {62 fn name(&self) -> Result<string> {63 Ok(decode_utf16(self.name.iter().copied())64 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))65 .collect::<string>())66 }67 fn symbol(&self) -> Result<string> {68 Ok(string::from_utf8_lossy(&self.token_prefix).into())69 }70 fn total_supply(&self) -> Result<uint256> {71 self.consume_store_reads(1)?;72 Ok(<TotalSupply<T>>::get(self.id).into())73 }7475 fn decimals(&self) -> Result<uint8> {76 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {77 *decimals78 } else {79 unreachable!()80 })81 }82 fn balance_of(&self, owner: address) -> Result<uint256> {83 self.consume_store_reads(1)?;84 let owner = T::CrossAccountId::from_eth(owner);85 let balance = <Balance<T>>::get((self.id, owner));86 Ok(balance.into())87 }88 #[weight(<SelfWeightOf<T>>::transfer())]89 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {90 let caller = T::CrossAccountId::from_eth(caller);91 let to = T::CrossAccountId::from_eth(to);92 let amount = amount.try_into().map_err(|_| "amount overflow")?;93 let budget = self94 .recorder95 .weight_calls_budget(<StructureWeight<T>>::find_parent());9697 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;98 Ok(true)99 }100101 #[weight(<SelfWeightOf<T>>::transfer_from())]102 fn transfer_from(103 &mut self,104 caller: caller,105 from: address,106 to: address,107 amount: uint256,108 ) -> Result<bool> {109 let caller = T::CrossAccountId::from_eth(caller);110 let from = T::CrossAccountId::from_eth(from);111 let to = T::CrossAccountId::from_eth(to);112 let amount = amount.try_into().map_err(|_| "amount overflow")?;113 let budget = self114 .recorder115 .weight_calls_budget(<StructureWeight<T>>::find_parent());116117 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)118 .map_err(dispatch_to_evm::<T>)?;119 Ok(true)120 }121 #[weight(<SelfWeightOf<T>>::approve())]122 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {123 let caller = T::CrossAccountId::from_eth(caller);124 let spender = T::CrossAccountId::from_eth(spender);125 let amount = amount.try_into().map_err(|_| "amount overflow")?;126127 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)128 .map_err(dispatch_to_evm::<T>)?;129 Ok(true)130 }131 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {132 self.consume_store_reads(1)?;133 let owner = T::CrossAccountId::from_eth(owner);134 let spender = T::CrossAccountId::from_eth(spender);135136 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())137 }138139 /// @notice Returns collection helper contract address140 fn collection_helper_address(&self) -> Result<address> {141 Ok(T::ContractAddress::get())142 }143}144145#[solidity_interface(name = ERC20Mintable)]146impl<T: Config> FungibleHandle<T> {147 /// Mint tokens for `to` account.148 /// @param to account that will receive minted tokens149 /// @param amount amount of tokens to mint150 #[weight(<SelfWeightOf<T>>::create_item())]151 fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {152 let caller = T::CrossAccountId::from_eth(caller);153 let to = T::CrossAccountId::from_eth(to);154 let amount = amount.try_into().map_err(|_| "amount overflow")?;155 let budget = self156 .recorder157 .weight_calls_budget(<StructureWeight<T>>::find_parent());158 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)159 .map_err(dispatch_to_evm::<T>)?;160 Ok(true)161 }162}163164#[solidity_interface(name = ERC20UniqueExtensions)]165impl<T: Config> FungibleHandle<T>166where167 T::AccountId: From<[u8; 32]>,168{169 /// @notice A description for the collection.170 fn description(&self) -> Result<string> {171 Ok(decode_utf16(self.description.iter().copied())172 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))173 .collect::<string>())174 }175176 #[weight(<SelfWeightOf<T>>::create_item())]177 fn mint_cross(178 &mut self,179 caller: caller,180 to: pallet_common::eth::CrossAddress,181 amount: uint256,182 ) -> Result<bool> {183 let caller = T::CrossAccountId::from_eth(caller);184 let to = to.into_sub_cross_account::<T>()?;185 let amount = amount.try_into().map_err(|_| "amount overflow")?;186 let budget = self187 .recorder188 .weight_calls_budget(<StructureWeight<T>>::find_parent());189 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)190 .map_err(dispatch_to_evm::<T>)?;191 Ok(true)192 }193194 #[weight(<SelfWeightOf<T>>::approve())]195 fn approve_cross(196 &mut self,197 caller: caller,198 spender: pallet_common::eth::CrossAddress,199 amount: uint256,200 ) -> Result<bool> {201 let caller = T::CrossAccountId::from_eth(caller);202 let spender = spender.into_sub_cross_account::<T>()?;203 let amount = amount.try_into().map_err(|_| "amount overflow")?;204205 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)206 .map_err(dispatch_to_evm::<T>)?;207 Ok(true)208 }209210 /// Burn tokens from account211 /// @dev Function that burns an `amount` of the tokens of a given account,212 /// deducting from the sender's allowance for said account.213 /// @param from The account whose tokens will be burnt.214 /// @param amount The amount that will be burnt.215 #[solidity(hide)]216 #[weight(<SelfWeightOf<T>>::burn_from())]217 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {218 let caller = T::CrossAccountId::from_eth(caller);219 let from = T::CrossAccountId::from_eth(from);220 let amount = amount.try_into().map_err(|_| "amount overflow")?;221 let budget = self222 .recorder223 .weight_calls_budget(<StructureWeight<T>>::find_parent());224225 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)226 .map_err(dispatch_to_evm::<T>)?;227 Ok(true)228 }229230 /// Burn tokens from account231 /// @dev Function that burns an `amount` of the tokens of a given account,232 /// deducting from the sender's allowance for said account.233 /// @param from The account whose tokens will be burnt.234 /// @param amount The amount that will be burnt.235 #[weight(<SelfWeightOf<T>>::burn_from())]236 fn burn_from_cross(237 &mut self,238 caller: caller,239 from: pallet_common::eth::CrossAddress,240 amount: uint256,241 ) -> Result<bool> {242 let caller = T::CrossAccountId::from_eth(caller);243 let from = from.into_sub_cross_account::<T>()?;244 let amount = amount.try_into().map_err(|_| "amount overflow")?;245 let budget = self246 .recorder247 .weight_calls_budget(<StructureWeight<T>>::find_parent());248249 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)250 .map_err(dispatch_to_evm::<T>)?;251 Ok(true)252 }253254 /// Mint tokens for multiple accounts.255 /// @param amounts array of pairs of account address and amount256 #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]257 fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {258 let caller = T::CrossAccountId::from_eth(caller);259 let budget = self260 .recorder261 .weight_calls_budget(<StructureWeight<T>>::find_parent());262 let amounts = amounts263 .into_iter()264 .map(|(to, amount)| {265 Ok((266 T::CrossAccountId::from_eth(to),267 amount.try_into().map_err(|_| "amount overflow")?,268 ))269 })270 .collect::<Result<_>>()?;271272 <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)273 .map_err(dispatch_to_evm::<T>)?;274 Ok(true)275 }276277 #[weight(<SelfWeightOf<T>>::transfer())]278 fn transfer_cross(279 &mut self,280 caller: caller,281 to: pallet_common::eth::CrossAddress,282 amount: uint256,283 ) -> Result<bool> {284 let caller = T::CrossAccountId::from_eth(caller);285 let to = to.into_sub_cross_account::<T>()?;286 let amount = amount.try_into().map_err(|_| "amount overflow")?;287 let budget = self288 .recorder289 .weight_calls_budget(<StructureWeight<T>>::find_parent());290291 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;292 Ok(true)293 }294295 #[weight(<SelfWeightOf<T>>::transfer_from())]296 fn transfer_from_cross(297 &mut self,298 caller: caller,299 from: pallet_common::eth::CrossAddress,300 to: pallet_common::eth::CrossAddress,301 amount: uint256,302 ) -> Result<bool> {303 let caller = T::CrossAccountId::from_eth(caller);304 let from = from.into_sub_cross_account::<T>()?;305 let to = to.into_sub_cross_account::<T>()?;306 let amount = amount.try_into().map_err(|_| "amount overflow")?;307 let budget = self308 .recorder309 .weight_calls_budget(<StructureWeight<T>>::find_parent());310311 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)312 .map_err(dispatch_to_evm::<T>)?;313 Ok(true)314 }315}316317#[solidity_interface(318 name = UniqueFungible,319 is(320 ERC20,321 ERC20Mintable,322 ERC20UniqueExtensions,323 Collection(via(common_mut returns CollectionHandle<T>)),324 )325)]326impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}327328generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);329generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);330331impl<T: Config> CommonEvmHandler for FungibleHandle<T>332where333 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,334{335 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");336337 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {338 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)339 }340}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//! ERC-20 standart support implementation.1819extern crate alloc;20use core::char::{REPLACEMENT_CHARACTER, decode_utf16};21use core::convert::TryInto;22use evm_coder::{23 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,24 weight,25};26use up_data_structs::CollectionMode;27use pallet_common::{28 CollectionHandle,29 erc::{CommonEvmHandler, PrecompileResult, CollectionCall},30};31use sp_std::vec::Vec;32use pallet_evm::{account::CrossAccountId, PrecompileHandle};33use pallet_evm_coder_substrate::{call, dispatch_to_evm};34use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};35use sp_core::Get;3637use crate::{38 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,39 weights::WeightInfo,40};4142#[derive(ToLog)]43pub enum ERC20Events {44 Transfer {45 #[indexed]46 from: address,47 #[indexed]48 to: address,49 value: uint256,50 },51 Approval {52 #[indexed]53 owner: address,54 #[indexed]55 spender: address,56 value: uint256,57 },58}5960#[solidity_interface(name = ERC20, events(ERC20Events))]61impl<T: Config> FungibleHandle<T> {62 fn name(&self) -> Result<string> {63 Ok(decode_utf16(self.name.iter().copied())64 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))65 .collect::<string>())66 }67 fn symbol(&self) -> Result<string> {68 Ok(string::from_utf8_lossy(&self.token_prefix).into())69 }70 fn total_supply(&self) -> Result<uint256> {71 self.consume_store_reads(1)?;72 Ok(<TotalSupply<T>>::get(self.id).into())73 }7475 fn decimals(&self) -> Result<u8> {76 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {77 *decimals78 } else {79 unreachable!()80 })81 }82 fn balance_of(&self, owner: address) -> Result<uint256> {83 self.consume_store_reads(1)?;84 let owner = T::CrossAccountId::from_eth(owner);85 let balance = <Balance<T>>::get((self.id, owner));86 Ok(balance.into())87 }88 #[weight(<SelfWeightOf<T>>::transfer())]89 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {90 let caller = T::CrossAccountId::from_eth(caller);91 let to = T::CrossAccountId::from_eth(to);92 let amount = amount.try_into().map_err(|_| "amount overflow")?;93 let budget = self94 .recorder95 .weight_calls_budget(<StructureWeight<T>>::find_parent());9697 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;98 Ok(true)99 }100101 #[weight(<SelfWeightOf<T>>::transfer_from())]102 fn transfer_from(103 &mut self,104 caller: caller,105 from: address,106 to: address,107 amount: uint256,108 ) -> Result<bool> {109 let caller = T::CrossAccountId::from_eth(caller);110 let from = T::CrossAccountId::from_eth(from);111 let to = T::CrossAccountId::from_eth(to);112 let amount = amount.try_into().map_err(|_| "amount overflow")?;113 let budget = self114 .recorder115 .weight_calls_budget(<StructureWeight<T>>::find_parent());116117 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)118 .map_err(dispatch_to_evm::<T>)?;119 Ok(true)120 }121 #[weight(<SelfWeightOf<T>>::approve())]122 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {123 let caller = T::CrossAccountId::from_eth(caller);124 let spender = T::CrossAccountId::from_eth(spender);125 let amount = amount.try_into().map_err(|_| "amount overflow")?;126127 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)128 .map_err(dispatch_to_evm::<T>)?;129 Ok(true)130 }131 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {132 self.consume_store_reads(1)?;133 let owner = T::CrossAccountId::from_eth(owner);134 let spender = T::CrossAccountId::from_eth(spender);135136 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())137 }138139 /// @notice Returns collection helper contract address140 fn collection_helper_address(&self) -> Result<address> {141 Ok(T::ContractAddress::get())142 }143}144145#[solidity_interface(name = ERC20Mintable)]146impl<T: Config> FungibleHandle<T> {147 /// Mint tokens for `to` account.148 /// @param to account that will receive minted tokens149 /// @param amount amount of tokens to mint150 #[weight(<SelfWeightOf<T>>::create_item())]151 fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {152 let caller = T::CrossAccountId::from_eth(caller);153 let to = T::CrossAccountId::from_eth(to);154 let amount = amount.try_into().map_err(|_| "amount overflow")?;155 let budget = self156 .recorder157 .weight_calls_budget(<StructureWeight<T>>::find_parent());158 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)159 .map_err(dispatch_to_evm::<T>)?;160 Ok(true)161 }162}163164#[solidity_interface(name = ERC20UniqueExtensions)]165impl<T: Config> FungibleHandle<T>166where167 T::AccountId: From<[u8; 32]>,168{169 /// @notice A description for the collection.170 fn description(&self) -> Result<string> {171 Ok(decode_utf16(self.description.iter().copied())172 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))173 .collect::<string>())174 }175176 #[weight(<SelfWeightOf<T>>::create_item())]177 fn mint_cross(178 &mut self,179 caller: caller,180 to: pallet_common::eth::CrossAddress,181 amount: uint256,182 ) -> Result<bool> {183 let caller = T::CrossAccountId::from_eth(caller);184 let to = to.into_sub_cross_account::<T>()?;185 let amount = amount.try_into().map_err(|_| "amount overflow")?;186 let budget = self187 .recorder188 .weight_calls_budget(<StructureWeight<T>>::find_parent());189 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)190 .map_err(dispatch_to_evm::<T>)?;191 Ok(true)192 }193194 #[weight(<SelfWeightOf<T>>::approve())]195 fn approve_cross(196 &mut self,197 caller: caller,198 spender: pallet_common::eth::CrossAddress,199 amount: uint256,200 ) -> Result<bool> {201 let caller = T::CrossAccountId::from_eth(caller);202 let spender = spender.into_sub_cross_account::<T>()?;203 let amount = amount.try_into().map_err(|_| "amount overflow")?;204205 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)206 .map_err(dispatch_to_evm::<T>)?;207 Ok(true)208 }209210 /// Burn tokens from account211 /// @dev Function that burns an `amount` of the tokens of a given account,212 /// deducting from the sender's allowance for said account.213 /// @param from The account whose tokens will be burnt.214 /// @param amount The amount that will be burnt.215 #[solidity(hide)]216 #[weight(<SelfWeightOf<T>>::burn_from())]217 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {218 let caller = T::CrossAccountId::from_eth(caller);219 let from = T::CrossAccountId::from_eth(from);220 let amount = amount.try_into().map_err(|_| "amount overflow")?;221 let budget = self222 .recorder223 .weight_calls_budget(<StructureWeight<T>>::find_parent());224225 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)226 .map_err(dispatch_to_evm::<T>)?;227 Ok(true)228 }229230 /// Burn tokens from account231 /// @dev Function that burns an `amount` of the tokens of a given account,232 /// deducting from the sender's allowance for said account.233 /// @param from The account whose tokens will be burnt.234 /// @param amount The amount that will be burnt.235 #[weight(<SelfWeightOf<T>>::burn_from())]236 fn burn_from_cross(237 &mut self,238 caller: caller,239 from: pallet_common::eth::CrossAddress,240 amount: uint256,241 ) -> Result<bool> {242 let caller = T::CrossAccountId::from_eth(caller);243 let from = from.into_sub_cross_account::<T>()?;244 let amount = amount.try_into().map_err(|_| "amount overflow")?;245 let budget = self246 .recorder247 .weight_calls_budget(<StructureWeight<T>>::find_parent());248249 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)250 .map_err(dispatch_to_evm::<T>)?;251 Ok(true)252 }253254 /// Mint tokens for multiple accounts.255 /// @param amounts array of pairs of account address and amount256 #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]257 fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {258 let caller = T::CrossAccountId::from_eth(caller);259 let budget = self260 .recorder261 .weight_calls_budget(<StructureWeight<T>>::find_parent());262 let amounts = amounts263 .into_iter()264 .map(|(to, amount)| {265 Ok((266 T::CrossAccountId::from_eth(to),267 amount.try_into().map_err(|_| "amount overflow")?,268 ))269 })270 .collect::<Result<_>>()?;271272 <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)273 .map_err(dispatch_to_evm::<T>)?;274 Ok(true)275 }276277 #[weight(<SelfWeightOf<T>>::transfer())]278 fn transfer_cross(279 &mut self,280 caller: caller,281 to: pallet_common::eth::CrossAddress,282 amount: uint256,283 ) -> Result<bool> {284 let caller = T::CrossAccountId::from_eth(caller);285 let to = to.into_sub_cross_account::<T>()?;286 let amount = amount.try_into().map_err(|_| "amount overflow")?;287 let budget = self288 .recorder289 .weight_calls_budget(<StructureWeight<T>>::find_parent());290291 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;292 Ok(true)293 }294295 #[weight(<SelfWeightOf<T>>::transfer_from())]296 fn transfer_from_cross(297 &mut self,298 caller: caller,299 from: pallet_common::eth::CrossAddress,300 to: pallet_common::eth::CrossAddress,301 amount: uint256,302 ) -> Result<bool> {303 let caller = T::CrossAccountId::from_eth(caller);304 let from = from.into_sub_cross_account::<T>()?;305 let to = to.into_sub_cross_account::<T>()?;306 let amount = amount.try_into().map_err(|_| "amount overflow")?;307 let budget = self308 .recorder309 .weight_calls_budget(<StructureWeight<T>>::find_parent());310311 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)312 .map_err(dispatch_to_evm::<T>)?;313 Ok(true)314 }315}316317#[solidity_interface(318 name = UniqueFungible,319 is(320 ERC20,321 ERC20Mintable,322 ERC20UniqueExtensions,323 Collection(via(common_mut returns CollectionHandle<T>)),324 )325)]326impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}327328generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);329generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);330331impl<T: Config> CommonEvmHandler for FungibleHandle<T>332where333 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,334{335 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");336337 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {338 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)339 }340}pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- 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()?;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- 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()?;
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- 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)
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- 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!(