Merge pull request #1267 from SilentCicero/develop

eth_sendRawTransaction JSON RPC

Author: obscuren

rpc/api.go

@@ -170,6 +170,17 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		}
 		*reply = v
 
+	case "eth_sendRawTransaction":
+		args := new(NewDataArgs)
+		if err := json.Unmarshal(req.Params, &args); err != nil {
+			return err
+		}
+		v, err := api.xeth().PushTx(args.Data)
+		if err != nil {
+			return err
+		}
+		*reply = v
+
 	case "eth_sendTransaction", "eth_transact":
 		args := new(NewTxArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {

rpc/api/eth.go

@@ -46,6 +46,7 @@ var (
 		"eth_getData":                           (*ethApi).GetData,
 		"eth_getCode":                           (*ethApi).GetData,
 		"eth_sign":                              (*ethApi).Sign,
+		"eth_sendRawTransaction":                (*ethApi).PushTx,
 		"eth_sendTransaction":                   (*ethApi).SendTransaction,
 		"eth_transact":                          (*ethApi).SendTransaction,
 		"eth_estimateGas":                       (*ethApi).EstimateGas,
@@ -247,6 +248,20 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
 	return v, nil
 }
 
+
+func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) {
+	args := new(NewDataArgs)
+	if err := self.codec.Decode(req.Params, &args); err != nil {
+		return nil, shared.NewDecodeParamError(err.Error())
+	}
+
+	v, err := self.xeth.PushTx(args.Data)
+	if err != nil {
+		return nil, err
+	}
+	return v, nil
+}
+
 func (self *ethApi) SendTransaction(req *shared.Request) (interface{}, error) {
 	args := new(NewTxArgs)
 	if err := self.codec.Decode(req.Params, &args); err != nil {

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

rpc/api/utils.go

@@ -51,6 +51,7 @@ var (
 			"getData",
 			"getCode",
 			"sign",
+			"sendRawTransaction",
 			"sendTransaction",
 			"transact",
 			"estimateGas",

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

xeth/xeth.go

@@ -803,8 +803,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
 
 	if tx.To() == nil {
 		addr := core.AddressFromMessage(tx)
+		glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
 		return addr.Hex(), nil
+	} else {
+		glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To())
 	}
+
 	return tx.Hash().Hex(), nil
 }