mirror of
https://github.com/tendermint/tendermint.git
synced 2026-07-29 19:42:51 +00:00
reap max bytes from the mempool & check transaction size
See ADR 020: Limiting txs size inside a block docs/architecture/adr-020-block-size.md Refs #2035
This commit is contained in:
+4
-3
@@ -83,7 +83,7 @@ func DefaultNewNode(config *cfg.Config, logger log.Logger) (*Node, error) {
|
||||
// Generate node PrivKey
|
||||
nodeKey, err := p2p.LoadOrGenNodeKey(config.NodeKeyFile())
|
||||
if err != nil {
|
||||
return nil,err
|
||||
return nil, err
|
||||
}
|
||||
return NewNode(config,
|
||||
privval.LoadOrGenFilePV(config.PrivValidatorFile()),
|
||||
@@ -248,6 +248,8 @@ func NewNode(config *cfg.Config,
|
||||
mempl.WithMetrics(memplMetrics),
|
||||
)
|
||||
mempool.SetLogger(mempoolLogger)
|
||||
maxBytes := state.ConsensusParams.TxSize.MaxBytes
|
||||
mempool.SetFilter(func(tx types.Tx) bool { return len(tx) <= maxBytes })
|
||||
mempool.InitWAL() // no need to have the mempool wal during tests
|
||||
mempoolReactor := mempl.NewMempoolReactor(config.Mempool, mempool)
|
||||
mempoolReactor.SetLogger(mempoolLogger)
|
||||
@@ -401,7 +403,7 @@ func NewNode(config *cfg.Config,
|
||||
|
||||
sw: sw,
|
||||
addrBook: addrBook,
|
||||
nodeKey: nodeKey,
|
||||
nodeKey: nodeKey,
|
||||
|
||||
stateDB: stateDB,
|
||||
blockStore: blockStore,
|
||||
@@ -434,7 +436,6 @@ func (n *Node) OnStart() error {
|
||||
n.Logger.With("module", "p2p"))
|
||||
n.sw.AddListener(l)
|
||||
|
||||
|
||||
nodeInfo := n.makeNodeInfo(n.nodeKey.ID())
|
||||
n.sw.SetNodeInfo(nodeInfo)
|
||||
n.sw.SetNodeKey(n.nodeKey)
|
||||
|
||||
Reference in New Issue
Block a user