diff --git a/.changeset/pre.json b/.changeset/pre.json index c1c2f9cacce..f84a1a96e7c 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -73,6 +73,7 @@ "tender-shirts-turn", "thick-pumpkins-exercise", "thin-camels-matter", + "thirty-drinks-happen", "tough-drinks-hammer", "two-wasps-punch", "unlucky-beans-obey", diff --git a/CHANGELOG.md b/CHANGELOG.md index e23d0634e80..039e566bc9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog +## 5.0.0-rc.2 (2023-10-02) + +- `AccessManager`: Make `schedule` and `execute` more conservative when delay is 0. + ## 5.0.0-rc.1 (2023-09-28) - Upgradeable Contracts: No longer transpile interfaces, libraries, and stateless contracts. ([#4636](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4636)) diff --git a/contracts/access/manager/AccessManager.sol b/contracts/access/manager/AccessManager.sol index d3e24765cc3..2b5b5a07ff9 100644 --- a/contracts/access/manager/AccessManager.sol +++ b/contracts/access/manager/AccessManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0-rc.1) (access/manager/AccessManager.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (access/manager/AccessManager.sol) pragma solidity ^0.8.20; diff --git a/contracts/package.json b/contracts/package.json index a0bbc26759b..5cd226323ae 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.0.0-rc.1", + "version": "5.0.0-rc.2", "files": [ "**/*.sol", "/build/contracts/*.json", diff --git a/contracts/proxy/utils/UUPSUpgradeable.sol b/contracts/proxy/utils/UUPSUpgradeable.sol index da0b1f6da15..dedf2814eb3 100644 --- a/contracts/proxy/utils/UUPSUpgradeable.sol +++ b/contracts/proxy/utils/UUPSUpgradeable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0-rc.1) (proxy/utils/UUPSUpgradeable.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (proxy/utils/UUPSUpgradeable.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC1155/utils/ERC1155Holder.sol b/contracts/token/ERC1155/utils/ERC1155Holder.sol index 6dbd8ad0faf..9e4f9f547f4 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.0.0-rc.1) (token/ERC1155/utils/ERC1155Holder.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (token/ERC1155/utils/ERC1155Holder.sol) pragma solidity ^0.8.20; diff --git a/contracts/token/ERC721/utils/ERC721Holder.sol b/contracts/token/ERC721/utils/ERC721Holder.sol index 525866f58c5..c4d47d19678 100644 --- a/contracts/token/ERC721/utils/ERC721Holder.sol +++ b/contracts/token/ERC721/utils/ERC721Holder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0-rc.1) (token/ERC721/utils/ERC721Holder.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (token/ERC721/utils/ERC721Holder.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Context.sol b/contracts/utils/Context.sol index 208edcfc9a1..772a3c316fa 100644 --- a/contracts/utils/Context.sol +++ b/contracts/utils/Context.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0-rc.1) (utils/Context.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (utils/Context.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Multicall.sol b/contracts/utils/Multicall.sol index f9dd5be7df0..f61025db023 100644 --- a/contracts/utils/Multicall.sol +++ b/contracts/utils/Multicall.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0-rc.1) (utils/Multicall.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (utils/Multicall.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/introspection/ERC165.sol b/contracts/utils/introspection/ERC165.sol index 47838296adf..3648e68d78b 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.0.0-rc.1) (utils/introspection/ERC165.sol) +// OpenZeppelin Contracts (last updated v5.0.0-rc.2) (utils/introspection/ERC165.sol) pragma solidity ^0.8.20; diff --git a/package.json b/package.json index b9203637eed..75501993a5f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openzeppelin-solidity", "description": "Secure Smart Contract library for Solidity", - "version": "5.0.0-rc.1", + "version": "5.0.0-rc.2", "private": true, "files": [ "/contracts/**/*.sol",