difftreelog
refactor remove AbiType
in: master
3 files changed
crates/evm-coder/procedural/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#![allow(dead_code)]1819use inflector::cases;20use proc_macro::TokenStream;21use quote::quote;22use sha3::{Digest, Keccak256};23use syn::{24 DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments, PathSegment, Type,25 parse_macro_input, spanned::Spanned,26};2728mod solidity_interface;29mod to_log;3031fn fn_selector_str(input: &str) -> u32 {32 let mut hasher = Keccak256::new();33 hasher.update(input.as_bytes());34 let result = hasher.finalize();3536 let mut selector_bytes = [0; 4];37 selector_bytes.copy_from_slice(&result[0..4]);3839 u32::from_be_bytes(selector_bytes)40}4142/// Returns solidity function selector (first 4 bytes of hash) by its43/// textual representation44///45/// ```ignore46/// use evm_coder_macros::fn_selector;47///48/// assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);49/// ```50#[proc_macro]51pub fn fn_selector(input: TokenStream) -> TokenStream {52 let input = input.to_string().replace(' ', "");53 let selector = fn_selector_str(&input);5455 (quote! {56 #selector57 })58 .into()59}6061fn event_selector_str(input: &str) -> [u8; 32] {62 let mut hasher = Keccak256::new();63 hasher.update(input.as_bytes());64 let result = hasher.finalize();6566 let mut selector_bytes = [0; 32];67 selector_bytes.copy_from_slice(&result[0..32]);68 selector_bytes69}7071/// Returns solidity topic (hash) by its textual representation72///73/// ```ignore74/// use evm_coder_macros::event_topic;75///76/// assert_eq!(77/// format!("{:x}", event_topic!(Transfer(address, address, uint256))),78/// "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",79/// );80/// ```81#[proc_macro]82pub fn event_topic(stream: TokenStream) -> TokenStream {83 let input = stream.to_string().replace(' ', "");84 let selector_bytes = event_selector_str(&input);8586 (quote! {87 ::primitive_types::H256([#(88 #selector_bytes,89 )*])90 })91 .into()92}9394fn parse_path(ty: &Type) -> syn::Result<&Path> {95 match &ty {96 syn::Type::Path(pat) => {97 if let Some(qself) = &pat.qself {98 return Err(syn::Error::new(qself.ty.span(), "no receiver expected"));99 }100 Ok(&pat.path)101 }102 _ => Err(syn::Error::new(ty.span(), "expected ty to be path")),103 }104}105106fn parse_path_segment(path: &Path) -> syn::Result<&PathSegment> {107 if path.segments.len() != 1 {108 return Err(syn::Error::new(109 path.span(),110 "expected path to have only segment",111 ));112 }113 let last_segment = &path.segments.last().unwrap();114 Ok(last_segment)115}116117fn parse_ident_from_pat(pat: &Pat) -> syn::Result<&Ident> {118 match pat {119 Pat::Ident(i) => Ok(&i.ident),120 _ => Err(syn::Error::new(pat.span(), "expected pat ident")),121 }122}123124fn parse_ident_from_segment(segment: &PathSegment, allow_generics: bool) -> syn::Result<&Ident> {125 if segment.arguments != PathArguments::None && !allow_generics {126 return Err(syn::Error::new(127 segment.arguments.span(),128 "unexpected generic type",129 ));130 }131 Ok(&segment.ident)132}133134fn parse_ident_from_path(path: &Path, allow_generics: bool) -> syn::Result<&Ident> {135 let segment = parse_path_segment(path)?;136 parse_ident_from_segment(segment, allow_generics)137}138139fn parse_ident_from_type(ty: &Type, allow_generics: bool) -> syn::Result<&Ident> {140 let path = parse_path(ty)?;141 parse_ident_from_path(path, allow_generics)142}143144// Gets T out of Result<T>145fn parse_result_ok(ty: &Type) -> syn::Result<&Type> {146 let path = parse_path(ty)?;147 let segment = parse_path_segment(path)?;148149 if segment.ident != "Result" {150 return Err(syn::Error::new(151 ty.span(),152 "expected Result as return type (no renamed aliases allowed)",153 ));154 }155 let args = match &segment.arguments {156 PathArguments::AngleBracketed(e) => e,157 _ => {158 return Err(syn::Error::new(159 segment.arguments.span(),160 "missing Result generics",161 ))162 }163 };164165 let args = &args.args;166 let arg = args.first().unwrap();167168 let ty = match arg {169 GenericArgument::Type(ty) => ty,170 _ => {171 return Err(syn::Error::new(172 arg.span(),173 "expected first generic to be type",174 ))175 }176 };177178 Ok(ty)179}180181fn pascal_ident_to_call(ident: &Ident) -> Ident {182 let name = format!("{}Call", ident);183 Ident::new(&name, ident.span())184}185fn snake_ident_to_pascal(ident: &Ident) -> Ident {186 let name = ident.to_string();187 let name = cases::pascalcase::to_pascal_case(&name);188 Ident::new(&name, ident.span())189}190fn snake_ident_to_screaming(ident: &Ident) -> Ident {191 let name = ident.to_string();192 let name = cases::screamingsnakecase::to_screaming_snake_case(&name);193 Ident::new(&name, ident.span())194}195fn pascal_ident_to_snake_call(ident: &Ident) -> Ident {196 let name = ident.to_string();197 let name = cases::snakecase::to_snake_case(&name);198 let name = format!("call_{}", name);199 Ident::new(&name, ident.span())200}201202/// See documentation for this proc-macro reexported in `evm-coder` crate203#[proc_macro_attribute]204pub fn solidity_interface(args: TokenStream, stream: TokenStream) -> TokenStream {205 let args = parse_macro_input!(args as solidity_interface::InterfaceInfo);206207 let input: ItemImpl = match syn::parse(stream) {208 Ok(t) => t,209 Err(e) => return e.to_compile_error().into(),210 };211212 let expanded = match solidity_interface::SolidityInterface::try_from(args, &input) {213 Ok(v) => v.expand(),214 Err(e) => e.to_compile_error(),215 };216217 (quote! {218 #input219220 #expanded221 })222 .into()223}224225#[proc_macro_attribute]226pub fn solidity(_args: TokenStream, stream: TokenStream) -> TokenStream {227 stream228}229#[proc_macro_attribute]230pub fn weight(_args: TokenStream, stream: TokenStream) -> TokenStream {231 stream232}233234/// See documentation for this proc-macro reexported in `evm-coder` crate235#[proc_macro_derive(ToLog, attributes(indexed))]236pub fn to_log(value: TokenStream) -> TokenStream {237 let input = parse_macro_input!(value as DeriveInput);238239 match to_log::Events::try_from(&input) {240 Ok(e) => e.expand(),241 Err(e) => e.to_compile_error(),242 }243 .into()244}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#![allow(dead_code)]1819use inflector::cases;20use proc_macro::TokenStream;21use quote::quote;22use sha3::{Digest, Keccak256};23use syn::{24 DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments, PathSegment, Type,25 parse_macro_input, spanned::Spanned,26};2728mod solidity_interface;29mod to_log;3031fn fn_selector_str(input: &str) -> u32 {32 let mut hasher = Keccak256::new();33 hasher.update(input.as_bytes());34 let result = hasher.finalize();3536 let mut selector_bytes = [0; 4];37 selector_bytes.copy_from_slice(&result[0..4]);3839 u32::from_be_bytes(selector_bytes)40}4142/// Returns solidity function selector (first 4 bytes of hash) by its43/// textual representation44///45/// ```ignore46/// use evm_coder_macros::fn_selector;47///48/// assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);49/// ```50#[proc_macro]51pub fn fn_selector(input: TokenStream) -> TokenStream {52 let input = input.to_string().replace(' ', "");53 let selector = fn_selector_str(&input);5455 (quote! {56 #selector57 })58 .into()59}6061fn event_selector_str(input: &str) -> [u8; 32] {62 let mut hasher = Keccak256::new();63 hasher.update(input.as_bytes());64 let result = hasher.finalize();6566 let mut selector_bytes = [0; 32];67 selector_bytes.copy_from_slice(&result[0..32]);68 selector_bytes69}7071/// Returns solidity topic (hash) by its textual representation72///73/// ```ignore74/// use evm_coder_macros::event_topic;75///76/// assert_eq!(77/// format!("{:x}", event_topic!(Transfer(address, address, uint256))),78/// "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",79/// );80/// ```81#[proc_macro]82pub fn event_topic(stream: TokenStream) -> TokenStream {83 let input = stream.to_string().replace(' ', "");84 let selector_bytes = event_selector_str(&input);8586 (quote! {87 ::primitive_types::H256([#(88 #selector_bytes,89 )*])90 })91 .into()92}9394fn parse_path(ty: &Type) -> syn::Result<&Path> {95 match &ty {96 syn::Type::Path(pat) => {97 if let Some(qself) = &pat.qself {98 return Err(syn::Error::new(qself.ty.span(), "no receiver expected"));99 }100 Ok(&pat.path)101 }102 _ => Err(syn::Error::new(ty.span(), "expected ty to be path")),103 }104}105106fn parse_path_segment(path: &Path) -> syn::Result<&PathSegment> {107 if path.segments.len() != 1 {108 return Err(syn::Error::new(109 path.span(),110 "expected path to have only one segment",111 ));112 }113 let last_segment = &path.segments.last().unwrap();114 Ok(last_segment)115}116117fn parse_ident_from_pat(pat: &Pat) -> syn::Result<&Ident> {118 match pat {119 Pat::Ident(i) => Ok(&i.ident),120 _ => Err(syn::Error::new(pat.span(), "expected pat ident")),121 }122}123124fn parse_ident_from_segment(segment: &PathSegment, allow_generics: bool) -> syn::Result<&Ident> {125 if segment.arguments != PathArguments::None && !allow_generics {126 return Err(syn::Error::new(127 segment.arguments.span(),128 "unexpected generic type",129 ));130 }131 Ok(&segment.ident)132}133134fn parse_ident_from_path(path: &Path, allow_generics: bool) -> syn::Result<&Ident> {135 let segment = parse_path_segment(path)?;136 parse_ident_from_segment(segment, allow_generics)137}138139fn parse_ident_from_type(ty: &Type, allow_generics: bool) -> syn::Result<&Ident> {140 let path = parse_path(ty)?;141 parse_ident_from_path(path, allow_generics)142}143144// Gets T out of Result<T>145fn parse_result_ok(ty: &Type) -> syn::Result<&Type> {146 let path = parse_path(ty)?;147 let segment = parse_path_segment(path)?;148149 if segment.ident != "Result" {150 return Err(syn::Error::new(151 ty.span(),152 "expected Result as return type (no renamed aliases allowed)",153 ));154 }155 let args = match &segment.arguments {156 PathArguments::AngleBracketed(e) => e,157 _ => {158 return Err(syn::Error::new(159 segment.arguments.span(),160 "missing Result generics",161 ))162 }163 };164165 let args = &args.args;166 let arg = args.first().unwrap();167168 let ty = match arg {169 GenericArgument::Type(ty) => ty,170 _ => {171 return Err(syn::Error::new(172 arg.span(),173 "expected first generic to be type",174 ))175 }176 };177178 Ok(ty)179}180181fn pascal_ident_to_call(ident: &Ident) -> Ident {182 let name = format!("{}Call", ident);183 Ident::new(&name, ident.span())184}185fn snake_ident_to_pascal(ident: &Ident) -> Ident {186 let name = ident.to_string();187 let name = cases::pascalcase::to_pascal_case(&name);188 Ident::new(&name, ident.span())189}190fn snake_ident_to_screaming(ident: &Ident) -> Ident {191 let name = ident.to_string();192 let name = cases::screamingsnakecase::to_screaming_snake_case(&name);193 Ident::new(&name, ident.span())194}195fn pascal_ident_to_snake_call(ident: &Ident) -> Ident {196 let name = ident.to_string();197 let name = cases::snakecase::to_snake_case(&name);198 let name = format!("call_{}", name);199 Ident::new(&name, ident.span())200}201202/// See documentation for this proc-macro reexported in `evm-coder` crate203#[proc_macro_attribute]204pub fn solidity_interface(args: TokenStream, stream: TokenStream) -> TokenStream {205 let args = parse_macro_input!(args as solidity_interface::InterfaceInfo);206207 let input: ItemImpl = match syn::parse(stream) {208 Ok(t) => t,209 Err(e) => return e.to_compile_error().into(),210 };211212 let expanded = match solidity_interface::SolidityInterface::try_from(args, &input) {213 Ok(v) => v.expand(),214 Err(e) => e.to_compile_error(),215 };216217 (quote! {218 #input219220 #expanded221 })222 .into()223}224225#[proc_macro_attribute]226pub fn solidity(_args: TokenStream, stream: TokenStream) -> TokenStream {227 stream228}229#[proc_macro_attribute]230pub fn weight(_args: TokenStream, stream: TokenStream) -> TokenStream {231 stream232}233234/// See documentation for this proc-macro reexported in `evm-coder` crate235#[proc_macro_derive(ToLog, attributes(indexed))]236pub fn to_log(value: TokenStream) -> TokenStream {237 let input = parse_macro_input!(value as DeriveInput);238239 match to_log::Events::try_from(&input) {240 Ok(e) => e.expand(),241 Err(e) => e.to_compile_error(),242 }243 .into()244}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
@@ -329,149 +329,39 @@
}
}
-#[derive(Debug)]
-enum AbiType {
- // type
- Plain(Ident),
- // (type1,type2)
- Tuple(Vec<AbiType>),
- // type[]
- Vec(Box<AbiType>),
- // type[20]
- Array(Box<AbiType>, usize),
+trait AbiType {
+ fn plain(&self) -> syn::Result<&Ident>;
+ fn is_value(&self) -> bool;
+ fn is_caller(&self) -> bool;
+ fn is_special(&self) -> bool;
}
-impl AbiType {
- fn try_from(value: &Type) -> syn::Result<Self> {
- let value = Self::try_maybe_special_from(value)?;
- if value.is_special() {
- return Err(syn::Error::new(value.span(), "unexpected special type"));
+
+impl AbiType for Type {
+ fn plain(&self) -> syn::Result<&Ident> {
+ let path = parse_path(self)?;
+ let segment = parse_path_segment(path)?;
+ if !segment.arguments.is_empty() {
+ return Err(syn::Error::new(self.span(), "Not plain type"));
}
- Ok(value)
+ Ok(&segment.ident)
}
- fn try_maybe_special_from(value: &Type) -> syn::Result<Self> {
- match value {
- Type::Array(arr) => {
- let wrapped = AbiType::try_from(&arr.elem)?;
- match &arr.len {
- Expr::Lit(l) => match &l.lit {
- Lit::Int(i) => {
- let num = i.base10_parse::<usize>()?;
- Ok(AbiType::Array(Box::new(wrapped), num as usize))
- }
- _ => Err(syn::Error::new(arr.len.span(), "should be int literal")),
- },
- _ => Err(syn::Error::new(arr.len.span(), "should be literal")),
- }
- }
- Type::Path(_) => {
- let path = parse_path(value)?;
- let segment = parse_path_segment(path)?;
- if segment.ident == "Vec" {
- let args = match &segment.arguments {
- PathArguments::AngleBracketed(e) => e,
- _ => {
- return Err(syn::Error::new(
- segment.arguments.span(),
- "missing Vec generic",
- ))
- }
- };
- let args = &args.args;
- if args.len() != 1 {
- return Err(syn::Error::new(
- args.span(),
- "expected only one generic for vec",
- ));
- }
- let arg = args.first().expect("first arg");
- let ty = match arg {
- GenericArgument::Type(ty) => ty,
- _ => {
- return Err(syn::Error::new(
- arg.span(),
- "expected first generic to be type",
- ))
- }
- };
-
- let wrapped = AbiType::try_from(ty)?;
- Ok(Self::Vec(Box::new(wrapped)))
- } else {
- if !segment.arguments.is_empty() {
- return Err(syn::Error::new(
- segment.arguments.span(),
- "unexpected generic arguments for non-vec type",
- ));
- }
- Ok(Self::Plain(segment.ident.clone()))
- }
- }
- Type::Tuple(t) => {
- let mut out = Vec::with_capacity(t.elems.len());
- for el in t.elems.iter() {
- out.push(AbiType::try_from(el)?)
- }
- Ok(Self::Tuple(out))
- }
- _ => Err(syn::Error::new(
- value.span(),
- "unexpected type, only arrays, plain types and tuples are supported",
- )),
+ fn is_value(&self) -> bool {
+ if let Ok(ident) = self.plain() {
+ return ident == "value";
}
+ false
}
- fn is_value(&self) -> bool {
- matches!(self, Self::Plain(v) if v == "value")
- }
+
fn is_caller(&self) -> bool {
- matches!(self, Self::Plain(v) if v == "caller")
+ if let Ok(ident) = self.plain() {
+ return ident == "caller";
+ }
+ false
}
+
fn is_special(&self) -> bool {
self.is_caller() || self.is_value()
- }
- fn selector_ty_buf(&self, buf: &mut String) -> std::fmt::Result {
- match self {
- AbiType::Plain(t) => {
- write!(buf, "{}", t)
- }
- AbiType::Tuple(t) => {
- write!(buf, "(")?;
- for (i, t) in t.iter().enumerate() {
- if i != 0 {
- write!(buf, ",")?;
- }
- t.selector_ty_buf(buf)?;
- }
- write!(buf, ")")
- }
- AbiType::Vec(v) => {
- v.selector_ty_buf(buf)?;
- write!(buf, "[]")
- }
- AbiType::Array(v, len) => {
- v.selector_ty_buf(buf)?;
- write!(buf, "[{}]", len)
- }
- }
- }
- fn selector_ty(&self) -> String {
- let mut out = String::new();
- self.selector_ty_buf(&mut out).expect("no fmt error");
- out
- }
-}
-impl ToTokens for AbiType {
- fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
- match self {
- AbiType::Plain(t) => tokens.extend(quote! {#t}),
- AbiType::Tuple(t) => {
- tokens.extend(quote! {(
- #(#t),*
- )});
- }
- AbiType::Vec(v) => tokens.extend(quote! {Vec<#v>}),
- AbiType::Array(v, l) => tokens.extend(quote! {[#v; #l]}),
- }
}
}
@@ -479,7 +369,7 @@
struct MethodArg {
name: Ident,
camel_name: String,
- ty: AbiType,
+ ty: Type,
}
impl MethodArg {
fn try_from(value: &PatType) -> syn::Result<Self> {
@@ -487,7 +377,7 @@
Ok(Self {
camel_name: cases::camelcase::to_camel_case(&name.to_string()),
name,
- ty: AbiType::try_maybe_special_from(&value.ty)?,
+ ty: value.ty.as_ref().clone(),
})
}
fn is_value(&self) -> bool {
@@ -498,10 +388,6 @@
}
fn is_special(&self) -> bool {
self.ty.is_special()
- }
- fn selector_ty(&self) -> String {
- assert!(!self.is_special());
- self.ty.selector_ty()
}
fn expand_call_def(&self) -> proc_macro2::TokenStream {
@@ -578,8 +464,6 @@
camel_name: String,
pascal_name: Ident,
screaming_name: Ident,
- selector_str: String,
- selector: u32,
hide: bool,
args: Vec<MethodArg>,
has_normal_args: bool,
@@ -670,27 +554,14 @@
let camel_name = info
.rename_selector
.unwrap_or_else(|| cases::camelcase::to_camel_case(&ident.to_string()));
- let mut selector_str = camel_name.clone();
- selector_str.push('(');
- let mut has_normal_args = false;
- for (i, arg) in args.iter().filter(|arg| !arg.is_special()).enumerate() {
- if i != 0 {
- selector_str.push(',');
- }
- write!(selector_str, "{}", arg.selector_ty()).unwrap();
- has_normal_args = true;
- }
+ let has_normal_args = args.iter().filter(|arg| !arg.is_special()).count() != 0;
let has_value_args = args.iter().any(|a| a.is_value());
- selector_str.push(')');
- let selector = fn_selector_str(&selector_str);
Ok(Self {
name: ident.clone(),
camel_name,
pascal_name: snake_ident_to_pascal(ident),
screaming_name: snake_ident_to_screaming(ident),
- selector_str,
- selector,
hide: info.hide,
args,
has_normal_args,
@@ -728,10 +599,8 @@
fn expand_const(&self) -> proc_macro2::TokenStream {
let screaming_name = &self.screaming_name;
let screaming_name_signature = format_ident!("{}_SIGNATURE", &self.screaming_name);
- let selector_str = &self.selector_str;
let custom_signature = self.expand_custom_signature();
quote! {
- #[doc = #selector_str]
const #screaming_name_signature: ::evm_coder::custom_signature::FunctionSignature = #custom_signature;
const #screaming_name: ::evm_coder::types::bytes4 = {
let mut sum = ::evm_coder::sha3_const::Keccak256::new();
@@ -845,31 +714,78 @@
}
}
- fn expand_type(
- ty: &AbiType,
- token_stream: &mut proc_macro2::TokenStream,
- read_signature: bool,
- ) {
+ fn expand_type(ty: &Type, token_stream: &mut proc_macro2::TokenStream, read_signature: bool) {
match ty {
- AbiType::Plain(ref ident) => {
- let plain_token = if read_signature {
- quote! {
- (<#ident>::SIGNATURE)
+ Type::Path(tp) => {
+ if let Some(qself) = &tp.qself {
+ panic!("no receiver expected {:?}", qself.ty.span());
+ }
+ let path = &tp.path;
+ if path.segments.len() != 1 {
+ panic!("expected path to have only one segment {:?}", path.span());
+ }
+ let last_segment = path.segments.last().unwrap();
+
+ if last_segment.ident == "Vec" {
+ let args = match &last_segment.arguments {
+ PathArguments::AngleBracketed(e) => e,
+ _ => {
+ panic!("missing Vec generic {:?}", last_segment.arguments.span());
+ }
+ };
+ let args = &args.args;
+ if args.len() != 1 {
+ panic!("expected only one generic for vec {:?}", args.span());
}
+ let arg = args.first().expect("first arg");
+
+ let ty = match arg {
+ GenericArgument::Type(ty) => ty,
+ _ => {
+ panic!("expected first generic to be type {:?}", arg.span());
+ }
+ };
+
+ let mut vec_token = proc_macro2::TokenStream::new();
+ Self::expand_type(ty, &mut vec_token, false);
+ vec_token = if read_signature {
+ quote! { (<Vec<#vec_token>>::SIGNATURE) }
+ } else {
+ quote! { <Vec<#vec_token>> }
+ };
+ token_stream.extend(vec_token);
} else {
- quote! {
- #ident
+ if !last_segment.arguments.is_empty() {
+ panic!(
+ "unexpected generic arguments for non-vec type {:?}",
+ last_segment.arguments.span()
+ );
}
- };
- token_stream.extend(plain_token);
+ let ident = &last_segment.ident;
+ let plain_token = if read_signature {
+ quote! {
+ (<#ident>::SIGNATURE)
+ }
+ } else {
+ quote! {
+ #ident
+ }
+ };
+
+ token_stream.extend(plain_token);
+ }
}
- AbiType::Tuple(ref tuple_type) => {
+ Type::Tuple(tt) => {
+ // for ty in tt.elems.iter() {
+ // out.push(AbiType::try_from(ty)?)
+ // }
+
let mut tuple_types = proc_macro2::TokenStream::new();
let mut is_first = true;
- for ty in tuple_type {
+ for ty in tt.elems.iter() {
if is_first {
is_first = false
} else {
@@ -885,19 +801,69 @@
token_stream.extend(tuple_types);
}
- AbiType::Vec(ref vec_type) => {
- let mut vec_token = proc_macro2::TokenStream::new();
- Self::expand_type(vec_type.as_ref(), &mut vec_token, false);
- vec_token = if read_signature {
- quote! { (<Vec<#vec_token>>::SIGNATURE) }
- } else {
- quote! { <Vec<#vec_token>> }
- };
- token_stream.extend(vec_token);
- }
+ // Type::Array(arr) => {
+ // let wrapped = AbiType::try_from(&arr.elem)?;
+ // match &arr.len {
+ // Expr::Lit(l) => match &l.lit {
+ // Lit::Int(i) => {
+ // let num = i.base10_parse::<usize>()?;
+ // Ok(AbiType::Array(Box::new(wrapped), num as usize))
+ // }
+ // _ => Err(syn::Error::new(arr.len.span(), "should be int literal")),
+ // },
+ // _ => Err(syn::Error::new(arr.len.span(), "should be literal")),
+ // }
+ // }
+ _ => panic!("Unexpected type {ty:?}"),
+ }
+ // match ty {
+ // AbiType::Plain(ref ident) => {
+ // let plain_token = if read_signature {
+ // quote! {
+ // (<#ident>::SIGNATURE)
+ // }
+ // } else {
+ // quote! {
+ // #ident
+ // }
+ // };
+
+ // token_stream.extend(plain_token);
+ // }
+
+ // AbiType::Tuple(ref tuple_type) => {
+ // let mut tuple_types = proc_macro2::TokenStream::new();
+ // let mut is_first = true;
+
+ // for ty in tuple_type {
+ // if is_first {
+ // is_first = false
+ // } else {
+ // tuple_types.extend(quote!(,));
+ // }
+ // Self::expand_type(ty, &mut tuple_types, false);
+ // }
+ // tuple_types = if read_signature {
+ // quote! { (<(#tuple_types)>::SIGNATURE) }
+ // } else {
+ // quote! { (#tuple_types) }
+ // };
+ // token_stream.extend(tuple_types);
+ // }
+
+ // AbiType::Vec(ref vec_type) => {
+ // let mut vec_token = proc_macro2::TokenStream::new();
+ // Self::expand_type(vec_type.as_ref(), &mut vec_token, false);
+ // vec_token = if read_signature {
+ // quote! { (<Vec<#vec_token>>::SIGNATURE) }
+ // } else {
+ // quote! { <Vec<#vec_token>> }
+ // };
+ // token_stream.extend(vec_token);
+ // }
- AbiType::Array(_, _) => todo!("Array eth signature"),
- };
+ // AbiType::Array(_, _) => todo!("Array eth signature"),
+ // };
}
fn expand_custom_signature(&self) -> proc_macro2::TokenStream {
@@ -947,7 +913,6 @@
.filter(|a| !a.is_special())
.map(MethodArg::expand_solidity_argument);
let docs = &self.docs;
- let selector_str = &self.selector_str;
let screaming_name = &self.screaming_name;
let hide = self.hide;
let custom_signature = self.expand_custom_signature();
@@ -962,7 +927,6 @@
quote! {
SolidityFunction {
docs: &[#(#docs),*],
- selector_str: #selector_str,
hide: #hide,
selector: u32::from_be_bytes(Self::#screaming_name),
custom_signature: #custom_signature,
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -484,7 +484,6 @@
}
pub struct SolidityFunction<A, R> {
pub docs: &'static [&'static str],
- pub selector_str: &'static str,
pub selector: u32,
pub hide: bool,
pub custom_signature: FunctionSignature,
@@ -513,15 +512,8 @@
writeln!(
writer,
"\t{hide_comment}/// or in textual repr: {}",
- self.selector_str
+ self.custom_signature.as_str()
)?;
- if self.selector_str != self.custom_signature.as_str() {
- writeln!(
- writer,
- "\t{hide_comment}/// or in the expanded repr: {}",
- self.custom_signature.as_str()
- )?;
- }
write!(writer, "\t{hide_comment}function {}(", self.name)?;
self.args.solidity_name(writer, tc)?;
write!(writer, ")")?;