refactor: change permit2 remapping to @uniswap/permit2 (#140)

sablier-labs · Jul 10, 2023 · d1263fb · d1263fb
1 parent 205e256
commit d1263fb
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";