From b6a42d5d4e4812d869c393a9e50125c45ed95a0c Mon Sep 17 00:00:00 2001 From: William Banfield Date: Fri, 4 Mar 2022 16:21:14 -0500 Subject: [PATCH] synchronize the intermediate proto file --- .../tendermint/abci/types.proto.intermediate | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/proto/tendermint/abci/types.proto.intermediate b/proto/tendermint/abci/types.proto.intermediate index ace64d911..c913c73ab 100644 --- a/proto/tendermint/abci/types.proto.intermediate +++ b/proto/tendermint/abci/types.proto.intermediate @@ -77,7 +77,7 @@ message RequestQuery { message RequestBeginBlock { bytes hash = 1; tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; - LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; + CommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; } @@ -151,17 +151,16 @@ message RequestProcessProposal { bytes hash = 1; tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; repeated bytes txs = 3; - LastCommitInfo last_commit_info = 4 [(gogoproto.nullable) = false]; + CommitInfo proposed_last_commit = 4 [(gogoproto.nullable) = false]; repeated Evidence byzantine_validators = 5 [(gogoproto.nullable) = false]; } message RequestFinalizeBlock { - repeated bytes txs = 1; - bytes hash = 2; - int64 height = 3; - tendermint.types.Header header = 4 [(gogoproto.nullable) = false]; - LastCommitInfo last_commit_info = 5 [(gogoproto.nullable) = false]; - repeated Evidence byzantine_validators = 6 [(gogoproto.nullable) = false]; + bytes hash = 1; + tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; + repeated bytes txs = 3; + CommitInfo decided_last_commit = 4 [(gogoproto.nullable) = false]; + repeated Evidence byzantine_validators = 5 [(gogoproto.nullable) = false]; } //---------------------------------------- @@ -343,17 +342,19 @@ message ResponseProcessProposal { } message ResponseFinalizeBlock { - repeated ResponseDeliverTx txs = 1; - repeated ValidatorUpdate validator_updates = 2 [(gogoproto.nullable) = false]; - tendermint.types.ConsensusParams consensus_param_updates = 3; - repeated Event events = 4 + repeated Event block_events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; + repeated ExecTxResult tx_results = 2; + repeated ValidatorUpdate validator_updates = 3 [(gogoproto.nullable) = false]; + tendermint.types.ConsensusParams consensus_param_updates = 4; + bytes app_hash = 5; + int64 retain_height = 6; } //---------------------------------------- // Misc. -message LastCommitInfo { +message CommitInfo { int32 round = 1; repeated VoteInfo votes = 2 [(gogoproto.nullable) = false]; } @@ -395,7 +396,7 @@ message TxResult { int64 height = 1; uint32 index = 2; bytes tx = 3; - ResponseDeliverTx result = 4 [(gogoproto.nullable) = false]; + ExecTxResult result = 4 [(gogoproto.nullable) = false]; } //----------------------------------------