From dacaa009481acf22a7ff9e9797053f1fdefa2d55 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 26 Nov 2020 13:22:55 +0100 Subject: [PATCH 1/2] Update Tendermint to 0.34.0 --- packages/tendermint-rpc/src/adaptors/index.ts | 1 + scripts/tendermint/all_start.sh | 2 +- scripts/tendermint/all_stop.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/tendermint-rpc/src/adaptors/index.ts b/packages/tendermint-rpc/src/adaptors/index.ts index 4a164f48..51223aba 100644 --- a/packages/tendermint-rpc/src/adaptors/index.ts +++ b/packages/tendermint-rpc/src/adaptors/index.ts @@ -31,6 +31,7 @@ export const adaptor34 = v0_33; // With this alias we can swap out the implement const hashes = { v0_34: [ "ca2c9df", // v0.34.0-rc6 + "182fa32", // v0.34.0 ], }; diff --git a/scripts/tendermint/all_start.sh b/scripts/tendermint/all_start.sh index 7fd78488..dd0335c3 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]=v0.34.0-rc6 +TM_VERSIONS[34]=v0.34.0 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/scripts/tendermint/all_stop.sh b/scripts/tendermint/all_stop.sh index a2ee467a..e9f3a127 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]=v0.34.0-rc6 +TM_VERSIONS[34]=v0.34.0 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" From e454d5836ca88e0bcf8a988474ba496e1f5bd5a8 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 26 Nov 2020 13:36:13 +0100 Subject: [PATCH 2/2] Test Tendermint version in node info tests --- packages/tendermint-rpc/src/client.spec.ts | 1 + packages/tendermint-rpc/src/config.spec.ts | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/packages/tendermint-rpc/src/client.spec.ts b/packages/tendermint-rpc/src/client.spec.ts index 55ea3107..4e0322ac 100644 --- a/packages/tendermint-rpc/src/client.spec.ts +++ b/packages/tendermint-rpc/src/client.spec.ts @@ -137,6 +137,7 @@ function defaultTestSuite(rpcFactory: () => RpcClient, adaptor: Adaptor, expecte const status = await client.status(); // node info + expect(status.nodeInfo.version).toEqual(expected.version); expect(status.nodeInfo.protocolVersion).toEqual({ p2p: expected.p2pVersion, block: expected.blockVersion, diff --git a/packages/tendermint-rpc/src/config.spec.ts b/packages/tendermint-rpc/src/config.spec.ts index 2810d856..8373923a 100644 --- a/packages/tendermint-rpc/src/config.spec.ts +++ b/packages/tendermint-rpc/src/config.spec.ts @@ -1,4 +1,6 @@ export interface ExpectedValues { + /** The Tendermint version as reported by Tendermint itself */ + readonly version: string; readonly appCreator: string; readonly p2pVersion: number; readonly blockVersion: number; @@ -32,6 +34,7 @@ export const tendermintInstances: readonly TendermintInstance[] = [ version: "0.33.x", blockTime: 1000, expected: { + version: "0.33.8", appCreator: "Cosmoshi Netowoko", p2pVersion: 7, blockVersion: 10, @@ -43,6 +46,7 @@ export const tendermintInstances: readonly TendermintInstance[] = [ version: "0.34.x", blockTime: 500, expected: { + version: "182fa32", // srsly? appCreator: "Cosmoshi Netowoko", p2pVersion: 8, blockVersion: 11,