From 0eaeb46983fa41f13c35a03107c4f5f51b55d94e Mon Sep 17 00:00:00 2001 From: Ben Sparks <52714090+BenSparksCode@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:40:16 +0200 Subject: [PATCH 1/2] chore: change Simulator imports to absolute path --- src/contracts/helpers/Simulator.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/contracts/helpers/Simulator.sol b/src/contracts/helpers/Simulator.sol index af3620bd7..34d9f3f33 100644 --- a/src/contracts/helpers/Simulator.sol +++ b/src/contracts/helpers/Simulator.sol @@ -1,19 +1,19 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import { IAtlas } from "../interfaces/IAtlas.sol"; +import { IAtlas } from "src/contracts/interfaces/IAtlas.sol"; import { AtlasErrors } from "src/contracts/types/AtlasErrors.sol"; import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol"; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/LockTypes.sol"; -import "../types/DAppOperation.sol"; -import "../types/ConfigTypes.sol"; -import "../types/ValidCalls.sol"; -import "../types/EscrowTypes.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/LockTypes.sol"; +import "src/contracts/types/DAppOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; +import "src/contracts/types/ValidCalls.sol"; +import "src/contracts/types/EscrowTypes.sol"; import { Result } from "src/contracts/interfaces/ISimulator.sol"; From 120b911a0813406075dd734f1bfd6404157fac6b Mon Sep 17 00:00:00 2001 From: Ben Sparks <52714090+BenSparksCode@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:46:32 +0200 Subject: [PATCH 2/2] chore: make all imports absolute path --- src/contracts/atlas/Atlas.sol | 3 +-- src/contracts/atlas/Escrow.sol | 2 +- src/contracts/dapp/ControlTemplate.sol | 6 +++--- src/contracts/helpers/Sorter.sol | 17 +++++++++-------- src/contracts/helpers/TxBuilder.sol | 18 +++++++++--------- .../interfaces/IAtlasVerification.sol | 12 ++++++------ src/contracts/interfaces/IDAppControl.sol | 6 +++--- .../interfaces/IExecutionEnvironment.sol | 8 ++++---- src/contracts/interfaces/ISimulator.sol | 6 +++--- src/contracts/libraries/CallBits.sol | 4 ++-- src/contracts/solver/src/TestSolver.sol | 2 +- src/contracts/solver/src/TestSolverExPost.sol | 2 +- test/helpers/DummyDAppControlBuilder.sol | 2 +- test/libraries/CallBits.t.sol | 2 +- test/libraries/CallVerification.t.sol | 2 +- test/libraries/SafetyBits.t.sol | 2 +- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/contracts/atlas/Atlas.sol b/src/contracts/atlas/Atlas.sol index e709fa2fb..c17d08258 100644 --- a/src/contracts/atlas/Atlas.sol +++ b/src/contracts/atlas/Atlas.sol @@ -4,8 +4,6 @@ pragma solidity 0.8.25; import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol"; import { LibSort } from "solady/utils/LibSort.sol"; -import { IDAppControl } from "../interfaces/IDAppControl.sol"; - import { Escrow } from "./Escrow.sol"; import { Factory } from "./Factory.sol"; @@ -19,6 +17,7 @@ import "src/contracts/types/ValidCalls.sol"; import { CallBits } from "src/contracts/libraries/CallBits.sol"; import { SafetyBits } from "src/contracts/libraries/SafetyBits.sol"; import { IL2GasCalculator } from "src/contracts/interfaces/IL2GasCalculator.sol"; +import { IDAppControl } from "src/contracts/interfaces/IDAppControl.sol"; /// @title Atlas V1 /// @author FastLane Labs diff --git a/src/contracts/atlas/Escrow.sol b/src/contracts/atlas/Escrow.sol index 27c633fbf..47ce9a5ec 100644 --- a/src/contracts/atlas/Escrow.sol +++ b/src/contracts/atlas/Escrow.sol @@ -6,7 +6,7 @@ import { IExecutionEnvironment } from "src/contracts/interfaces/IExecutionEnviro import { IAtlas } from "src/contracts/interfaces/IAtlas.sol"; import { ISolverContract } from "src/contracts/interfaces/ISolverContract.sol"; import { IAtlasVerification } from "src/contracts/interfaces/IAtlasVerification.sol"; -import { IDAppControl } from "../interfaces/IDAppControl.sol"; +import { IDAppControl } from "src/contracts/interfaces/IDAppControl.sol"; import { SafeCall } from "src/contracts/libraries/SafeCall/SafeCall.sol"; import { EscrowBits } from "src/contracts/libraries/EscrowBits.sol"; diff --git a/src/contracts/dapp/ControlTemplate.sol b/src/contracts/dapp/ControlTemplate.sol index 2d76b2126..df402abcf 100644 --- a/src/contracts/dapp/ControlTemplate.sol +++ b/src/contracts/dapp/ControlTemplate.sol @@ -1,9 +1,9 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; import { AtlasErrors } from "src/contracts/types/AtlasErrors.sol"; abstract contract DAppControlTemplate { diff --git a/src/contracts/helpers/Sorter.sol b/src/contracts/helpers/Sorter.sol index 60225cc27..face331c4 100644 --- a/src/contracts/helpers/Sorter.sol +++ b/src/contracts/helpers/Sorter.sol @@ -1,17 +1,18 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import { IAtlas } from "../interfaces/IAtlas.sol"; -import { IDAppControl } from "../interfaces/IDAppControl.sol"; +import { IAtlas } from "src/contracts/interfaces/IAtlas.sol"; +import { IDAppControl } from "src/contracts/interfaces/IDAppControl.sol"; +import { IAtlasVerification } from "src/contracts/interfaces/IAtlasVerification.sol"; + import { CallBits } from "src/contracts/libraries/CallBits.sol"; import { AccountingMath } from "src/contracts/libraries/AccountingMath.sol"; -import { CallVerification } from "../libraries/CallVerification.sol"; -import { IAtlasVerification } from "../interfaces/IAtlasVerification.sol"; -import { AtlasConstants } from "../types/AtlasConstants.sol"; +import { CallVerification } from "src/contracts/libraries/CallVerification.sol"; +import { AtlasConstants } from "src/contracts/types/AtlasConstants.sol"; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; contract Sorter is AtlasConstants { using CallBits for uint32; diff --git a/src/contracts/helpers/TxBuilder.sol b/src/contracts/helpers/TxBuilder.sol index dea57c90b..3e70fdc2e 100644 --- a/src/contracts/helpers/TxBuilder.sol +++ b/src/contracts/helpers/TxBuilder.sol @@ -1,17 +1,17 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.25; -import { IDAppControl } from "../interfaces/IDAppControl.sol"; -import { IAtlas } from "../interfaces/IAtlas.sol"; -import { IAtlasVerification } from "../interfaces/IAtlasVerification.sol"; +import { IDAppControl } from "src/contracts/interfaces/IDAppControl.sol"; +import { IAtlas } from "src/contracts/interfaces/IAtlas.sol"; +import { IAtlasVerification } from "src/contracts/interfaces/IAtlasVerification.sol"; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; -import "../types/DAppOperation.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; +import "src/contracts/types/DAppOperation.sol"; -import { CallVerification } from "../libraries/CallVerification.sol"; -import { CallBits } from "../libraries/CallBits.sol"; +import { CallVerification } from "src/contracts/libraries/CallVerification.sol"; +import { CallBits } from "src/contracts/libraries/CallBits.sol"; import "forge-std/Test.sol"; diff --git a/src/contracts/interfaces/IAtlasVerification.sol b/src/contracts/interfaces/IAtlasVerification.sol index ed4f050f5..cdd1eef7a 100644 --- a/src/contracts/interfaces/IAtlasVerification.sol +++ b/src/contracts/interfaces/IAtlasVerification.sol @@ -1,12 +1,12 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; -import "../types/DAppOperation.sol"; -import "../types/SolverOperation.sol"; -import "../types/EscrowTypes.sol"; -import "../types/ValidCalls.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; +import "src/contracts/types/DAppOperation.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/EscrowTypes.sol"; +import "src/contracts/types/ValidCalls.sol"; interface IAtlasVerification { // AtlasVerification.sol diff --git a/src/contracts/interfaces/IDAppControl.sol b/src/contracts/interfaces/IDAppControl.sol index e3be1417f..25f699e85 100644 --- a/src/contracts/interfaces/IDAppControl.sol +++ b/src/contracts/interfaces/IDAppControl.sol @@ -1,9 +1,9 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import "../types/UserOperation.sol"; -import "../types/SolverOperation.sol"; -import "../types/ConfigTypes.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; interface IDAppControl { function preOpsCall(UserOperation calldata userOp) external payable returns (bytes memory); diff --git a/src/contracts/interfaces/IExecutionEnvironment.sol b/src/contracts/interfaces/IExecutionEnvironment.sol index 9dcdee96a..17d7ecb55 100644 --- a/src/contracts/interfaces/IExecutionEnvironment.sol +++ b/src/contracts/interfaces/IExecutionEnvironment.sol @@ -1,10 +1,10 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; -import "../types/EscrowTypes.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; +import "src/contracts/types/EscrowTypes.sol"; interface IExecutionEnvironment { function preOpsWrapper(UserOperation calldata userOp) external returns (bytes memory preOpsData); diff --git a/src/contracts/interfaces/ISimulator.sol b/src/contracts/interfaces/ISimulator.sol index 97f5852f8..8a92a2ce1 100644 --- a/src/contracts/interfaces/ISimulator.sol +++ b/src/contracts/interfaces/ISimulator.sol @@ -1,9 +1,9 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import "../types/SolverOperation.sol"; -import "../types/UserOperation.sol"; -import "../types/ConfigTypes.sol"; +import "src/contracts/types/SolverOperation.sol"; +import "src/contracts/types/UserOperation.sol"; +import "src/contracts/types/ConfigTypes.sol"; import "src/contracts/types/DAppOperation.sol"; enum Result { diff --git a/src/contracts/libraries/CallBits.sol b/src/contracts/libraries/CallBits.sol index f5c1d0a6e..62b46a465 100644 --- a/src/contracts/libraries/CallBits.sol +++ b/src/contracts/libraries/CallBits.sol @@ -1,9 +1,9 @@ //SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.25; -import { IDAppControl } from "../interfaces/IDAppControl.sol"; +import { IDAppControl } from "src/contracts/interfaces/IDAppControl.sol"; -import "../types/ConfigTypes.sol"; +import "src/contracts/types/ConfigTypes.sol"; library CallBits { uint32 internal constant _ONE = uint32(1); diff --git a/src/contracts/solver/src/TestSolver.sol b/src/contracts/solver/src/TestSolver.sol index 9eb86bce0..0e9a22475 100644 --- a/src/contracts/solver/src/TestSolver.sol +++ b/src/contracts/solver/src/TestSolver.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.25; -import { SolverBase } from "../SolverBase.sol"; +import { SolverBase } from "src/contracts/solver/SolverBase.sol"; // Flashbots opensource repo import { BlindBackrun } from "./BlindBackrun/BlindBackrun.sol"; diff --git a/src/contracts/solver/src/TestSolverExPost.sol b/src/contracts/solver/src/TestSolverExPost.sol index 9ae762207..2bf3cd0eb 100644 --- a/src/contracts/solver/src/TestSolverExPost.sol +++ b/src/contracts/solver/src/TestSolverExPost.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.25; import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol"; import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; -import { SolverBase } from "../SolverBase.sol"; +import { SolverBase } from "src/contracts/solver/SolverBase.sol"; // Flashbots opensource repo import { BlindBackrun } from "./BlindBackrun/BlindBackrun.sol"; diff --git a/test/helpers/DummyDAppControlBuilder.sol b/test/helpers/DummyDAppControlBuilder.sol index 5aa25c469..d9eaafd23 100644 --- a/test/helpers/DummyDAppControlBuilder.sol +++ b/test/helpers/DummyDAppControlBuilder.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.25; -import { DummyDAppControl } from "../base/DummyDAppControl.sol"; +import { DummyDAppControl } from "test/base/DummyDAppControl.sol"; import { CallConfig } from "src/contracts/types/ConfigTypes.sol"; import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol"; diff --git a/test/libraries/CallBits.t.sol b/test/libraries/CallBits.t.sol index 3f84e2992..ffc093cad 100644 --- a/test/libraries/CallBits.t.sol +++ b/test/libraries/CallBits.t.sol @@ -5,7 +5,7 @@ import "forge-std/Test.sol"; import { CallBits } from "src/contracts/libraries/CallBits.sol"; import "src/contracts/types/UserOperation.sol"; -import "../base/TestUtils.sol"; +import "test/base/TestUtils.sol"; contract CallBitsTest is Test { using CallBits for uint32; diff --git a/test/libraries/CallVerification.t.sol b/test/libraries/CallVerification.t.sol index 73e95bc80..665224198 100644 --- a/test/libraries/CallVerification.t.sol +++ b/test/libraries/CallVerification.t.sol @@ -5,7 +5,7 @@ import "forge-std/Test.sol"; import { CallVerification } from "src/contracts/libraries/CallVerification.sol"; import "src/contracts/types/UserOperation.sol"; -import "../base/TestUtils.sol"; +import "test/base/TestUtils.sol"; contract CallVerificationTest is Test { using CallVerification for UserOperation; diff --git a/test/libraries/SafetyBits.t.sol b/test/libraries/SafetyBits.t.sol index 26b7650f4..52ba6c979 100644 --- a/test/libraries/SafetyBits.t.sol +++ b/test/libraries/SafetyBits.t.sol @@ -5,7 +5,7 @@ import "forge-std/Test.sol"; import { SafetyBits } from "src/contracts/libraries/SafetyBits.sol"; import "src/contracts/types/LockTypes.sol"; -import "../base/TestUtils.sol"; +import "test/base/TestUtils.sol"; import { CallBits } from "src/contracts/libraries/CallBits.sol";