From 5835b14740d0b3f96646467238f73373aa5e40a0 Mon Sep 17 00:00:00 2001
From: eliasmpw <eliasmpw@hotmail.com>
Date: Wed, 11 Sep 2024 20:03:33 +0200
Subject: [PATCH] fix(core): workaround for batching issue in V9

---
 CHANGELOG.md                     |  9 +++++++++
 packages/arch3-core/src/utils.ts | 10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 574f83b..6c56410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v0.7.2 (Unreleased)
+
+### Fixed
+
+#### **arch3-core**
+
+- make `connectToRpcClient` use 0.37.x version of Tendermint for both 0.37.x and 0.38.x
+RPC Clients as a workaround for a bug in batching requests in Archway V9 ([#121])
+
 ## v0.7.1 (2024-07-08)
 
 ### Added
diff --git a/packages/arch3-core/src/utils.ts b/packages/arch3-core/src/utils.ts
index e44dfc0..915302c 100644
--- a/packages/arch3-core/src/utils.ts
+++ b/packages/arch3-core/src/utils.ts
@@ -10,15 +10,17 @@ export async function connectToRpcClient(rpcClient: RpcClient): Promise<CometCli
   const tendermint37Client = await Tendermint37Client.create(rpcClient);
   const version = (await tendermint37Client.status()).nodeInfo.version;
 
-  if (version.startsWith('0.37.')) {
+  // HACK: Force Tendermint37Client on 0.38.x versions, remove when client batching issue is fixed
+  if (version.startsWith('0.37.') || version.startsWith('0.38.')) {
     return tendermint37Client;
   }
 
   tendermint37Client.disconnect();
 
-  if (version.startsWith('0.38.')) {
-    return await Comet38Client.create(rpcClient);
-  }
+  // if (version.startsWith('0.38.')) {
+  //   console.log('VERRRRR2222',version)
+  //   return await Comet38Client.create(rpcClient);
+  // }
 
   return await Tendermint34Client.create(rpcClient);
 }