reenable baseFee lower bound check

This commit is contained in:
vyzo 2020-09-08 09:33:21 +03:00
parent 8a21198f56
commit d68ec37942

View File

@ -104,10 +104,6 @@ type MessagePoolEvtMessage struct {
CID cid.Cid CID cid.Cid
} }
// this is *temporary* mutilation until we have implemented uncapped miner penalties -- it will go
// away in the next fork.
var strictBaseFeeValidation = false
func init() { func init() {
// if the republish interval is too short compared to the pubsub timecache, adjust it // if the republish interval is too short compared to the pubsub timecache, adjust it
minInterval := pubsub.TimeCacheDuration + time.Duration(build.PropagationDelaySecs) minInterval := pubsub.TimeCacheDuration + time.Duration(build.PropagationDelaySecs)
@ -444,7 +440,7 @@ func (mp *MessagePool) verifyMsgBeforeAdd(m *types.SignedMessage, curTs *types.T
// Note that for local messages, we always add them so that they can be accepted and republished // Note that for local messages, we always add them so that they can be accepted and republished
// automatically. // automatically.
publish := local publish := local
if strictBaseFeeValidation && len(curTs.Blocks()) > 0 { if len(curTs.Blocks()) > 0 {
baseFee := curTs.Blocks()[0].ParentBaseFee baseFee := curTs.Blocks()[0].ParentBaseFee
baseFeeLowerBound := getBaseFeeLowerBound(baseFee) baseFeeLowerBound := getBaseFeeLowerBound(baseFee)
if m.Message.GasFeeCap.LessThan(baseFeeLowerBound) { if m.Message.GasFeeCap.LessThan(baseFeeLowerBound) {