Full testing refactor

.forge-snapshots/permitBatchCleanWrite.snap

@@ -1 +1 @@
-91924
+94475

.forge-snapshots/permitBatchDirtyWrite.snap

@@ -1 +1 @@
-57724
+60336

.forge-snapshots/permitCleanWrite.snap

@@ -1 +1 @@
-63119
+63299

.forge-snapshots/permitCompactSig.snap

@@ -1 +1 @@
-63094
+63273

.forge-snapshots/permitDirtyNonce.snap

@@ -1 +1 @@
-44014
+44348

.forge-snapshots/permitDirtyWrite.snap

@@ -1 +1 @@
-46019
+46349

.forge-snapshots/permitInvalidSigner.snap

@@ -1 +1 @@
-40301
+40554

.forge-snapshots/permitSetMaxAllowanceCleanWrite.snap

@@ -1 +1 @@
-61114
+61448

.forge-snapshots/permitSetMaxAllowanceDirtyWrite.snap

@@ -1 +1 @@
-44014
+44348

.forge-snapshots/permitSignatureExpired.snap

@@ -1 +1 @@
-31700
+31952

.forge-snapshots/transferFrom.snap

@@ -1 +1 @@
-52197
+52178

.gas-snapshot

@@ -1,3 +1,54 @@
+<<<<<<< HEAD
+AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferTest_ERC20:testApprove() (gas: 47610)
+AllowanceTransferTest_ERC20:testMaxAllowance() (gas: 135412)
+AllowanceTransferTest_ERC20:testMaxAllowanceDirtyWrite() (gas: 118045)
+AllowanceTransferTest_ERC20:testPartialAllowance() (gas: 105603)
+AllowanceTransferTest_ERC20:testReuseOrderedNonceInvalid() (gas: 69865)
+AllowanceTransferTest_ERC20:testSetAllowance() (gas: 89936)
+AllowanceTransferTest_ERC20:testSetAllowanceBatch() (gas: 144498)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchDifferentNonces() (gas: 129658)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchDirtyWrite() (gas: 110034)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchEvent() (gas: 124271)
+AllowanceTransferTest_ERC20:testSetAllowanceCompactSig() (gas: 89950)
+AllowanceTransferTest_ERC20:testSetAllowanceDeadlinePassed() (gas: 56816)
+AllowanceTransferTest_ERC20:testSetAllowanceDirtyWrite() (gas: 72528)
+AllowanceTransferTest_ERC20:testSetAllowanceIncorrectSigLength() (gas: 29552)
+AllowanceTransferTest_ERC20:testSetAllowanceInvalidSignature() (gas: 64467)
+AllowanceTransferTest_ERC20:testSetAllowanceTransfer() (gas: 103558)
+AllowanceTransferTest_ERC20:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 97849)
+AllowanceTransferTest_ERC20:testTransferFromWithGasSnapshot() (gas: 133453)
+CompactSignature:testCompactSignature27() (gas: 275)
+CompactSignature:testCompactSignature28() (gas: 141)
+EIP712Test:testDomainSeparator() (gas: 5804)
+EIP712Test:testDomainSeparatorAfterFork() (gas: 10787)
+Permit2LibTest:testOZSafePermit() (gas: 24555)
+Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129243)
+Permit2LibTest:testOZSafeTransferFrom() (gas: 38941)
+Permit2LibTest:testPermit2() (gas: 22822)
+Permit2LibTest:testPermit2DSLessToken() (gas: 7011)
+Permit2LibTest:testPermit2DSMore32Token() (gas: 7098)
+Permit2LibTest:testPermit2DSMoreToken() (gas: 6979)
+Permit2LibTest:testPermit2Full() (gas: 42242)
+Permit2LibTest:testPermit2InvalidAmount() (gas: 20665)
+Permit2LibTest:testPermit2LargerDS() (gas: 51272)
+Permit2LibTest:testPermit2LargerDSRevert() (gas: 32696)
+Permit2LibTest:testPermit2NonPermitFallback() (gas: 37094)
+Permit2LibTest:testPermit2NonPermitToken() (gas: 32057)
+Permit2LibTest:testPermit2PlusTransferFrom2() (gas: 126939)
+Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermit() (gas: 148045)
+Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermitFallback() (gas: 174683)
+Permit2LibTest:testPermit2PlusTransferFrom2WithWETH9Mainnet() (gas: 147739)
+Permit2LibTest:testPermit2SmallerDS() (gas: 77643)
+Permit2LibTest:testPermit2SmallerDSNoRevert() (gas: 59293)
+Permit2LibTest:testPermit2WETH9Mainnet() (gas: 28736)
+Permit2LibTest:testStandardPermit() (gas: 22386)
+Permit2LibTest:testStandardTransferFrom() (gas: 38143)
+Permit2LibTest:testTransferFrom2() (gas: 38602)
+Permit2LibTest:testTransferFrom2Full() (gas: 53280)
+=======
 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)
