⚡️ Optimize ERC4337 storageGuard (ethereum#649)

Author: Vectorized

.gas-snapshot

@@ -221,27 +221,27 @@ ERC2981Test:testRoyaltyOverflowCheckDifferential(uint256,uint256) (runs: 256, μ
 ERC2981Test:testSetAndGetRoyaltyInfo(uint256) (runs: 256, μ: 107629, ~: 104801)
 ERC2981Test:test__codesize() (gas: 8419)
 ERC4337FactoryTest:testDeploy() (gas: 112614)
-ERC4337FactoryTest:testDeploy(uint256) (runs: 256, μ: 135772, ~: 135781)
-ERC4337FactoryTest:testDeployDeterministic(uint256) (runs: 256, μ: 131090, ~: 137159)
+ERC4337FactoryTest:testDeploy(uint256) (runs: 256, μ: 135781, ~: 135781)
+ERC4337FactoryTest:testDeployDeterministic(uint256) (runs: 256, μ: 132993, ~: 137165)
 ERC4337FactoryTest:testDeployDeterministicRevertWithDeploymentFailed() (gas: 96883638)
-ERC4337FactoryTest:test__codesize() (gas: 11372)
-ERC4337Test:testDelegateExecute() (gas: 370507)
-ERC4337Test:testDelegateExecute(uint256) (runs: 256, μ: 354240, ~: 344085)
-ERC4337Test:testDelegateExecuteRevertsIfOwnerSlotValueChanged() (gas: 318922)
+ERC4337FactoryTest:test__codesize() (gas: 11354)
+ERC4337Test:testDelegateExecute() (gas: 370417)
+ERC4337Test:testDelegateExecute(uint256) (runs: 256, μ: 354765, ~: 343995)
+ERC4337Test:testDelegateExecuteRevertsIfOwnerSlotValueChanged() (gas: 318832)
 ERC4337Test:testDepositFunctions() (gas: 502796)
-ERC4337Test:testDirectStorage() (gas: 70958)
+ERC4337Test:testDirectStorage() (gas: 70943)
 ERC4337Test:testETHReceived() (gas: 16606)
 ERC4337Test:testExecute() (gas: 382275)
 ERC4337Test:testExecuteBatch() (gas: 691383)
-ERC4337Test:testExecuteBatch(uint256) (runs: 256, μ: 516631, ~: 367594)
+ERC4337Test:testExecuteBatch(uint256) (runs: 256, μ: 530520, ~: 571824)
 ERC4337Test:testInitializer() (gas: 285354)
 ERC4337Test:testIsValidSignature() (gas: 66115)
 ERC4337Test:testIsValidSignatureWrapped() (gas: 388471)
 ERC4337Test:testOnERC1155BatchReceived() (gas: 1393612)
 ERC4337Test:testOnERC1155Received() (gas: 1390956)
 ERC4337Test:testOnERC721Received() (gas: 1311297)
 ERC4337Test:testValidateUserOp() (gas: 491252)
-ERC4337Test:test__codesize() (gas: 44427)
+ERC4337Test:test__codesize() (gas: 44409)
 ERC4626Test:testDepositWithNoApprovalReverts() (gas: 16371)
 ERC4626Test:testDepositWithNotEnoughApprovalReverts() (gas: 89884)
 ERC4626Test:testDifferentialFullMulDiv(uint256,uint256,uint256) (runs: 256, μ: 3336, ~: 3201)

src/accounts/ERC4337.sol

@@ -260,8 +260,8 @@ contract ERC4337 is Ownable, UUPSUpgradeable, Receiver {
         bytes32 ownerSlotValue = _ownerSlotValue();
         bytes32 implementationSlotValue = _implementationSlotValue();
         _;
-        assert(_implementationSlotValue() == implementationSlotValue);
-        assert(_ownerSlotValue() == ownerSlotValue);
+        assert(implementationSlotValue == _implementationSlotValue());
+        assert(ownerSlotValue == _ownerSlotValue());
     }
 
     /// @dev Requires that the caller is the EntryPoint, the owner, or the account itself.