diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
| commit | 4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8 (patch) | |
| tree | 1cc4369855586a5b59406d09299e89f8e3f9142d /cmd/utils | |
| parent | cfe037028081ebb84ee35caa5b16fed5d125b58a (diff) | |
| parent | 65cad14f9b27db396d036f47814d4843d947ac43 (diff) | |
| download | dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.gz dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.zst dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/cmd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 20165fa97..723cfa887 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -159,9 +159,9 @@ func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, Secre clilogger.Infof("Main address %x\n", keyManager.Address()) } -func StartRpc(ethereum *eth.Ethereum, RpcPort int) { +func StartRpc(ethereum *eth.Ethereum, RpcListenAddress string, RpcPort int) { var err error - ethereum.RpcServer, err = rpchttp.NewRpcHttpServer(xeth.New(ethereum), RpcPort) + ethereum.RpcServer, err = rpchttp.NewRpcHttpServer(xeth.New(ethereum), RpcListenAddress, RpcPort) if err != nil { clilogger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err) } else { |