diff options
Diffstat (limited to 'cmd/geth/main.go')
-rw-r--r-- | cmd/geth/main.go | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 284f78c3e..a5187bf76 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -266,6 +266,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.LogJSONFlag, utils.PProfEanbledFlag, utils.PProfPortFlag, + utils.SolcPathFlag, } app.Before = func(ctx *cli.Context) error { if ctx.GlobalBool(utils.PProfEanbledFlag.Name) { @@ -321,7 +322,14 @@ func console(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), true, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) + repl := newJSRE( + ethereum, + ctx.String(utils.JSpathFlag.Name), + ctx.String(utils.SolcPathFlag.Name), + ctx.GlobalString(utils.RPCCORSDomainFlag.Name), + true, + nil, + ) repl.interactive() ethereum.Stop() @@ -336,7 +344,14 @@ func execJSFiles(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), false, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) + repl := newJSRE( + ethereum, + ctx.String(utils.JSpathFlag.Name), + ctx.String(utils.SolcPathFlag.Name), + ctx.GlobalString(utils.RPCCORSDomainFlag.Name), + false, + nil, + ) for _, file := range ctx.Args() { repl.exec(file) } @@ -363,6 +378,7 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (pass func startEth(ctx *cli.Context, eth *eth.Ethereum) { // Start Ethereum itself + utils.StartEthereum(eth) am := eth.AccountManager() |