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

feat: add (re)delegation getters (backport #11596) #11615

Merged
merged 4 commits into from
Apr 13, 2022
Merged

feat: add (re)delegation getters (backport #11596) #11615

merged 4 commits into from
Apr 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2022

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

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

You are currently cherry-picking commit b8270fc9b.
  (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:   x/staking/keeper/delegation_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/staking/keeper/delegation.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

@danburck
feat: add (re)delegation getters (#11596)
d8461c6 
### Description

This PR adds general helper functions to the `x/staking` module that are used in the Evmos `x/vesting` module and originated from Agoric's custom staking module implementation https://github.com/agoric-labs/cosmos-sdk/blob/4085-true-vesting/x/staking/keeper/delegation.go.

- `GetDelegatorUnbonding`
- `GetDelegatorBonded`
- `IterateDelegatorUnbondingDelegations`
- `IterateDelegatorDelegations`
- `IterateDelegatorRedelegations`

(cherry picked from commit b8270fc)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/delegation.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners April 12, 2022 14:41
@mergify mergify bot added the conflicts label Apr 12, 2022
@tac0turtle
Copy link
Member

@danburck or @fedekunze could you solve the conflicts here please

@tac0turtle tac0turtle merged commit ac970f5 into release/v0.45.x Apr 13, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-11596 branch April 13, 2022 14:34
dwedul-figure added a commit to provenance-io/cosmos-sdk that referenced this pull request May 19, 2022
@dwedul-figure @jhernandezb
@mergify @danburck @fedekunze @alexanderbez @takapi327 @tac0turtle
Merge v0.45.4 into PIO 0.45.x (#127)
9b10c37 
* check error returned from NewNode (cosmos#11624)

* docs: Add v0.45.x to docs versions (backport cosmos#11613) (cosmos#11623)

* docs: Update mentions of Starport to Ignite CLI (backport cosmos#11612) (cosmos#11617)

* feat: add (re)delegation getters (backport cosmos#11596) (cosmos#11615)

* feat: add (re)delegation getters (cosmos#11596)

### Description

This PR adds general helper functions to the `x/staking` module that are used in the Evmos `x/vesting` module and originated from Agoric's custom staking module implementation https://github.com/agoric-labs/cosmos-sdk/blob/4085-true-vesting/x/staking/keeper/delegation.go.

- `GetDelegatorUnbonding`
- `GetDelegatorBonded`
- `IterateDelegatorUnbondingDelegations`
- `IterateDelegatorDelegations`
- `IterateDelegatorRedelegations`

(cherry picked from commit b8270fc)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/delegation.go

* fix RemoveDelegation method conflict

* fix CHANGELOG conflict

* add new PR in CHANGELOG

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>

* feat: add vesting util functions (backport cosmos#11652) (cosmos#11667)

* feat: add vesting util functions (cosmos#11652)

* feat: add vesting util functions

* changelog

* revert string deletion

* fix build

* Update x/auth/vesting/types/period.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit c676952)

# Conflicts:
#	CHANGELOG.md
#	x/auth/vesting/types/period.go

* changelog

* Update x/auth/vesting/types/period.go

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>

* chore: v0.45.x bump min go version to 1.17 (cosmos#11686)

* fix: Add validation on create gentx (backport cosmos#11693) (cosmos#11698)

* fix: Added description of how to run the unsafe-reset-all command in simapp README (cosmos#11718) (cosmos#11719)

* Fix simapp README

* Revised review content

Co-authored-by: Julien Robert <julien@rbrt.fr>
(cherry picked from commit d5e0b86)

Co-authored-by: Takahiko Tominaga <57429437+takapi327@users.noreply.github.com>

* chore: remove unneeded swagger docs from 0.45 cosmos#11745

* fix: data race issues with api.Server (backport cosmos#11724) (cosmos#11748)

* updates (cosmos#11750)

* updates (cosmos#11752)

* chore: release notes++

* Add dynamic build tag so this can build on M1 macs.

* Change README line endings to dos since that's what they were originally.

Co-authored-by: Jorge Hernandez <3452489+jhernandezb@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Takahiko Tominaga <57429437+takapi327@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
@mergify @danburck @JimLarson
feat: add (re)delegation getters (backport cosmos#11596) (cosmos#11615)
a9403e3 
* feat: add (re)delegation getters (cosmos#11596)

This PR adds general helper functions to the `x/staking` module that are used in the Evmos `x/vesting` module and originated from Agoric's custom staking module implementation https://github.com/agoric-labs/cosmos-sdk/blob/4085-true-vesting/x/staking/keeper/delegation.go.

- `GetDelegatorUnbonding`
- `GetDelegatorBonded`
- `IterateDelegatorUnbondingDelegations`
- `IterateDelegatorDelegations`
- `IterateDelegatorRedelegations`

(cherry picked from commit b8270fc)

* fix RemoveDelegation method conflict

* fix CHANGELOG conflict

* add new PR in CHANGELOG

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
@mergify @danburck @randy75828
feat: add (re)delegation getters (backport cosmos#11596) (cosmos#11615)
1553a0d 
* feat: add (re)delegation getters (cosmos#11596)

### Description

This PR adds general helper functions to the `x/staking` module that are used in the Evmos `x/vesting` module and originated from Agoric's custom staking module implementation https://github.com/agoric-labs/cosmos-sdk/blob/4085-true-vesting/x/staking/keeper/delegation.go.

- `GetDelegatorUnbonding`
- `GetDelegatorBonded`
- `IterateDelegatorUnbondingDelegations`
- `IterateDelegatorDelegations`
- `IterateDelegatorRedelegations`

(cherry picked from commit b8270fc)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/delegation.go

* fix RemoveDelegation method conflict

* fix CHANGELOG conflict

* add new PR in CHANGELOG

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@mergify @danburck @JeancarloBarrios
feat: add (re)delegation getters (backport cosmos#11596) (cosmos#11615)
42da3a0 
* feat: add (re)delegation getters (cosmos#11596)

### Description

This PR adds general helper functions to the `x/staking` module that are used in the Evmos `x/vesting` module and originated from Agoric's custom staking module implementation https://github.com/agoric-labs/cosmos-sdk/blob/4085-true-vesting/x/staking/keeper/delegation.go.

- `GetDelegatorUnbonding`
- `GetDelegatorBonded`
- `IterateDelegatorUnbondingDelegations`
- `IterateDelegatorDelegations`
- `IterateDelegatorRedelegations`

(cherry picked from commit b8270fc)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/delegation.go

* fix RemoveDelegation method conflict

* fix CHANGELOG conflict

* add new PR in CHANGELOG

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
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:x/staking conflicts
Projects
None yet
Milestone
No milestone
Development

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