pull/3516/head v4.7.0-rc.0
Francisco Giordano 3 years ago
parent 7c75b8aa89
commit fac4326b5a
  1. 2
      CHANGELOG.md
  2. 2
      contracts/access/AccessControl.sol
  3. 2
      contracts/access/Ownable.sol
  4. 2
      contracts/crosschain/amb/CrossChainEnabledAMB.sol
  5. 2
      contracts/crosschain/amb/LibAMB.sol
  6. 2
      contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol
  7. 2
      contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol
  8. 2
      contracts/crosschain/arbitrum/LibArbitrumL1.sol
  9. 2
      contracts/crosschain/arbitrum/LibArbitrumL2.sol
  10. 2
      contracts/crosschain/optimism/CrossChainEnabledOptimism.sol
  11. 2
      contracts/crosschain/optimism/LibOptimism.sol
  12. 2
      contracts/crosschain/polygon/CrossChainEnabledPolygonChild.sol
  13. 2
      contracts/finance/PaymentSplitter.sol
  14. 2
      contracts/finance/VestingWallet.sol
  15. 2
      contracts/governance/Governor.sol
  16. 2
      contracts/governance/IGovernor.sol
  17. 2
      contracts/governance/TimelockController.sol
  18. 2
      contracts/interfaces/IERC3156FlashBorrower.sol
  19. 1
      contracts/interfaces/IERC4626.sol
  20. 2
      contracts/metatx/ERC2771Context.sol
  21. 2
      contracts/metatx/MinimalForwarder.sol
  22. 2
      contracts/package.json
  23. 2
      contracts/proxy/Clones.sol
  24. 2
      contracts/proxy/ERC1967/ERC1967Proxy.sol
  25. 2
      contracts/proxy/beacon/BeaconProxy.sol
  26. 2
      contracts/proxy/transparent/TransparentUpgradeableProxy.sol
  27. 2
      contracts/proxy/utils/Initializable.sol
  28. 2
      contracts/security/Pausable.sol
  29. 2
      contracts/security/PullPayment.sol
  30. 2
      contracts/token/ERC1155/ERC1155.sol
  31. 2
      contracts/token/ERC1155/IERC1155.sol
  32. 2
      contracts/token/ERC1155/extensions/ERC1155Burnable.sol
  33. 2
      contracts/token/ERC20/ERC20.sol
  34. 2
      contracts/token/ERC20/extensions/ERC20FlashMint.sol
  35. 2
      contracts/token/ERC20/extensions/ERC20Snapshot.sol
  36. 1
      contracts/token/ERC20/extensions/ERC20TokenizedVault.sol
  37. 2
      contracts/token/ERC20/utils/SafeERC20.sol
  38. 2
      contracts/token/ERC721/ERC721.sol
  39. 2
      contracts/token/ERC721/IERC721.sol
  40. 2
      contracts/token/ERC721/extensions/ERC721Burnable.sol
  41. 2
      contracts/token/ERC721/extensions/ERC721URIStorage.sol
  42. 2
      contracts/token/ERC777/ERC777.sol
  43. 2
      contracts/token/common/ERC2981.sol
  44. 2
      contracts/utils/Address.sol
  45. 2
      contracts/utils/Base64.sol
  46. 2
      contracts/utils/Create2.sol
  47. 2
      contracts/utils/StorageSlot.sol
  48. 2
      contracts/utils/Strings.sol
  49. 2
      contracts/utils/cryptography/ECDSA.sol
  50. 2
      contracts/utils/cryptography/MerkleProof.sol
  51. 2
      contracts/utils/escrow/Escrow.sol
  52. 2
      contracts/utils/math/Math.sol
  53. 2
      contracts/utils/math/SafeCast.sol
  54. 2
      contracts/utils/structs/EnumerableMap.sol
  55. 2
      contracts/utils/structs/EnumerableSet.sol
  56. 2
      package-lock.json
  57. 2
      package.json

