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: oracle accept list no longer automatically adds blacklisted tokens (backport #1736) #1818

Merged
merged 3 commits into from
Feb 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2023

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

On branch mergify/bp/release/v4.1.x/pr-1736
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit b1454c1.
  (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/oracle/keeper/hooks.go
	modified:   x/oracle/keeper/hooks_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

…ns (#1736)

* fix: oracle accept list no longer automatically adds blacklisted tokens

* cl++

* switch order

(cherry picked from commit b1454c1)

# Conflicts:
#	CHANGELOG.md
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Member

@toteki toteki left a comment

Choose a reason for hiding this comment

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

First new one to merge into 4.1.x (edit: besides sdkerrors deprecation lint)

@codecov-commenter
Copy link

codecov-commenter commented Feb 14, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release/v4.1.x@5cc2c0c). Click here to learn what that means.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Impacted file tree graph

@@                Coverage Diff                @@
##             release/v4.1.x    #1818   +/-   ##
=================================================
  Coverage                  ?   57.47%           
=================================================
  Files                     ?       76           
  Lines                     ?     7945           
  Branches                  ?        0           
=================================================
  Hits                      ?     4566           
  Misses                    ?     3028           
  Partials                  ?      351           
Impacted Files Coverage Δ
x/oracle/keeper/hooks.go 95.65% <100.00%> (ø)

@toteki toteki merged commit 9b65b8c into release/v4.1.x Feb 14, 2023
@toteki toteki deleted the mergify/bp/release/v4.1.x/pr-1736 branch February 14, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants