Merge branch 'main' into dependabot/go_modules/github.com/hashicorp/g…

…o-getter-1.7.4

CHANGELOG.md

@@ -30,6 +30,7 @@
 * [\#1326](https://github.com/cosmos/relayer/pull/1326) Avoid sending channel close confirm message after channel get closed successfully.
 * [\#1364](https://github.com/cosmos/relayer/pull/1364) Include feegrant message when calculate gas.
 * [\#1390](https://github.com/cosmos/relayer/pull/1390) Avoid no concrete type registered for type URL error of EthAccount.
+* [\#1455](https://github.com/cosmos/relayer/pull/1455) Allow retry for pathEnd to avoid packet message get removed before open channel.
 
 ## v0.9.3
 

relayer/processor/path_end_runtime.go

@@ -59,6 +59,7 @@ type pathEndRuntime struct {
 	metrics *PrometheusMetrics
 
 	finishedProcessing chan messageToTrack
+	retryCount         uint64
 }
 
 func newPathEndRuntime(log *zap.Logger, pathEnd PathEnd, metrics *PrometheusMetrics) *pathEndRuntime {
@@ -560,8 +561,12 @@ func (pathEnd *pathEndRuntime) shouldSendPacketMessage(message packetIBCMessage,
 			zap.Uint64("sequence", sequence),
 			zap.Inline(k),
 		)
-		pathEnd.removePacketRetention(counterparty, eventType, k, sequence)
-		return false
+		if pathEnd.retryCount >= maxMessageSendRetriesIfChannelNotOpen {
+			pathEnd.removePacketRetention(counterparty, eventType, k, sequence)
+			pathEnd.retryCount = 0
+			return false
+		}
+		pathEnd.retryCount++
 	}
 	msgProcessCache, ok := pathEnd.packetProcessing[k]
 	if !ok {

relayer/processor/path_processor.go

@@ -39,6 +39,9 @@ const (
 	// How many times to retry sending a message before giving up on it.
 	maxMessageSendRetries = 5
 
+	// How many times to retry sending a message if channel is not opened.
+	maxMessageSendRetriesIfChannelNotOpen = 1
+
 	// How many blocks of history to retain ibc headers in the cache for.
 	ibcHeadersToCache = 10