Merged in coinplugin/go-metadium (pull request #6)

Fixed gas limit setting was not enforced Approved-by: Uh Sado <sadoc@metadium.com>
METADIUM · Aug 25, 2018 · 83bf5db · 83bf5db
2 parents 12637f5 + 6a426f4
commit 83bf5db
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/block_validator.go b/core/block_validator.go
@@ -108,6 +108,10 @@ func (v *BlockValidator) ValidateState(block, parent *types.Block, statedb *stat
 // CalcGasLimit computes the gas limit of the next block after parent.
 // This is miner strategy, not consensus protocol.
 func CalcGasLimit(parent *types.Block) uint64 {
+	if params.FixedGasLimit != 0 {
+		return params.FixedGasLimit
+	}
+
 	// contrib = (parentGasUsed * 3 / 2) / 1024
 	contrib := (parent.GasUsed() + parent.GasUsed()/2) / params.GasLimitBoundDivisor