diff --git a/remappings.txt b/remappings.txt index 0bbe91e..dcadbfe 100644 --- a/remappings.txt +++ b/remappings.txt @@ -3,5 +3,4 @@ forge-gas-snapshot/=lib/v4-core/lib/forge-gas-snapshot/src/ forge-std/=lib/v4-core/lib/forge-std/src/ permit2/=lib/v4-periphery/lib/permit2/ solmate/=lib/v4-core/lib/solmate/ -v4-core/=lib/v4-core/ v4-periphery/=lib/v4-periphery/ diff --git a/script/00_Counter.s.sol b/script/00_Counter.s.sol index 10680c2..171d5a7 100644 --- a/script/00_Counter.s.sol +++ b/script/00_Counter.s.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.19; import "forge-std/Script.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {Constants} from "./base/Constants.sol"; import {Counter} from "../src/Counter.sol"; diff --git a/script/01_CreatePoolAndMintLiquidity.s.sol b/script/01_CreatePoolAndMintLiquidity.s.sol index 848d183..0ad44f1 100644 --- a/script/01_CreatePoolAndMintLiquidity.s.sol +++ b/script/01_CreatePoolAndMintLiquidity.s.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.20; import "forge-std/Script.sol"; import {PositionManager} from "v4-periphery/src/PositionManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; import {Actions} from "v4-periphery/src/libraries/Actions.sol"; -import {LiquidityAmounts} from "v4-core/test/utils/LiquidityAmounts.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; +import {LiquidityAmounts} from "@uniswap/v4-core/test/utils/LiquidityAmounts.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; import {IERC20} from "forge-std/interfaces/IERC20.sol"; import {Constants} from "./base/Constants.sol"; diff --git a/script/01a_CreatePoolOnly.s.sol b/script/01a_CreatePoolOnly.s.sol index 8179789..1227d3c 100644 --- a/script/01a_CreatePoolOnly.s.sol +++ b/script/01a_CreatePoolOnly.s.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.20; import "forge-std/Script.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; import {Constants} from "./base/Constants.sol"; import {Config} from "./base/Config.sol"; diff --git a/script/02_AddLiquidity.s.sol b/script/02_AddLiquidity.s.sol index 34733d1..74b44b3 100644 --- a/script/02_AddLiquidity.s.sol +++ b/script/02_AddLiquidity.s.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.20; import "forge-std/Script.sol"; import "forge-std/console.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; -import {LiquidityAmounts} from "v4-core/test/utils/LiquidityAmounts.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; -import {StateLibrary} from "v4-core/src/libraries/StateLibrary.sol"; +import {LiquidityAmounts} from "@uniswap/v4-core/test/utils/LiquidityAmounts.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; +import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol"; import {EasyPosm} from "../test/utils/EasyPosm.sol"; import {Constants} from "./base/Constants.sol"; diff --git a/script/03_Swap.s.sol b/script/03_Swap.s.sol index e9217d2..dfb28b5 100644 --- a/script/03_Swap.s.sol +++ b/script/03_Swap.s.sol @@ -2,11 +2,11 @@ pragma solidity ^0.8.20; import "forge-std/Script.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {PoolSwapTest} from "v4-core/src/test/PoolSwapTest.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {PoolSwapTest} from "@uniswap/v4-core/src/test/PoolSwapTest.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; import {Constants} from "./base/Constants.sol"; import {Config} from "./base/Config.sol"; diff --git a/script/Anvil.s.sol b/script/Anvil.s.sol index 4ed0c03..fa58d4a 100644 --- a/script/Anvil.s.sol +++ b/script/Anvil.s.sol @@ -2,18 +2,18 @@ pragma solidity ^0.8.19; import "forge-std/Script.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {PoolManager} from "v4-core/src/PoolManager.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolModifyLiquidityTest} from "v4-core/src/test/PoolModifyLiquidityTest.sol"; -import {PoolSwapTest} from "v4-core/src/test/PoolSwapTest.sol"; -import {PoolDonateTest} from "v4-core/src/test/PoolDonateTest.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {PoolManager} from "@uniswap/v4-core/src/PoolManager.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolModifyLiquidityTest} from "@uniswap/v4-core/src/test/PoolModifyLiquidityTest.sol"; +import {PoolSwapTest} from "@uniswap/v4-core/src/test/PoolSwapTest.sol"; +import {PoolDonateTest} from "@uniswap/v4-core/src/test/PoolDonateTest.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; -import {Constants} from "v4-core/src/../test/utils/Constants.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; +import {Constants} from "@uniswap/v4-core/src/../test/utils/Constants.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; import {Counter} from "../src/Counter.sol"; import {HookMiner} from "../test/utils/HookMiner.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; diff --git a/script/base/Config.sol b/script/base/Config.sol index 05c6583..4a88188 100644 --- a/script/base/Config.sol +++ b/script/base/Config.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.19; import {IERC20} from "forge-std/interfaces/IERC20.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {Currency} from "v4-core/src/types/Currency.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; /// @notice Shared configuration between scripts contract Config { diff --git a/script/base/Constants.sol b/script/base/Constants.sol index 808722b..972adec 100644 --- a/script/base/Constants.sol +++ b/script/base/Constants.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {PositionManager} from "v4-periphery/src/PositionManager.sol"; import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"; diff --git a/src/Counter.sol b/src/Counter.sol index 92ad5d0..065de5a 100644 --- a/src/Counter.sol +++ b/src/Counter.sol @@ -3,12 +3,12 @@ pragma solidity ^0.8.24; import {BaseHook} from "v4-periphery/src/base/hooks/BaseHook.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {PoolId, PoolIdLibrary} from "v4-core/src/types/PoolId.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {BeforeSwapDelta, BeforeSwapDeltaLibrary} from "v4-core/src/types/BeforeSwapDelta.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {PoolId, PoolIdLibrary} from "@uniswap/v4-core/src/types/PoolId.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {BeforeSwapDelta, BeforeSwapDeltaLibrary} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol"; contract Counter is BaseHook { using PoolIdLibrary for PoolKey; diff --git a/test/Counter.t.sol b/test/Counter.t.sol index 4f13acb..b0e14f0 100644 --- a/test/Counter.t.sol +++ b/test/Counter.t.sol @@ -2,19 +2,19 @@ pragma solidity ^0.8.24; import "forge-std/Test.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {PoolId, PoolIdLibrary} from "v4-core/src/types/PoolId.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; -import {PoolSwapTest} from "v4-core/src/test/PoolSwapTest.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {PoolId, PoolIdLibrary} from "@uniswap/v4-core/src/types/PoolId.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; +import {PoolSwapTest} from "@uniswap/v4-core/src/test/PoolSwapTest.sol"; import {Counter} from "../src/Counter.sol"; -import {StateLibrary} from "v4-core/src/libraries/StateLibrary.sol"; +import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol"; -import {LiquidityAmounts} from "v4-core/test/utils/LiquidityAmounts.sol"; +import {LiquidityAmounts} from "@uniswap/v4-core/test/utils/LiquidityAmounts.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; import {EasyPosm} from "./utils/EasyPosm.sol"; import {Fixtures} from "./utils/Fixtures.sol"; diff --git a/test/custom-accounting/ExampleHook.sol b/test/custom-accounting/ExampleHook.sol index 1c5fd1b..a734a46 100644 --- a/test/custom-accounting/ExampleHook.sol +++ b/test/custom-accounting/ExampleHook.sol @@ -1,16 +1,16 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.20; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {BeforeSwapDelta, toBeforeSwapDelta} from "v4-core/src/types/BeforeSwapDelta.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {Currency} from "v4-core/src/types/Currency.sol"; -import {CurrencySettler} from "v4-core/test/utils/CurrencySettler.sol"; -import {BaseTestHooks} from "v4-core/src/test/BaseTestHooks.sol"; -import {Currency} from "v4-core/src/types/Currency.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {BeforeSwapDelta, toBeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; +import {CurrencySettler} from "@uniswap/v4-core/test/utils/CurrencySettler.sol"; +import {BaseTestHooks} from "@uniswap/v4-core/src/test/BaseTestHooks.sol"; +import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; contract ExampleHook is BaseTestHooks { using Hooks for IHooks; diff --git a/test/custom-accounting/ExampleHook.t.sol b/test/custom-accounting/ExampleHook.t.sol index f1d6452..93c9330 100644 --- a/test/custom-accounting/ExampleHook.t.sol +++ b/test/custom-accounting/ExampleHook.t.sol @@ -2,15 +2,15 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Deployers} from "v4-core/test/utils/Deployers.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {PoolSwapTest} from "v4-core/src/test/PoolSwapTest.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {Currency} from "v4-core/src/types/Currency.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {SafeCast} from "v4-core/src/libraries/SafeCast.sol"; -import {Constants} from "v4-core/test/utils/Constants.sol"; +import {Deployers} from "@uniswap/v4-core/test/utils/Deployers.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {PoolSwapTest} from "@uniswap/v4-core/src/test/PoolSwapTest.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol"; +import {Constants} from "@uniswap/v4-core/test/utils/Constants.sol"; import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; import {ExampleHook} from "./ExampleHook.sol"; diff --git a/test/utils/EasyPosm.sol b/test/utils/EasyPosm.sol index a04bb1b..076309b 100644 --- a/test/utils/EasyPosm.sol +++ b/test/utils/EasyPosm.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later pragma solidity ^0.8.21; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {BalanceDelta, toBalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {Currency, CurrencyLibrary} from "v4-core/src/types/Currency.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {BalanceDelta, toBalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; import {Actions} from "v4-periphery/src/libraries/Actions.sol"; -import {SafeCast} from "v4-core/src/libraries/SafeCast.sol"; +import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol"; import {PositionInfo, PositionInfoLibrary} from "v4-periphery/src/libraries/PositionInfoLibrary.sol"; /// @title Easy Position Manager diff --git a/test/utils/EasyPosm.t.sol b/test/utils/EasyPosm.t.sol index f454111..47d819e 100644 --- a/test/utils/EasyPosm.t.sol +++ b/test/utils/EasyPosm.t.sol @@ -2,16 +2,16 @@ pragma solidity ^0.8.24; import "forge-std/Test.sol"; -import {IHooks} from "v4-core/src/interfaces/IHooks.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {TickMath} from "v4-core/src/libraries/TickMath.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {PoolId, PoolIdLibrary} from "v4-core/src/types/PoolId.sol"; -import {CurrencyLibrary, Currency} from "v4-core/src/types/Currency.sol"; -import {StateLibrary} from "v4-core/src/libraries/StateLibrary.sol"; -import {LiquidityAmounts} from "v4-core/test/utils/LiquidityAmounts.sol"; +import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {PoolId, PoolIdLibrary} from "@uniswap/v4-core/src/types/PoolId.sol"; +import {CurrencyLibrary, Currency} from "@uniswap/v4-core/src/types/Currency.sol"; +import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol"; +import {LiquidityAmounts} from "@uniswap/v4-core/test/utils/LiquidityAmounts.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; import {EasyPosm} from "./EasyPosm.sol"; diff --git a/test/utils/Fixtures.sol b/test/utils/Fixtures.sol index ca61acc..85224a7 100644 --- a/test/utils/Fixtures.sol +++ b/test/utils/Fixtures.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.24; -import {Currency} from "v4-core/src/types/Currency.sol"; -import {BalanceDelta} from "v4-core/src/types/BalanceDelta.sol"; -import {IPoolManager} from "v4-core/src/interfaces/IPoolManager.sol"; +import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; +import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; +import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {PositionManager} from "v4-periphery/src/PositionManager.sol"; import {IPositionManager} from "v4-periphery/src/interfaces/IPositionManager.sol"; -import {Hooks} from "v4-core/src/libraries/Hooks.sol"; -import {PoolKey} from "v4-core/src/types/PoolKey.sol"; -import {Deployers} from "v4-core/test/utils/Deployers.sol"; +import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol"; +import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; +import {Deployers} from "@uniswap/v4-core/test/utils/Deployers.sol"; import {IERC20} from "forge-std/interfaces/IERC20.sol"; import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"; import {DeployPermit2} from "./forks/DeployPermit2.sol";