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

feat(blobstream): utilizes sdk.Dec type for power difference calculation (backport #2719) #2735

Merged
merged 4 commits into from
Oct 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 20, 2023

This is an automatic backport of pull request #2719 done by Mergify.
Cherry-pick of 6192a5a has failed:

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

You are currently cherry-picking commit 6192a5a.
  (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/qgb/abci.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/qgb/types/types_test.go
	both modified:   x/qgb/types/validator.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

…ion (#2719)

Closes #2700
Closes #2699

(cherry picked from commit 6192a5a)

# Conflicts:
#	x/qgb/types/types_test.go
#	x/qgb/types/validator.go
@mergify mergify bot requested review from rach-id and evan-forbes as code owners October 20, 2023 10:13
@mergify mergify bot added the conflicts label Oct 20, 2023
@celestia-bot celestia-bot requested a review from a team October 20, 2023 10:13
@github-actions github-actions bot added the bot item was created by a bot label Oct 20, 2023
x/qgb/types/types_test.go Outdated Show resolved Hide resolved
x/qgb/types/validator.go Outdated Show resolved Hide resolved
@celestia-bot celestia-bot requested a review from a team October 20, 2023 10:16
@rach-id rach-id enabled auto-merge (squash) October 20, 2023 10:19
Copy link
Member

@evan-forbes evan-forbes left a comment

Choose a reason for hiding this comment

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

I'm approving these changes, but am blocking this to make sure we don't accidently merge until we test it on mocha and arabica

@evan-forbes
Copy link
Member

to update here, both mocha and arabica are on roughly height 100k with no observed issues yet 🤞

it will likely take a while to finish syncing mocha since it got a ton of spam recently

Copy link
Member

@evan-forbes evan-forbes left a comment

Choose a reason for hiding this comment

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

okay we're gucci

@celestia-bot celestia-bot requested a review from a team October 23, 2023 12:41
@rach-id rach-id merged commit 74d47e1 into v1.x Oct 23, 2023
22 of 23 checks passed
@rach-id rach-id deleted the mergify/bp/v1.x/pr-2719 branch October 23, 2023 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants