Merge branch 'release/0.9.32'v0.9.32

1 files changed, 59 insertions, 43 deletions

diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 66ee69930..0dff138c6 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -28,47 +28,49 @@ type ethhandler func(*ethApi, *shared.Request) (interface{}, error)
 
 var (
 	ethMapping = map[string]ethhandler{
-		"eth_accounts":                          (*ethApi).Accounts,
-		"eth_blockNumber":                       (*ethApi).BlockNumber,
-		"eth_getBalance":                        (*ethApi).GetBalance,
-		"eth_protocolVersion":                   (*ethApi).ProtocolVersion,
-		"eth_coinbase":                          (*ethApi).Coinbase,
-		"eth_mining":                            (*ethApi).IsMining,
-		"eth_gasPrice":                          (*ethApi).GasPrice,
-		"eth_getStorage":                        (*ethApi).GetStorage,
-		"eth_storageAt":                         (*ethApi).GetStorage,
-		"eth_getStorageAt":                      (*ethApi).GetStorageAt,
-		"eth_getTransactionCount":               (*ethApi).GetTransactionCount,
-		"eth_getBlockTransactionCountByHash":    (*ethApi).GetBlockTransactionCountByHash,
-		"eth_getBlockTransactionCountByNumber":  (*ethApi).GetBlockTransactionCountByNumber,
-		"eth_getUncleCountByBlockHash":          (*ethApi).GetUncleCountByBlockHash,
-		"eth_getUncleCountByBlockNumber":        (*ethApi).GetUncleCountByBlockNumber,
-		"eth_getData":                           (*ethApi).GetData,
-		"eth_getCode":                           (*ethApi).GetData,
-		"eth_sign":                              (*ethApi).Sign,
-		"eth_sendTransaction":                   (*ethApi).SendTransaction,
-		"eth_transact":                          (*ethApi).SendTransaction,
-		"eth_estimateGas":                       (*ethApi).EstimateGas,
-		"eth_call":                              (*ethApi).Call,
-		"eth_flush":                             (*ethApi).Flush,
-		"eth_getBlockByHash":                    (*ethApi).GetBlockByHash,
-		"eth_getBlockByNumber":                  (*ethApi).GetBlockByNumber,
-		"eth_getTransactionByHash":              (*ethApi).GetTransactionByHash,
-		"eth_getTransactionByBlockHashAndIndex": (*ethApi).GetTransactionByBlockHashAndIndex,
-		"eth_getUncleByBlockHashAndIndex":       (*ethApi).GetUncleByBlockHashAndIndex,
-		"eth_getUncleByBlockNumberAndIndex":     (*ethApi).GetUncleByBlockNumberAndIndex,
-		"eth_getCompilers":                      (*ethApi).GetCompilers,
-		"eth_compileSolidity":                   (*ethApi).CompileSolidity,
-		"eth_newFilter":                         (*ethApi).NewFilter,
-		"eth_newBlockFilter":                    (*ethApi).NewBlockFilter,
-		"eth_newPendingTransactionFilter":       (*ethApi).NewPendingTransactionFilter,
-		"eth_uninstallFilter":                   (*ethApi).UninstallFilter,
-		"eth_getFilterChanges":                  (*ethApi).GetFilterChanges,
-		"eth_getFilterLogs":                     (*ethApi).GetFilterLogs,
-		"eth_getLogs":                           (*ethApi).GetLogs,
-		"eth_hashrate":                          (*ethApi).Hashrate,
-		"eth_getWork":                           (*ethApi).GetWork,
-		"eth_submitWork":                        (*ethApi).SubmitWork,
+		"eth_accounts":                            (*ethApi).Accounts,
+		"eth_blockNumber":                         (*ethApi).BlockNumber,
+		"eth_getBalance":                          (*ethApi).GetBalance,
+		"eth_protocolVersion":                     (*ethApi).ProtocolVersion,
+		"eth_coinbase":                            (*ethApi).Coinbase,
+		"eth_mining":                              (*ethApi).IsMining,
+		"eth_gasPrice":                            (*ethApi).GasPrice,
+		"eth_getStorage":                          (*ethApi).GetStorage,
+		"eth_storageAt":                           (*ethApi).GetStorage,
+		"eth_getStorageAt":                        (*ethApi).GetStorageAt,
+		"eth_getTransactionCount":                 (*ethApi).GetTransactionCount,
+		"eth_getBlockTransactionCountByHash":      (*ethApi).GetBlockTransactionCountByHash,
+		"eth_getBlockTransactionCountByNumber":    (*ethApi).GetBlockTransactionCountByNumber,
+		"eth_getUncleCountByBlockHash":            (*ethApi).GetUncleCountByBlockHash,
+		"eth_getUncleCountByBlockNumber":          (*ethApi).GetUncleCountByBlockNumber,
+		"eth_getData":                             (*ethApi).GetData,
+		"eth_getCode":                             (*ethApi).GetData,
+		"eth_sign":                                (*ethApi).Sign,
+		"eth_sendRawTransaction":                  (*ethApi).SendRawTransaction,
+		"eth_sendTransaction":                     (*ethApi).SendTransaction,
+		"eth_transact":                            (*ethApi).SendTransaction,
+		"eth_estimateGas":                         (*ethApi).EstimateGas,
+		"eth_call":                                (*ethApi).Call,
+		"eth_flush":                               (*ethApi).Flush,
+		"eth_getBlockByHash":                      (*ethApi).GetBlockByHash,
+		"eth_getBlockByNumber":                    (*ethApi).GetBlockByNumber,
+		"eth_getTransactionByHash":                (*ethApi).GetTransactionByHash,
+		"eth_getTransactionByBlockNumberAndIndex": (*ethApi).GetTransactionByBlockNumberAndIndex,
+		"eth_getTransactionByBlockHashAndIndex":   (*ethApi).GetTransactionByBlockHashAndIndex,
+		"eth_getUncleByBlockHashAndIndex":         (*ethApi).GetUncleByBlockHashAndIndex,
+		"eth_getUncleByBlockNumberAndIndex":       (*ethApi).GetUncleByBlockNumberAndIndex,
+		"eth_getCompilers":                        (*ethApi).GetCompilers,
+		"eth_compileSolidity":                     (*ethApi).CompileSolidity,
+		"eth_newFilter":                           (*ethApi).NewFilter,
+		"eth_newBlockFilter":                      (*ethApi).NewBlockFilter,
+		"eth_newPendingTransactionFilter":         (*ethApi).NewPendingTransactionFilter,
+		"eth_uninstallFilter":                     (*ethApi).UninstallFilter,
+		"eth_getFilterChanges":                    (*ethApi).GetFilterChanges,
+		"eth_getFilterLogs":                       (*ethApi).GetFilterLogs,
+		"eth_getLogs":                             (*ethApi).GetLogs,
+		"eth_hashrate":                            (*ethApi).Hashrate,
+		"eth_getWork":                             (*ethApi).GetWork,
+		"eth_submitWork":                          (*ethApi).SubmitWork,
 	}
 )
 
@@ -98,7 +100,7 @@ func (self *ethApi) Execute(req *shared.Request) (interface{}, error) {
 }
 
 func (self *ethApi) Name() string {
-	return EthApiName
+	return shared.EthApiName
 }
 
 func (self *ethApi) ApiVersion() string {
@@ -114,7 +116,8 @@ func (self *ethApi) Hashrate(req *shared.Request) (interface{}, error) {
 }
 
 func (self *ethApi) BlockNumber(req *shared.Request) (interface{}, error) {
-	return self.xeth.CurrentBlock().Number(), nil
+	num := self.xeth.CurrentBlock().Number()
+	return newHexNum(num.Bytes()), nil
 }
 
 func (self *ethApi) GetBalance(req *shared.Request) (interface{}, error) {
@@ -247,6 +250,19 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
 	return v, nil
 }
 
+func (self *ethApi) SendRawTransaction(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 {