From 32db5716816ef6fddb0d943fc0083c89127e8533 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 2 May 2017 13:42:55 +0200 Subject: console: avoid float64 when remarshaling parameters With Go 1.7, encoding/json marshals float64 using scientific notation ("10e+6"), but Go's int and *big.Int decoders don't accept such numbers. This change disables use of float64 to avoid the problem. --- console/bridge.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'console') diff --git a/console/bridge.go b/console/bridge.go index 6db54eb21..75be68188 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -20,6 +20,7 @@ import ( "encoding/json" "fmt" "io" + "strings" "time" "github.com/ethereum/go-ethereum/log" @@ -240,17 +241,19 @@ func (b *bridge) Send(call otto.FunctionCall) (response otto.Value) { throwJSException(err.Error()) } var ( - rawReq = []byte(reqVal.String()) + rawReq = reqVal.String() + dec = json.NewDecoder(strings.NewReader(rawReq)) reqs []jsonrpcCall batch bool ) + dec.UseNumber() // avoid float64s if rawReq[0] == '[' { batch = true - json.Unmarshal(rawReq, &reqs) + dec.Decode(&reqs) } else { batch = false reqs = make([]jsonrpcCall, 1) - json.Unmarshal(rawReq, &reqs[0]) + dec.Decode(&reqs[0]) } // Execute the requests. -- cgit v1.2.3