diff options
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api.go | 11 | ||||
| -rw-r--r-- | rpc/api/eth.go | 21 | ||||
| -rw-r--r-- | rpc/api/utils.go | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/rpc/api.go b/rpc/api.go index e35395734..64d27df2e 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_pushTx": + args := new(NewSigArgs) + if err := json.Unmarshal(req.Params, &args); err != nil { + return err + } + v, err := api.xeth().PushTx(args.encodedTx) + 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 a0b9dad86..c5de2cd3b 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_pushTx": (*ethApi).PushTx, "eth_sendTransaction": (*ethApi).SendTransaction, "eth_transact": (*ethApi).SendTransaction, "eth_estimateGas": (*ethApi).EstimateGas, @@ -247,6 +248,26 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) { return v, nil } + +func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) { + args := new(NewTxArgs) + if err := self.codec.Decode(req.Params, &args); err != nil { + return nil, shared.NewDecodeParamError(err.Error()) + } + + // nonce may be nil ("guess" mode) + var nonce string + if args.Nonce != nil { + nonce = args.Nonce.String() + } + + v, err := self.xeth.PushTx(args.encodedTx) + 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/utils.go b/rpc/api/utils.go index 318d7c39b..13f580f58 100644 --- a/rpc/api/utils.go +++ b/rpc/api/utils.go @@ -51,6 +51,7 @@ var ( "getData", "getCode", "sign", + "pushTx", "sendTransaction", "transact", "estimateGas", |