From 0b0cbe1286079105a7ac2c0bbed28d16624afc4f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Jun 2025 17:48:29 +0200 Subject: [PATCH] Release v5.4.0 (rc) (#5731) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Hadrien Croubois Co-authored-by: ernestognw --- .changeset/pre.json | 25 ++++++++- CHANGELOG.md | 56 +++++++++++++++++++ contracts/access/AccessControl.sol | 2 +- contracts/access/IAccessControl.sol | 2 +- .../AccessControlDefaultAdminRules.sol | 2 +- .../extensions/AccessControlEnumerable.sol | 2 +- .../IAccessControlDefaultAdminRules.sol | 2 +- .../extensions/IAccessControlEnumerable.sol | 2 +- contracts/access/manager/AccessManaged.sol | 2 +- contracts/access/manager/IAccessManaged.sol | 2 +- contracts/access/manager/IAccessManager.sol | 2 +- contracts/access/manager/IAuthority.sol | 2 +- contracts/account/Account.sol | 1 + .../extensions/draft-AccountERC7579.sol | 1 + .../extensions/draft-AccountERC7579Hooked.sol | 1 + .../account/extensions/draft-ERC7821.sol | 1 + contracts/account/utils/EIP7702Utils.sol | 1 + .../account/utils/draft-ERC7579Utils.sol | 2 +- contracts/governance/Governor.sol | 2 +- contracts/governance/IGovernor.sol | 2 +- contracts/governance/TimelockController.sol | 2 +- .../extensions/GovernorCountingFractional.sol | 2 +- .../GovernorCountingOverridable.sol | 2 +- .../extensions/GovernorCountingSimple.sol | 2 +- .../extensions/GovernorNoncesKeyed.sol | 1 + .../extensions/GovernorPreventLateQuorum.sol | 2 +- .../extensions/GovernorProposalGuardian.sol | 2 +- .../GovernorSequentialProposalId.sol | 2 +- .../extensions/GovernorSettings.sol | 2 +- .../governance/extensions/GovernorStorage.sol | 2 +- .../extensions/GovernorSuperQuorum.sol | 2 +- .../extensions/GovernorTimelockAccess.sol | 2 +- .../extensions/GovernorTimelockCompound.sol | 2 +- .../extensions/GovernorTimelockControl.sol | 2 +- .../governance/extensions/GovernorVotes.sol | 2 +- .../GovernorVotesQuorumFraction.sol | 2 +- .../GovernorVotesSuperQuorumFraction.sol | 2 +- contracts/governance/utils/IVotes.sol | 2 +- contracts/interfaces/IERC1155.sol | 2 +- contracts/interfaces/IERC1155MetadataURI.sol | 2 +- contracts/interfaces/IERC1155Receiver.sol | 2 +- contracts/interfaces/IERC1271.sol | 2 +- contracts/interfaces/IERC1363.sol | 2 +- contracts/interfaces/IERC1363Receiver.sol | 2 +- contracts/interfaces/IERC1363Spender.sol | 2 +- contracts/interfaces/IERC165.sol | 2 +- contracts/interfaces/IERC1820Implementer.sol | 2 +- contracts/interfaces/IERC1820Registry.sol | 2 +- contracts/interfaces/IERC1967.sol | 2 +- contracts/interfaces/IERC20.sol | 2 +- contracts/interfaces/IERC20Metadata.sol | 2 +- contracts/interfaces/IERC2309.sol | 2 +- contracts/interfaces/IERC2612.sol | 2 +- contracts/interfaces/IERC2981.sol | 2 +- contracts/interfaces/IERC3156.sol | 2 +- .../interfaces/IERC3156FlashBorrower.sol | 2 +- contracts/interfaces/IERC3156FlashLender.sol | 2 +- contracts/interfaces/IERC4626.sol | 2 +- contracts/interfaces/IERC4906.sol | 2 +- contracts/interfaces/IERC5267.sol | 2 +- contracts/interfaces/IERC5313.sol | 2 +- contracts/interfaces/IERC5805.sol | 2 +- contracts/interfaces/IERC6372.sol | 2 +- contracts/interfaces/IERC721.sol | 2 +- contracts/interfaces/IERC721Enumerable.sol | 2 +- contracts/interfaces/IERC721Metadata.sol | 2 +- contracts/interfaces/IERC721Receiver.sol | 2 +- contracts/interfaces/IERC777.sol | 2 +- contracts/interfaces/IERC777Recipient.sol | 2 +- contracts/interfaces/IERC777Sender.sol | 2 +- contracts/interfaces/IERC7913.sol | 1 + contracts/interfaces/draft-IERC1822.sol | 2 +- contracts/interfaces/draft-IERC4337.sol | 2 +- contracts/interfaces/draft-IERC6093.sol | 2 +- contracts/interfaces/draft-IERC6909.sol | 2 +- contracts/interfaces/draft-IERC7579.sol | 2 +- contracts/interfaces/draft-IERC7674.sol | 2 +- contracts/interfaces/draft-IERC7802.sol | 1 + contracts/interfaces/draft-IERC7821.sol | 1 + contracts/metatx/ERC2771Context.sol | 2 +- contracts/package.json | 2 +- contracts/proxy/ERC1967/ERC1967Utils.sol | 2 +- contracts/proxy/beacon/IBeacon.sol | 2 +- contracts/token/ERC1155/ERC1155.sol | 2 +- contracts/token/ERC1155/IERC1155.sol | 2 +- contracts/token/ERC1155/IERC1155Receiver.sol | 2 +- .../ERC1155/extensions/ERC1155Supply.sol | 2 +- .../extensions/IERC1155MetadataURI.sol | 2 +- .../token/ERC1155/utils/ERC1155Holder.sol | 2 +- .../token/ERC1155/utils/ERC1155Utils.sol | 2 +- contracts/token/ERC20/ERC20.sol | 2 +- contracts/token/ERC20/IERC20.sol | 2 +- contracts/token/ERC20/extensions/ERC1363.sol | 2 +- .../token/ERC20/extensions/ERC20Capped.sol | 2 +- .../token/ERC20/extensions/ERC20Permit.sol | 2 +- .../token/ERC20/extensions/ERC20Wrapper.sol | 2 +- contracts/token/ERC20/extensions/ERC4626.sol | 2 +- .../token/ERC20/extensions/IERC20Metadata.sol | 2 +- .../token/ERC20/extensions/IERC20Permit.sol | 2 +- .../extensions/draft-ERC20Bridgeable.sol | 1 + contracts/token/ERC20/utils/ERC1363Utils.sol | 2 +- contracts/token/ERC721/ERC721.sol | 2 +- contracts/token/ERC721/IERC721.sol | 2 +- contracts/token/ERC721/IERC721Receiver.sol | 2 +- .../ERC721/extensions/ERC721Enumerable.sol | 2 +- .../token/ERC721/extensions/ERC721Royalty.sol | 2 +- .../ERC721/extensions/ERC721URIStorage.sol | 2 +- .../ERC721/extensions/IERC721Enumerable.sol | 2 +- .../ERC721/extensions/IERC721Metadata.sol | 2 +- contracts/token/ERC721/utils/ERC721Utils.sol | 2 +- contracts/token/common/ERC2981.sol | 2 +- contracts/utils/Address.sol | 2 +- contracts/utils/Arrays.sol | 2 +- contracts/utils/Base64.sol | 2 +- contracts/utils/Blockhash.sol | 1 + contracts/utils/Bytes.sol | 2 +- contracts/utils/Strings.sol | 2 +- contracts/utils/cryptography/EIP712.sol | 2 +- .../utils/cryptography/SignatureChecker.sol | 2 +- .../utils/cryptography/draft-ERC7739Utils.sol | 1 + .../cryptography/signers/AbstractSigner.sol | 1 + .../signers/MultiSignerERC7913.sol | 1 + .../signers/MultiSignerERC7913Weighted.sol | 1 + .../cryptography/signers/SignerECDSA.sol | 1 + .../cryptography/signers/SignerERC7702.sol | 1 + .../cryptography/signers/SignerERC7913.sol | 1 + .../utils/cryptography/signers/SignerP256.sol | 1 + .../utils/cryptography/signers/SignerRSA.sol | 1 + .../cryptography/signers/draft-ERC7739.sol | 1 + .../verifiers/ERC7913P256Verifier.sol | 1 + .../verifiers/ERC7913RSAVerifier.sol | 1 + contracts/utils/introspection/ERC165.sol | 2 +- contracts/utils/introspection/IERC165.sol | 2 +- contracts/utils/structs/Checkpoints.sol | 2 +- contracts/utils/structs/EnumerableMap.sol | 2 +- contracts/utils/structs/EnumerableSet.sol | 2 +- .../vendor/compound/ICompoundTimelock.sol | 2 +- docs/antora.yml | 4 +- package.json | 2 +- 139 files changed, 218 insertions(+), 116 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 96928a17b..974a44886 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -4,5 +4,28 @@ "initialVersions": { "openzeppelin-solidity": "5.3.0" }, - "changesets": [] + "changesets": [ + "clean-ways-push", + "fine-frogs-bake", + "full-ways-help", + "funny-years-yawn", + "hot-grapes-lie", + "lazy-poets-cheer", + "long-hornets-mate", + "lucky-donuts-scream", + "nice-rings-wish", + "pink-dolls-shop", + "popular-geese-tan", + "proud-tables-sip", + "public-crabs-heal", + "quiet-kiwis-feel", + "rare-shirts-unite", + "ripe-bears-hide", + "rotten-apes-lie", + "social-walls-obey", + "sour-pens-shake", + "strong-points-change", + "tame-bears-mix", + "wet-dodos-reply" + ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index fec1725f6..ef7ad4ada 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,65 @@ # Changelog +## 5.4.0-rc.0 (2025-06-18) + ### Breaking changes - Update minimum pragma to 0.8.24 in `SignatureChecker`, `Governor` and Governor's extensions. ([#5716](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5716)). +### Pragma changes + +- Reduced pragma requirement of interface files + +### Changes by category + +#### Account + +- `Account`: Added a simple ERC-4337 account implementation with minimal logic to process user operations. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) +- `AccountERC7579`: Extension of `Account` that implements support for ERC-7579 modules of type executor, validator, and fallback handler. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) +- `AccountERC7579Hooked`: Extension of `AccountERC7579` that implements support for ERC-7579 hook modules. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) +- `EIP7702Utils`: Add a library for checking if an address has an EIP-7702 delegation in place. ([#5587](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5587)) +- `IERC7821`, `ERC7821`: Interface and logic for minimal batch execution. No support for additional `opData` is included. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) + +#### Governance + +- `GovernorNoncesKeyed`: Extension of `Governor` that adds support for keyed nonces when voting by sig. ([#5574](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5574)) + +#### Tokens + +- `ERC20Bridgeable`: Implementation of ERC-7802 that makes an ERC-20 compatible with crosschain bridges. ([#5739](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5739)) + +#### Cryptography + +##### Signers + +- `AbstractSigner`, `SignerECDSA`, `SignerP256`, and `SignerRSA`: Add an abstract contract and various implementations for contracts that deal with signature verification. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) +- `SignerERC7702`: Implementation of `AbstractSigner` for Externally Owned Accounts (EOAs). Useful with ERC-7702. ([#5657](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5657)) +- `SignerERC7913`: Abstract signer that verifies signatures using the ERC-7913 workflow. ([#5659](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5659)) +- `MultiSignerERC7913`: Implementation of `AbstractSigner` that supports multiple ERC-7913 signers with a threshold-based signature verification system. ([#5659](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5659)) +- `MultiSignerERC7913Weighted`: Extension of `MultiSignerERC7913` that supports assigning different weights to each signer, enabling more flexible governance schemes. ([#5741](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5741)) + +##### Verifiers + +- `ERC7913P256Verifier` and `ERC7913RSAVerifier`: Ready to use ERC-7913 verifiers that implement key verification for P256 (secp256r1) and RSA keys. ([#5659](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5659)) + +##### Other + +- `SignatureChecker`: Add support for ERC-7913 signatures alongside existing ECDSA and ERC-1271 signature verification. ([#5659](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5659)) +- `ERC7739`: An abstract contract to validate signatures following the rehashing scheme from `ERC7739Utils`. ([#5664](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5664)) +- `ERC7739Utils`: Add a library that implements a defensive rehashing mechanism to prevent replayability of smart contract signatures based on the ERC-7739. ([#5664](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5664)) + +#### Structures + +- `EnumerableMap`: Add support for `BytesToBytesMap` type. ([#5658](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5658)) +- `EnumerableMap`: Add `keys(uint256,uint256)` that returns a subset (slice) of the keys in the map. ([#5713](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5713)) +- `EnumerableSet`: Add support for `StringSet` and `BytesSet` types. ([#5658](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5658)) +- `EnumerableSet`: Add `values(uint256,uint256)` that returns a subset (slice) of the values in the set. ([#5713](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5713)) + +#### Utils + +- `Arrays`: Add `unsafeAccess`, `unsafeMemoryAccess` and `unsafeSetLength` for `bytes[]` and `string[]`. ([#5568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5568)) +- `Blockhash`: Add a library that provides access to historical block hashes using EIP-2935's history storage, extending the standard 256-block limit to 8191 blocks. ([#5642](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/5642)) + ## 5.3.0 (2025-04-09) ### Breaking Changes diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol index bd09eed8b..fd2fe03e4 100644 --- a/contracts/access/AccessControl.sol +++ b/contracts/access/AccessControl.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (access/AccessControl.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/AccessControl.sol) pragma solidity ^0.8.20; diff --git a/contracts/access/IAccessControl.sol b/contracts/access/IAccessControl.sol index 912afa1c2..0a79ad924 100644 --- a/contracts/access/IAccessControl.sol +++ b/contracts/access/IAccessControl.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (access/IAccessControl.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/IAccessControl.sol) pragma solidity >=0.8.4; diff --git a/contracts/access/extensions/AccessControlDefaultAdminRules.sol b/contracts/access/extensions/AccessControlDefaultAdminRules.sol index 8ae6c3702..71857025f 100644 --- a/contracts/access/extensions/AccessControlDefaultAdminRules.sol +++ b/contracts/access/extensions/AccessControlDefaultAdminRules.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (access/extensions/AccessControlDefaultAdminRules.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/extensions/AccessControlDefaultAdminRules.sol) pragma solidity ^0.8.20; diff --git a/contracts/access/extensions/AccessControlEnumerable.sol b/contracts/access/extensions/AccessControlEnumerable.sol index e8d54ead2..962a752cc 100644 --- a/contracts/access/extensions/AccessControlEnumerable.sol +++ b/contracts/access/extensions/AccessControlEnumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (access/extensions/AccessControlEnumerable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/extensions/AccessControlEnumerable.sol) pragma solidity ^0.8.20; diff --git a/contracts/access/extensions/IAccessControlDefaultAdminRules.sol b/contracts/access/extensions/IAccessControlDefaultAdminRules.sol index 1c4c331af..53617307b 100644 --- a/contracts/access/extensions/IAccessControlDefaultAdminRules.sol +++ b/contracts/access/extensions/IAccessControlDefaultAdminRules.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (access/extensions/IAccessControlDefaultAdminRules.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/extensions/IAccessControlDefaultAdminRules.sol) pragma solidity >=0.8.4; diff --git a/contracts/access/extensions/IAccessControlEnumerable.sol b/contracts/access/extensions/IAccessControlEnumerable.sol index 9b0b7c477..75bcb78b2 100644 --- a/contracts/access/extensions/IAccessControlEnumerable.sol +++ b/contracts/access/extensions/IAccessControlEnumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (access/extensions/IAccessControlEnumerable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/extensions/IAccessControlEnumerable.sol) pragma solidity >=0.8.4; diff --git a/contracts/access/manager/AccessManaged.sol b/contracts/access/manager/AccessManaged.sol index c1cfee86d..2df2f1105 100644 --- a/contracts/access/manager/AccessManaged.sol +++ b/contracts/access/manager/AccessManaged.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (access/manager/AccessManaged.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/manager/AccessManaged.sol) pragma solidity ^0.8.20; diff --git a/contracts/access/manager/IAccessManaged.sol b/contracts/access/manager/IAccessManaged.sol index 975892bb4..ac26315c6 100644 --- a/contracts/access/manager/IAccessManaged.sol +++ b/contracts/access/manager/IAccessManaged.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (access/manager/IAccessManaged.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/manager/IAccessManaged.sol) pragma solidity >=0.8.4; diff --git a/contracts/access/manager/IAccessManager.sol b/contracts/access/manager/IAccessManager.sol index 2d73f37a4..bcb67da19 100644 --- a/contracts/access/manager/IAccessManager.sol +++ b/contracts/access/manager/IAccessManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (access/manager/IAccessManager.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/manager/IAccessManager.sol) pragma solidity >=0.8.4; diff --git a/contracts/access/manager/IAuthority.sol b/contracts/access/manager/IAuthority.sol index e6f1e077c..dd064b095 100644 --- a/contracts/access/manager/IAuthority.sol +++ b/contracts/access/manager/IAuthority.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (access/manager/IAuthority.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (access/manager/IAuthority.sol) pragma solidity >=0.4.16; diff --git a/contracts/account/Account.sol b/contracts/account/Account.sol index 687d5d990..e6116c91e 100644 --- a/contracts/account/Account.sol +++ b/contracts/account/Account.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/Account.sol) pragma solidity ^0.8.20; diff --git a/contracts/account/extensions/draft-AccountERC7579.sol b/contracts/account/extensions/draft-AccountERC7579.sol index e24e56dce..2d88bf6d1 100644 --- a/contracts/account/extensions/draft-AccountERC7579.sol +++ b/contracts/account/extensions/draft-AccountERC7579.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/extensions/draft-AccountERC7579.sol) pragma solidity ^0.8.26; diff --git a/contracts/account/extensions/draft-AccountERC7579Hooked.sol b/contracts/account/extensions/draft-AccountERC7579Hooked.sol index 030cc1c31..d7ac4dfd4 100644 --- a/contracts/account/extensions/draft-AccountERC7579Hooked.sol +++ b/contracts/account/extensions/draft-AccountERC7579Hooked.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/extensions/draft-AccountERC7579Hooked.sol) pragma solidity ^0.8.26; diff --git a/contracts/account/extensions/draft-ERC7821.sol b/contracts/account/extensions/draft-ERC7821.sol index 8ba4e8699..48a66ca46 100644 --- a/contracts/account/extensions/draft-ERC7821.sol +++ b/contracts/account/extensions/draft-ERC7821.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/extensions/draft-ERC7821.sol) pragma solidity ^0.8.20; diff --git a/contracts/account/utils/EIP7702Utils.sol b/contracts/account/utils/EIP7702Utils.sol index ca3eeb6f1..312a0b2d8 100644 --- a/contracts/account/utils/EIP7702Utils.sol +++ b/contracts/account/utils/EIP7702Utils.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/utils/EIP7702Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/account/utils/draft-ERC7579Utils.sol b/contracts/account/utils/draft-ERC7579Utils.sol index 9b41cba1c..8421527ad 100644 --- a/contracts/account/utils/draft-ERC7579Utils.sol +++ b/contracts/account/utils/draft-ERC7579Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (account/utils/draft-ERC7579Utils.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (account/utils/draft-ERC7579Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/governance/Governor.sol b/contracts/governance/Governor.sol index 5a7b16170..18ca7749b 100644 --- a/contracts/governance/Governor.sol +++ b/contracts/governance/Governor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/Governor.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/Governor.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/IGovernor.sol b/contracts/governance/IGovernor.sol index 9fc2a7587..0a012192a 100644 --- a/contracts/governance/IGovernor.sol +++ b/contracts/governance/IGovernor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/IGovernor.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/IGovernor.sol) pragma solidity >=0.8.4; diff --git a/contracts/governance/TimelockController.sol b/contracts/governance/TimelockController.sol index e608d393d..b6212a253 100644 --- a/contracts/governance/TimelockController.sol +++ b/contracts/governance/TimelockController.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/TimelockController.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/TimelockController.sol) pragma solidity ^0.8.20; diff --git a/contracts/governance/extensions/GovernorCountingFractional.sol b/contracts/governance/extensions/GovernorCountingFractional.sol index 7af2a7060..089b57de4 100644 --- a/contracts/governance/extensions/GovernorCountingFractional.sol +++ b/contracts/governance/extensions/GovernorCountingFractional.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorCountingFractional.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorCountingFractional.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorCountingOverridable.sol b/contracts/governance/extensions/GovernorCountingOverridable.sol index 9900c64c8..b05897a00 100644 --- a/contracts/governance/extensions/GovernorCountingOverridable.sol +++ b/contracts/governance/extensions/GovernorCountingOverridable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorCountingOverridable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorCountingOverridable.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorCountingSimple.sol b/contracts/governance/extensions/GovernorCountingSimple.sol index afa0efc2a..031d66412 100644 --- a/contracts/governance/extensions/GovernorCountingSimple.sol +++ b/contracts/governance/extensions/GovernorCountingSimple.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (governance/extensions/GovernorCountingSimple.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorCountingSimple.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorNoncesKeyed.sol b/contracts/governance/extensions/GovernorNoncesKeyed.sol index e99a47dba..6c3391492 100644 --- a/contracts/governance/extensions/GovernorNoncesKeyed.sol +++ b/contracts/governance/extensions/GovernorNoncesKeyed.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorNoncesKeyed.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorPreventLateQuorum.sol b/contracts/governance/extensions/GovernorPreventLateQuorum.sol index b92b3c676..2b91c649a 100644 --- a/contracts/governance/extensions/GovernorPreventLateQuorum.sol +++ b/contracts/governance/extensions/GovernorPreventLateQuorum.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.2.0) (governance/extensions/GovernorPreventLateQuorum.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorPreventLateQuorum.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorProposalGuardian.sol b/contracts/governance/extensions/GovernorProposalGuardian.sol index f1b5aba36..4833c2766 100644 --- a/contracts/governance/extensions/GovernorProposalGuardian.sol +++ b/contracts/governance/extensions/GovernorProposalGuardian.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorProposalGuardian.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorProposalGuardian.sol) pragma solidity ^0.8.24; import {Governor} from "../Governor.sol"; diff --git a/contracts/governance/extensions/GovernorSequentialProposalId.sol b/contracts/governance/extensions/GovernorSequentialProposalId.sol index 55b9e1631..06fa8b6d4 100644 --- a/contracts/governance/extensions/GovernorSequentialProposalId.sol +++ b/contracts/governance/extensions/GovernorSequentialProposalId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorSequentialProposalId.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorSequentialProposalId.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorSettings.sol b/contracts/governance/extensions/GovernorSettings.sol index 41793c5b0..dce38048d 100644 --- a/contracts/governance/extensions/GovernorSettings.sol +++ b/contracts/governance/extensions/GovernorSettings.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (governance/extensions/GovernorSettings.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorSettings.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorStorage.sol b/contracts/governance/extensions/GovernorStorage.sol index 52fc5386b..ee3d67f3c 100644 --- a/contracts/governance/extensions/GovernorStorage.sol +++ b/contracts/governance/extensions/GovernorStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorStorage.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorStorage.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorSuperQuorum.sol b/contracts/governance/extensions/GovernorSuperQuorum.sol index 47f2bfcce..0a699415f 100644 --- a/contracts/governance/extensions/GovernorSuperQuorum.sol +++ b/contracts/governance/extensions/GovernorSuperQuorum.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorSuperQuorum.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorSuperQuorum.sol) pragma solidity ^0.8.24; import {Governor} from "../Governor.sol"; diff --git a/contracts/governance/extensions/GovernorTimelockAccess.sol b/contracts/governance/extensions/GovernorTimelockAccess.sol index d340f5855..d716916c5 100644 --- a/contracts/governance/extensions/GovernorTimelockAccess.sol +++ b/contracts/governance/extensions/GovernorTimelockAccess.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorTimelockAccess.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorTimelockAccess.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorTimelockCompound.sol b/contracts/governance/extensions/GovernorTimelockCompound.sol index ea705a76e..a88604fec 100644 --- a/contracts/governance/extensions/GovernorTimelockCompound.sol +++ b/contracts/governance/extensions/GovernorTimelockCompound.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorTimelockCompound.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorTimelockCompound.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorTimelockControl.sol b/contracts/governance/extensions/GovernorTimelockControl.sol index 6aab59c94..1aafada97 100644 --- a/contracts/governance/extensions/GovernorTimelockControl.sol +++ b/contracts/governance/extensions/GovernorTimelockControl.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorTimelockControl.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorTimelockControl.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorVotes.sol b/contracts/governance/extensions/GovernorVotes.sol index 960a91ba4..e5df00025 100644 --- a/contracts/governance/extensions/GovernorVotes.sol +++ b/contracts/governance/extensions/GovernorVotes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (governance/extensions/GovernorVotes.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorVotes.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorVotesQuorumFraction.sol b/contracts/governance/extensions/GovernorVotesQuorumFraction.sol index 5abd7c129..fb74e5597 100644 --- a/contracts/governance/extensions/GovernorVotesQuorumFraction.sol +++ b/contracts/governance/extensions/GovernorVotesQuorumFraction.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorVotesQuorumFraction.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorVotesQuorumFraction.sol) pragma solidity ^0.8.24; diff --git a/contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol b/contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol index 48c138ed1..3ec3715d1 100644 --- a/contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol +++ b/contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (governance/extensions/GovernorVotesSuperQuorumFraction.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/extensions/GovernorVotesSuperQuorumFraction.sol) pragma solidity ^0.8.24; import {Governor} from "../Governor.sol"; diff --git a/contracts/governance/utils/IVotes.sol b/contracts/governance/utils/IVotes.sol index 508e611a5..01c53756c 100644 --- a/contracts/governance/utils/IVotes.sol +++ b/contracts/governance/utils/IVotes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (governance/utils/IVotes.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (governance/utils/IVotes.sol) pragma solidity >=0.8.4; /** diff --git a/contracts/interfaces/IERC1155.sol b/contracts/interfaces/IERC1155.sol index 4bda2dc90..b9861b43d 100644 --- a/contracts/interfaces/IERC1155.sol +++ b/contracts/interfaces/IERC1155.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC1155.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1155.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC1155MetadataURI.sol b/contracts/interfaces/IERC1155MetadataURI.sol index ccef66cd6..375c4c782 100644 --- a/contracts/interfaces/IERC1155MetadataURI.sol +++ b/contracts/interfaces/IERC1155MetadataURI.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC1155MetadataURI.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1155MetadataURI.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC1155Receiver.sol b/contracts/interfaces/IERC1155Receiver.sol index fde303172..5f09ba7c3 100644 --- a/contracts/interfaces/IERC1155Receiver.sol +++ b/contracts/interfaces/IERC1155Receiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC1155Receiver.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1155Receiver.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC1271.sol b/contracts/interfaces/IERC1271.sol index 5b5f26681..a95adedd5 100644 --- a/contracts/interfaces/IERC1271.sol +++ b/contracts/interfaces/IERC1271.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (interfaces/IERC1271.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1271.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC1363.sol b/contracts/interfaces/IERC1363.sol index ebfa76c3f..6299ae6b6 100644 --- a/contracts/interfaces/IERC1363.sol +++ b/contracts/interfaces/IERC1363.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC1363.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1363.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC1363Receiver.sol b/contracts/interfaces/IERC1363Receiver.sol index 28ae5c751..5fa889f4a 100644 --- a/contracts/interfaces/IERC1363Receiver.sol +++ b/contracts/interfaces/IERC1363Receiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC1363Receiver.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1363Receiver.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC1363Spender.sol b/contracts/interfaces/IERC1363Spender.sol index 7c1ce0c2d..4bc0d93e1 100644 --- a/contracts/interfaces/IERC1363Spender.sol +++ b/contracts/interfaces/IERC1363Spender.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC1363Spender.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1363Spender.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC165.sol b/contracts/interfaces/IERC165.sol index 302565544..235d02ed5 100644 --- a/contracts/interfaces/IERC165.sol +++ b/contracts/interfaces/IERC165.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC165.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC165.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC1820Implementer.sol b/contracts/interfaces/IERC1820Implementer.sol index 7b6841b3a..be1f45e99 100644 --- a/contracts/interfaces/IERC1820Implementer.sol +++ b/contracts/interfaces/IERC1820Implementer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC1820Implementer.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1820Implementer.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC1820Registry.sol b/contracts/interfaces/IERC1820Registry.sol index 822be8b3b..622f64154 100644 --- a/contracts/interfaces/IERC1820Registry.sol +++ b/contracts/interfaces/IERC1820Registry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC1820Registry.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1820Registry.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC1967.sol b/contracts/interfaces/IERC1967.sol index e7e54d5ae..3088c02a4 100644 --- a/contracts/interfaces/IERC1967.sol +++ b/contracts/interfaces/IERC1967.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC1967.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC1967.sol) pragma solidity >=0.4.11; diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol index 7248dfb49..eb6bf0858 100644 --- a/contracts/interfaces/IERC20.sol +++ b/contracts/interfaces/IERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC20.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC20.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC20Metadata.sol b/contracts/interfaces/IERC20Metadata.sol index 6a4d15a7e..cd3b354b6 100644 --- a/contracts/interfaces/IERC20Metadata.sol +++ b/contracts/interfaces/IERC20Metadata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC20Metadata.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC20Metadata.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC2309.sol b/contracts/interfaces/IERC2309.sol index a282a79ef..7e1cb863d 100644 --- a/contracts/interfaces/IERC2309.sol +++ b/contracts/interfaces/IERC2309.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC2309.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC2309.sol) pragma solidity >=0.4.11; diff --git a/contracts/interfaces/IERC2612.sol b/contracts/interfaces/IERC2612.sol index 03acefb3d..7e9b90a66 100644 --- a/contracts/interfaces/IERC2612.sol +++ b/contracts/interfaces/IERC2612.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC2612.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC2612.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC2981.sol b/contracts/interfaces/IERC2981.sol index 8b04bdd49..ce7222adc 100644 --- a/contracts/interfaces/IERC2981.sol +++ b/contracts/interfaces/IERC2981.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC2981.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC2981.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC3156.sol b/contracts/interfaces/IERC3156.sol index a72846c0c..022f0af8b 100644 --- a/contracts/interfaces/IERC3156.sol +++ b/contracts/interfaces/IERC3156.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC3156.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC3156.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC3156FlashBorrower.sol b/contracts/interfaces/IERC3156FlashBorrower.sol index af1a8698c..387d73f0c 100644 --- a/contracts/interfaces/IERC3156FlashBorrower.sol +++ b/contracts/interfaces/IERC3156FlashBorrower.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC3156FlashBorrower.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC3156FlashBorrower.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC3156FlashLender.sol b/contracts/interfaces/IERC3156FlashLender.sol index f0a004971..549945b68 100644 --- a/contracts/interfaces/IERC3156FlashLender.sol +++ b/contracts/interfaces/IERC3156FlashLender.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC3156FlashLender.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC3156FlashLender.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC4626.sol b/contracts/interfaces/IERC4626.sol index 7d607ff51..5807b1ae8 100644 --- a/contracts/interfaces/IERC4626.sol +++ b/contracts/interfaces/IERC4626.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (interfaces/IERC4626.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC4626.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC4906.sol b/contracts/interfaces/IERC4906.sol index 63260505f..cf69de164 100644 --- a/contracts/interfaces/IERC4906.sol +++ b/contracts/interfaces/IERC4906.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC4906.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC4906.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC5267.sol b/contracts/interfaces/IERC5267.sol index cf819df72..6d43e6739 100644 --- a/contracts/interfaces/IERC5267.sol +++ b/contracts/interfaces/IERC5267.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC5267.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC5267.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC5313.sol b/contracts/interfaces/IERC5313.sol index c0763b82d..20003c342 100644 --- a/contracts/interfaces/IERC5313.sol +++ b/contracts/interfaces/IERC5313.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC5313.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC5313.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC5805.sol b/contracts/interfaces/IERC5805.sol index d73f8acc8..c9f54c22c 100644 --- a/contracts/interfaces/IERC5805.sol +++ b/contracts/interfaces/IERC5805.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC5805.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC5805.sol) pragma solidity >=0.8.4; diff --git a/contracts/interfaces/IERC6372.sol b/contracts/interfaces/IERC6372.sol index 56f8936b5..b93a90af7 100644 --- a/contracts/interfaces/IERC6372.sol +++ b/contracts/interfaces/IERC6372.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC6372.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC6372.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/IERC721.sol b/contracts/interfaces/IERC721.sol index 7d36f3e86..7dffd82cf 100644 --- a/contracts/interfaces/IERC721.sol +++ b/contracts/interfaces/IERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC721.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC721.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC721Enumerable.sol b/contracts/interfaces/IERC721Enumerable.sol index f0b836469..197aa0bac 100644 --- a/contracts/interfaces/IERC721Enumerable.sol +++ b/contracts/interfaces/IERC721Enumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC721Enumerable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC721Enumerable.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC721Metadata.sol b/contracts/interfaces/IERC721Metadata.sol index 7ebdea2ec..18f091652 100644 --- a/contracts/interfaces/IERC721Metadata.sol +++ b/contracts/interfaces/IERC721Metadata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC721Metadata.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC721Metadata.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/IERC721Receiver.sol b/contracts/interfaces/IERC721Receiver.sol index 7094254a6..0f2d82f8c 100644 --- a/contracts/interfaces/IERC721Receiver.sol +++ b/contracts/interfaces/IERC721Receiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (interfaces/IERC721Receiver.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC721Receiver.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC777.sol b/contracts/interfaces/IERC777.sol index b3f5184fb..eb1b90565 100644 --- a/contracts/interfaces/IERC777.sol +++ b/contracts/interfaces/IERC777.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC777.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC777.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC777Recipient.sol b/contracts/interfaces/IERC777Recipient.sol index 99ade77c1..8ce1c8b0c 100644 --- a/contracts/interfaces/IERC777Recipient.sol +++ b/contracts/interfaces/IERC777Recipient.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC777Recipient.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC777Recipient.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC777Sender.sol b/contracts/interfaces/IERC777Sender.sol index 0086b82c9..ac193714f 100644 --- a/contracts/interfaces/IERC777Sender.sol +++ b/contracts/interfaces/IERC777Sender.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/IERC777Sender.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC777Sender.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/IERC7913.sol b/contracts/interfaces/IERC7913.sol index 3bf0df808..9a3ca4837 100644 --- a/contracts/interfaces/IERC7913.sol +++ b/contracts/interfaces/IERC7913.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/IERC7913.sol) pragma solidity >=0.5.0; diff --git a/contracts/interfaces/draft-IERC1822.sol b/contracts/interfaces/draft-IERC1822.sol index d21a30226..d23d2835c 100644 --- a/contracts/interfaces/draft-IERC1822.sol +++ b/contracts/interfaces/draft-IERC1822.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/draft-IERC1822.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC1822.sol) pragma solidity >=0.4.16; diff --git a/contracts/interfaces/draft-IERC4337.sol b/contracts/interfaces/draft-IERC4337.sol index 7ea368fd0..78b452fe5 100644 --- a/contracts/interfaces/draft-IERC4337.sol +++ b/contracts/interfaces/draft-IERC4337.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (interfaces/draft-IERC4337.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC4337.sol) pragma solidity >=0.8.4; diff --git a/contracts/interfaces/draft-IERC6093.sol b/contracts/interfaces/draft-IERC6093.sol index fffb444a5..9f2d808d0 100644 --- a/contracts/interfaces/draft-IERC6093.sol +++ b/contracts/interfaces/draft-IERC6093.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/draft-IERC6093.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC6093.sol) pragma solidity >=0.8.4; /** diff --git a/contracts/interfaces/draft-IERC6909.sol b/contracts/interfaces/draft-IERC6909.sol index d39e283b8..d26ef597e 100644 --- a/contracts/interfaces/draft-IERC6909.sol +++ b/contracts/interfaces/draft-IERC6909.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (interfaces/draft-IERC6909.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC6909.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/draft-IERC7579.sol b/contracts/interfaces/draft-IERC7579.sol index d6f62e7ea..469100c71 100644 --- a/contracts/interfaces/draft-IERC7579.sol +++ b/contracts/interfaces/draft-IERC7579.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (interfaces/draft-IERC7579.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC7579.sol) pragma solidity >=0.8.4; import {PackedUserOperation} from "./draft-IERC4337.sol"; diff --git a/contracts/interfaces/draft-IERC7674.sol b/contracts/interfaces/draft-IERC7674.sol index f8b6b71ad..ba23443bc 100644 --- a/contracts/interfaces/draft-IERC7674.sol +++ b/contracts/interfaces/draft-IERC7674.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (interfaces/draft-IERC7674.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC7674.sol) pragma solidity >=0.6.2; diff --git a/contracts/interfaces/draft-IERC7802.sol b/contracts/interfaces/draft-IERC7802.sol index b0ad767e4..4f340a0e3 100644 --- a/contracts/interfaces/draft-IERC7802.sol +++ b/contracts/interfaces/draft-IERC7802.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC7802.sol) pragma solidity >=0.6.2; import {IERC165} from "./IERC165.sol"; diff --git a/contracts/interfaces/draft-IERC7821.sol b/contracts/interfaces/draft-IERC7821.sol index db247f7f8..35e20f423 100644 --- a/contracts/interfaces/draft-IERC7821.sol +++ b/contracts/interfaces/draft-IERC7821.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (interfaces/draft-IERC7821.sol) pragma solidity >=0.5.0; diff --git a/contracts/metatx/ERC2771Context.sol b/contracts/metatx/ERC2771Context.sol index 95a798348..761c36867 100644 --- a/contracts/metatx/ERC2771Context.sol +++ b/contracts/metatx/ERC2771Context.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (metatx/ERC2771Context.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (metatx/ERC2771Context.sol) pragma solidity ^0.8.20; diff --git a/contracts/package.json b/contracts/package.json index 70ae73bc2..921254f9c 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@openzeppelin/contracts", "description": "Secure Smart Contract library for Solidity", - "version": "5.3.0", + "version": "5.4.0-rc.0", "files": [ "**/*.sol", "/build/contracts/*.json", diff --git a/contracts/proxy/ERC1967/ERC1967Utils.sol b/contracts/proxy/ERC1967/ERC1967Utils.sol index d7c4a9631..49d3d3b04 100644 --- a/contracts/proxy/ERC1967/ERC1967Utils.sol +++ b/contracts/proxy/ERC1967/ERC1967Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.2.0) (proxy/ERC1967/ERC1967Utils.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (proxy/ERC1967/ERC1967Utils.sol) pragma solidity ^0.8.21; diff --git a/contracts/proxy/beacon/IBeacon.sol b/contracts/proxy/beacon/IBeacon.sol index cfdaf73bd..ad702de01 100644 --- a/contracts/proxy/beacon/IBeacon.sol +++ b/contracts/proxy/beacon/IBeacon.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (proxy/beacon/IBeacon.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (proxy/beacon/IBeacon.sol) pragma solidity >=0.4.16; diff --git a/contracts/token/ERC1155/ERC1155.sol b/contracts/token/ERC1155/ERC1155.sol index e7f1dab98..d709ef17a 100644 --- a/contracts/token/ERC1155/ERC1155.sol +++ b/contracts/token/ERC1155/ERC1155.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC1155/ERC1155.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/ERC1155.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC1155/IERC1155.sol b/contracts/token/ERC1155/IERC1155.sol index 70cdecd93..d69ca5254 100644 --- a/contracts/token/ERC1155/IERC1155.sol +++ b/contracts/token/ERC1155/IERC1155.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC1155/IERC1155.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/IERC1155.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC1155/IERC1155Receiver.sol b/contracts/token/ERC1155/IERC1155Receiver.sol index 22ac80aaf..99b479f2b 100644 --- a/contracts/token/ERC1155/IERC1155Receiver.sol +++ b/contracts/token/ERC1155/IERC1155Receiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC1155/IERC1155Receiver.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/IERC1155Receiver.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC1155/extensions/ERC1155Supply.sol b/contracts/token/ERC1155/extensions/ERC1155Supply.sol index 2ca206782..e0a5501b0 100644 --- a/contracts/token/ERC1155/extensions/ERC1155Supply.sol +++ b/contracts/token/ERC1155/extensions/ERC1155Supply.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC1155/extensions/ERC1155Supply.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/extensions/ERC1155Supply.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol b/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol index 38fc6852a..9fa2aa4d7 100644 --- a/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol +++ b/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC1155/extensions/IERC1155MetadataURI.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/extensions/IERC1155MetadataURI.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC1155/utils/ERC1155Holder.sol b/contracts/token/ERC1155/utils/ERC1155Holder.sol index ff4681a52..8eaa8bae4 100644 --- a/contracts/token/ERC1155/utils/ERC1155Holder.sol +++ b/contracts/token/ERC1155/utils/ERC1155Holder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC1155/utils/ERC1155Holder.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/utils/ERC1155Holder.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC1155/utils/ERC1155Utils.sol b/contracts/token/ERC1155/utils/ERC1155Utils.sol index 76b273794..350255a54 100644 --- a/contracts/token/ERC1155/utils/ERC1155Utils.sol +++ b/contracts/token/ERC1155/utils/ERC1155Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC1155/utils/ERC1155Utils.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC1155/utils/ERC1155Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol index 87da2fb04..ff61cda9b 100644 --- a/contracts/token/ERC20/ERC20.sol +++ b/contracts/token/ERC20/ERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC20/ERC20.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/ERC20.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/IERC20.sol b/contracts/token/ERC20/IERC20.sol index 71a3dffb8..cded4a49b 100644 --- a/contracts/token/ERC20/IERC20.sol +++ b/contracts/token/ERC20/IERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/IERC20.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/IERC20.sol) pragma solidity >=0.4.16; diff --git a/contracts/token/ERC20/extensions/ERC1363.sol b/contracts/token/ERC20/extensions/ERC1363.sol index c76e454f0..9c696fa97 100644 --- a/contracts/token/ERC20/extensions/ERC1363.sol +++ b/contracts/token/ERC20/extensions/ERC1363.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.2.0) (token/ERC20/extensions/ERC1363.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/ERC1363.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/extensions/ERC20Capped.sol b/contracts/token/ERC20/extensions/ERC20Capped.sol index 8370c6ce6..bec958e95 100644 --- a/contracts/token/ERC20/extensions/ERC20Capped.sol +++ b/contracts/token/ERC20/extensions/ERC20Capped.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/extensions/ERC20Capped.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/ERC20Capped.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/extensions/ERC20Permit.sol b/contracts/token/ERC20/extensions/ERC20Permit.sol index d59319196..a97252a2f 100644 --- a/contracts/token/ERC20/extensions/ERC20Permit.sol +++ b/contracts/token/ERC20/extensions/ERC20Permit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/extensions/ERC20Permit.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/ERC20Permit.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/extensions/ERC20Wrapper.sol b/contracts/token/ERC20/extensions/ERC20Wrapper.sol index d4b0fe8e8..0aa000284 100644 --- a/contracts/token/ERC20/extensions/ERC20Wrapper.sol +++ b/contracts/token/ERC20/extensions/ERC20Wrapper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/extensions/ERC20Wrapper.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/ERC20Wrapper.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/extensions/ERC4626.sol b/contracts/token/ERC20/extensions/ERC4626.sol index 6e6a57c30..54e1d4d29 100644 --- a/contracts/token/ERC20/extensions/ERC4626.sol +++ b/contracts/token/ERC20/extensions/ERC4626.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC20/extensions/ERC4626.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/ERC4626.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/extensions/IERC20Metadata.sol b/contracts/token/ERC20/extensions/IERC20Metadata.sol index dd9c9beb4..6aa8ba9e4 100644 --- a/contracts/token/ERC20/extensions/IERC20Metadata.sol +++ b/contracts/token/ERC20/extensions/IERC20Metadata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/extensions/IERC20Metadata.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/IERC20Metadata.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC20/extensions/IERC20Permit.sol b/contracts/token/ERC20/extensions/IERC20Permit.sol index 7da408c45..c55ccca12 100644 --- a/contracts/token/ERC20/extensions/IERC20Permit.sol +++ b/contracts/token/ERC20/extensions/IERC20Permit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/extensions/IERC20Permit.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/IERC20Permit.sol) pragma solidity >=0.4.16; diff --git a/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol b/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol index 411d5b007..2c29cd247 100644 --- a/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol +++ b/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/extensions/draft-ERC20Bridgeable.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC20/utils/ERC1363Utils.sol b/contracts/token/ERC20/utils/ERC1363Utils.sol index e2ce20080..991bea1ec 100644 --- a/contracts/token/ERC20/utils/ERC1363Utils.sol +++ b/contracts/token/ERC20/utils/ERC1363Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/utils/ERC1363Utils.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC20/utils/ERC1363Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol index a757e9b05..a989caa52 100644 --- a/contracts/token/ERC721/ERC721.sol +++ b/contracts/token/ERC721/ERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/ERC721.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/ERC721.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/IERC721.sol b/contracts/token/ERC721/IERC721.sol index 61aaaab33..e9d80fd3e 100644 --- a/contracts/token/ERC721/IERC721.sol +++ b/contracts/token/ERC721/IERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/IERC721.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/IERC721.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC721/IERC721Receiver.sol b/contracts/token/ERC721/IERC721Receiver.sol index 42c3fd12a..eb6928620 100644 --- a/contracts/token/ERC721/IERC721Receiver.sol +++ b/contracts/token/ERC721/IERC721Receiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/IERC721Receiver.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/IERC721Receiver.sol) pragma solidity >=0.5.0; diff --git a/contracts/token/ERC721/extensions/ERC721Enumerable.sol b/contracts/token/ERC721/extensions/ERC721Enumerable.sol index 6d699429d..164c69593 100644 --- a/contracts/token/ERC721/extensions/ERC721Enumerable.sol +++ b/contracts/token/ERC721/extensions/ERC721Enumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/extensions/ERC721Enumerable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/extensions/ERC721Enumerable.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/extensions/ERC721Royalty.sol b/contracts/token/ERC721/extensions/ERC721Royalty.sol index c3b9dd627..ffb041f7d 100644 --- a/contracts/token/ERC721/extensions/ERC721Royalty.sol +++ b/contracts/token/ERC721/extensions/ERC721Royalty.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/extensions/ERC721Royalty.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/extensions/ERC721Royalty.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/extensions/ERC721URIStorage.sol b/contracts/token/ERC721/extensions/ERC721URIStorage.sol index 432fec71d..2912b7958 100644 --- a/contracts/token/ERC721/extensions/ERC721URIStorage.sol +++ b/contracts/token/ERC721/extensions/ERC721URIStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC721/extensions/ERC721URIStorage.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/extensions/ERC721URIStorage.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/extensions/IERC721Enumerable.sol b/contracts/token/ERC721/extensions/IERC721Enumerable.sol index e839243f6..6122c6eb4 100644 --- a/contracts/token/ERC721/extensions/IERC721Enumerable.sol +++ b/contracts/token/ERC721/extensions/IERC721Enumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/extensions/IERC721Enumerable.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/extensions/IERC721Enumerable.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC721/extensions/IERC721Metadata.sol b/contracts/token/ERC721/extensions/IERC721Metadata.sol index 3c66d0fee..3ae92b49a 100644 --- a/contracts/token/ERC721/extensions/IERC721Metadata.sol +++ b/contracts/token/ERC721/extensions/IERC721Metadata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/extensions/IERC721Metadata.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/extensions/IERC721Metadata.sol) pragma solidity >=0.6.2; diff --git a/contracts/token/ERC721/utils/ERC721Utils.sol b/contracts/token/ERC721/utils/ERC721Utils.sol index 86f3f265b..635f7c32d 100644 --- a/contracts/token/ERC721/utils/ERC721Utils.sol +++ b/contracts/token/ERC721/utils/ERC721Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/ERC721/utils/ERC721Utils.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/ERC721/utils/ERC721Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/common/ERC2981.sol b/contracts/token/common/ERC2981.sol index 2c2f0446c..2c6932162 100644 --- a/contracts/token/common/ERC2981.sol +++ b/contracts/token/common/ERC2981.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (token/common/ERC2981.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (token/common/ERC2981.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol index d658e7af9..78cc94537 100644 --- a/contracts/utils/Address.sol +++ b/contracts/utils/Address.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.2.0) (utils/Address.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Address.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Arrays.sol b/contracts/utils/Arrays.sol index 173331886..fbf0af46b 100644 --- a/contracts/utils/Arrays.sol +++ b/contracts/utils/Arrays.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/Arrays.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Arrays.sol) // This file was procedurally generated from scripts/generate/templates/Arrays.js. pragma solidity ^0.8.20; diff --git a/contracts/utils/Base64.sol b/contracts/utils/Base64.sol index c6ee6a524..7f23687f9 100644 --- a/contracts/utils/Base64.sol +++ b/contracts/utils/Base64.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (utils/Base64.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Base64.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Blockhash.sol b/contracts/utils/Blockhash.sol index a4a7cb003..d175cf5e0 100644 --- a/contracts/utils/Blockhash.sol +++ b/contracts/utils/Blockhash.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Blockhash.sol) pragma solidity ^0.8.20; /** diff --git a/contracts/utils/Bytes.sol b/contracts/utils/Bytes.sol index 1234b8455..98c6a0aef 100644 --- a/contracts/utils/Bytes.sol +++ b/contracts/utils/Bytes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.2.0) (utils/Bytes.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Bytes.sol) pragma solidity ^0.8.24; diff --git a/contracts/utils/Strings.sol b/contracts/utils/Strings.sol index 4cc597646..afeccc174 100644 --- a/contracts/utils/Strings.sol +++ b/contracts/utils/Strings.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/Strings.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/Strings.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol index c39954e35..cbbdc87cb 100644 --- a/contracts/utils/cryptography/EIP712.sol +++ b/contracts/utils/cryptography/EIP712.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/cryptography/EIP712.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/EIP712.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/SignatureChecker.sol b/contracts/utils/cryptography/SignatureChecker.sol index 3b570418f..f941c1a2f 100644 --- a/contracts/utils/cryptography/SignatureChecker.sol +++ b/contracts/utils/cryptography/SignatureChecker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (utils/cryptography/SignatureChecker.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/SignatureChecker.sol) pragma solidity ^0.8.24; diff --git a/contracts/utils/cryptography/draft-ERC7739Utils.sol b/contracts/utils/cryptography/draft-ERC7739Utils.sol index ec79fdd22..8da4ddfd2 100644 --- a/contracts/utils/cryptography/draft-ERC7739Utils.sol +++ b/contracts/utils/cryptography/draft-ERC7739Utils.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/draft-ERC7739Utils.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/AbstractSigner.sol b/contracts/utils/cryptography/signers/AbstractSigner.sol index a269df855..b947f5623 100644 --- a/contracts/utils/cryptography/signers/AbstractSigner.sol +++ b/contracts/utils/cryptography/signers/AbstractSigner.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/AbstractSigner.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/MultiSignerERC7913.sol b/contracts/utils/cryptography/signers/MultiSignerERC7913.sol index e8473fca9..de735917f 100644 --- a/contracts/utils/cryptography/signers/MultiSignerERC7913.sol +++ b/contracts/utils/cryptography/signers/MultiSignerERC7913.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/MultiSignerERC7913.sol) pragma solidity ^0.8.26; diff --git a/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol b/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol index 4fa3fa683..09cd34c3d 100644 --- a/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol +++ b/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/MultiSignerERC7913Weighted.sol) pragma solidity ^0.8.27; diff --git a/contracts/utils/cryptography/signers/SignerECDSA.sol b/contracts/utils/cryptography/signers/SignerECDSA.sol index c9a543343..f08e6f905 100644 --- a/contracts/utils/cryptography/signers/SignerECDSA.sol +++ b/contracts/utils/cryptography/signers/SignerECDSA.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/SignerECDSA.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/SignerERC7702.sol b/contracts/utils/cryptography/signers/SignerERC7702.sol index 687eeefc4..11b2d5882 100644 --- a/contracts/utils/cryptography/signers/SignerERC7702.sol +++ b/contracts/utils/cryptography/signers/SignerERC7702.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/SignerERC7702.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/SignerERC7913.sol b/contracts/utils/cryptography/signers/SignerERC7913.sol index ecc387536..4a8ff153b 100644 --- a/contracts/utils/cryptography/signers/SignerERC7913.sol +++ b/contracts/utils/cryptography/signers/SignerERC7913.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/SignerERC7913.sol) pragma solidity ^0.8.24; diff --git a/contracts/utils/cryptography/signers/SignerP256.sol b/contracts/utils/cryptography/signers/SignerP256.sol index 1d6587662..fe449b08a 100644 --- a/contracts/utils/cryptography/signers/SignerP256.sol +++ b/contracts/utils/cryptography/signers/SignerP256.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/SignerP256.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/SignerRSA.sol b/contracts/utils/cryptography/signers/SignerRSA.sol index e5aadfd98..cfa88cbd9 100644 --- a/contracts/utils/cryptography/signers/SignerRSA.sol +++ b/contracts/utils/cryptography/signers/SignerRSA.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/SignerRSA.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/signers/draft-ERC7739.sol b/contracts/utils/cryptography/signers/draft-ERC7739.sol index b5b829c3c..06af3430b 100644 --- a/contracts/utils/cryptography/signers/draft-ERC7739.sol +++ b/contracts/utils/cryptography/signers/draft-ERC7739.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/signers/draft-ERC7739.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol b/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol index 70d0f342a..1b4ce07e3 100644 --- a/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol +++ b/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/verifiers/ERC7913P256Verifier.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol b/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol index 1139f9326..0b82e9cac 100644 --- a/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol +++ b/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/cryptography/verifiers/ERC7913RSAVerifier.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/introspection/ERC165.sol b/contracts/utils/introspection/ERC165.sol index b21f7e9bd..6207ffb5e 100644 --- a/contracts/utils/introspection/ERC165.sol +++ b/contracts/utils/introspection/ERC165.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (utils/introspection/ERC165.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/introspection/ERC165.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/introspection/IERC165.sol b/contracts/utils/introspection/IERC165.sol index f42416651..6ac40eab8 100644 --- a/contracts/utils/introspection/IERC165.sol +++ b/contracts/utils/introspection/IERC165.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.1.0) (utils/introspection/IERC165.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/introspection/IERC165.sol) pragma solidity >=0.4.16; diff --git a/contracts/utils/structs/Checkpoints.sol b/contracts/utils/structs/Checkpoints.sol index 431c9acb0..a8a9140be 100644 --- a/contracts/utils/structs/Checkpoints.sol +++ b/contracts/utils/structs/Checkpoints.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/structs/Checkpoints.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/structs/Checkpoints.sol) // This file was procedurally generated from scripts/generate/templates/Checkpoints.js. pragma solidity ^0.8.20; diff --git a/contracts/utils/structs/EnumerableMap.sol b/contracts/utils/structs/EnumerableMap.sol index 69cb57781..659eb7ff6 100644 --- a/contracts/utils/structs/EnumerableMap.sol +++ b/contracts/utils/structs/EnumerableMap.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/structs/EnumerableMap.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/structs/EnumerableMap.sol) // This file was procedurally generated from scripts/generate/templates/EnumerableMap.js. pragma solidity ^0.8.20; diff --git a/contracts/utils/structs/EnumerableSet.sol b/contracts/utils/structs/EnumerableSet.sol index 896e484c7..15418446c 100644 --- a/contracts/utils/structs/EnumerableSet.sol +++ b/contracts/utils/structs/EnumerableSet.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.3.0) (utils/structs/EnumerableSet.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (utils/structs/EnumerableSet.sol) // This file was procedurally generated from scripts/generate/templates/EnumerableSet.js. pragma solidity ^0.8.20; diff --git a/contracts/vendor/compound/ICompoundTimelock.sol b/contracts/vendor/compound/ICompoundTimelock.sol index 3ecf251cf..506e2e4e8 100644 --- a/contracts/vendor/compound/ICompoundTimelock.sol +++ b/contracts/vendor/compound/ICompoundTimelock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (vendor/compound/ICompoundTimelock.sol) +// OpenZeppelin Contracts (last updated v5.4.0-rc.0) (vendor/compound/ICompoundTimelock.sol) pragma solidity >=0.6.9; diff --git a/docs/antora.yml b/docs/antora.yml index 4bc06b36a..46c7444e0 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,7 @@ name: contracts title: Contracts -version: 5.x -prerelease: false +version: 5.x-rc +prerelease: true nav: - modules/ROOT/nav.adoc - modules/api/nav.adoc diff --git a/package.json b/package.json index 851020463..e35a9b285 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openzeppelin-solidity", "description": "Secure Smart Contract library for Solidity", - "version": "5.3.0", + "version": "5.4.0-rc.0", "private": true, "files": [ "/contracts/**/*.sol",