aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-06-19 02:33:50 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-06-19 02:33:50 +0800
commite4f9ec886b498c5744633a4db1c735eec11dc71b (patch)
tree2e79f01ec71cd18aa889c11637b3ceb2be3ebb86
parent8eaaf24b1e3d205c790f3803eaf333802284d50f (diff)
parent1f34daccc33d7d4edd3fdf27efbc0c29445f2f1f (diff)
downloaddexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar.gz
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar.bz2
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar.lz
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar.xz
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.tar.zst
dexon-e4f9ec886b498c5744633a4db1c735eec11dc71b.zip
Merge pull request #1267 from SilentCicero/develop
eth_sendRawTransaction JSON RPC
-rw-r--r--rpc/api.go11
-rw-r--r--rpc/api/eth.go15
-rw-r--r--rpc/api/eth_args.go29
-rw-r--r--rpc/api/utils.go1
-rw-r--r--rpc/args.go29
-rw-r--r--xeth/xeth.go4
6 files changed, 89 insertions, 0 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 8b9a080f8..a344a8294 100644
--- a/rpc/api.go
+++ b/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 {
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 66ee69930..cb678922b 100644
--- a/rpc/api/eth.go
+++ b/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 {
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 1c86bee51..54eb7201d 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/api/utils.go b/rpc/api/utils.go
index 318d7c39b..40bcae52f 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -51,6 +51,7 @@ var (
"getData",
"getCode",
"sign",
+ "sendRawTransaction",
"sendTransaction",
"transact",
"estimateGas",
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
diff --git a/xeth/xeth.go b/xeth/xeth.go
index d68f48d50..7342be4a9 100644
--- a/xeth/xeth.go
+++ b/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
}