diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
| commit | b0e09ec82752b48c2384c315dc420e5c39e785b6 (patch) | |
| tree | 0dc20ee3807e3fe5a076fbfe2ec00bd6601792a6 /cmd/mist | |
| parent | 6afc5e762af0f81b70256ebb7e830b09caf17be0 (diff) | |
| parent | 720d978e356bba74160dbdd95b51bcb8087fb92e (diff) | |
| download | dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.gz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.bz2 dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.lz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.xz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.zst dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.zip | |
merge conflict
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/main.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index fab651b22..6780cfb3a 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -47,12 +47,19 @@ var ( Usage: "absolute path to GUI assets directory", Value: common.DefaultAssetPath(), } + rpcCorsFlag = utils.RPCCORSDomainFlag ) func init() { + // Mist-specific default + if len(rpcCorsFlag.Value) == 0 { + rpcCorsFlag.Value = "http://localhost" + } + app.Action = run app.Flags = []cli.Flag{ assetPathFlag, + rpcCorsFlag, utils.BootnodesFlag, utils.DataDirFlag, |