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

Jump to bottom

remove history limit, replace fatal to error #1940

Merged
merged 2 commits into from
Mar 28, 2023
Merged

remove history limit, replace fatal to error #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5063a88
remove hitory limit, replace fatal to error
tclemos Mar 27, 2023
544503a
fix
tclemos Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions ethtxmanager/ethtxmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

const (
failureIntervalInSeconds = 5
maxHistorySize = 10
// maxHistorySize = 10
)

var (
Expand Down Expand Up @@ -321,16 +321,16 @@ func (c *Client) monitorTxs(ctx context.Context) error {
// this Tx and we are not able to identify automatically, so we mark this as failed to let the
// caller know something is not right and needs to be review and to avoid to monitor this
// tx infinitely
if len(mTx.history) == maxHistorySize {
mTx.status = MonitoredTxStatusFailed
mTxLog.Infof("marked as failed because reached the history size limit: %v", err)
// update monitored tx changes into storage
err = c.storage.Update(ctx, mTx, nil)
if err != nil {
mTxLog.Errorf("failed to update monitored tx when max history size limit reached: %v", err)
continue
}
}
// if len(mTx.history) == maxHistorySize {
// mTx.status = MonitoredTxStatusFailed
// mTxLog.Infof("marked as failed because reached the history size limit: %v", err)
// // update monitored tx changes into storage
// err = c.storage.Update(ctx, mTx, nil)
// if err != nil {
// mTxLog.Errorf("failed to update monitored tx when max history size limit reached: %v", err)
// continue
// }
// }

var signedTx *types.Transaction
if !mined {
Expand Down
8 changes: 7 additions & 1 deletion sequencer/sequencesender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,20 @@ const (
)

func (s *Sequencer) tryToSendSequence(ctx context.Context, ticker *time.Ticker) {
retry := false
// process monitored sequences before starting a next cycle
s.ethTxManager.ProcessPendingMonitoredTxs(ctx, ethTxManagerOwner, func(result ethtxmanager.MonitoredTxResult, dbTx pgx.Tx) {
if result.Status == ethtxmanager.MonitoredTxStatusFailed {
retry = true
resultLog := log.WithFields("owner", ethTxManagerOwner, "id", result.ID)
resultLog.Fatal("failed to send sequence, TODO: review this fatal and define what to do in this case")
resultLog.Error("failed to send sequence, TODO: review this fatal and define what to do in this case")
}
}, nil)

if retry {
return
}

// Check if synchronizer is up to date
if !s.isSynced(ctx) {
log.Info("wait for synchronizer to sync last batch")
Expand Down