From ca969f28225652b396228d16b24188ab06930c0a Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 1 Feb 2022 14:29:32 +0100 Subject: [PATCH 1/4] Make evidence non optional --- packages/tendermint-rpc/src/tendermint34/responses.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/tendermint-rpc/src/tendermint34/responses.ts b/packages/tendermint-rpc/src/tendermint34/responses.ts index c7648f69..fbbb058d 100644 --- a/packages/tendermint-rpc/src/tendermint34/responses.ts +++ b/packages/tendermint-rpc/src/tendermint34/responses.ts @@ -227,8 +227,7 @@ export interface Block { */ readonly lastCommit: Commit | null; readonly txs: readonly Uint8Array[]; - // This field becomes non-optional in 0.28 (https://github.com/cosmos/cosmjs/issues/1011) - readonly evidence?: readonly Evidence[]; + readonly evidence: readonly Evidence[]; } /** From c0882460b028d8ce77500f0f50832f8ce933f958 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 1 Feb 2022 14:59:30 +0100 Subject: [PATCH 2/4] Fix implementation of evidence so its non optional --- packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts index b8784188..ff1ecc5f 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts @@ -743,8 +743,8 @@ interface RpcBlock { }; // It's currently unclear why the deep nesting is requied. // See https://github.com/tendermint/tendermint/issues/7697. - readonly evidence?: { - readonly evidence?: readonly RpcEvidence[]; + readonly evidence: { + readonly evidence: readonly RpcEvidence[]; }; } From 8c9c7596246e7fc6b090f8f6a26c9d1b5cd53d77 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 1 Feb 2022 15:15:51 +0100 Subject: [PATCH 3/4] Fix implementation of evidence so its non optional --- .../tendermint-rpc/src/tendermint34/adaptor/responses.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts index ff1ecc5f..b2255d99 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts @@ -743,8 +743,8 @@ interface RpcBlock { }; // It's currently unclear why the deep nesting is requied. // See https://github.com/tendermint/tendermint/issues/7697. - readonly evidence: { - readonly evidence: readonly RpcEvidence[]; + readonly evidence?: { + readonly evidence?: readonly RpcEvidence[]; }; } @@ -757,7 +757,7 @@ function decodeBlock(data: RpcBlock): responses.Block { txs: data.data.txs ? assertArray(data.data.txs).map(fromBase64) : [], // Lift up .evidence.evidence to just .evidence // See https://github.com/tendermint/tendermint/issues/7697 - evidence: data.evidence?.evidence, + evidence: data.evidence?.evidence ?? [], }; } From 099ba78db080f75284e1cb94c992115d06b3c8a0 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Wed, 2 Feb 2022 09:46:34 +0100 Subject: [PATCH 4/4] Adding changes to CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a3ff87..73285665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,11 @@ and this project adheres to `AminoTypesOptions`. This is an object with a required `prefix` field. Before the prefix defaulted to "cosmos" but this is almost never the right choice for CosmJS users that need to add Amino types manually. ([#989]) +- @cosmjs/tendermint-rpc: The property `evidence` in the interface `Block` is now + non-optional. ([#1011]) [#989]: https://github.com/cosmos/cosmjs/issues/989 +[#1011]: https://github.com/cosmos/cosmjs/issues/1011 ### Removed