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.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#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![macro_use]20#![cfg_attr(not(feature = "std"), no_std)]21#[cfg(not(feature = "std"))]22extern crate alloc;2324use abi::{AbiRead, AbiReader, AbiWriter};25pub use evm_coder_procedural::{event_topic, fn_selector};26pub mod abi;27pub use events::{ToLog, ToTopic};28use execution::DispatchInfo;29pub mod execution;30#[macro_use]31pub mod custom_signature;3233/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]34/// and [`crate::Call`] from impl block.35///36/// ## Macro syntax37///38/// `#[solidity_interface(name, is, inline_is, events)]`39/// - *name* - used in generated code, and for Call enum name40/// - *is* - used to provide inheritance in Solidity41/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true42/// if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`43/// SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return44/// false.45///46/// `#[weight(value)]`47/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which48/// is used by substrate bridge.49/// - *value*: expression, which evaluates to weight required to call this method.50/// This expression can use call arguments to calculate non-constant execution time.51/// This expression should evaluate faster than actual execution does, and may provide worse case52/// than one is called.53///54/// `#[solidity_interface(rename_selector)]`55/// - *rename_selector* - by default, selector name will be generated by transforming method name56/// from snake_case to camelCase. Use this option, if other naming convention is required.57/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name58/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`59/// explicitly.60///61/// Both contract and contract methods may have doccomments, which will end up in a generated62/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro63///64/// ## Example65///66/// ```ignore67/// struct SuperContract;68/// struct InlineContract;69/// struct Contract;70///71/// #[derive(ToLog)]72/// enum ContractEvents {73/// Event(#[indexed] uint32),74/// }75///76/// /// @dev This contract provides function to multiply two numbers77/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]78/// impl Contract {79/// /// Multiply two numbers80/// /// @param a First number81/// /// @param b Second number82/// /// @return uint32 Product of two passed numbers83/// /// @dev This function returns error in case of overflow84/// #[weight(200 + a + b)]85/// #[solidity_interface(rename_selector = "mul")]86/// fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {87/// Ok(a.checked_mul(b).ok_or("overflow")?)88/// }89/// }90/// ```91pub use evm_coder_procedural::solidity_interface;92/// See [`solidity_interface`]93pub use evm_coder_procedural::solidity;94/// See [`solidity_interface`]95pub use evm_coder_procedural::weight;96pub use evm_coder_procedural::AbiCoder;97pub use sha3_const;9899/// Derives [`ToLog`] for enum100///101/// Selectors will be derived from variant names, there is currently no way to have custom naming102/// for them103///104/// `#[indexed]`105/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data106pub use evm_coder_procedural::ToLog;107108// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros109#[doc(hidden)]110pub mod events;111#[doc(hidden)]112#[cfg(feature = "stubgen")]113pub mod solidity;114115/// Sealed traits.116pub mod sealed {117 /// Not every type should be directly placed in vec.118 /// Vec encoding is not memory efficient, as every item will be padded119 /// to 32 bytes.120 /// Instead you should use specialized types (`bytes` in case of `Vec<u8>`)121 pub trait CanBePlacedInVec {}122}123124/// Solidity type definitions (aliases from solidity name to rust type)125/// To be used in [`solidity_interface`] definitions, to make sure there is no126/// type conflict between Rust code and generated definitions127pub mod types {128 #![allow(non_camel_case_types, missing_docs)]129130 #[cfg(not(feature = "std"))]131 use alloc::{vec::Vec};132 use primitive_types::{U256, H160, H256};133134 pub type address = H160;135 pub type uint8 = u8;136 pub type uint16 = u16;137 pub type uint32 = u32;138 pub type uint64 = u64;139 pub type uint128 = u128;140 pub type uint256 = U256;141 pub type bytes4 = [u8; 4];142 pub type topic = H256;143144 #[cfg(not(feature = "std"))]145 pub type string = ::alloc::string::String;146 #[cfg(feature = "std")]147 pub type string = ::std::string::String;148149 #[derive(Default, Debug, PartialEq, Eq, Clone)]150 pub struct bytes(pub Vec<u8>);151152 /// Solidity doesn't have `void` type, however we have special implementation153 /// for empty tuple return type154 pub type void = ();155156 //#region Special types157 /// Makes function payable158 pub type value = U256;159 /// Makes function caller-sensitive160 pub type caller = address;161 //#endregion162163 /// Ethereum typed call message, similar to solidity164 /// `msg` object.165 pub struct Msg<C> {166 pub call: C,167 /// Address of user, which called this contract.168 pub caller: H160,169 /// Payment amount to contract.170 /// Contract should reject payment, if target call is not payable,171 /// and there is no `receiver()` function defined.172 pub value: U256,173 }174175 impl From<Vec<u8>> for bytes {176 fn from(src: Vec<u8>) -> Self {177 Self(src)178 }179 }180181 #[allow(clippy::from_over_into)]182 impl Into<Vec<u8>> for bytes {183 fn into(self) -> Vec<u8> {184 self.0185 }186 }187188 impl bytes {189 #[must_use]190 pub fn len(&self) -> usize {191 self.0.len()192 }193194 #[must_use]195 pub fn is_empty(&self) -> bool {196 self.len() == 0197 }198 }199}200201/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro202pub trait Call: Sized {203 /// Parse call buffer into typed call enum204 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;205}206207/// Intended to be used as `#[weight]` output type208/// Should be same between evm-coder and substrate to avoid confusion209///210/// Isn't same thing as gas, some mapping is required between those types211pub type Weight = frame_support::weights::Weight;212213/// In substrate, we have benchmarking, which allows214/// us to not rely on gas metering, but instead predict amount of gas to execute call215pub trait Weighted: Call {216 /// Predict weight of this call217 fn weight(&self) -> DispatchInfo;218}219220/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro221/// on interface implementation, or for externally-owned real EVM contract222pub trait Callable<C: Call> {223 /// Call contract using specified call data224 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;225}226227/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],228/// this structure holds parsed data for ERC165Call subvariant229///230/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every231/// implementing contract232///233/// See <https://eips.ethereum.org/EIPS/eip-165>234#[derive(Debug)]235pub enum ERC165Call {236 /// ERC165 provides single method, which returns true, if contract237 /// implements specified interface238 SupportsInterface {239 /// Requested interface240 interface_id: types::bytes4,241 },242}243244impl ERC165Call {245 /// ERC165 selector is provided by standard246 pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);247}248249impl Call for ERC165Call {250 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {251 if selector != Self::INTERFACE_ID {252 return Ok(None);253 }254 Ok(Some(Self::SupportsInterface {255 interface_id: types::bytes4::abi_read(input)?,256 }))257 }258}259260/// Generate "tests", which will generate solidity code on execution and print it to stdout261/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime262///263/// This macro receives type usage as second argument, but you can use anything as generics,264/// because no bounds are implied265#[macro_export]266macro_rules! generate_stubgen {267 ($name:ident, $decl:ty, $is_impl:literal) => {268 #[cfg(feature = "stubgen")]269 #[test]270 #[ignore]271 fn $name() {272 use evm_coder::solidity::TypeCollector;273 let mut out = TypeCollector::new();274 <$decl>::generate_solidity_interface(&mut out, $is_impl);275 println!("=== SNIP START ===");276 println!("// SPDX-License-Identifier: OTHER");277 println!("// This code is automatically generated");278 println!();279 println!("pragma solidity >=0.8.0 <0.9.0;");280 println!();281 for b in out.finish() {282 println!("{}", b);283 }284 println!("=== SNIP END ===");285 }286 };287}288289#[cfg(test)]290mod tests {291 use super::*;292293 #[test]294 fn function_selector_generation() {295 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);296 }297298 #[test]299 fn event_topic_generation() {300 assert_eq!(301 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),302 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",303 );304 }305}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#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![macro_use]20#![cfg_attr(not(feature = "std"), no_std)]21#[cfg(not(feature = "std"))]22extern crate alloc;2324use abi::{AbiRead, AbiReader, AbiWriter};25pub use evm_coder_procedural::{event_topic, fn_selector};26pub mod abi;27pub use events::{ToLog, ToTopic};28use execution::DispatchInfo;29pub mod execution;30#[macro_use]31pub mod custom_signature;3233/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]34/// and [`crate::Call`] from impl block.35///36/// ## Macro syntax37///38/// `#[solidity_interface(name, is, inline_is, events)]`39/// - *name* - used in generated code, and for Call enum name40/// - *is* - used to provide inheritance in Solidity41/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true42/// if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`43/// SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return44/// false.45///46/// `#[weight(value)]`47/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which48/// is used by substrate bridge.49/// - *value*: expression, which evaluates to weight required to call this method.50/// This expression can use call arguments to calculate non-constant execution time.51/// This expression should evaluate faster than actual execution does, and may provide worse case52/// than one is called.53///54/// `#[solidity_interface(rename_selector)]`55/// - *rename_selector* - by default, selector name will be generated by transforming method name56/// from snake_case to camelCase. Use this option, if other naming convention is required.57/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name58/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`59/// explicitly.60///61/// Both contract and contract methods may have doccomments, which will end up in a generated62/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro63///64/// ## Example65///66/// ```ignore67/// struct SuperContract;68/// struct InlineContract;69/// struct Contract;70///71/// #[derive(ToLog)]72/// enum ContractEvents {73/// Event(#[indexed] uint32),74/// }75///76/// /// @dev This contract provides function to multiply two numbers77/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]78/// impl Contract {79/// /// Multiply two numbers80/// /// @param a First number81/// /// @param b Second number82/// /// @return uint32 Product of two passed numbers83/// /// @dev This function returns error in case of overflow84/// #[weight(200 + a + b)]85/// #[solidity_interface(rename_selector = "mul")]86/// fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {87/// Ok(a.checked_mul(b).ok_or("overflow")?)88/// }89/// }90/// ```91pub use evm_coder_procedural::solidity_interface;92/// See [`solidity_interface`]93pub use evm_coder_procedural::solidity;94/// See [`solidity_interface`]95pub use evm_coder_procedural::weight;96pub use evm_coder_procedural::AbiCoder;97pub use sha3_const;9899/// Derives [`ToLog`] for enum100///101/// Selectors will be derived from variant names, there is currently no way to have custom naming102/// for them103///104/// `#[indexed]`105/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data106pub use evm_coder_procedural::ToLog;107108// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros109#[doc(hidden)]110pub mod events;111#[doc(hidden)]112#[cfg(feature = "stubgen")]113pub mod solidity;114115/// Sealed traits.116pub mod sealed {117 /// Not every type should be directly placed in vec.118 /// Vec encoding is not memory efficient, as every item will be padded119 /// to 32 bytes.120 /// Instead you should use specialized types (`bytes` in case of `Vec<u8>`)121 pub trait CanBePlacedInVec {}122}123124/// Solidity type definitions (aliases from solidity name to rust type)125/// To be used in [`solidity_interface`] definitions, to make sure there is no126/// type conflict between Rust code and generated definitions127pub mod types {128 #![allow(non_camel_case_types, missing_docs)]129130 #[cfg(not(feature = "std"))]131 use alloc::{vec::Vec};132 use primitive_types::{U256, H160, H256};133134 pub type address = H160;135 pub type uint256 = U256;136 pub type bytes4 = [u8; 4];137 pub type topic = H256;138139 #[cfg(not(feature = "std"))]140 pub type string = ::alloc::string::String;141 #[cfg(feature = "std")]142 pub type string = ::std::string::String;143144 #[derive(Default, Debug, PartialEq, Eq, Clone)]145 pub struct bytes(pub Vec<u8>);146147 //#region Special types148 /// Makes function payable149 pub type value = U256;150 /// Makes function caller-sensitive151 pub type caller = address;152 //#endregion153154 /// Ethereum typed call message, similar to solidity155 /// `msg` object.156 pub struct Msg<C> {157 pub call: C,158 /// Address of user, which called this contract.159 pub caller: H160,160 /// Payment amount to contract.161 /// Contract should reject payment, if target call is not payable,162 /// and there is no `receiver()` function defined.163 pub value: U256,164 }165166 impl From<Vec<u8>> for bytes {167 fn from(src: Vec<u8>) -> Self {168 Self(src)169 }170 }171172 #[allow(clippy::from_over_into)]173 impl Into<Vec<u8>> for bytes {174 fn into(self) -> Vec<u8> {175 self.0176 }177 }178179 impl bytes {180 #[must_use]181 pub fn len(&self) -> usize {182 self.0.len()183 }184185 #[must_use]186 pub fn is_empty(&self) -> bool {187 self.len() == 0188 }189 }190}191192/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro193pub trait Call: Sized {194 /// Parse call buffer into typed call enum195 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;196}197198/// Intended to be used as `#[weight]` output type199/// Should be same between evm-coder and substrate to avoid confusion200///201/// Isn't same thing as gas, some mapping is required between those types202pub type Weight = frame_support::weights::Weight;203204/// In substrate, we have benchmarking, which allows205/// us to not rely on gas metering, but instead predict amount of gas to execute call206pub trait Weighted: Call {207 /// Predict weight of this call208 fn weight(&self) -> DispatchInfo;209}210211/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro212/// on interface implementation, or for externally-owned real EVM contract213pub trait Callable<C: Call> {214 /// Call contract using specified call data215 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;216}217218/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],219/// this structure holds parsed data for ERC165Call subvariant220///221/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every222/// implementing contract223///224/// See <https://eips.ethereum.org/EIPS/eip-165>225#[derive(Debug)]226pub enum ERC165Call {227 /// ERC165 provides single method, which returns true, if contract228 /// implements specified interface229 SupportsInterface {230 /// Requested interface231 interface_id: types::bytes4,232 },233}234235impl ERC165Call {236 /// ERC165 selector is provided by standard237 pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);238}239240impl Call for ERC165Call {241 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {242 if selector != Self::INTERFACE_ID {243 return Ok(None);244 }245 Ok(Some(Self::SupportsInterface {246 interface_id: types::bytes4::abi_read(input)?,247 }))248 }249}250251/// Generate "tests", which will generate solidity code on execution and print it to stdout252/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime253///254/// This macro receives type usage as second argument, but you can use anything as generics,255/// because no bounds are implied256#[macro_export]257macro_rules! generate_stubgen {258 ($name:ident, $decl:ty, $is_impl:literal) => {259 #[cfg(feature = "stubgen")]260 #[test]261 #[ignore]262 fn $name() {263 use evm_coder::solidity::TypeCollector;264 let mut out = TypeCollector::new();265 <$decl>::generate_solidity_interface(&mut out, $is_impl);266 println!("=== SNIP START ===");267 println!("// SPDX-License-Identifier: OTHER");268 println!("// This code is automatically generated");269 println!();270 println!("pragma solidity >=0.8.0 <0.9.0;");271 println!();272 for b in out.finish() {273 println!("{}", b);274 }275 println!("=== SNIP END ===");276 }277 };278}279280#[cfg(test)]281mod tests {282 use super::*;283284 #[test]285 fn function_selector_generation() {286 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);287 }288289 #[test]290 fn event_topic_generation() {291 assert_eq!(292 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),293 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",294 );295 }296}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.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!(