@@ -29,22 +80,10 @@ AllowanceTransferTest:testSetAllowanceInvalidSignature() (gas: 64071)
 AllowanceTransferTest:testSetAllowanceTransfer() (gas: 103161)
 AllowanceTransferTest:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 97432)
 AllowanceTransferTest:testTransferFromWithGasSnapshot() (gas: 133004)
-AllowanceUnitTest:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38998, ~: 39076)
-AllowanceUnitTest:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40222, ~: 40223)
-AllowanceUnitTest:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39224, ~: 39225)
 CompactSignature:testCompactSignature27() (gas: 253)
 CompactSignature:testCompactSignature28() (gas: 141)
 EIP712Test:testDomainSeparator() (gas: 5804)
 EIP712Test:testDomainSeparatorAfterFork() (gas: 10787)
-NonceBitmapTest:testHighNonces() (gas: 36186)
-NonceBitmapTest:testInvalidateFullWord() (gas: 63125)
-NonceBitmapTest:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30308, ~: 31008)
-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, μ: 49205, ~: 51640)
-NonceBitmapTest:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
 Permit2LibTest:testOZSafePermit() (gas: 24509)
 Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129197)
 Permit2LibTest:testOZSafeTransferFrom() (gas: 38919)
@@ -69,41 +108,93 @@ Permit2LibTest:testStandardPermit() (gas: 22340)
 Permit2LibTest:testStandardTransferFrom() (gas: 38121)
 Permit2LibTest:testTransferFrom2() (gas: 38580)
 Permit2LibTest:testTransferFrom2Full() (gas: 53258)
+>>>>>>> cce91d844585ac3f5a1ab817efd61b721b4a527e
 Permit2LibTest:testTransferFrom2InvalidAmount() (gas: 12710)
-Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53104)
+Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53126)
 SignatureTransferTest:testCorrectWitnessTypehashes() (gas: 3075)
-SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 270919)
-SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 186316)
-SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 123850)
-SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 41268)
-SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 133644)
+SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 270943)
+SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 186340)
+SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 123852)
+SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 41233)
+SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 133666)
 SignatureTransferTest:testPermitBatchTransferFrom() (gas: 162010)
-SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 190319)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 239854)
+SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 190277)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 239856)
 SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidType() (gas: 84467)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 85864)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 85842)
 SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidWitness() (gas: 85688)
 SignatureTransferTest:testPermitBatchTransferInvalidAmountsLengthMismatch() (gas: 43967)
-SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 160406)
-SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 211834)
+SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 160384)
+SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 211836)
 SignatureTransferTest:testPermitTransferFrom() (gas: 93012)
 SignatureTransferTest:testPermitTransferFromCompactSig() (gas: 123927)
-SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 51327)
-SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 72799)
+SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 51349)
+SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 72755)
 SignatureTransferTest:testPermitTransferFromRandomNonceAndAmount(uint256,uint128) (runs: 256, μ: 95754, ~: 96730)
-SignatureTransferTest:testPermitTransferFromToSpender() (gas: 93342)
-SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 125271)
-SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 55906)
+SignatureTransferTest:testPermitTransferFromToSpender() (gas: 93364)
+SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 125273)
+SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 55928)
 SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidTypehash() (gas: 56794)
-SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 97989, ~: 99707)
-TypehashGeneration:testPermitBatch() (gas: 40493)
+SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 97967, ~: 99685)
+TypehashGeneration:testPermitBatch() (gas: 40515)
 TypehashGeneration:testPermitBatchTransferFrom() (gas: 49854)
-TypehashGeneration:testPermitBatchTransferFromWithWitness() (gas: 56587)
+TypehashGeneration:testPermitBatchTransferFromWithWitness() (gas: 56609)
 TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectPermitData() (gas: 56744)
-TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectTypehashStub() (gas: 57229)
+TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectTypehashStub() (gas: 57251)
 TypehashGeneration:testPermitSingle() (gas: 28117)
 TypehashGeneration:testPermitTransferFrom() (gas: 36520)
-TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43369)
+TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43391)
 TypehashGeneration:testPermitTransferFromWithWitnessIncorrectPermitData() (gas: 43430)
-TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43833)
+TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43855)
 MockPermit2Lib:testPermit2Code(address):(bool) (runs: 256, μ: 3025, ~: 3016)
