cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

decouple negative chain selection from base fee lower bound validation

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
vyzo 2020-09-07 22:28:23 +03:00 committed by Jakub Sztandera
parent 97fddc45d9
commit 172ff846fd
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain/messagepool/messagepool.go
View File

@ -83,7 +83,7 @@ const (
// this is *temporary* mutilation until we have implemented uncapped miner penalties -- it will go // this is *temporary* mutilation until we have implemented uncapped miner penalties -- it will go
// away in the next fork. // away in the next fork.
var allowNegativeChains = true 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
@ -393,7 +393,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 !allowNegativeChains && len(curTs.Blocks()) > 0 { if strictBaseFeeValidation && len(curTs.Blocks()) > 0 {
baseFee := curTs.Blocks()[0].ParentBaseFee baseFee := curTs.Blocks()[0].ParentBaseFee
baseFeeLowerBound := types.BigDiv(baseFee, baseFeeLowerBoundFactor) baseFeeLowerBound := types.BigDiv(baseFee, baseFeeLowerBoundFactor)
if m.Message.GasFeeCap.LessThan(baseFeeLowerBound) { if m.Message.GasFeeCap.LessThan(baseFeeLowerBound) {

4
chain/messagepool/selection.go
View File

@ -18,6 +18,10 @@ import (
var bigBlockGasLimit = big.NewInt(build.BlockGasLimit) var bigBlockGasLimit = big.NewInt(build.BlockGasLimit)
// this is *temporary* mutilation until we have implemented uncapped miner penalties -- it will go
// away in the next fork.
var allowNegativeChains = true
const MaxBlocks = 15 const MaxBlocks = 15
type msgChain struct { type msgChain struct {