forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-14 07:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

accounts/abi: current workings on packing and unpacking, trying to decide how to design this

Browse source 
Signed-off-by: RJ Catalano <rj@monax.io>
This commit is contained in:
RJ Catalano 2017-06-27 15:05:39 -05:00
parent 3a72388020
commit a0083e913a
No known key found for this signature in database
GPG key ID: D4AB109D9B5D6386
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
accounts/abi/unpack.go
View file

@ -97,6 +97,11 @@ func toGoSlice(i int, t Argument, output []byte) (interface{}, error) {
inter = common.BytesToHash(returnOutput) inter = common.BytesToHash(returnOutput)
case FixedBytesTy: case FixedBytesTy:
inter = returnOutput inter = returnOutput
case SliceTy, ArrayTy:
inter, err = toGoSlice(i+index/32, t, output)
if err != nil {
return nil, err
}
default: default:
return nil, fmt.Errorf("abi: unsupported slice type passed in") return nil, fmt.Errorf("abi: unsupported slice type passed in")
} }
@ -158,6 +163,9 @@ func readBool(word []byte) (bool, error) {
// toGoType parses the input and casts it to the proper type defined by the ABI // toGoType parses the input and casts it to the proper type defined by the ABI
// argument in T. // argument in T.
func toGoType(i int, t Argument, output []byte) (interface{}, error) { func toGoType(i int, t Argument, output []byte) (interface{}, error) {
if len(output)%32 != 0 {
return nil, fmt.Errorf("abi: improperly formatted output")
}
// we need to treat slices differently // we need to treat slices differently
if (t.Type.IsSlice || t.Type.IsArray) && t.Type.T != BytesTy && t.Type.T != StringTy && t.Type.T != FixedBytesTy && t.Type.T != FunctionTy { if (t.Type.IsSlice || t.Type.IsArray) && t.Type.T != BytesTy && t.Type.T != StringTy && t.Type.T != FixedBytesTy && t.Type.T != FunctionTy {
return toGoSlice(i, t, output) return toGoSlice(i, t, output)

8
accounts/abi/unpack_test.go
View file

@ -244,6 +244,13 @@ func TestArraysAndSlicesUnpack(t *testing.T) {
[]uint8{}, []uint8{},
"", "",
}, },
{
`[ { "type": "uint8[][]" } ]`,
common.Hex2Bytes("00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000E0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002"),
[][]uint8{{1, 2}, {1, 2}},
[][]uint8{{}},
"",
},
{ {
`[ { "type": "uint8[2]" } ]`, `[ { "type": "uint8[2]" } ]`,
common.Hex2Bytes("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002"), common.Hex2Bytes("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002"),
@ -378,6 +385,7 @@ func TestArraysAndSlicesUnpack(t *testing.T) {
"", "",
}, },
} { } {
//t.Log(test.marshalledOutput)
abiDefinition := fmt.Sprintf(`[{ "name" : "method", "outputs": %s}]`, test.def) abiDefinition := fmt.Sprintf(`[{ "name" : "method", "outputs": %s}]`, test.def)
abi, err := JSON(strings.NewReader(abiDefinition)) abi, err := JSON(strings.NewReader(abiDefinition))