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 /core/config.go | |
parent | eeb2a1a6e3c7a0c77ee6836f3103708cff4102ad (diff) | |
download | dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.gz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.bz2 dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.lz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.xz 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 'core/config.go')
-rw-r--r-- | core/config.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/config.go b/core/config.go index c0d065a57..3ab04e520 100644 --- a/core/config.go +++ b/core/config.go @@ -21,6 +21,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethereum/go-ethereum/params" ) var ChainConfigNotFoundErr = errors.New("ChainConfig not found") // general config not found error @@ -35,6 +36,8 @@ type ChainConfig struct { DAOForkBlock *big.Int `json:"daoForkBlock"` // TheDAO hard-fork switch block (nil = no fork) DAOForkSupport bool `json:"daoForkSupport"` // Whether the nodes supports or opposes the DAO hard-fork + HomesteadGasRepriceBlock *big.Int `json:"homesteadGasRepriceBlock"` // Homestead gas reprice switch block (nil = no fork) + VmConfig vm.Config `json:"-"` } @@ -45,3 +48,14 @@ func (c *ChainConfig) IsHomestead(num *big.Int) bool { } return num.Cmp(c.HomesteadBlock) >= 0 } + +// GasTable returns the gas table corresponding to the current phase (homestead or homestead reprice). +// +// The returned GasTable's fields shouldn't, under any circumstances, be changed. +func (c *ChainConfig) GasTable(num *big.Int) params.GasTable { + if c.HomesteadGasRepriceBlock == nil || num == nil || num.Cmp(c.HomesteadGasRepriceBlock) < 0 { + return params.GasTableHomestead + } + + return params.GasTableHomesteadGasRepriceFork +} |