Skip to content

Commit

Permalink
remove history limit, replace fatal to error (#1940)
Browse files Browse the repository at this point in the history
  • Loading branch information
tclemos committed Mar 28, 2023
1 parent e81964c commit b0a6ba5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
22 changes: 11 additions & 11 deletions ethtxmanager/ethtxmanager.go
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
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

0 comments on commit b0a6ba5

Please sign in to comment.