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

refactor: remove redacted message (backport #11960) #12002

Merged
merged 4 commits into from
May 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2022

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

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

You are currently cherry-picking commit bcf208892.
  (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:   types/errors/abci_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   errors/abci.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

## Description

Closes: #11539

---

### Author Checklist

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed

### Reviewers Checklist

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

(cherry picked from commit bcf2088)

# Conflicts:
#	CHANGELOG.md
#	errors/abci.go
@mergify mergify bot added the conflicts label May 19, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@alexanderbez alexanderbez merged commit a72d9fa into release/v0.45.x May 20, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-11960 branch May 20, 2022 14:11
@alexanderbez
Copy link
Contributor

Wait, doesn't this impact the tx response, which Tendermint stores? Can we actually backport this @AmauryM ?

@amaury1093
Copy link
Contributor

It does modify the tx response, but I thought this was like events, i.e. "full-node-breaking", but not consensus-breaking, so okay to backport.

But I'm also not 100% sure on the TM side though. If this somehow gets stored in a block, then it's consensus breaking.

@alexanderbez
Copy link
Contributor

I'm going to revert for this for now until I can confirm...

@yihuang
Copy link
Collaborator

yihuang commented May 21, 2022

I'm going to revert for this for now until I can confirm...

https://github.com/tendermint/tendermint/blob/e6f07116483973914eb1c71ade39b0499f84bbe2/types/results.go#L47
only these four fields get hashed into the result hash.
the error message is in the log field I think.

@alexanderbez
Copy link
Contributor

Yes, I've confirmed it. So we'll keep the backport.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants