diff --git a/remappings.txt b/remappings.txt index edac14c0..b183e7dd 100644 --- a/remappings.txt +++ b/remappings.txt @@ -5,7 +5,7 @@ @sablier/v2-core/=lib/v2-core/src/ @sablier/v2-core-script/=lib/v2-core/script/ @sablier/v2-core-test/=lib/v2-core/test/ +@uniswap/permit2/=lib/permit2/src/ +@uniswap/permit2-test/=lib/permit2/test/ forge-std/=lib/forge-std/src/ -permit2/=lib/permit2/src/ -permit2-test/=lib/permit2/test/ solady/=lib/solady/src/ diff --git a/script/DeployDeterministicPeriphery.s.sol b/script/DeployDeterministicPeriphery.s.sol index 2313f1c8..98040c58 100644 --- a/script/DeployDeterministicPeriphery.s.sol +++ b/script/DeployDeterministicPeriphery.s.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <=0.9.0; import { BaseScript } from "@sablier/v2-core-script/Base.s.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { SablierV2Archive } from "../src/SablierV2Archive.sol"; import { SablierV2ProxyPlugin } from "../src/SablierV2ProxyPlugin.sol"; diff --git a/script/DeployDeterministicProxyTarget.s.sol b/script/DeployDeterministicProxyTarget.s.sol index e9535216..3954be95 100644 --- a/script/DeployDeterministicProxyTarget.s.sol +++ b/script/DeployDeterministicProxyTarget.s.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <=0.9.0; import { BaseScript } from "@sablier/v2-core-script/Base.s.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { SablierV2ProxyTarget } from "../src/SablierV2ProxyTarget.sol"; diff --git a/script/DeployPeriphery.s.sol b/script/DeployPeriphery.s.sol index a3ea69bf..3be2b712 100644 --- a/script/DeployPeriphery.s.sol +++ b/script/DeployPeriphery.s.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { BaseScript } from "@sablier/v2-core-script/Base.s.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { SablierV2Archive } from "../src/SablierV2Archive.sol"; import { SablierV2ProxyPlugin } from "../src/SablierV2ProxyPlugin.sol"; diff --git a/script/DeployProtocol.s.sol b/script/DeployProtocol.s.sol index 43d086a1..fb49da6a 100644 --- a/script/DeployProtocol.s.sol +++ b/script/DeployProtocol.s.sol @@ -6,7 +6,7 @@ import { SablierV2LockupDynamic } from "@sablier/v2-core/SablierV2LockupDynamic. import { SablierV2LockupLinear } from "@sablier/v2-core/SablierV2LockupLinear.sol"; import { SablierV2NFTDescriptor } from "@sablier/v2-core/SablierV2NFTDescriptor.sol"; import { BaseScript } from "@sablier/v2-core-script/Base.s.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { SablierV2Archive } from "../src/SablierV2Archive.sol"; import { SablierV2ProxyPlugin } from "../src/SablierV2ProxyPlugin.sol"; diff --git a/script/DeployProxyTarget.s.sol b/script/DeployProxyTarget.s.sol index 985cecbe..3c82e4c4 100644 --- a/script/DeployProxyTarget.s.sol +++ b/script/DeployProxyTarget.s.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { BaseScript } from "@sablier/v2-core-script/Base.s.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { SablierV2ProxyTarget } from "../src/SablierV2ProxyTarget.sol"; diff --git a/src/SablierV2ProxyTarget.sol b/src/SablierV2ProxyTarget.sol index 12158fa1..3e57ed35 100644 --- a/src/SablierV2ProxyTarget.sol +++ b/src/SablierV2ProxyTarget.sol @@ -8,7 +8,7 @@ import { ISablierV2Lockup } from "@sablier/v2-core/interfaces/ISablierV2Lockup.s import { ISablierV2LockupLinear } from "@sablier/v2-core/interfaces/ISablierV2LockupLinear.sol"; import { ISablierV2LockupDynamic } from "@sablier/v2-core/interfaces/ISablierV2LockupDynamic.sol"; import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { OnlyDelegateCall } from "./abstracts/OnlyDelegateCall.sol"; import { ISablierV2ProxyTarget } from "./interfaces/ISablierV2ProxyTarget.sol"; diff --git a/src/types/Permit2.sol b/src/types/Permit2.sol index cd8496da..a842b92e 100644 --- a/src/types/Permit2.sol +++ b/src/types/Permit2.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.19; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; -import { IPermit2 } from "permit2/interfaces/IPermit2.sol"; // unused but re-exported for convenience +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; +import { IPermit2 } from "@uniswap/permit2/interfaces/IPermit2.sol"; // unused but re-exported for convenience /// @notice A struct encapsulating the parameters needed for Permit2. /// @dev See the full documentation at https://github.com/Uniswap/permit2. diff --git a/test/Base.t.sol b/test/Base.t.sol index 52259bb3..3aa461b0 100644 --- a/test/Base.t.sol +++ b/test/Base.t.sol @@ -9,8 +9,8 @@ import { IPRBProxyRegistry } from "@prb/proxy/interfaces/IPRBProxyRegistry.sol"; import { ISablierV2Lockup } from "@sablier/v2-core/interfaces/ISablierV2Lockup.sol"; import { ISablierV2LockupDynamic } from "@sablier/v2-core/interfaces/ISablierV2LockupDynamic.sol"; import { ISablierV2LockupLinear } from "@sablier/v2-core/interfaces/ISablierV2LockupLinear.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { Utils as V2CoreUtils } from "@sablier/v2-core-test/utils/Utils.sol"; import { StdCheats } from "forge-std/StdCheats.sol"; diff --git a/test/fork/Fork.t.sol b/test/fork/Fork.t.sol index f026df12..0e89c87b 100644 --- a/test/fork/Fork.t.sol +++ b/test/fork/Fork.t.sol @@ -6,7 +6,7 @@ import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol"; import { IPRBProxyRegistry } from "@prb/proxy/interfaces/IPRBProxyRegistry.sol"; import { ISablierV2LockupDynamic } from "@sablier/v2-core/interfaces/ISablierV2LockupDynamic.sol"; import { ISablierV2LockupLinear } from "@sablier/v2-core/interfaces/ISablierV2LockupLinear.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { Fuzzers as V2CoreFuzzers } from "@sablier/v2-core-test/utils/Fuzzers.sol"; import { IWrappedNativeAsset } from "src/interfaces/IWrappedNativeAsset.sol"; diff --git a/test/fork/plugin/onStreamCanceled.t.sol b/test/fork/plugin/onStreamCanceled.t.sol index dc7798b6..473c0670 100644 --- a/test/fork/plugin/onStreamCanceled.t.sol +++ b/test/fork/plugin/onStreamCanceled.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { LockupLinear } from "@sablier/v2-core/types/DataTypes.sol"; -import { PermitSignature } from "permit2-test/utils/PermitSignature.sol"; +import { PermitSignature } from "@uniswap/permit2-test/utils/PermitSignature.sol"; import { Fork_Test } from "../Fork.t.sol"; diff --git a/test/fork/target/batchCreate.t.sol b/test/fork/target/batchCreate.t.sol index f3647512..306f5356 100644 --- a/test/fork/target/batchCreate.t.sol +++ b/test/fork/target/batchCreate.t.sol @@ -5,7 +5,7 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol"; import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol"; -import { PermitSignature } from "permit2-test/utils/PermitSignature.sol"; +import { PermitSignature } from "@uniswap/permit2-test/utils/PermitSignature.sol"; import { Batch } from "src/types/DataTypes.sol"; import { Permit2Params } from "src/types/Permit2.sol"; diff --git a/test/integration/Integration.t.sol b/test/integration/Integration.t.sol index 35613c5c..0a486dc0 100644 --- a/test/integration/Integration.t.sol +++ b/test/integration/Integration.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { Precompiles as PRBProxyPrecompiles } from "@prb/proxy-test/utils/Precompiles.sol"; import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core-test/utils/Precompiles.sol"; -import { DeployPermit2 } from "permit2-test/utils/DeployPermit2.sol"; +import { DeployPermit2 } from "@uniswap/permit2-test/utils/DeployPermit2.sol"; import { Defaults } from "../utils/Defaults.sol"; import { WETH } from "../mocks/WETH.sol"; diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol index 13b651b4..f04c057e 100644 --- a/test/utils/Defaults.sol +++ b/test/utils/Defaults.sol @@ -5,8 +5,8 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol"; import { ud2x18, UD60x18 } from "@sablier/v2-core/types/Math.sol"; import { Broker, LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol"; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; -import { PermitSignature } from "permit2-test/utils/PermitSignature.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; +import { PermitSignature } from "@uniswap/permit2-test/utils/PermitSignature.sol"; import { Batch } from "src/types/DataTypes.sol"; import { Permit2Params } from "src/types/Permit2.sol"; diff --git a/test/utils/Precompiles.sol b/test/utils/Precompiles.sol index f604262a..4847430f 100644 --- a/test/utils/Precompiles.sol +++ b/test/utils/Precompiles.sol @@ -2,7 +2,7 @@ // solhint-disable max-line-length,no-inline-assembly,reason-string pragma solidity >=0.8.19; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; import { ISablierV2Archive } from "../../src/interfaces/ISablierV2Archive.sol"; import { ISablierV2ProxyPlugin } from "../../src/interfaces/ISablierV2ProxyPlugin.sol"; diff --git a/test/utils/Precompiles.t.sol b/test/utils/Precompiles.t.sol index e82f2fb5..2bf09e62 100644 --- a/test/utils/Precompiles.t.sol +++ b/test/utils/Precompiles.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <=0.9.0; -import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol"; -import { DeployPermit2 } from "permit2-test/utils/DeployPermit2.sol"; +import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol"; +import { DeployPermit2 } from "@uniswap/permit2-test/utils/DeployPermit2.sol"; import { LibString } from "solady/utils/LibString.sol"; import { ISablierV2Archive } from "../../src/interfaces/ISablierV2Archive.sol";