diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-10-15 00:32:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-15 00:32:11 +0800 |
| commit | 81b01f1c2bba8340f9cf2bf1da8ef131e3decd50 (patch) | |
| tree | 0b2269cb3dfa9719cf3bf7a828c49b0c1ffccab8 /cmd/utils/flags.go | |
| parent | a4d9e63d12c80a14294c0d085de6bf711ceec779 (diff) | |
| parent | 64af2aafdaf16d0bab4c2b89573324b076602bab (diff) | |
| download | dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar.gz dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar.bz2 dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar.lz dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar.xz dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.tar.zst dexon-81b01f1c2bba8340f9cf2bf1da8ef131e3decd50.zip | |
Merge pull request #3111 from obscuren/gas-price-fork
core, core/vm: added gas price variance table (EIP #150)
Diffstat (limited to 'cmd/utils/flags.go')
| -rw-r--r-- | cmd/utils/flags.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 0be499c5b..0c5206a17 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -792,6 +792,13 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainConfi } config.DAOForkSupport = true } + if config.HomesteadGasRepriceBlock == nil { + if ctx.GlobalBool(TestNetFlag.Name) { + config.HomesteadGasRepriceBlock = params.TestNetHomesteadGasRepriceBlock + } else { + config.HomesteadGasRepriceBlock = params.MainNetHomesteadGasRepriceBlock + } + } // Force override any existing configs if explicitly requested switch { case ctx.GlobalBool(SupportDAOFork.Name): |