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

fix: forbid negative values for trusting period, unbonding period and max clock drift (backport #2555) #2620

Merged
merged 6 commits into from
Nov 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2022

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

On branch mergify/bp/release/v6.0.x/pr-2555
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit eab24e8.
  (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:   CHANGELOG.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   modules/light-clients/07-tendermint/client_state.go
	deleted by us:   modules/light-clients/07-tendermint/client_state_test.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

… max clock drift (#2555)

Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit eab24e8)

# Conflicts:
#	modules/light-clients/07-tendermint/client_state.go
#	modules/light-clients/07-tendermint/client_state_test.go
@crodriguezvega crodriguezvega removed their assignment Oct 28, 2022
@colin-axner colin-axner enabled auto-merge (squash) November 1, 2022 16:21
@colin-axner colin-axner merged commit 01b4f3a into release/v6.0.x Nov 1, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v6.0.x/pr-2555 branch November 1, 2022 16:26
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.

4 participants