Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
This commit is contained in:
obscuren
commit
e1c6c01b4d
|
|
@ -9,7 +9,7 @@ install:
|
|||
# - go get code.google.com/p/go.tools/cmd/goimports
|
||||
# - go get github.com/golang/lint/golint
|
||||
# - go get golang.org/x/tools/cmd/vet
|
||||
- if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
|
||||
- go get golang.org/x/tools/cmd/cover
|
||||
- go get github.com/mattn/goveralls
|
||||
before_script:
|
||||
# - gofmt -l -w .
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ RUN mkdir -p $GOPATH/src/github.com/ethereum/
|
|||
RUN git clone https://github.com/ethereum/go-ethereum $GOPATH/src/github.com/ethereum/go-ethereum
|
||||
WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
|
||||
RUN git checkout develop
|
||||
RUN GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/ethereum
|
||||
RUN GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/geth
|
||||
|
||||
## Run & expose JSON RPC
|
||||
ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8545"]
|
||||
ENTRYPOINT ["geth", "-rpc=true", "-rpcport=8545"]
|
||||
EXPOSE 8545
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ Ethereum Go Client © 2014 Jeffrey Wilcke.
|
|||
|
||||
| Linux | OSX | Windows | Tests
|
||||
----------|---------|-----|---------|------
|
||||
develop | [](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum)
|
||||
master | [](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum)
|
||||
develop | [](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum) [](https://coveralls.io/r/ethereum/go-ethereum?branch=develop)
|
||||
master | [](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum) [](https://coveralls.io/r/ethereum/go-ethereum?branch=master)
|
||||
|
||||
[](https://waffle.io/ethereum/go-ethereum)
|
||||
[](https://waffle.io/ethereum/go-ethereum)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import (
|
|||
type EthereumApi struct {
|
||||
eth *xeth.XEth
|
||||
xethMu sync.RWMutex
|
||||
db common.Database
|
||||
}
|
||||
|
||||
func NewEthereumApi(xeth *xeth.XEth) *EthereumApi {
|
||||
|
|
@ -99,7 +98,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
|
|||
state := api.xethAtStateNum(args.BlockNumber).State().SafeGet(args.Address)
|
||||
value := state.StorageString(args.Key)
|
||||
|
||||
*reply = common.Bytes2Hex(value.Bytes())
|
||||
*reply = common.ToHex(value.Bytes())
|
||||
case "eth_getTransactionCount":
|
||||
args := new(GetTxCountArgs)
|
||||
if err := json.Unmarshal(req.Params, &args); err != nil {
|
||||
|
|
|
|||
21
rpc/args.go
21
rpc/args.go
|
|
@ -1,9 +1,7 @@
|
|||
package rpc
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
// "errors"
|
||||
"fmt"
|
||||
"math/big"
|
||||
|
||||
|
|
@ -105,8 +103,8 @@ type GetBlockByHashArgs struct {
|
|||
|
||||
func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
@ -134,8 +132,7 @@ type GetBlockByNumberArgs struct {
|
|||
|
||||
func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
@ -405,8 +402,7 @@ type BlockNumIndexArgs struct {
|
|||
|
||||
func (args *BlockNumIndexArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
@ -436,8 +432,7 @@ type HashIndexArgs struct {
|
|||
|
||||
func (args *HashIndexArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
@ -468,8 +463,7 @@ type Sha3Args struct {
|
|||
|
||||
func (args *Sha3Args) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
@ -798,8 +792,7 @@ type FilterStringArgs struct {
|
|||
|
||||
func (args *FilterStringArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
r := bytes.NewReader(b)
|
||||
if err := json.NewDecoder(r).Decode(&obj); err != nil {
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ func RpcResponse(api *EthereumApi, request *RpcRequest) *interface{} {
|
|||
case *NotImplementedError:
|
||||
jsonerr := &RpcErrorObject{-32601, reserr.Error()}
|
||||
response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr}
|
||||
case *DecodeParamError, *InsufficientParamsError, *ValidationError:
|
||||
case *DecodeParamError, *InsufficientParamsError, *ValidationError, *InvalidTypeError:
|
||||
jsonerr := &RpcErrorObject{-32602, reserr.Error()}
|
||||
response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr}
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
|
|||
ext.Difficulty = common.ToHex(b.Difficulty.Bytes())
|
||||
ext.TotalDifficulty = common.ToHex(b.TotalDifficulty.Bytes())
|
||||
ext.Size = common.ToHex(b.Size.Bytes())
|
||||
// ext.ExtraData = common.ToHex(b.ExtraData)
|
||||
ext.ExtraData = common.ToHex(b.ExtraData)
|
||||
ext.GasLimit = common.ToHex(b.GasLimit.Bytes())
|
||||
// ext.MinGasPrice = common.ToHex(big.NewInt(b.MinGasPrice).Bytes())
|
||||
ext.GasUsed = common.ToHex(b.GasUsed.Bytes())
|
||||
|
|
@ -111,7 +111,7 @@ func NewBlockRes(block *types.Block) *BlockRes {
|
|||
res.Difficulty = block.Difficulty()
|
||||
res.TotalDifficulty = block.Td
|
||||
res.Size = big.NewInt(int64(block.Size()))
|
||||
// res.ExtraData =
|
||||
res.ExtraData = []byte(block.Header().Extra)
|
||||
res.GasLimit = block.GasLimit()
|
||||
// res.MinGasPrice =
|
||||
res.GasUsed = block.GasUsed()
|
||||
|
|
@ -243,8 +243,8 @@ func (l *LogRes) MarshalJSON() ([]byte, error) {
|
|||
}
|
||||
|
||||
ext.Address = l.Address.Hex()
|
||||
ext.Data = common.Bytes2Hex(l.Data)
|
||||
ext.Number = common.Bytes2Hex(big.NewInt(int64(l.Number)).Bytes())
|
||||
ext.Data = common.ToHex(l.Data)
|
||||
ext.Number = common.ToHex(big.NewInt(int64(l.Number)).Bytes())
|
||||
ext.Topics = make([]string, len(l.Topics))
|
||||
for i, v := range l.Topics {
|
||||
ext.Topics[i] = v.Hex()
|
||||
|
|
|
|||
Loading…
Reference in New Issue