aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go95
-rw-r--r--rpc/args.go11
-rw-r--r--rpc/args_test.go2
-rw-r--r--rpc/responses.go206
4 files changed, 303 insertions, 11 deletions
diff --git a/rpc/api.go b/rpc/api.go
index c03168863..0abed3c14 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -415,6 +415,44 @@ func (p *EthereumApi) WhisperMessages(id int, reply *interface{}) error {
return nil
}
+func (p *EthereumApi) GetBlockByHash(blockhash string, includetx bool) (*BlockRes, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ br.fullTx = includetx
+ return br, nil
+}
+
+func (p *EthereumApi) GetBlockByNumber(blocknum int64, includetx bool) (*BlockRes, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ br.fullTx = includetx
+ return br, nil
+}
+
+func (p *EthereumApi) GetBlockTransactionCountByHash(blockhash string) (int64, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ return int64(len(br.Transactions)), nil
+}
+
+func (p *EthereumApi) GetBlockTransactionCountByNumber(blocknum int64) (int64, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ return int64(len(br.Transactions)), nil
+}
+
+func (p *EthereumApi) GetBlockUncleCountByHash(blockhash string) (int64, error) {
+ block := p.xeth().EthBlockByHash(blockhash)
+ br := NewBlockRes(block)
+ return int64(len(br.Uncles)), nil
+}
+
+func (p *EthereumApi) GetBlockUncleCountByNumber(blocknum int64) (int64, error) {
+ block := p.xeth().EthBlockByNumber(blocknum)
+ br := NewBlockRes(block)
+ return int64(len(br.Uncles)), nil
+}
+
func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error {
// Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC
rpclogger.Infof("%s %s", req.Method, req.Params)
@@ -468,10 +506,49 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
}
return p.GetTxCountAt(args, reply)
case "eth_getBlockTransactionCountByHash":
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockTransactionCountByHash(args.BlockHash)
+ if err != nil {
+ return err
+ }
+ *reply = toHex(big.NewInt(v).Bytes())
case "eth_getBlockTransactionCountByNumber":
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockTransactionCountByNumber(args.BlockNumber)
+ if err != nil {
+ return err
+ }
+ *reply = toHex(big.NewInt(v).Bytes())
case "eth_getUncleCountByBlockHash":
+ args := new(GetBlockByHashArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockUncleCountByHash(args.BlockHash)
+ if err != nil {
+ return err
+ }
+ *reply = toHex(big.NewInt(v).Bytes())
case "eth_getUncleCountByBlockNumber":
- return errNotImplemented
+ args := new(GetBlockByNumberArgs)
+ if err := json.Unmarshal(req.Params, &args); err != nil {
+ return err
+ }
+
+ v, err := p.GetBlockUncleCountByNumber(args.BlockNumber)
+ if err != nil {
+ return err
+ }
+ *reply = toHex(big.NewInt(v).Bytes())
case "eth_getData":
// TODO handle BlockNumber
args := new(GetDataArgs)
@@ -494,19 +571,27 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
case "eth_flush":
return errNotImplemented
case "eth_getBlockByHash":
- // TODO handle second param for "include transaction objects"
args := new(GetBlockByHashArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- *reply = p.xeth().BlockByHash(args.BlockHash)
+
+ v, err := p.GetBlockByHash(args.BlockHash, args.Transactions)
+ if err != nil {
+ return err
+ }
+ *reply = v
case "eth_getBlockByNumber":
- // TODO handle second param for "include transaction objects"
args := new(GetBlockByNumberArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- *reply = p.xeth().BlockByNumber(args.BlockNumber)
+
+ v, err := p.GetBlockByNumber(args.BlockNumber, args.Transactions)
+ if err != nil {
+ return err
+ }
+ *reply = v
case "eth_getTransactionByHash":
case "eth_getTransactionByBlockHashAndIndex":
case "eth_getTransactionByBlockNumberAndIndex":
diff --git a/rpc/args.go b/rpc/args.go
index 3d4c8667a..ab711e78f 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -3,7 +3,6 @@ package rpc
import (
"bytes"
"encoding/json"
- "fmt"
"math/big"
"github.com/ethereum/go-ethereum/ethutil"
@@ -65,7 +64,12 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
if len(obj) < 1 {
return errArguments
}
- args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
+
+ if v, ok := obj[0].(float64); ok {
+ args.BlockNumber = int64(v)
+ } else {
+ args.BlockNumber = ethutil.Big(obj[0].(string)).Int64()
+ }
if len(obj) > 1 {
args.Transactions = obj[1].(bool)
@@ -110,7 +114,6 @@ func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
if err = UnmarshalRawMessages(b, &args.Address, &args.BlockNumber); err != nil {
return errDecodeArgs
}
- fmt.Println(args)
return nil
}
@@ -140,8 +143,6 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
args.Address = obj[0]
args.Key = obj[1]
- fmt.Println(args)
-
return nil
}
diff --git a/rpc/args_test.go b/rpc/args_test.go
index 1e6609b79..ec5400f3f 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -243,7 +243,7 @@ func TestFilterOptions(t *testing.T) {
expected.Max = 3
expected.Skip = 0
expected.Address = "0xd5677cf67b5aa051bb40496e68ad359eb97cfbf8"
- expected.Topic = []string{"0x12341234"}
+ // expected.Topics = []string{"0x12341234"}
args := new(FilterOptions)
if err := json.Unmarshal([]byte(input), &args); err != nil {
diff --git a/rpc/responses.go b/rpc/responses.go
new file mode 100644
index 000000000..06d2ffef7
--- /dev/null
+++ b/rpc/responses.go
@@ -0,0 +1,206 @@
+package rpc
+
+import (
+ "encoding/json"
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethutil"
+)
+
+type BlockRes struct {
+ fullTx bool
+
+ BlockNumber int64 `json:"number"`
+ BlockHash []byte `json:"hash"`
+ ParentHash []byte `json:"parentHash"`
+ Nonce []byte `json:"nonce"`
+ Sha3Uncles []byte `json:"sha3Uncles"`
+ LogsBloom []byte `json:"logsBloom"`
+ TransactionRoot []byte `json:"transactionRoot"`
+ StateRoot []byte `json:"stateRoot"`
+ Miner []byte `json:"miner"`
+ Difficulty int64 `json:"difficulty"`
+ TotalDifficulty int64 `json:"totalDifficulty"`
+ Size int64 `json:"size"`
+ ExtraData []byte `json:"extraData"`
+ GasLimit int64 `json:"gasLimit"`
+ MinGasPrice int64 `json:"minGasPrice"`
+ GasUsed int64 `json:"gasUsed"`
+ UnixTimestamp int64 `json:"timestamp"`
+ Transactions []*TransactionRes `json:"transactions"`
+ Uncles [][]byte `json:"uncles"`
+}
+
+func (b *BlockRes) MarshalJSON() ([]byte, error) {
+ var ext struct {
+ BlockNumber string `json:"number"`
+ BlockHash string `json:"hash"`
+ ParentHash string `json:"parentHash"`
+ Nonce string `json:"nonce"`
+ Sha3Uncles string `json:"sha3Uncles"`
+ LogsBloom string `json:"logsBloom"`
+ TransactionRoot string `json:"transactionRoot"`
+ StateRoot string `json:"stateRoot"`
+ Miner string `json:"miner"`
+ Difficulty string `json:"difficulty"`
+ TotalDifficulty string `json:"totalDifficulty"`
+ Size string `json:"size"`
+ ExtraData string `json:"extraData"`
+ GasLimit string `json:"gasLimit"`
+ MinGasPrice string `json:"minGasPrice"`
+ GasUsed string `json:"gasUsed"`
+ UnixTimestamp string `json:"timestamp"`
+ Transactions []interface{} `json:"transactions"`
+ Uncles []string `json:"uncles"`
+ }
+
+ // convert strict types to hexified strings
+ ext.BlockNumber = ethutil.Bytes2Hex(big.NewInt(b.BlockNumber).Bytes())
+ ext.BlockHash = ethutil.Bytes2Hex(b.BlockHash)
+ ext.ParentHash = ethutil.Bytes2Hex(b.ParentHash)
+ ext.Nonce = ethutil.Bytes2Hex(b.Nonce)
+ ext.Sha3Uncles = ethutil.Bytes2Hex(b.Sha3Uncles)
+ ext.LogsBloom = ethutil.Bytes2Hex(b.LogsBloom)
+ ext.TransactionRoot = ethutil.Bytes2Hex(b.TransactionRoot)
+ ext.StateRoot = ethutil.Bytes2Hex(b.StateRoot)
+ ext.Miner = ethutil.Bytes2Hex(b.Miner)
+ ext.Difficulty = ethutil.Bytes2Hex(big.NewInt(b.Difficulty).Bytes())
+ ext.TotalDifficulty = ethutil.Bytes2Hex(big.NewInt(b.TotalDifficulty).Bytes())
+ ext.Size = ethutil.Bytes2Hex(big.NewInt(b.Size).Bytes())
+ ext.ExtraData = ethutil.Bytes2Hex(b.ExtraData)
+ ext.GasLimit = ethutil.Bytes2Hex(big.NewInt(b.GasLimit).Bytes())
+ ext.MinGasPrice = ethutil.Bytes2Hex(big.NewInt(b.MinGasPrice).Bytes())
+ ext.GasUsed = ethutil.Bytes2Hex(big.NewInt(b.GasUsed).Bytes())
+ ext.UnixTimestamp = ethutil.Bytes2Hex(big.NewInt(b.UnixTimestamp).Bytes())
+ ext.Transactions = make([]interface{}, len(b.Transactions))
+ if b.fullTx {
+ for i, tx := range b.Transactions {
+ ext.Transactions[i] = tx
+ }
+ } else {
+ for i, tx := range b.Transactions {
+ ext.Transactions[i] = ethutil.Bytes2Hex(tx.Hash)
+ }
+ }
+ ext.Uncles = make([]string, len(b.Uncles))
+ for i, v := range b.Uncles {
+ ext.Uncles[i] = ethutil.Bytes2Hex(v)
+ }
+
+ return json.Marshal(ext)
+}
+
+func NewBlockRes(block *types.Block) *BlockRes {
+ res := new(BlockRes)
+ res.BlockNumber = block.Number().Int64()
+ res.BlockHash = block.Hash()
+ res.ParentHash = block.ParentHash()
+ res.Nonce = block.Header().Nonce
+ res.Sha3Uncles = block.Header().UncleHash
+ res.LogsBloom = block.Bloom()
+ res.TransactionRoot = block.Header().TxHash
+ res.StateRoot = block.Root()
+ res.Miner = block.Header().Coinbase
+ res.Difficulty = block.Difficulty().Int64()
+ res.TotalDifficulty = block.Td.Int64()
+ res.Size = int64(block.Size())
+ // res.ExtraData =
+ res.GasLimit = block.GasLimit().Int64()
+ // res.MinGasPrice =
+ res.GasUsed = block.GasUsed().Int64()
+ res.UnixTimestamp = block.Time()
+ res.Transactions = make([]*TransactionRes, len(block.Transactions()))
+ for i, tx := range block.Transactions() {
+ v := NewTransactionRes(tx)
+ v.BlockHash = block.Hash()
+ v.BlockNumber = block.Number().Int64()
+ v.TxIndex = int64(i)
+ res.Transactions[i] = v
+ }
+ res.Uncles = make([][]byte, len(block.Uncles()))
+ for i, uncle := range block.Uncles() {
+ res.Uncles[i] = uncle.Hash()
+ }
+ return res
+}
+
+type TransactionRes struct {
+ Hash []byte `json:"hash"`
+ Nonce int64 `json:"nonce"`
+ BlockHash []byte `json:"blockHash,omitempty"`
+ BlockNumber int64 `json:"blockNumber,omitempty"`
+ TxIndex int64 `json:"transactionIndex,omitempty"`
+ From []byte `json:"from"`
+ To []byte `json:"to"`
+ Value int64 `json:"value"`
+ Gas int64 `json:"gas"`
+ GasPrice int64 `json:"gasPrice"`
+ Input []byte `json:"input"`
+}
+
+func (t *TransactionRes) MarshalJSON() ([]byte, error) {
+ var ext struct {
+ Hash string `json:"hash"`
+ Nonce string `json:"nonce"`
+ BlockHash string `json:"blockHash,omitempty"`
+ BlockNumber string `json:"blockNumber,omitempty"`
+ TxIndex string `json:"transactionIndex,omitempty"`
+ From string `json:"from"`
+ To string `json:"to"`
+ Value string `json:"value"`
+ Gas string `json:"gas"`
+ GasPrice string `json:"gasPrice"`
+ Input string `json:"input"`
+ }
+
+ ext.Hash = ethutil.Bytes2Hex(t.Hash)
+ ext.Nonce = ethutil.Bytes2Hex(big.NewInt(t.Nonce).Bytes())
+ ext.BlockHash = ethutil.Bytes2Hex(t.BlockHash)
+ ext.BlockNumber = ethutil.Bytes2Hex(big.NewInt(t.BlockNumber).Bytes())
+ ext.TxIndex = ethutil.Bytes2Hex(big.NewInt(t.TxIndex).Bytes())
+ ext.From = ethutil.Bytes2Hex(t.From)
+ ext.To = ethutil.Bytes2Hex(t.To)
+ ext.Value = ethutil.Bytes2Hex(big.NewInt(t.Value).Bytes())
+ ext.Gas = ethutil.Bytes2Hex(big.NewInt(t.Gas).Bytes())
+ ext.GasPrice = ethutil.Bytes2Hex(big.NewInt(t.GasPrice).Bytes())
+ ext.Input = ethutil.Bytes2Hex(t.Input)
+
+ return json.Marshal(ext)
+}
+
+func NewTransactionRes(tx *types.Transaction) *TransactionRes {
+ var v = new(TransactionRes)
+ v.Hash = tx.Hash()
+ v.Nonce = int64(tx.Nonce())
+ v.From = tx.From()
+ v.To = tx.To()
+ v.Value = tx.Value().Int64()
+ v.Gas = tx.Gas().Int64()
+ v.GasPrice = tx.GasPrice().Int64()
+ v.Input = tx.Data()
+ return v
+}
+
+type FilterLogRes struct {
+ Hash string `json:"hash"`
+ Address string `json:"address"`
+ Data string `json:"data"`
+ BlockNumber string `json:"blockNumber"`
+ TransactionHash string `json:"transactionHash"`
+ BlockHash string `json:"blockHash"`
+ TransactionIndex string `json:"transactionIndex"`
+ LogIndex string `json:"logIndex"`
+}
+
+type FilterWhisperRes struct {
+ Hash string `json:"hash"`
+ From string `json:"from"`
+ To string `json:"to"`
+ Expiry string `json:"expiry"`
+ Sent string `json:"sent"`
+ Ttl string `json:"ttl"`
+ Topics string `json:"topics"`
+ Payload string `json:"payload"`
+ WorkProved string `json:"workProved"`
+}
generated by cgit (git 2.34.1) at 2024-11-16 11:40:52 +0800