mirror of https://github.com/ethereum/go-ethereum
Refactored the abi package parsing and type handling. Relying mostly on
package reflect as opposed to most of our own type reflection. Our own
type reflection is still used however for cases such as Bytes and
FixedBytes (abi: bytes•).
This also inclused several fixes for slice handling of arbitrary and
fixed size for all supported types.
This also further removes implicit type casting such as assigning,
for example `[2]T{} = []T{1}` will fail, however `[2]T{} == []T{1, 2}`
(notice assigning *slice* to fixed size *array*). Assigning arrays to
slices will always succeed if they are of the same element type.
Incidentally also fixes #2379
pull/2435/head
Jeffrey Wilcke
9 years ago
parent
18580e152c
commit
5127ec10cb
@ -0,0 +1,80 @@ |
||||
// Copyright 2016 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 ( |
||||
"fmt" |
||||
"reflect" |
||||
) |
||||
|
||||
// formatSliceString formats the reflection kind with the given slice size
|
||||
// and returns a formatted string representation.
|
||||
func formatSliceString(kind reflect.Kind, sliceSize int) string { |
||||
if sliceSize == -1 { |
||||
return fmt.Sprintf("[]%v", kind) |
||||
} |
||||
return fmt.Sprintf("[%d]%v", sliceSize, kind) |
||||
} |
||||
|
||||
// sliceTypeCheck checks that the given slice can by assigned to the reflection
|
||||
// type in t.
|
||||
func sliceTypeCheck(t Type, val reflect.Value) error { |
||||
if !(val.Kind() == reflect.Slice || val.Kind() == reflect.Array) { |
||||
return typeErr(formatSliceString(t.Kind, t.SliceSize), val.Type()) |
||||
} |
||||
if t.IsArray && val.Len() != t.SliceSize { |
||||
return typeErr(formatSliceString(t.Elem.Kind, t.SliceSize), formatSliceString(val.Type().Elem().Kind(), val.Len())) |
||||
} |
||||
|
||||
if t.Elem.IsSlice { |
||||
if val.Len() > 0 { |
||||
return sliceTypeCheck(*t.Elem, val.Index(0)) |
||||
} |
||||
} else if t.Elem.IsArray { |
||||
return sliceTypeCheck(*t.Elem, val.Index(0)) |
||||
} |
||||
|
||||
elemKind := val.Type().Elem().Kind() |
||||
if elemKind != t.Elem.Kind { |
||||
return typeErr(formatSliceString(t.Elem.Kind, t.SliceSize), val.Type()) |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
// typeCheck checks that thet given reflection val can be assigned to the reflection
|
||||
// type in t.
|
||||
func typeCheck(t Type, value reflect.Value) error { |
||||
if t.IsSlice || t.IsArray { |
||||
return sliceTypeCheck(t, value) |
||||
} |
||||
|
||||
// Check base type validity. Element types will be checked later on.
|
||||
if t.Kind != value.Kind() { |
||||
return typeErr(t.Kind, value.Kind()) |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
// varErr returns a formatted error.
|
||||
func varErr(expected, got reflect.Kind) error { |
||||
return typeErr(expected, got) |
||||
} |
||||
|
||||
// typeErr returns a formatted type casting error.
|
||||
func typeErr(expected, got interface{}) error { |
||||
return fmt.Errorf("abi: cannot use %v as type %v as argument", got, expected) |
||||
} |
||||
@ -0,0 +1,65 @@ |
||||
// Copyright 2016 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 ( |
||||
"reflect" |
||||
|
||||
"github.com/ethereum/go-ethereum/common" |
||||
) |
||||
|
||||
// packBytesSlice packs the given bytes as [L, V] as the canonical representation
|
||||
// bytes slice
|
||||
func packBytesSlice(bytes []byte, l int) []byte { |
||||
len := packNum(reflect.ValueOf(l), UintTy) |
||||
return append(len, common.RightPadBytes(bytes, (l+31)/32*32)...) |
||||
} |
||||
|
||||
// packElement packs the given reflect value according to the abi specification in
|
||||
// t.
|
||||
func packElement(t Type, reflectValue reflect.Value) []byte { |
||||
switch t.T { |
||||
case IntTy, UintTy: |
||||
return packNum(reflectValue, t.T) |
||||
case StringTy: |
||||
return packBytesSlice([]byte(reflectValue.String()), reflectValue.Len()) |
||||
case AddressTy: |
||||
if reflectValue.Kind() == reflect.Array { |
||||
reflectValue = mustArrayToByteSlice(reflectValue) |
||||
} |
||||
|
||||
return common.LeftPadBytes(reflectValue.Bytes(), 32) |
||||
case BoolTy: |
||||
if reflectValue.Bool() { |
||||
return common.LeftPadBytes(common.Big1.Bytes(), 32) |
||||
} else { |
||||
return common.LeftPadBytes(common.Big0.Bytes(), 32) |
||||
} |
||||
case BytesTy: |
||||
if reflectValue.Kind() == reflect.Array { |
||||
reflectValue = mustArrayToByteSlice(reflectValue) |
||||
} |
||||
return packBytesSlice(reflectValue.Bytes(), reflectValue.Len()) |
||||
case FixedBytesTy: |
||||
if reflectValue.Kind() == reflect.Array { |
||||
reflectValue = mustArrayToByteSlice(reflectValue) |
||||
} |
||||
|
||||
return common.LeftPadBytes(reflectValue.Bytes(), 32) |
||||
} |
||||
panic("abi: fatal error") |
||||
} |
||||
@ -0,0 +1,64 @@ |
||||
// Copyright 2016 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 "reflect" |
||||
|
||||
// indirect recursively dereferences the value until it either gets the value
|
||||
// or finds a big.Int
|
||||
func indirect(v reflect.Value) reflect.Value { |
||||
if v.Kind() == reflect.Ptr && v.Elem().Type() != big_t { |
||||
return indirect(v.Elem()) |
||||
} |
||||
return v |
||||
} |
||||
|
||||
// reflectIntKind returns the reflect using the given size and
|
||||
// unsignedness.
|
||||
func reflectIntKind(unsigned bool, size int) reflect.Kind { |
||||
switch size { |
||||
case 8: |
||||
if unsigned { |
||||
return reflect.Uint8 |
||||
} |
||||
return reflect.Int8 |
||||
case 16: |
||||
if unsigned { |
||||
return reflect.Uint16 |
||||
} |
||||
return reflect.Int16 |
||||
case 32: |
||||
if unsigned { |
||||
return reflect.Uint32 |
||||
} |
||||
return reflect.Int32 |
||||
case 64: |
||||
if unsigned { |
||||
return reflect.Uint64 |
||||
} |
||||
return reflect.Int64 |
||||
} |
||||
return reflect.Ptr |
||||
} |
||||
|
||||
// mustArrayToBytesSlice creates a new byte slice with the exact same size as value
|
||||
// and copies the bytes in value to the new slice.
|
||||
func mustArrayToByteSlice(value reflect.Value) reflect.Value { |
||||
slice := reflect.MakeSlice(reflect.TypeOf([]byte{}), value.Len(), value.Len()) |
||||
reflect.Copy(slice, value) |
||||
return slice |
||||
} |
||||
Loading…
Reference in new issue