From 14b1266321a72a44a069ec8c4ffea768b527c338 Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Tue, 7 May 2024 08:18:52 +0800
Subject: [PATCH] fix: avoid counterparty recv packet message get removed
 before open channel (#1455)

* fix: avoid counterparty recv packet message get removed before open channel

this change was related to https://github.com/cosmos/relayer/pull/1393/commits/8b7184bfbbb6def03dce9dc3650beac81d18efca

* add retry instead

* separate max
---
 CHANGELOG.md                          | 1 +
 relayer/processor/path_end_runtime.go | 9 +++++++--
 relayer/processor/path_processor.go   | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65a5dd6e4..8cdc5868d 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go
index 687553eb6..9765aad73 100644
--- a/relayer/processor/path_end_runtime.go
+++ b/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 {
diff --git a/relayer/processor/path_processor.go b/relayer/processor/path_processor.go
index a6e31bd60..3cc2668da 100644
--- a/relayer/processor/path_processor.go
+++ b/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