diff --git a/rpc/api.go b/rpc/api.go
index 57075bffc3dc923fb66566bc98219c2f92e358fa..6154a0b286bada30246f0a494486925869ffba89 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -161,7 +161,7 @@ func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) erro
id = self.filterManager.InstallFilter(filter)
self.logs[id] = &logFilter{timeout: time.Now()}
- *reply = i2hex(id)
+ *reply = common.ToHex(big.NewInt(int64(id)).Bytes())
return nil
}
@@ -198,7 +198,7 @@ func (self *EthereumApi) NewFilterString(args *FilterStringArgs, reply *interfac
id = self.filterManager.InstallFilter(filter)
self.logs[id] = &logFilter{timeout: time.Now()}
- *reply = i2hex(id)
+ *reply = common.ToHex(big.NewInt(int64(id)).Bytes())
return nil
}
diff --git a/rpc/args.go b/rpc/args.go
index fee44c4e09c2151d38811c9fa86fa86c76b03107..992ea1eedefe35e6be1314bd93d5d8c603aee4c9 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -8,10 +8,18 @@ import (
"github.com/ethereum/go-ethereum/common"
)
-func blockNumber(raw json.RawMessage, number *int64) (err error) {
- var str string
- if err = json.Unmarshal(raw, &str); err != nil {
- return NewDecodeParamError(err.Error())
+func blockAge(raw interface{}, number *int64) (err error) {
+ // Parse as integer
+ num, ok := raw.(float64)
+ if ok {
+ *number = int64(num)
+ return nil
+ }
+
+ // Parse as string/hexstring
+ str, ok := raw.(string)
+ if !ok {
+ return NewDecodeParamError("BlockNumber is not a string")
}
switch str {
@@ -22,6 +30,7 @@ func blockNumber(raw json.RawMessage, number *int64) (err error) {
default:
*number = common.String2Big(str).Int64()
}
+
return nil
}
@@ -95,17 +104,43 @@ type NewTxArgs struct {
}
func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
- var obj struct{ From, To, Value, Gas, GasPrice, Data string }
- if err = UnmarshalRawMessages(b, &obj, &args.BlockNumber); err != nil {
- return err
+ var obj []json.RawMessage
+ var ext struct{ From, To, Value, Gas, GasPrice, Data string }
+
+ // Decode byte slice to array of RawMessages
+ if err := json.Unmarshal(b, &obj); err != nil {
+ return NewDecodeParamError(err.Error())
}
- args.From = obj.From
- args.To = obj.To
- args.Value = common.Big(obj.Value)
- args.Gas = common.Big(obj.Gas)
- args.GasPrice = common.Big(obj.GasPrice)
- args.Data = obj.Data
+ // Check for sufficient params
+ if len(obj) < 1 {
+ return NewInsufficientParamsError(len(obj), 1)
+ }
+
+ // Decode 0th RawMessage to temporary struct
+ if err := json.Unmarshal(obj[0], &ext); err != nil {
+ return NewDecodeParamError(err.Error())
+ }
+
+ // var ok bool
+ args.From = ext.From
+ args.To = ext.To
+ args.Value = common.String2Big(ext.Value)
+ args.Gas = common.String2Big(ext.Gas)
+ args.GasPrice = common.String2Big(ext.GasPrice)
+ args.Data = ext.Data
+
+ // Check for optional BlockNumber param
+ if len(obj) > 1 {
+ var raw interface{}
+ if err = json.Unmarshal(obj[1], &raw); err != nil {
+ return NewDecodeParamError(err.Error())
+ }
+
+ if err := blockAge(raw, &args.BlockNumber); err != nil {
+ return err
+ }
+ }
return nil
}
@@ -116,10 +151,27 @@ type GetStorageArgs struct {
}
func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
- if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ var obj []interface{}
+ if err := json.Unmarshal(b, &obj); err != nil {
return NewDecodeParamError(err.Error())
}
+ if len(obj) < 1 {
+ return NewInsufficientParamsError(len(obj), 1)
+ }
+
+ addstr, ok := obj[0].(string)
+ if !ok {
+ return NewDecodeParamError("Address is not a string")
+ }
+ args.Address = addstr
+
+ if len(obj) > 1 {
+ if err := blockAge(obj[1], &args.BlockNumber); err != nil {
+ return err
+ }
+ }
+
return nil
}
@@ -137,16 +189,32 @@ type GetStorageAtArgs struct {
}
func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
- var obj []string
- if err = UnmarshalRawMessages(b, &obj, &args.BlockNumber); err != nil {
+ var obj []interface{}
+ if err := json.Unmarshal(b, &obj); err != nil {
return NewDecodeParamError(err.Error())
}
+
if len(obj) < 2 {
return NewInsufficientParamsError(len(obj), 2)
}
- args.Address = obj[0]
- args.Key = obj[1]
+ addstr, ok := obj[0].(string)
+ if !ok {
+ return NewDecodeParamError("Address is not a string")
+ }
+ args.Address = addstr
+
+ keystr, ok := obj[1].(string)
+ if !ok {
+ return NewDecodeParamError("Key is not a string")
+ }
+ args.Key = keystr
+
+ if len(obj) > 2 {
+ if err := blockAge(obj[2], &args.BlockNumber); err != nil {
+ return err
+ }
+ }
return nil
}
@@ -168,10 +236,27 @@ type GetTxCountArgs struct {
}
func (args *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
- if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ var obj []interface{}
+ if err := json.Unmarshal(b, &obj); err != nil {
return NewDecodeParamError(err.Error())
}
+ if len(obj) < 1 {
+ return NewInsufficientParamsError(len(obj), 1)
+ }
+
+ addstr, ok := obj[0].(string)
+ if !ok {
+ return NewDecodeParamError("Address is not a string")
+ }
+ args.Address = addstr
+
+ if len(obj) > 1 {
+ if err := blockAge(obj[1], &args.BlockNumber); err != nil {
+ return err
+ }
+ }
+
return nil
}
@@ -189,8 +274,7 @@ type GetBalanceArgs struct {
func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
var obj []interface{}
- r := bytes.NewReader(b)
- if err := json.NewDecoder(r).Decode(&obj); err != nil {
+ if err := json.Unmarshal(b, &obj); err != nil {
return NewDecodeParamError(err.Error())
}
@@ -205,17 +289,11 @@ func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = addstr
if len(obj) > 1 {
- if obj[1].(string) == "latest" {
- args.BlockNumber = -1
- } else {
- args.BlockNumber = common.Big(obj[1].(string)).Int64()
+ if err := blockAge(obj[1], &args.BlockNumber); err != nil {
+ return err
}
}
- // if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
- // return NewDecodeParamError(err.Error())
- // }
-
return nil
}
@@ -232,10 +310,27 @@ type GetDataArgs struct {
}
func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
- if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
+ var obj []interface{}
+ if err := json.Unmarshal(b, &obj); err != nil {
return NewDecodeParamError(err.Error())
}
+ if len(obj) < 1 {
+ return NewInsufficientParamsError(len(obj), 1)
+ }
+
+ addstr, ok := obj[0].(string)
+ if !ok {
+ return NewDecodeParamError("Address is not a string")
+ }
+ args.Address = addstr
+
+ if len(obj) > 1 {
+ if err := blockAge(obj[1], &args.BlockNumber); err != nil {
+ return err
+ }
+ }
+
return nil
}
@@ -392,10 +487,6 @@ func (args *FilterOptions) UnmarshalJSON(b []byte) (err error) {
return nil
}
-// type FilterChangedArgs struct {
-// n int
-// }
-
type DbArgs struct {
Database string
Key string
@@ -578,31 +669,3 @@ func (args *WhisperFilterArgs) UnmarshalJSON(b []byte) (err error) {
return nil
}
-
-// func (req *RpcRequest) ToRegisterArgs() (string, error) {
-// if len(req.Params) < 1 {
-// return "", errArguments
-// }
-
-// var args string
-// err := json.Unmarshal(req.Params, &args)
-// if err != nil {
-// return "", err
-// }
-
-// return args, nil
-// }
-
-// func (req *RpcRequest) ToWatchTxArgs() (string, error) {
-// if len(req.Params) < 1 {
-// return "", errArguments
-// }
-
-// var args string
-// err := json.Unmarshal(req.Params, &args)
-// if err != nil {
-// return "", err
-// }
-
-// return args, nil
-// }
diff --git a/rpc/args_test.go b/rpc/args_test.go
index 61b9dad25eee536a54bc0597ad89d99f1f604676..872c535fae713125e4108f0de96536c56d36c357 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -43,6 +43,30 @@ func TestGetBalanceArgs(t *testing.T) {
}
}
+func TestGetBalanceArgsLatest(t *testing.T) {
+ input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "latest"]`
+ expected := new(GetBalanceArgs)
+ expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+ expected.BlockNumber = -1
+
+ args := new(GetBalanceArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if err := args.requirements(); err != nil {
+ t.Error(err)
+ }
+
+ if args.Address != expected.Address {
+ t.Errorf("Address should be %v but is %v", expected.Address, args.Address)
+ }
+
+ if args.BlockNumber != expected.BlockNumber {
+ t.Errorf("BlockNumber should be %v but is %v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
func TestGetBalanceEmptyArgs(t *testing.T) {
input := `[]`
@@ -120,7 +144,8 @@ func TestNewTxArgs(t *testing.T) {
"gas": "0x76c0",
"gasPrice": "0x9184e72a000",
"value": "0x9184e72a000",
- "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"}]`
+ "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"},
+ "0x10"]`
expected := new(NewTxArgs)
expected.From = "0xb60e8dd61c5d32be8058bb8eb970870f07233155"
expected.To = "0xd46e8dd67c5d32be8058bb8eb970870f072445675"
@@ -128,6 +153,7 @@ func TestNewTxArgs(t *testing.T) {
expected.GasPrice = big.NewInt(10000000000000)
expected.Value = big.NewInt(10000000000000)
expected.Data = "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"
+ expected.BlockNumber = big.NewInt(16).Int64()
args := new(NewTxArgs)
if err := json.Unmarshal([]byte(input), &args); err != nil {
@@ -157,6 +183,30 @@ func TestNewTxArgs(t *testing.T) {
if expected.Data != args.Data {
t.Errorf("Data shoud be %#v but is %#v", expected.Data, args.Data)
}
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
+}
+
+func TestNewTxArgsBlockInt(t *testing.T) {
+ input := `[{"from": "0xb60e8dd61c5d32be8058bb8eb970870f07233155"}, 5]`
+ expected := new(NewTxArgs)
+ expected.From = "0xb60e8dd61c5d32be8058bb8eb970870f07233155"
+ expected.BlockNumber = big.NewInt(5).Int64()
+
+ args := new(NewTxArgs)
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
+ t.Error(err)
+ }
+
+ if expected.From != args.From {
+ t.Errorf("From shoud be %#v but is %#v", expected.From, args.From)
+ }
+
+ if expected.BlockNumber != args.BlockNumber {
+ t.Errorf("BlockNumber shoud be %#v but is %#v", expected.BlockNumber, args.BlockNumber)
+ }
}
func TestNewTxArgsEmpty(t *testing.T) {
diff --git a/rpc/util.go b/rpc/util.go
index 3209c4540e969a1aaaf29473e956b1c75efde622..0798ae1d22a9f70909c68ea3c1b64dc07688c649 100644
--- a/rpc/util.go
+++ b/rpc/util.go
@@ -17,10 +17,6 @@
package rpc
import (
- "encoding/json"
- "fmt"
- "math/big"
- "reflect"
"time"
"github.com/ethereum/go-ethereum/common"
@@ -31,74 +27,6 @@ import (
var rpclogger = logger.NewLogger("RPC")
-// Unmarshal state is a helper method which has the ability to decode messsages
-// that use the `defaultBlock` (https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter)
-// For example a `call`: [{to: "0x....", data:"0x..."}, "latest"]. The first argument is the transaction
-// message and the second one refers to the block height (or state) to which to apply this `call`.
-func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error) {
- var data []json.RawMessage
- if err = json.Unmarshal(b, &data); err != nil && len(data) == 0 {
- return NewDecodeParamError(err.Error())
- }
-
- // Hrm... Occurs when no params
- if len(data) == 0 {
- return NewDecodeParamError("No data")
- }
-
- // Number index determines the index in the array for a possible block number
- numberIndex := 0
-
- value := reflect.ValueOf(iface)
- rvalue := reflect.Indirect(value)
-
- switch rvalue.Kind() {
- case reflect.Slice:
- // This is a bit of a cheat, but `data` is expected to be larger than 2 if iface is a slice
- if number != nil {
- numberIndex = len(data) - 1
- } else {
- numberIndex = len(data)
- }
-
- slice := reflect.MakeSlice(rvalue.Type(), numberIndex, numberIndex)
- for i, raw := range data[0:numberIndex] {
- v := slice.Index(i).Interface()
- if err = json.Unmarshal(raw, &v); err != nil {
- fmt.Println(err, v)
- return err
- }
- slice.Index(i).Set(reflect.ValueOf(v))
- }
- reflect.Indirect(rvalue).Set(slice) //value.Set(slice)
- case reflect.Struct:
- fallthrough
- default:
- if err = json.Unmarshal(data[0], iface); err != nil {
- return NewDecodeParamError(err.Error())
- }
- numberIndex = 1
- }
-
- // <0 index means out of bound for block number
- if numberIndex >= 0 && len(data) > numberIndex {
- if err = blockNumber(data[numberIndex], number); err != nil {
- return NewDecodeParamError(err.Error())
- }
- }
-
- return nil
-}
-
-func i2hex(n int) string {
- return common.ToHex(big.NewInt(int64(n)).Bytes())
-}
-
-type RpcServer interface {
- Start()
- Stop()
-}
-
type Log struct {
Address string `json:"address"`
Topic []string `json:"topic"`