Skip to content

fix: stop infinite miles retry when commitment is never opened #913

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
owen-eth wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −18
Open

fix: stop infinite miles retry when commitment is never opened #913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 32 additions & 18 deletions tools/fastswap-miles/miles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,24 @@ WHERE processed = false

if bidCostWei.Sign() == 0 {
if fastRPCSet[strings.ToLower(r.txHash)] {
cfg.Logger.Info("tx in FastRPC but bid not indexed yet, will retry",
if r.blockTS.Valid && time.Since(r.blockTS.Time) > 15*time.Minute {
cfg.Logger.Info("tx in FastRPC but bid never indexed, processing with 0 bid cost",
slog.String("tx", r.txHash), slog.String("user", r.user))
// fall through to normal miles calculation with bidCostWei = 0
} else {
cfg.Logger.Info("tx in FastRPC but bid not indexed yet, will retry",
slog.String("tx", r.txHash), slog.String("user", r.user))
continue
}
} else {
cfg.Logger.Info("tx not in FastRPC, skipping with 0 miles",
slog.String("tx", r.txHash), slog.String("user", r.user))
if !cfg.DryRun {
markProcessed(cfg.DB, r.txHash, weiToEth(surplusWei), 0, 0, "0")
}
processed++
continue
}
cfg.Logger.Info("tx not in FastRPC, skipping with 0 miles",
slog.String("tx", r.txHash), slog.String("user", r.user))
if !cfg.DryRun {
markProcessed(cfg.DB, r.txHash, weiToEth(surplusWei), 0, 0, "0")
}
processed++
continue
}

netProfit := new(big.Int).Sub(surplusWei, gasCostWei)
Expand Down Expand Up @@ -265,18 +272,25 @@ WHERE processed = false
bidCostWei := getBidCost(erc20BidMap, r.txHash)
if bidCostWei.Sign() == 0 {
if erc20FastRPCSet[strings.ToLower(r.txHash)] {
cfg.Logger.Info("erc20 tx in FastRPC but bid not indexed yet, will retry",
if r.blockTS.Valid && time.Since(r.blockTS.Time) > 15*time.Minute {
cfg.Logger.Info("erc20 tx in FastRPC but bid never indexed, processing with 0 bid cost",
slog.String("tx", r.txHash), slog.String("user", r.user))
// fall through with bidCostWei = 0
} else {
cfg.Logger.Info("erc20 tx in FastRPC but bid not indexed yet, will retry",
slog.String("tx", r.txHash), slog.String("user", r.user))
continue
}
} else {
cfg.Logger.Info("erc20 tx not in FastRPC, skipping with 0 miles",
slog.String("tx", r.txHash), slog.String("user", r.user))
continue // genuinely skip — will retry next cycle
}
cfg.Logger.Info("erc20 tx not in FastRPC, skipping with 0 miles",
slog.String("tx", r.txHash), slog.String("user", r.user))
surplusWei, _ := new(big.Int).SetString(r.surplus, 10)
if !cfg.DryRun {
markProcessed(cfg.DB, r.txHash, weiToEth(surplusWei), 0, 0, "0")
surplusWei, _ := new(big.Int).SetString(r.surplus, 10)
if !cfg.DryRun {
markProcessed(cfg.DB, r.txHash, weiToEth(surplusWei), 0, 0, "0")
}
processed++
continue
}
processed++
continue
}

userPaysGas := strings.EqualFold(r.inputToken, zeroAddr.Hex())
Expand Down
Loading