Merge branch '2023-09-06-deps' of https://github.com/rainprotocol/rai…

…n.orderbook into 2023-09-06-deps
rainlanguage · Sep 7, 2023 · a632436 · a632436
2 parents 15f87fc + 4c75ebe
commit a632436
Show file tree

Hide file tree

Showing 32 changed files with 94 additions and 105 deletions.
diff --git a/.github/workflows/ci-deploy.yaml b/.github/workflows/ci-deploy.yaml
@@ -8,25 +8,19 @@ jobs:
       DEPLOYMENT_KEY: ${{ github.ref == 'refs/heads/main' && secrets.PRIVATE_KEY || secrets.PRIVATE_KEY_DEV }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
           version: nightly
-      - name: Install rain
-        run: nix profile install github:rainprotocol/rain.cli
-      - run: rain --version
       - name: Report public key to make it easy to send funds for deployments
         run: cast wallet address "${DEPLOYMENT_KEY}"
+      - name: Forge shallow install
+        run: forge install --shallow
       - name: Forge deploy contracts to mumbai
         env:
           CI_DEPLOY_RPC_URL: ${{ secrets.CI_DEPLOY_RPC_URL }}
           EXPLORER_VERIFICATION_KEY: ${{ secrets.EXPLORER_VERIFICATION_KEY }}
-        run: nix run .#deploy-contracts
-      # - name: Forge deploy contract to mumbai
-      #   env:
-      #     CI_DEPLOY_RPC_URL: ${{ secrets.CI_DEPLOY_RPC_URL }}
-      #     EXPLORER_VERIFICATION_KEY: ${{ secrets.EXPLORER_VERIFICATION_KEY }}
-      #   run: forge build && forge script script/DeployCloneFactory.sol:DeployCloneFactory --legacy --verify --broadcast --rpc-url "${CI_DEPLOY_RPC_URL}" --etherscan-api-key "${EXPLORER_VERIFICATION_KEY}" --sig='run(bytes)' $(rain meta build -i <(rain meta solc artifact -c abi -i out/CloneFactory.sol/CloneFactory.json) -m solidity-abi-v2 -t json -e deflate -l en -E hex)
+        run: nix run .#deploy-contracts
diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -5,13 +5,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # This is technically not needed as slither will try to install foundry but
-      # I found the installer flakey on CI.
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-
       - uses: crytic/slither-action@v0.3.0
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -14,14 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
-
       - name: Check gas snapshots
         run: forge snapshot --check
         id: snapshot
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,6 +27,10 @@ jobs:
         run: forge install --shallow
         id: forge-install-shallow
 
+      - name: git status
+        run: git status
+        id: git-status
+
       - name: Run Forge fmt
         run: forge fmt --check
         id: fmt

diff --git a/.gitmodules b/.gitmodules
@@ -13,15 +13,18 @@
 [submodule "lib/rain.lib.memkv"]
 	path = lib/rain.lib.memkv
 	url = https://github.com/rainprotocol/rain.lib.memkv
-[submodule "lib/rain.datacontract"]
-	path = lib/rain.datacontract
-	url = https://github.com/rainprotocol/rain.datacontract
 [submodule "lib/rain.factory"]
 	path = lib/rain.factory
 	url = https://github.com/rainprotocol/rain.factory
 [submodule "lib/v2-periphery"]
 	path = lib/v2-periphery
 	url = https://github.com/Uniswap/v2-periphery
+[submodule "lib/rain.math.fixedpoint"]
+	path = lib/rain.math.fixedpoint
+	url = https://github.com/rainprotocol/rain.math.fixedpoint
+[submodule "lib/rain.solmem"]
+	path = lib/rain.solmem
+	url = https://github.com/rainprotocol/rain.solmem
 [submodule "lib/rain.interpreter"]
 	path = lib/rain.interpreter
 	url = https://github.com/rainprotocol/rain.interpreter
diff --git a/flake.nix b/flake.nix
@@ -15,7 +15,7 @@
 
       in rec {
         packages = rec {
-          concrete-contracts = ["OrderBook" "GenericPoolOrderBookFlashBorrower"];
+          concrete-contracts = ["OrderBook" "GenericPoolOrderBookV3FlashBorrower"];
           build-meta-cmd = contract: ''
             ${rain-cli} meta build \
               -i <(${rain-cli} meta solc artifact -c abi -i out/${contract}.sol/${contract}.json) -m solidity-abi-v2 -t json -e deflate -l en \

diff --git a/lib/rain.datacontract b/lib/rain.datacontract
diff --git a/lib/rain.interpreter b/lib/rain.interpreter
diff --git a/lib/rain.math.fixedpoint b/lib/rain.math.fixedpoint
diff --git a/lib/rain.solmem b/lib/rain.solmem
diff --git a/meta/OrderBook.rain.meta b/meta/OrderBook.rain.meta
diff --git a/script/DeployGenericPoolOrderBookV3FlashBorrower.sol b/script/DeployGenericPoolOrderBookV3FlashBorrower.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Script.sol";
+import "lib/forge-std/src/Script.sol";
 import "src/concrete/GenericPoolOrderBookV3FlashBorrower.sol";
 
 /// @title DeployGenericPoolOrderBookV3FlashBorrower
@@ -14,8 +14,8 @@ contract DeployGenericPoolOrderBookV3FlashBorrower is Script {
     function run(bytes memory meta) external {
         uint256 deployerPrivateKey = vm.envUint("DEPLOYMENT_KEY");
         // @todo pull this from subgraph.
-        // hardcoded from CI https://github.com/rainprotocol/rain-protocol/actions/runs/5365826502/jobs/9934721206
-        address i9rDeployer = 0x12CC9A83C200354bc35e19e6ad18a0F444aB5c86;
+        // https://github.com/rainprotocol/rain.interpreter/actions/runs/6000630847/job/16273099850
+        address i9rDeployer = 0xCA0Ef6E0d9cd47d44aF5d87098f8482669303b06;
 
         console2.log("DeployGenericPoolOrderBookFlashBorrower meta hash:");
         console2.logBytes32(keccak256(meta));

diff --git a/script/DeployOrderBook.sol b/script/DeployOrderBook.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Script.sol";
+import "lib/forge-std/src/Script.sol";
 import "src/concrete/OrderBook.sol";
 
 contract DeployOrderBook is Script {
     function run(bytes memory meta) external {
         uint256 deployerPrivateKey = vm.envUint("DEPLOYMENT_KEY");
         // @todo pull this from subgraph.
-        // hardcoded from CI https://github.com/rainprotocol/rain-protocol/actions/runs/5365826502/jobs/9934721206
-        address i9rDeployer = 0x12CC9A83C200354bc35e19e6ad18a0F444aB5c86;
+        // https://github.com/rainprotocol/rain.interpreter/actions/runs/6000630847/job/16273099850
+        address i9rDeployer = 0xCA0Ef6E0d9cd47d44aF5d87098f8482669303b06;
 
         console2.log("DeployOrderBook meta hash:");
         console2.logBytes32(keccak256(meta));

diff --git a/src/abstract/OrderBookV3ArbOrderTaker.sol b/src/abstract/OrderBookV3ArbOrderTaker.sol
@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import {ERC165, IERC165} from "openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
-import {ReentrancyGuard} from "openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {Initializable} from "openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
+import {ERC165, IERC165} from "lib/openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
+import {ReentrancyGuard} from "lib/openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {Initializable} from "lib/openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "lib/openzeppelin-contracts/contracts/utils/Address.sol";
 import {
     DeployerDiscoverableMetaV2,
     DeployerDiscoverableMetaV2ConstructionConfig,
     LibMeta
-} from "rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
-import "rain.factory/src/interface/ICloneableV2.sol";
-import "rain.interpreter/src/lib/caller/LibContext.sol";
-import "rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
-import "rain.interpreter/src/lib/bytecode/LibBytecode.sol";
+} from "lib/rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
+import "lib/rain.factory/src/interface/ICloneableV2.sol";
+import "lib/rain.interpreter/src/lib/caller/LibContext.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
+import "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol";
 
 import "../interface/unstable/IOrderBookV3.sol";
 import "../interface/unstable/IOrderBookV3OrderTaker.sol";

diff --git a/src/abstract/OrderBookV3FlashBorrower.sol b/src/abstract/OrderBookV3FlashBorrower.sol
@@ -1,23 +1,23 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import {ERC165, IERC165} from "openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {ReentrancyGuard} from "openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
-import {Initializable} from "openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
+import {ERC165, IERC165} from "lib/openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "lib/openzeppelin-contracts/contracts/utils/Address.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {ReentrancyGuard} from "lib/openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
+import {Initializable} from "lib/openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
 import {
     DeployerDiscoverableMetaV2,
     DeployerDiscoverableMetaV2ConstructionConfig,
     LibMeta
-} from "rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
-import "rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
-import "rain.interpreter/src/lib/caller/LibContext.sol";
-import "rain.interpreter/src/lib/bytecode/LibBytecode.sol";
+} from "lib/rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
+import "lib/rain.interpreter/src/lib/caller/LibContext.sol";
+import "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol";
 
 import "../interface/unstable/IOrderBookV3.sol";
-import "rain.factory/src/interface/ICloneableV2.sol";
+import "lib/rain.factory/src/interface/ICloneableV2.sol";
 import "./OrderBookV3ArbCommon.sol";
 
 /// Thrown when the initiator is not the order book.

diff --git a/src/abstract/OrderBookV3FlashLender.sol b/src/abstract/OrderBookV3FlashLender.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: CAL
 pragma solidity ^0.8.18;
 
-import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Math} from "lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "../interface/ierc3156/IERC3156FlashBorrower.sol";
 import "../interface/ierc3156/IERC3156FlashLender.sol";

diff --git a/src/concrete/GenericPoolOrderBookV3ArbOrderTaker.sol b/src/concrete/GenericPoolOrderBookV3ArbOrderTaker.sol
@@ -2,9 +2,9 @@
 pragma solidity =0.8.19;
 
 import "../abstract/OrderBookV3ArbOrderTaker.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "lib/openzeppelin-contracts/contracts/utils/Address.sol";
 
 bytes32 constant CALLER_META_HASH = bytes32(0x00);
 

diff --git a/src/concrete/OrderBook.sol b/src/concrete/OrderBook.sol
@@ -1,22 +1,22 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
-import {Multicall} from "openzeppelin-contracts/contracts/utils/Multicall.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {ReentrancyGuard} from "openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
-
-import "rain.math.fixedpoint/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol";
-import "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
-import "rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
-import "rain.interpreter/src/lib/caller/LibContext.sol";
+import {Math} from "lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
+import {Multicall} from "lib/openzeppelin-contracts/contracts/utils/Multicall.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {ReentrancyGuard} from "lib/openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
+
+import "lib/rain.math.fixedpoint/src/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol";
+import "lib/rain.math.fixedpoint/src/lib/LibFixedPointDecimalScale.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEncodedDispatch.sol";
+import "lib/rain.interpreter/src/lib/caller/LibContext.sol";
 import {
     DeployerDiscoverableMetaV2,
     DeployerDiscoverableMetaV2ConstructionConfig,
     LibMeta
-} from "rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
-import "rain.interpreter/src/lib/bytecode/LibBytecode.sol";
+} from "lib/rain.interpreter/src/abstract/DeployerDiscoverableMetaV2.sol";
+import "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol";
 
 import "../interface/unstable/IOrderBookV3.sol";
 import "../interface/unstable/IOrderBookV3OrderTaker.sol";
@@ -123,7 +123,7 @@ uint256 constant CONTEXT_VAULT_IO_BALANCE_DIFF = 4;
 uint256 constant CONTEXT_VAULT_IO_ROWS = 5;
 
 /// @dev Hash of the caller contract metadata for construction.
-bytes32 constant CALLER_META_HASH = bytes32(0xf0c79e4006636a71899066ac45a478da4eafaa3117769678b6f18d96138bc156);
+bytes32 constant CALLER_META_HASH = bytes32(0x71fe2f4f68f17dfe6ae7aba2bbd6cbfe5a2a48a93ebbc8b1f1900887b978eeee);
 
 /// All information resulting from an order calculation that allows for vault IO
 /// to be calculated and applied, then the handle IO entrypoint to be dispatched.

diff --git a/src/concrete/UniV2PoolOrderBookV3ArbOrderTaker.sol b/src/concrete/UniV2PoolOrderBookV3ArbOrderTaker.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "v2-periphery/interfaces/IUniswapV2Router02.sol";
+import "lib/v2-periphery/contracts/interfaces/IUniswapV2Router02.sol";
 
 import "../abstract/OrderBookV3ArbOrderTaker.sol";
-import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
+import {IERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "lib/openzeppelin-contracts/contracts/utils/Address.sol";
 
 bytes32 constant CALLER_META_HASH = bytes32(0x00);
 

diff --git a/src/interface/IOrderBookV2.sol b/src/interface/IOrderBookV2.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.18;
 
 import "./ierc3156/IERC3156FlashLender.sol";
-import "rain.interpreter/src/lib/caller/LibEvaluable.sol";
-import "rain.interpreter/src/interface/IInterpreterCallerV2.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEvaluable.sol";
+import "lib/rain.interpreter/src/interface/IInterpreterCallerV2.sol";
 
 /// Configuration for a deposit. All deposits are processed by and for
 /// `msg.sender` so the vaults are unambiguous here.

diff --git a/src/interface/deprecated/IOrderBookV1.sol b/src/interface/deprecated/IOrderBookV1.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.18;
 
 import "../ierc3156/IERC3156FlashLender.sol";
-import "rain.interpreter/src/lib/caller/LibEvaluable.sol";
-import "rain.interpreter/src/interface/deprecated/IInterpreterCallerV1.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEvaluable.sol";
+import "lib/rain.interpreter/src/interface/deprecated/IInterpreterCallerV1.sol";
 
 /// Configuration for a deposit. All deposits are processed by and for
 /// `msg.sender` so the vaults are unambiguous here.

diff --git a/src/interface/unstable/IOrderBookV3.sol b/src/interface/unstable/IOrderBookV3.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.18;
 
 import "../ierc3156/IERC3156FlashLender.sol";
-import "rain.interpreter/src/lib/caller/LibEvaluable.sol";
-import "rain.interpreter/src/interface/IInterpreterCallerV2.sol";
+import "lib/rain.interpreter/src/lib/caller/LibEvaluable.sol";
+import "lib/rain.interpreter/src/interface/IInterpreterCallerV2.sol";
 
 /// Import unmodified structures from older versions of `IOrderBook`.
 import {IO, Order, TakeOrderConfig, ClearConfig, ClearStateChange} from "../IOrderBookV2.sol";

diff --git a/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol b/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Test.sol";
-import "openzeppelin-contracts/contracts/proxy/Clones.sol";
-import "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
+import "lib/forge-std/src/Test.sol";
+import "lib/openzeppelin-contracts/contracts/proxy/Clones.sol";
+import "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 
 import "test/util/lib/LibTestConstants.sol";
 import "test/util/lib/LibGenericPoolOrderBookV3FlashBorrowerConstants.sol";

diff --git a/test/concrete/OrderBook.deposit.t.sol b/test/concrete/OrderBook.deposit.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 
 import "test/util/lib/LibTestConstants.sol";
 import "test/util/abstract/OrderBookExternalMockTest.sol";

diff --git a/test/concrete/OrderBook.vaultBalance.t.sol b/test/concrete/OrderBook.vaultBalance.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 
 import "test/util/abstract/OrderBookExternalMockTest.sol";
 import "test/util/concrete/Reenteroor.sol";

diff --git a/test/concrete/OrderBook.withdraw.t.sol b/test/concrete/OrderBook.withdraw.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 
-import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
+import {Math} from "lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
 
 import "test/util/abstract/OrderBookExternalMockTest.sol";
 import "test/util/concrete/Reenteroor.sol";

diff --git a/test/lib/LibOrder.t.sol b/test/lib/LibOrder.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity =0.8.19;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 
 import "src/lib/LibOrder.sol";