difftreelog
fix generate stubs build ans remove warnings
in: master
4 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -1,4 +1,3 @@
-use proc_macro2::TokenStream;
use quote::quote;
pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
@@ -128,7 +127,7 @@
}
}
-fn extract_docs(attrs: &Vec<syn::Attribute>) -> syn::Result<Vec<String>> {
+fn extract_docs(attrs: &[syn::Attribute]) -> syn::Result<Vec<String>> {
attrs
.iter()
.filter_map(|attr| {
@@ -163,7 +162,7 @@
}
}
-fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {
+fn map_field_to_type(field: &syn::Field) -> &syn::Type {
&field.ty
}
@@ -177,7 +176,7 @@
}
}
-fn impl_abi_type<'a>(
+fn impl_abi_type(
name: &syn::Ident,
tuple_type: proc_macro2::TokenStream,
) -> proc_macro2::TokenStream {
@@ -194,7 +193,7 @@
}
}
-fn impl_abi_read<'a>(
+fn impl_abi_read(
name: &syn::Ident,
tuple_type: proc_macro2::TokenStream,
tuple_names: proc_macro2::TokenStream,
@@ -210,9 +209,9 @@
)
}
-fn impl_abi_write<'a>(
+fn impl_abi_write(
name: &syn::Ident,
- is_named_fields: bool,
+ _is_named_fields: bool,
tuple_type: proc_macro2::TokenStream,
tuple_data: proc_macro2::TokenStream,
) -> proc_macro2::TokenStream {
@@ -301,7 +300,7 @@
field_names: impl Iterator<Item = proc_macro2::Ident> + Clone,
field_types: impl Iterator<Item = &'a syn::Type> + Clone,
field_docs: impl Iterator<Item = syn::Result<Vec<String>>> + Clone,
- docs: &Vec<String>,
+ docs: &[String],
) -> syn::Result<proc_macro2::TokenStream> {
let string_name = name.to_string();
let name_type = field_names
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth1use crate::{2 custom_signature::SignatureUnit,3 execution::{Result, ResultWithPostInfo, WithPostDispatchInfo},4 make_signature, sealed,5 types::*,6};7use super::{traits::*, ABI_ALIGNMENT, AbiReader, AbiWriter};8use primitive_types::{U256, H160};910#[cfg(not(feature = "std"))]11use alloc::vec::Vec;1213macro_rules! impl_abi_type {14 ($ty:ty, $name:ident, $dynamic:literal) => {15 impl sealed::CanBePlacedInVec for $ty {}1617 impl AbiType for $ty {18 const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($name)));1920 fn is_dynamic() -> bool {21 $dynamic22 }2324 fn size() -> usize {25 ABI_ALIGNMENT26 }27 }28 };29}3031macro_rules! impl_abi_readable {32 ($ty:ty, $method:ident) => {33 impl AbiRead for $ty {34 fn abi_read(reader: &mut AbiReader) -> Result<$ty> {35 reader.$method()36 }37 }38 };39}4041macro_rules! impl_abi_writeable {42 ($ty:ty, $method:ident) => {43 impl AbiWrite for $ty {44 fn abi_write(&self, writer: &mut AbiWriter) {45 writer.$method(&self)46 }47 }48 };49}5051macro_rules! impl_abi {52 ($ty:ty, $method:ident, $dynamic:literal) => {53 impl_abi_type!($ty, $method, $dynamic);54 impl_abi_readable!($ty, $method);55 impl_abi_writeable!($ty, $method);56 };57}5859impl_abi!(bool, bool, false);60impl_abi!(u8, uint8, false);61impl_abi!(u32, uint32, false);62impl_abi!(u64, uint64, false);63impl_abi!(u128, uint128, false);64impl_abi!(U256, uint256, false);65impl_abi!(H160, address, false);66impl_abi!(string, string, true);6768impl_abi_writeable!(&str, string);6970impl_abi_type!(bytes, bytes, true);7172impl AbiRead for bytes {73 fn abi_read(reader: &mut AbiReader) -> Result<bytes> {74 Ok(bytes(reader.bytes()?))75 }76}7778impl AbiWrite for bytes {79 fn abi_write(&self, writer: &mut AbiWriter) {80 writer.bytes(self.0.as_slice())81 }82}8384impl_abi_type!(bytes4, bytes4, false);85impl AbiRead for bytes4 {86 fn abi_read(reader: &mut AbiReader) -> Result<bytes4> {87 reader.bytes4()88 }89}9091impl<T: AbiWrite> AbiWrite for &T {92 fn abi_write(&self, writer: &mut AbiWriter) {93 T::abi_write(self, writer);94 }95}9697impl<T: AbiType> AbiType for &T {98 const SIGNATURE: SignatureUnit = T::SIGNATURE;99100 fn is_dynamic() -> bool {101 T::is_dynamic()102 }103104 fn size() -> usize {105 T::size()106 }107}108109impl<T: AbiType + AbiRead + sealed::CanBePlacedInVec> AbiRead for Vec<T> {110 fn abi_read(reader: &mut AbiReader) -> Result<Vec<T>> {111 let mut sub = reader.subresult(None)?;112 let size = sub.uint32()? as usize;113 sub.subresult_offset = sub.offset;114 let is_dynamic = <T as AbiType>::is_dynamic();115 let mut out = Vec::with_capacity(size);116 for _ in 0..size {117 out.push(<T as AbiRead>::abi_read(&mut sub)?);118 if !is_dynamic {119 sub.bytes_read(<T as AbiType>::size());120 };121 }122 Ok(out)123 }124}125126impl<T: AbiType> AbiType for Vec<T> {127 const SIGNATURE: SignatureUnit = make_signature!(new nameof(T::SIGNATURE) fixed("[]"));128129 fn is_dynamic() -> bool {130 true131 }132133 fn size() -> usize {134 ABI_ALIGNMENT135 }136}137138impl sealed::CanBePlacedInVec for Property {}139140impl AbiType for Property {141 const SIGNATURE: SignatureUnit = make_signature!(new fixed("(string,bytes)"));142143 fn is_dynamic() -> bool {144 string::is_dynamic() || bytes::is_dynamic()145 }146147 fn size() -> usize {148 <string as AbiType>::size() + <bytes as AbiType>::size()149 }150}151152impl AbiRead for Property {153 fn abi_read(reader: &mut AbiReader) -> Result<Property> {154 let size = if !Property::is_dynamic() {155 Some(<Property as AbiType>::size())156 } else {157 None158 };159 let mut subresult = reader.subresult(size)?;160 let key = <string>::abi_read(&mut subresult)?;161 let value = <bytes>::abi_read(&mut subresult)?;162163 Ok(Property { key, value })164 }165}166167impl AbiWrite for Property {168 fn abi_write<'a>(&'a self, writer: &mut AbiWriter) {169 (&self.key, &self.value).abi_write(writer);170 }171}172173impl<T: AbiWrite + AbiType> AbiWrite for Vec<T> {174 fn abi_write(&self, writer: &mut AbiWriter) {175 let is_dynamic = T::is_dynamic();176 let mut sub = if is_dynamic {177 AbiWriter::new_dynamic(is_dynamic)178 } else {179 AbiWriter::new()180 };181182 // Write items count183 (self.len() as u32).abi_write(&mut sub);184185 for item in self {186 item.abi_write(&mut sub);187 }188 writer.write_subresult(sub);189 }190}191192impl AbiWrite for () {193 fn abi_write(&self, _writer: &mut AbiWriter) {}194}195196/// This particular AbiWrite implementation should be split to another trait,197/// which only implements `to_result`, but due to lack of specialization feature198/// in stable Rust, we can't have blanket impl of this trait `for T where T: AbiWrite`,199/// so here we abusing default trait methods for it200impl<T: AbiWrite> AbiWrite for ResultWithPostInfo<T> {201 fn abi_write(&self, _writer: &mut AbiWriter) {202 debug_assert!(false, "shouldn't be called, see comment")203 }204 fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {205 match self {206 Ok(v) => Ok(WithPostDispatchInfo {207 post_info: v.post_info.clone(),208 data: {209 let mut out = AbiWriter::new();210 v.data.abi_write(&mut out);211 out212 },213 }),214 Err(e) => Err(e.clone()),215 }216 }217}218219macro_rules! impl_tuples {220 ($($ident:ident)+) => {221 impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)222 where223 $(224 $ident: AbiType,225 )+226 {227 const SIGNATURE: SignatureUnit = make_signature!(228 new fixed("(")229 $(nameof(<$ident>::SIGNATURE) fixed(","))+230 shift_left(1)231 fixed(")")232 );233234 fn is_dynamic() -> bool {235 false236 $(237 || <$ident>::is_dynamic()238 )*239 }240241 fn size() -> usize {242 0 $(+ <$ident>::size())+243 }244 }245246 impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}247248 impl<$($ident),+> AbiRead for ($($ident,)+)249 where250 Self: AbiType,251 $($ident: AbiRead + AbiType,)+252 {253 fn abi_read(reader: &mut AbiReader) -> Result<($($ident,)+)> {254 let is_dynamic = <Self>::is_dynamic();255 let size = if !is_dynamic { Some(<Self>::size()) } else { None };256 let mut subresult = reader.subresult(size)?;257 Ok((258 $({259 let value = <$ident>::abi_read(&mut subresult)?;260 if !is_dynamic {subresult.bytes_read(<$ident as AbiType>::size())};261 value262 },)+263 ))264 }265 }266267 #[allow(non_snake_case)]268 impl<$($ident),+> AbiWrite for ($($ident,)+)269 where270 $($ident: AbiWrite + AbiType,)+271 {272 fn abi_write(&self, writer: &mut AbiWriter) {273 let ($($ident,)+) = self;274 if <Self as AbiType>::is_dynamic() {275 let mut sub = AbiWriter::new();276 $($ident.abi_write(&mut sub);)+277 writer.write_subresult(sub);278 } else {279 $($ident.abi_write(writer);)+280 }281 }282 }283 };284}285286impl_tuples! {A}287impl_tuples! {A B}288impl_tuples! {A B C}289impl_tuples! {A B C D}290impl_tuples! {A B C D E}291impl_tuples! {A B C D E F}292impl_tuples! {A B C D E F G}293impl_tuples! {A B C D E F G H}294impl_tuples! {A B C D E F G H I}295impl_tuples! {A B C D E F G H I J}1use crate::{2 custom_signature::SignatureUnit,3 execution::{Result, ResultWithPostInfo, WithPostDispatchInfo},4 make_signature, sealed,5 types::*,6};7use super::{traits::*, ABI_ALIGNMENT, AbiReader, AbiWriter};8use primitive_types::{U256, H160};910#[cfg(not(feature = "std"))]11use alloc::vec::Vec;1213macro_rules! impl_abi_type {14 ($ty:ty, $name:ident, $dynamic:literal) => {15 impl sealed::CanBePlacedInVec for $ty {}1617 impl AbiType for $ty {18 const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($name)));1920 fn is_dynamic() -> bool {21 $dynamic22 }2324 fn size() -> usize {25 ABI_ALIGNMENT26 }27 }28 };29}3031macro_rules! impl_abi_readable {32 ($ty:ty, $method:ident) => {33 impl AbiRead for $ty {34 fn abi_read(reader: &mut AbiReader) -> Result<$ty> {35 reader.$method()36 }37 }38 };39}4041macro_rules! impl_abi_writeable {42 ($ty:ty, $method:ident) => {43 impl AbiWrite for $ty {44 fn abi_write(&self, writer: &mut AbiWriter) {45 writer.$method(&self)46 }47 }48 };49}5051macro_rules! impl_abi {52 ($ty:ty, $method:ident, $dynamic:literal) => {53 impl_abi_type!($ty, $method, $dynamic);54 impl_abi_readable!($ty, $method);55 impl_abi_writeable!($ty, $method);56 };57}5859impl_abi!(bool, bool, false);60impl_abi!(u8, uint8, false);61impl_abi!(u32, uint32, false);62impl_abi!(u64, uint64, false);63impl_abi!(u128, uint128, false);64impl_abi!(U256, uint256, false);65impl_abi!(H160, address, false);66impl_abi!(string, string, true);6768impl_abi_writeable!(&str, string);6970impl_abi_type!(bytes, bytes, true);7172impl AbiRead for bytes {73 fn abi_read(reader: &mut AbiReader) -> Result<bytes> {74 Ok(bytes(reader.bytes()?))75 }76}7778impl AbiWrite for bytes {79 fn abi_write(&self, writer: &mut AbiWriter) {80 writer.bytes(self.0.as_slice())81 }82}8384impl_abi_type!(bytes4, bytes4, false);85impl AbiRead for bytes4 {86 fn abi_read(reader: &mut AbiReader) -> Result<bytes4> {87 reader.bytes4()88 }89}9091impl<T: AbiWrite> AbiWrite for &T {92 fn abi_write(&self, writer: &mut AbiWriter) {93 T::abi_write(self, writer);94 }95}9697impl<T: AbiType> AbiType for &T {98 const SIGNATURE: SignatureUnit = T::SIGNATURE;99100 fn is_dynamic() -> bool {101 T::is_dynamic()102 }103104 fn size() -> usize {105 T::size()106 }107}108109impl<T: AbiType + AbiRead + sealed::CanBePlacedInVec> AbiRead for Vec<T> {110 fn abi_read(reader: &mut AbiReader) -> Result<Vec<T>> {111 let mut sub = reader.subresult(None)?;112 let size = sub.uint32()? as usize;113 sub.subresult_offset = sub.offset;114 let is_dynamic = <T as AbiType>::is_dynamic();115 let mut out = Vec::with_capacity(size);116 for _ in 0..size {117 out.push(<T as AbiRead>::abi_read(&mut sub)?);118 if !is_dynamic {119 sub.bytes_read(<T as AbiType>::size());120 };121 }122 Ok(out)123 }124}125126impl<T: AbiType> AbiType for Vec<T> {127 const SIGNATURE: SignatureUnit = make_signature!(new nameof(T::SIGNATURE) fixed("[]"));128129 fn is_dynamic() -> bool {130 true131 }132133 fn size() -> usize {134 ABI_ALIGNMENT135 }136}137138impl sealed::CanBePlacedInVec for Property {}139140impl AbiType for Property {141 const SIGNATURE: SignatureUnit = make_signature!(new fixed("(string,bytes)"));142143 fn is_dynamic() -> bool {144 string::is_dynamic() || bytes::is_dynamic()145 }146147 fn size() -> usize {148 <string as AbiType>::size() + <bytes as AbiType>::size()149 }150}151152impl AbiRead for Property {153 fn abi_read(reader: &mut AbiReader) -> Result<Property> {154 let size = if !Property::is_dynamic() {155 Some(<Property as AbiType>::size())156 } else {157 None158 };159 let mut subresult = reader.subresult(size)?;160 let key = <string>::abi_read(&mut subresult)?;161 let value = <bytes>::abi_read(&mut subresult)?;162163 Ok(Property { key, value })164 }165}166167impl AbiWrite for Property {168 fn abi_write(&self, writer: &mut AbiWriter) {169 (&self.key, &self.value).abi_write(writer);170 }171}172173impl<T: AbiWrite + AbiType> AbiWrite for Vec<T> {174 fn abi_write(&self, writer: &mut AbiWriter) {175 let is_dynamic = T::is_dynamic();176 let mut sub = if is_dynamic {177 AbiWriter::new_dynamic(is_dynamic)178 } else {179 AbiWriter::new()180 };181182 // Write items count183 (self.len() as u32).abi_write(&mut sub);184185 for item in self {186 item.abi_write(&mut sub);187 }188 writer.write_subresult(sub);189 }190}191192impl AbiWrite for () {193 fn abi_write(&self, _writer: &mut AbiWriter) {}194}195196/// This particular AbiWrite implementation should be split to another trait,197/// which only implements `to_result`, but due to lack of specialization feature198/// in stable Rust, we can't have blanket impl of this trait `for T where T: AbiWrite`,199/// so here we abusing default trait methods for it200impl<T: AbiWrite> AbiWrite for ResultWithPostInfo<T> {201 fn abi_write(&self, _writer: &mut AbiWriter) {202 debug_assert!(false, "shouldn't be called, see comment")203 }204 fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {205 match self {206 Ok(v) => Ok(WithPostDispatchInfo {207 post_info: v.post_info.clone(),208 data: {209 let mut out = AbiWriter::new();210 v.data.abi_write(&mut out);211 out212 },213 }),214 Err(e) => Err(e.clone()),215 }216 }217}218219macro_rules! impl_tuples {220 ($($ident:ident)+) => {221 impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)222 where223 $(224 $ident: AbiType,225 )+226 {227 const SIGNATURE: SignatureUnit = make_signature!(228 new fixed("(")229 $(nameof(<$ident>::SIGNATURE) fixed(","))+230 shift_left(1)231 fixed(")")232 );233234 fn is_dynamic() -> bool {235 false236 $(237 || <$ident>::is_dynamic()238 )*239 }240241 fn size() -> usize {242 0 $(+ <$ident>::size())+243 }244 }245246 impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}247248 impl<$($ident),+> AbiRead for ($($ident,)+)249 where250 Self: AbiType,251 $($ident: AbiRead + AbiType,)+252 {253 fn abi_read(reader: &mut AbiReader) -> Result<($($ident,)+)> {254 let is_dynamic = <Self>::is_dynamic();255 let size = if !is_dynamic { Some(<Self>::size()) } else { None };256 let mut subresult = reader.subresult(size)?;257 Ok((258 $({259 let value = <$ident>::abi_read(&mut subresult)?;260 if !is_dynamic {subresult.bytes_read(<$ident as AbiType>::size())};261 value262 },)+263 ))264 }265 }266267 #[allow(non_snake_case)]268 impl<$($ident),+> AbiWrite for ($($ident,)+)269 where270 $($ident: AbiWrite + AbiType,)+271 {272 fn abi_write(&self, writer: &mut AbiWriter) {273 let ($($ident,)+) = self;274 if <Self as AbiType>::is_dynamic() {275 let mut sub = AbiWriter::new();276 $($ident.abi_write(&mut sub);)+277 writer.write_subresult(sub);278 } else {279 $($ident.abi_write(writer);)+280 }281 }282 }283 };284}285286impl_tuples! {A}287impl_tuples! {A B}288impl_tuples! {A B C}289impl_tuples! {A B C D}290impl_tuples! {A B C D E}291impl_tuples! {A B C D E F}292impl_tuples! {A B C D E F G}293impl_tuples! {A B C D E F G H}294impl_tuples! {A B C D E F G H I}295impl_tuples! {A B C D E F G H I J}crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -146,7 +146,7 @@
#[cfg(feature = "std")]
pub type string = ::std::string::String;
- #[derive(Default, Debug, PartialEq, Clone)]
+ #[derive(Default, Debug, PartialEq, Eq, Clone)]
pub struct bytes(pub Vec<u8>);
/// Solidity doesn't have `void` type, however we have special implementation
crates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -132,13 +132,14 @@
impl_tuples! {A B C D E F G H I}
impl_tuples! {A B C D E F G H I J}
-impl sealed::CanBePlacedInVec for Property {}
impl StructCollect for Property {
fn name() -> String {
"Property".into()
}
fn declaration() -> String {
+ use std::fmt::Write;
+
let mut str = String::new();
writeln!(str, "/// @dev Property struct").unwrap();
writeln!(str, "struct {} {{", Self::name()).unwrap();
@@ -167,7 +168,7 @@
}
}
-impl SolidityTupleType for Property {
+impl SolidityType for Property {
fn names(tc: &TypeCollector) -> Vec<string> {
let mut collected = Vec::with_capacity(Self::len());
{