better minGas sanity check

This commit is contained in:
vyzo 2020-08-04 22:12:15 +03:00
parent 89d42b5958
commit b4ff9ba220

View File

@ -9,6 +9,7 @@ import (
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/messagepool/gasguess" "github.com/filecoin-project/lotus/chain/messagepool/gasguess"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/chain/vm"
) )
type msgChain struct { type msgChain struct {
@ -141,7 +142,6 @@ func (mp *MessagePool) createMessageChains(actor address.Address, mset *msgSet,
return a return a
} }
minGas := guessgas.MinGas
a, _ := mp.api.StateGetActor(actor, nil) a, _ := mp.api.StateGetActor(actor, nil)
curNonce := a.Nonce curNonce := a.Nonce
balance := a.Balance balance := a.Balance
@ -155,6 +155,7 @@ func (mp *MessagePool) createMessageChains(actor address.Address, mset *msgSet,
} }
curNonce++ curNonce++
minGas := vm.PricelistByEpoch(ts.Height()).OnChainMessage(m.ChainLength())
if m.GasLimit < minGas { if m.GasLimit < minGas {
break break
} }