More optimizations

openfort-xyz · Nov 15, 2023 · f8b9344 · f8b9344
1 parent 17e8adc
commit f8b9344
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/contracts/core/BaseOpenfortAccount.sol b/contracts/core/BaseOpenfortAccount.sol
@@ -154,16 +154,16 @@ abstract contract BaseOpenfortAccount is
 
             // Check if it is a masterSessionKey (no whitelist applies)
             if (sessionKey.masterSessionKey) return true;
-
-            for (uint256 i = 0; i < toContracts.length;) {
+            uint256 i;
+            for (i; i < toContracts.length;) {
                 if (toContracts[i] == address(this)) {
                     return false;
                 } // Only masterSessionKey can reenter
                 if (sessionKey.whitelising && !sessionKey.whitelist[toContracts[i]]) {
                     return false;
                 } // One contract's not in the sessionKey's whitelist (if any)
                 unchecked {
-                    ++i; // gas optimization
+                    ++i;
                 }
             }
             return true;
@@ -217,10 +217,11 @@ abstract contract BaseOpenfortAccount is
         if (_target.length > 9 || _target.length != _calldata.length || _target.length != _value.length) {
             revert InvalidParameterLength();
         }
-        for (uint256 i = 0; i < _target.length;) {
+        uint256 i;
+        for (i; i < _target.length;) {
             _call(_target[i], _value[i], _calldata[i]);
             unchecked {
-                ++i; // gas optimization
+                ++i;
             }
         }
     }
@@ -263,7 +264,7 @@ abstract contract BaseOpenfortAccount is
         override
         returns (uint256 validationData)
     {
-        // require(entryPoint().getUserOpHash(userOp) == userOpHash, "MEEECK!");
+        require(entryPoint().getUserOpHash(userOp) == userOpHash, "Calculated userOpHash doesn't match");
         bytes32 hash = userOpHash.toEthSignedMessageHash();
         address signer = hash.recover(userOp.signature);
 
@@ -296,14 +297,14 @@ abstract contract BaseOpenfortAccount is
         _requireFromEntryPointOrOwner();
 
         require(_whitelist.length < 11, "Whitelist too big");
-        uint256 i = 0;
+        uint256 i;
         for (i; i < _whitelist.length;) {
             sessionKeys[_key].whitelist[_whitelist[i]] = true;
             unchecked {
-                ++i; // gas optimization
+                ++i;
             }
         }
-        if (i > 0) {
+        if (i != 0) {
             // If there was some whitelisting, it is not a masterSessionKey
             sessionKeys[_key].whitelising = true;
             sessionKeys[_key].masterSessionKey = false;

diff --git a/contracts/core/eip6551/EIP6551OpenfortAccount.sol b/contracts/core/eip6551/EIP6551OpenfortAccount.sol
@@ -30,6 +30,8 @@ contract EIP6551OpenfortAccount is BaseOpenfortAccount, IERC6551Account, IERC655
 
     uint256 public state;
 
+    error OperationNotAllowed();
+
     event EntryPointUpdated(address oldEntryPoint, address newEntryPoint);
 
     receive() external payable override(BaseOpenfortAccount, IERC6551Account) {}
@@ -89,7 +91,7 @@ contract EIP6551OpenfortAccount is BaseOpenfortAccount, IERC6551Account, IERC655
         override
         returns (bytes memory _result)
     {
-        require(_operation == 0, "Only call operations are supported");
+        if (_operation != 0) revert OperationNotAllowed();
         ++state;
         bool success;
         // solhint-disable-next-line avoid-low-level-calls

diff --git a/contracts/core/managed/ManagedOpenfortFactory.sol b/contracts/core/managed/ManagedOpenfortFactory.sol
@@ -40,9 +40,7 @@ contract ManagedOpenfortFactory is IBaseOpenfortFactory, UpgradeableBeacon {
         bytes32 salt = keccak256(abi.encode(_admin, _nonce));
         account = getAddressWithNonce(_admin, _nonce);
 
-        if (account.code.length > 0) {
-            return account;
-        }
+        if (account.code.length != 0) return account;
 
         emit AccountCreated(account, _admin);
         account = address(

diff --git a/contracts/core/recoverable/RecoverableOpenfortAccount.sol b/contracts/core/recoverable/RecoverableOpenfortAccount.sol
@@ -54,7 +54,7 @@ contract RecoverableOpenfortAccount is BaseOpenfortAccount, Ownable2StepUpgradea
     RecoveryConfig public recoveryDetails;
 
     // keccak256("Recover(address recoveryAddress,uint64 executeAfter,uint32 guardiansRequired)");
-    bytes32 public constant RECOVER_TYPEHASH = 0x9f7aca777caf11405930359f601a4db01fad1b2d79ef3f2f9e93c835e9feffa5;
+    bytes32 private constant RECOVER_TYPEHASH = 0x9f7aca777caf11405930359f601a4db01fad1b2d79ef3f2f9e93c835e9feffa5;
 
     event EntryPointUpdated(address oldEntryPoint, address newEntryPoint);
     event Locked(bool isLocked);
@@ -208,7 +208,8 @@ contract RecoverableOpenfortAccount is BaseOpenfortAccount, Ownable2StepUpgradea
      */
     function getGuardians() external view returns (address[] memory) {
         address[] memory guardians = new address[](guardiansConfig.guardians.length);
-        for (uint256 i = 0; i < guardiansConfig.guardians.length;) {
+        uint256 i;
+        for (i; i < guardiansConfig.guardians.length;) {
             guardians[i] = guardiansConfig.guardians[i];
             unchecked {
                 ++i; // gas optimization

diff --git a/contracts/mock/SimpleNFT.sol b/contracts/mock/SimpleNFT.sol
@@ -11,6 +11,6 @@ contract SimpleNFT is ERC721 {
 
     // Anyone can mint an NFT for anyone
     function mint(address _to) public {
-        _safeMint(_to, tokenId++);
+        _safeMint(_to, ++tokenId);
     }
 }