fix: save to disk after max retry

icon-project · Jun 4, 2024 · 7986cc6 · 7986cc6
1 parent dafb61e
commit 7986cc6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/relayer/chains/evm/events.go b/relayer/chains/evm/events.go
@@ -1,8 +1,6 @@
 package evm
 
 import (
-	"fmt"
-
 	ethereum "github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -38,8 +36,6 @@ func (p *Config) eventMap() map[string]providerTypes.EventMap {
 }
 
 func (p *Config) GetMonitorEventFilters() ethereum.FilterQuery {
-	fmt.Println(CallMessageHash)
-
 	var (
 		addresses []common.Address
 		topics    []common.Hash

diff --git a/relayer/chains/evm/route.go b/relayer/chains/evm/route.go
@@ -40,6 +40,7 @@ func (p *Provider) Route(ctx context.Context, message *providerTypes.Message, ca
 	if err != nil {
 		return fmt.Errorf("routing failed: %w", err)
 	}
+	p.log.Info("transaction sent", zap.String("tx_hash", tx.Hash().String()), zap.Any("message", messageKey))
 	return p.WaitForTxResult(ctx, tx, messageKey, callback)
 }
 

diff --git a/relayer/relay.go b/relayer/relay.go
@@ -373,22 +373,23 @@ func (r *Relayer) ExecuteCall(ctx context.Context, msg *types.RouteMessage, dst
 func (r *Relayer) HandleMessageFailed(routeMessage *types.RouteMessage, dst, src *ChainRuntime) {
 	routeMessage.ToggleProcessing()
 	routeMessage.AddNextTry()
-	// save to db
-	if err := r.messageStore.StoreMessage(routeMessage); err != nil {
-		r.log.Error("error occured when storing the message after max retry", zap.Error(err))
-		return
-	}
+	if routeMessage.Retry > types.MaxTxRetry {
+		if err := r.messageStore.StoreMessage(routeMessage); err != nil {
+			r.log.Error("error occured when storing the message after max retry", zap.Error(err))
+			return
+		}
 
-	// removed message from messageCache
-	src.MessageCache.Remove(routeMessage.MessageKey())
+		// removed message from messageCache
+		src.MessageCache.Remove(routeMessage.MessageKey())
 
-	dst.log.Error("message relay failed",
-		zap.String("src", routeMessage.Src),
-		zap.String("dst", routeMessage.Dst),
-		zap.Uint64("sn", routeMessage.Sn.Uint64()),
-		zap.String("event_type", routeMessage.EventType),
-		zap.Uint8("count", routeMessage.Retry),
-	)
+		dst.log.Error("message relay failed",
+			zap.String("src", routeMessage.Src),
+			zap.String("dst", routeMessage.Dst),
+			zap.Uint64("sn", routeMessage.Sn.Uint64()),
+			zap.String("event_type", routeMessage.EventType),
+			zap.Uint8("count", routeMessage.Retry),
+		)
+	}
 	return
 }
 

diff --git a/relayer/types/types.go b/relayer/types/types.go
@@ -99,7 +99,7 @@ func (r *RouteMessage) GetRetry() uint8 {
 
 // ResetLastTry resets the last try time to the current time plus the retry interval
 func (r *RouteMessage) AddNextTry() {
-	r.LastTry = time.Now().Add(RetryInterval + time.Duration(math.Pow(2, float64(r.Retry)))) // exponential backoff
+	r.LastTry = time.Now().Add(RetryInterval * time.Duration(math.Pow(2, float64(r.Retry)))) // exponential backoff
 }
 
 func (r *RouteMessage) IsProcessing() bool {