+<<<<<<< HEAD
+AllowanceUnitTest_ERC20:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38727, ~: 38805)
+AllowanceUnitTest_ERC20:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40210, ~: 40211)
+AllowanceUnitTest_ERC20:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39330, ~: 39331)
+AllowanceUnitTest_ERC721:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38727, ~: 38805)
+AllowanceUnitTest_ERC721:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40210, ~: 40211)
+AllowanceUnitTest_ERC721:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39330, ~: 39331)
+NonceBitmapTest_ERC20:testHighNonces() (gas: 36142)
+NonceBitmapTest_ERC20:testInvalidateFullWord() (gas: 63031)
+NonceBitmapTest_ERC20:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30335, ~: 31035)
+NonceBitmapTest_ERC20:testInvalidateNonzeroWord() (gas: 85489)
+NonceBitmapTest_ERC20:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39067, ~: 39067)
+NonceBitmapTest_ERC20:testLowNonces() (gas: 40894)
+NonceBitmapTest_ERC20:testNonceWordBoundary() (gas: 42168)
+NonceBitmapTest_ERC20:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49018, ~: 51624)
+NonceBitmapTest_ERC20:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
+NonceBitmapTest_ERC721:testHighNonces() (gas: 36142)
+NonceBitmapTest_ERC721:testInvalidateFullWord() (gas: 63031)
+NonceBitmapTest_ERC721:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30335, ~: 31035)
+NonceBitmapTest_ERC721:testInvalidateNonzeroWord() (gas: 85489)
+NonceBitmapTest_ERC721:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39067, ~: 39067)
+NonceBitmapTest_ERC721:testLowNonces() (gas: 40894)
+NonceBitmapTest_ERC721:testNonceWordBoundary() (gas: 42168)
+NonceBitmapTest_ERC721:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49189, ~: 51624)
+NonceBitmapTest_ERC721:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
+=======
+AllowanceUnitTestERC20:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 42090, ~: 42168)
+AllowanceUnitTestERC20:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 42620, ~: 42621)
+AllowanceUnitTestERC20:testUpdateSomeRandomly(uint160,uint48) (runs: 256, μ: 41234, ~: 41235)
+AllowanceUnitTestERC721:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 41651, ~: 41729)
+AllowanceUnitTestERC721:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 42456, ~: 42457)
+AllowanceUnitTestERC721:testUpdateSomeRandomly(uint160,uint48) (runs: 256, μ: 40723, ~: 40724)
+NonceBitmapTest_ERC20:testHighNonces() (gas: 36142)
+NonceBitmapTest_ERC20:testInvalidateFullWord() (gas: 63031)
+NonceBitmapTest_ERC20:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30313, ~: 31013)
+NonceBitmapTest_ERC20:testInvalidateNonzeroWord() (gas: 85489)
+NonceBitmapTest_ERC20:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39001, ~: 39001)
+NonceBitmapTest_ERC20:testLowNonces() (gas: 40894)
+NonceBitmapTest_ERC20:testNonceWordBoundary() (gas: 42168)
+NonceBitmapTest_ERC20:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49104, ~: 51624)
+NonceBitmapTest_ERC20:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
+NonceBitmapTestERC721:testHighNonces() (gas: 36362)
+NonceBitmapTestERC721:testInvalidateFullWord() (gas: 63251)
+NonceBitmapTestERC721:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30203, ~: 30903)
+NonceBitmapTestERC721:testInvalidateNonzeroWord() (gas: 85764)
+NonceBitmapTestERC721:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 38671, ~: 38671)
+NonceBitmapTestERC721:testLowNonces() (gas: 41279)
+NonceBitmapTestERC721:testNonceWordBoundary() (gas: 42344)
+NonceBitmapTestERC721:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49299, ~: 51734)
+NonceBitmapTestERC721:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21954, ~: 21977)
+>>>>>>> cce91d844585ac3f5a1ab817efd61b721b4a527e

src/ERC20/AllowanceTransfer.sol

@@ -4,10 +4,10 @@ pragma solidity 0.8.17;
 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 {SignatureVerification} from "../shared/SignatureVerification.sol";
 import {EIP712} from "./EIP712.sol";
 import {IAllowanceTransfer} from "./interfaces/IAllowanceTransfer.sol";
-import {SignatureExpired, InvalidNonce} from "./PermitErrors.sol";
+import {SignatureExpired, InvalidNonce} from "../shared/PermitErrors.sol";
 import {Allowance} from "./libraries/Allowance.sol";
 
 contract AllowanceTransfer is IAllowanceTransfer, EIP712 {

src/ERC20/SignatureTransfer.sol

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