diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-05 21:56:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-05 21:56:05 +0800 |
| commit | a77dcd10414e94fbd255931b0a539bbfefd91f56 (patch) | |
| tree | 5c804987152d89c4915a433bb79fcb7b95c6364c /ethereal/ethereum.go | |
| parent | 1323f60c074297c97397d20dd275124da2f5b531 (diff) | |
| parent | 70221c36e381e98bf3e92913f48fb94d18da8ef5 (diff) | |
| download | go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar.gz go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar.bz2 go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar.lz go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar.xz go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.tar.zst go-tangerine-a77dcd10414e94fbd255931b0a539bbfefd91f56.zip | |
Merge branch 'release/poc5-rc1'poc5-rc1
Diffstat (limited to 'ethereal/ethereum.go')
| -rw-r--r-- | ethereal/ethereum.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index 99f3b0b52..f3240adec 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -4,10 +4,12 @@ import ( "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" + "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethrpc" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" - "github.com/niemeyer/qml" + "github.com/go-qml/qml" "log" "os" "os/signal" @@ -84,8 +86,6 @@ func main() { utils.ImportPrivateKey(ImportKey) os.Exit(0) } - } else { - utils.CreateKeyPair(false) } } @@ -100,6 +100,11 @@ func main() { os.Exit(0) } + if StartRpc { + ethereum.RpcServer = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool())) + go ethereum.RpcServer.Start() + } + log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver) // Set the max peers |