0ed8b838a9
+ The event slice unpacker doesn't correctly extract element from the slice. The indexed arguments are not ignored as they should be (the data offset should not include the indexed arguments). + The `Elem()` call in the slice unpack doesn't work. The Slice related tests fails because of that. + the check in the loop are suboptimal and have been extracted out of the loop. + extracted common code from event and method tupleUnpack
62 lines
1.5 KiB
Go
62 lines
1.5 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package abi
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
)
|
|
|
|
// Argument holds the name of the argument and the corresponding type.
|
|
// Types are used when packing and testing arguments.
|
|
type Argument struct {
|
|
Name string
|
|
Type Type
|
|
Indexed bool // indexed is only used by events
|
|
}
|
|
|
|
func (a *Argument) UnmarshalJSON(data []byte) error {
|
|
var extarg struct {
|
|
Name string
|
|
Type string
|
|
Indexed bool
|
|
}
|
|
err := json.Unmarshal(data, &extarg)
|
|
if err != nil {
|
|
return fmt.Errorf("argument json err: %v", err)
|
|
}
|
|
|
|
a.Type, err = NewType(extarg.Type)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
a.Name = extarg.Name
|
|
a.Indexed = extarg.Indexed
|
|
|
|
return nil
|
|
}
|
|
|
|
func countNonIndexedArguments(args []Argument) int {
|
|
out := 0
|
|
for i := range args {
|
|
if !args[i].Indexed {
|
|
out++
|
|
}
|
|
}
|
|
return out
|
|
}
|