difftreelog
refac: rename string -> String
in: master
16 files changed
crates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -999,7 +999,7 @@
)*),
};
- let mut out = ::evm_coder::types::string::new();
+ let mut out = ::evm_coder::types::String::new();
if #solidity_name.starts_with("Inline") {
out.push_str("/// @dev inlined interface\n");
}
crates/evm-coder/procedural/src/to_log.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/to_log.rs
+++ b/crates/evm-coder/procedural/src/to_log.rs
@@ -222,7 +222,7 @@
#solidity_functions,
)*),
};
- let mut out = string::new();
+ let mut out = ::evm_coder::types::String::new();
out.push_str("/// @dev inlined interface\n");
let _ = interface.format(is_impl, &mut out, tc);
tc.collect(out);
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -63,7 +63,7 @@
impl_abi!(u128, uint128, false);
impl_abi!(U256, uint256, false);
impl_abi!(H160, address, false);
-impl_abi!(string, string, true);
+impl_abi!(String, string, true);
impl_abi_writeable!(&str, string);
crates/evm-coder/src/abi/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/mod.rs
+++ b/crates/evm-coder/src/abi/mod.rs
@@ -148,8 +148,8 @@
}
/// Read [`string`] at current position, then advance
- pub fn string(&mut self) -> Result<string> {
- string::from_utf8(self.bytes()?).map_err(|_| Error::Error(ExitError::InvalidRange))
+ pub fn string(&mut self) -> Result<String> {
+ String::from_utf8(self.bytes()?).map_err(|_| Error::Error(ExitError::InvalidRange))
}
/// Read [`u8`] at current position, then advance
crates/evm-coder/src/abi/test.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/test.rs
+++ b/crates/evm-coder/src/abi/test.rs
@@ -138,7 +138,7 @@
#[test]
fn encode_decode_vec_tuple_uint256_string() {
- test_impl::<Vec<(U256, string)>>(
+ test_impl::<Vec<(U256, String)>>(
0xdeadbeef,
vec![
(1.into(), "Test URI 0".to_string()),
@@ -261,7 +261,7 @@
let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
assert_eq!(call, u32::to_be_bytes(decoded_data.0));
let address = decoder.address().unwrap();
- let data = <Vec<(U256, string)>>::abi_read(&mut decoder).unwrap();
+ let data = <Vec<(U256, String)>>::abi_read(&mut decoder).unwrap();
assert_eq!(data, decoded_data.1);
let mut writer = AbiWriter::new_call(decoded_data.0);
@@ -273,7 +273,7 @@
#[test]
fn encode_decode_vec_tuple_string_bytes() {
- test_impl::<Vec<(string, bytes)>>(
+ test_impl::<Vec<(String, bytes)>>(
0xdeadbeef,
vec![
(
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 Bytes4 = [u8; 4];136 pub type Topic = H256;137138 #[cfg(not(feature = "std"))]139 pub type string = ::alloc::string::String;140 #[cfg(feature = "std")]141 pub type string = ::std::string::String;142143 #[derive(Default, Debug, PartialEq, Eq, Clone)]144 pub struct bytes(pub Vec<u8>);145146 //#region Special types147 /// Makes function payable148 pub type value = U256;149 /// Makes function caller-sensitive150 pub type caller = Address;151 //#endregion152153 /// Ethereum typed call message, similar to solidity154 /// `msg` object.155 pub struct Msg<C> {156 pub call: C,157 /// Address of user, which called this contract.158 pub caller: H160,159 /// Payment amount to contract.160 /// Contract should reject payment, if target call is not payable,161 /// and there is no `receiver()` function defined.162 pub value: U256,163 }164165 impl From<Vec<u8>> for bytes {166 fn from(src: Vec<u8>) -> Self {167 Self(src)168 }169 }170171 #[allow(clippy::from_over_into)]172 impl Into<Vec<u8>> for bytes {173 fn into(self) -> Vec<u8> {174 self.0175 }176 }177178 impl bytes {179 #[must_use]180 pub fn len(&self) -> usize {181 self.0.len()182 }183184 #[must_use]185 pub fn is_empty(&self) -> bool {186 self.len() == 0187 }188 }189}190191/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro192pub trait Call: Sized {193 /// Parse call buffer into typed call enum194 fn parse(selector: types::Bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;195}196197/// Intended to be used as `#[weight]` output type198/// Should be same between evm-coder and substrate to avoid confusion199///200/// Isn't same thing as gas, some mapping is required between those types201pub type Weight = frame_support::weights::Weight;202203/// In substrate, we have benchmarking, which allows204/// us to not rely on gas metering, but instead predict amount of gas to execute call205pub trait Weighted: Call {206 /// Predict weight of this call207 fn weight(&self) -> DispatchInfo;208}209210/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro211/// on interface implementation, or for externally-owned real EVM contract212pub trait Callable<C: Call> {213 /// Call contract using specified call data214 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;215}216217/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],218/// this structure holds parsed data for ERC165Call subvariant219///220/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every221/// implementing contract222///223/// See <https://eips.ethereum.org/EIPS/eip-165>224#[derive(Debug)]225pub enum ERC165Call {226 /// ERC165 provides single method, which returns true, if contract227 /// implements specified interface228 SupportsInterface {229 /// Requested interface230 interface_id: types::Bytes4,231 },232}233234impl ERC165Call {235 /// ERC165 selector is provided by standard236 pub const INTERFACE_ID: types::Bytes4 = u32::to_be_bytes(0x01ffc9a7);237}238239impl Call for ERC165Call {240 fn parse(selector: types::Bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {241 if selector != Self::INTERFACE_ID {242 return Ok(None);243 }244 Ok(Some(Self::SupportsInterface {245 interface_id: types::Bytes4::abi_read(input)?,246 }))247 }248}249250/// Generate "tests", which will generate solidity code on execution and print it to stdout251/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime252///253/// This macro receives type usage as second argument, but you can use anything as generics,254/// because no bounds are implied255#[macro_export]256macro_rules! generate_stubgen {257 ($name:ident, $decl:ty, $is_impl:literal) => {258 #[cfg(feature = "stubgen")]259 #[test]260 #[ignore]261 fn $name() {262 use evm_coder::solidity::TypeCollector;263 let mut out = TypeCollector::new();264 <$decl>::generate_solidity_interface(&mut out, $is_impl);265 println!("=== SNIP START ===");266 println!("// SPDX-License-Identifier: OTHER");267 println!("// This code is automatically generated");268 println!();269 println!("pragma solidity >=0.8.0 <0.9.0;");270 println!();271 for b in out.finish() {272 println!("{}", b);273 }274 println!("=== SNIP END ===");275 }276 };277}278279#[cfg(test)]280mod tests {281 use super::*;282283 #[test]284 fn function_selector_generation() {285 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);286 }287288 #[test]289 fn event_topic_generation() {290 assert_eq!(291 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),292 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",293 );294 }295}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 Bytes4 = [u8; 4];136 pub type Topic = H256;137138 #[cfg(not(feature = "std"))]139 pub type String = ::alloc::string::String;140 #[cfg(feature = "std")]141 pub type String = ::std::string::String;142143 #[derive(Default, Debug, PartialEq, Eq, Clone)]144 pub struct bytes(pub Vec<u8>);145146 //#region Special types147 /// Makes function payable148 pub type value = U256;149 /// Makes function caller-sensitive150 pub type caller = Address;151 //#endregion152153 /// Ethereum typed call message, similar to solidity154 /// `msg` object.155 pub struct Msg<C> {156 pub call: C,157 /// Address of user, which called this contract.158 pub caller: H160,159 /// Payment amount to contract.160 /// Contract should reject payment, if target call is not payable,161 /// and there is no `receiver()` function defined.162 pub value: U256,163 }164165 impl From<Vec<u8>> for bytes {166 fn from(src: Vec<u8>) -> Self {167 Self(src)168 }169 }170171 #[allow(clippy::from_over_into)]172 impl Into<Vec<u8>> for bytes {173 fn into(self) -> Vec<u8> {174 self.0175 }176 }177178 impl bytes {179 #[must_use]180 pub fn len(&self) -> usize {181 self.0.len()182 }183184 #[must_use]185 pub fn is_empty(&self) -> bool {186 self.len() == 0187 }188 }189}190191/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro192pub trait Call: Sized {193 /// Parse call buffer into typed call enum194 fn parse(selector: types::Bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;195}196197/// Intended to be used as `#[weight]` output type198/// Should be same between evm-coder and substrate to avoid confusion199///200/// Isn't same thing as gas, some mapping is required between those types201pub type Weight = frame_support::weights::Weight;202203/// In substrate, we have benchmarking, which allows204/// us to not rely on gas metering, but instead predict amount of gas to execute call205pub trait Weighted: Call {206 /// Predict weight of this call207 fn weight(&self) -> DispatchInfo;208}209210/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro211/// on interface implementation, or for externally-owned real EVM contract212pub trait Callable<C: Call> {213 /// Call contract using specified call data214 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;215}216217/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],218/// this structure holds parsed data for ERC165Call subvariant219///220/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every221/// implementing contract222///223/// See <https://eips.ethereum.org/EIPS/eip-165>224#[derive(Debug)]225pub enum ERC165Call {226 /// ERC165 provides single method, which returns true, if contract227 /// implements specified interface228 SupportsInterface {229 /// Requested interface230 interface_id: types::Bytes4,231 },232}233234impl ERC165Call {235 /// ERC165 selector is provided by standard236 pub const INTERFACE_ID: types::Bytes4 = u32::to_be_bytes(0x01ffc9a7);237}238239impl Call for ERC165Call {240 fn parse(selector: types::Bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {241 if selector != Self::INTERFACE_ID {242 return Ok(None);243 }244 Ok(Some(Self::SupportsInterface {245 interface_id: types::Bytes4::abi_read(input)?,246 }))247 }248}249250/// Generate "tests", which will generate solidity code on execution and print it to stdout251/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime252///253/// This macro receives type usage as second argument, but you can use anything as generics,254/// because no bounds are implied255#[macro_export]256macro_rules! generate_stubgen {257 ($name:ident, $decl:ty, $is_impl:literal) => {258 #[cfg(feature = "stubgen")]259 #[test]260 #[ignore]261 fn $name() {262 use evm_coder::solidity::TypeCollector;263 let mut out = TypeCollector::new();264 <$decl>::generate_solidity_interface(&mut out, $is_impl);265 println!("=== SNIP START ===");266 println!("// SPDX-License-Identifier: OTHER");267 println!("// This code is automatically generated");268 println!();269 println!("pragma solidity >=0.8.0 <0.9.0;");270 println!();271 for b in out.finish() {272 println!("{}", b);273 }274 println!("=== SNIP END ===");275 }276 };277}278279#[cfg(test)]280mod tests {281 use super::*;282283 #[test]284 fn function_selector_generation() {285 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);286 }287288 #[test]289 fn event_topic_generation() {290 assert_eq!(291 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),292 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",293 );294 }295}crates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -29,7 +29,7 @@
U256 => "uint256" true = "0",
Bytes4 => "bytes4" true = "bytes4(0)",
H160 => "address" true = "0x0000000000000000000000000000000000000000",
- string => "string" false = "\"\"",
+ String => "string" false = "\"\"",
bytes => "bytes" false = "hex\"\"",
bool => "bool" true = "false",
}
@@ -72,10 +72,10 @@
macro_rules! impl_tuples {
($($ident:ident)+) => {
impl<$($ident: SolidityTypeName + 'static),+> SolidityTupleTy for ($($ident,)+) {
- fn fields(tc: &TypeCollector) -> Vec<string> {
+ fn fields(tc: &TypeCollector) -> Vec<String> {
let mut collected = Vec::with_capacity(Self::len());
$({
- let mut out = string::new();
+ let mut out = String::new();
$ident::solidity_name(&mut out, tc).expect("no fmt error");
collected.push(out);
})*;
crates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -26,7 +26,7 @@
mod impls;
#[cfg(not(feature = "std"))]
-use alloc::{string::String, vec::Vec, collections::BTreeMap, format};
+use alloc::{vec::Vec, collections::BTreeMap, format};
#[cfg(feature = "std")]
use std::collections::BTreeMap;
use core::{
@@ -42,16 +42,16 @@
pub struct TypeCollector {
/// Code => id
/// id ordering is required to perform topo-sort on the resulting data
- structs: RefCell<BTreeMap<string, usize>>,
- anonymous: RefCell<BTreeMap<Vec<string>, usize>>,
- // generic: RefCell<BTreeMap<string, usize>>,
+ structs: RefCell<BTreeMap<String, usize>>,
+ anonymous: RefCell<BTreeMap<Vec<String>, usize>>,
+ // generic: RefCell<BTreeMap<String, usize>>,
id: Cell<usize>,
}
impl TypeCollector {
pub fn new() -> Self {
Self::default()
}
- pub fn collect(&self, item: string) {
+ pub fn collect(&self, item: String) {
let id = self.next_id();
self.structs.borrow_mut().insert(item, id);
}
@@ -84,7 +84,7 @@
pub fn collect_enum<T: SolidityEnumTy>(&self) -> String {
T::generate_solidity_interface(self)
}
- pub fn finish(self) -> Vec<string> {
+ pub fn finish(self) -> Vec<String> {
let mut data = self.structs.into_inner().into_iter().collect::<Vec<_>>();
data.sort_by_key(|(_, id)| Reverse(*id));
data.into_iter().map(|(code, _)| code).collect()
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -94,7 +94,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<()> {
+ 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()
@@ -130,7 +130,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]
- fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {
+ fn delete_collection_property(&mut self, caller: caller, key: String) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let key = <Vec<u8>>::from(key)
.try_into()
@@ -143,7 +143,7 @@
///
/// @param keys Properties keys.
#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]
- fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {
+ fn delete_collection_properties(&mut self, caller: caller, keys: Vec<String>) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let keys = keys
.into_iter()
@@ -164,7 +164,7 @@
///
/// @param key Property key.
/// @return bytes The property corresponding to the key.
- fn collection_property(&self, key: string) -> Result<bytes> {
+ fn collection_property(&self, key: String) -> Result<bytes> {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -179,7 +179,7 @@
///
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn collection_properties(&self, keys: Vec<String>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -616,7 +616,7 @@
/// Returns collection type
///
/// @return `Fungible` or `NFT` or `ReFungible`
- fn unique_collection_type(&self) -> Result<string> {
+ fn unique_collection_type(&self) -> Result<String> {
let mode = match self.collection.mode {
CollectionMode::Fungible(_) => "Fungible",
CollectionMode::NFT => "NFT",
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -118,7 +118,7 @@
/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
#[derive(Debug, Default, AbiCoder)]
pub struct Property {
- key: evm_coder::types::string,
+ key: evm_coder::types::String,
value: evm_coder::types::bytes,
}
@@ -126,7 +126,7 @@
type Error = evm_coder::execution::Error;
fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {
- let key = evm_coder::types::string::from_utf8(from.key.into())
+ let key = evm_coder::types::String::from_utf8(from.key.into())
.map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;
let value = evm_coder::types::bytes(from.value.to_vec());
Ok(Property { key, value })
@@ -342,7 +342,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct TokenPropertyPermission {
/// Token property key.
- key: evm_coder::types::string,
+ key: evm_coder::types::String,
/// Token property permissions.
permissions: Vec<PropertyPermission>,
}
@@ -360,7 +360,7 @@
),
) -> Self {
let (key, permission) = value;
- let key = evm_coder::types::string::from_utf8(key.into_inner())
+ let key = evm_coder::types::String::from_utf8(key.into_inner())
.expect("Stored key must be valid");
let permissions = PropertyPermission::into_vec(permission);
Self { key, permissions }
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -59,13 +59,13 @@
#[solidity_interface(name = ERC20, events(ERC20Events))]
impl<T: Config> FungibleHandle<T> {
- fn name(&self) -> Result<string> {
+ fn name(&self) -> Result<String> {
Ok(decode_utf16(self.name.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
- fn symbol(&self) -> Result<string> {
- Ok(string::from_utf8_lossy(&self.token_prefix).into())
+ fn symbol(&self) -> Result<String> {
+ Ok(String::from_utf8_lossy(&self.token_prefix).into())
}
fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
@@ -167,10 +167,10 @@
T::AccountId: From<[u8; 32]>,
{
/// @notice A description for the collection.
- fn description(&self) -> Result<string> {
+ fn description(&self) -> Result<String> {
Ok(decode_utf16(self.description.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
#[weight(<SelfWeightOf<T>>::create_item())]
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -64,7 +64,7 @@
fn set_token_property_permission(
&mut self,
caller: caller,
- key: string,
+ key: String,
is_mutable: bool,
collection_admin: bool,
token_owner: bool,
@@ -123,7 +123,7 @@
&mut self,
caller: caller,
token_id: U256,
- key: string,
+ key: String,
value: bytes,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -187,7 +187,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]
- fn delete_property(&mut self, token_id: U256, caller: caller, key: string) -> Result<()> {
+ fn delete_property(&mut self, token_id: U256, caller: caller, key: String) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
@@ -211,7 +211,7 @@
&mut self,
token_id: U256,
caller: caller,
- keys: Vec<string>,
+ keys: Vec<String>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -239,7 +239,7 @@
/// @param tokenId ID of the token.
/// @param key Property key.
/// @return Property value bytes
- fn property(&self, token_id: U256, key: string) -> Result<bytes> {
+ fn property(&self, token_id: U256, key: String) -> Result<bytes> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
.try_into()
@@ -301,14 +301,14 @@
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
#[solidity(hide, rename_selector = "name")]
- fn name_proxy(&self) -> Result<string> {
+ fn name_proxy(&self) -> Result<String> {
self.name()
}
/// @notice An abbreviated name for NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
#[solidity(hide, rename_selector = "symbol")]
- fn symbol_proxy(&self) -> Result<string> {
+ fn symbol_proxy(&self) -> Result<String> {
self.symbol()
}
@@ -322,7 +322,7 @@
///
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: U256) -> Result<string> {
+ fn token_uri(&self, token_id: U256) -> Result<String> {
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -335,7 +335,7 @@
let base_uri =
pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())
.map(BoundedVec::into_inner)
- .map(string::from_utf8)
+ .map(String::from_utf8)
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
@@ -595,7 +595,7 @@
&mut self,
caller: caller,
to: Address,
- token_uri: string,
+ token_uri: String,
) -> Result<U256> {
let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -618,7 +618,7 @@
caller: caller,
to: Address,
token_id: U256,
- token_uri: string,
+ token_uri: String,
) -> Result<bool> {
let key = key::url();
let permission = get_token_permission::<T>(self.id, &key)?;
@@ -670,12 +670,12 @@
collection: &CollectionHandle<T>,
token_id: u32,
key: &up_data_structs::PropertyKey,
-) -> Result<string> {
+) -> Result<String> {
collection.consume_store_reads(1)?;
let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
.map_err(|_| Error::Revert("Token properties not found".into()))?;
if let Some(property) = properties.get(key) {
- return Ok(string::from_utf8_lossy(property).into());
+ return Ok(String::from_utf8_lossy(property).into());
}
Err("Property tokenURI not found".into())
@@ -691,7 +691,7 @@
.get(key)
.map(Clone::clone)
.ok_or_else(|| {
- let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();
+ let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
Error::Revert(alloc::format!("No permission for key {}", key))
})?;
Ok(a)
@@ -704,22 +704,22 @@
T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
- fn name(&self) -> Result<string> {
+ fn name(&self) -> Result<String> {
Ok(decode_utf16(self.name.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
/// @notice An abbreviated name for NFTs in this contract
- fn symbol(&self) -> Result<string> {
- Ok(string::from_utf8_lossy(&self.token_prefix).into())
+ fn symbol(&self) -> Result<String> {
+ Ok(String::from_utf8_lossy(&self.token_prefix).into())
}
/// @notice A description for the collection.
- fn description(&self) -> Result<string> {
+ fn description(&self) -> Result<String> {
Ok(decode_utf16(self.description.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
/// Returns the owner (in cross format) of the token.
@@ -736,7 +736,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(&self, token_id: U256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn properties(&self, token_id: U256, keys: Vec<String>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -948,7 +948,7 @@
&mut self,
caller: caller,
to: Address,
- tokens: Vec<(U256, string)>,
+ tokens: Vec<(U256, String)>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -67,7 +67,7 @@
fn set_token_property_permission(
&mut self,
caller: caller,
- key: string,
+ key: String,
is_mutable: bool,
collection_admin: bool,
token_owner: bool,
@@ -126,7 +126,7 @@
&mut self,
caller: caller,
token_id: U256,
- key: string,
+ key: String,
value: bytes,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -190,7 +190,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]
- fn delete_property(&mut self, token_id: U256, caller: caller, key: string) -> Result<()> {
+ fn delete_property(&mut self, token_id: U256, caller: caller, key: String) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
@@ -214,7 +214,7 @@
&mut self,
token_id: U256,
caller: caller,
- keys: Vec<string>,
+ keys: Vec<String>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -242,7 +242,7 @@
/// @param tokenId ID of the token.
/// @param key Property key.
/// @return Property value bytes
- fn property(&self, token_id: U256, key: string) -> Result<bytes> {
+ fn property(&self, token_id: U256, key: String) -> Result<bytes> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
.try_into()
@@ -298,14 +298,14 @@
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
#[solidity(hide, rename_selector = "name")]
- fn name_proxy(&self) -> Result<string> {
+ fn name_proxy(&self) -> Result<String> {
self.name()
}
/// @notice An abbreviated name for NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
#[solidity(hide, rename_selector = "symbol")]
- fn symbol_proxy(&self) -> Result<string> {
+ fn symbol_proxy(&self) -> Result<String> {
self.symbol()
}
@@ -319,7 +319,7 @@
///
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: U256) -> Result<string> {
+ fn token_uri(&self, token_id: U256) -> Result<String> {
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -332,7 +332,7 @@
let base_uri =
pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())
.map(BoundedVec::into_inner)
- .map(string::from_utf8)
+ .map(String::from_utf8)
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
@@ -631,7 +631,7 @@
&mut self,
caller: caller,
to: Address,
- token_uri: string,
+ token_uri: String,
) -> Result<U256> {
let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -654,7 +654,7 @@
caller: caller,
to: Address,
token_id: U256,
- token_uri: string,
+ token_uri: String,
) -> Result<bool> {
let key = key::url();
let permission = get_token_permission::<T>(self.id, &key)?;
@@ -708,12 +708,12 @@
collection: &CollectionHandle<T>,
token_id: u32,
key: &up_data_structs::PropertyKey,
-) -> Result<string> {
+) -> Result<String> {
collection.consume_store_reads(1)?;
let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
.map_err(|_| Error::Revert("Token properties not found".into()))?;
if let Some(property) = properties.get(key) {
- return Ok(string::from_utf8_lossy(property).into());
+ return Ok(String::from_utf8_lossy(property).into());
}
Err("Property tokenURI not found".into())
@@ -729,7 +729,7 @@
.get(key)
.map(Clone::clone)
.ok_or_else(|| {
- let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();
+ let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
Error::Revert(alloc::format!("No permission for key {}", key))
})?;
Ok(a)
@@ -742,22 +742,22 @@
T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
- fn name(&self) -> Result<string> {
+ fn name(&self) -> Result<String> {
Ok(decode_utf16(self.name.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
/// @notice An abbreviated name for NFTs in this contract
- fn symbol(&self) -> Result<string> {
- Ok(string::from_utf8_lossy(&self.token_prefix).into())
+ fn symbol(&self) -> Result<String> {
+ Ok(String::from_utf8_lossy(&self.token_prefix).into())
}
/// @notice A description for the collection.
- fn description(&self) -> Result<string> {
+ fn description(&self) -> Result<String> {
Ok(decode_utf16(self.description.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
/// Returns the owner (in cross format) of the token.
@@ -774,7 +774,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(&self, token_id: U256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn properties(&self, token_id: U256, keys: Vec<String>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -991,7 +991,7 @@
&mut self,
caller: caller,
to: Address,
- tokens: Vec<(U256, string)>,
+ tokens: Vec<(U256, String)>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -92,15 +92,15 @@
#[solidity_interface(name = ERC20, events(ERC20Events))]
impl<T: Config> RefungibleTokenHandle<T> {
/// @return the name of the token.
- fn name(&self) -> Result<string> {
+ fn name(&self) -> Result<String> {
Ok(decode_utf16(self.name.iter().copied())
.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- .collect::<string>())
+ .collect::<String>())
}
/// @return the symbol of the token.
- fn symbol(&self) -> Result<string> {
- Ok(string::from_utf8_lossy(&self.token_prefix).into())
+ fn symbol(&self) -> Result<String> {
+ Ok(String::from_utf8_lossy(&self.token_prefix).into())
}
/// @dev Total number of tokens in existence
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -57,9 +57,9 @@
fn convert_data<T: Config>(
caller: caller,
- name: string,
- description: string,
- token_prefix: string,
+ name: String,
+ description: String,
+ token_prefix: String,
) -> Result<(
T::CrossAccountId,
CollectionName,
@@ -89,10 +89,10 @@
fn create_collection_internal<T: Config>(
caller: caller,
value: value,
- name: string,
+ name: String,
collection_mode: CollectionMode,
- description: string,
- token_prefix: string,
+ description: String,
+ token_prefix: String,
) -> Result<Address> {
let (caller, name, description, token_prefix) =
convert_data::<T>(caller, name, description, token_prefix)?;
@@ -151,9 +151,9 @@
&mut self,
caller: caller,
value: value,
- name: string,
- description: string,
- token_prefix: string,
+ name: String,
+ description: String,
+ token_prefix: String,
) -> Result<Address> {
let (caller, name, description, token_prefix) =
convert_data::<T>(caller, name, description, token_prefix)?;
@@ -190,9 +190,9 @@
&mut self,
caller: caller,
value: value,
- name: string,
- description: string,
- token_prefix: string,
+ name: String,
+ description: String,
+ token_prefix: String,
) -> Result<Address> {
create_collection_internal::<T>(
caller,
@@ -210,9 +210,9 @@
&mut self,
caller: caller,
value: value,
- name: string,
- description: string,
- token_prefix: string,
+ name: String,
+ description: String,
+ token_prefix: String,
) -> Result<Address> {
create_collection_internal::<T>(
caller,
@@ -230,10 +230,10 @@
&mut self,
caller: caller,
value: value,
- name: string,
+ name: String,
decimals: u8,
- description: string,
- token_prefix: string,
+ description: String,
+ token_prefix: String,
) -> Result<Address> {
create_collection_internal::<T>(
caller,
@@ -250,7 +250,7 @@
&mut self,
caller: caller,
collection: Address,
- base_uri: string,
+ base_uri: String,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let collection =
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -323,7 +323,7 @@
.map(|d| { d.into() })
.collect()
));
- for (index, data) in items_data.into_iter().enumerate() {
+ for (index, _data) in items_data.into_iter().enumerate() {
let balance = <pallet_refungible::Balance<Test>>::get((
CollectionId(1),
TokenId((index + 1) as u32),