cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Allow integers for BlockNumber

Browse Source 
If parsing fails, fall back to hex decoding
This commit is contained in:
Taylor Gerring 2015-03-09 20:38:37 -05:00
parent a7538d0020
commit 3de51f76ee
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rpc/args.go
View File

@ -47,7 +47,12 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
if len(obj) < 1 { if len(obj) < 1 {
return errArguments return errArguments
} }
if v, ok := obj[0].(float64); ok {
args.BlockNumber = int64(v)
} else {
args.BlockNumber = ethutil.Big(obj[0].(string)).Int64() args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
}
if len(obj) > 1 { if len(obj) > 1 {
args.Transactions = obj[1].(bool) args.Transactions = obj[1].(bool)
@ -110,7 +115,9 @@ func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0].(string) args.Address = obj[0].(string)
if len(obj) > 1 { if len(obj) > 1 {
if obj[1].(string) == "latest" { if v, ok := obj[1].(float64); ok {
args.BlockNumber = int64(v)
} else if obj[1].(string) == "latest" {
args.BlockNumber = -1 args.BlockNumber = -1
} else { } else {
args.BlockNumber = ethutil.Big(obj[1].(string)).Int64() args.BlockNumber = ethutil.Big(obj[1].(string)).Int64()
@ -147,7 +154,9 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
args.Key = obj[1].(string) args.Key = obj[1].(string)
if len(obj) > 2 { if len(obj) > 2 {
if obj[2].(string) == "latest" { if v, ok := obj[2].(float64); ok {
args.BlockNumber = int64(v)
} else if obj[2].(string) == "latest" {
args.BlockNumber = -1 args.BlockNumber = -1
} else { } else {
args.BlockNumber = ethutil.Big(obj[2].(string)).Int64() args.BlockNumber = ethutil.Big(obj[2].(string)).Int64()
@ -187,7 +196,9 @@ func (args *GetTxCountArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0].(string) args.Address = obj[0].(string)
if len(obj) > 1 { if len(obj) > 1 {
if obj[1].(string) == "latest" { if v, ok := obj[1].(float64); ok {
args.BlockNumber = int64(v)
} else if obj[1].(string) == "latest" {
args.BlockNumber = -1 args.BlockNumber = -1
} else { } else {
args.BlockNumber = ethutil.Big(obj[1].(string)).Int64() args.BlockNumber = ethutil.Big(obj[1].(string)).Int64()
@ -222,7 +233,9 @@ func (args *GetBalanceArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0].(string) args.Address = obj[0].(string)
if len(obj) > 1 { if len(obj) > 1 {
if obj[1].(string) == "latest" { if v, ok := obj[1].(float64); ok {
args.BlockNumber = int64(v)
} else if obj[1].(string) == "latest" {
args.BlockNumber = -1 args.BlockNumber = -1
} else { } else {
args.BlockNumber = ethutil.Big(obj[1].(string)).Int64() args.BlockNumber = ethutil.Big(obj[1].(string)).Int64()
@ -257,7 +270,9 @@ func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0].(string) args.Address = obj[0].(string)
if len(obj) > 1 { if len(obj) > 1 {
if obj[1].(string) == "latest" { if v, ok := obj[1].(float64); ok {
args.BlockNumber = int64(v)
} else if obj[1].(string) == "latest" {
args.BlockNumber = -1 args.BlockNumber = -1
} else { } else {
args.BlockNumber = ethutil.Big(obj[1].(string)).Int64() args.BlockNumber = ethutil.Big(obj[1].(string)).Int64()