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

Latest v4 periphery #420

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Latest v4 periphery #420

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
3f33438
Latest v4 periphery
hensha256 Oct 18, 2024
e2f16c7
why didnt the linter catch this
hensha256 Oct 18, 2024
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
2 changes: 1 addition & 1 deletion lib/v4-periphery
Open in desktop
Submodule v4-periphery updated 38 files
+1 −1 .forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
+1 −1 .forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
+1 −1 .forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
+1 −1 .forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
+1 −1 .forge-snapshots/V4Router_Bytecode.snap
+1 −1 .forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
+1 −1 .forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
+1 −1 .forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
+1 −1 .forge-snapshots/V4Router_ExactIn2Hops.snap
+1 −1 .forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactIn3Hops.snap
+1 −1 .forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactInputSingle.snap
+1 −1 .forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
+1 −1 .forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
+1 −1 .forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
+1 −1 .forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
+1 −1 .forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
+1 −1 .forge-snapshots/V4Router_ExactOut2Hops.snap
+1 −1 .forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactOut3Hops.snap
+1 −1 .forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
+1 −1 .forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
+1 −1 .forge-snapshots/V4Router_ExactOutputSingle.snap
+1 −1 .forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
+1 −1 .forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
+1 −1 .forge-snapshots/positionDescriptor bytecode size.snap
+12 −30 src/V4Router.sol
+0 −2 src/interfaces/IV4Router.sol
+1 −1 src/libraries/SVG.sol
+4 −1 src/libraries/SafeCurrencyMetadata.sol
+0 −2 test/libraries/CalldataDecoder.t.sol
+4 −4 test/router/Payments.gas.t.sol
+9 −9 test/router/Payments.t.sol
+6 −6 test/router/V4Router.gas.t.sol
+20 −24 test/router/V4Router.t.sol
6 changes: 0 additions & 6 deletions test/integration-tests/UniswapV4.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: true,
amountIn: amountInUSDC,
amountOutMinimum: minAmountOutNative,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down Expand Up @@ -336,7 +335,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: true,
amountOut: amountOutNative,
amountInMaximum: maxAmountInUSDC,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down Expand Up @@ -422,7 +420,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: true,
amountIn: amountInNative,
amountOutMinimum: minAmountOutUSDC,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down Expand Up @@ -512,7 +509,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: true,
amountOut: amountOutUSDC,
amountInMaximum: maxAmountInNative,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down Expand Up @@ -613,7 +609,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: false,
amountIn: amountInUSDC,
amountOutMinimum: minAmountOutNative,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down Expand Up @@ -700,7 +695,6 @@ describe('Uniswap V4 Tests:', () => {
zeroForOne: false,
amountOut: amountOutNative,
amountInMaximum: maxAmountInUSDC,
sqrtPriceLimitX96: 0,
hookData: '0x',
},
])
Expand Down
2 changes: 1 addition & 1 deletion test/integration-tests/gas-tests/__snapshots__/UniversalRouter.gas.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `19706`;
exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `19595`;
8 changes: 2 additions & 6 deletions test/integration-tests/shared/v4Planner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,13 @@ const POOL_KEY_STRUCT = '(address currency0,address currency1,uint24 fee,int24 t
const PATH_KEY_STRUCT = '(address intermediateCurrency,uint256 fee,int24 tickSpacing,address hooks,bytes hookData)'

const SWAP_EXACT_IN_SINGLE_STRUCT =
'(' +
POOL_KEY_STRUCT +
' poolKey,bool zeroForOne,uint128 amountIn,uint128 amountOutMinimum,uint160 sqrtPriceLimitX96,bytes hookData)'
'(' + POOL_KEY_STRUCT + ' poolKey,bool zeroForOne,uint128 amountIn,uint128 amountOutMinimum,bytes hookData)'

const SWAP_EXACT_IN_STRUCT =
'(address currencyIn,' + PATH_KEY_STRUCT + '[] path,uint128 amountIn,uint128 amountOutMinimum)'

const SWAP_EXACT_OUT_SINGLE_STRUCT =
'(' +
POOL_KEY_STRUCT +
' poolKey,bool zeroForOne,uint128 amountOut,uint128 amountInMaximum,uint160 sqrtPriceLimitX96,bytes hookData)'
'(' + POOL_KEY_STRUCT + ' poolKey,bool zeroForOne,uint128 amountOut,uint128 amountInMaximum,bytes hookData)'

const SWAP_EXACT_OUT_STRUCT =
'(address currencyOut,' + PATH_KEY_STRUCT + '[] path,uint128 amountOut,uint128 amountInMaximum)'
Expand Down
Loading