8000 Log proposer's address when correctly accepting a proposal (backport #1079) by mergify[bot] · Pull Request #1222 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Log proposer's address when correctly accepting a proposal (backport #1079) #1222

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Aug 10, 2023
Merged

Log proposer's address when correctly accepting a proposal (backport #1079) #1222

merged 4 commits into from
Aug 10, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Aug 7, 2023

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

On branch mergify/bp/v0.34.x/pr-1079
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit cf230821c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   consensus/state.go
	both modified:   state/execution.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@sergio-mena @mergify
Log proposer's address when correctly accepting a proposal (#1079)
8ccdb00 
* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

(cherry picked from commit cf23082)

# Conflicts:
#	consensus/state.go
#	state/execution.go
@mergify mergify bot requested a review from a team as a code owner August 7, 2023 16:37
@mergify mergify bot added the conflicts label Aug 7, 2023
@sergio-mena
Revert "Log proposer's address when correctly accepting a proposal (#…
36f7091 
…1079)"

This reverts commit 8ccdb00.
@sergio-mena
Log proposer's address when correctly accepting a proposal (#1079)
2834169 
* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level
@sergio-mena sergio-mena added logs Anything relating to logging and removed conflicts labels Aug 8, 2023
@sergio-mena sergio-mena merged commit 30895df into v0.34.x Aug 10, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.34.x/pr-1079 branch August 10, 2023 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sergio-mena sergio-mena sergio-mena approved these changes

Assignees
No one assigned
Labels
logs Anything relating to logging
Projects
No open projects
CometBFT 2023
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@sergio-mena
0