aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-22 19:00:04 +0800
committerobscuren <geffobscura@gmail.com>2015-05-22 19:00:04 +0800
commit6539ccae7cc34ed164fd7e6d6750804fa3378261 (patch)
tree93b455f50e2769faef6758e588458f59faf369e0
parent054abe20b81ada11a820405f4a42f59cea9f9199 (diff)
downloadgo-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar.gz
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar.bz2
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar.lz
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar.xz
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.tar.zst
go-tangerine-6539ccae7cc34ed164fd7e6d6750804fa3378261.zip
core: added RPC sign back in
-rw-r--r--rpc/api.go20
-rw-r--r--rpc/args.go64
2 files changed, 42 insertions, 42 deletions
diff --git a/rpc/api.go b/rpc/api.go
index b6f6ac3f9..a9a0ae609 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -158,16 +158,16 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
v := api.xethAtStateNum(args.BlockNumber).CodeAtBytes(args.Address)
*reply = newHexData(v)
- // case "eth_sign":
- // args := new(NewSigArgs)
- // if err := json.Unmarshal(req.Params, &args); err != nil {
- // return err
- // }
- // v, err := api.xeth().Sign(args.From, args.Data, false)
- // if err != nil {
- // return err
- // }
- // *reply = v
+ case "eth_sign":
+ args := new(NewSigArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+ v, err := api.xeth().Sign(args.From, args.Data, false)
+ if err != nil {
+ return err
+ }
+ *reply = v
case "eth_sendTransaction", "eth_transact":
args := new(NewTxArgs)
diff --git a/rpc/args.go b/rpc/args.go
index 27824f12c..686872a59 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -166,45 +166,45 @@ type NewTxArgs struct {
BlockNumber int64
}
-// type NewSigArgs struct {
-// From string
-// Data string
-// }
+type NewSigArgs struct {
+ From string
+ Data string
+}
-// func (args *NewSigArgs) UnmarshalJSON(b []byte) (err error) {
-// var obj []json.RawMessage
-// var ext struct {
-// From string
-// Data string
-// }
+func (args *NewSigArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []json.RawMessage
+ var ext struct {
+ From string
+ Data string
+ }
-// // Decode byte slice to array of RawMessages
-// if err := json.Unmarshal(b, &obj); err != nil {
-// return NewDecodeParamError(err.Error())
-// }
+ // Decode byte slice to array of RawMessages
+ if err := json.Unmarshal(b, &obj); err != nil {
+ return NewDecodeParamError(err.Error())
+ }
-// // Check for sufficient params
-// if len(obj) < 1 {
-// return NewInsufficientParamsError(len(obj), 1)
-// }
+ // 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())
-// }
+ // Decode 0th RawMessage to temporary struct
+ if err := json.Unmarshal(obj[0], &ext); err != nil {
+ return NewDecodeParamError(err.Error())
+ }
-// if len(ext.From) == 0 {
-// return NewValidationError("from", "is required")
-// }
+ if len(ext.From) == 0 {
+ return NewValidationError("from", "is required")
+ }
-// if len(ext.Data) == 0 {
-// return NewValidationError("data", "is required")
-// }
+ if len(ext.Data) == 0 {
+ return NewValidationError("data", "is required")
+ }
-// args.From = ext.From
-// args.Data = ext.Data
-// return nil
-// }
+ args.From = ext.From
+ args.Data = ext.Data
+ return nil
+}
func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
var obj []json.RawMessage