From 54674fcd0b910d38922956fc2c42afeafbdf2d40 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:40:13 -0500
Subject: [PATCH] fix(v7): take user-configured gas-adjustment into account
 (#1107) (#1108)

GasAdjustments configured via the ChainConfig were being ignored.

(cherry picked from commit d5228250d13f05c95c9d9299838bb0405f3ada5b)

Co-authored-by: violet <158512193+fastfadingviolets@users.noreply.github.com>
---
 ibc/types.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ibc/types.go b/ibc/types.go
index b7dd6d117..cf1941d9a 100644
--- a/ibc/types.go
+++ b/ibc/types.go
@@ -168,7 +168,7 @@ func (c ChainConfig) MergeChainSpecConfig(other ChainConfig) ChainConfig {
 		c.GasPrices = other.GasPrices
 	}
 
-	if other.GasAdjustment > 0 && c.GasAdjustment == 0 {
+	if other.GasAdjustment > 0 {
 		c.GasAdjustment = other.GasAdjustment
 	}