Merge upstream openzeppelin-contracts into upstream-patched

CHANGELOG.md

@@ -6,7 +6,7 @@
  * `ERC777`: make reception acquirement optional in `_mint`. ([#2552](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2552))
  * `ERC20Permit`: add a `_useNonce` to enable further usage of ERC712 signatures. ([#2565](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2565))
 
-## Unreleased
+## 4.0.0 (2021-03-23)
 
  * Now targeting the 0.8.x line of Solidity compilers. For 0.6.x (resp 0.7.x) support, use version 3.4.0 (resp 3.4.0-solc-0.7) of OpenZeppelin.
  * `Context`: making `_msgData` return `bytes calldata` instead of `bytes memory` ([#2492](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2492))
@@ -31,7 +31,6 @@
 
  * `AccessControlEnumerable`: Fixed `renounceRole` not updating enumerable set of addresses for a role. ([#2572](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2572))
 
-
 ### How to upgrade from 3.x
 
 Since this version has moved a few contracts to different directories, users upgrading from a previous version will need to adjust their import statements. To make this easier, the package includes a script that will migrate import statements automatically. After upgrading to the latest version of the package, run:

contracts/package.json

 {
   "name": "@openzeppelin/contracts-upgradeable",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",

contracts/token/ERC20/ERC20.sol

@@ -76,7 +76,7 @@ contract ERC20 is Context, IERC20, IERC20Metadata {
      *
      * Tokens usually opt for a value of 18, imitating the relationship between
      * Ether and Wei. This is the value {ERC20} uses, unless this function is
-     * overloaded;
+     * overridden;
      *
      * NOTE: This information is only used for _display_ purposes: it in
      * no way affects any of the arithmetic of the contract, including

docs/antora.yml

 name: contracts
 title: Contracts
-version: 3.x
+version: 4.x
 nav:
   - modules/ROOT/nav.adoc
   - modules/api/nav.adoc

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "openzeppelin-solidity",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",

scripts/migrate-imports.js

@@ -47,7 +47,7 @@ const pathUpdates = {
   // 'proxy/Proxy.sol': undefined,
   // 'proxy/TransparentUpgradeableProxy.sol': 'proxy/transparent/TransparentUpgradeableProxy.sol',
   // 'proxy/UpgradeableBeacon.sol': 'proxy/beacon/UpgradeableBeacon.sol',
-  // 'proxy/UpgradeableProxy.sol': undefined,
+  // 'proxy/UpgradeableProxy.sol': 'proxy/ERC1967/ERC1967Proxy.sol',
   'token/ERC1155/ERC1155Burnable.sol': 'token/ERC1155/extensions/ERC1155Burnable.sol',
   'token/ERC1155/ERC1155Holder.sol': 'token/ERC1155/utils/ERC1155Holder.sol',
   'token/ERC1155/ERC1155Pausable.sol': 'token/ERC1155/extensions/ERC1155Pausable.sol',

scripts/release/release.sh

@@ -42,8 +42,10 @@ publish() {
   npm publish --tag "$dist_tag" --otp "$(prompt_otp)"
 
   log "Publishing @openzeppelin/contracts on npm"
+  cd contracts
   env ALREADY_COMPILED= \
-      npm publish contracts --tag "$dist_tag" --otp "$(prompt_otp)"
+      npm publish --tag "$dist_tag" --otp "$(prompt_otp)"
+  cd ..
 
   if [[ "$dist_tag" == "latest" ]]; then
     otp="$(prompt_otp)"