chore(backport)!: extend TxStatus with more info and ExecTxRes to include signers (#2637)

ninabarbakadze · web-flow · commit c3c13760ca55 · 2025-11-12T11:08:22.000-05:00
## Description Cherry picks #2543 && #2593
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
@@ -257,6 +257,7 @@ func (app *Application) FinalizeBlock(_ context.Context, req *types.RequestFinal
 					},
 				},
 			},
+			Signers: []string{"kvstore-app"}, // set signers for the tx
 		}
 		app.state.Size++
 	}
diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
diff --git a/consensus/replay_test.go b/consensus/replay_test.go
@@ -1182,7 +1182,7 @@ func newMockBlockStore(t *testing.T, config *cfg.Config, params types.ConsensusP
 	}
 }
 
-func (*mockBlockStore) SaveTxInfo(block *types.Block, txResponseCodes []uint32, logs []string) error {
+func (*mockBlockStore) SaveTxInfo(block *types.Block, execTxRes []*abci.ExecTxResult) error {
 	return nil
 }
 func (bs *mockBlockStore) LoadTxInfo(hash []byte) *cmtstore.TxInfo { return &cmtstore.TxInfo{} }
diff --git a/consensus/wal_fuzz.go b/consensus/wal_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 package consensus
 
diff --git a/libs/sync/deadlock.go b/libs/sync/deadlock.go
@@ -1,5 +1,4 @@
 //go:build deadlock
-// +build deadlock
 
 package sync
 
diff --git a/libs/sync/sync.go b/libs/sync/sync.go
@@ -1,5 +1,4 @@
 //go:build !deadlock
-// +build !deadlock
 
 package sync
 
diff --git a/p2p/conn/conn_go110.go b/p2p/conn/conn_go110.go
@@ -1,5 +1,4 @@
 //go:build go1.10
-// +build go1.10
 
 package conn
 
diff --git a/p2p/conn/conn_notgo110.go b/p2p/conn/conn_notgo110.go
@@ -1,5 +1,4 @@
 //go:build !go1.10
-// +build !go1.10
 
 package conn
 
diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto
@@ -452,6 +452,7 @@ message ExecTxResult {
   repeated Event events     = 7
       [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];  // nondeterministic
   string codespace = 8;
+  repeated string signers = 9;
 }
 
 // TxResult contains results of executing the transaction.
diff --git a/proto/tendermint/store/types.pb.go b/proto/tendermint/store/types.pb.go
diff --git a/proto/tendermint/store/types.proto b/proto/tendermint/store/types.proto
@@ -18,4 +18,11 @@ message TxInfo {
   uint32 code = 3;
   // The error log output generated if the transaction execution fails.
   string error = 4;
+  // The error namespace/module
+  string codespace  = 5;
+  // Requested gas limit
+  int64  gas_wanted = 6;
+  // Actual gas consumed
+  int64 gas_used = 7;
+  repeated string signers = 8; // tx signers
 }
diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go
@@ -853,6 +853,7 @@ func TestTxStatus(t *testing.T) {
 	require.Equal("COMMITTED", result.Status)
 	require.Equal(abci.CodeTypeOK, result.ExecutionCode)
 	require.Equal("", result.Error)
+	require.Equal(bres.TxResult.Signers, result.Signers)
 }
 
 func TestDataCommitment(t *testing.T) {
diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go
@@ -364,7 +364,7 @@ func (mockBlockStore) SaveBlockWithExtendedCommit(block *types.Block, blockParts
 func (mockBlockStore) SaveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit) {
 }
 
-func (mockBlockStore) SaveTxInfo(block *types.Block, txResponseCodes []uint32, logs []string) error {
+func (mockBlockStore) SaveTxInfo(block *types.Block, txResults []*abci.ExecTxResult) error {
 	return nil
 }
 
diff --git a/rpc/core/tx.go b/rpc/core/tx.go
@@ -233,6 +233,10 @@ func (env *Environment) TxStatus(ctx *rpctypes.Context, hash []byte) (*ctypes.Re
 			ExecutionCode: txInfo.Code,
 			Error:         txInfo.Error,
 			Status:        TxStatusCommitted,
+			Codespace:     txInfo.Codespace,
+			GasWanted:     txInfo.GasWanted,
+			GasUsed:       txInfo.GasUsed,
+			Signers:       txInfo.Signers,
 		}, nil
 	}
 
diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go
@@ -267,11 +267,15 @@ type ResultSignedBlock struct {
 // ResultTxStatus represents the status of a transaction during its life cycle.
 // It contains info to locate a tx in a committed block as well as its execution code, log if it fails and status.
 type ResultTxStatus struct {
-	Height        int64  `json:"height"`
-	Index         uint32 `json:"index"`
-	ExecutionCode uint32 `json:"execution_code"`
-	Error         string `json:"error"`
-	Status        string `json:"status"`
+	Height        int64    `json:"height"`
+	Index         uint32   `json:"index"`
+	ExecutionCode uint32   `json:"execution_code"`
+	Error         string   `json:"error"`
+	Status        string   `json:"status"`
+	Codespace     string   `json:"codespace,omitempty"`
+	GasWanted     int64    `json:"gas_wanted,omitempty"`
+	GasUsed       int64    `json:"gas_used,omitempty"`
+	Signers       []string `json:"signers,omitempty"`
 }
 
 type ResultDataCommitment struct {
diff --git a/rpc/jsonrpc/client/integration_test.go b/rpc/jsonrpc/client/integration_test.go
@@ -1,5 +1,4 @@
 //go:build release
-// +build release
 
 // The code in here is comprehensive as an integration
 // test and is long, hence is only run before releases.
diff --git a/state/execution.go b/state/execution.go
diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go
diff --git a/state/services.go b/state/services.go
diff --git a/store/store.go b/store/store.go
diff --git a/store/store_test.go b/store/store_test.go

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,7 @@ func (app Application) FinalizeBlock(_ context.Context, req types.RequestFinal`
`257`	`257`	`},`
`258`	`258`	`},`
`259`	`259`	`},`
	`260`	`+ Signers: []string{"kvstore-app"}, // set signers for the tx`
`260`	`261`	`}`
`261`	`262`	`app.state.Size++`
`262`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ func newMockBlockStore(t testing.T, config cfg.Config, params types.ConsensusP`
`1182`	`1182`	`}`
`1183`	`1183`	`}`
`1184`	`1184`
`1185`		`-func (mockBlockStore) SaveTxInfo(block types.Block, txResponseCodes []uint32, logs []string) error {`
	`1185`	`+func (mockBlockStore) SaveTxInfo(block types.Block, execTxRes []*abci.ExecTxResult) error {`
`1186`	`1186`	`return nil`
`1187`	`1187`	`}`
`1188`	`1188`	`func (bs mockBlockStore) LoadTxInfo(hash []byte) cmtstore.TxInfo { return &cmtstore.TxInfo{} }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build gofuzz`
`2`		`-// +build gofuzz`
`3`	`2`
`4`	`3`	`package consensus`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build deadlock`
`2`		`-// +build deadlock`
`3`	`2`
`4`	`3`	`package sync`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !deadlock`
`2`		`-// +build !deadlock`
`3`	`2`
`4`	`3`	`package sync`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build go1.10`
`2`		`-// +build go1.10`
`3`	`2`
`4`	`3`	`package conn`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !go1.10`
`2`		`-// +build !go1.10`
`3`	`2`
`4`	`3`	`package conn`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ message ExecTxResult {`
`452`	`452`	`repeated Event events = 7`
`453`	`453`	`[(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic`
`454`	`454`	`string codespace = 8;`
	`455`	`+ repeated string signers = 9;`
`455`	`456`	`}`
`456`	`457`
`457`	`458`	`// TxResult contains results of executing the transaction.`