diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 21:58:31 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 21:58:31 +0800 |
| commit | 168ff36676fdc7b4e9daf21ae4dfa4dfac576dac (patch) | |
| tree | ec28bcdc80fd04f0060ff84ac73cdb057d97cc61 /cmd/geth/js.go | |
| parent | 81379cbc7bd8f06c937983594d1d19c2b9d42223 (diff) | |
| parent | c5e9a0a71c21e52789d8707c7268ee979c1faba8 (diff) | |
| download | dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar.gz dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar.bz2 dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar.lz dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar.xz dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.tar.zst dexon-168ff36676fdc7b4e9daf21ae4dfa4dfac576dac.zip | |
Merge pull request #773 from ethersphere/frontier/cli
CLI and JS admin changes
Diffstat (limited to 'cmd/geth/js.go')
| -rw-r--r-- | cmd/geth/js.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index abbd65513..a545de1d0 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -59,17 +59,19 @@ func (r dumbterm) PasswordPrompt(p string) (string, error) { func (r dumbterm) AppendHistory(string) {} type jsre struct { - re *re.JSRE - ethereum *eth.Ethereum - xeth *xeth.XEth - ps1 string - atexit func() - + re *re.JSRE + ethereum *eth.Ethereum + xeth *xeth.XEth + ps1 string + atexit func() + corsDomain string prompter } -func newJSRE(ethereum *eth.Ethereum, libPath string, interactive bool) *jsre { +func newJSRE(ethereum *eth.Ethereum, libPath string, interactive bool, corsDomain string) *jsre { js := &jsre{ethereum: ethereum, ps1: "> "} + // set default cors domain used by startRpc from CLI flag + js.corsDomain = corsDomain js.xeth = xeth.New(ethereum, js) js.re = re.New(libPath) js.apiBindings() |