aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-04-12 20:03:21 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-04-12 20:03:21 +0800
commit8627680e24a29abd5f2aaaeaa2c1c852d8fb693b (patch)
tree1ad39e8b43d04e5a17c17c0b7314eece80620dd5 /cmd/geth
parent934f587bd5c38a36e8b8c8647a9e600d1751ff2f (diff)
parentaa9fff3e68b1def0a9a22009c233150bf9ba481f (diff)
downloaddexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar.gz
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar.bz2
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar.lz
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar.xz
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.tar.zst
dexon-8627680e24a29abd5f2aaaeaa2c1c852d8fb693b.zip
Merge pull request #2359 from bas-vk/rpc-optional-args
rpc: several fixes and support for optional arguments
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/js.go2
-rw-r--r--cmd/geth/main.go2
-rw-r--r--cmd/geth/usage.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index b01fd7e36..68c906443 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -238,7 +238,7 @@ func (js *jsre) apiBindings() error {
}
// load only supported API's in javascript runtime
- shortcuts := "var eth = web3.eth; "
+ shortcuts := "var eth = web3.eth; var personal = web3.personal; "
for _, apiName := range apiNames {
if apiName == "web3" || apiName == "rpc" {
continue // manually mapped or ignore
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index c0a7ba318..584df7316 100644
--- 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,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 5d36b5b1d..278a55980 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -94,7 +94,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.WSListenAddrFlag,
utils.WSPortFlag,
utils.WSApiFlag,
- utils.WSAllowedDomainsFlag,
+ utils.WSAllowedOriginsFlag,
utils.IPCDisabledFlag,
utils.IPCApiFlag,
utils.IPCPathFlag,