More refactoring

openfort-xyz · Nov 21, 2023 · e3ed943 · e3ed943
1 parent 043ae2d
commit e3ed943
Show file tree

Hide file tree

Showing 17 changed files with 1,708 additions and 2,072 deletions.
diff --git a/contracts/core/base/BaseOpenfortAccount.sol b/contracts/core/base/BaseOpenfortAccount.sol
@@ -9,6 +9,7 @@ import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/mat
 import {BaseAccount, UserOperation, IEntryPoint, UserOperationLib} from "account-abstraction/core/BaseAccount.sol";
 import {TokenCallbackHandler} from "account-abstraction/samples/callback/TokenCallbackHandler.sol";
 import {_packValidationData} from "account-abstraction/core/Helpers.sol";
+import {OpenfortErrorsAndEvents} from "../../interfaces/OpenfortErrorsAndEvents.sol";
 
 /**
  * @title BaseOpenfortAccount (Non upgradeable by default)
@@ -25,7 +26,8 @@ abstract contract BaseOpenfortAccount is
     Initializable,
     EIP712Upgradeable,
     IERC1271Upgradeable,
-    TokenCallbackHandler
+    TokenCallbackHandler,
+    OpenfortErrorsAndEvents
 {
     using ECDSAUpgradeable for bytes32;
 
@@ -59,15 +61,6 @@ abstract contract BaseOpenfortAccount is
 
     mapping(address sessionKey => SessionKeyStruct sessionKeyData) public sessionKeys;
 
-    event AccountImplementationDeployed(address indexed creator);
-    event SessionKeyRegistered(address indexed key);
-    event SessionKeyRevoked(address indexed key);
-
-    error ZeroAddressNotAllowed();
-    error NotOwnerOrEntrypoint();
-    error NotOwner();
-    error InvalidParameterLength();
-
     receive() external payable virtual {}
 
     constructor() {

diff --git a/contracts/core/base/BaseRecoverableAccount.sol b/contracts/core/base/BaseRecoverableAccount.sol
@@ -53,7 +53,6 @@ abstract contract BaseRecoverableAccount is BaseOpenfortAccount, Ownable2StepUpg
     // keccak256("Recover(address recoveryAddress,uint64 executeAfter,uint32 guardiansRequired)");
     bytes32 private constant RECOVER_TYPEHASH = 0x9f7aca777caf11405930359f601a4db01fad1b2d79ef3f2f9e93c835e9feffa5;
 
-    event EntryPointUpdated(address oldEntryPoint, address newEntryPoint);
     event Locked(bool isLocked);
     event GuardianProposed(address indexed guardian, uint256 executeAfter);
     event GuardianAdded(address indexed guardian);
@@ -63,7 +62,7 @@ abstract contract BaseRecoverableAccount is BaseOpenfortAccount, Ownable2StepUpg
     event GuardianRevocationCancelled(address indexed guardian);
     event RecoveryExecuted(address indexed recoveryAddress, uint64 executeAfter);
     event RecoveryCompleted(address indexed recoveryAddress);
-    event RecoveryCanceled(address indexed recoveryAddress);
+    event RecoveryCancelled(address indexed recoveryAddress);
 
     error AccountLocked();
     error AccountNotLocked();
@@ -410,7 +409,7 @@ abstract contract BaseRecoverableAccount is BaseOpenfortAccount, Ownable2StepUpg
     function cancelRecovery() external onlyOwner {
         _requireRecovery(true);
         address recoveryOwner = recoveryDetails.recoveryAddress;
-        emit RecoveryCanceled(recoveryOwner);
+        emit RecoveryCancelled(recoveryOwner);
         delete recoveryDetails;
         _setLock(0);
     }

diff --git a/contracts/core/eip6551/EIP6551OpenfortAccount.sol b/contracts/core/eip6551/EIP6551OpenfortAccount.sol
@@ -30,8 +30,6 @@ contract EIP6551OpenfortAccount is BaseOpenfortAccount, IERC6551Account, IERC655
 
     error OperationNotAllowed();
 
-    event EntryPointUpdated(address oldEntryPoint, address newEntryPoint);
-
     receive() external payable override(BaseOpenfortAccount, IERC6551Account) {}
 
     /*

diff --git a/contracts/interfaces/OpenfortErrorsAndEvents.sol b/contracts/interfaces/OpenfortErrorsAndEvents.sol
@@ -11,6 +11,16 @@ interface OpenfortErrorsAndEvents {
     /// @notice Error when a function requires msg.value to be different than owner()
     error OwnerNotAllowed();
 
+    error ZeroAddressNotAllowed();
+    error NotOwnerOrEntrypoint();
+    error NotOwner();
+    error InvalidParameterLength();
+
+    event AccountImplementationDeployed(address indexed creator);
+    event SessionKeyRegistered(address indexed key);
+    event SessionKeyRevoked(address indexed key);
+    event EntryPointUpdated(address oldEntryPoint, address newEntryPoint);
+
     // Paymaster specifics
 
     /**

diff --git a/script/UserOpTestCounter.sol → script/UserOpTestCounter.s.sol b/script/UserOpTestCounter.sol → script/UserOpTestCounter.s.sol
diff --git a/script/debugUserOp.s.sol b/script/debugUserOp.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity =0.8.19;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 import {UserOperation, EntryPoint} from "account-abstraction/core/EntryPoint.sol";
 
 contract DebugUserOp is Script {
@@ -26,6 +26,6 @@ contract DebugUserOp is Script {
 
         entryPoint.simulateHandleOp(userOp, address(0), "");
         // simulateHandleOp() will always return the following error:
-        //  error ExecutionResult(uint256 preOpGas, uint256 paid, uint48 validAfter, uint48 validUntil, bool targetSuccess, bytes targetResult);
+        // error ExecutionResult(uint256 preOpGas, uint256 paid, uint48 validAfter, uint48 validUntil, bool targetSuccess, bytes targetResult);
     }
 }
diff --git a/script/deployEIP6551.sol → script/deployEIP6551.s.sol b/script/deployEIP6551.sol → script/deployEIP6551.s.sol
diff --git a/script/deployManagedAccounts.sol → script/deployManagedAccounts.s.sol b/script/deployManagedAccounts.sol → script/deployManagedAccounts.s.sol
diff --git a/script/deployMock.sol → script/deployMock.s.sol b/script/deployMock.sol → script/deployMock.s.sol
diff --git a/script/deployRecoverableAccounts.sol b/script/deployRecoverableAccounts.sol
diff --git a/script/deployUpgradeableAccounts.sol → script/deployUpgradeableAccounts.s.sol b/script/deployUpgradeableAccounts.sol → script/deployUpgradeableAccounts.s.sol
diff --git a/script/signMessage.sol → script/signMessage.s.sol b/script/signMessage.sol → script/signMessage.s.sol
diff --git a/test/foundry/4337/Specific4337Tests.t.sol b/test/foundry/4337/Specific4337Tests.t.sol