Reorder

OpenZeppelin · Sep 19, 2024 · 074423d · 074423d
1 parent aa4a7f7
commit 074423d
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 48 deletions.
diff --git a/contracts/account/AccountECDSA.sol → contracts/account/ECDSA/AccountECDSA.sol b/contracts/account/AccountECDSA.sol → contracts/account/ECDSA/AccountECDSA.sol
@@ -2,11 +2,11 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
-import {Account} from "./Account.sol";
-import {ECDSA} from "../utils/cryptography/ECDSA.sol";
-import {Clones} from "../proxy/Clones.sol";
-import {EIP712} from "../utils/cryptography/EIP712.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {ECDSA} from "../../utils/cryptography/ECDSA.sol";
+import {Clones} from "../../proxy/Clones.sol";
+import {EIP712} from "../../utils/cryptography/EIP712.sol";
+import {Account} from "./../Account.sol";
 
 abstract contract AccountECDSA is Account {
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
@@ -22,13 +22,7 @@ abstract contract AccountECDSA is Account {
     }
 }
 
-contract AccountECDSAClonable is AccountECDSA {
-    constructor(
-        IEntryPoint entryPoint_,
-        string memory name,
-        string memory version
-    ) Account(entryPoint_) EIP712(name, version) {}
-
+abstract contract AccountECDSAClonable is AccountECDSA {
     function signer() public view override returns (address) {
         return abi.decode(Clones.fetchCloneArgs(address(this)), (address));
     }

diff --git a/contracts/account/AccountECDSAFactory.sol → ...cts/account/ECDSA/AccountECDSAFactory.sol b/contracts/account/AccountECDSAFactory.sol → ...cts/account/ECDSA/AccountECDSAFactory.sol
@@ -2,17 +2,16 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {AccountFactory} from "./../AccountFactory.sol";
 import {AccountECDSAClonable} from "./AccountECDSA.sol";
-import {AccountFactory} from "./AccountFactory.sol";
 
 abstract contract AccountECDSAFactory is AccountFactory {
     constructor(IEntryPoint entryPoint_, string memory name, string memory version) {
         _accountImplementation = address(new AccountECDSAClonable(entryPoint_, name, version));
     }
 
     function clone(address signer, bytes32 salt) external returns (address) {
-        bytes memory encodedSigner = abi.encode(signer);
-        return _clone(encodedSigner, salt);
+        return _clone(abi.encode(signer), salt);
     }
 }
diff --git a/contracts/account/AccountP256.sol → contracts/account/P256/AccountP256.sol b/contracts/account/AccountP256.sol → contracts/account/P256/AccountP256.sol
@@ -2,11 +2,11 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
-import {Account} from "./Account.sol";
-import {P256} from "../utils/cryptography/P256.sol";
-import {Clones} from "../proxy/Clones.sol";
-import {EIP712} from "../utils/cryptography/EIP712.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {P256} from "../../utils/cryptography/P256.sol";
+import {Clones} from "../../proxy/Clones.sol";
+import {EIP712} from "../../utils/cryptography/EIP712.sol";
+import {Account} from "./../Account.sol";
 
 abstract contract AccountP256 is Account {
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
@@ -31,13 +31,7 @@ abstract contract AccountP256 is Account {
     }
 }
 
-contract AccountP256Clonable is AccountP256 {
-    constructor(
-        IEntryPoint entryPoint_,
-        string memory name,
-        string memory version
-    ) Account(entryPoint_) EIP712(name, version) {}
-
+abstract contract AccountP256Clonable is AccountP256 {
     function signer() public view override returns (bytes32 qx, bytes32 qy) {
         return abi.decode(Clones.fetchCloneArgs(address(this)), (bytes32, bytes32));
     }

diff --git a/contracts/account/AccountP256Factory.sol → ...racts/account/P256/AccountP256Factory.sol b/contracts/account/AccountP256Factory.sol → ...racts/account/P256/AccountP256Factory.sol
@@ -2,17 +2,16 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {AccountFactory} from "./../AccountFactory.sol";
 import {AccountP256Clonable} from "./AccountP256.sol";
-import {AccountFactory} from "./AccountFactory.sol";
 
 abstract contract AccountP256Factory is AccountFactory {
     constructor(IEntryPoint entryPoint_, string memory name, string memory version) {
         _accountImplementation = address(new AccountP256Clonable(entryPoint_, name, version));
     }
 
     function clone(bytes32 qx, bytes32 qy, bytes32 salt) external returns (address) {
-        bytes memory encodedSigner = abi.encode(qx, qy);
-        return _clone(encodedSigner, salt);
+        return _clone(abi.encode(qx, qy), salt);
     }
 }
diff --git a/contracts/account/AccountRSA.sol → contracts/account/RSA/AccountRSA.sol b/contracts/account/AccountRSA.sol → contracts/account/RSA/AccountRSA.sol
@@ -2,11 +2,11 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
-import {Account} from "./Account.sol";
-import {RSA} from "../utils/cryptography/RSA.sol";
-import {Clones} from "../proxy/Clones.sol";
-import {EIP712} from "../utils/cryptography/EIP712.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {RSA} from "../../utils/cryptography/RSA.sol";
+import {Clones} from "../../proxy/Clones.sol";
+import {EIP712} from "../../utils/cryptography/EIP712.sol";
+import {Account} from "./../Account.sol";
 
 abstract contract AccountRSA is Account {
     // NOTE: There is no way to store immutable byte arrays in a contract, so we use private instead
@@ -26,13 +26,7 @@ abstract contract AccountRSA is Account {
     }
 }
 
-contract AccountRSAClonable is AccountRSA {
-    constructor(
-        IEntryPoint entryPoint_,
-        string memory name,
-        string memory version
-    ) Account(entryPoint_) EIP712(name, version) {}
-
+abstract contract AccountRSAClonable is AccountRSA {
     function signer() public view override returns (bytes memory e, bytes memory m) {
         return abi.decode(Clones.fetchCloneArgs(address(this)), (bytes, bytes));
     }

diff --git a/contracts/account/AccountRSAFactory.sol → contracts/account/RSA/AccountRSAFactory.sol b/contracts/account/AccountRSAFactory.sol → contracts/account/RSA/AccountRSAFactory.sol
@@ -2,17 +2,16 @@
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint} from "../interfaces/IERC4337.sol";
+import {IEntryPoint} from "../../interfaces/IERC4337.sol";
+import {AccountFactory} from "./../AccountFactory.sol";
 import {AccountRSAClonable} from "./AccountRSA.sol";
-import {AccountFactory} from "./AccountFactory.sol";
 
 abstract contract AccountRSAFactory is AccountFactory {
     constructor(IEntryPoint entryPoint_, string memory name, string memory version) {
         _accountImplementation = address(new AccountRSAClonable(entryPoint_, name, version));
     }
 
     function clone(bytes memory e, bytes memory m, bytes32 salt) external returns (address) {
-        bytes memory encodedSigner = abi.encode(e, m);
-        return _clone(encodedSigner, salt);
+        return _clone(abi.encode(e, m), salt);
     }
 }