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: Update uniswap provider to use new websocket api (backport #308) #309

Merged
merged 2 commits into from
Nov 13, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 13, 2023

This is an automatic backport of pull request #308 done by Mergify.
Cherry-pick of 9ca4545 has failed:

On branch mergify/bp/umee/pr-308
Your branch is up to date with 'origin/umee'.

You are currently cherry-picking commit 9ca4545.
  (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:   .golangci.yml
	modified:   oracle/oracle.go
	modified:   oracle/provider/uniswap.go
	modified:   tests/integration/provider_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ojo-provider-config/endpoints.toml
	both modified:   oracle/provider/uniswap_test.go
	both modified:   umee-provider-config/currency-pairs.toml

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

* replace uniswap provider with new websocket api

(cherry picked from commit 9ca4545)

# Conflicts:
#	ojo-provider-config/endpoints.toml
#	oracle/provider/uniswap_test.go
#	umee-provider-config/currency-pairs.toml
@mergify mergify bot requested a review from a team as a code owner November 13, 2023 20:47
@mergify mergify bot added the conflicts label Nov 13, 2023
@zarazan zarazan merged commit 1da01c3 into umee Nov 13, 2023
16 of 17 checks passed
@zarazan zarazan deleted the mergify/bp/umee/pr-308 branch November 13, 2023 21:38
zarazan added a commit that referenced this pull request Nov 15, 2023
#309)

* feat: Update uniswap provider to use new websocket api (#308)

* replace uniswap provider with new websocket api

(cherry picked from commit 9ca4545)

* resolve conflicts

---------

Co-authored-by: Kyle <[email protected]>
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.

1 participant