Skip to content

fix: correct safe-wait delta calculation in edge tracker and transact #3633

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
merged 6 commits into from
Sep 23, 2025
Merged

fix: correct safe-wait delta calculation in edge tracker and transact #3633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae3563d
fix: correct safe-wait delta calculation in edge tracker
MozirDmitriy Sep 12, 2025
9c7e965
fix: correct safe-wait delta calculation in transact
MozirDmitriy Sep 12, 2025
ab9c53d
Merge branch 'master' into fix/safe-wait-delta
rauljordan Sep 19, 2025
fa6f6ce
Merge branch 'master' into fix/safe-wait-delta
joshuacolvin0 Sep 22, 2025
1215a75
Merge branch 'master' into fix/safe-wait-delta
joshuacolvin0 Sep 22, 2025
1e62525
Merge branch 'master' into fix/safe-wait-delta
eljobe Sep 23, 2025
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
7 changes: 4 additions & 3 deletions bold/chain-abstraction/sol-implementation/transact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,13 @@ func (a *AssertionChain) waitForTxToBeSafe(
if !txSafe {
var blocksLeftForTxToBeSafe int64
if receipt.BlockNumber.Uint64() > latestSafeHeaderNumber {
blocksLeftForTxToBeSafe = 0
} else {
blocksLeftForTxToBeSafe, err = safecast.ToInt64(latestSafeHeaderNumber - receipt.BlockNumber.Uint64())
// Wait for safe head to catch up to the receipt block
blocksLeftForTxToBeSafe, err = safecast.ToInt64(receipt.BlockNumber.Uint64() - latestSafeHeaderNumber)
if err != nil {
return nil, errors.Wrap(err, "could not convert blocks left for tx to be safe to int64")
}
} else {
blocksLeftForTxToBeSafe = 0
}
timeToWait := a.averageTimeForBlockCreation * time.Duration(blocksLeftForTxToBeSafe)
select {
Expand Down
7 changes: 4 additions & 3 deletions bold/challenge-manager/edge-tracker/challenge_confirmation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,13 @@ func (cc *challengeConfirmer) waitForTxToBeSafe(
if !txSafe {
var blocksLeftForTxToBeSafe int64
if receipt.BlockNumber.Uint64() > latestSafeHeaderNumber {
blocksLeftForTxToBeSafe = 0
} else {
blocksLeftForTxToBeSafe, err = safecast.ToInt64(latestSafeHeaderNumber - receipt.BlockNumber.Uint64())
// Wait for safe head to catch up to the receipt block
blocksLeftForTxToBeSafe, err = safecast.ToInt64(receipt.BlockNumber.Uint64() - latestSafeHeaderNumber)
if err != nil {
return errors.Wrap(err, "could not convert blocks left for tx to be safe to int64")
}
} else {
blocksLeftForTxToBeSafe = 0
}
timeToWait := cc.averageTimeForBlockCreation * time.Duration(blocksLeftForTxToBeSafe)
select {
Expand Down
Loading