From f2fb8cf23b5f2b868f986ad91369e5004842c274 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 3 Sep 2020 16:26:55 -0300 Subject: [PATCH 1/3] 3.2.0-rc.0 --- contracts/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/package.json b/contracts/package.json index 0592d6a2d..e50a5eb2f 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@openzeppelin/contracts", - "version": "3.1.0", + "version": "3.2.0-rc.0", "description": "Secure Smart Contract library for Solidity", "files": [ "**/*.sol", diff --git a/package-lock.json b/package-lock.json index 7def0c566..a9c4f9454 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "3.1.0", + "version": "3.2.0-rc.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 03981ff5e..24743980e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "3.1.0", + "version": "3.2.0-rc.0", "description": "Secure Smart Contract library for Solidity", "files": [ "/contracts/**/*.sol", From 45b81c969f03cf5a96cde8ddea277db6e3c75474 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 9 Sep 2020 17:43:00 -0300 Subject: [PATCH 2/3] Add note about proxy changes in the changelog (cherry picked from commit cfb7f800032348a861a6570f0c12634d4ff9f3cb) --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5068de3e..b61e9c2f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ ### New features * Proxies: added the proxy contracts from OpenZeppelin SDK. ([#2335](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2335)) +#### Proxy changes with respect to OpenZeppelin SDK + +Aside from upgrading them from Solidity 0.5 to 0.6, we've changed a few minor things from the proxy contracts as they were found in OpenZeppelin SDK. + +- `UpgradeabilityProxy` was renamed to `UpgradeableProxy`. +- `AdminUpgradeabilityProxy` was renamed to `TransparentUpgradeableProxy`. +- `Proxy._willFallback` was renamed to `Proxy._beforeFallback`. +- `UpgradeabilityProxy._setImplementation` and `AdminUpgradeabilityProxy._setAdmin` were made private. + ### Improvements * `Address.isContract`: switched from `extcodehash` to `extcodesize` for less gas usage. ([#2311](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2311)) From 1ada3b633e5bfd9d4ffe0207d64773a11f5a7c40 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 10 Sep 2020 20:10:42 -0300 Subject: [PATCH 3/3] 3.2.0 --- CHANGELOG.md | 2 +- contracts/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b61e9c2f1..a2cbb489e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 3.2.0 (unreleased) +## 3.2.0 (2020-09-10) ### New features * Proxies: added the proxy contracts from OpenZeppelin SDK. ([#2335](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2335)) diff --git a/contracts/package.json b/contracts/package.json index e50a5eb2f..3a298aec4 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@openzeppelin/contracts", - "version": "3.2.0-rc.0", + "version": "3.2.0", "description": "Secure Smart Contract library for Solidity", "files": [ "**/*.sol", diff --git a/package-lock.json b/package-lock.json index a9c4f9454..973d4d9aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "3.2.0-rc.0", + "version": "3.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 24743980e..c7be6bf4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "3.2.0-rc.0", + "version": "3.2.0", "description": "Secure Smart Contract library for Solidity", "files": [ "/contracts/**/*.sol",