Merge pull request #2359 from bas-vk/rpc-optional-args

rpc: several fixes and support for optional arguments
2016-04-12 14:03:21 +02:00
parent 934f587bd5 aa9fff3e68
commit 8627680e24
23 changed files with 3440 additions and 648 deletions
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -326,7 +326,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.WSListenAddrFlag,
 		utils.WSPortFlag,
 		utils.WSApiFlag,
-		utils.WSAllowedDomainsFlag,
+		utils.WSAllowedOriginsFlag,
 		utils.IPCDisabledFlag,
 		utils.IPCApiFlag,
 		utils.IPCPathFlag,