accounts/abi: fix a bug in getTypeSize method (ethereum#21501)

tofudfy · unclezoro · commit 670009d1e17b · 2021-01-11T11:26:29.000+08:00
* accounts/abi: fix a bug in getTypeSize method

e.g. for "Tuple[2]" type, the element of the array is a tuple type and the size of the tuple may not be 32.

* accounts/abi: add unit test of getTypeSize method
diff --git a/accounts/abi/type.go b/accounts/abi/type.go
@@ -350,7 +350,7 @@ func isDynamicType(t Type) bool {
 func getTypeSize(t Type) int {
 	if t.T == ArrayTy && !isDynamicType(*t.Elem) {
 		// Recursively calculate type size if it is a nested array
-		if t.Elem.T == ArrayTy {
+		if t.Elem.T == ArrayTy || t.Elem.T == TupleTy {
 			return t.Size * getTypeSize(*t.Elem)
 		}
 		return t.Size * 32

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ func isDynamicType(t Type) bool {`
`350`	`350`	`func getTypeSize(t Type) int {`
`351`	`351`	`if t.T == ArrayTy && !isDynamicType(*t.Elem) {`
`352`	`352`	`// Recursively calculate type size if it is a nested array`
`353`		`- if t.Elem.T == ArrayTy {`
	`353`	`+ if t.Elem.T == ArrayTy \|\| t.Elem.T == TupleTy {`
`354`	`354`	`return t.Size * getTypeSize(*t.Elem)`
`355`	`355`	`}`
`356`	`356`	`return t.Size * 32`