Skip to content

Commit

Permalink
Optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vectorized
Vectorized committed Jan 22, 2024
1 parent 18adf11 commit 3fb10c1
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 56 deletions.
92 changes: 46 additions & 46 deletions .gas-snapshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,25 +227,25 @@ ERC4337FactoryTest:test__codesize() (gas: 13520)
ERC4337Test:testCdFallback() (gas: 443989)
ERC4337Test:testCdFallback2() (gas: 1140699)
ERC4337Test:testDelegateExecute() (gas: 369570)
ERC4337Test:testDelegateExecute(uint256) (runs: 256, μ: 352832, ~: 344555)
ERC4337Test:testDelegateExecute(uint256) (runs: 256, μ: 353389, ~: 344555)
ERC4337Test:testDelegateExecuteRevertsIfOwnerSlotValueChanged() (gas: 319282)
ERC4337Test:testDepositFunctions() (gas: 502955)
ERC4337Test:testDirectStorage() (gas: 70413)
ERC4337Test:testDisableInitializerForImplementation() (gas: 1177324)
ERC4337Test:testETHReceived() (gas: 16584)
ERC4337Test:testExecute() (gas: 382786)
ERC4337Test:testExecuteBatch() (gas: 692605)
ERC4337Test:testExecuteBatch(uint256) (runs: 256, μ: 519572, ~: 368320)
ERC4337Test:testExecuteBatch(uint256) (runs: 256, μ: 503741, ~: 368210)
ERC4337Test:testInitializer() (gas: 285192)
ERC4337Test:testIsValidSignature() (gas: 111663)
ERC4337Test:testIsValidSignaturePersonalSign() (gas: 96270)
ERC4337Test:testIsValidSignatureWrapped() (gas: 406706)
ERC4337Test:testOnERC1155BatchReceived() (gas: 1393788)
ERC4337Test:testOnERC1155Received() (gas: 1391111)
ERC4337Test:testOnERC721Received() (gas: 1366600)
ERC4337Test:testOnERC721Received() (gas: 1364600)
ERC4337Test:testOwnerRecovery() (gas: 486105)
ERC4337Test:testValidateUserOp() (gas: 491555)
ERC4337Test:test__codesize() (gas: 54778)
ERC4337Test:test__codesize() (gas: 54768)
ERC4626Test:testDepositWithNoApprovalReverts() (gas: 16371)
ERC4626Test:testDepositWithNotEnoughApprovalReverts() (gas: 89884)
ERC4626Test:testDifferentialFullMulDiv(uint256,uint256,uint256) (runs: 256, μ: 3325, ~: 3185)
Expand All @@ -266,21 +266,21 @@ ERC4626Test:testWithdrawWithNotEnoughUnderlyingAmountReverts() (gas: 144074)
ERC4626Test:testWithdrawZero() (gas: 52807)
ERC4626Test:test__codesize() (gas: 41067)
ERC6551Test:testCdFallback() (gas: 894585)
ERC6551Test:testDeployERC6551(uint256) (runs: 256, μ: 171288, ~: 168767)
ERC6551Test:testDeployERC6551(uint256) (runs: 256, μ: 171237, ~: 168767)
ERC6551Test:testDeployERC6551Proxy() (gas: 80751)
ERC6551Test:testExecute() (gas: 507949)
ERC6551Test:testExecuteBatch() (gas: 817049)
ERC6551Test:testExecuteBatch(uint256) (runs: 256, μ: 630199, ~: 483214)
ERC6551Test:testExecuteBatch(uint256) (runs: 256, μ: 616724, ~: 483220)
ERC6551Test:testInitializeERC6551ProxyImplementation() (gas: 189807)
ERC6551Test:testIsValidSignature() (gas: 187653)
ERC6551Test:testOnERC1155BatchReceived() (gas: 1526548)
ERC6551Test:testOnERC1155Received() (gas: 1523904)
ERC6551Test:testOnERC721Received() (gas: 1503328)
ERC6551Test:testOnERC721Received() (gas: 1501328)
ERC6551Test:testOnERC721ReceivedCycles() (gas: 1714290)
ERC6551Test:testOnERC721ReceivedCyclesWithDifferentChainIds(uint256) (runs: 256, μ: 449044, ~: 454558)
ERC6551Test:testOnERC721ReceivedCyclesWithDifferentChainIds(uint256) (runs: 256, μ: 448739, ~: 454220)
ERC6551Test:testSupportsInterface() (gas: 169393)
ERC6551Test:testUpgrade() (gas: 1154917)
ERC6551Test:test__codesize() (gas: 48038)
ERC6551Test:test__codesize() (gas: 48028)
ERC6909Test:testApprove() (gas: 36771)
ERC6909Test:testApprove(address,uint256,uint256) (runs: 256, μ: 36480, ~: 37413)
ERC6909Test:testBurn() (gas: 40676)
Expand Down Expand Up @@ -317,57 +317,57 @@ ERC6909Test:testTransferInsufficientBalanceReverts(address,uint256,uint256,uint2
ERC6909Test:testTransferOverMaxUintReverts() (gas: 63438)
ERC6909Test:testTransferOverMaxUintReverts(address,uint256,uint256,uint256) (runs: 256, μ: 63957, ~: 63967)
ERC6909Test:test__codesize() (gas: 26802)
ERC721HooksTest:testERC721Hooks() (gas: 2938642)
ERC721HooksTest:test__codesize() (gas: 10002)
ERC721Test:testApprove(uint256) (runs: 256, μ: 108112, ~: 108130)
ERC721Test:testApproveAll(uint256) (runs: 256, μ: 47968, ~: 40334)
ERC721Test:testApproveBurn(uint256) (runs: 256, μ: 86804, ~: 86849)
ERC721Test:testApproveNonExistentReverts(uint256,address) (runs: 256, μ: 33638, ~: 33571)
ERC721Test:testApproveUnauthorizedReverts(uint256) (runs: 256, μ: 83347, ~: 82532)
ERC721HooksTest:testERC721Hooks() (gas: 2936628)
ERC721HooksTest:test__codesize() (gas: 9992)
ERC721Test:testApprove(uint256) (runs: 256, μ: 108124, ~: 108134)
ERC721Test:testApproveAll(uint256) (runs: 256, μ: 48057, ~: 40334)
ERC721Test:testApproveBurn(uint256) (runs: 256, μ: 86782, ~: 86843)
ERC721Test:testApproveNonExistentReverts(uint256,address) (runs: 256, μ: 33641, ~: 33571)
ERC721Test:testApproveUnauthorizedReverts(uint256) (runs: 256, μ: 83282, ~: 82355)
ERC721Test:testAuthorizedEquivalence(address,bool,bool) (runs: 256, μ: 748, ~: 743)
ERC721Test:testAux(uint256) (runs: 256, μ: 191930, ~: 193054)
ERC721Test:testBurn(uint256) (runs: 256, μ: 82819, ~: 93918)
ERC721Test:testAux(uint256) (runs: 256, μ: 191946, ~: 193057)
ERC721Test:testBurn(uint256) (runs: 256, μ: 82525, ~: 93910)
ERC721Test:testBurnNonExistentReverts(uint256) (runs: 256, μ: 10783, ~: 10783)
ERC721Test:testCannotExceedMaxBalance() (gas: 169055)
ERC721Test:testDoubleBurnReverts(uint256) (runs: 256, μ: 63584, ~: 63583)
ERC721Test:testDoubleMintReverts(uint256) (runs: 256, μ: 79139, ~: 79170)
ERC721Test:testEverything(uint256) (runs: 256, μ: 314405, ~: 302356)
ERC721Test:testExtraData(uint256) (runs: 256, μ: 99112, ~: 99144)
ERC721Test:testDoubleBurnReverts(uint256) (runs: 256, μ: 63580, ~: 63525)
ERC721Test:testDoubleMintReverts(uint256) (runs: 256, μ: 79138, ~: 79170)
ERC721Test:testEverything(uint256) (runs: 256, μ: 307030, ~: 302004)
ERC721Test:testExtraData(uint256) (runs: 256, μ: 99136, ~: 99192)
ERC721Test:testExtraData2(uint256,uint256) (runs: 256, μ: 54285, ~: 53934)
ERC721Test:testIsApprovedOrOwner(uint256) (runs: 256, μ: 135176, ~: 135199)
ERC721Test:testMint(uint256) (runs: 256, μ: 82829, ~: 82879)
ERC721Test:testMintAndSetExtraDataUnchecked(uint256) (runs: 256, μ: 84345, ~: 84385)
ERC721Test:testMintAndSetExtraDataUncheckedWithOverwrite(uint256,uint96) (runs: 256, μ: 83613, ~: 83670)
ERC721Test:testIsApprovedOrOwner(uint256) (runs: 256, μ: 135180, ~: 135199)
ERC721Test:testMint(uint256) (runs: 256, μ: 82831, ~: 82879)
ERC721Test:testMintAndSetExtraDataUnchecked(uint256) (runs: 256, μ: 84349, ~: 84385)
ERC721Test:testMintAndSetExtraDataUncheckedWithOverwrite(uint256,uint96) (runs: 256, μ: 83607, ~: 83515)
ERC721Test:testMintToZeroReverts(uint256) (runs: 256, μ: 39197, ~: 39197)
ERC721Test:testOwnerOfNonExistent(uint256) (runs: 256, μ: 33394, ~: 33338)
ERC721Test:testSafeMintToEOA(uint256) (runs: 256, μ: 83328, ~: 83369)
ERC721Test:testSafeMintToERC721Recipient(uint256) (runs: 256, μ: 409309, ~: 410424)
ERC721Test:testSafeMintToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 470745, ~: 460016)
ERC721Test:testOwnerOfNonExistent(uint256) (runs: 256, μ: 33397, ~: 33338)
ERC721Test:testSafeMintToEOA(uint256) (runs: 256, μ: 83340, ~: 83386)
ERC721Test:testSafeMintToERC721Recipient(uint256) (runs: 256, μ: 409317, ~: 410424)
ERC721Test:testSafeMintToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 470741, ~: 460008)
ERC721Test:testSafeMintToERC721RecipientWithWrongReturnData(uint256) (runs: 256, μ: 169926, ~: 169926)
ERC721Test:testSafeMintToERC721RecipientWithWrongReturnDataWithData(uint256,bytes) (runs: 256, μ: 171141, ~: 171088)
ERC721Test:testSafeMintToNonERC721RecipientReverts(uint256) (runs: 256, μ: 100388, ~: 100388)
ERC721Test:testSafeMintToNonERC721RecipientWithDataReverts(uint256,bytes) (runs: 256, μ: 101635, ~: 101582)
ERC721Test:testSafeMintToRevertingERC721RecipientReverts(uint256) (runs: 256, μ: 203045, ~: 203045)
ERC721Test:testSafeMintToRevertingERC721RecipientWithDataReverts(uint256,bytes) (runs: 256, μ: 204281, ~: 204228)
ERC721Test:testSafeTransferFromToEOA(uint256) (runs: 256, μ: 121907, ~: 121998)
ERC721Test:testSafeTransferFromToERC721Recipient(uint256) (runs: 256, μ: 470909, ~: 472029)
ERC721Test:testSafeTransferFromToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 532319, ~: 521665)
ERC721Test:testSafeTransferFromToERC721RecipientWithWrongReturnDataReverts(uint256) (runs: 256, μ: 200869, ~: 200919)
ERC721Test:testSafeTransferFromToERC721RecipientWithWrongReturnDataWithDataReverts(uint256,bytes) (runs: 256, μ: 202108, ~: 202123)
ERC721Test:testSafeTransferFromToNonERC721RecipientReverts(uint256) (runs: 256, μ: 131276, ~: 131217)
ERC721Test:testSafeTransferFromToEOA(uint256) (runs: 256, μ: 121881, ~: 122011)
ERC721Test:testSafeTransferFromToERC721Recipient(uint256) (runs: 256, μ: 470888, ~: 472029)
ERC721Test:testSafeTransferFromToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 532327, ~: 521634)
ERC721Test:testSafeTransferFromToERC721RecipientWithWrongReturnDataReverts(uint256) (runs: 256, μ: 200870, ~: 200919)
ERC721Test:testSafeTransferFromToERC721RecipientWithWrongReturnDataWithDataReverts(uint256,bytes) (runs: 256, μ: 202113, ~: 202125)
ERC721Test:testSafeTransferFromToNonERC721RecipientReverts(uint256) (runs: 256, μ: 131273, ~: 131217)
ERC721Test:testSafeTransferFromToNonERC721RecipientWithDataReverts(uint256,bytes) (runs: 256, μ: 132589, ~: 132600)
ERC721Test:testSafeTransferFromToRevertingERC721RecipientReverts(uint256) (runs: 256, μ: 233944, ~: 233996)
ERC721Test:testSafeTransferFromToRevertingERC721RecipientWithDataReverts(uint256,bytes) (runs: 256, μ: 235253, ~: 235264)
ERC721Test:testSafeTransferFromToRevertingERC721RecipientReverts(uint256) (runs: 256, μ: 233946, ~: 233996)
ERC721Test:testSafeTransferFromToRevertingERC721RecipientWithDataReverts(uint256,bytes) (runs: 256, μ: 235256, ~: 235265)
ERC721Test:testSafetyOfCustomStorage(uint256,uint256) (runs: 256, μ: 1063, ~: 713)
ERC721Test:testTransferFrom() (gas: 85763)
ERC721Test:testTransferFrom(uint256) (runs: 256, μ: 113797, ~: 112450)
ERC721Test:testTransferFromApproveAll(uint256) (runs: 256, μ: 119282, ~: 119257)
ERC721Test:testTransferFromNotExistentReverts(address,address,uint256) (runs: 256, μ: 34047, ~: 34014)
ERC721Test:testTransferFromNotOwner(uint256) (runs: 256, μ: 84732, ~: 84702)
ERC721Test:testTransferFromSelf(uint256) (runs: 256, μ: 92705, ~: 92688)
ERC721Test:testTransferFromToZeroReverts(uint256) (runs: 256, μ: 62792, ~: 62791)
ERC721Test:testTransferFromWrongFromReverts(address,uint256) (runs: 256, μ: 80442, ~: 80450)
ERC721Test:test__codesize() (gas: 43689)
ERC721Test:testTransferFrom(uint256) (runs: 256, μ: 113893, ~: 112451)
ERC721Test:testTransferFromApproveAll(uint256) (runs: 256, μ: 119273, ~: 119239)
ERC721Test:testTransferFromNotExistentReverts(address,address,uint256) (runs: 256, μ: 34030, ~: 34007)
ERC721Test:testTransferFromNotOwner(uint256) (runs: 256, μ: 84721, ~: 84702)
ERC721Test:testTransferFromSelf(uint256) (runs: 256, μ: 92694, ~: 92688)
ERC721Test:testTransferFromToZeroReverts(uint256) (runs: 256, μ: 62786, ~: 62784)
ERC721Test:testTransferFromWrongFromReverts(address,uint256) (runs: 256, μ: 80443, ~: 80434)
ERC721Test:test__codesize() (gas: 43679)
FixedPointMathLibTest:testAbs() (gas: 578)
FixedPointMathLibTest:testAbs(int256) (runs: 256, μ: 516, ~: 485)
FixedPointMathLibTest:testAbsEdgeCases() (gas: 410)
Expand Down
14 changes: 4 additions & 10 deletions src/tokens/ERC721.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,8 @@ abstract contract ERC721 {
let owner := and(bitmaskAddress, ownershipPacked)
// Revert if `from` is not the owner, or does not exist.
if iszero(mul(owner, eq(owner, from))) {
if iszero(owner) {
mstore(0x00, 0xceea21b6) // `TokenDoesNotExist()`.
revert(0x1c, 0x04)
}
mstore(0x00, 0xa1148100) // `TransferFromIncorrectOwner()`.
// `TokenDoesNotExist()`, `TransferFromIncorrectOwner()`.
mstore(shl(2, iszero(owner)), 0xceea21b6a1148100)
revert(0x1c, 0x04)
}
// Load, check, and update the token approval.
Expand Down Expand Up @@ -761,11 +758,8 @@ abstract contract ERC721 {
let owner := and(bitmaskAddress, ownershipPacked)
// Revert if `from` is not the owner, or does not exist.
if iszero(mul(owner, eq(owner, from))) {
if iszero(owner) {
mstore(0x00, 0xceea21b6) // `TokenDoesNotExist()`.
revert(0x1c, 0x04)
}
mstore(0x00, 0xa1148100) // `TransferFromIncorrectOwner()`.
// `TokenDoesNotExist()`, `TransferFromIncorrectOwner()`.
mstore(shl(2, iszero(owner)), 0xceea21b6a1148100)
revert(0x1c, 0x04)
}
// Load, check, and update the token approval.
Expand Down

0 comments on commit 3fb10c1

Please sign in to comment.