aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ethereum.go
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/ethereum.go')
-rw-r--r--ethereal/ethereum.go11
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