Skip to content

feat: Tighter UniswapV4 types #220

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

Merged
lucas-manuel merged 2 commits into from
Jan 28, 2026
Merged

feat: Tighter UniswapV4 types #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
535c600
feat: tighter UniswaV4 types
deluca-mike Jan 23, 2026
12ab80e
remove `amount-too-large-for-permit2` error
deluca-mike Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/MainnetController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,8 +690,8 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
int24 tickLower,
int24 tickUpper,
uint128 liquidity,
uint256 amount0Max,
uint256 amount1Max
uint128 amount0Max,
uint128 amount1Max
)
external nonReentrant
{
Expand All @@ -714,8 +714,8 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
bytes32 poolId,
uint256 tokenId,
uint128 liquidityIncrease,
uint256 amount0Max,
uint256 amount1Max
uint128 amount0Max,
uint128 amount1Max
)
external nonReentrant
{
Expand All @@ -737,8 +737,8 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
bytes32 poolId,
uint256 tokenId,
uint128 liquidityDecrease,
uint256 amount0Min,
uint256 amount1Min
uint128 amount0Min,
uint128 amount1Min
)
external nonReentrant
{
Expand Down
68 changes: 33 additions & 35 deletions src/libraries/UniswapV4Lib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ library UniswapV4Lib {
int24 tickLower,
int24 tickUpper,
uint128 liquidity,
uint256 amount0Max,
uint256 amount1Max,
uint128 amount0Max,
uint128 amount1Max,
mapping(bytes32 poolId => TickLimits tickLimits) storage tickLimits
)
external
Expand Down Expand Up @@ -85,8 +85,8 @@ library UniswapV4Lib {
bytes32 poolId,
uint256 tokenId,
uint128 liquidityIncrease,
uint256 amount0Max,
uint256 amount1Max,
uint128 amount0Max,
uint128 amount1Max,
mapping(bytes32 poolId => TickLimits tickLimits) storage tickLimits
)
external
Expand Down Expand Up @@ -132,8 +132,8 @@ library UniswapV4Lib {
bytes32 poolId,
uint256 tokenId,
uint128 liquidityDecrease,
uint256 amount0Min,
uint256 amount1Min
uint128 amount0Min,
uint128 amount1Min
)
external
{
Expand Down Expand Up @@ -254,12 +254,10 @@ library UniswapV4Lib {
address proxy,
address token,
address spender,
uint256 amount
uint128 amount
)
internal
{
require(amount <= type(uint160).max, "MC/amount-too-large-for-permit2");

// Approve the Permit2 contract to spend none of the token (success is optional).
// NOTE: We don't care about the success of this call, since the only outcomes are:
// - the allowance is 0 (it was reset or was already 0)
Expand Down Expand Up @@ -303,8 +301,8 @@ library UniswapV4Lib {
bytes32 poolId,
address token0,
address token1,
uint256 amount0Max,
uint256 amount1Max,
uint128 amount0Max,
uint128 amount1Max,
bytes memory callData
)
internal
Expand Down Expand Up @@ -413,8 +411,8 @@ library UniswapV4Lib {
int24 tickLower,
int24 tickUpper,
uint128 liquidity,
uint256 amount0Max,
uint256 amount1Max
uint128 amount0Max,
uint128 amount1Max
)
internal view returns (bytes memory callData)
{
Expand All @@ -426,14 +424,14 @@ library UniswapV4Lib {
bytes[] memory params = new bytes[](2);

params[0] = abi.encode(
poolKey, // Which pool to mint in
tickLower, // Position's lower price bound
tickUpper, // Position's upper price bound
liquidity, // Amount of liquidity to mint
amount0Max, // Maximum amount of token0 to use
amount1Max, // Maximum amount of token1 to use
proxy, // NFT recipient
"" // No hook data needed
poolKey, // Which pool to mint in
tickLower, // Position's lower price bound
tickUpper, // Position's upper price bound
uint256(liquidity), // Amount of liquidity to mint
amount0Max, // Maximum amount of token0 to use
amount1Max, // Maximum amount of token1 to use
proxy, // NFT recipient
"" // No hook data needed
);

params[1] = abi.encode(
Expand All @@ -448,8 +446,8 @@ library UniswapV4Lib {
PoolKey memory poolKey,
uint256 tokenId,
uint128 liquidityIncrease,
uint256 amount0Max,
uint256 amount1Max
uint128 amount0Max,
uint128 amount1Max
)
internal view returns (bytes memory callData)
{
Expand All @@ -461,11 +459,11 @@ library UniswapV4Lib {
bytes[] memory params = new bytes[](2);

params[0] = abi.encode(
tokenId, // Position to increase
liquidityIncrease, // Amount to add
amount0Max, // Maximum token0 to spend
amount1Max, // Maximum token1 to spend
"" // No hook data needed
tokenId, // Position to increase
uint256(liquidityIncrease), // Amount to add
amount0Max, // Maximum token0 to spend
amount1Max, // Maximum token1 to spend
"" // No hook data needed
);

params[1] = abi.encode(
Expand All @@ -481,8 +479,8 @@ library UniswapV4Lib {
PoolKey memory poolKey,
uint256 tokenId,
uint128 liquidityDecrease,
uint256 amount0Min,
uint256 amount1Min
uint128 amount0Min,
uint128 amount1Min
)
internal view returns (bytes memory callData)
{
Expand All @@ -494,11 +492,11 @@ library UniswapV4Lib {
bytes[] memory params = new bytes[](2);

params[0] = abi.encode(
tokenId, // Position to decrease
liquidityDecrease, // Amount to remove
amount0Min, // Minimum token0 to receive
amount1Min, // Minimum token1 to receive
"" // No hook data needed
tokenId, // Position to decrease
uint256(liquidityDecrease), // Amount to remove
amount0Min, // Minimum token0 to receive
amount1Min, // Minimum token1 to receive
"" // No hook data needed
);

params[1] = abi.encode(
Expand Down
Loading
Loading