update v4-periphery, change remapping, and update deploy test (#361)

* update v4-periphery, change remapping, and update deploy test

* make immutables public

* little fixes

* last one

* make only migrator immutables public

Author: dianakocsis

contracts/base/Dispatcher.sol

@@ -10,7 +10,7 @@ import {V3ToV4Migrator} from '../modules/V3ToV4Migrator.sol';
 import {Callbacks} from '../base/Callbacks.sol';
 import {Commands} from '../libraries/Commands.sol';
 import {LockAndMsgSender} from './LockAndMsgSender.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 import {IAllowanceTransfer} from 'permit2/src/interfaces/IAllowanceTransfer.sol';
 import {IERC721Permit} from '@uniswap/v3-periphery/contracts/interfaces/IERC721Permit.sol';
 import {Constants} from '../libraries/Constants.sol';

contracts/modules/MigratorImmutables.sol

@@ -11,8 +11,9 @@ struct MigratorParameters {
 
 contract MigratorImmutables {
     /// @notice v3PositionManager address
-    INonfungiblePositionManager internal immutable V3_POSITION_MANAGER;
-    IPositionManager internal immutable V4_POSITION_MANAGER;
+    INonfungiblePositionManager public immutable V3_POSITION_MANAGER;
+    /// @notice v4PositionManager address
+    IPositionManager public immutable V4_POSITION_MANAGER;
 
     constructor(MigratorParameters memory params) {
         V3_POSITION_MANAGER = INonfungiblePositionManager(params.v3PositionManager);

contracts/modules/Payments.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.24;
 
 import {Constants} from '../libraries/Constants.sol';
 import {PaymentsImmutables} from '../modules/PaymentsImmutables.sol';
-import {SafeTransferLib} from 'solmate/utils/SafeTransferLib.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {SafeTransferLib} from 'solmate/src/utils/SafeTransferLib.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 /// @title Payments contract
 /// @notice Performs various operations around the payment of ETH and tokens

contracts/modules/uniswap/UniswapImmutables.sol

@@ -9,16 +9,16 @@ struct UniswapParameters {
 }
 
 contract UniswapImmutables {
-    /// @dev The address of UniswapV2Factory
+    /// @notice The address of UniswapV2Factory
     address internal immutable UNISWAP_V2_FACTORY;
 
-    /// @dev The UniswapV2Pair initcodehash
+    /// @notice The UniswapV2Pair initcodehash
     bytes32 internal immutable UNISWAP_V2_PAIR_INIT_CODE_HASH;
 
-    /// @dev The address of UniswapV3Factory
+    /// @notice The address of UniswapV3Factory
     address internal immutable UNISWAP_V3_FACTORY;
 
-    /// @dev The UniswapV3Pool initcodehash
+    /// @notice The UniswapV3Pool initcodehash
     bytes32 internal immutable UNISWAP_V3_POOL_INIT_CODE_HASH;
 
     constructor(UniswapParameters memory params) {

contracts/modules/uniswap/v2/V2SwapRouter.sol

@@ -7,7 +7,7 @@ import {UniswapImmutables} from '../UniswapImmutables.sol';
 import {Payments} from '../../Payments.sol';
 import {Permit2Payments} from '../../Permit2Payments.sol';
 import {Constants} from '../../../libraries/Constants.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 /// @title Router for Uniswap v2 Trades
 abstract contract V2SwapRouter is UniswapImmutables, Permit2Payments {

contracts/modules/uniswap/v3/V3SwapRouter.sol

@@ -10,7 +10,7 @@ import {Constants} from '../../../libraries/Constants.sol';
 import {Permit2Payments} from '../../Permit2Payments.sol';
 import {UniswapImmutables} from '../UniswapImmutables.sol';
 import {Constants} from '../../../libraries/Constants.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 /// @title Router for Uniswap v3 Trades
 abstract contract V3SwapRouter is UniswapImmutables, Permit2Payments, IUniswapV3SwapCallback {

contracts/test/ImportsForTypechain.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import {PositionManager} from '@uniswap/v4-periphery/src/PositionManager.sol';
 import {PoolManager} from '@uniswap/v4-core/src/PoolManager.sol';
-import {ERC721} from 'solmate/tokens/ERC721.sol';
+import {ERC721} from 'solmate/src/tokens/ERC721.sol';
 import {ERC6909} from '@uniswap/v4-core/src/ERC6909.sol';
 
 // this contract only exists to pull PositionManager and PoolManager into the hardhat build pipeline

contracts/test/MintableERC20.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.15;
 
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 contract MintableERC20 is ERC20 {
     constructor(uint256 amountToMint) ERC20('test', 'TEST', 18) {

contracts/test/ReenteringWETH.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.15;
 
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 contract ReenteringWETH is ERC20 {
     error NotAllowedReenter();

lib/v4-periphery

@@ -1,4 +1,4 @@
-solmate/=lib/solmate/src/
+solmate/=lib/solmate/
 permit2/=lib/permit2/
 forge-std/=lib/forge-std/src/
 @openzeppelin/contracts=node_modules/@openzeppelin/contracts

remappings.txt

@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 import 'forge-std/Test.sol';
 import {IPermit2} from 'permit2/src/interfaces/IPermit2.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 import {IUniswapV2Factory} from '@uniswap/v2-core/contracts/interfaces/IUniswapV2Factory.sol';
 import {IUniswapV2Pair} from '@uniswap/v2-core/contracts/interfaces/IUniswapV2Pair.sol';
 import {UniversalRouter} from '../../contracts/UniversalRouter.sol';

test/foundry-tests/UniswapV2.t.sol

@@ -10,7 +10,7 @@ import {MockERC20} from './mock/MockERC20.sol';
 import {Callbacks} from '../../contracts/base/Callbacks.sol';
 import {ExampleModule} from '../../contracts/test/ExampleModule.sol';
 import {RouterParameters} from '../../contracts/base/RouterImmutables.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 import 'permit2/src/interfaces/IAllowanceTransfer.sol';
 import {IERC165} from '@openzeppelin/contracts/utils/introspection/IERC165.sol';
 

test/foundry-tests/UniversalRouter.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.24;
 
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 
 contract MockERC20 is ERC20 {
     constructor() ERC20('TEST', 'test', 18) {}

test/foundry-tests/mock/MockERC20.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.15;
 
 import 'forge-std/Test.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 import {UniswapV2Test} from '../UniswapV2.t.sol';
 
 contract V2DaiWeth is UniswapV2Test {

test/foundry-tests/uniswapTokens/v2DaiWeth.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.15;
 
 import 'forge-std/Test.sol';
-import {ERC20} from 'solmate/tokens/ERC20.sol';
+import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 import {UniswapV2Test} from '../UniswapV2.t.sol';
 
 contract V2WethApe is UniswapV2Test {

test/foundry-tests/uniswapTokens/v2WethApe.t.sol

@@ -8,7 +8,7 @@ import hre from 'hardhat'
 import deployUniversalRouter from './shared/deployUniversalRouter'
 import { findCustomErrorSelector } from './shared/parseEvents'
 import { BigNumber, Contract } from 'ethers'
-import { abi as TOKEN_ABI } from '../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 const { ethers } = hre
 
 describe('Check Ownership', () => {

test/integration-tests/CheckOwnership.test.ts

@@ -3,7 +3,7 @@ import { Pair } from '@uniswap/v2-sdk'
 import { expect } from './shared/expect'
 import { BigNumber, BigNumberish } from 'ethers'
 import { IPermit2, UniversalRouter } from '../../typechain'
-import { abi as TOKEN_ABI } from '../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { resetFork, WETH, DAI, USDC, USDT, PERMIT2 } from './shared/mainnetForkHelpers'
 import {
   ADDRESS_THIS,

test/integration-tests/Uniswap.test.ts

@@ -2,7 +2,7 @@ import { UniversalRouter, ERC20, IWETH9, IPermit2 } from '../../typechain'
 import { Pair } from '@uniswap/v2-sdk'
 import { expect } from './shared/expect'
 import { abi as ROUTER_ABI } from '../../artifacts/contracts/UniversalRouter.sol/UniversalRouter.json'
-import { abi as TOKEN_ABI } from '../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { abi as WETH_ABI } from '../../artifacts/contracts/interfaces/external/IWETH9.sol/IWETH9.json'
 
 import deployUniversalRouter from './shared/deployUniversalRouter'

test/integration-tests/UniversalRouter.test.ts

@@ -1,8 +1,8 @@
 import type { Contract } from '@ethersproject/contracts'
 import { expect } from './shared/expect'
 import { BigNumber } from 'ethers'
-import { UniversalRouter, INonfungiblePositionManager } from '../../typechain'
-import { abi as TOKEN_ABI } from '../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { UniversalRouter, INonfungiblePositionManager, PositionManager } from '../../typechain'
+import { abi as TOKEN_ABI } from '../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { resetFork, WETH, DAI, USDC, V3_NFT_POSITION_MANAGER } from './shared/mainnetForkHelpers'
 import { ZERO_ADDRESS, ALICE_ADDRESS, MAX_UINT, MAX_UINT128 } from './shared/constants'
 import { expandTo18DecimalsBN, expandTo6DecimalsBN } from './shared/helpers'
@@ -26,6 +26,8 @@ describe('V3 to V4 Migration Tests:', () => {
   let usdcContract: Contract
   let planner: RoutePlanner
   let v3NFTPositionManager: INonfungiblePositionManager
+  let v4PositionManagerAddress: string
+  let v4PositionManager: PositionManager
 
   let tokenIdv3: BigNumber
 
@@ -43,6 +45,9 @@ describe('V3 to V4 Migration Tests:', () => {
     usdcContract = new ethers.Contract(USDC.address, TOKEN_ABI, bob)
     v3NFTPositionManager = V3_NFT_POSITION_MANAGER.connect(bob) as INonfungiblePositionManager
     router = (await deployUniversalRouter()) as UniversalRouter
+    v4PositionManagerAddress = await router.V4_POSITION_MANAGER()
+    v4PositionManager = (await ethers.getContractAt('PositionManager', v4PositionManagerAddress)) as PositionManager
+
     planner = new RoutePlanner()
 
     // alice gives bob some tokens

test/integration-tests/V3ToV4Migration.test.ts

@@ -6,7 +6,7 @@ import { ALICE_ADDRESS, DEADLINE } from './../shared/constants'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
 import hre from 'hardhat'
 import deployUniversalRouter from './../shared/deployUniversalRouter'
-import { abi as TOKEN_ABI } from '../../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 const { ethers } = hre
 
 describe('Check Ownership Gas', () => {

test/integration-tests/gas-tests/CheckOwnership.gas.test.ts

@@ -1,6 +1,6 @@
 import type { Contract } from '@ethersproject/contracts'
-import { UniversalRouter } from '../../../typechain'
-import { abi as TOKEN_ABI } from '../../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { UniversalRouter, PositionManager } from '../../../typechain'
+import { abi as TOKEN_ABI } from '../../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { resetFork, DAI, WETH } from '../shared/mainnetForkHelpers'
 import { ALICE_ADDRESS, DEADLINE, ETH_ADDRESS, ONE_PERCENT_BIPS } from '../shared/constants'
 import { expandTo18DecimalsBN } from '../shared/helpers'

test/integration-tests/gas-tests/Payments.gas.test.ts

@@ -19,7 +19,7 @@ import {
 } from '../shared/swapRouter02Helpers'
 import { BigNumber, BigNumberish } from 'ethers'
 import { IPermit2, UniversalRouter } from '../../../typechain'
-import { abi as TOKEN_ABI } from '../../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { approveAndExecuteSwapRouter02, resetFork, WETH, DAI, USDC, USDT, PERMIT2 } from '../shared/mainnetForkHelpers'
 import {
   ADDRESS_THIS,

test/integration-tests/gas-tests/Uniswap.gas.test.ts

@@ -1,7 +1,7 @@
 import { UniversalRouter, IWETH9, ERC20 } from '../../../typechain'
 import { expect } from '../shared/expect'
 import { ALICE_ADDRESS } from '../shared/constants'
-import { abi as TOKEN_ABI } from '../../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { abi as WETH_ABI } from '../../../artifacts/contracts/interfaces/external/IWETH9.sol/IWETH9.json'
 import { resetFork, WETH, DAI } from '../shared/mainnetForkHelpers'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'

test/integration-tests/gas-tests/UniversalRouter.gas.test.ts

@@ -3,7 +3,7 @@ import snapshotGasCost from '@uniswap/snapshot-gas-cost'
 import deployUniversalRouter from '../shared/deployUniversalRouter'
 import { BigNumber } from 'ethers'
 import { UniversalRouter, INonfungiblePositionManager } from '../../../typechain'
-import { abi as TOKEN_ABI } from '../../../artifacts/solmate/tokens/ERC20.sol/ERC20.json'
+import { abi as TOKEN_ABI } from '../../../artifacts/solmate/src/tokens/ERC20.sol/ERC20.json'
 import { resetFork, WETH, DAI, USDC, V3_NFT_POSITION_MANAGER } from '../shared/mainnetForkHelpers'
 import { ALICE_ADDRESS, DEADLINE, MAX_UINT, MAX_UINT128 } from '../shared/constants'
 import { expandTo18DecimalsBN, expandTo6DecimalsBN } from '../shared/helpers'