accounts/abi: make ToGoType public

This commit is contained in:
Martin Holst Swende 2017-12-18 20:21:16 +01:00
parent fe070ab5c3
commit 533f2be9ee
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
6 changed files with 21 additions and 9 deletions

View file

@ -20,6 +20,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"bytes"
) )
// The ABI holds information about a contract's context and available // The ABI holds information about a contract's context and available
@ -137,3 +138,14 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
return nil return nil
} }
// methodById looks up a method by the 4-byte id
// returns nil if none found
func (abi *ABI) MethodById(sigdata []byte) *Method {
for _, method := range abi.Methods{
if bytes.Equal(method.Id(), sigdata) {
return &method
}
}
return nil
}

View file

@ -75,7 +75,7 @@ func (e Event) tupleUnpack(v interface{}, output []byte) error {
// need to move this up because they read sequentially // need to move this up because they read sequentially
j += input.Type.Size j += input.Type.Size
} }
marshalledValue, err := toGoType((i+j)*32, input.Type, output) marshalledValue, err := ToGoType((i+j)*32, input.Type, output)
if err != nil { if err != nil {
return err return err
} }
@ -126,7 +126,7 @@ func (e Event) singleUnpack(v interface{}, output []byte) error {
value := valueOf.Elem() value := valueOf.Elem()
marshalledValue, err := toGoType(0, e.Inputs[0].Type, output) marshalledValue, err := ToGoType(0, e.Inputs[0].Type, output)
if err != nil { if err != nil {
return err return err
} }

View file

@ -99,7 +99,7 @@ func (method Method) tupleUnpack(v interface{}, output []byte) error {
// need to move this up because they read sequentially // need to move this up because they read sequentially
j += toUnpack.Type.Size j += toUnpack.Type.Size
} }
marshalledValue, err := toGoType((i+j)*32, toUnpack.Type, output) marshalledValue, err := ToGoType((i+j)*32, toUnpack.Type, output)
if err != nil { if err != nil {
return err return err
} }
@ -146,7 +146,7 @@ func (method Method) singleUnpack(v interface{}, output []byte) error {
value := valueOf.Elem() value := valueOf.Elem()
marshalledValue, err := toGoType(0, method.Outputs[0].Type, output) marshalledValue, err := ToGoType(0, method.Outputs[0].Type, output)
if err != nil { if err != nil {
return err return err
} }

View file

@ -127,7 +127,7 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
if t.Elem.T == ArrayTy && j != 0 { if t.Elem.T == ArrayTy && j != 0 {
i = start + t.Elem.Size*32*j i = start + t.Elem.Size*32*j
} }
inter, err := toGoType(i, *t.Elem, output) inter, err := ToGoType(i, *t.Elem, output)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -139,9 +139,9 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
return refSlice.Interface(), nil return refSlice.Interface(), nil
} }
// toGoType parses the output bytes and recursively assigns the value of these bytes // ToGoType parses the output bytes and recursively assigns the value of these bytes
// into a go type with accordance with the ABI spec. // into a go type with accordance with the ABI spec.
func toGoType(index int, t Type, output []byte) (interface{}, error) { func ToGoType(index int, t Type, output []byte) (interface{}, error) {
if index+32 > len(output) { if index+32 > len(output) {
return nil, fmt.Errorf("abi: cannot marshal in to go type: length insufficient %d require %d", len(output), index+32) return nil, fmt.Errorf("abi: cannot marshal in to go type: length insufficient %d require %d", len(output), index+32)
} }

View file

@ -127,7 +127,7 @@ func (hub *Hub) refreshWallets() {
// breaking the Ledger protocol if that is waiting for user confirmation. This // breaking the Ledger protocol if that is waiting for user confirmation. This
// is a bug acknowledged at Ledger, but it won't be fixed on old devices so we // is a bug acknowledged at Ledger, but it won't be fixed on old devices so we
// need to prevent concurrent comms ourselves. The more elegant solution would // need to prevent concurrent comms ourselves. The more elegant solution would
// be to ditch enumeration in favor of hutplug events, but that don't work yet // be to ditch enumeration in favor of hotplug events, but that don't work yet
// on Windows so if we need to hack it anyway, this is more elegant for now. // on Windows so if we need to hack it anyway, this is more elegant for now.
hub.commsLock.Lock() hub.commsLock.Lock()
if hub.commsPend > 0 { // A confirmation is pending, don't refresh if hub.commsPend > 0 { // A confirmation is pending, don't refresh

View file

@ -99,7 +99,7 @@ type wallet struct {
// //
// As such, a hardware wallet needs two locks to function correctly. A state // As such, a hardware wallet needs two locks to function correctly. A state
// lock can be used to protect the wallet's software-side internal state, which // lock can be used to protect the wallet's software-side internal state, which
// must not be held exlusively during hardware communication. A communication // must not be held exclusively during hardware communication. A communication
// lock can be used to achieve exclusive access to the device itself, this one // lock can be used to achieve exclusive access to the device itself, this one
// however should allow "skipping" waiting for operations that might want to // however should allow "skipping" waiting for operations that might want to
// use the device, but can live without too (e.g. account self-derivation). // use the device, but can live without too (e.g. account self-derivation).