aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth/js.go
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2015-06-22 18:47:32 +0800
committerBas van Kervel <bas@ethdev.com>2015-06-22 18:47:32 +0800
commit2e0b56a72b3eafc89938003da29c06496ac9ad4e (patch)
treeeba3eb3a822da0ba7de98d9c7b6dc8601a63db0a /cmd/geth/js.go
parent2737baa6577a337f33f020d587af100c9bda3585 (diff)
downloaddexon-2e0b56a72b3eafc89938003da29c06496ac9ad4e.tar.gz
dexon-2e0b56a72b3eafc89938003da29c06496ac9ad4e.tar.zst
dexon-2e0b56a72b3eafc89938003da29c06496ac9ad4e.zip
added RPC start/stop support
Diffstat (limited to 'cmd/geth/js.go')
-rw-r--r--cmd/geth/js.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 761943b63..c0c77c02a 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -41,6 +41,7 @@ import (
"github.com/ethereum/go-ethereum/xeth"
"github.com/peterh/liner"
"github.com/robertkrimen/otto"
+ "github.com/ethereum/go-ethereum/rpc/shared"
)
type prompter interface {
@@ -183,7 +184,9 @@ func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, client comms.Et
js.wait = js.xeth.UpdateState()
js.client = client
if clt, ok := js.client.(*comms.InProcClient); ok {
- clt.Initialize(js.xeth, ethereum)
+ if offeredApis, err := api.ParseApiString(shared.AllApis, codec.JSON, js.xeth, ethereum); err == nil {
+ clt.Initialize(api.Merge(offeredApis...))
+ }
}
// update state in separare forever blocks
@@ -311,7 +314,7 @@ func (js *jsre) apiBindings(f xeth.Frontend) error {
// load only supported API's in javascript runtime
shortcuts := "var eth = web3.eth; "
for _, apiName := range apiNames {
- if apiName == api.Web3ApiName || apiName == api.EthApiName {
+ if apiName == shared.Web3ApiName || apiName == shared.EthApiName {
continue // manually mapped
}