Skip to content

WIP: fix(node): bound derivation shutdown wait #1047

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

Open
curryxbo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

WIP: fix(node): bound derivation shutdown wait #1047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9209776
fix(node): make RPC retries and derivation shutdown respect context c…
Aug 28, 2026
7870b33
refactor(node): drop the context-bound backoff refactor
Aug 28, 2026
077f82d
refactor(node): keep the shutdown fix inside derivation
Aug 28, 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
23 changes: 20 additions & 3 deletions node/derivation/derivation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ var (
RollupEventTopicHash = crypto.Keccak256Hash([]byte(RollupEventTopic))
)

// stopTimeout bounds how long Stop waits for the main loop to unwind after
// the context is canceled.
const stopTimeout = 30 * time.Second

type Derivation struct {
ctx context.Context
node *tmnode.Node
Expand Down Expand Up @@ -229,8 +233,17 @@ func (d *Derivation) Stop() {
if d.cancel != nil {
d.cancel()
}
<-d.stop
d.logger.Info("derivation service is stopped")
// The main loop only observes ctx.Done() between polls, so a poll that
// is mid-RPC still has to unwind. Bound the wait rather than block the
// process's shutdown sequence indefinitely: nothing here needs a clean
// hand-off, since the L1 cursor is only persisted after a fully
// successful poll and any partial derivation is redone on restart.
select {
case <-d.stop:
d.logger.Info("derivation service is stopped")
case <-time.After(stopTimeout):
d.logger.Error("derivation service did not stop within timeout; abandoning wait", "timeout", stopTimeout)
}
}

func (d *Derivation) derivationBlock(ctx context.Context) {
Expand Down Expand Up @@ -546,7 +559,7 @@ func (d *Derivation) fetchRollupLog(ctx context.Context, from, to uint64) ([]eth
}

func (d *Derivation) fetchRollupDataByTxHash(txHash common.Hash, blockNumber uint64) (*BatchInfo, error) {
tx, pending, err := d.l1Client.TransactionByHash(context.Background(), txHash)
tx, pending, err := d.l1Client.TransactionByHash(d.ctx, txHash)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -762,6 +775,10 @@ func (d *Derivation) getL1Message(l1MessagePopped, l1MsgNum uint64) ([]types.L1M
func (d *Derivation) derive(rollupData *BatchInfo) (*eth.Header, error) {
var lastHeader *eth.Header
for _, blockData := range rollupData.blockContexts {
// Deliberately not d.ctx: RetryableClient's backoff loop is not
// context-bound and treats a canceled context as retryable, so
// passing d.ctx here would spin until the 30-minute retry budget
// expires instead of returning.
latestBlockNumber, err := d.l2Client.BlockNumber(context.Background())
if err != nil {
return nil, fmt.Errorf("get derivation geth block number error:%v", err)
Expand Down
Loading