delete remapping for solmate to reduce remapping.txt requirement for …

…upstream dependents (#160)

.gas-snapshot

@@ -1,6 +1,6 @@
-AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 884)
-AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 884)
-AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 884)
+AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 886)
+AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 886)
+AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 886)
 AllowanceTransferTest:testApprove() (gas: 47561)
 AllowanceTransferTest:testBatchTransferFrom() (gas: 159268)
 AllowanceTransferTest:testBatchTransferFromDifferentOwners() (gas: 235508)
@@ -43,7 +43,7 @@ NonceBitmapTest:testInvalidateNonzeroWord() (gas: 85665)
 NonceBitmapTest:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39187, ~: 39187)
 NonceBitmapTest:testLowNonces() (gas: 41004)
 NonceBitmapTest:testNonceWordBoundary() (gas: 42203)
-NonceBitmapTest:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49120, ~: 51640)
+NonceBitmapTest:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49205, ~: 51640)
 NonceBitmapTest:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
 Permit2LibTest:testOZSafePermit() (gas: 24443)
 Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129153)
@@ -102,4 +102,4 @@ TypehashGeneration:testPermitTransferFrom() (gas: 36520)
 TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43369)
 TypehashGeneration:testPermitTransferFromWithWitnessIncorrectPermitData() (gas: 43430)
 TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43833)
-MockPermit2Lib:testPermit2Code(address):(bool) (runs: 256, μ: 2911, ~: 2911)
+MockPermit2Lib:testPermit2Code(address):(bool) (runs: 256, μ: 35465847065545473, ~: 2911)

remappings.txt

@@ -1,3 +1 @@
-forge-std/=lib/forge-std/src/
-openzeppelin-contracts/=lib/openzeppelin-contracts/
-solmate/=lib/solmate/src/
+solmate/=lib/solmate

src/AllowanceTransfer.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
-import {SafeTransferLib} from "solmate/utils/SafeTransferLib.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
 import {PermitHash} from "./libraries/PermitHash.sol";
 import {SignatureVerification} from "./libraries/SignatureVerification.sol";
 import {EIP712} from "./EIP712.sol";

src/SignatureTransfer.sol

@@ -3,8 +3,8 @@ pragma solidity 0.8.17;
 
 import {ISignatureTransfer} from "./interfaces/ISignatureTransfer.sol";
 import {SignatureExpired, InvalidNonce} from "./PermitErrors.sol";
-import {ERC20} from "solmate/tokens/ERC20.sol";
-import {SafeTransferLib} from "solmate/utils/SafeTransferLib.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
 import {SignatureVerification} from "./libraries/SignatureVerification.sol";
 import {PermitHash} from "./libraries/PermitHash.sol";
 import {EIP712} from "./EIP712.sol";

src/libraries/Permit2Lib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 
 import {Permit2} from "../Permit2.sol";
 import {IDAIPermit} from "../interfaces/IDAIPermit.sol";

test/Permit2Lib.t.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.17;
 import "forge-std/Test.sol";
 
 import {SafeERC20, IERC20, IERC20Permit} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
-import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
+import {DSTestPlus} from "solmate/src/test/utils/DSTestPlus.sol";
+import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
 import {Permit2} from "../src/Permit2.sol";
 import {Permit2Lib} from "../src/libraries/Permit2Lib.sol";
 import {MockNonPermitERC20} from "./mocks/MockNonPermitERC20.sol";

test/integration/MainnetToken.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import {SafeTransferLib} from "solmate/utils/SafeTransferLib.sol";
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {AddressBuilder} from "../utils/AddressBuilder.sol";
 import {StructBuilder} from "../utils/StructBuilder.sol";
 import {PermitSignature} from "../utils/PermitSignature.sol";

test/integration/tokens/DAI.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract DAITest is MainnetTokenTest {

test/integration/tokens/FeeOnTransferToken.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract FeeOnTransferTokenTest is MainnetTokenTest {

test/integration/tokens/RebasingToken.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract RebasingTokenTest is MainnetTokenTest {

test/integration/tokens/TooManyReturnBytesToken.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract TooManyReturnBytesTokenTest is MainnetTokenTest {

test/integration/tokens/UNI.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract UNITest is MainnetTokenTest {

test/integration/tokens/USDC.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract USDCTest is MainnetTokenTest {

test/integration/tokens/USDT.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {SafeTransferLib} from "solmate/utils/SafeTransferLib.sol";
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract USDTTest is MainnetTokenTest {

test/integration/tokens/WBTC.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract WBTCTest is MainnetTokenTest {

test/integration/tokens/ZRX.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {MainnetTokenTest} from "../MainnetToken.t.sol";
 
 contract ZRXTest is MainnetTokenTest {

test/mocks/MockERC1155.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC1155} from "solmate/tokens/ERC1155.sol";
+import {ERC1155} from "solmate/src/tokens/ERC1155.sol";
 
 contract MockERC1155 is ERC1155 {
     constructor() ERC1155() {}

test/mocks/MockERC20.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 
 contract MockERC20 is ERC20 {
     constructor(string memory name, string memory symbol, uint8 decimals) ERC20(name, symbol, decimals) {}

test/mocks/MockERC721.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC721} from "solmate/tokens/ERC721.sol";
+import {ERC721} from "solmate/src/tokens/ERC721.sol";
 
 contract MockERC721 is ERC721 {
     constructor(string memory name, string memory symbol) ERC721(name, symbol) {}

test/mocks/MockNonPermitERC20.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
 
 contract MockNonPermitERC20 is MockERC20 {
     constructor(string memory _name, string memory _symbol, uint8 _decimals) MockERC20(_name, _symbol, _decimals) {}

test/mocks/MockPermit2Lib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/tokens/ERC20.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {Permit2Lib} from "../../src/libraries/Permit2Lib.sol";
 
 contract MockPermit2Lib {

test/mocks/MockPermitWithDS.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
 
 contract MockPermitWithSmallDS is MockERC20 {
     constructor(string memory _name, string memory _symbol, uint8 _decimals) MockERC20(_name, _symbol, _decimals) {}