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

Genesis upgrade and add invariant cherry pick (backport #1081) #1082

Merged
merged 3 commits into from
Mar 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2022

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

On branch mergify/bp/v7.x/pr-1081
Your branch is up to date with 'origin/v7.x'.

You are currently cherry-picking commit a454116.
  (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:   go.mod
	modified:   proto/osmosis/superfluid/genesis.proto
	modified:   proto/osmosis/superfluid/superfluid.proto
	modified:   x/claim/keeper/hooks.go
	modified:   x/superfluid/genesis.go
	modified:   x/superfluid/keeper/distribution_test.go
	modified:   x/superfluid/keeper/hooks.go
	modified:   x/superfluid/keeper/intermediary_account.go
	modified:   x/superfluid/keeper/intermediary_account_test.go
	new file:   x/superfluid/keeper/invariants.go
	modified:   x/superfluid/keeper/stake_test.go
	modified:   x/superfluid/module.go
	modified:   x/superfluid/types/genesis.pb.go
	modified:   x/superfluid/types/superfluid.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum
	both modified:   x/superfluid/keeper/slash_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

* add TotalSuperfluidDelegationInvariant

* update invariant name

* Update x/superfluid/keeper/invariants.go

Co-authored-by: Dev Ojha <[email protected]>

* Update x/superfluid/keeper/invariants.go

Co-authored-by: Dev Ojha <[email protected]>

* revert back changes for SetLockIdIntermediaryAccountConnection

* convert to round

* add invariant checker function call on all superfluid tests

* update go mod/sum

* add after validator slashed hook

* following updates for main branch cherry-pick

Co-authored-by: Dev Ojha <[email protected]>
(cherry picked from commit a454116)

# Conflicts:
#	go.sum
#	x/superfluid/keeper/slash_test.go
@mergify mergify bot added the conflicts label Mar 13, 2022
@@ -157,7 +157,9 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
}

// RegisterInvariants registers the capability module's invariants.
func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}
func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
keeper.RegisterInvariants(ir, am.keeper)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to comment this out

Comment on lines 92 to 95
if slashFactor.IsZero() {
return
}
h.k.RefreshIntermediaryDelegationAmounts(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to comment this out

Copy link
Member

@ValarDragon ValarDragon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing the conflicts!

@ValarDragon ValarDragon merged commit 381dbf0 into v7.x Mar 15, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v7.x/pr-1081 branch March 15, 2022 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants