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

difftreelog

fix AbiWrite implementations

Trubnikov Sergey2022-11-14parent: #d535fba.patch.diff
in: master

4 files changed

modifiedcrates/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
@@ -137,7 +137,7 @@
 	let abi_write = if is_named_fields {
 		quote!(
 			#(
-				self.#field_names.abi_write(writer);
+				self.#field_names.abi_write(sub);
 			)*
 		)
 	} else {
@@ -146,14 +146,24 @@
 			.map(proc_macro2::Literal::usize_unsuffixed);
 		quote!(
 			#(
-				self.#field_names.abi_write(writer);
+				self.#field_names.abi_write(sub);
 			)*
 		)
 	};
 	quote!(
 		impl ::evm_coder::abi::AbiWrite for #name {
 			fn abi_write(&self, writer: &mut ::evm_coder::abi::AbiWriter) {
-				#abi_write
+				if <Self as ::evm_coder::abi::AbiType>::is_dynamic() {
+					let mut sub = ::evm_coder::abi::AbiWriter::new();
+					{
+						let sub = &mut sub;
+						#abi_write
+					}
+					writer.write_subresult(sub);
+				} else {
+					let sub = writer;
+					#abi_write
+				}
 			}
 		}
 	)
modifiedcrates/evm-coder/src/abi/impls.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -310,11 +310,11 @@
 		#[allow(non_snake_case)]
 		impl<$($ident),+> AbiWrite for ($($ident,)+)
 		where
