Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mempool msg selection should respect block message limits #7321

Merged
merged 5 commits into from
Dec 17, 2021
Merged

Mempool msg selection should respect block message limits #7321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac3cdf7
Mempool: Selection logic should respect block message limits
arajasek Sep 8, 2021
dd20cb7
Consensus: Safety check against unknown sig types
arajasek Sep 10, 2021
ec00e73
Mempool: Selection should respect CBOR limits
arajasek Sep 11, 2021
a45803d
Mempool: add selection tests
arajasek Sep 12, 2021
b08bf32
Add a log for when message selection fails
arajasek Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion chain/consensus/filcns/mine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (filec *FilecoinEC) CreateBlock(ctx context.Context, w api.Wallet, bt *api.
}

blsMsgCids = append(blsMsgCids, c)
} else {
} else if msg.Signature.Type == crypto.SigTypeSecp256k1 {
c, err := filec.sm.ChainStore().PutMessage(msg)
if err != nil {
return nil, err
Expand All @@ -74,6 +74,8 @@ func (filec *FilecoinEC) CreateBlock(ctx context.Context, w api.Wallet, bt *api.
secpkMsgCids = append(secpkMsgCids, c)
secpkMessages = append(secpkMessages, msg)

} else {
return nil, xerrors.Errorf("unknown sig type: %d", msg.Signature.Type)
}
}

Expand Down
6 changes: 5 additions & 1 deletion chain/messagepool/repub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ loop:

// we can't fit the current chain but there is gas to spare
// trim it and push it down
chain.Trim(gasLimit, mp, baseFee)
chain.Trim(gasLimit, repubMsgLimit, mp, baseFee)
for j := i; j < len(chains)-1; j++ {
if chains[j].Before(chains[j+1]) {
break
Expand All @@ -131,6 +131,10 @@ loop:
}

count := 0
if len(msgs) > repubMsgLimit {
msgs = msgs[:repubMsgLimit]
}

log.Infof("republishing %d messages", len(msgs))
for _, m := range msgs {
mb, err := m.Serialize()
Expand Down
Loading