Skip to content

fix(op-devstack): add 5m timeout to txs in GameHelper #19556

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

Merged
ajsutton merged 2 commits into from
Mar 18, 2026
Merged

fix(op-devstack): add 5m timeout to txs in GameHelper #19556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfaabd8
fix(op-service): add 30s timeout to eth_estimateGas in txplan
ajsutton Mar 16, 2026
5b40afb
fix(op-devstack): add tx timeout to GameHelper Eval calls
ajsutton Mar 16, 2026
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
25 changes: 21 additions & 4 deletions op-devstack/dsl/proofs/game_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package proofs

import (
"bytes"
"context"
"encoding/json"
"fmt"
"math/big"
"os"
"path/filepath"
"time"

challengerTypes "github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
gameTypes "github.com/ethereum-optimism/optimism/op-challenger/game/types"
Expand All @@ -23,6 +25,13 @@ import (
"github.com/ethereum-optimism/optimism/op-service/txplan"
)

// txTimeout is the maximum time to wait for a single transaction to be
// estimated, submitted, and included. Without this, transactions inherit the
// test's full context deadline (~2 hours in CI) and a hanging RPC call
// (e.g. eth_estimateGas for an EIP-7702 delegated EOA) blocks silently
// for the entire duration.
const txTimeout = 5 * time.Minute

type GameHelperMove struct {
ParentIdx *big.Int
Claim common.Hash
Expand Down Expand Up @@ -60,7 +69,9 @@ func DeployGameHelper(t devtest.T, deployer *dsl.EOA, honestTraceProvider func(g
)

deployTx := txplan.NewPlannedTx(deployTxOpts)
receipt, err := deployTx.Included.Eval(t.Ctx())
deployCtx, deployCancel := context.WithTimeout(t.Ctx(), txTimeout)
defer deployCancel()
receipt, err := deployTx.Included.Eval(deployCtx)
req.NoError(err, "Failed to deploy GameHelper contract")

req.Equal(types.ReceiptStatusSuccessful, receipt.Status, "GameHelper deployment failed")
Expand Down Expand Up @@ -125,7 +136,9 @@ func getGameHelperArtifactPath(t devtest.T) string {

func (gs *GameHelper) AuthEOA(eoa *dsl.EOA) *GameHelper {
tx := txplan.NewPlannedTx(eoa.PlanAuth(gs.contractAddr))
receipt, err := tx.Included.Eval(gs.t.Ctx())
authCtx, authCancel := context.WithTimeout(gs.t.Ctx(), txTimeout)
defer authCancel()
receipt, err := tx.Included.Eval(authCtx)
gs.require.NoError(err)
gs.require.Equal(types.ReceiptStatusSuccessful, receipt.Status)
return &GameHelper{
Expand Down Expand Up @@ -160,7 +173,9 @@ func (gs *GameHelper) CreateGameWithClaims(
txplan.WithData(data),
),
)
receipt, err := tx.Included.Eval(gs.t.Ctx())
createCtx, createCancel := context.WithTimeout(gs.t.Ctx(), txTimeout)
defer createCancel()
receipt, err := tx.Included.Eval(createCtx)
gs.require.NoError(err)
gs.require.Equal(types.ReceiptStatusSuccessful, receipt.Status)

Expand Down Expand Up @@ -307,7 +322,9 @@ func (gs *GameHelper) PerformMoves(eoa *dsl.EOA, game *FaultDisputeGame, moves [
),
)
preClaimCount := game.claimCount()
receipt, err := tx.Included.Eval(gs.t.Ctx())
moveCtx, moveCancel := context.WithTimeout(gs.t.Ctx(), txTimeout)
defer moveCancel()
receipt, err := tx.Included.Eval(moveCtx)
gs.require.NoError(err)
gs.require.Equal(types.ReceiptStatusSuccessful, receipt.Status)
postClaimCount := game.claimCount()
Expand Down