Skip to content

Commit 277d7b1

Browse files
committed
feat: add elaborate remappings and fix imports
1 parent 58eb1b0 commit 277d7b1

6 files changed

Lines changed: 33 additions & 22 deletions

File tree

remappings.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1-
@uniswap/v4-core/=lib/v4-periphery/lib/v4-core/src/
2-
@uniswap/v4-periphery/=lib/v4-periphery/src/
1+
@ensdomains/=lib/v4-periphery/lib/v4-core/node_modules/@ensdomains/
2+
@openzeppelin/=lib/v4-periphery/lib/v4-core/lib/openzeppelin-contracts/
3+
@uniswap/v4-core/=lib/v4-periphery/lib/v4-core/
4+
ds-test/=lib/v4-periphery/lib/v4-core/lib/forge-std/lib/ds-test/src/
5+
erc4626-tests/=lib/v4-periphery/lib/v4-core/lib/openzeppelin-contracts/lib/erc4626-tests/
6+
forge-gas-snapshot/=lib/v4-periphery/lib/permit2/lib/forge-gas-snapshot/src/
7+
forge-std/=lib/forge-std/src/
8+
hardhat/=lib/v4-periphery/lib/v4-core/node_modules/hardhat/
9+
openzeppelin-contracts/=lib/v4-periphery/lib/v4-core/lib/openzeppelin-contracts/
10+
permit2/=lib/v4-periphery/lib/permit2/
11+
solmate/=lib/v4-periphery/lib/v4-core/lib/solmate/
12+
v4-core/=lib/v4-periphery/lib/v4-core/src/
13+
v4-periphery/=lib/v4-periphery/

src/interfaces/IMultiHookAdapterBase.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4-
import {IPoolManager} from "@uniswap/v4-core/interfaces/IPoolManager.sol";
4+
import {IPoolManager} from "v4-core/interfaces/IPoolManager.sol";
55

66
/// @title IMultiHookAdapterBase
77
/// @notice An interface for the MultiHookAdapterBase contract

src/utils/BaseHookExtension.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// SPDX-License-identifiery: MIT
22
pragma solidity ^0.8.0;
33

4-
import {Hooks} from "@uniswap/v4-core/libraries/Hooks.sol";
4+
import {Hooks} from "v4-core/libraries/Hooks.sol";
55
import {IMultiHookAdapterBase} from "../interfaces/IMultiHookAdapterBase.sol";
6-
import {IHooks} from "@uniswap/v4-core/interfaces/IHooks.sol";
7-
import {BalanceDelta} from "@uniswap/v4-core/types/BalanceDelta.sol";
8-
import {PoolKey} from "@uniswap/v4-core/types/PoolKey.sol";
9-
import {BeforeSwapDelta} from "@uniswap/v4-core/types/BeforeSwapDelta.sol";
6+
import {IHooks} from "v4-core/interfaces/IHooks.sol";
7+
import {BalanceDelta} from "v4-core/types/BalanceDelta.sol";
8+
import {PoolKey} from "v4-core/types/PoolKey.sol";
9+
import {BeforeSwapDelta} from "v4-core/types/BeforeSwapDelta.sol";
1010
import {ImmutableState} from "./ImmutableState.sol";
11-
import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/types/PoolOperation.sol";
11+
import {ModifyLiquidityParams, SwapParams} from "v4-core/types/PoolOperation.sol";
1212

1313
/// @title BaseHookExtension
1414
/// @notice An extension of the original UniswapV4 BaseHook contract purposed for the MultiHookAdapter

test/BaseHookExtension.t.sol

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ pragma solidity ^0.8.0;
44
import {Test} from "forge-std/Test.sol";
55
import {BaseHook} from "../src/utils/BaseHookExtension.sol";
66
import {IMultiHookAdapterBase} from "../src/interfaces/IMultiHookAdapterBase.sol";
7-
import {Hooks} from "@uniswap/v4-core/libraries/Hooks.sol";
8-
import {PoolKey} from "@uniswap/v4-core/types/PoolKey.sol";
9-
import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/types/PoolOperation.sol";
10-
import {BalanceDelta, toBalanceDelta} from "@uniswap/v4-core/types/BalanceDelta.sol";
11-
import {BeforeSwapDelta, toBeforeSwapDelta} from "@uniswap/v4-core/types/BeforeSwapDelta.sol";
12-
import {Currency} from "@uniswap/v4-core/types/Currency.sol";
13-
import {IHooks} from "@uniswap/v4-core/interfaces/IHooks.sol";
7+
import {Hooks} from "v4-core/libraries/Hooks.sol";
8+
import {PoolKey} from "v4-core/types/PoolKey.sol";
9+
import {ModifyLiquidityParams, SwapParams} from "v4-core/types/PoolOperation.sol";
10+
import {BalanceDelta, toBalanceDelta} from "v4-core/types/BalanceDelta.sol";
11+
import {BeforeSwapDelta, toBeforeSwapDelta} from "v4-core/types/BeforeSwapDelta.sol";
12+
import {Currency} from "v4-core/types/Currency.sol";
13+
import {IHooks} from "v4-core/interfaces/IHooks.sol";
1414
import {MockMultiHookAdapter} from "./mocs/MockMultiHookAdapter.sol";
1515
import {MockBaseHook} from "./mocs/MockBaseHookExtension.sol";
1616

test/mocs/MockBaseHookExtension.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
import {BaseHook} from "../../src/utils/BaseHookExtension.sol";
55
import {IMultiHookAdapterBase} from "../../src/interfaces/IMultiHookAdapterBase.sol";
6-
import {Hooks} from "@uniswap/v4-core/libraries/Hooks.sol";
6+
import {Hooks} from "v4-core/libraries/Hooks.sol";
77

88
contract MockBaseHook is BaseHook {
99
constructor(IMultiHookAdapterBase adapter) BaseHook(adapter) {}

test/mocs/MockMultiHookAdapter.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.0;
33

44
import {IMultiHookAdapterBase} from "../../src/interfaces/IMultiHookAdapterBase.sol";
5-
import {IPoolManager} from "@uniswap/v4-core/interfaces/IPoolManager.sol";
6-
import {PoolKey} from "@uniswap/v4-core/types/PoolKey.sol";
7-
import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/types/PoolOperation.sol";
8-
import {BalanceDelta, toBalanceDelta} from "@uniswap/v4-core/types/BalanceDelta.sol";
9-
import {BeforeSwapDelta, toBeforeSwapDelta} from "@uniswap/v4-core/types/BeforeSwapDelta.sol";
5+
import {IPoolManager} from "v4-core/interfaces/IPoolManager.sol";
6+
import {PoolKey} from "v4-core/types/PoolKey.sol";
7+
import {ModifyLiquidityParams, SwapParams} from "v4-core/types/PoolOperation.sol";
8+
import {BalanceDelta, toBalanceDelta} from "v4-core/types/BalanceDelta.sol";
9+
import {BeforeSwapDelta, toBeforeSwapDelta} from "v4-core/types/BeforeSwapDelta.sol";
1010

1111
contract MockMultiHookAdapter is IMultiHookAdapterBase {
1212
IPoolManager public immutable poolManager;

0 commit comments

Comments
 (0)