diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-10-08 06:23:45 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-10-15 00:09:17 +0800 |
| commit | 64af2aafdaf16d0bab4c2b89573324b076602bab (patch) | |
| tree | fb8f5d30ce7ff12ee8f56c3621254edea55885be /cmd | |
| parent | eeb2a1a6e3c7a0c77ee6836f3103708cff4102ad (diff) | |
| download | dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.gz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.zst dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.zip | |
core, core/vm: added gas price variance table
This implements 1b & 1c of EIP150 by adding a new GasTable which must be
returned from the RuleSet config method. This table is used to determine
the gas prices for the current epoch.
Please note that when the CreateBySuicide gas price is set it is assumed
that we're in the new epoch phase.
In addition this PR will serve as temporary basis while refactorisation
in being done in the EVM64 PR, which will substentially overhaul the gas
price code.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethtest/main.go | 2 | ||||
| -rw-r--r-- | cmd/evm/main.go | 4 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 71465fb55..5663c2623 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -74,7 +74,7 @@ func runTestWithReader(test string, r io.Reader) error { var err error switch strings.ToLower(test) { case "bk", "block", "blocktest", "blockchaintest", "blocktests", "blockchaintests": - err = tests.RunBlockTestWithReader(params.MainNetHomesteadBlock, params.MainNetDAOForkBlock, r, skipTests) + err = tests.RunBlockTestWithReader(params.MainNetHomesteadBlock, params.MainNetDAOForkBlock, params.MainNetHomesteadGasRepriceBlock, r, skipTests) case "st", "state", "statetest", "statetests": rs := tests.RuleSet{HomesteadBlock: params.MainNetHomesteadBlock, DAOForkBlock: params.MainNetDAOForkBlock, DAOForkSupport: true} err = tests.RunStateTestWithReader(rs, r, skipTests) diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 22707c1cc..9ca761b7b 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -33,6 +33,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/params" "gopkg.in/urfave/cli.v1" ) @@ -226,6 +227,9 @@ func NewEnv(state *state.StateDB, transactor common.Address, value *big.Int, cfg type ruleSet struct{} func (ruleSet) IsHomestead(*big.Int) bool { return true } +func (ruleSet) GasTable(*big.Int) params.GasTable { + return params.GasTableHomesteadGasRepriceFork +} func (self *VMEnv) RuleSet() vm.RuleSet { return ruleSet{} } func (self *VMEnv) Vm() vm.Vm { return self.evm } 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): |