diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 686a8399c..90437c9a6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,9 +1,8 @@ [bumpversion] -current_version = 0.5.6 +current_version = 0.5.7 [bumpversion:file:setup.cfg] [bumpversion:file:setup.py] [bumpversion:file:package.json] - diff --git a/CHANGELOG.md b/CHANGELOG.md index aaa2d8ab4..57e2d2bbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,27 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v0.5.7](https://github.com/oceanprotocol/ocean-contracts/compare/v0.5.6...v0.5.7) + +> 22 October 2020 + +- Feature/mainnet deployment [`#250`](https://github.com/oceanprotocol/ocean-contracts/pull/250) +- v0.5.6 [`#247`](https://github.com/oceanprotocol/ocean-contracts/pull/247) +- mainnet deployment [`d14b753`](https://github.com/oceanprotocol/ocean-contracts/commit/d14b753eb2be95b4f436b798fd6e0c3b40f4adea) +- prepare for a new release [`d4e8292`](https://github.com/oceanprotocol/ocean-contracts/commit/d4e8292e0fe4d3ba69b2c77072bb35635a3f54bf) +- rebase the rinkeby addresses [`9418606`](https://github.com/oceanprotocol/ocean-contracts/commit/9418606a2abf697d87f9f430cb7c4bb44dee25c4) + #### [v0.5.6](https://github.com/oceanprotocol/ocean-contracts/compare/v0.5.5...v0.5.6) +> 14 October 2020 + - Fix/token template cap [`#245`](https://github.com/oceanprotocol/ocean-contracts/pull/245) - Fix/minor-docs-issues [`#246`](https://github.com/oceanprotocol/ocean-contracts/pull/246) - Fix missing address.json [`#243`](https://github.com/oceanprotocol/ocean-contracts/pull/243) - Fix/rinkeby addresses [`#239`](https://github.com/oceanprotocol/ocean-contracts/pull/239) +- revert package-lock file changes except for the release version [`fae5f11`](https://github.com/oceanprotocol/ocean-contracts/commit/fae5f11594058dd8d6ef8260d2b79fcee23fa748) +- fix lint error [`c3e61e3`](https://github.com/oceanprotocol/ocean-contracts/commit/c3e61e3600dfeece9f6960f013d8a15c24947c60) +- update changelog. [`03577de`](https://github.com/oceanprotocol/ocean-contracts/commit/03577de4a130aee998bc0c22354f0ac7ea6aec57) #### [v0.5.5](https://github.com/oceanprotocol/ocean-contracts/compare/v0.5.4...v0.5.5) diff --git a/package-lock.json b/package-lock.json index b3133afcd..f7dfc0175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "0.5.6", + "version": "0.5.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b6a8c7d35..be9fa9b37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "0.5.6", + "version": "0.5.7", "description": "Ocean Protocol L1 - DataTokens", "bugs": { "url": "https://github.com/oceanprotocol/contracts/issues" @@ -80,7 +80,7 @@ "release-it": "^13.6.2", "solc": "^0.5.7", "solidity-coverage": "0.7.5", - "solidity-docgen": "^0.5.6", + "solidity-docgen": "^0.5.7", "solium": "^1.2.5", "solium-plugin-security": "^0.1.1", "truffle": "^5.1.43", diff --git a/setup.cfg b/setup.cfg index 0b01c3790..895967f4d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.6 +current_version = 0.5.7 commit = True tag = True diff --git a/setup.py b/setup.py index 361e90ec5..ccfd129ad 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ test_suite='tests', tests_require=test_requirements, url='https://github.com/oceanprotocol/ocean-contracts', - version='0.5.6', + version='0.5.7', zip_safe=False, ) \ No newline at end of file