cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Output hex should be prepended with 0x

Browse Source
This commit is contained in:
Taylor Gerring 2015-03-10 19:10:02 -05:00
parent fda4d02f94
commit 499f816e30
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/api.go
View File

@ -455,7 +455,7 @@ func (p *EthereumApi) GetBlockUncleCountByNumber(blocknum int64) (int64, error)
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)
rpclogger.Debugf("%s %s", req.Method, req.Params)
switch req.Method {
case "web3_sha3":
args := new(Sha3Args)

65
rpc/responses.go
View File

@ -5,7 +5,6 @@ import (
"math/big"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethutil"
)
type BlockRes struct {
@ -56,23 +55,23 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
}
// 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.BlockNumber = toHex(big.NewInt(b.BlockNumber).Bytes())
ext.BlockHash = toHex(b.BlockHash)
ext.ParentHash = toHex(b.ParentHash)
ext.Nonce = toHex(b.Nonce)
ext.Sha3Uncles = toHex(b.Sha3Uncles)
ext.LogsBloom = toHex(b.LogsBloom)
ext.TransactionRoot = toHex(b.TransactionRoot)
ext.StateRoot = toHex(b.StateRoot)
ext.Miner = toHex(b.Miner)
ext.Difficulty = toHex(big.NewInt(b.Difficulty).Bytes())
ext.TotalDifficulty = toHex(big.NewInt(b.TotalDifficulty).Bytes())
ext.Size = toHex(big.NewInt(b.Size).Bytes())
// ext.ExtraData = toHex(b.ExtraData)
ext.GasLimit = toHex(big.NewInt(b.GasLimit).Bytes())
// ext.MinGasPrice = toHex(big.NewInt(b.MinGasPrice).Bytes())
ext.GasUsed = toHex(big.NewInt(b.GasUsed).Bytes())
ext.UnixTimestamp = toHex(big.NewInt(b.UnixTimestamp).Bytes())
ext.Transactions = make([]interface{}, len(b.Transactions))
if b.fullTx {
for i, tx := range b.Transactions {
@ -80,12 +79,12 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
}
} else {
for i, tx := range b.Transactions {
ext.Transactions[i] = ethutil.Bytes2Hex(tx.Hash)
ext.Transactions[i] = toHex(tx.Hash)
}
}
ext.Uncles = make([]string, len(b.Uncles))
for i, v := range b.Uncles {
ext.Uncles[i] = ethutil.Bytes2Hex(v)
ext.Uncles[i] = toHex(v)
}
return json.Marshal(ext)
@ -103,7 +102,9 @@ func NewBlockRes(block *types.Block) *BlockRes {
res.StateRoot = block.Root()
res.Miner = block.Header().Coinbase
res.Difficulty = block.Difficulty().Int64()
res.TotalDifficulty = block.Td.Int64()
if block.Td != nil {
res.TotalDifficulty = block.Td.Int64()
}
res.Size = int64(block.Size())
// res.ExtraData =
res.GasLimit = block.GasLimit().Int64()
@ -154,17 +155,17 @@ func (t *TransactionRes) MarshalJSON() ([]byte, error) {
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)
ext.Hash = toHex(t.Hash)
ext.Nonce = toHex(big.NewInt(t.Nonce).Bytes())
ext.BlockHash = toHex(t.BlockHash)
ext.BlockNumber = toHex(big.NewInt(t.BlockNumber).Bytes())
ext.TxIndex = toHex(big.NewInt(t.TxIndex).Bytes())
ext.From = toHex(t.From)
ext.To = toHex(t.To)
ext.Value = toHex(big.NewInt(t.Value).Bytes())
ext.Gas = toHex(big.NewInt(t.Gas).Bytes())
ext.GasPrice = toHex(big.NewInt(t.GasPrice).Bytes())
ext.Input = toHex(t.Input)
return json.Marshal(ext)
}

3
rpc/util.go
View File

@ -91,7 +91,7 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error
func (self JsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) {
var payload []byte
payload, err = json.Marshal(v)
payload, err = json.MarshalIndent(v, "", "\t")
if err != nil {
rpclogger.Fatalln("Error marshalling JSON", err)
return 0, err
@ -127,6 +127,7 @@ func toHex(b []byte) string {
}
return "0x" + hex
}
func fromHex(s string) []byte {
if len(s) > 1 {
if s[0:2] == "0x" {