diff options
| author | Sonic <sonic@dexon.org> | 2019-03-27 20:02:55 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:50:05 +0800 |
| commit | ce280c6728552c38ddc6c8ca964c84e46e80dff5 (patch) | |
| tree | 280d55484f17232f982d54e04d14fe5620cc1e47 /cmd | |
| parent | d550ab1a88353d326ecd743170f0a4117568d66b (diff) | |
| download | dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar.gz dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar.bz2 dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar.lz dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar.xz dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.tar.zst dexon-ce280c6728552c38ddc6c8ca964c84e46e80dff5.zip | |
backport from v1.8.23 (#304)
* dex: backport f6193ad
* dex/downloader: backport accc0fa accc0fab 174083c3
* dex: backport 434dd5b
* dex: backport 42a914a 0983d02
* dex: backport 48b70ec 31b3334 and some modification
* dex/downloader: backport 5f251a6
* dex/downloader: backport 81c3dc7
* dex, dex/downloader: fix typos
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/utils/flags.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3b68794d5..6ac26d1fe 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1126,7 +1126,7 @@ func setEthash(ctx *cli.Context, cfg *eth.Config) { } } -func setWhitelist(ctx *cli.Context, cfg *eth.Config) { +func setWhitelist(ctx *cli.Context, cfg *dex.Config) { whitelist := ctx.GlobalString(WhitelistFlag.Name) if whitelist == "" { return @@ -1212,6 +1212,7 @@ func SetDexConfig(ctx *cli.Context, stack *node.Node, cfg *dex.Config) { ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore) setGPO(ctx, &cfg.GPO) setTxPool(ctx, &cfg.TxPool) + setWhitelist(ctx, cfg) if ctx.GlobalIsSet(SyncModeFlag.Name) { cfg.SyncMode = *GlobalTextMarshaler(ctx, SyncModeFlag.Name).(*downloader.SyncMode) |