fixed decoding of tuples in an array

izakpavel · izakpavel · commit 2d7952454290 · 2021-08-12T16:25:12.000+02:00
diff --git a/Sources/web3swift/EthereumABI/ABIDecoding.swift b/Sources/web3swift/EthereumABI/ABIDecoding.swift
@@ -137,7 +137,12 @@ extension ABIDecoder {
                         let (v, c) = decodeSignleType(type: subType, data: dataSlice, pointer: subpointer)
                         guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}
                         toReturn.append(valueUnwrapped)
-                        subpointer = subpointer + consumedUnwrapped
+                        if (subType.isStatic) {
+                            subpointer = subpointer + consumedUnwrapped
+                        }
+                        else {
+                            subpointer = consumedUnwrapped // need to go by nextElementPointer
+                        }
                     }
                     return (toReturn as AnyObject, nextElementPointer)
                 }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,12 @@ extension ABIDecoder {`
`137`	`137`	`let (v, c) = decodeSignleType(type: subType, data: dataSlice, pointer: subpointer)`
`138`	`138`	`guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}`
`139`	`139`	`toReturn.append(valueUnwrapped)`
`140`		`- subpointer = subpointer + consumedUnwrapped`
	`140`	`+ if (subType.isStatic) {`
	`141`	`+ subpointer = subpointer + consumedUnwrapped`
	`142`	`+ }`
	`143`	`+ else {`
	`144`	`+ subpointer = consumedUnwrapped // need to go by nextElementPointer`
	`145`	`+ }`
`141`	`146`	`}`
`142`	`147`	`return (toReturn as AnyObject, nextElementPointer)`
`143`	`148`	`}`