fix(universal-router-sdk): handle ETH/WETH output in V4 split routes by dianakocsis · Pull Request #462 · Uniswap/sdks

dianakocsis · 2025-12-15T15:31:55Z

PR Scope

Please title your PR according to the following types and scopes following conventional commits:

fix(SDK name): will trigger a patch version
chore(<type>): will not trigger any release and should be used for internal repo changes
<type>(public): will trigger a patch version for non-code changes (e.g. README changes)
feat(SDK name): will trigger a minor version
feat(breaking): will trigger a major version for a breaking change

Description

[Summary of the change, motivation, and context]

How Has This Been Tested?

[e.g. Manually, E2E tests, unit tests, Storybook]

Are there any breaking changes?

[e.g. Type definitions, API definitions]

If there are breaking changes, please ensure you bump the major version Bump the major version (by using the title feat(breaking): ...), post a notice in #eng-sdks, and explicitly notify all Uniswap Labs consumers of the SDK.

(Optional) Feedback Focus

[Specific parts of this PR you'd like feedback on, or that reviewers should pay closer attention to]

(Optional) Follow Ups

[Things that weren't addressed in this PR, ways you plan to build on this work, or other ways this work could be extended]

✨ Claude-Generated Content

Description

Fixes an issue where split routes containing both V4 and non-V4 (V2/V3) swaps would fail when the output currency is ETH. V4 pools handle ETH natively, but V2/V3 pools use WETH. When both route types are combined in a split trade, the V4 routes must take WETH instead of ETH to ensure all routes accumulate WETH, which can then be unwrapped together in a single operation at the end.

Changes

Added shouldForceV4UnwrapForSplitNativeOutput getter to UniswapTrade class that detects if any V4 route (including mixed routes) ends with an ETH-WETH pool
Updated outputRequiresUnwrap to return true when output is native ETH and any V4 route has an ETH-WETH last pool
Modified addV4Swap to accept a shouldForceV4UnwrapForSplitNativeOutput parameter and use WETH for the take operation when this condition is true
Modified addMixedSwap to pass the flag through and use WETH for the final take in mixed routes when applicable
Bumped @uniswap/v4-sdk from ^1.25.1 to ^1.25.2
Bumped @uniswap/router-sdk from ^2.3.2 to ^2.3.3

How Has This Been Tested?

10 new Forge tests covering split route scenarios with V4 and non-V4 combinations
Unit tests added for the following scenarios:
- V3 + V4 split routes outputting ETH
- Mixed (V2->V3) + V4 split routes outputting ETH
- Mixed routes with V4 pools ending in ETH or WETH
- Pure V4 split routes with ETH-WETH pools

Are there any breaking changes?

No breaking changes. This is a bug fix that improves handling of edge cases in split route swaps.

github-actions · 2025-12-15T15:32:27Z

🤖 Claude Code Review

🔄 Review in progress... Claude is analyzing this pull request. If a review can be seen below, it will be replaced by the results of this one.

_{⏱️ Reviews typically complete within 5-15 minutes depending on PR size.}

Summary

This PR fixes handling of split routes when mixing V4 and non-V4 (V2/V3) swaps for ETH output. The issue is that V4 can handle native ETH directly, but V2/V3 require WETH. When splitting trades across both, you need consistent handling - this PR forces V4 to take WETH instead of ETH when there's a split route, then performs a final unwrap.

Key Changes

New hasSplitRoutesWithV4AndNonV4 getter - Cached detection of whether a trade has split routes mixing V4 and non-V4 protocols. For mixed routes, only counts as non-V4 if the last pool is not V4 (since V4 can handle ETH natively).
Updated outputRequiresUnwrap - Now returns true when split routes have V4 outputting ETH, ensuring the final WETH gets unwrapped to ETH for the recipient.
Modified addV4Swap - When hasSplitRoutesWithV4AndNonV4 is true and the path outputs native ETH via an ETH-WETH pool, it takes WETH instead of ETH.
Test coverage - Added 4 new test cases covering various split route scenarios, plus Forge integration tests validating the actual on-chain behavior.

Analysis

The logic is correct. The ETH-WETH pool detection at lines 443-445 checks if one currency is native and the other is its wrapped equivalent:

(lastPool.currency0.isNative && lastPool.currency1.wrapped.equals(lastPool.currency0.wrapped)) ||
(lastPool.currency1.isNative && lastPool.currency0.wrapped.equals(lastPool.currency1.wrapped))

This correctly identifies pools like ETH/WETH where swapping direction doesn't matter for the output token type.

The caching of _hasSplitRoutesWithV4AndNonV4 is appropriate since this property is accessed multiple times during encoding.

The Forge tests verify the end-to-end behavior: recipient receives ETH (not WETH), router balance ends at 0, and USDC is correctly deducted.

No issues found.

_{💡 Want a fresh review? Add a comment containing @request-claude-review to trigger a new review at any time.}

github-actions

📋 Review verdict: APPROVE

👆 The main review comment above is the source of truth for this PR review. It is automatically updated on each review cycle, so always refer to it for the most current feedback.

This formal review submission is for the verdict only.

graphite-app · 2025-12-15T15:40:12Z

Graphite Automations

"Request reviewers once CI passes on sdks monorepo" took an action on this PR • (12/15/25)

2 reviewers were added and 1 assignee was added to this PR based on Siyu Jiang (See-You John)'s automation.

sdks/universal-router-sdk/src/entities/actions/uniswap.ts

github-actions · 2025-12-16T20:45:36Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2025-12-16T20:45:37Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

sdks/universal-router-sdk/src/entities/actions/uniswap.ts

github-actions · 2025-12-17T19:11:13Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2025-12-17T19:11:14Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2025-12-17T19:34:11Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2025-12-17T19:34:12Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

sdks/universal-router-sdk/src/entities/actions/uniswap.ts

jsy1218 · 2026-01-06T17:12:31Z

@dianakocsis i think i prefer to have #476 merged first, then #462 should include as well

github-actions · 2026-01-06T22:05:58Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-06T22:05:59Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T01:08:10Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T01:08:11Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T16:42:41Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T16:42:41Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T16:47:53Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T16:47:53Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T17:03:58Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T17:03:59Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T17:15:25Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T17:15:26Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T17:37:33Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T17:37:33Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

socket-security · 2026-01-09T17:40:15Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	@uniswap/router-sdk@2.3.2 ⏵ 2.3.3	^-2		^-24	^-4

View full report

github-actions · 2026-01-09T17:40:29Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T17:40:30Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

github-actions · 2026-01-09T18:04:18Z

🤖 Claude Code Review

Status: ⚠️ Partial (script error)
Job: View workflow run

The review was completed but there was an error posting inline comments.

Raw Review Output

No review output available

Please check the workflow logs for details.

github-actions · 2026-01-09T18:04:19Z

🤖 Claude Code Review

Status: ❌ Error
Job: View workflow run

⚠️ Review Failed

The automated code review encountered an error and could not complete.

Next Steps:

Check the workflow logs for details
Verify the GitHub Actions configuration
Ensure the Anthropic API key is valid
Check for any permission issues

If the problem persists, please contact your repository administrator.

You can manually re-trigger the review by pushing a new commit or re-running the workflow.

dianakocsis added 2 commits December 15, 2025 10:26

fix split route for eth-weth pools

d81e9d9

update ur

6ccf2ae

dianakocsis requested a review from a team as a code owner December 15, 2025 15:31

dianakocsis changed the title ~~Eth weth fix~~ fix(universal-router-sdk): Eth weth fix Dec 15, 2025

github-actions bot changed the title ~~fix(universal-router-sdk): Eth weth fix~~ fix(universal-router-sdk): handle ETH/WETH output in V4 split routes Dec 15, 2025

github-actions bot approved these changes Dec 15, 2025

View reviewed changes

graphite-app bot requested a review from a team December 15, 2025 15:38

graphite-app bot assigned dianakocsis Dec 15, 2025

jsy1218 reviewed Dec 15, 2025

View reviewed changes

sdks/universal-router-sdk/src/entities/actions/uniswap.ts Outdated Show resolved Hide resolved

jsy1218 reviewed Dec 15, 2025

View reviewed changes

sdks/universal-router-sdk/src/entities/actions/uniswap.ts Outdated Show resolved Hide resolved

marktoda and others added 2 commits December 16, 2025 12:29

Merge branch 'main' into eth-weth-fix

7a75a8b

fix when multiple v4s in split path

e4611a1

jsy1218 reviewed Dec 16, 2025

View reviewed changes

sdks/universal-router-sdk/src/entities/actions/uniswap.ts Show resolved Hide resolved

dianakocsis added 2 commits December 17, 2025 12:43

add comments

f84056a

add nice comments

03d863e

make clear

fb05e0a

xrsv reviewed Jan 5, 2026

View reviewed changes

sdks/universal-router-sdk/src/entities/actions/uniswap.ts Show resolved Hide resolved

merge main

96bcd39

Merge branch 'main' into eth-weth-fix

43ccfc4

remove unnecessary checks

5dfa77b

Base automatically changed from eth-weth-exactOutput to main January 9, 2026 16:13

merge main

3495392

lint

33fdfc4

bump v4 sdk

9be9914

yarn dedupe

964871b

dianakocsis added 2 commits January 9, 2026 12:35

Merge branch 'main' into eth-weth-fix

e014341

bump router sdk

b786553

yarn dedupe again

61a98c5

use same universal router

06d10ce

marktoda approved these changes Jan 9, 2026

View reviewed changes

dianakocsis merged commit 1b97e76 into main Jan 9, 2026
8 of 9 checks passed

dianakocsis deleted the eth-weth-fix branch January 9, 2026 19:16

Conversation

dianakocsis commented Dec 15, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Scope

Description

How Has This Been Tested?

Are there any breaking changes?

(Optional) Feedback Focus

(Optional) Follow Ups

✨ Claude-Generated Content

Description

Changes

How Has This Been Tested?

Are there any breaking changes?

Uh oh!

github-actions bot commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Claude Code Review

Summary

Key Changes

Analysis

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

graphite-app bot commented Dec 15, 2025

Graphite Automations

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Dec 16, 2025

🤖 Claude Code Review

Uh oh!

github-actions bot commented Dec 16, 2025

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

Uh oh!

github-actions bot commented Dec 17, 2025

🤖 Claude Code Review

Uh oh!

github-actions bot commented Dec 17, 2025

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

github-actions bot commented Dec 17, 2025

🤖 Claude Code Review

Uh oh!

github-actions bot commented Dec 17, 2025

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

Uh oh!

jsy1218 commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

🤖 Claude Code Review

Uh oh!

github-actions bot commented Jan 6, 2026

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

github-actions bot commented Jan 9, 2026

🤖 Claude Code Review

Uh oh!

github-actions bot commented Jan 9, 2026

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

github-actions bot commented Jan 9, 2026

🤖 Claude Code Review

Uh oh!

github-actions bot commented Jan 9, 2026

🤖 Claude Code Review

⚠️ Review Failed

Uh oh!

github-actions bot commented Jan 9, 2026

🤖 Claude Code Review

Uh oh!

github-actions bot commented Jan 9, 2026

dianakocsis commented Dec 15, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Dec 15, 2025 •

edited

Loading

socket-security bot commented Jan 9, 2026 •

edited

Loading