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 event-query-tx-for cmd to subscribe and wait for transaction (backport #17274) #17435

Merged
merged 5 commits into from
Aug 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #17274 done by Mergify.
Cherry-pick of d0f2344 has failed:

On branch mergify/bp/release/v0.47.x/pr-17274
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit d0f23440b.
  (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:
	new file:   client/rpc/tx.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   simapp/simd/cmd/commands.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

#17274)

(cherry picked from commit d0f2344)

# Conflicts:
#	CHANGELOG.md
#	simapp/simd/cmd/commands.go
@mergify mergify bot requested a review from a team as a code owner August 17, 2023 16:25
@mergify mergify bot added the conflicts label Aug 17, 2023
@github-actions github-actions bot added the C:CLI label Aug 17, 2023
@julienrbrt julienrbrt assigned julienrbrt and unassigned julienrbrt Aug 17, 2023
@julienrbrt julienrbrt self-assigned this Aug 17, 2023
client/rpc/tx.go Outdated Show resolved Hide resolved
client/rpc/tx.go Outdated Show resolved Hide resolved
@tac0turtle tac0turtle enabled auto-merge (squash) August 18, 2023 08:37
@tac0turtle tac0turtle merged commit 32b23f5 into release/v0.47.x Aug 18, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-17274 branch August 18, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants