Skip to content

Fix PoolManager circular imports #85

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix PoolManager circular imports #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
[submodule "src/pkgs/v4-core"]
path = src/pkgs/v4-core
url = https://github.com/Uniswap/v4-core/
branch = chris/fix-dependency-graph
[submodule "src/pkgs/v4-periphery"]
path = src/pkgs/v4-periphery
url = https://github.com/Uniswap/v4-periphery/
Expand All @@ -46,9 +47,9 @@
[submodule "src/pkgs/swap-router-contracts"]
path = src/pkgs/swap-router-contracts
url = https://github.com/Uniswap/swap-router-contracts
[submodule "lib/v4-core"]
path = lib/v4-core
url = https://github.com/Uniswap/v4-core
[submodule "lib/forge-chronicles"]
path = lib/forge-chronicles
url = https://github.com/uniswap/forge-chronicles
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/openzeppelin/openzeppelin-contracts
2 changes: 1 addition & 1 deletion foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ compilation_restrictions = [
# permit2
{ paths = "src/pkgs/permit2/src/**", version = "0.8.17", via_ir = true },
# v4
{ paths = "lib/v4-core/src/PoolManager.sol", optimizer_runs = 44444444 },
{ paths = "src/pkgs/v4-core/src/PoolManager.sol", optimizer_runs = 44444444 },
{ paths = "src/pkgs/v4-periphery/src/PositionDescriptor.sol", version = "0.8.26", optimizer_runs = 1 },
{ paths = "src/pkgs/v4-periphery/src/PositionManager.sol", version = "0.8.26", optimizer_runs = 30000 },
{ paths = "src/pkgs/v4-periphery/src/lens/**", version = "0.8.26", optimizer_runs = 44444444 },
Expand Down
1 change: 1 addition & 0 deletions lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts added at acd4ff
1 change: 0 additions & 1 deletion lib/v4-core
Open in desktop
Submodule v4-core deleted from e50237
2 changes: 2 additions & 0 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ src/pkgs/permit2:solmate=src/pkgs/permit2/lib/solmate
src/pkgs/universal-router:@uniswap/v3-periphery/=src/pkgs/universal-router/lib/v3-periphery/
src/pkgs/universal-router:@uniswap/v4-periphery/=src/pkgs/universal-router/lib/v4-periphery/
src/pkgs/universal-router:solmate=src/pkgs/universal-router/lib/solmate
src/pkgs/universal-router:@uniswap/v4-core=src/pkgs/universal-router/lib/v4-periphery/lib/v4-core
src/pkgs/universal-router/lib/v4-periphery:@openzeppelin=src/pkgs/universal-router/lib/v4-periphery/lib/v4-core/lib/openzeppelin-contracts
src/pkgs/universal-router/lib/v4-periphery:@uniswap/v4-core=src/pkgs/universal-router/lib/v4-periphery/lib/v4-core
src/pkgs/universal-router/lib/v3-periphery:@openzeppelin=lib/oz-v4.7.0
src/pkgs/uniswapx:solmate=src/pkgs/uniswapx/lib/solmate
src/pkgs/uniswapx:openzeppelin-contracts=src/pkgs/uniswapx/lib/openzeppelin-contracts/contracts
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/Deploy-all.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {UniswapInterfaceMulticallDeployer} from
import {V3MigratorDeployer} from '../../src/briefcase/deployers/v3-periphery/V3MigratorDeployer.sol';
import {QuoterDeployer} from '../../src/briefcase/deployers/view-quoter-v3/QuoterDeployer.sol';
import {TransparentUpgradeableProxy} from
'lib/v4-core/lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol';
'lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol';

import {PoolManagerDeployer} from '../../src/briefcase/deployers/v4-core/PoolManagerDeployer.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/briefcase/deployers/v4-core/PoolManagerDeployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ library PoolManagerDeployer {
* @dev autogenerated - run `./script/util/create_briefcase.sh` to generate current initcode
*
* @notice This initcode is generated from the following contract:
* - Source Contract: lib/v4-core/src/PoolManager.sol
* - Source Contract: src/pkgs/v4-core/src/PoolManager.sol
*/
function initcode() internal pure returns (bytes memory) {
return
Expand Down
7 changes: 0 additions & 7 deletions src/helper/PoolManagerImport.sol
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/pkgs/v4-core
Open in desktop
Submodule v4-core updated 33 files
+3 −2 src/PoolManager.sol
+7 −7 src/interfaces/IHooks.sol
+3 −21 src/interfaces/IPoolManager.sol
+5 −4 src/libraries/Hooks.sol
+7 −6 src/test/BaseTestHooks.sol
+4 −3 src/test/CustomCurveHook.sol
+4 −3 src/test/DeltaReturningHook.sol
+2 −1 src/test/DynamicFeesTestHook.sol
+2 −1 src/test/DynamicReturnFeeTestHook.sol
+7 −6 src/test/EmptyTestHooks.sol
+4 −3 src/test/FeeTakingHook.sol
+9 −8 src/test/Fuzzers.sol
+3 −2 src/test/LPFeeTakingHook.sol
+7 −6 src/test/MockHooks.sol
+4 −3 src/test/PoolModifyLiquidityTest.sol
+4 −3 src/test/PoolModifyLiquidityTestNoChecks.sol
+7 −6 src/test/PoolNestedActionsTest.sol
+3 −2 src/test/PoolSwapTest.sol
+3 −2 src/test/ProxyPoolManager.sol
+12 −11 src/test/SkipCallsTestHook.sol
+3 −2 src/test/SwapRouterNoChecks.sol
+27 −0 src/types/PoolOperation.sol
+6 −5 test/CustomAccounting.t.sol
+10 −9 test/DynamicFees.t.sol
+12 −11 test/ModifyLiquidity.t.sol
+3 −2 test/PoolManager.swap.t.sol
+39 −38 test/PoolManager.t.sol
+2 −1 test/Sync.t.sol
+16 −15 test/libraries/Hooks.t.sol
+40 −39 test/libraries/StateLibrary.t.sol
+2 −1 test/utils/AmountHelpers.sol
+10 −9 test/utils/Deployers.sol
+2 −2 test/utils/Logger.sol
Loading