@ -1,6 +1,6 @@
# Changelog
## Unreleased
## 4.7.0
* `TimelockController`: Migrate `_call` to `_execute` and allow inheritance and overriding similar to `Governor`. ([#3317](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3317))
* `CrossChainEnabledPolygonChild`: replace the `require` statement with the custom error `NotCrossChainCall`. ([#3380](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3380))

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (access/AccessControl.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (access/AccessControl.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (access/Ownable.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (access/Ownable.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/amb/CrossChainEnabledAMB.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/amb/CrossChainEnabledAMB.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/amb/LibAMB.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/amb/LibAMB.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/arbitrum/LibArbitrumL1.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/arbitrum/LibArbitrumL1.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/arbitrum/LibArbitrumL2.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/arbitrum/LibArbitrumL2.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/optimism/CrossChainEnabledOptimism.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/optimism/CrossChainEnabledOptimism.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/optimism/LibOptimism.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/optimism/LibOptimism.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (crosschain/polygon/CrossChainEnabledPolygonChild.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (crosschain/polygon/CrossChainEnabledPolygonChild.sol)
pragma solidity ^0.8.4;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (finance/PaymentSplitter.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (finance/PaymentSplitter.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (finance/VestingWallet.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (finance/VestingWallet.sol)
pragma solidity ^0.8.0;
import "../token/ERC20/utils/SafeERC20.sol";

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (governance/Governor.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (governance/Governor.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (governance/IGovernor.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (governance/IGovernor.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (governance/TimelockController.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (governance/TimelockController.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (interfaces/IERC3156FlashBorrower.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (interfaces/IERC3156FlashBorrower.sol)
pragma solidity ^0.8.0;

@ -1,4 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (interfaces/IERC4626.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (metatx/ERC2771Context.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (metatx/ERC2771Context.sol)
pragma solidity ^0.8.9;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (metatx/MinimalForwarder.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (metatx/MinimalForwarder.sol)
pragma solidity ^0.8.0;

@ -1,7 +1,7 @@
{
"name": "@openzeppelin/contracts",
"description": "Secure Smart Contract library for Solidity",
"version": "4.6.0",
"version": "4.7.0-rc.0",
"files": [
"**/*.sol",
"/build/contracts/*.json",

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (proxy/Clones.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (proxy/Clones.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (proxy/ERC1967/ERC1967Proxy.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (proxy/ERC1967/ERC1967Proxy.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (proxy/beacon/BeaconProxy.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (proxy/beacon/BeaconProxy.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (proxy/transparent/TransparentUpgradeableProxy.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (proxy/transparent/TransparentUpgradeableProxy.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (proxy/utils/Initializable.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (proxy/utils/Initializable.sol)
pragma solidity ^0.8.2;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (security/Pausable.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (security/Pausable.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (security/PullPayment.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (security/PullPayment.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC1155/ERC1155.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC1155/ERC1155.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (token/ERC1155/IERC1155.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC1155/IERC1155.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (token/ERC1155/extensions/ERC1155Burnable.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC1155/extensions/ERC1155Burnable.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/ERC20.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC20/ERC20.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/extensions/ERC20FlashMint.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC20/extensions/ERC20FlashMint.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/extensions/ERC20Snapshot.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC20/extensions/ERC20Snapshot.sol)
pragma solidity ^0.8.0;

@ -1,4 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC20/extensions/ERC20TokenizedVault.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (token/ERC20/utils/SafeERC20.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC20/utils/SafeERC20.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC721/ERC721.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC721/ERC721.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC721/IERC721.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC721/IERC721.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (token/ERC721/extensions/ERC721Burnable.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC721/extensions/ERC721Burnable.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (token/ERC721/extensions/ERC721URIStorage.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC721/extensions/ERC721URIStorage.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC777/ERC777.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/ERC777/ERC777.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (token/common/ERC2981.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (token/common/ERC2981.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (utils/Address.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/Address.sol)
pragma solidity ^0.8.1;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (utils/Base64.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/Base64.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (utils/Create2.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/Create2.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (utils/StorageSlot.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/StorageSlot.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (utils/Strings.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/Strings.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (utils/cryptography/ECDSA.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/cryptography/ECDSA.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (utils/cryptography/MerkleProof.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/cryptography/MerkleProof.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts v4.4.1 (utils/escrow/Escrow.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/escrow/Escrow.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.5.0) (utils/math/Math.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/math/Math.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.4.1) (utils/math/SafeCast.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/math/SafeCast.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (utils/structs/EnumerableMap.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/structs/EnumerableMap.sol)
pragma solidity ^0.8.0;

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v4.6.0) (utils/structs/EnumerableSet.sol)
// OpenZeppelin Contracts (last updated v4.7.0-rc.0) (utils/structs/EnumerableSet.sol)
pragma solidity ^0.8.0;

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "openzeppelin-solidity",
"version": "4.6.0",
"version": "4.7.0-rc.0",
"lockfileVersion": 2,
"requires": true,
"packages": {

@ -1,7 +1,7 @@
{
"name": "openzeppelin-solidity",
"description": "Secure Smart Contract library for Solidity",
"version": "4.6.0",
"version": "4.7.0-rc.0",
"files": [
"/contracts/**/*.sol",
"/build/contracts/*.json",

Loading…
Cancel
Save