-			$($ident: AbiWrite,)+
+			$($ident: AbiWrite + AbiType,)+
 		{
 			fn abi_write(&self, writer: &mut AbiWriter) {
 				let ($($ident,)+) = self;
-				if writer.is_dynamic {
+				if <Self as AbiType>::is_dynamic() {
 					let mut sub = AbiWriter::new();
 					$($ident.abi_write(&mut sub);)+
 					writer.write_subresult(sub);
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -137,7 +137,7 @@
 	#[cfg(feature = "std")]
 	pub type string = ::std::string::String;
 
-	#[derive(Default, Debug, PartialEq)]
+	#[derive(Default, Debug, PartialEq, Clone)]
 	pub struct bytes(pub Vec<u8>);
 
 	/// Solidity doesn't have `void` type, however we have special implementation
modifiedcrates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth
1use evm_coder_procedural::AbiCoder;1use evm_coder_procedural::AbiCoder;
2use evm_coder::{2use evm_coder::{
3	types::*,3	types::*,
4	abi::{AbiType},4	abi::{AbiType, AbiRead, AbiWrite},
5};5};
66
7// TODO: move to build_failed tests7// TODO: move to build_failed tests
8// #[derive(AbiCoder)]8// #[derive(AbiCoder, PartialEq, Debug)]
9// struct TypeStructUnit {}9// struct TypeStructUnit {}
1010
11#[derive(AbiCoder)]11#[derive(AbiCoder, PartialEq, Debug)]
12struct TypeStruct1SimpleParam {12struct TypeStruct1SimpleParam {
13	_a: u8,13	_a: u8,
14}14}
1515
16#[derive(AbiCoder)]16#[derive(AbiCoder, PartialEq, Debug)]
17struct TypeStruct1DynamicParam {17struct TypeStruct1DynamicParam {
18	_a: String,18	_a: String,
19}19}
2020
21#[derive(AbiCoder)]21#[derive(AbiCoder, PartialEq, Debug)]
22struct TypeStruct2SimpleParam {22struct TypeStruct2SimpleParam {
23	_a: u8,23	_a: u8,
24	_b: u32,24	_b: u32,
25}25}
2626
27#[derive(AbiCoder)]27#[derive(AbiCoder, PartialEq, Debug)]
28struct TypeStruct2DynamicParam {28struct TypeStruct2DynamicParam {
29	_a: String,29	_a: String,
30	_b: bytes,30	_b: bytes,
31}31}
3232
33#[derive(AbiCoder)]33#[derive(AbiCoder, PartialEq, Debug)]
34struct TypeStruct2MixedParam {34struct TypeStruct2MixedParam {
35	_a: u8,35	_a: u8,
36	_b: bytes,36	_b: bytes,
37}37}
3838
39#[derive(AbiCoder)]39#[derive(AbiCoder, PartialEq, Debug)]
40struct TypeStruct1DerivedSimpleParam {40struct TypeStruct1DerivedSimpleParam {
41	_a: TypeStruct1SimpleParam,41	_a: TypeStruct1SimpleParam,
42}42}
4343
44#[derive(AbiCoder)]44#[derive(AbiCoder, PartialEq, Debug)]
45struct TypeStruct2DerivedSimpleParam {45struct TypeStruct2DerivedSimpleParam {
46	_a: TypeStruct1SimpleParam,46	_a: TypeStruct1SimpleParam,
47	_b: TypeStruct2SimpleParam,47	_b: TypeStruct2SimpleParam,
48}48}
4949
50#[derive(AbiCoder)]50#[derive(AbiCoder, PartialEq, Debug)]
51struct TypeStruct1DerivedDynamicParam {51struct TypeStruct1DerivedDynamicParam {
52	_a: TypeStruct1DynamicParam,52	_a: TypeStruct1DynamicParam,
53}53}
5454
55#[derive(AbiCoder)]55#[derive(AbiCoder, PartialEq, Debug)]
56struct TypeStruct2DerivedDynamicParam {56struct TypeStruct2DerivedDynamicParam {
57	_a: TypeStruct1DynamicParam,57	_a: TypeStruct1DynamicParam,
58	_b: TypeStruct2DynamicParam,58	_b: TypeStruct2DynamicParam,
59}59}
6060
61#[derive(AbiCoder)]61#[derive(AbiCoder, PartialEq, Debug)]
62struct TypeStruct3DerivedMixedParam {62struct TypeStruct3DerivedMixedParam {
63	_a: TypeStruct1SimpleParam,63	_a: TypeStruct1SimpleParam,
64	_b: TypeStruct2DynamicParam,64	_b: TypeStruct2DynamicParam,
200	);200	);
201}201}
202202
203#[derive(AbiCoder)]203#[derive(AbiCoder, PartialEq, Debug)]
204struct TupleStruct1SimpleParam(u8);204struct TupleStruct1SimpleParam(u8);
205205
206#[derive(AbiCoder)]206#[derive(AbiCoder, PartialEq, Debug)]
207struct TupleStruct1DynamicParam(String);207struct TupleStruct1DynamicParam(String);
208208
209#[derive(AbiCoder)]209#[derive(AbiCoder, PartialEq, Debug)]
210struct TupleStruct2SimpleParam(u8, u32);210struct TupleStruct2SimpleParam(u8, u32);
211211
212#[derive(AbiCoder)]212#[derive(AbiCoder, PartialEq, Debug)]
213struct TupleStruct2DynamicParam(String, bytes);213struct TupleStruct2DynamicParam(String, bytes);
214214
215#[derive(AbiCoder)]215#[derive(AbiCoder, PartialEq, Debug)]
216struct TupleStruct2MixedParam(u8, bytes);216struct TupleStruct2MixedParam(u8, bytes);
217217
218#[derive(AbiCoder)]218#[derive(AbiCoder, PartialEq, Debug)]
219struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);219struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);
220220
221#[derive(AbiCoder)]221#[derive(AbiCoder, PartialEq, Debug)]
222struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);222struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);
223223
224#[derive(AbiCoder)]224#[derive(AbiCoder, PartialEq, Debug)]
225struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);225struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);
226226
227#[derive(AbiCoder)]227#[derive(AbiCoder, PartialEq, Debug)]
228struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);228struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);
229229
230#[derive(AbiCoder)]230#[derive(AbiCoder, PartialEq, Debug)]
231struct TupleStruct3DerivedMixedParam(231struct TupleStruct3DerivedMixedParam(
232	TupleStruct1SimpleParam,232	TupleStruct1SimpleParam,
233	TupleStruct2DynamicParam,233	TupleStruct2DynamicParam,
406	);406	);
407}407}
408408
409// #[test]409fn test_impl<TypeStruct, TupleStruct, Tuple>(
410// fn impl_abi_read() {410	type_struct_data: TypeStruct,
411// 	TypeStruct1SimpleParam::411	tuple_struct_data: TupleStruct,
412// }412	tuple_data: Tuple,
413) where
414	TypeStruct: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
415	Tuple: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
416{
417	use evm_coder::abi::{AbiReader, AbiWriter};
418	const FUNCTION_IDENTIFIER: u32 = 0xdeadbeef;
419
420	let mut writer = AbiWriter::new_call(FUNCTION_IDENTIFIER);
421	tuple_data.abi_write(&mut writer);
422	let encoded_tuple = writer.finish();
423
424	let mut writer = AbiWriter::new_call(FUNCTION_IDENTIFIER);
425	type_struct_data.abi_write(&mut writer);
426	let encoded_struct = writer.finish();
427
428	similar_asserts::assert_eq!(encoded_tuple, encoded_struct);
429
430	// let (_, mut decoder) = AbiReader::new_call(&encoded_tuple).unwrap();
431	// let restored_struct_data = <TypeStruct>::abi_read(&mut decoder).unwrap();
432	// assert_eq!(restored_struct_data, type_struct_data);
433
434	// let (_, mut decoder) = AbiReader::new_call(&encoded_struct).unwrap();
435	// let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();
436	// assert_eq!(restored_tuple_data, tuple_data);
437}
438
439#[test]
440fn codec_struct_1_simple() {
441	let _a = 0xff;
442	test_impl::<TypeStruct1SimpleParam, TupleStruct1SimpleParam, (uint8,)>(
443		TypeStruct1SimpleParam { _a },
444		TupleStruct1SimpleParam(_a),
445		(_a,),
446	);
447}
448
449#[test]
450fn codec_struct_1_dynamic() {
451	let _a: String = "some string".into();
452	test_impl::<TypeStruct1DynamicParam, TupleStruct1DynamicParam, (String,)>(
453		TypeStruct1DynamicParam { _a: _a.clone() },
454		TupleStruct1DynamicParam(_a.clone()),
455		(_a,),
456	);
457}
458
459#[test]
460fn codec_struct_2_dynamic() {
461	let _a: String = "some string".into();
462	let _b: bytes = bytes(vec![0x11, 0x22, 0x33]);
463	test_impl::<TypeStruct2DynamicParam, TupleStruct2DynamicParam, (String, bytes)>(
464		TypeStruct2DynamicParam {
465			_a: _a.clone(),
466			_b: _b.clone(),
467		},
468		TupleStruct2DynamicParam(_a.clone(), _b.clone()),
469		(_a, _b),
470	);
471}
413472