diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-23 00:27:05 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-23 00:27:05 +0800 |
commit | dce503779b2866d1d35b4582470604c0d7e156db (patch) | |
tree | 7d8817ec84be38b911f967f1ecd5618d02e4caa9 /cmd/utils/flags.go | |
parent | 58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff) | |
parent | 8b81ad1fc40080af441c0c6df94f0b2ea46e320b (diff) | |
download | go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar.gz go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar.bz2 go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar.lz go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar.xz go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.tar.zst go-tangerine-dce503779b2866d1d35b4582470604c0d7e156db.zip |
Merge pull request #1840 from ethersphere/console
console, cli, api fixes
Diffstat (limited to 'cmd/utils/flags.go')
-rw-r--r-- | cmd/utils/flags.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index eb2a7d421..66ec46f80 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -183,6 +183,10 @@ var ( Usage: "Sets the minimal gasprice when mining transactions", Value: new(big.Int).Mul(big.NewInt(50), common.Shannon).String(), } + ExtraDataFlag = cli.StringFlag{ + Name: "extradata", + Usage: "Extra data for the miner", + } UnlockedAccountFlag = cli.StringFlag{ Name: "unlock", @@ -345,7 +349,7 @@ var ( // ATM the url is left to the user and deployment to JSpathFlag = cli.StringFlag{ Name: "jspath", - Usage: "JS library path to be used with console and js subcommands", + Usage: "JS root path for loadScript and document root for admin.httpGet", Value: ".", } SolcPathFlag = cli.StringFlag{ @@ -612,7 +616,7 @@ func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error { xeth := xeth.New(eth, fe) codec := codec.JSON - apis, err := api.ParseApiString(ctx.GlobalString(IPCApiFlag.Name), codec, xeth, eth) + apis, err := api.ParseApiString(ctx.GlobalString(IPCApiFlag.Name), codec, xeth, eth, ctx.GlobalString(JSpathFlag.Name)) if err != nil { return nil, err } @@ -633,7 +637,7 @@ func StartRPC(eth *eth.Ethereum, ctx *cli.Context) error { xeth := xeth.New(eth, nil) codec := codec.JSON - apis, err := api.ParseApiString(ctx.GlobalString(RpcApiFlag.Name), codec, xeth, eth) + apis, err := api.ParseApiString(ctx.GlobalString(RpcApiFlag.Name), codec, xeth, eth, ctx.GlobalString(JSpathFlag.Name)) if err != nil { return err } |