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

handle messages with invalid nonces after balance filtering

Browse Source
This commit is contained in:
whyrusleeping 2019-09-25 20:53:52 -07:00
parent f5ae64bf94
commit 8337dd52fe
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
miner/miner.go
View File

@ -312,17 +312,30 @@ func (m *Miner) createBlock(base *MiningBase, ticket *types.Ticket, proof types.
func (m *Miner) selectMessages(ctx context.Context, base *MiningBase, msgs []*types.SignedMessage) ([]*types.SignedMessage, error) { func (m *Miner) selectMessages(ctx context.Context, base *MiningBase, msgs []*types.SignedMessage) ([]*types.SignedMessage, error) {
out := make([]*types.SignedMessage, 0, len(msgs)) out := make([]*types.SignedMessage, 0, len(msgs))
inclNonces := make(map[address.Address]uint64)
for _, msg := range msgs { for _, msg := range msgs {
act, err := m.api.StateGetActor(ctx, msg.Message.From, base.ts) from := msg.Message.From
act, err := m.api.StateGetActor(ctx, from, base.ts)
if err != nil { if err != nil {
return nil, xerrors.Errorf("failed to check message sender balance: %w", err) return nil, xerrors.Errorf("failed to check message sender balance: %w", err)
} }
if _, ok := inclNonces[from]; !ok {
inclNonces[from] = act.Nonce
}
if act.Balance.LessThan(msg.Message.RequiredFunds()) { if act.Balance.LessThan(msg.Message.RequiredFunds()) {
log.Warningf("message in mempool does not have enough funds: %s", msg.Cid()) log.Warningf("message in mempool does not have enough funds: %s", msg.Cid())
continue continue
} }
if msg.Message.Nonce > inclNonces[from] {
log.Warningf("message in mempool has too high of a nonce: %s", msg.Cid())
continue
}
inclNonces[from] = msg.Message.Nonce
out = append(out, msg) out = append(out, msg)
} }
return out, nil return out, nil