From f8767add3e27c5779444b77e1b978e89bb26214d Mon Sep 17 00:00:00 2001 From: dianakocsis Date: Tue, 3 Dec 2024 16:18:34 -0500 Subject: [PATCH] move file --- contracts/UniversalRouter.sol | 2 +- .../{base/RouterImmutables.sol => types/RouterParameters.sol} | 0 script/DeployUniversalRouter.s.sol | 2 +- script/deployParameters/DeployArbitrum.s.sol | 2 +- script/deployParameters/DeployArbitrumGoerli.s.sol | 2 +- script/deployParameters/DeployAvalanche.s.sol | 2 +- script/deployParameters/DeployBSC.s.sol | 2 +- script/deployParameters/DeployBase.s.sol | 2 +- script/deployParameters/DeployBaseGoerli.s.sol | 2 +- script/deployParameters/DeployBaseSepolia.s.sol | 2 +- script/deployParameters/DeployBlast.s.sol | 2 +- script/deployParameters/DeployCelo.s.sol | 2 +- script/deployParameters/DeployCeloAlfajores.s.sol | 2 +- script/deployParameters/DeployGoerli.s.sol | 2 +- script/deployParameters/DeployMainnet.s.sol | 2 +- script/deployParameters/DeployOPSepolia.s.sol | 2 +- script/deployParameters/DeployOptimism.s.sol | 2 +- script/deployParameters/DeployOptimismGoerli.s.sol | 2 +- script/deployParameters/DeployPolygon.s.sol | 2 +- script/deployParameters/DeployPolygonMumbai.s.sol | 2 +- script/deployParameters/DeploySepolia.s.sol | 2 +- script/deployParameters/DeployUnichainSepolia.s.sol | 2 +- test/foundry-tests/UniswapV2.t.sol | 2 +- test/foundry-tests/UniversalRouter.t.sol | 2 +- 24 files changed, 23 insertions(+), 23 deletions(-) rename contracts/{base/RouterImmutables.sol => types/RouterParameters.sol} (100%) diff --git a/contracts/UniversalRouter.sol b/contracts/UniversalRouter.sol index d03bf0ca4..9f5929cda 100644 --- a/contracts/UniversalRouter.sol +++ b/contracts/UniversalRouter.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.24; // Command implementations import {Dispatcher} from './base/Dispatcher.sol'; -import {RouterParameters} from './base/RouterImmutables.sol'; +import {RouterParameters} from './types/RouterParameters.sol'; import {PaymentsImmutables, PaymentsParameters} from './modules/PaymentsImmutables.sol'; import {UniswapImmutables, UniswapParameters} from './modules/uniswap/UniswapImmutables.sol'; import {V4SwapRouter} from './modules/uniswap/v4/V4SwapRouter.sol'; diff --git a/contracts/base/RouterImmutables.sol b/contracts/types/RouterParameters.sol similarity index 100% rename from contracts/base/RouterImmutables.sol rename to contracts/types/RouterParameters.sol diff --git a/script/DeployUniversalRouter.s.sol b/script/DeployUniversalRouter.s.sol index a66999057..2a438db51 100644 --- a/script/DeployUniversalRouter.s.sol +++ b/script/DeployUniversalRouter.s.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.15; import 'forge-std/console2.sol'; import 'forge-std/Script.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; import {UnsupportedProtocol} from 'contracts/deploy/UnsupportedProtocol.sol'; import {UniversalRouter} from 'contracts/UniversalRouter.sol'; diff --git a/script/deployParameters/DeployArbitrum.s.sol b/script/deployParameters/DeployArbitrum.s.sol index 98658ba5f..2769b4f90 100644 --- a/script/deployParameters/DeployArbitrum.s.sol +++ b/script/deployParameters/DeployArbitrum.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployArbitrum is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployArbitrumGoerli.s.sol b/script/deployParameters/DeployArbitrumGoerli.s.sol index ed2683d1f..d4e730f16 100644 --- a/script/deployParameters/DeployArbitrumGoerli.s.sol +++ b/script/deployParameters/DeployArbitrumGoerli.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployArbitrumGoerli is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployAvalanche.s.sol b/script/deployParameters/DeployAvalanche.s.sol index 2a4a519c7..cc0c2522a 100644 --- a/script/deployParameters/DeployAvalanche.s.sol +++ b/script/deployParameters/DeployAvalanche.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployAvalanche is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployBSC.s.sol b/script/deployParameters/DeployBSC.s.sol index 4113455a2..0ed8cd2d3 100644 --- a/script/deployParameters/DeployBSC.s.sol +++ b/script/deployParameters/DeployBSC.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployBSC is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployBase.s.sol b/script/deployParameters/DeployBase.s.sol index e8b1424d3..b7720be0e 100644 --- a/script/deployParameters/DeployBase.s.sol +++ b/script/deployParameters/DeployBase.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployBase is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployBaseGoerli.s.sol b/script/deployParameters/DeployBaseGoerli.s.sol index f0274d2ed..2a3245fcb 100644 --- a/script/deployParameters/DeployBaseGoerli.s.sol +++ b/script/deployParameters/DeployBaseGoerli.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployBaseGoerli is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployBaseSepolia.s.sol b/script/deployParameters/DeployBaseSepolia.s.sol index 8e9dd399b..6831fd35c 100644 --- a/script/deployParameters/DeployBaseSepolia.s.sol +++ b/script/deployParameters/DeployBaseSepolia.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.26; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployBaseSepolia is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployBlast.s.sol b/script/deployParameters/DeployBlast.s.sol index 6f6238ef1..94cd248eb 100644 --- a/script/deployParameters/DeployBlast.s.sol +++ b/script/deployParameters/DeployBlast.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployBlast is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployCelo.s.sol b/script/deployParameters/DeployCelo.s.sol index f83958f03..90fe164c5 100644 --- a/script/deployParameters/DeployCelo.s.sol +++ b/script/deployParameters/DeployCelo.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployCelo is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployCeloAlfajores.s.sol b/script/deployParameters/DeployCeloAlfajores.s.sol index 0b4b7de49..90d975247 100644 --- a/script/deployParameters/DeployCeloAlfajores.s.sol +++ b/script/deployParameters/DeployCeloAlfajores.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployCeloAlfajores is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployGoerli.s.sol b/script/deployParameters/DeployGoerli.s.sol index 4c826b839..9956863ba 100644 --- a/script/deployParameters/DeployGoerli.s.sol +++ b/script/deployParameters/DeployGoerli.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployGoerli is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployMainnet.s.sol b/script/deployParameters/DeployMainnet.s.sol index 03908e65e..9cbf20b75 100644 --- a/script/deployParameters/DeployMainnet.s.sol +++ b/script/deployParameters/DeployMainnet.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployMainnet is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployOPSepolia.s.sol b/script/deployParameters/DeployOPSepolia.s.sol index dbaa012f2..867ad8cda 100644 --- a/script/deployParameters/DeployOPSepolia.s.sol +++ b/script/deployParameters/DeployOPSepolia.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.26; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployOPSepolia is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployOptimism.s.sol b/script/deployParameters/DeployOptimism.s.sol index 708927c58..106bb5ac2 100644 --- a/script/deployParameters/DeployOptimism.s.sol +++ b/script/deployParameters/DeployOptimism.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployOptimism is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployOptimismGoerli.s.sol b/script/deployParameters/DeployOptimismGoerli.s.sol index 84f2c180f..6c5de8e5d 100644 --- a/script/deployParameters/DeployOptimismGoerli.s.sol +++ b/script/deployParameters/DeployOptimismGoerli.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployOptimismGoerli is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployPolygon.s.sol b/script/deployParameters/DeployPolygon.s.sol index 29aa5a209..7ea72e8c3 100644 --- a/script/deployParameters/DeployPolygon.s.sol +++ b/script/deployParameters/DeployPolygon.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployPolygon is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployPolygonMumbai.s.sol b/script/deployParameters/DeployPolygonMumbai.s.sol index 6b0ff0607..885b06ae9 100644 --- a/script/deployParameters/DeployPolygonMumbai.s.sol +++ b/script/deployParameters/DeployPolygonMumbai.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployPolygonMumbai is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeploySepolia.s.sol b/script/deployParameters/DeploySepolia.s.sol index 008b939e9..e18f7cf66 100644 --- a/script/deployParameters/DeploySepolia.s.sol +++ b/script/deployParameters/DeploySepolia.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.15; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeploySepolia is DeployUniversalRouter { function setUp() public override { diff --git a/script/deployParameters/DeployUnichainSepolia.s.sol b/script/deployParameters/DeployUnichainSepolia.s.sol index 4cb68bf73..28be2663b 100644 --- a/script/deployParameters/DeployUnichainSepolia.s.sol +++ b/script/deployParameters/DeployUnichainSepolia.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.26; import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol'; -import {RouterParameters} from 'contracts/base/RouterImmutables.sol'; +import {RouterParameters} from 'contracts/types/RouterParameters.sol'; contract DeployUnichainSepolia is DeployUniversalRouter { function setUp() public override { diff --git a/test/foundry-tests/UniswapV2.t.sol b/test/foundry-tests/UniswapV2.t.sol index 14600f36c..8642312c4 100644 --- a/test/foundry-tests/UniswapV2.t.sol +++ b/test/foundry-tests/UniswapV2.t.sol @@ -10,7 +10,7 @@ import {UniversalRouter} from '../../contracts/UniversalRouter.sol'; import {Payments} from '../../contracts/modules/Payments.sol'; import {ActionConstants} from '@uniswap/v4-periphery/src/libraries/ActionConstants.sol'; import {Commands} from '../../contracts/libraries/Commands.sol'; -import {RouterParameters} from '../../contracts/base/RouterImmutables.sol'; +import {RouterParameters} from '../../contracts/types/RouterParameters.sol'; abstract contract UniswapV2Test is Test { address constant RECIPIENT = address(10); diff --git a/test/foundry-tests/UniversalRouter.t.sol b/test/foundry-tests/UniversalRouter.t.sol index 51b67b0f9..1cf49a99e 100644 --- a/test/foundry-tests/UniversalRouter.t.sol +++ b/test/foundry-tests/UniversalRouter.t.sol @@ -8,7 +8,7 @@ import {Constants} from '../../contracts/libraries/Constants.sol'; import {Commands} from '../../contracts/libraries/Commands.sol'; import {MockERC20} from './mock/MockERC20.sol'; import {ExampleModule} from '../../contracts/test/ExampleModule.sol'; -import {RouterParameters} from '../../contracts/base/RouterImmutables.sol'; +import {RouterParameters} from '../../contracts/types/RouterParameters.sol'; import {ERC20} from 'solmate/src/tokens/ERC20.sol'; import 'permit2/src/interfaces/IAllowanceTransfer.sol'; import {IERC165} from '@openzeppelin/contracts/utils/introspection/IERC165.sol';