From c4bedf8a5677c11cf6c81d920c7668ef4b435f5d Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Tue, 30 Nov 2021 10:29:09 -0500 Subject: [PATCH] fix: Add Events to TxResponse (#10630) --- CHANGELOG.md | 1 + go.sum | 3 - proto/cosmos/base/abci/v1beta1/abci.proto | 7 + types/abci.pb.go | 174 +++++++++++++++------- types/result.go | 51 +------ types/result_test.go | 64 ++++++-- 6 files changed, 183 insertions(+), 117 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44a0f174f86..99e216056ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (deps) [\#10210](https://github.com/cosmos/cosmos-sdk/pull/10210) Bump Tendermint to [v0.35.0](https://github.com/tendermint/tendermint/releases/tag/v0.35.0). * [\#10486](https://github.com/cosmos/cosmos-sdk/pull/10486) store/cachekv's `Store.Write` conservatively looks up keys, but also uses the [map clearing idiom](https://bencher.orijtech.com/perfclinic/mapclearing/) to reduce the RAM usage, CPU time usage, and garbage collection pressure from clearing maps, instead of allocating new maps. +* (types) [\#10630](https://github.com/cosmos/cosmos-sdk/pull/10630) Add an `Events` field to the `TxResponse` type that captures _all_ events emitted by a transaction, unlike `Logs` which only contains events emitted during message execution. ### API Breaking Changes diff --git a/go.sum b/go.sum index ead4b48b06f..a93bb7b33e8 100644 --- a/go.sum +++ b/go.sum @@ -298,7 +298,6 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= -github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= @@ -498,8 +497,6 @@ github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9 github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= diff --git a/proto/cosmos/base/abci/v1beta1/abci.proto b/proto/cosmos/base/abci/v1beta1/abci.proto index 8bfeaf8e1dc..1376761b38b 100644 --- a/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/proto/cosmos/base/abci/v1beta1/abci.proto @@ -39,6 +39,13 @@ message TxResponse { // the timestamps of the valid votes in the block.LastCommit. For height == 1, // it's genesis time. string timestamp = 12; + // Events defines all the events emitted by processing a transaction. Note, + // these events include those emitted by processing all the messages and those + // emitted from the ante handler. Whereas Logs contains the events, with + // additional metadata, emitted only by processing the messages. + // + // Since: cosmos-sdk 0.42.11, 0.44.5, 0.45 + repeated tendermint.abci.Event events = 13 [(gogoproto.nullable) = false]; } // ABCIMessageLog defines a structure containing an indexed tx ABCI message log. diff --git a/types/abci.pb.go b/types/abci.pb.go index 04174b97e41..402df71d158 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -57,6 +57,13 @@ type TxResponse struct { // the timestamps of the valid votes in the block.LastCommit. For height == 1, // it's genesis time. Timestamp string `protobuf:"bytes,12,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + // Events defines all the events emitted by processing a transaction. Note, + // these events include those emitted by processing all the messages and those + // emitted from the ante handler. Whereas Logs contains the events, with + // additional metadata, emitted only by processing the messages. + // + // Since: cosmos-sdk 0.45 + Events []types1.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"` } func (m *TxResponse) Reset() { *m = TxResponse{} } @@ -609,62 +616,63 @@ func init() { } var fileDescriptor_4e37629bc7eb0df8 = []byte{ - // 874 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0xbd, 0x6f, 0xdb, 0x46, - 0x14, 0xc0, 0x45, 0x89, 0xa1, 0xcc, 0x27, 0x27, 0x2e, 0x0e, 0x46, 0x42, 0x27, 0xad, 0xa4, 0x2a, - 0x29, 0xa0, 0x25, 0x54, 0xe3, 0xb4, 0x45, 0x91, 0xa1, 0x68, 0xe8, 0x7e, 0xc4, 0x40, 0xd2, 0xe1, - 0xac, 0xa0, 0x40, 0x17, 0xe1, 0x24, 0x5d, 0x4e, 0x6c, 0x44, 0x9e, 0xc0, 0x3b, 0xda, 0xf4, 0xd6, - 0xb1, 0x53, 0xd1, 0x29, 0x43, 0xa7, 0xce, 0xfd, 0x4b, 0x32, 0x7a, 0xcc, 0x50, 0xa8, 0xad, 0xbd, - 0xe5, 0xaf, 0x28, 0xee, 0x1d, 0xf5, 0xe1, 0x04, 0xf2, 0xa4, 0xf7, 0x75, 0xef, 0xde, 0xfb, 0xbd, - 0xa7, 0x23, 0xdc, 0x1d, 0x49, 0x95, 0x48, 0xd5, 0x1b, 0x32, 0xc5, 0x7b, 0x6c, 0x38, 0x8a, 0x7b, - 0xc7, 0x0f, 0x86, 0x5c, 0xb3, 0x07, 0xa8, 0x84, 0xb3, 0x4c, 0x6a, 0x49, 0x02, 0x1b, 0x14, 0x9a, - 0xa0, 0x10, 0xed, 0x65, 0xd0, 0xed, 0x5d, 0x21, 0x85, 0xc4, 0xa0, 0x9e, 0x91, 0x6c, 0xfc, 0xed, - 0x3b, 0x9a, 0xa7, 0x63, 0x9e, 0x25, 0x71, 0xaa, 0x6d, 0x4e, 0x7d, 0x3a, 0xe3, 0xaa, 0x74, 0xee, - 0x09, 0x29, 0xc5, 0x94, 0xf7, 0x50, 0x1b, 0xe6, 0x2f, 0x7a, 0x2c, 0x3d, 0xb5, 0xae, 0xce, 0xab, - 0x1a, 0x40, 0xbf, 0xa0, 0x5c, 0xcd, 0x64, 0xaa, 0x38, 0xb9, 0x09, 0xde, 0x84, 0xc7, 0x62, 0xa2, - 0x03, 0xa7, 0xed, 0x74, 0x6b, 0xb4, 0xd4, 0x48, 0x07, 0x3c, 0x5d, 0x4c, 0x98, 0x9a, 0x04, 0xd5, - 0xb6, 0xd3, 0xf5, 0x23, 0x38, 0x9f, 0xb7, 0xbc, 0x7e, 0xf1, 0x84, 0xa9, 0x09, 0x2d, 0x3d, 0xe4, - 0x43, 0xf0, 0x47, 0x72, 0xcc, 0xd5, 0x8c, 0x8d, 0x78, 0x50, 0x33, 0x61, 0x74, 0x65, 0x20, 0x04, - 0x5c, 0xa3, 0x04, 0x6e, 0xdb, 0xe9, 0x5e, 0xa7, 0x28, 0x1b, 0xdb, 0x98, 0x69, 0x16, 0x5c, 0xc3, - 0x60, 0x94, 0xc9, 0x2d, 0xa8, 0x67, 0xec, 0x64, 0x30, 0x95, 0x22, 0xf0, 0xd0, 0xec, 0x65, 0xec, - 0xe4, 0xa9, 0x14, 0xe4, 0x39, 0xb8, 0x53, 0x29, 0x54, 0x50, 0x6f, 0xd7, 0xba, 0x8d, 0xfd, 0x6e, - 0xb8, 0x09, 0x50, 0xf8, 0x38, 0x3a, 0x38, 0x7c, 0xc6, 0x95, 0x62, 0x82, 0x3f, 0x95, 0x22, 0xba, - 0xf5, 0x7a, 0xde, 0xaa, 0xfc, 0xf5, 0x4f, 0x6b, 0xe7, 0xb2, 0x5d, 0x51, 0x4c, 0x67, 0x6a, 0x88, - 0xd3, 0x17, 0x32, 0xd8, 0xb2, 0x35, 0x18, 0x99, 0x7c, 0x04, 0x20, 0x98, 0x1a, 0x9c, 0xb0, 0x54, - 0xf3, 0x71, 0xe0, 0x23, 0x09, 0x5f, 0x30, 0xf5, 0x23, 0x1a, 0xc8, 0x1e, 0x6c, 0x19, 0x77, 0xae, - 0xf8, 0x38, 0x00, 0x74, 0xd6, 0x05, 0x53, 0xcf, 0x15, 0x1f, 0x93, 0x7b, 0x50, 0xd5, 0x45, 0xd0, - 0x68, 0x3b, 0xdd, 0xc6, 0xfe, 0x6e, 0x68, 0xb1, 0x87, 0x0b, 0xec, 0xe1, 0xe3, 0xf4, 0x94, 0x56, - 0x75, 0x61, 0x48, 0xe9, 0x38, 0xe1, 0x4a, 0xb3, 0x64, 0x16, 0x6c, 0x5b, 0x52, 0x4b, 0xc3, 0x23, - 0xf7, 0xd7, 0x3f, 0x5b, 0x95, 0xce, 0x1f, 0x0e, 0xdc, 0xb8, 0x5c, 0x31, 0xb9, 0x03, 0x7e, 0xa2, - 0xc4, 0x20, 0x4e, 0xc7, 0xbc, 0xc0, 0xf9, 0x5c, 0xa7, 0x5b, 0x89, 0x12, 0x87, 0x46, 0x27, 0x1f, - 0x40, 0xcd, 0x30, 0xc3, 0xf1, 0x50, 0x23, 0x92, 0x23, 0xf0, 0xf8, 0x31, 0x4f, 0xb5, 0x0a, 0x6a, - 0x88, 0xec, 0x93, 0xcd, 0xc8, 0x8e, 0x74, 0x16, 0xa7, 0xe2, 0x5b, 0x13, 0x1d, 0xed, 0x96, 0xbc, - 0xb6, 0xd7, 0x8c, 0x8a, 0x96, 0xa9, 0x1e, 0xb9, 0xbf, 0xfc, 0xdd, 0x76, 0x3a, 0x19, 0x34, 0xd6, - 0xbc, 0x86, 0xa1, 0x59, 0x37, 0xac, 0xc9, 0xa7, 0x28, 0x93, 0x43, 0x00, 0xa6, 0x75, 0x16, 0x0f, - 0x73, 0xcd, 0x55, 0x50, 0xc5, 0x0a, 0xee, 0x5e, 0x31, 0xb4, 0x45, 0x6c, 0xe4, 0x9a, 0xfb, 0xe9, - 0xda, 0xe1, 0xf2, 0xce, 0x87, 0xe0, 0x2f, 0x83, 0x4c, 0xb7, 0x2f, 0xf9, 0x69, 0x79, 0xa1, 0x11, - 0xc9, 0x2e, 0x5c, 0x3b, 0x66, 0xd3, 0x9c, 0x97, 0x04, 0xac, 0xd2, 0x39, 0x80, 0xfa, 0xf7, 0x4c, - 0x1d, 0xbe, 0x3f, 0x54, 0x73, 0xd2, 0xdd, 0x34, 0xd4, 0x2a, 0x3a, 0x17, 0x43, 0xed, 0xfc, 0x0c, - 0x1e, 0xe5, 0x2a, 0x9f, 0xea, 0xe5, 0xc2, 0x9a, 0xd3, 0xdb, 0xe5, 0xc2, 0xbe, 0x0f, 0xfe, 0xb3, - 0x77, 0xc0, 0xdf, 0x0c, 0x57, 0x7f, 0x4e, 0xdb, 0xb5, 0x25, 0x6d, 0x3b, 0x5d, 0x92, 0xc5, 0xb1, - 0xbf, 0x72, 0x80, 0x1c, 0xc5, 0x49, 0x3e, 0x65, 0x3a, 0x96, 0xe9, 0xf2, 0x7f, 0xf9, 0x9d, 0xad, - 0x0e, 0x37, 0xd5, 0xc1, 0xed, 0xfa, 0x78, 0x33, 0xcb, 0xb2, 0xe3, 0x68, 0xcb, 0xe4, 0x3f, 0x9b, - 0xb7, 0x1c, 0x6c, 0x05, 0x21, 0x7c, 0x09, 0x5e, 0x86, 0xad, 0x60, 0xbd, 0x8d, 0xfd, 0xf6, 0xe6, - 0x2c, 0xb6, 0x65, 0x5a, 0xc6, 0x77, 0xbe, 0x82, 0xfa, 0x33, 0x25, 0xbe, 0x31, 0x1d, 0xef, 0x81, - 0x59, 0xbb, 0xc1, 0xda, 0xc8, 0xeb, 0x89, 0x12, 0x7d, 0x33, 0xf5, 0x05, 0xa0, 0xea, 0x0a, 0x50, - 0x39, 0xbe, 0x27, 0xe0, 0xf7, 0x8b, 0x45, 0x86, 0xcf, 0x97, 0x1c, 0x6b, 0x57, 0xb7, 0x52, 0x1e, - 0xb8, 0x94, 0xe9, 0xb7, 0x2a, 0xec, 0x1c, 0x71, 0x96, 0x8d, 0x26, 0xfd, 0x42, 0x95, 0x83, 0xf9, - 0x14, 0x1a, 0x5a, 0x6a, 0x36, 0x1d, 0x8c, 0x64, 0x9e, 0xda, 0xc7, 0xcb, 0x8d, 0x76, 0xde, 0xce, - 0x5b, 0xeb, 0x66, 0x0a, 0xa8, 0x1c, 0x18, 0xd9, 0xec, 0x8b, 0x8d, 0xb5, 0xc3, 0xb6, 0x8a, 0xc9, - 0x33, 0x63, 0x82, 0x0f, 0xd2, 0x3c, 0x19, 0xf2, 0x0c, 0x5f, 0xb1, 0x32, 0xcf, 0x9a, 0x99, 0x82, - 0x51, 0x7e, 0x40, 0x99, 0xdc, 0x07, 0xd4, 0x06, 0x98, 0x1a, 0x5f, 0x37, 0x37, 0xba, 0xf1, 0x76, - 0xde, 0x5a, 0xb3, 0x52, 0xdf, 0xc8, 0x7d, 0x23, 0x9a, 0x6b, 0xa7, 0x71, 0x12, 0x6b, 0x7c, 0xf3, - 0x5c, 0x6a, 0x15, 0xf2, 0x05, 0xd4, 0x74, 0xa1, 0x02, 0x0f, 0x71, 0xdc, 0xdb, 0x8c, 0x63, 0xf5, - 0x52, 0x53, 0x73, 0xc0, 0x02, 0x89, 0xbe, 0x7e, 0xf3, 0x5f, 0xb3, 0xf2, 0xfa, 0xbc, 0xe9, 0x9c, - 0x9d, 0x37, 0x9d, 0x7f, 0xcf, 0x9b, 0xce, 0xef, 0x17, 0xcd, 0xca, 0xd9, 0x45, 0xb3, 0xf2, 0xe6, - 0xa2, 0x59, 0xf9, 0xa9, 0x23, 0x62, 0x3d, 0xc9, 0x87, 0xe1, 0x48, 0x26, 0xbd, 0xf2, 0xcb, 0x63, - 0x7f, 0xee, 0xab, 0xf1, 0x4b, 0xfb, 0x99, 0x18, 0x7a, 0xf8, 0x44, 0x3d, 0xfc, 0x3f, 0x00, 0x00, - 0xff, 0xff, 0x84, 0x62, 0x26, 0x5f, 0x9b, 0x06, 0x00, 0x00, + // 881 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xbd, 0x8f, 0x1b, 0x45, + 0x14, 0xf7, 0xda, 0xce, 0xfa, 0xf6, 0xf9, 0x2e, 0x87, 0x46, 0xa7, 0x64, 0x2f, 0x01, 0xdb, 0x38, + 0x41, 0x72, 0x93, 0x35, 0xb9, 0x04, 0x84, 0x28, 0x10, 0xf1, 0xf1, 0x91, 0x93, 0x12, 0x8a, 0x39, + 0x47, 0x48, 0x34, 0xd6, 0xd8, 0x9e, 0x8c, 0x97, 0x78, 0x77, 0xac, 0x9d, 0xd9, 0xbb, 0xbd, 0x8e, + 0x92, 0x0a, 0x51, 0x51, 0x50, 0x51, 0xf3, 0x97, 0xa4, 0xa0, 0xb8, 0x32, 0x05, 0x32, 0x70, 0xd7, + 0xe5, 0xaf, 0x40, 0xf3, 0x66, 0xfc, 0x71, 0x44, 0x8e, 0x44, 0xe5, 0xf7, 0xf1, 0x9b, 0x37, 0xef, + 0xf7, 0x7b, 0xcf, 0xb3, 0x70, 0x67, 0x24, 0x55, 0x22, 0x55, 0x77, 0xc8, 0x14, 0xef, 0xb2, 0xe1, + 0x28, 0xee, 0x9e, 0xdc, 0x1f, 0x72, 0xcd, 0xee, 0xa3, 0x13, 0xcd, 0x32, 0xa9, 0x25, 0x09, 0x2d, + 0x28, 0x32, 0xa0, 0x08, 0xe3, 0x0e, 0x74, 0x6b, 0x4f, 0x48, 0x21, 0x11, 0xd4, 0x35, 0x96, 0xc5, + 0xdf, 0xba, 0xad, 0x79, 0x3a, 0xe6, 0x59, 0x12, 0xa7, 0xda, 0xd6, 0xd4, 0x67, 0x33, 0xae, 0x5c, + 0x72, 0x5f, 0x48, 0x29, 0xa6, 0xbc, 0x8b, 0xde, 0x30, 0x7f, 0xde, 0x65, 0xe9, 0x99, 0x4d, 0xb5, + 0xff, 0xa8, 0x00, 0xf4, 0x0b, 0xca, 0xd5, 0x4c, 0xa6, 0x8a, 0x93, 0x1b, 0xe0, 0x4f, 0x78, 0x2c, + 0x26, 0x3a, 0xf4, 0x5a, 0x5e, 0xa7, 0x42, 0x9d, 0x47, 0xda, 0xe0, 0xeb, 0x62, 0xc2, 0xd4, 0x24, + 0x2c, 0xb7, 0xbc, 0x4e, 0xd0, 0x83, 0x8b, 0x79, 0xd3, 0xef, 0x17, 0x8f, 0x99, 0x9a, 0x50, 0x97, + 0x21, 0xef, 0x42, 0x30, 0x92, 0x63, 0xae, 0x66, 0x6c, 0xc4, 0xc3, 0x8a, 0x81, 0xd1, 0x55, 0x80, + 0x10, 0xa8, 0x1a, 0x27, 0xac, 0xb6, 0xbc, 0xce, 0x0e, 0x45, 0xdb, 0xc4, 0xc6, 0x4c, 0xb3, 0xf0, + 0x1a, 0x82, 0xd1, 0x26, 0x37, 0xa1, 0x96, 0xb1, 0xd3, 0xc1, 0x54, 0x8a, 0xd0, 0xc7, 0xb0, 0x9f, + 0xb1, 0xd3, 0x27, 0x52, 0x90, 0x67, 0x50, 0x9d, 0x4a, 0xa1, 0xc2, 0x5a, 0xab, 0xd2, 0xa9, 0x1f, + 0x74, 0xa2, 0x4d, 0x02, 0x45, 0x8f, 0x7a, 0x87, 0x47, 0x4f, 0xb9, 0x52, 0x4c, 0xf0, 0x27, 0x52, + 0xf4, 0x6e, 0xbe, 0x9c, 0x37, 0x4b, 0xbf, 0xff, 0xd5, 0xdc, 0xbd, 0x1a, 0x57, 0x14, 0xcb, 0x99, + 0x1e, 0xe2, 0xf4, 0xb9, 0x0c, 0xb7, 0x6c, 0x0f, 0xc6, 0x26, 0xef, 0x01, 0x08, 0xa6, 0x06, 0xa7, + 0x2c, 0xd5, 0x7c, 0x1c, 0x06, 0xa8, 0x44, 0x20, 0x98, 0xfa, 0x16, 0x03, 0x64, 0x1f, 0xb6, 0x4c, + 0x3a, 0x57, 0x7c, 0x1c, 0x02, 0x26, 0x6b, 0x82, 0xa9, 0x67, 0x8a, 0x8f, 0xc9, 0x5d, 0x28, 0xeb, + 0x22, 0xac, 0xb7, 0xbc, 0x4e, 0xfd, 0x60, 0x2f, 0xb2, 0xb2, 0x47, 0x0b, 0xd9, 0xa3, 0x47, 0xe9, + 0x19, 0x2d, 0xeb, 0xc2, 0x28, 0xa5, 0xe3, 0x84, 0x2b, 0xcd, 0x92, 0x59, 0xb8, 0x6d, 0x95, 0x5a, + 0x06, 0xc8, 0x43, 0xf0, 0xf9, 0x09, 0x4f, 0xb5, 0x0a, 0x77, 0x90, 0xea, 0x8d, 0x68, 0x35, 0x5b, + 0xcb, 0xf4, 0x4b, 0x93, 0xee, 0x55, 0x0d, 0x31, 0xea, 0xb0, 0x9f, 0x56, 0x7f, 0xfc, 0xad, 0x59, + 0x6a, 0xff, 0xea, 0xc1, 0xf5, 0xab, 0x3c, 0xc9, 0x6d, 0x08, 0x12, 0x25, 0x06, 0x71, 0x3a, 0xe6, + 0x05, 0x4e, 0x75, 0x87, 0x6e, 0x25, 0x4a, 0x1c, 0x19, 0x9f, 0xbc, 0x03, 0x15, 0xa3, 0x34, 0x0e, + 0x95, 0x1a, 0x93, 0x1c, 0x2f, 0x6f, 0xaf, 0xe0, 0xed, 0x1f, 0x6c, 0x16, 0xfa, 0x58, 0x67, 0x71, + 0x2a, 0x6c, 0x33, 0x7b, 0x4e, 0xe5, 0xed, 0xb5, 0xa0, 0x5a, 0x35, 0xf7, 0xc3, 0x9f, 0x2d, 0xaf, + 0x9d, 0x41, 0x7d, 0x2d, 0x6b, 0x94, 0x37, 0x4b, 0x8a, 0x3d, 0x05, 0x14, 0x6d, 0x72, 0x04, 0xc0, + 0xb4, 0xce, 0xe2, 0x61, 0xae, 0xb9, 0x0a, 0xcb, 0xd8, 0xc1, 0x9d, 0xb7, 0x8c, 0x7a, 0x81, 0x75, + 0x62, 0xac, 0x1d, 0x76, 0x77, 0x3e, 0x80, 0x60, 0x09, 0x32, 0x6c, 0x5f, 0xf0, 0x33, 0x77, 0xa1, + 0x31, 0xc9, 0x1e, 0x5c, 0x3b, 0x61, 0xd3, 0x9c, 0x3b, 0x05, 0xac, 0xd3, 0x3e, 0x84, 0xda, 0xd7, + 0x4c, 0x1d, 0xbd, 0xb9, 0x0a, 0xe6, 0x64, 0x75, 0xd3, 0x2a, 0x94, 0x31, 0xb9, 0x58, 0x85, 0xf6, + 0xf7, 0xe0, 0x53, 0xae, 0xf2, 0xa9, 0x5e, 0xae, 0xb9, 0x39, 0xbd, 0xed, 0xd6, 0xfc, 0x4d, 0xe1, + 0x1f, 0xfe, 0x47, 0xf8, 0xff, 0x33, 0xf6, 0x5f, 0x3c, 0x20, 0xc7, 0x71, 0x92, 0x4f, 0x99, 0x8e, + 0x65, 0xba, 0xfc, 0x37, 0x7f, 0x65, 0xbb, 0xc3, 0xfd, 0xf6, 0x70, 0x27, 0xdf, 0xdf, 0xac, 0xa5, + 0x63, 0xdc, 0xdb, 0x32, 0xf5, 0xcf, 0xe7, 0x4d, 0x0f, 0xa9, 0xa0, 0x08, 0x9f, 0x80, 0x9f, 0x21, + 0x15, 0xec, 0xb7, 0x7e, 0xd0, 0xda, 0x5c, 0xc5, 0x52, 0xa6, 0x0e, 0xdf, 0xfe, 0x0c, 0x6a, 0x4f, + 0x95, 0xf8, 0xc2, 0x30, 0xde, 0x07, 0xb3, 0x76, 0x83, 0xb5, 0x91, 0xd7, 0x12, 0x25, 0xfa, 0x66, + 0xea, 0x0b, 0x81, 0xca, 0x2b, 0x81, 0xdc, 0xf8, 0x1e, 0x43, 0xd0, 0x2f, 0x16, 0x15, 0x3e, 0x5a, + 0xea, 0x58, 0x79, 0x3b, 0x15, 0x77, 0xe0, 0x4a, 0xa5, 0x9f, 0xca, 0xb0, 0x7b, 0xcc, 0x59, 0x36, + 0x9a, 0xf4, 0x0b, 0xe5, 0x06, 0xf3, 0x21, 0xd4, 0xb5, 0xd4, 0x6c, 0x3a, 0x18, 0xc9, 0x3c, 0xb5, + 0x4f, 0x5e, 0xb5, 0xb7, 0xfb, 0x7a, 0xde, 0x5c, 0x0f, 0x53, 0x40, 0xe7, 0xd0, 0xd8, 0x66, 0x5f, + 0x2c, 0xd6, 0x0e, 0xdb, 0x3a, 0xa6, 0xce, 0x8c, 0x09, 0x3e, 0x48, 0xf3, 0x64, 0xc8, 0x33, 0x7c, + 0xfb, 0x5c, 0x9d, 0xb5, 0x30, 0x05, 0xe3, 0x7c, 0x83, 0x36, 0xb9, 0x07, 0xe8, 0x0d, 0xb0, 0x34, + 0xbe, 0x89, 0xd5, 0xde, 0xf5, 0xd7, 0xf3, 0xe6, 0x5a, 0x94, 0x06, 0xc6, 0xee, 0x1b, 0xd3, 0x5c, + 0x3b, 0x8d, 0x93, 0x58, 0xe3, 0x4b, 0x59, 0xa5, 0xd6, 0x21, 0x1f, 0x43, 0x45, 0x17, 0x2a, 0xf4, + 0x51, 0x8e, 0xbb, 0x9b, 0xe5, 0x58, 0xbd, 0xef, 0xd4, 0x1c, 0xb0, 0x82, 0xf4, 0x3e, 0x7f, 0xf5, + 0x4f, 0xa3, 0xf4, 0xf2, 0xa2, 0xe1, 0x9d, 0x5f, 0x34, 0xbc, 0xbf, 0x2f, 0x1a, 0xde, 0xcf, 0x97, + 0x8d, 0xd2, 0xf9, 0x65, 0xa3, 0xf4, 0xea, 0xb2, 0x51, 0xfa, 0xae, 0x2d, 0x62, 0x3d, 0xc9, 0x87, + 0xd1, 0x48, 0x26, 0x5d, 0xf7, 0xbd, 0xb2, 0x3f, 0xf7, 0xd4, 0xf8, 0x85, 0xfd, 0xb8, 0x0c, 0x7d, + 0x7c, 0xd8, 0x1e, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xed, 0x2a, 0x80, 0xd1, 0x06, 0x00, + 0x00, } func (m *TxResponse) Marshal() (dAtA []byte, err error) { @@ -687,6 +695,20 @@ func (m *TxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Events) > 0 { + for iNdEx := len(m.Events) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Events[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAbci(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6a + } + } if len(m.Timestamp) > 0 { i -= len(m.Timestamp) copy(dAtA[i:], m.Timestamp) @@ -1236,6 +1258,12 @@ func (m *TxResponse) Size() (n int) { if l > 0 { n += 1 + l + sovAbci(uint64(l)) } + if len(m.Events) > 0 { + for _, e := range m.Events { + l = e.Size() + n += 1 + l + sovAbci(uint64(l)) + } + } return n } @@ -1872,6 +1900,40 @@ func (m *TxResponse) Unmarshal(dAtA []byte) error { } m.Timestamp = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Events", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAbci + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthAbci + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAbci + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Events = append(m.Events, types1.Event{}) + if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAbci(dAtA[iNdEx:]) diff --git a/types/result.go b/types/result.go index fc9f715970e..4e7b15bf5b0 100644 --- a/types/result.go +++ b/types/result.go @@ -3,14 +3,10 @@ package types import ( "encoding/hex" "encoding/json" - "fmt" "math" "strings" "github.com/gogo/protobuf/proto" - - "sigs.k8s.io/yaml" - abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/rpc/coretypes" @@ -21,12 +17,12 @@ import ( var cdc = codec.NewLegacyAmino() func (gi GasInfo) String() string { - bz, _ := yaml.Marshal(gi) + bz, _ := codec.MarshalYAML(codec.NewProtoCodec(nil), &gi) return string(bz) } func (r Result) String() string { - bz, _ := yaml.Marshal(r) + bz, _ := codec.MarshalYAML(codec.NewProtoCodec(nil), &r) return string(bz) } @@ -83,6 +79,7 @@ func NewResponseResultTx(res *coretypes.ResultTx, anyTx *codectypes.Any, timesta GasUsed: res.TxResult.GasUsed, Tx: anyTx, Timestamp: timestamp, + Events: res.TxResult.Events, } } @@ -123,6 +120,7 @@ func newTxResponseCheckTx(res *coretypes.ResultBroadcastTxCommit) *TxResponse { Info: res.CheckTx.Info, GasWanted: res.CheckTx.GasWanted, GasUsed: res.CheckTx.GasUsed, + Events: res.CheckTx.Events, } } @@ -149,6 +147,7 @@ func newTxResponseDeliverTx(res *coretypes.ResultBroadcastTxCommit) *TxResponse Info: res.DeliverTx.Info, GasWanted: res.DeliverTx.GasWanted, GasUsed: res.DeliverTx.GasUsed, + Events: res.DeliverTx.Events, } } @@ -171,44 +170,8 @@ func NewResponseFormatBroadcastTx(res *coretypes.ResultBroadcastTx) *TxResponse } func (r TxResponse) String() string { - var sb strings.Builder - sb.WriteString("Response:\n") - - if r.Height > 0 { - sb.WriteString(fmt.Sprintf(" Height: %d\n", r.Height)) - } - if r.TxHash != "" { - sb.WriteString(fmt.Sprintf(" TxHash: %s\n", r.TxHash)) - } - if r.Code > 0 { - sb.WriteString(fmt.Sprintf(" Code: %d\n", r.Code)) - } - if r.Data != "" { - sb.WriteString(fmt.Sprintf(" Data: %s\n", r.Data)) - } - if r.RawLog != "" { - sb.WriteString(fmt.Sprintf(" Raw Log: %s\n", r.RawLog)) - } - if r.Logs != nil { - sb.WriteString(fmt.Sprintf(" Logs: %s\n", r.Logs)) - } - if r.Info != "" { - sb.WriteString(fmt.Sprintf(" Info: %s\n", r.Info)) - } - if r.GasWanted != 0 { - sb.WriteString(fmt.Sprintf(" GasWanted: %d\n", r.GasWanted)) - } - if r.GasUsed != 0 { - sb.WriteString(fmt.Sprintf(" GasUsed: %d\n", r.GasUsed)) - } - if r.Codespace != "" { - sb.WriteString(fmt.Sprintf(" Codespace: %s\n", r.Codespace)) - } - if r.Timestamp != "" { - sb.WriteString(fmt.Sprintf(" Timestamp: %s\n", r.Timestamp)) - } - - return strings.TrimSpace(sb.String()) + bz, _ := codec.MarshalYAML(codec.NewProtoCodec(nil), &r) + return string(bz) } // Empty returns true if the response is empty diff --git a/types/result_test.go b/types/result_test.go index 04b75a2f259..e9fd9f4a4ad 100644 --- a/types/result_test.go +++ b/types/result_test.go @@ -7,10 +7,8 @@ import ( "testing" "github.com/golang/protobuf/proto" - "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/rpc/coretypes" @@ -101,18 +99,20 @@ func (s *resultTestSuite) TestResponseResultTx() { s.Require().Equal(want, sdk.NewResponseResultTx(resultTx, nil, "timestamp")) s.Require().Equal((*sdk.TxResponse)(nil), sdk.NewResponseResultTx(nil, nil, "timestamp")) - s.Require().Equal(`Response: - Height: 10 - TxHash: 74657374 - Code: 1 - Data: 64617461 - Raw Log: [] - Logs: [] - Info: info - GasWanted: 100 - GasUsed: 90 - Codespace: codespace - Timestamp: timestamp`, sdk.NewResponseResultTx(resultTx, nil, "timestamp").String()) + s.Require().Equal(`code: 1 +codespace: codespace +data: "64617461" +events: [] +gas_used: "90" +gas_wanted: "100" +height: "10" +info: info +logs: [] +raw_log: '[]' +timestamp: timestamp +tx: null +txhash: "74657374" +`, sdk.NewResponseResultTx(resultTx, nil, "timestamp").String()) s.Require().True(sdk.TxResponse{}.Empty()) s.Require().False(want.Empty()) @@ -154,6 +154,18 @@ func (s *resultTestSuite) TestResponseFormatBroadcastTxCommit() { GasWanted: 99, GasUsed: 100, Codespace: "codespace", + Events: []abci.Event{ + { + Type: "message", + Attributes: []abci.EventAttribute{ + { + Key: "action", + Value: "foo", + Index: true, + }, + }, + }, + }, }, } deliverTxResult := &coretypes.ResultBroadcastTxCommit{ @@ -167,6 +179,18 @@ func (s *resultTestSuite) TestResponseFormatBroadcastTxCommit() { GasWanted: 99, GasUsed: 100, Codespace: "codespace", + Events: []abci.Event{ + { + Type: "message", + Attributes: []abci.EventAttribute{ + { + Key: "action", + Value: "foo", + Index: true, + }, + }, + }, + }, }, } want := &sdk.TxResponse{ @@ -180,6 +204,18 @@ func (s *resultTestSuite) TestResponseFormatBroadcastTxCommit() { Info: "info", GasWanted: 99, GasUsed: 100, + Events: []abci.Event{ + { + Type: "message", + Attributes: []abci.EventAttribute{ + { + Key: "action", + Value: "foo", + Index: true, + }, + }, + }, + }, } s.Require().Equal(want, sdk.NewResponseFormatBroadcastTxCommit(checkTxResult))