Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add error log to txstatus (backport #3788) #3789

Merged
merged 7 commits into from
Aug 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2024

Overview

Ended up cherry picking #3790 to make it easier for the reviewer

## Overview

- [x] Bump celestia-core verison including refactored TxStatus work
- [x] Extend the rpc response to return the error log
- [x] Update TxClient with extended TxStatus struct

---------

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
(cherry picked from commit 02b604d)

# Conflicts:
#	app/test/big_blob_test.go
#	app/test/prepare_proposal_context_test.go
#	app/test/square_size_test.go
#	app/test/std_sdk_test.go
#	pkg/user/tx_client.go
#	pkg/user/tx_client_test.go
#	x/blobstream/integration_test.go
#	x/signal/legacy_test.go
@mergify mergify bot requested a review from rach-id as a code owner August 19, 2024 11:58
@mergify mergify bot added the conflicts label Aug 19, 2024
@mergify mergify bot requested review from evan-forbes and a team as code owners August 19, 2024 11:58
Copy link
Contributor Author

mergify bot commented Aug 19, 2024

Cherry-pick of 02b604d has failed:

On branch mergify/bp/v2.x/pr-3788
Your branch is up to date with 'origin/v2.x'.

You are currently cherry-picking commit 02b604de.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/grpc/tx/server.go
	modified:   app/grpc/tx/tx.pb.go
	modified:   go.mod
	modified:   go.sum
	modified:   proto/celestia/core/v1/tx/tx.proto
	modified:   test/interchain/go.mod
	modified:   test/interchain/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/test/big_blob_test.go
	both modified:   app/test/prepare_proposal_context_test.go
	both modified:   app/test/square_size_test.go
	both modified:   app/test/std_sdk_test.go
	both modified:   pkg/user/tx_client.go
	both modified:   pkg/user/tx_client_test.go
	both modified:   x/blobstream/integration_test.go
	both modified:   x/signal/legacy_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the bot item was created by a bot label Aug 19, 2024
@ninabarbakadze ninabarbakadze marked this pull request as draft August 19, 2024 12:06
@ninabarbakadze ninabarbakadze marked this pull request as ready for review August 20, 2024 19:53
proto/celestia/core/v1/tx/tx.proto Show resolved Hide resolved
@ninabarbakadze ninabarbakadze enabled auto-merge (squash) August 20, 2024 20:16
@celestia-bot celestia-bot requested review from a team and staheri14 and removed request for a team August 20, 2024 20:16
@ninabarbakadze ninabarbakadze merged commit 5cf56ff into v2.x Aug 20, 2024
30 of 32 checks passed
@ninabarbakadze ninabarbakadze deleted the mergify/bp/v2.x/pr-3788 branch August 20, 2024 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants