diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ffaacfc1..ee0aaae15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Breaking changes: * `ERC165Checker` now requires a minimum Solidity compiler version of 0.5.10. ([#1829](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1829)) -## 2.4.0 (unreleased) +## 2.4.0 (2019-10-29) ### New features: * `Address.toPayable`: added a helper to convert between address types without having to resort to low-level casting. ([#1773](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1773)) diff --git a/contracts/GSN/README.adoc b/contracts/GSN/README.adoc index a78226255..7788512ce 100644 --- a/contracts/GSN/README.adoc +++ b/contracts/GSN/README.adoc @@ -15,8 +15,6 @@ Utilities to make writing xref:ROOT:gsn-strategies.adoc[GSN strategies] easy are You can also take a look at the two contract interfaces that make up the GSN protocol: {IRelayRecipient} and {IRelayHub}, but you won't need to use those directly. -NOTE: This feature is being released in the next version of OpenZeppelin Contracts, available right now through `npm install @openzeppelin/contracts@next`. - == Recipient {{GSNRecipient}} diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol index 531b31b77..e7091fb22 100644 --- a/contracts/math/SafeMath.sol +++ b/contracts/math/SafeMath.sol @@ -52,9 +52,6 @@ library SafeMath { * Requirements: * - Subtraction cannot overflow. * - * NOTE: This is a feature of the next version of OpenZeppelin Contracts. - * @dev Get it via `npm install @openzeppelin/contracts@next`. - * * _Available since v2.4.0._ */ function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { @@ -112,9 +109,6 @@ library SafeMath { * * Requirements: * - The divisor cannot be zero. - - * NOTE: This is a feature of the next version of OpenZeppelin Contracts. - * @dev Get it via `npm install @openzeppelin/contracts@next`. * * _Available since v2.4.0._ */ @@ -153,9 +147,6 @@ library SafeMath { * Requirements: * - The divisor cannot be zero. * - * NOTE: This is a feature of the next version of OpenZeppelin Contracts. - * @dev Get it via `npm install @openzeppelin/contracts@next`. - * * _Available since v2.4.0._ */ function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { diff --git a/contracts/package.json b/contracts/package.json index 0271d14cb..ef570eeef 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@openzeppelin/contracts", - "version": "2.3.0", + "version": "2.4.0", "description": "Secure Smart Contract library for Solidity", "files": [ "**/*.sol", diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol index fe54f45d2..61830f0b1 100644 --- a/contracts/utils/Address.sol +++ b/contracts/utils/Address.sol @@ -34,9 +34,6 @@ library Address { * @dev Converts an `address` into `address payable`. Note that this is * simply a type cast: the actual underlying value is not changed. * - * NOTE: This is a feature of the next version of OpenZeppelin Contracts. - * @dev Get it via `npm install @openzeppelin/contracts@next`. - * * _Available since v2.4.0._ */ function toPayable(address account) internal pure returns (address payable) { diff --git a/docs/modules/ROOT/pages/gsn.adoc b/docs/modules/ROOT/pages/gsn.adoc index 5a88cc0d5..7cd0bba91 100644 --- a/docs/modules/ROOT/pages/gsn.adoc +++ b/docs/modules/ROOT/pages/gsn.adoc @@ -4,8 +4,6 @@ The https://gsn.openzeppelin.com[Gas Station Network] allows you to build apps w If you're new to the GSN, you probably want to first take a look at the xref:openzeppelin::gsn/what-is-the-gsn.adoc[light overview of the system], to get a clearer picture of how gasless transactions are achieved. Otherwise, strap in! -NOTE: This feature is being released in the next version of `@openzeppelin/contracts`, available right now through `npm install @openzeppelin/contracts@next`. It is also available on the `@openzeppelin/contracts-ethereum-package` variant. - == Receiving a relayed call The first step to writing a recipient is to inherit from our GSNRecipient contract. If you're also inheriting from other OpenZeppelin contracts, such as ERC20 or Crowdsale, this will work just fine: adding GSNRecipient to all of your token or crowdsale functions will make them GSN-callable. diff --git a/ethpm.json b/ethpm.json index f7ed6925b..7593e5c25 100644 --- a/ethpm.json +++ b/ethpm.json @@ -1,6 +1,6 @@ { "package_name": "zeppelin", - "version": "2.3.0", + "version": "2.4.0", "description": "Secure Smart Contract library for Solidity", "authors": [ "OpenZeppelin Community " diff --git a/package-lock.json b/package-lock.json index d9a6e7890..2fc206ebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "2.3.0", + "version": "2.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 291b2915b..1cf904322 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-solidity", - "version": "2.3.0", + "version": "2.4.0", "description": "Secure Smart Contract library for Solidity", "files": [ "/contracts/**/*.sol", diff --git a/scripts/release/release.sh b/scripts/release/release.sh index bf863fedf..e5c259f52 100755 --- a/scripts/release/release.sh +++ b/scripts/release/release.sh @@ -81,7 +81,10 @@ environment_check() { environment_check -if [[ "$*" == "start minor" ]]; then +if [[ "$*" == "push" ]]; then + push_and_publish next + +elif [[ "$*" == "start minor" ]]; then log "Creating new minor pre-release" assert_current_branch master