Skip to content

Commit 0a00486

Browse files
ernestognwAmxx
andauthored
Remove draft- prefix for ERC6909 (#5929)
Co-authored-by: Hadrien Croubois <[email protected]>
1 parent b9c7078 commit 0a00486

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
### Breaking changes
88

9+
- `ERC6909` and the its extensions (`ERC6909ContentURI`, `ERC6909Metadata` and `ERC6909TokenSupply`) are no longer marked as draft since [EIP-6909](https://eips.ethereum.org/EIPS/eip-6909) is now final. Developers must update the import paths. Contracts behavior is not modified.
910
- `SignerERC7702` is renamed as `SignerEIP7702`. Imports and inheritance must be updated to that new name and path. Behavior is unmodified.
1011
- `ERC721Holder` and `ERC1155Holder` are flagged as stateless and are no longer transpiled. Developers using their upgradeable variants from `@openzeppelin/contracts-upgradeable` (i.e. `ERC712HolderUpgradeable` and `ERC1155HolderUpgradeable`) must update their imports to use the equivalent version available in `@openzeppelin/contracts`.
1112
- Update minimum pragma to 0.8.24 in `Votes`, `VotesExtended`, `ERC20Votes`, `Strings`, `ERC1155URIStorage`, `MessageHashUtils`, `ERC721URIStorage`, `ERC721Votes`, `ERC721Wrapper`, `ERC721Burnable`, `ERC721Consecutive`, `ERC721Enumerable`, `ERC721Pausable`, `ERC721Royalty`, `ERC721Wrapper`, `EIP712`, `ERC4626` and `ERC7739`. ([#5726](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5726))

contracts/interfaces/draft-IERC6909.sol renamed to contracts/interfaces/IERC6909.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v5.4.0) (interfaces/draft-IERC6909.sol)
2+
// OpenZeppelin Contracts (last updated v5.4.0) (interfaces/IERC6909.sol)
33

44
pragma solidity >=0.6.2;
55

contracts/mocks/docs/token/ERC6909/ERC6909GameItems.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.20;
33

4-
import {ERC6909Metadata} from "../../../../token/ERC6909/extensions/draft-ERC6909Metadata.sol";
4+
import {ERC6909Metadata} from "../../../../token/ERC6909/extensions/ERC6909Metadata.sol";
55

66
contract ERC6909GameItems is ERC6909Metadata {
77
uint256 public constant GOLD = 0;

contracts/token/ERC6909/draft-ERC6909.sol renamed to contracts/token/ERC6909/ERC6909.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/draft-ERC6909.sol)
2+
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/ERC6909.sol)
33

44
pragma solidity ^0.8.20;
55

6-
import {IERC6909} from "../../interfaces/draft-IERC6909.sol";
6+
import {IERC6909} from "../../interfaces/IERC6909.sol";
77
import {Context} from "../../utils/Context.sol";
88
import {IERC165, ERC165} from "../../utils/introspection/ERC165.sol";
99

contracts/token/ERC6909/extensions/draft-ERC6909ContentURI.sol renamed to contracts/token/ERC6909/extensions/ERC6909ContentURI.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/draft-ERC6909ContentURI.sol)
2+
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/ERC6909ContentURI.sol)
33

44
pragma solidity ^0.8.20;
55

6-
import {ERC6909} from "../draft-ERC6909.sol";
7-
import {IERC6909ContentURI} from "../../../interfaces/draft-IERC6909.sol";
6+
import {ERC6909} from "../ERC6909.sol";
7+
import {IERC6909ContentURI} from "../../../interfaces/IERC6909.sol";
88

99
/**
1010
* @dev Implementation of the Content URI extension defined in ERC6909.

contracts/token/ERC6909/extensions/draft-ERC6909Metadata.sol renamed to contracts/token/ERC6909/extensions/ERC6909Metadata.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/draft-ERC6909Metadata.sol)
2+
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/ERC6909Metadata.sol)
33

44
pragma solidity ^0.8.20;
55

6-
import {ERC6909} from "../draft-ERC6909.sol";
7-
import {IERC6909Metadata} from "../../../interfaces/draft-IERC6909.sol";
6+
import {ERC6909} from "../ERC6909.sol";
7+
import {IERC6909Metadata} from "../../../interfaces/IERC6909.sol";
88

99
/**
1010
* @dev Implementation of the Metadata extension defined in ERC6909. Exposes the name, symbol, and decimals of each token id.

contracts/token/ERC6909/extensions/draft-ERC6909TokenSupply.sol renamed to contracts/token/ERC6909/extensions/ERC6909TokenSupply.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/draft-ERC6909TokenSupply.sol)
2+
// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC6909/extensions/ERC6909TokenSupply.sol)
33

44
pragma solidity ^0.8.20;
55

6-
import {ERC6909} from "../draft-ERC6909.sol";
7-
import {IERC6909TokenSupply} from "../../../interfaces/draft-IERC6909.sol";
6+
import {ERC6909} from "../ERC6909.sol";
7+
import {IERC6909TokenSupply} from "../../../interfaces/IERC6909.sol";
88

99
/**
1010
* @dev Implementation of the Token Supply extension defined in ERC6909.

0 commit comments

Comments
 (0)