diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
| commit | dd60382fc3724ee9c9507cba8df9e6d6db1d5d51 (patch) | |
| tree | 65cf02326774f51a6c3fa96dbc71dd0ddecbc6cd /ethereal | |
| parent | 32c6126593100d37c38e423ec62c56938e5f9155 (diff) | |
| parent | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (diff) | |
| download | go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.gz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.bz2 go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.lz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.xz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.zst go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
ethereal/ethereum.go
ethereum/ethereum.go
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 4 | ||||
| -rw-r--r-- | ethereal/config.go | 2 | ||||
| -rw-r--r-- | ethereal/ethereum.go | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 1f3c3874a..14f3bd6d0 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -48,11 +48,11 @@ ApplicationWindow { try { switch(data.call) { case "getBlockByNumber": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "getBlockByHash": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "transact": diff --git a/ethereal/config.go b/ethereal/config.go index 94f896c5f..e4bdb0a00 100644 --- a/ethereal/config.go +++ b/ethereal/config.go @@ -7,6 +7,7 @@ import ( var StartConsole bool var StartMining bool var StartRpc bool +var RpcPort int var UseUPnP bool var OutboundPort string var ShowGenesis bool @@ -28,6 +29,7 @@ func Init() { flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&ExportKey, "export", false, "export private key") + flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.StringVar(&OutboundPort, "p", "30303", "listening port") flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index fd8c56dae..15a454bdf 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -100,7 +100,7 @@ func main() { } if StartRpc { - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum)) + ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) if err != nil { log.Println("Could not start RPC interface:", err) } else { |