gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15285 from yondonfu/abi-offset-fixed-arrays

Browse Source 
accounts/abi: include fixed array size in offset for dynamic type
This commit is contained in:
Martin Holst Swende
2017-12-21 14:42:03 +01:00
committed by GitHub
parent 91c3362315 cf7aba36c8
commit b0d41e386e
2 changed files with 194 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
accounts/abi/method.go
View File

@ -48,6 +48,16 @@ func (method Method) pack(args ...interface{}) ([]byte, error) {
// output. This is used for strings and bytes types input.
var variableInput []byte
// input offset is the bytes offset for packed output
inputOffset := 0
for _, input := range method.Inputs {
if input.Type.T == ArrayTy {
inputOffset += (32 * input.Type.Size)
} else {
inputOffset += 32
}
}
var ret []byte
for i, a := range args {
input := method.Inputs[i]
@ -60,7 +70,8 @@ func (method Method) pack(args ...interface{}) ([]byte, error) {
// check for a slice type (string, bytes, slice)
if input.Type.requiresLengthPrefix() {
// calculate the offset
offset := len(method.Inputs)*32 + len(variableInput)
offset := inputOffset + len(variableInput)
// set the offset
ret = append(ret, packNum(reflect.ValueOf(offset))...)
// Append the packed output to the variable input. The variable input