@@ -73,9 +73,19 @@ func finalizeBlockResponse(
7373) (* abci.FinalizeBlockResponse , error ) {
7474 allEvents := append (in .BeginBlockEvents , in .EndBlockEvents ... )
7575
76+ events , err := intoABCIEvents (allEvents , indexSet )
77+ if err != nil {
78+ return nil , err
79+ }
80+
81+ txResults , err := intoABCITxResults (in .TxResults , indexSet )
82+ if err != nil {
83+ return nil , err
84+ }
85+
7686 resp := & abci.FinalizeBlockResponse {
77- Events : intoABCIEvents ( allEvents , indexSet ) ,
78- TxResults : intoABCITxResults ( in . TxResults , indexSet ) ,
87+ Events : events ,
88+ TxResults : txResults ,
7989 ValidatorUpdates : intoABCIValidatorUpdates (in .ValidatorUpdates ),
8090 AppHash : appHash ,
8191 ConsensusParamUpdates : cp ,
@@ -97,7 +107,7 @@ func intoABCIValidatorUpdates(updates []appmodulev2.ValidatorUpdate) []abci.Vali
97107 return valsetUpdates
98108}
99109
100- func intoABCITxResults (results []server.TxResult , indexSet map [string ]struct {}) []* abci.ExecTxResult {
110+ func intoABCITxResults (results []server.TxResult , indexSet map [string ]struct {}) ( []* abci.ExecTxResult , error ) {
101111 res := make ([]* abci.ExecTxResult , len (results ))
102112 for i := range results {
103113 if results [i ].Error != nil {
@@ -110,29 +120,36 @@ func intoABCITxResults(results []server.TxResult, indexSet map[string]struct{})
110120
111121 continue
112122 }
113-
123+ events , err := intoABCIEvents (results [i ].Events , indexSet )
124+ if err != nil {
125+ return nil , err
126+ }
114127 res [i ] = responseExecTxResultWithEvents (
115128 results [i ].Error ,
116129 results [i ].GasWanted ,
117130 results [i ].GasUsed ,
118- intoABCIEvents ( results [ i ]. Events , indexSet ) ,
131+ events ,
119132 false ,
120133 )
121134 }
122135
123- return res
136+ return res , nil
124137}
125138
126- func intoABCIEvents (events []event.Event , indexSet map [string ]struct {}) []abci.Event {
139+ func intoABCIEvents (events []event.Event , indexSet map [string ]struct {}) ( []abci.Event , error ) {
127140 indexAll := len (indexSet ) == 0
128141 abciEvents := make ([]abci.Event , len (events ))
129142 for i , e := range events {
143+ attributes , err := e .Attributes ()
144+ if err != nil {
145+ return nil , err
146+ }
130147 abciEvents [i ] = abci.Event {
131148 Type : e .Type ,
132- Attributes : make ([]abci.EventAttribute , len (e . Attributes )),
149+ Attributes : make ([]abci.EventAttribute , len (attributes )),
133150 }
134151
135- for j , attr := range e . Attributes {
152+ for j , attr := range attributes {
136153 _ , index := indexSet [fmt .Sprintf ("%s.%s" , e .Type , attr .Key )]
137154 abciEvents [i ].Attributes [j ] = abci.EventAttribute {
138155 Key : attr .Key ,
@@ -141,19 +158,23 @@ func intoABCIEvents(events []event.Event, indexSet map[string]struct{}) []abci.E
141158 }
142159 }
143160 }
144- return abciEvents
161+ return abciEvents , nil
145162}
146163
147164func intoABCISimulationResponse (txRes server.TxResult , indexSet map [string ]struct {}) ([]byte , error ) {
148165 indexAll := len (indexSet ) == 0
149166 abciEvents := make ([]abci.Event , len (txRes .Events ))
150167 for i , e := range txRes .Events {
168+ attributes , err := e .Attributes ()
169+ if err != nil {
170+ return nil , err
171+ }
151172 abciEvents [i ] = abci.Event {
152173 Type : e .Type ,
153- Attributes : make ([]abci.EventAttribute , len (e . Attributes )),
174+ Attributes : make ([]abci.EventAttribute , len (attributes )),
154175 }
155176
156- for j , attr := range e . Attributes {
177+ for j , attr := range attributes {
157178 _ , index := indexSet [fmt .Sprintf ("%s.%s" , e .Type , attr .Key )]
158179 abciEvents [i ].Attributes [j ] = abci.EventAttribute {
159180 Key : attr .Key ,
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?v=4&size=40){kind=avatar}
0 commit comments