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.

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

chore: remove direct reliance on staking from slashing (backport #12177) #12181

Merged
merged 2 commits into from
Jun 7, 2022
Merged

chore: remove direct reliance on staking from slashing (backport #12177) #12181

merged 2 commits into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2022

This is an automatic backport of pull request #12177 done by Mergify.
Cherry-pick of 7c4e4c1 has failed:

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

You are currently cherry-picking commit 7c4e4c1a4.
  (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:   go.sum
	both modified:   x/distribution/module.go
	both modified:   x/distribution/simulation/operations.go
	both modified:   x/slashing/module.go
	both modified:   x/slashing/simulation/operations.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

@tac0turtle @mergify
chore: remove direct reliance on staking from slashing (#12177)
ba74679 
(cherry picked from commit 7c4e4c1)

# Conflicts:
#	go.sum
#	x/distribution/module.go
#	x/distribution/simulation/operations.go
#	x/slashing/module.go
#	x/slashing/simulation/operations.go
@mergify mergify bot added the conflicts label Jun 7, 2022
@alexanderbez alexanderbez merged commit 95d873f into release/v0.45.x Jun 7, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-12177 branch June 7, 2022 21:34
@tac0turtle tac0turtle mentioned this pull request Jun 7, 2022
Closed
6 tasks
sainoe pushed a commit that referenced this pull request Jun 13, 2022
@mergify @sainoe
chore: remove direct reliance on staking from slashing (backport #12177…
c783aea 
…) (#12181)
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
@mergify @randy75828
chore: remove direct reliance on staking from slashing (backport cosm…
db349bc 
…os#12177) (cosmos#12181)
jtremback added a commit that referenced this pull request Nov 1, 2022
@jtremback @fedekunze
@AdityaSripal @sainoe @okwme @mergify @mpoke @danwt @shaspitz
Interchain security rebase (#13722)
8f913f8 
* feat: store ABCI validator updates in transient store

* fix test build

* change transient key name

* add UnbondingDelegationEntryCreated hook

* add id to UnbondingDelegationEntry

* changes to add simple version of staking ccv hooks

* ubde id to string

* rough draft of more efficient technique

* change hook api and do some clean ups

* use ByEntry index and keep stopped entries in Entries array

* correct error convention

* add comment

* some cleanups

* comment cleanup

* finish hooking up hooks

* get the tests to pass

* proof of concept with embedded mock hooks

* first unit test of CCV hooks

* fix forgotten pointer bug

* move hook mocks into own file

* added test for completing stopped unbonding early

* added staking hooks template

* correct file and module names

* clean up and fix import error

* move staking hooks template to types

* fix hooks after merge

* fix silly proto bug

* feat: Add AfterValidatorDowntime hook in slashing module (#10938)

Create a slashing hook that allows external modules to register an execution when a validator has downtime.

Implementation details:

* Call hook in HandleValidatorSignature (x/slashing/keeper/infractions.go) which updates validator SignInfo data

* Defer hook execution in case it also wants to update validator SignInfo data

* Add methods to update SignInfo to slashing keeper interface(/x/slashing/types/expected_keepers.go)

* update: Remove slashing module hooks (#11425)

* update: Remove slashing module hooks

Hooks are not required anymore to implement the slashing for downtime in CCV. The logic is now using the staking keeper interface definition from the slashing module.

The SDK changes are the following:
- /x/slashing/keeper/infractions.go - remove hook calls and don't update validators missed blocks when jailed

- /x/slashing/types/expected_keepers.go - remove `AfterValidatorDowntime` hook interface and add `IsJailed()` method to staking interface definition

- /x/staking/keeper/validator.go - implement `IsJailed()` method

* fix last details

* Finish staking hooks merge (#11677)

* allow stopping and completing of redelegations

* refactor to remove BeforeUnbondingDelegationEntryComplete hook and notes for validator unbonding

* WIP rough draft of validator unbonding hooks

* add many of marius's suggested changes

* More review changes

* unbonding delegation tests pass

* WIP adding redelegation tests

* WIP redelegation tests work

* unbondingDelegation and redelegation tests pass and cleanup

* WIP validator unbonding tests almost pass

* tests for all new functionality pass

* fix index deleting logic

* clean up TODOs

* fix small logic bug

* fix slashing tests

* Rename statements containing 'UnbondingOp' to 'Unbond' in code, docs and proto files

Co-authored-by: Simon <simon.ntz@gmail.com>

* feat: enable double-signing evidence in Interchain-Security (#11921)

* Add a `InfractionType` enum to Slash function arguments

* Remove pubkey condition in HandleEquivocation

* Update docs/core/proto-docs.md

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* Update proto/cosmos/staking/v1beta1/staking.proto

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* add a possible solution to the evidence module issue

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* chore: remove direct reliance on staking from slashing (backport #12177) (#12181)

* fix: make ModuleAccountInvariants pass for IS SDK changes (#12554)

* fix bug breaking ModuleAccountInvariants

* set UnbondingOnHold to false explicitly

* Fixes staking hooks safety issues (#12578)

Co-authored-by: Daniel T <30197399+danwt@users.noreply.github.com>

* Revert "fix: make ModuleAccountInvariants pass for IS SDK changes (#12554)" (#12782)

This reverts commit 67c8163.

* fix: make ModuleAccountInvariants pass for IS SDK changes (#12783)

* fix bug breaking ModuleAccountInvariants

* set UnbondingOnHold to false explicitly

* fix: [Interchain Security] `validatorUnbondingCanComplete` must take into account (re)bonded validators (#12796)

* replace val.UnbondingOnHold w/ UnbondingOnHoldRefCount

* add UnbondingOnHoldRefCount for undel and red (for consistency)

* improve comments

* improve TestValidatorUnbondingOnHold test

* ret error if UnbondingOnHoldRefCount is negative

* adding extra validator unbonding test

* change OnHold() def

* fix: [Interchain Security] Fix leak in unbonding hooks (#12849)

* remove leak for UBDEs and REDEs

* remove leak for val unbondings

* docs: [Interchain Security] update spec (#12848)

* updating staking spec

* clarify code

* fix typo

* store ValidatorUpdates in normal store (#12845)

* Update x/slashing/keeper/signing_info.go

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>

* Update x/staking/keeper/val_state_change.go

* Update x/staking/keeper/val_state_change.go

* Update x/slashing/keeper/infractions.go

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>

* Update x/staking/keeper/val_state_change.go

* Update x/staking/keeper/val_state_change.go

* fix compile errors

* remove stakingtypes.TStoreKey

* fix: decrease minimums for genesis parameters (#13106)

* Update genesis.go

* Update genesis.go

Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>
Co-authored-by: Aditya Sripal <adityasripal@gmail.com>
Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>
Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Marius Poke <marius.poke@posteo.de>
Co-authored-by: Daniel T <30197399+danwt@users.noreply.github.com>
Co-authored-by: Shawn Marshall-Spitzbart <44221603+smarshall-spitzbart@users.noreply.github.com>
@faddat faddat mentioned this pull request Dec 11, 2023
Draft
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@mergify @JeancarloBarrios
chore: remove direct reliance on staking from slashing (backport cosm…
8b95d1c 
…os#12177) (cosmos#12181)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle approved these changes

@aaronc aaronc Awaiting requested review from aaronc aaronc is a code owner

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

Assignees
No one assigned
Labels
C:Simulations C:x/distribution distribution module related C:x/slashing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tac0turtle @alexanderbez