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

fix: update depedencies to fix avax/bnb routing #6974

Merged
merged 4 commits into from
Jul 19, 2023
Merged

fix: update depedencies to fix avax/bnb routing #6974

merged 4 commits into from
Jul 19, 2023

Conversation

cbachmeier
Copy link
Contributor

@vercel
Copy link

vercel bot commented Jul 18, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
interface ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 18, 2023 11:57pm

@cbachmeier cbachmeier mentioned this pull request Jul 18, 2023
Merged
3 tasks
zzmp
zzmp suggested changes Jul 18, 2023
View reviewed changes
package.json Outdated Show resolved Hide resolved
yarn.lock Outdated Show resolved Hide resolved
@socket-security
Copy link

socket-security bot commented Jul 18, 2023 •
edited
Loading

New, updated, and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
@uniswap/v3-core 1.0.1 None +0 426 kB noahwz
@uniswap/universal-router-sdk 1.5.3...1.5.4 None +3/-6 3.1 MB eddiedugan
@uniswap/v2-sdk 3.0.1...3.2.0 None +0/-3 264 kB eddiedugan
@uniswap/router-sdk 1.4.0...1.6.0 None +2/-5 2.21 MB eddiedugan
@uniswap/v3-sdk 3.9.0...3.10.0 None +0/-3 1.17 MB eddiedugan
cypress-hardhat 2.4.2...2.5.0 None +4/-7 3.4 MB zzmp

🚮 Removed packages: @uniswap/sdk-core@3.2.6, @uniswap/smart-order-router@3.13.5

@cypress
Copy link

cypress bot commented Jul 18, 2023 •
edited
Loading

1 flaky tests on run #12817 ↗︎

0 89 6 0 Flakiness 1

Details:

fix: update depedencies to fix avax/bnb routing
Project: Uniswap Interface Commit: 3660b2380d
Status: Passed Duration: 04:44 💡
Started: Jul 19, 2023 12:02 AM Ended: Jul 19, 2023 12:06 AM
Flakiness  cypress/e2e/permit2.test.ts • 1 flaky test • e2e

View Output Video

Test Artifacts
Permit2 > prompts signature when existing permit approval is expired Output Screenshots Video

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@codecov
Copy link

codecov bot commented Jul 18, 2023 •
edited
Loading

Codecov Report

Merging #6974 (3660b23) into main (8956fba) will increase coverage by 0.05%.
The diff coverage is 100.00%.

Flag Coverage Δ
e2e-tests 62.22% <100.00%> (+0.08%) ⬆️
unit-tests 29.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@cbachmeier cbachmeier requested a review from zzmp July 18, 2023 22:02
zzmp
zzmp suggested changes Jul 18, 2023
View reviewed changes
yarn.lock Outdated
@@ -6418,6 +6418,11 @@
resolved "https://registry.npmjs.org/@uniswap/v2-core/-/v2-core-1.0.1.tgz"
integrity sha512-MtybtkUPSyysqLY2U210NBDeCHX+ltHt3oADGdjqoThZaFRDKwM6k1Nb3F0A3hk5hwuQvytFWhrWHOEq6nVJ8Q==

"@uniswap/v2-core@^1.0.1":
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be dedup'ed. run yarn deduplicate.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

deduplicate did not create a diff to yarn.lock

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I needed to update @uniswap/v2-periphery to be able to remove

yarn.lock
@@ -6442,6 +6447,11 @@
resolved "https://registry.npmjs.org/@uniswap/v3-core/-/v3-core-1.0.0.tgz"
Copy link
Contributor

Choose a reason for hiding this comment

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

why is 1.0.0 still required? this is a duplicate that needs to be resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Several dependencies still rely on it include the latest of router-sdk

Copy link
Contributor

Choose a reason for hiding this comment

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

this is forcing us to ship two copies of v3-core. Can we fix it upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://linear.app/uniswap/issue/WEB-2515/no-longer-import-uniswapv3-core-v100

@cbachmeier cbachmeier requested a review from zzmp July 18, 2023 23:57
zzmp
zzmp approved these changes Jul 19, 2023
View reviewed changes
yarn.lock
@@ -6442,6 +6447,11 @@
resolved "https://registry.npmjs.org/@uniswap/v3-core/-/v3-core-1.0.0.tgz"
Copy link
Contributor

Choose a reason for hiding this comment

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

this is forcing us to ship two copies of v3-core. Can we fix it upstream?

@cbachmeier cbachmeier merged commit b906cdd into main Jul 19, 2023
@cbachmeier cbachmeier deleted the cab/avax_fix_main branch July 19, 2023 16:58
This was referenced Aug 22, 2023
Open
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@just-toby just-toby just-toby approved these changes

@zzmp zzmp zzmp approved these changes

@tinaszheng tinaszheng Awaiting requested review from tinaszheng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cbachmeier @zzmp @just-toby