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.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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<void> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<Option<eth::CrossAddress>> {179 Ok(match Pallet::<T>::get_sponsor(contract_address) {180 Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),181 None => None,182 })183 }184185 /// Check tat contract has confirmed sponsor.186 ///187 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188 /// @return **true** if contract has confirmed sponsor.189 fn has_sponsor(&self, contract_address: address) -> Result<bool> {190 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191 }192193 /// Check tat contract has pending sponsor.194 ///195 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.196 /// @return **true** if contract has pending sponsor.197 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198 Ok(match Sponsoring::<T>::get(contract_address) {199 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200 SponsorshipState::Unconfirmed(_) => true,201 })202 }203204 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206 }207208 fn set_sponsoring_mode(209 &mut self,210 caller: caller,211 contract_address: address,212 mode: SponsoringModeT,213 ) -> Result<void> {214 self.recorder().consume_sload()?;215 self.recorder().consume_sstore()?;216217 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;218 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);219220 Ok(())221 }222223 /// Get current contract sponsoring rate limit224 /// @param contractAddress Contract to get sponsoring rate limit of225 /// @return uint32 Amount of blocks between two sponsored transactions226 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {227 self.recorder().consume_sload()?;228229 Ok(<SponsoringRateLimit<T>>::get(contract_address)230 .try_into()231 .map_err(|_| "rate limit > u32::MAX")?)232 }233234 /// Set contract sponsoring rate limit235 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should236 /// pass between two sponsored transactions237 /// @param contractAddress Contract to change sponsoring rate limit of238 /// @param rateLimit Target rate limit239 /// @dev Only contract owner can change this setting240 fn set_sponsoring_rate_limit(241 &mut self,242 caller: caller,243 contract_address: address,244 rate_limit: uint32,245 ) -> Result<void> {246 self.recorder().consume_sload()?;247 self.recorder().consume_sstore()?;248249 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;250 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());251 Ok(())252 }253254 /// Set contract sponsoring fee limit255 /// @dev Sponsoring fee limit - is maximum fee that could be spent by256 /// single transaction257 /// @param contractAddress Contract to change sponsoring fee limit of258 /// @param feeLimit Fee limit259 /// @dev Only contract owner can change this setting260 fn set_sponsoring_fee_limit(261 &mut self,262 caller: caller,263 contract_address: address,264 fee_limit: uint256,265 ) -> Result<void> {266 self.recorder().consume_sload()?;267 self.recorder().consume_sstore()?;268269 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;270 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())271 .map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Get current contract sponsoring fee limit276 /// @param contractAddress Contract to get sponsoring fee limit of277 /// @return uint256 Maximum amount of fee that could be spent by single278 /// transaction279 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {280 self.recorder().consume_sload()?;281282 Ok(get_sponsoring_fee_limit::<T>(contract_address))283 }284285 /// Is specified user present in contract allow list286 /// @dev Contract owner always implicitly included287 /// @param contractAddress Contract to check allowlist of288 /// @param user User to check289 /// @return bool Is specified users exists in contract allowlist290 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {291 self.0.consume_sload()?;292 Ok(<Pallet<T>>::allowed(contract_address, user))293 }294295 /// Toggle user presence in contract allowlist296 /// @param contractAddress Contract to change allowlist of297 /// @param user Which user presence should be toggled298 /// @param isAllowed `true` if user should be allowed to be sponsored299 /// or call this contract, `false` otherwise300 /// @dev Only contract owner can change this setting301 fn toggle_allowed(302 &mut self,303 caller: caller,304 contract_address: address,305 user: address,306 is_allowed: bool,307 ) -> Result<void> {308 self.recorder().consume_sload()?;309 self.recorder().consume_sstore()?;310311 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;312 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);313314 Ok(())315 }316317 /// Is this contract has allowlist access enabled318 /// @dev Allowlist always can have users, and it is used for two purposes:319 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist320 /// in case of allowlist access enabled, only users from allowlist may call this contract321 /// @param contractAddress Contract to get allowlist access of322 /// @return bool Is specified contract has allowlist access enabled323 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {324 Ok(<AllowlistEnabled<T>>::get(contract_address))325 }326327 /// Toggle contract allowlist access328 /// @param contractAddress Contract to change allowlist access of329 /// @param enabled Should allowlist access to be enabled?330 fn toggle_allowlist(331 &mut self,332 caller: caller,333 contract_address: address,334 enabled: bool,335 ) -> Result<void> {336 self.recorder().consume_sload()?;337 self.recorder().consume_sstore()?;338339 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;340 <Pallet<T>>::toggle_allowlist(contract_address, enabled);341 Ok(())342 }343}344345/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]346pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);347impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>348where349 T::AccountId: AsRef<[u8; 32]>,350{351 fn is_reserved(contract: &sp_core::H160) -> bool {352 contract == &T::ContractAddress::get()353 }354355 fn is_used(contract: &sp_core::H160) -> bool {356 contract == &T::ContractAddress::get()357 }358359 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {360 // TODO: Extract to another OnMethodCall handler361 if <AllowlistEnabled<T>>::get(handle.code_address())362 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)363 {364 return Some(Err(PrecompileFailure::Revert {365 exit_status: ExitRevert::Reverted,366 output: {367 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));368 writer.string("Target contract is allowlisted");369 writer.finish()370 },371 }));372 }373374 if handle.code_address() != T::ContractAddress::get() {375 return None;376 }377378 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));379 pallet_evm_coder_substrate::call(handle, helpers)380 }381382 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {383 (contract == &T::ContractAddress::get())384 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())385 }386}387388/// Hooks into contract creation, storing owner of newly deployed contract389pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);390impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {391 fn on_create(owner: H160, contract: H160) {392 <Owner<T>>::insert(contract, owner);393 }394}395396/// Bridge to pallet-sponsoring397pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);398impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>399 for HelpersContractSponsoring<T>400{401 fn get_sponsor(402 who: &T::CrossAccountId,403 call_context: &CallContext,404 ) -> Option<T::CrossAccountId> {405 let contract_address = call_context.contract_address;406 let mode = <Pallet<T>>::sponsoring_mode(contract_address);407 if mode == SponsoringModeT::Disabled {408 return None;409 }410411 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {412 Some(sponsor) => sponsor,413 None => return None,414 };415416 if mode == SponsoringModeT::Allowlisted417 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())418 {419 return None;420 }421 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;422423 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {424 let limit = <SponsoringRateLimit<T>>::get(contract_address);425426 let timeout = last_tx_block + limit;427 if block_number < timeout {428 return None;429 }430 }431432 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);433434 if call_context.max_fee > sponsored_fee_limit {435 return None;436 }437438 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);439440 Some(sponsor)441 }442}443444fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {445 <SponsoringFeeLimit<T>>::get(contract_address)446 .get(&0xffffffff)447 .cloned()448 .unwrap_or(U256::MAX)449}450451generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);452generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<()> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<Option<eth::CrossAddress>> {179 Ok(match Pallet::<T>::get_sponsor(contract_address) {180 Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),181 None => None,182 })183 }184185 /// Check tat contract has confirmed sponsor.186 ///187 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188 /// @return **true** if contract has confirmed sponsor.189 fn has_sponsor(&self, contract_address: address) -> Result<bool> {190 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191 }192193 /// Check tat contract has pending sponsor.194 ///195 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.196 /// @return **true** if contract has pending sponsor.197 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198 Ok(match Sponsoring::<T>::get(contract_address) {199 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200 SponsorshipState::Unconfirmed(_) => true,201 })202 }203204 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206 }207208 fn set_sponsoring_mode(209 &mut self,210 caller: caller,211 contract_address: address,212 mode: SponsoringModeT,213 ) -> Result<()> {214 self.recorder().consume_sload()?;215 self.recorder().consume_sstore()?;216217 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;218 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);219220 Ok(())221 }222223 /// Get current contract sponsoring rate limit224 /// @param contractAddress Contract to get sponsoring rate limit of225 /// @return uint32 Amount of blocks between two sponsored transactions226 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {227 self.recorder().consume_sload()?;228229 Ok(<SponsoringRateLimit<T>>::get(contract_address)230 .try_into()231 .map_err(|_| "rate limit > u32::MAX")?)232 }233234 /// Set contract sponsoring rate limit235 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should236 /// pass between two sponsored transactions237 /// @param contractAddress Contract to change sponsoring rate limit of238 /// @param rateLimit Target rate limit239 /// @dev Only contract owner can change this setting240 fn set_sponsoring_rate_limit(241 &mut self,242 caller: caller,243 contract_address: address,244 rate_limit: u32,245 ) -> Result<()> {246 self.recorder().consume_sload()?;247 self.recorder().consume_sstore()?;248249 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;250 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());251 Ok(())252 }253254 /// Set contract sponsoring fee limit255 /// @dev Sponsoring fee limit - is maximum fee that could be spent by256 /// single transaction257 /// @param contractAddress Contract to change sponsoring fee limit of258 /// @param feeLimit Fee limit259 /// @dev Only contract owner can change this setting260 fn set_sponsoring_fee_limit(261 &mut self,262 caller: caller,263 contract_address: address,264 fee_limit: uint256,265 ) -> Result<()> {266 self.recorder().consume_sload()?;267 self.recorder().consume_sstore()?;268269 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;270 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())271 .map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Get current contract sponsoring fee limit276 /// @param contractAddress Contract to get sponsoring fee limit of277 /// @return uint256 Maximum amount of fee that could be spent by single278 /// transaction279 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {280 self.recorder().consume_sload()?;281282 Ok(get_sponsoring_fee_limit::<T>(contract_address))283 }284285 /// Is specified user present in contract allow list286 /// @dev Contract owner always implicitly included287 /// @param contractAddress Contract to check allowlist of288 /// @param user User to check289 /// @return bool Is specified users exists in contract allowlist290 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {291 self.0.consume_sload()?;292 Ok(<Pallet<T>>::allowed(contract_address, user))293 }294295 /// Toggle user presence in contract allowlist296 /// @param contractAddress Contract to change allowlist of297 /// @param user Which user presence should be toggled298 /// @param isAllowed `true` if user should be allowed to be sponsored299 /// or call this contract, `false` otherwise300 /// @dev Only contract owner can change this setting301 fn toggle_allowed(302 &mut self,303 caller: caller,304 contract_address: address,305 user: address,306 is_allowed: bool,307 ) -> Result<()> {308 self.recorder().consume_sload()?;309 self.recorder().consume_sstore()?;310311 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;312 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);313314 Ok(())315 }316317 /// Is this contract has allowlist access enabled318 /// @dev Allowlist always can have users, and it is used for two purposes:319 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist320 /// in case of allowlist access enabled, only users from allowlist may call this contract321 /// @param contractAddress Contract to get allowlist access of322 /// @return bool Is specified contract has allowlist access enabled323 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {324 Ok(<AllowlistEnabled<T>>::get(contract_address))325 }326327 /// Toggle contract allowlist access328 /// @param contractAddress Contract to change allowlist access of329 /// @param enabled Should allowlist access to be enabled?330 fn toggle_allowlist(331 &mut self,332 caller: caller,333 contract_address: address,334 enabled: bool,335 ) -> Result<()> {336 self.recorder().consume_sload()?;337 self.recorder().consume_sstore()?;338339 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;340 <Pallet<T>>::toggle_allowlist(contract_address, enabled);341 Ok(())342 }343}344345/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]346pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);347impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>348where349 T::AccountId: AsRef<[u8; 32]>,350{351 fn is_reserved(contract: &sp_core::H160) -> bool {352 contract == &T::ContractAddress::get()353 }354355 fn is_used(contract: &sp_core::H160) -> bool {356 contract == &T::ContractAddress::get()357 }358359 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {360 // TODO: Extract to another OnMethodCall handler361 if <AllowlistEnabled<T>>::get(handle.code_address())362 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)363 {364 return Some(Err(PrecompileFailure::Revert {365 exit_status: ExitRevert::Reverted,366 output: {367 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));368 writer.string("Target contract is allowlisted");369 writer.finish()370 },371 }));372 }373374 if handle.code_address() != T::ContractAddress::get() {375 return None;376 }377378 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));379 pallet_evm_coder_substrate::call(handle, helpers)380 }381382 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {383 (contract == &T::ContractAddress::get())384 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())385 }386}387388/// Hooks into contract creation, storing owner of newly deployed contract389pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);390impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {391 fn on_create(owner: H160, contract: H160) {392 <Owner<T>>::insert(contract, owner);393 }394}395396/// Bridge to pallet-sponsoring397pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);398impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>399 for HelpersContractSponsoring<T>400{401 fn get_sponsor(402 who: &T::CrossAccountId,403 call_context: &CallContext,404 ) -> Option<T::CrossAccountId> {405 let contract_address = call_context.contract_address;406 let mode = <Pallet<T>>::sponsoring_mode(contract_address);407 if mode == SponsoringModeT::Disabled {408 return None;409 }410411 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {412 Some(sponsor) => sponsor,413 None => return None,414 };415416 if mode == SponsoringModeT::Allowlisted417 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())418 {419 return None;420 }421 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;422423 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {424 let limit = <SponsoringRateLimit<T>>::get(contract_address);425426 let timeout = last_tx_block + limit;427 if block_number < timeout {428 return None;429 }430 }431432 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);433434 if call_context.max_fee > sponsored_fee_limit {435 return None;436 }437438 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);439440 Some(sponsor)441 }442}443444fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {445 <SponsoringFeeLimit<T>>::get(contract_address)446 .get(&0xffffffff)447 .cloned()448 .unwrap_or(U256::MAX)449}450451generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);452generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);pallets/fungible/src/erc.rsdiffbeforeafterboth--- 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 {
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!(