Remove draft- prefixes from ERC-4337 related files (#6581)

Author: ernestognw

.changeset/erc4337-drop-draft-prefix.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': minor
+---
+
+`ERC4337Utils`, `IERC4337`: Drop the `draft-` prefix from the file names now that ERC-4337 is finalized. Imports must be updated from `account/utils/draft-ERC4337Utils.sol` to `account/utils/ERC4337Utils.sol` and from `interfaces/draft-IERC4337.sol` to `interfaces/IERC4337.sol`.

contracts/account/Account.sol

@@ -3,8 +3,8 @@
 
 pragma solidity ^0.8.20;
 
-import {PackedUserOperation, IAccount, IEntryPoint} from "../interfaces/draft-IERC4337.sol";
-import {ERC4337Utils} from "./utils/draft-ERC4337Utils.sol";
+import {PackedUserOperation, IAccount, IEntryPoint} from "../interfaces/IERC4337.sol";
+import {ERC4337Utils} from "./utils/ERC4337Utils.sol";
 import {AbstractSigner} from "../utils/cryptography/signers/AbstractSigner.sol";
 import {LowLevelCall} from "../utils/LowLevelCall.sol";
 

contracts/account/extensions/draft-AccountERC7579.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.26;
 
-import {PackedUserOperation} from "../../interfaces/draft-IERC4337.sol";
+import {PackedUserOperation} from "../../interfaces/IERC4337.sol";
 import {IERC1271} from "../../interfaces/IERC1271.sol";
 import {
     IERC7579Module,

…cts/account/utils/draft-ERC4337Utils.sol contracts/account/utils/ERC4337Utils.solcontracts/account/utils/draft-ERC4337Utils.sol renamed to contracts/account/utils/ERC4337Utils.sol contracts/account/utils/draft-ERC4337Utils.sol renamed to contracts/account/utils/ERC4337Utils.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v5.6.0) (account/utils/draft-ERC4337Utils.sol)
+// OpenZeppelin Contracts (last updated v5.6.0) (account/utils/ERC4337Utils.sol)
 
 pragma solidity ^0.8.20;
 
-import {IEntryPoint, PackedUserOperation} from "../../interfaces/draft-IERC4337.sol";
+import {IEntryPoint, PackedUserOperation} from "../../interfaces/IERC4337.sol";
 import {Math} from "../../utils/math/Math.sol";
 import {Calldata} from "../../utils/Calldata.sol";
 import {Packing} from "../../utils/Packing.sol";

contracts/interfaces/draft-IERC4337.sol contracts/interfaces/IERC4337.solcontracts/interfaces/draft-IERC4337.sol renamed to contracts/interfaces/IERC4337.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v5.6.0) (interfaces/draft-IERC4337.sol)
+// OpenZeppelin Contracts (last updated v5.6.0) (interfaces/IERC4337.sol)
 
 pragma solidity >=0.8.4;
 

contracts/interfaces/draft-IERC7579.sol

@@ -3,7 +3,7 @@
 
 pragma solidity >=0.8.4;
 
-import {PackedUserOperation} from "./draft-IERC4337.sol";
+import {PackedUserOperation} from "./IERC4337.sol";
 
 uint256 constant VALIDATION_SUCCESS = 0;
 uint256 constant VALIDATION_FAILED = 1;

contracts/mocks/Stateless.sol

@@ -30,7 +30,7 @@ import {ERC165Checker} from "../utils/introspection/ERC165Checker.sol";
 import {ERC721Holder} from "../token/ERC721/utils/ERC721Holder.sol";
 import {ERC1155Holder} from "../token/ERC1155/utils/ERC1155Holder.sol";
 import {ERC1967Utils} from "../proxy/ERC1967/ERC1967Utils.sol";
-import {ERC4337Utils} from "../account/utils/draft-ERC4337Utils.sol";
+import {ERC4337Utils} from "../account/utils/ERC4337Utils.sol";
 import {ERC7579Utils} from "../account/utils/draft-ERC7579Utils.sol";
 import {ERC7913P256Verifier} from "../utils/cryptography/verifiers/ERC7913P256Verifier.sol";
 import {ERC7913RSAVerifier} from "../utils/cryptography/verifiers/ERC7913RSAVerifier.sol";

contracts/mocks/account/AccountMock.sol

@@ -10,7 +10,7 @@ import {ERC1155Holder} from "../../token/ERC1155/utils/ERC1155Holder.sol";
 import {ERC7739} from "../../utils/cryptography/signers/draft-ERC7739.sol";
 import {ERC7821} from "../../account/extensions/draft-ERC7821.sol";
 import {MODULE_TYPE_VALIDATOR} from "../../interfaces/draft-IERC7579.sol";
-import {PackedUserOperation} from "../../interfaces/draft-IERC4337.sol";
+import {PackedUserOperation} from "../../interfaces/IERC4337.sol";
 import {AbstractSigner} from "../../utils/cryptography/signers/AbstractSigner.sol";
 import {SignerECDSA} from "../../utils/cryptography/signers/SignerECDSA.sol";
 import {SignerP256} from "../../utils/cryptography/signers/SignerP256.sol";

contracts/mocks/account/modules/ERC7579Mock.sol

@@ -11,9 +11,9 @@ import {
     IERC7579Validator
 } from "../../../interfaces/draft-IERC7579.sol";
 import {SignatureChecker} from "../../../utils/cryptography/SignatureChecker.sol";
-import {PackedUserOperation} from "../../../interfaces/draft-IERC4337.sol";
+import {PackedUserOperation} from "../../../interfaces/IERC4337.sol";
 import {IERC1271} from "../../../interfaces/IERC1271.sol";
-import {ERC4337Utils} from "../../../account/utils/draft-ERC4337Utils.sol";
+import {ERC4337Utils} from "../../../account/utils/ERC4337Utils.sol";
 
 abstract contract ERC7579ModuleMock is IERC7579Module {
     uint256 private _moduleTypeId;

test/account/AccountEIP7702.t.sol

@@ -12,9 +12,9 @@ import {
     ModeSelector,
     ModePayload
 } from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol";
-import {ERC4337Utils, IEntryPointExtra} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
+import {ERC4337Utils, IEntryPointExtra} from "@openzeppelin/contracts/account/utils/ERC4337Utils.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
+import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/IERC4337.sol";
 import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";
 
 contract AccountEIP7702MockConstructor is AccountEIP7702Mock {