4.0.0

add missing rewrite rule in scripts/migrate-imports.js
(cherry picked from commit a3712a3288)
2021-03-23 12:06:54 -03:00 · 2021-03-22 18:08:36 +01:00 · 2021-03-15 16:48:43 -03:00
7 changed files with 9 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,6 @@
 # Changelog

-## 4.0.0
+## 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))
--- a/contracts/package.json
+++ b/contracts/package.json
@ -1,7 +1,7 @@
 {
  "name": "@openzeppelin/contracts",
  "description": "Secure Smart Contract library for Solidity",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0",
  "files": [
    "**/*.sol",
    "/build/contracts/*.json",
--- a/contracts/token/ERC721/README.adoc
+++ b/contracts/token/ERC721/README.adoc
@ -39,7 +39,7 @@ NOTE: This core set of contracts is designed to be unopinionated, allowing devel

 {{ERC721Burnable}}

-{{ERC721TokenUri}}
+{{ERC721URIStorage}}

 == Presets

--- a/contracts/token/ERC721/extensions/ERC721URIStorage.sol
+++ b/contracts/token/ERC721/extensions/ERC721URIStorage.sol
@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 import "../ERC721.sol";

 /**
- * @dev ERC721 token with storage based token uri management.
+ * @dev ERC721 token with storage based token URI management.
 */
 abstract contract ERC721URIStorage is ERC721 {
    using Strings for uint256;
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "openzeppelin-solidity",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "openzeppelin-solidity",
-      "version": "4.0.0-beta.0",
+      "version": "4.0.0",
      "license": "MIT",
      "bin": {
        "openzeppelin-contracts-migrate-imports": "scripts/migrate-imports.js"
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "openzeppelin-solidity",
  "description": "Secure Smart Contract library for Solidity",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0",
  "files": [
    "/contracts/**/*.sol",
    "/build/contracts/*.json",
@ -75,6 +75,5 @@
    "solidity-coverage": "^0.7.11",
    "solidity-docgen": "^0.5.3",
    "web3": "^1.3.0"
-  },
-  "dependencies": {}
+  }
 }
--- a/scripts/migrate-imports.js
+++ b/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',
Author	SHA1	Message	Date
Francisco Giordano	a673994de5	4.0.0	2021-03-23 12:06:54 -03:00
Hadrien Croubois	9b0e27c98c	add missing rewrite rule in scripts/migrate-imports.js (cherry picked from commit `a3712a3288`)	2021-03-22 18:08:36 +01:00
Francisco Giordano	90a72f9acd	Fix ERC721URIStorage in documentation (cherry picked from commit `7c1625b0e0`)	2021-03-15 16:48:43 -03:00