From 13c519ef03596d91076a9cd09c4fd56ae53b5eab Mon Sep 17 00:00:00 2001 From: Jake Date: Tue, 27 Jun 2023 08:37:10 -0700 Subject: [PATCH] fix: forge remappings (#86) * fix: remove solady * forge install: solady v0.0.107 * fix: correct shorter remappings * style: fmt --- .gitmodules | 6 +++--- foundry.toml | 10 +++++----- lib/solady | 2 +- script/DeployAll.s.sol | 2 +- script/UpgradeIssuer.s.sol | 2 +- src/BridgedERC20.sol | 3 +-- src/TransferRestrictor.sol | 2 +- src/common/SelfPermit.sol | 2 +- src/issuer/BuyOrderIssuer.sol | 2 +- src/issuer/DirectBuyIssuer.sol | 2 +- src/issuer/OrderFees.sol | 4 ++-- src/issuer/OrderProcessor.sol | 11 +++++------ src/issuer/SellOrderProcessor.sol | 2 +- test/BridgedERC20.t.sol | 2 +- test/BuyOrderIssuer.t.sol | 4 ++-- test/BuyOrderIssuerRequest.t.sol | 4 ++-- test/DirectBuyIssuer.t.sol | 2 +- test/SellOrderProcessor.t.sol | 4 ++-- 18 files changed, 32 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index a48f09df..92570b07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "lib/forge-std"] path = lib/forge-std url = https://github.com/foundry-rs/forge-std -[submodule "lib/solady"] - path = lib/solady - url = https://github.com/Vectorized/solady [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts @@ -13,3 +10,6 @@ [submodule "lib/openzeppelin-contracts-upgradeable"] path = lib/openzeppelin-contracts-upgradeable url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable +[submodule "lib/solady"] + path = lib/solady + url = https://github.com/Vectorized/solady diff --git a/foundry.toml b/foundry.toml index e2f0582e..516e47a3 100644 --- a/foundry.toml +++ b/foundry.toml @@ -3,11 +3,11 @@ src = "src" out = "out" libs = ["node_modules", "lib"] remappings = [ - "openzeppelin-contracts-upgradeable=lib/openzeppelin-contracts-upgradeable/", - "openzeppelin-contracts=lib/openzeppelin-contracts/", - "prb-math=lib/prb-math/src/", - "solady=lib/solady/src/", - "solady-test=lib/solady/test/", + "openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", + "openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/", + "prb-math/=lib/prb-math/src/", + "solady/=lib/solady/src/", + "solady-test/=lib/solady/test/", ] [fuzz] diff --git a/lib/solady b/lib/solady index 3550ff67..7175c21f 160000 --- a/lib/solady +++ b/lib/solady @@ -1 +1 @@ -Subproject commit 3550ff672a7256b417a98ab31588ec99c24fb045 +Subproject commit 7175c21f95255dc7711ce84cc32080a41864abd6 diff --git a/script/DeployAll.s.sol b/script/DeployAll.s.sol index 14aeeb57..4b031d26 100644 --- a/script/DeployAll.s.sol +++ b/script/DeployAll.s.sol @@ -7,7 +7,7 @@ import {OrderFees, IOrderFees} from "../src/issuer/OrderFees.sol"; import {BuyOrderIssuer} from "../src/issuer/BuyOrderIssuer.sol"; import {SellOrderProcessor} from "../src/issuer/SellOrderProcessor.sol"; import {DirectBuyIssuer} from "../src/issuer/DirectBuyIssuer.sol"; -import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol"; +import "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol"; contract DeployAllScript is Script { function run() external { diff --git a/script/UpgradeIssuer.s.sol b/script/UpgradeIssuer.s.sol index fcaed853..af62f4c6 100644 --- a/script/UpgradeIssuer.s.sol +++ b/script/UpgradeIssuer.s.sol @@ -6,7 +6,7 @@ import {BuyOrderIssuer} from "../src/issuer/BuyOrderIssuer.sol"; import {SellOrderProcessor} from "../src/issuer/SellOrderProcessor.sol"; import {DirectBuyIssuer} from "../src/issuer/DirectBuyIssuer.sol"; import {BridgedERC20} from "../src/BridgedERC20.sol"; -import "openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol"; +import "openzeppelin-contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; contract UpgradeIssuerScript is Script { // WARNING: This upgrade script does not validate storage changes. diff --git a/src/BridgedERC20.sol b/src/BridgedERC20.sol index 3e7241c8..30d9ae05 100644 --- a/src/BridgedERC20.sol +++ b/src/BridgedERC20.sol @@ -2,8 +2,7 @@ pragma solidity ^0.8.19; import {ERC20} from "solady/tokens/ERC20.sol"; -import {AccessControlDefaultAdminRules} from - "openzeppelin-contracts/contracts/access/AccessControlDefaultAdminRules.sol"; +import {AccessControlDefaultAdminRules} from "openzeppelin-contracts/access/AccessControlDefaultAdminRules.sol"; import {ITransferRestrictor} from "./ITransferRestrictor.sol"; /// @notice Core token contract for bridged assets. diff --git a/src/TransferRestrictor.sol b/src/TransferRestrictor.sol index f87dc969..84beea7c 100644 --- a/src/TransferRestrictor.sol +++ b/src/TransferRestrictor.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {Ownable2Step} from "openzeppelin-contracts/contracts/access/Ownable2Step.sol"; +import {Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol"; import {ITransferRestrictor} from "./ITransferRestrictor.sol"; /// @notice Enforces transfer restrictions diff --git a/src/common/SelfPermit.sol b/src/common/SelfPermit.sol index 4a103fd8..f8a7e97d 100644 --- a/src/common/SelfPermit.sol +++ b/src/common/SelfPermit.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {SafeERC20, IERC20Permit} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; +import {SafeERC20, IERC20Permit} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol"; /// @notice Functionality to call permit on any EIP-2612-compliant token /// @author Dinari (https://github.com/dinaricrypto/sbt-contracts/blob/main/src/common/SelfPermit.sol) diff --git a/src/issuer/BuyOrderIssuer.sol b/src/issuer/BuyOrderIssuer.sol index ed1c634d..270c9c69 100644 --- a/src/issuer/BuyOrderIssuer.sol +++ b/src/issuer/BuyOrderIssuer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {SafeERC20, IERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; +import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol"; import "prb-math/Common.sol" as PrbMath; import {OrderProcessor} from "./OrderProcessor.sol"; import {IMintBurn} from "../IMintBurn.sol"; diff --git a/src/issuer/DirectBuyIssuer.sol b/src/issuer/DirectBuyIssuer.sol index cab244ea..2f590638 100644 --- a/src/issuer/DirectBuyIssuer.sol +++ b/src/issuer/DirectBuyIssuer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {SafeERC20, IERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; +import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol"; import {BuyOrderIssuer, OrderProcessor} from "./BuyOrderIssuer.sol"; import {IMintBurn} from "../IMintBurn.sol"; diff --git a/src/issuer/OrderFees.sol b/src/issuer/OrderFees.sol index 6d82f0c4..44b92f82 100644 --- a/src/issuer/OrderFees.sol +++ b/src/issuer/OrderFees.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {Ownable2Step} from "openzeppelin-contracts/contracts/access/Ownable2Step.sol"; +import {Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol"; import "prb-math/Common.sol" as PrbMath; -import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import {IERC20Metadata} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Metadata.sol"; import {IOrderFees} from "./IOrderFees.sol"; /// @notice Manages fee calculations for orders. diff --git a/src/issuer/OrderProcessor.sol b/src/issuer/OrderProcessor.sol index e54b6e6f..9ea08847 100644 --- a/src/issuer/OrderProcessor.sol +++ b/src/issuer/OrderProcessor.sol @@ -1,13 +1,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {Initializable} from "openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol"; -import {UUPSUpgradeable} from "openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol"; +import {Initializable} from "openzeppelin-contracts-upgradeable/proxy/utils/Initializable.sol"; +import {UUPSUpgradeable} from "openzeppelin-contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; import {AccessControlDefaultAdminRulesUpgradeable} from - "openzeppelin-contracts-upgradeable/contracts/access/AccessControlDefaultAdminRulesUpgradeable.sol"; -import {ReentrancyGuardUpgradeable} from - "openzeppelin-contracts-upgradeable/contracts/security/ReentrancyGuardUpgradeable.sol"; -import {Multicall} from "openzeppelin-contracts/contracts/utils/Multicall.sol"; + "openzeppelin-contracts-upgradeable/access/AccessControlDefaultAdminRulesUpgradeable.sol"; +import {ReentrancyGuardUpgradeable} from "openzeppelin-contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; +import {Multicall} from "openzeppelin-contracts/utils/Multicall.sol"; import {SelfPermit} from "../common/SelfPermit.sol"; import {IOrderBridge} from "./IOrderBridge.sol"; import {IOrderFees} from "./IOrderFees.sol"; diff --git a/src/issuer/SellOrderProcessor.sol b/src/issuer/SellOrderProcessor.sol index be81b623..1d8cbd4f 100644 --- a/src/issuer/SellOrderProcessor.sol +++ b/src/issuer/SellOrderProcessor.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity ^0.8.19; -import {SafeERC20, IERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; +import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol"; import "prb-math/Common.sol" as PrbMath; import {OrderProcessor} from "./OrderProcessor.sol"; import {IMintBurn} from "../IMintBurn.sol"; diff --git a/test/BridgedERC20.t.sol b/test/BridgedERC20.t.sol index c39e3c2b..1ed805a1 100644 --- a/test/BridgedERC20.t.sol +++ b/test/BridgedERC20.t.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.13; import "forge-std/Test.sol"; import {BridgedERC20} from "../src/BridgedERC20.sol"; import {TransferRestrictor, ITransferRestrictor} from "../src/TransferRestrictor.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/utils/Strings.sol"; contract BridgedERC20Test is Test { event NameSet(string name); diff --git a/test/BuyOrderIssuer.t.sol b/test/BuyOrderIssuer.t.sol index e20a4693..55d96a25 100644 --- a/test/BuyOrderIssuer.t.sol +++ b/test/BuyOrderIssuer.t.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.13; import "forge-std/Test.sol"; import "solady-test/utils/mocks/MockERC20.sol"; -import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol"; +import "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol"; import "./utils/mocks/MockBridgedERC20.sol"; import "./utils/SigUtils.sol"; import "../src/issuer/BuyOrderIssuer.sol"; import "../src/issuer/IOrderBridge.sol"; import {OrderFees, IOrderFees} from "../src/issuer/OrderFees.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/utils/Strings.sol"; contract BuyOrderIssuerTest is Test { event TreasurySet(address indexed treasury); diff --git a/test/BuyOrderIssuerRequest.t.sol b/test/BuyOrderIssuerRequest.t.sol index 779036fc..ef0a1f65 100644 --- a/test/BuyOrderIssuerRequest.t.sol +++ b/test/BuyOrderIssuerRequest.t.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.13; import "forge-std/Test.sol"; import "solady-test/utils/mocks/MockERC20.sol"; -import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol"; +import "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol"; import "./utils/mocks/MockBridgedERC20.sol"; import "./utils/SigUtils.sol"; import "../src/issuer/BuyOrderIssuer.sol"; import "../src/issuer/IOrderBridge.sol"; import {OrderFees, IOrderFees} from "../src/issuer/OrderFees.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/utils/Strings.sol"; contract BuyOrderIssuerRequestTest is Test { // For gas profiling diff --git a/test/DirectBuyIssuer.t.sol b/test/DirectBuyIssuer.t.sol index 8c9a7d3c..163e0e7f 100644 --- a/test/DirectBuyIssuer.t.sol +++ b/test/DirectBuyIssuer.t.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.13; import "forge-std/Test.sol"; import "solady-test/utils/mocks/MockERC20.sol"; -import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol"; +import "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol"; import "./utils/mocks/MockBridgedERC20.sol"; import "../src/issuer/DirectBuyIssuer.sol"; import "../src/issuer/IOrderBridge.sol"; diff --git a/test/SellOrderProcessor.t.sol b/test/SellOrderProcessor.t.sol index 6da6b4d9..923654af 100644 --- a/test/SellOrderProcessor.t.sol +++ b/test/SellOrderProcessor.t.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.13; import "forge-std/Test.sol"; import "solady-test/utils/mocks/MockERC20.sol"; -import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol"; +import "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol"; import "./utils/mocks/MockBridgedERC20.sol"; import "./utils/SigUtils.sol"; import "../src/issuer/SellOrderProcessor.sol"; import "../src/issuer/IOrderBridge.sol"; import {OrderFees, IOrderFees} from "../src/issuer/OrderFees.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/utils/Strings.sol"; contract SellOrderProcessorTest is Test { event OrderRequested(bytes32 indexed id, address indexed recipient, IOrderBridge.Order order, bytes32 salt);