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

[workingset] remove action from actpool upon tx container error #4306

Merged
merged 2 commits into from
Jun 17, 2024
Merged

[workingset] remove action from actpool upon tx container error #4306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cf014e
[workingset] remove action from actpool upon tx container error
dustinxie Jun 17, 2024
322247f
Merge branch 'master' into txerror
CoderZhi Jun 17, 2024
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
5 changes: 3 additions & 2 deletions state/factory/workingset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var (
)

errInvalidSystemActionLayout = errors.New("system action layout is invalid")
errUnfoldTxContainer = errors.New("failed to unfold tx container")
)

func init() {
Expand Down Expand Up @@ -161,7 +162,7 @@ func (ws *workingSet) runAction(
if protocol.MustGetFeatureCtx(ctx).UseTxContainer {
if container, ok := selp.Action().(action.TxContainer); ok {
if err := container.Unfold(selp, ctx, ws.checkContract); err != nil {
return nil, errors.Wrapf(err, "Failed to unfold EVM tx inside the container")
return nil, errors.Wrap(errUnfoldTxContainer, err.Error())
}
}
}
Expand Down Expand Up @@ -593,7 +594,7 @@ func (ws *workingSet) pickAndRunActions(
// do nothing
case action.ErrChainID:
continue
case action.ErrGasLimit:
case action.ErrGasLimit, errUnfoldTxContainer:
actionIterator.PopAccount()
continue
default:
Expand Down
Loading