From 0dab62577c773f5b11c6a8bd8eda57521761862f Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 10 Nov 2020 16:01:57 +0100
Subject: [PATCH 1/3] scripts: Use tagged tendermint v0.34.0-rc6

---
 scripts/tendermint/all_start.sh | 2 +-
 scripts/tendermint/all_stop.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tendermint/all_start.sh b/scripts/tendermint/all_start.sh
index 05edb2c2..7fd78488 100755
--- a/scripts/tendermint/all_start.sh
+++ b/scripts/tendermint/all_start.sh
@@ -5,7 +5,7 @@ command -v shellcheck > /dev/null && shellcheck "$0"
 # Find latest patch releases at https://hub.docker.com/r/tendermint/tendermint/tags/
 declare -a TM_VERSIONS
 TM_VERSIONS[33]=v0.33.8
-TM_VERSIONS[34]=latest
+TM_VERSIONS[34]=v0.34.0-rc6
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
diff --git a/scripts/tendermint/all_stop.sh b/scripts/tendermint/all_stop.sh
index 4f044db8..a2ee467a 100755
--- a/scripts/tendermint/all_stop.sh
+++ b/scripts/tendermint/all_stop.sh
@@ -4,7 +4,7 @@ command -v shellcheck > /dev/null && shellcheck "$0"
 
 declare -a TM_VERSIONS
 TM_VERSIONS[33]=v0.33.8
-TM_VERSIONS[34]=latest
+TM_VERSIONS[34]=v0.34.0-rc6
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

From 2f2ecead945fce49c3dbc2174fd7518253de7975 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 10 Nov 2020 16:02:44 +0100
Subject: [PATCH 2/3] tendermint-rpc: Re-enable v0.34 tests

---
 packages/tendermint-rpc/src/config.spec.ts | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/tendermint-rpc/src/config.spec.ts b/packages/tendermint-rpc/src/config.spec.ts
index 4c158c6a..2810d856 100644
--- a/packages/tendermint-rpc/src/config.spec.ts
+++ b/packages/tendermint-rpc/src/config.spec.ts
@@ -38,18 +38,17 @@ export const tendermintInstances: readonly TendermintInstance[] = [
       appVersion: 1,
     },
   },
-  // Re-enable testing (https://github.com/cosmos/cosmjs/issues/486)
-  // {
-  //   url: "localhost:11134",
-  //   version: "0.34.x",
-  //   blockTime: 500,
-  //   expected: {
-  //     appCreator: "Cosmoshi Netowoko",
-  //     p2pVersion: 8,
-  //     blockVersion: 11,
-  //     appVersion: 1,
-  //   },
-  // },
+  {
+    url: "localhost:11134",
+    version: "0.34.x",
+    blockTime: 500,
+    expected: {
+      appCreator: "Cosmoshi Netowoko",
+      p2pVersion: 8,
+      blockVersion: 11,
+      appVersion: 1,
+    },
+  },
 ];
 
 export const defaultInstance: TendermintInstance = tendermintInstances[0];

From 77602efa6d37a0fa337da10ac8c0947239e30342 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 10 Nov 2020 16:03:14 +0100
Subject: [PATCH 3/3] tendermint-rpc: Update adaptorForVersion

---
 packages/tendermint-rpc/src/adaptorforversion.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/tendermint-rpc/src/adaptorforversion.ts b/packages/tendermint-rpc/src/adaptorforversion.ts
index 1fe1dde0..dc69d77d 100644
--- a/packages/tendermint-rpc/src/adaptorforversion.ts
+++ b/packages/tendermint-rpc/src/adaptorforversion.ts
@@ -4,6 +4,10 @@
 import { Adaptor } from "./adaptor";
 import { v0_33 } from "./v0-33";
 
+const hashes = {
+  v0_34: ["ca2c9df"],
+};
+
 /**
  * Returns an Adaptor implementation for a given tendermint version.
  * Throws when version is not supported.
@@ -11,7 +15,7 @@ import { v0_33 } from "./v0-33";
  * @param version full Tendermint version string, e.g. "0.20.1"
  */
 export function adaptorForVersion(version: string): Adaptor {
-  if (version.startsWith("0.33.") || version.startsWith("0.34.")) {
+  if (version.startsWith("0.33.") || version.startsWith("0.34.") || hashes.v0_34.includes(version)) {
     return v0_33;
   } else {
     throw new Error(`Unsupported tendermint version: ${version}`);