From 6c3c8736352991eaf4a04339d136c8003825e537 Mon Sep 17 00:00:00 2001 From: Bryan White Date: Fri, 18 Oct 2024 21:54:27 +0200 Subject: [PATCH 1/3] refactor: replace comet38 begin/end_block_events with finalize_block_events --- packages/tendermint-rpc/src/comet38/adaptor/responses.ts | 6 ++---- packages/tendermint-rpc/src/comet38/comet38client.spec.ts | 3 +-- packages/tendermint-rpc/src/comet38/responses.ts | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/tendermint-rpc/src/comet38/adaptor/responses.ts b/packages/tendermint-rpc/src/comet38/adaptor/responses.ts index a83de829..cb369bef 100644 --- a/packages/tendermint-rpc/src/comet38/adaptor/responses.ts +++ b/packages/tendermint-rpc/src/comet38/adaptor/responses.ts @@ -287,8 +287,7 @@ export function decodeValidatorUpdate(data: RpcValidatorUpdate): responses.Valid interface RpcBlockResultsResponse { readonly height: string; readonly txs_results: readonly RpcTxData[] | null; - readonly begin_block_events: readonly RpcEvent[] | null; - readonly end_block_events: readonly RpcEvent[] | null; + readonly finalize_block_events: readonly RpcEvent[] | null; readonly validator_updates: readonly RpcValidatorUpdate[] | null; readonly consensus_param_updates: RpcConsensusParams | null; } @@ -299,8 +298,7 @@ function decodeBlockResults(data: RpcBlockResultsResponse): responses.BlockResul results: (data.txs_results || []).map(decodeTxData), validatorUpdates: (data.validator_updates || []).map(decodeValidatorUpdate), consensusUpdates: may(decodeConsensusParams, data.consensus_param_updates), - beginBlockEvents: decodeEvents(data.begin_block_events || []), - endBlockEvents: decodeEvents(data.end_block_events || []), + finalizeBlockEvents: decodeEvents(data.finalize_block_events || []) }; } diff --git a/packages/tendermint-rpc/src/comet38/comet38client.spec.ts b/packages/tendermint-rpc/src/comet38/comet38client.spec.ts index 3d411432..aa65fc24 100644 --- a/packages/tendermint-rpc/src/comet38/comet38client.spec.ts +++ b/packages/tendermint-rpc/src/comet38/comet38client.spec.ts @@ -261,8 +261,7 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues) const results = await client.blockResults(height); expect(results.height).toEqual(height); expect(results.results).toEqual([]); - expect(results.beginBlockEvents).toEqual([]); - expect(results.endBlockEvents).toEqual([]); + expect(results.finalizeBlockEvents).toEqual([]); client.disconnect(); }); diff --git a/packages/tendermint-rpc/src/comet38/responses.ts b/packages/tendermint-rpc/src/comet38/responses.ts index 3477ba6b..fd35dc40 100644 --- a/packages/tendermint-rpc/src/comet38/responses.ts +++ b/packages/tendermint-rpc/src/comet38/responses.ts @@ -60,8 +60,7 @@ export interface BlockResultsResponse { readonly results: readonly TxData[]; readonly validatorUpdates: readonly ValidatorUpdate[]; readonly consensusUpdates?: ConsensusParams; - readonly beginBlockEvents: readonly Event[]; - readonly endBlockEvents: readonly Event[]; + readonly finalizeBlockEvents: readonly Event[]; } export interface BlockSearchResponse { From 250198e7946418af2b0c43220d21ea8f90534077 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 12 Jun 2025 14:39:51 +0200 Subject: [PATCH 2/3] Add CHANGELOG entry --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7034af3b..a0ed9593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,14 @@ and this project adheres to ## [Unreleased] -- Replaxe axios with cross-fetch ([#1645]) +### Changed +- Replaxe axios with cross-fetch ([#1645]) +- Fix block events in CometBFT 0.38 API (`begin_block_events`/`end_block_events` + -> `finalize_block_events`) in `RpcBlockResultsResponse` and + `BlockResultsResponse` ([#1612]) + +[#1612]: https://github.com/cosmos/cosmjs/pull/1612 [#1645]: https://github.com/cosmos/cosmjs/pull/1645 ## [0.33.1] - 2025-03-12 From f1478f7b9c5aa0558214e27492bb99c881e5de64 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:07:21 +0000 Subject: [PATCH 3/3] [autofix.ci] apply automated fixes --- packages/tendermint-rpc/src/comet38/adaptor/responses.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tendermint-rpc/src/comet38/adaptor/responses.ts b/packages/tendermint-rpc/src/comet38/adaptor/responses.ts index cb369bef..b344d6bb 100644 --- a/packages/tendermint-rpc/src/comet38/adaptor/responses.ts +++ b/packages/tendermint-rpc/src/comet38/adaptor/responses.ts @@ -298,7 +298,7 @@ function decodeBlockResults(data: RpcBlockResultsResponse): responses.BlockResul results: (data.txs_results || []).map(decodeTxData), validatorUpdates: (data.validator_updates || []).map(decodeValidatorUpdate), consensusUpdates: may(decodeConsensusParams, data.consensus_param_updates), - finalizeBlockEvents: decodeEvents(data.finalize_block_events || []) + finalizeBlockEvents: decodeEvents(data.finalize_block_events || []), }; }