git.delta.rocks / unique-network / refs/commits / a16933bbf61b

--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -30,6 +30,7 @@
 	let abi_type = impl_abi_type(name, field_types.clone());
 	let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);
 	let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);
+	// let solidity_tuple_type =
 
 	Ok(quote! {
 		#can_be_plcaed_in_vec

1use super::{TypeCollector, SolidityTypeName, SolidityTupleType};1use super::{TypeCollector, SolidityTypeName, SolidityType};
2use crate::{sealed, types::*};2use crate::{sealed, types::*};
3use core::fmt;3use core::fmt;
44
7070
71macro_rules! impl_tuples {71macro_rules! impl_tuples {
72	($($ident:ident)+) => {72	($($ident:ident)+) => {
73		impl<$($ident: SolidityTypeName + 'static),+> SolidityTupleType for ($($ident,)+) {73		impl<$($ident: SolidityTypeName + 'static),+> SolidityType for ($($ident,)+) {
74			fn names(tc: &TypeCollector) -> Vec<string> {74			fn names(tc: &TypeCollector) -> Vec<string> {
75				let mut collected = Vec::with_capacity(Self::len());75				let mut collected = Vec::with_capacity(Self::len());
76				$({76				$({

--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -59,7 +59,7 @@
 		self.id.set(v + 1);
 		v
 	}
-	pub fn collect_tuple<T: SolidityTupleType>(&self) -> String {
+	pub fn collect_tuple<T: SolidityType>(&self) -> String {
 		let names = T::names(self);
 		if let Some(id) = self.anonymous.borrow().get(&names).cloned() {
 			return format!("Tuple{}", id);

--- a/crates/evm-coder/src/solidity/traits.rs
+++ b/crates/evm-coder/src/solidity/traits.rs
@@ -19,7 +19,7 @@
 	}
 }
 
-pub trait SolidityTupleType {
+pub trait SolidityType {
 	fn names(tc: &TypeCollector) -> Vec<String>;
 	fn len() -> usize;
 }

--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -156,10 +156,10 @@
 }
 
 #[cfg(feature = "stubgen")]
-impl ::evm_coder::solidity::SolidityTupleType for EthCrossAccount {
+impl ::evm_coder::solidity::SolidityType for EthCrossAccount {
 	fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
 		let mut collected =
-			Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityTupleType>::len());
+			Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityType>::len());
 		{
 			let mut out = String::new();
 			<address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)