-
Notifications
You must be signed in to change notification settings - Fork 49
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(universal-router-sdk): v3 to v4 migrator #114
Merged
+642
−193
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
ad46340
feat(universal-router-sdk): add UR position management commands
marktoda c79566b
feat(ur-sdk): add v3 to v4 migration
marktoda a9cd32d
feat: add todos
marktoda e144a6b
fix: commands
marktoda f0dd14a
fix: lint
marktoda cfe317c
fix: yarn dedupe
marktoda 78b7b5f
fix: remove unused param
marktoda f92d967
migrate tests
dianakocsis c576a0f
merge main
dianakocsis 4179395
merge main again
dianakocsis 015042d
yarn dedupe and lint
dianakocsis 815f1d2
add migrate
dianakocsis 1ee8112
Merge branch 'main' into migrator-sdk
marktoda 9775356
test
dianakocsis afab750
invariant tests
dianakocsis c48845a
minting and migrating invariant tests
dianakocsis 2377b35
check position manager address
snreynolds 7667a67
remove unused imports
snreynolds b872258
test UR address
dianakocsis 852ca65
yarn lint:fix
dianakocsis 559c298
require burn when migrating
dianakocsis 9345ab3
Merge branch 'main' into migrator-sdk
dianakocsis 4e81bae
remove repeated permit field
dianakocsis 16a6ec9
specify with/without permit
dianakocsis 176f9b9
delete and re-generate interop.json
dianakocsis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,18 +2,41 @@ import invariant from 'tiny-invariant' | |
import { abi } from '@uniswap/universal-router/artifacts/contracts/UniversalRouter.sol/UniversalRouter.json' | ||
import { Interface } from '@ethersproject/abi' | ||
import { BigNumber, BigNumberish } from 'ethers' | ||
import { MethodParameters } from '@uniswap/v3-sdk' | ||
import { | ||
MethodParameters, | ||
Position as V3Position, | ||
NonfungiblePositionManager as V3PositionManager, | ||
RemoveLiquidityOptions as V3RemoveLiquidityOptions, | ||
} from '@uniswap/v3-sdk' | ||
import { | ||
Position as V4Position, | ||
V4PositionManager, | ||
AddLiquidityOptions as V4AddLiquidityOptions, | ||
MintOptions, | ||
} from '@uniswap/v4-sdk' | ||
import { Trade as RouterTrade } from '@uniswap/router-sdk' | ||
import { Currency, TradeType } from '@uniswap/sdk-core' | ||
import { Currency, TradeType, Percent, CHAIN_TO_ADDRESSES_MAP, SupportedChainsType } from '@uniswap/sdk-core' | ||
import { UniswapTrade, SwapOptions } from './entities/actions/uniswap' | ||
import { RoutePlanner } from './utils/routerCommands' | ||
import { encodePermit } from './utils/inputTokens' | ||
import { RoutePlanner, CommandType } from './utils/routerCommands' | ||
import { encodePermit, encodeV3PositionPermit } from './utils/inputTokens' | ||
import { UNIVERSAL_ROUTER_ADDRESS, UniversalRouterVersion } from './utils/constants' | ||
|
||
export type SwapRouterConfig = { | ||
sender?: string // address | ||
deadline?: BigNumberish | ||
} | ||
|
||
export interface MigrateV3ToV4Options { | ||
inputPosition: V3Position | ||
outputPosition: V4Position | ||
v3RemoveLiquidityOptions: V3RemoveLiquidityOptions | ||
v4AddLiquidityOptions: V4AddLiquidityOptions | ||
} | ||
|
||
function isMint(options: V4AddLiquidityOptions): options is MintOptions { | ||
return Object.keys(options).some((k) => k === 'recipient') | ||
} | ||
|
||
export abstract class SwapRouter { | ||
public static INTERFACE: Interface = new Interface(abi) | ||
|
||
|
@@ -43,6 +66,64 @@ export abstract class SwapRouter { | |
}) | ||
} | ||
|
||
/** | ||
* Builds the call parameters for a migration from a V3 position to a V4 position. | ||
* Some requirements of the parameters: | ||
* - v3RemoveLiquidityOptions.collectOptions.recipient must equal v4PositionManager | ||
* - v3RemoveLiquidityOptions.liquidityPercentage must be 100% | ||
* - input pool and output pool must have the same tokens | ||
* - V3 NFT must be approved, or valid inputV3NFTPermit must be provided with UR as spender | ||
*/ | ||
public static migrateV3ToV4CallParameters(options: MigrateV3ToV4Options): MethodParameters { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shoudl it check that the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it should imo + |
||
const token0 = options.inputPosition.pool.token0 | ||
const token1 = options.inputPosition.pool.token1 | ||
const v4PositionManagerAddress = | ||
CHAIN_TO_ADDRESSES_MAP[options.outputPosition.pool.chainId as SupportedChainsType].v4PositionManagerAddress | ||
|
||
invariant(token0 === options.outputPosition.pool.token0, 'TOKEN0_MISMATCH') | ||
invariant(token1 === options.outputPosition.pool.token1, 'TOKEN1_MISMATCH') | ||
invariant( | ||
options.v3RemoveLiquidityOptions.liquidityPercentage.equalTo(new Percent(100, 100)), | ||
'FULL_REMOVAL_REQUIRED' | ||
) | ||
invariant(options.v3RemoveLiquidityOptions.burnToken == true, 'BURN_TOKEN_REQUIRED') | ||
invariant( | ||
options.v3RemoveLiquidityOptions.collectOptions.recipient === v4PositionManagerAddress, | ||
'RECIPIENT_NOT_POSITION_MANAGER' | ||
) | ||
|
||
invariant(isMint(options.v4AddLiquidityOptions), 'MINT_REQUIRED') | ||
invariant(options.v4AddLiquidityOptions.migrate, 'MIGRATE_REQUIRED') | ||
|
||
const planner = new RoutePlanner() | ||
|
||
if (options.v3RemoveLiquidityOptions.permit) { | ||
// permit spender should be UR | ||
const universalRouterAddress = UNIVERSAL_ROUTER_ADDRESS( | ||
UniversalRouterVersion.V2_0, | ||
options.inputPosition.pool.chainId as SupportedChainsType | ||
) | ||
invariant(universalRouterAddress == options.v3RemoveLiquidityOptions.permit.spender, 'INVALID_SPENDER') | ||
// don't need to transfer it because v3posm uses isApprovedOrOwner() | ||
encodeV3PositionPermit(planner, options.v3RemoveLiquidityOptions.permit, options.v3RemoveLiquidityOptions.tokenId) | ||
} | ||
|
||
// encode v3 withdraw | ||
const v3RemoveParams = V3PositionManager.removeCallParameters( | ||
options.inputPosition, | ||
options.v3RemoveLiquidityOptions | ||
) | ||
planner.addCommand(CommandType.V3_POSITION_MANAGER_CALL, [v3RemoveParams.calldata]) | ||
|
||
// encode v4 mint | ||
const v4AddParams = V4PositionManager.addCallParameters(options.outputPosition, options.v4AddLiquidityOptions) | ||
planner.addCommand(CommandType.V4_POSITION_CALL, [v4AddParams.calldata]) | ||
|
||
return SwapRouter.encodePlan(planner, BigNumber.from(0), { | ||
deadline: BigNumber.from(options.v4AddLiquidityOptions.deadline), | ||
}) | ||
} | ||
|
||
/** | ||
* Encodes a planned route into a method name and parameters for the Router contract. | ||
* @param planner the planned route | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
was considering not taking
V3RemoveOptions
andV4RemoveOptions
and rather taking minimal deduplicated params and handling these automatically.. decided for this approach to give more configurability to options for each stage