New DataArgs and eth_sendRawTransaction

4 files changed, 60 insertions, 2 deletions

diff --git a/rpc/api.go b/rpc/api.go
index 943d50119..e825accfd 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -171,7 +171,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		*reply = v
 
 	case "eth_sendRawTransaction":
-		args := new(NewSigArgs)
+		args := new(NewDataArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 			return err
 		}
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index bb89615cf..e1e7381f5 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -250,7 +250,7 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
 
 
 func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) {
-	args := new(NewSigArgs)
+	args := new(NewDataArgs)
 	if err := self.codec.Decode(req.Params, &args); err != nil {
 		return nil, shared.NewDecodeParamError(err.Error())
 	}
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index ad9a35fa2..70fb18289 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -226,6 +226,35 @@ func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
 	return nil
 }
 
+type NewDataArgs struct {
+    Data string
+}
+
+func (args *NewDataArgs) UnmarshalJSON(b []byte) (err error) {
+    var obj []interface{}
+
+    if err := json.Unmarshal(b, &obj); err != nil {
+        return shared.NewDecodeParamError(err.Error())
+    }
+
+    // Check for sufficient params
+    if len(obj) < 1 {
+        return shared.NewInsufficientParamsError(len(obj), 1)
+    }
+
+    data, ok := obj[0].(string)
+    if !ok {
+        return shared.NewInvalidTypeError("data", "not a string")
+    }
+    args.Data = data
+
+    if len(args.Data) == 0 {
+        return shared.NewValidationError("data", "is required")
+    }
+
+    return nil
+}
+
 type NewSigArgs struct {
 	From string
 	Data string
diff --git a/rpc/args.go b/rpc/args.go
index 65f0f6043..aa7d20549 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -154,6 +154,35 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
 	return nil
 }
 
+type NewDataArgs struct {
+    Data string
+}
+
+func (args *NewDataArgs) UnmarshalJSON(b []byte) (err error) {
+    var obj []interface{}
+
+    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)
+    }
+
+    data, ok := obj[0].(string)
+    if !ok {
+        return NewInvalidTypeError("data", "not a string")
+    }
+    args.Data = data
+
+    if len(args.Data) == 0 {
+        return NewValidationError("data", "is required")
+    }
+
+    return nil
+}
+
 type NewTxArgs struct {
 	From     string
 	To       string