From 52da1529c66e5c995d3b2947dca914482db2423a Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Wed, 16 Sep 2020 12:34:28 +0200 Subject: [PATCH] v0.4.2 --- .bumpversion.cfg | 2 +- CHANGELOG.md | 13 +++++++++++++ artifacts/BConst.json | 2 +- artifacts/BFactory.json | 2 +- artifacts/BMath.json | 2 +- artifacts/BNum.json | 2 +- artifacts/BPool.json | 2 +- artifacts/BToken.json | 2 +- artifacts/BTokenBase.json | 2 +- artifacts/Context.json | 2 +- artifacts/DDO.json | 2 +- artifacts/DTFactory.json | 2 +- artifacts/DataTokenTemplate.json | 2 +- artifacts/Deployer.json | 2 +- artifacts/ERC20.json | 2 +- artifacts/ERC20Pausable.json | 2 +- artifacts/FixedRateExchange.json | 2 +- artifacts/IERC20.json | 2 +- artifacts/IERC20Template.json | 2 +- artifacts/Migrations.json | 2 +- artifacts/OPFCommunityFeeCollector.json | 2 +- artifacts/Ownable.json | 2 +- artifacts/SafeMath.json | 2 +- artifacts/address.json | 1 + package.json | 2 +- setup.cfg | 2 +- setup.py | 2 +- 27 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 artifacts/address.json diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 250e9e170..5c235753a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.1 +current_version = 0.4.2 [bumpversion:file:setup.cfg] diff --git a/CHANGELOG.md b/CHANGELOG.md index 559a910bf..d8a04f278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ 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.4.2](https://github.com/oceanprotocol/ocean-contracts/compare/v0.4.1...v0.4.2) + +> 16 September 2020 + +- Dockerfile updates [`#199`](https://github.com/oceanprotocol/ocean-contracts/pull/199) +- Fix/Docs [`#197`](https://github.com/oceanprotocol/ocean-contracts/pull/197) +- Fix/datatoken start order [`#200`](https://github.com/oceanprotocol/ocean-contracts/pull/200) +- Feature/Dockerfile [`#196`](https://github.com/oceanprotocol/ocean-contracts/pull/196) +- Release/v0.4.1 [`#193`](https://github.com/oceanprotocol/ocean-contracts/pull/193) +- allow mp zero fees in startOrder [`fd23d3a`](https://github.com/oceanprotocol/ocean-contracts/commit/fd23d3a910e75d4931aa39190be5c1fc9b21a91b) +- update artifacts [`f87915b`](https://github.com/oceanprotocol/ocean-contracts/commit/f87915bf91a4d0b68a6c88eed9361cb742a15afd) +- update artifacts [`0f1bece`](https://github.com/oceanprotocol/ocean-contracts/commit/0f1becefa5ebddb3fc974e36c5a599a5b5956d35) + #### [v0.4.1](https://github.com/oceanprotocol/ocean-contracts/compare/v0.4.0...v0.4.1) > 31 August 2020 diff --git a/artifacts/BConst.json b/artifacts/BConst.json index 667acfb62..77a79ae8f 100644 --- a/artifacts/BConst.json +++ b/artifacts/BConst.json @@ -2837,7 +2837,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.860Z", + "updatedAt": "2020-09-16T10:31:01.032Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BFactory.json b/artifacts/BFactory.json index c35ea575a..e3c375469 100644 --- a/artifacts/BFactory.json +++ b/artifacts/BFactory.json @@ -3311,7 +3311,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.863Z", + "updatedAt": "2020-09-16T10:31:01.035Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BMath.json b/artifacts/BMath.json index 226fa9962..b133e6cfc 100644 --- a/artifacts/BMath.json +++ b/artifacts/BMath.json @@ -16482,7 +16482,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.865Z", + "updatedAt": "2020-09-16T10:31:01.037Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BNum.json b/artifacts/BNum.json index 89de339d1..f32c5bbc1 100644 --- a/artifacts/BNum.json +++ b/artifacts/BNum.json @@ -13037,7 +13037,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.871Z", + "updatedAt": "2020-09-16T10:31:01.044Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BPool.json b/artifacts/BPool.json index 6bcf05c31..4268499f3 100644 --- a/artifacts/BPool.json +++ b/artifacts/BPool.json @@ -66499,7 +66499,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.876Z", + "updatedAt": "2020-09-16T10:31:01.050Z", "devdoc": { "details": "Used by the (Ocean version) BFactory contract as a bytecode reference to deploy new BPools. * This contract is is nearly identical to the BPool.sol contract at [1] The only difference is the \"Proxy contract functionality\" section given below. We'd inherit from BPool if we could, for simplicity. But we can't, because the proxy section needs to access private variables declared in BPool, and Solidity disallows this. Therefore the best we can do for now is clearly demarcate the proxy section. * [1] https://github.com/balancer-labs/balancer-core/contracts/.", "methods": {}, diff --git a/artifacts/BToken.json b/artifacts/BToken.json index 198969773..5bbfcaf36 100644 --- a/artifacts/BToken.json +++ b/artifacts/BToken.json @@ -14000,7 +14000,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.901Z", + "updatedAt": "2020-09-16T10:31:01.078Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BTokenBase.json b/artifacts/BTokenBase.json index d3addb919..6fe145272 100644 --- a/artifacts/BTokenBase.json +++ b/artifacts/BTokenBase.json @@ -13783,7 +13783,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.909Z", + "updatedAt": "2020-09-16T10:31:01.084Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Context.json b/artifacts/Context.json index 0dc23fea7..e9b61a6cb 100644 --- a/artifacts/Context.json +++ b/artifacts/Context.json @@ -585,7 +585,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.932Z", + "updatedAt": "2020-09-16T10:31:01.112Z", "devdoc": { "methods": {} }, diff --git a/artifacts/DDO.json b/artifacts/DDO.json index 5c29d97fd..091607851 100644 --- a/artifacts/DDO.json +++ b/artifacts/DDO.json @@ -4271,7 +4271,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.923Z", + "updatedAt": "2020-09-16T10:31:01.102Z", "devdoc": { "details": "DDO stands for Decentralized Document. It allows publishers to publish their dataset metadata in decentralized way. It follows the Ocean DID Document standard: https://github.com/oceanprotocol/OEPs/blob/master/7/v0.2/README.md", "methods": { diff --git a/artifacts/DTFactory.json b/artifacts/DTFactory.json index 89b663189..1cabeefb8 100644 --- a/artifacts/DTFactory.json +++ b/artifacts/DTFactory.json @@ -4665,7 +4665,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.857Z", + "updatedAt": "2020-09-16T10:31:01.029Z", "devdoc": { "author": "Ocean Protocol Team", "details": "Implementation of Ocean DataTokens Factory * DTFactory deploys DataToken proxy contracts. New DataToken proxy contracts are links to the template contract's bytecode. Proxy contract functionality is based on Ocean Protocol custom implementation of ERC1167 standard.", diff --git a/artifacts/DataTokenTemplate.json b/artifacts/DataTokenTemplate.json index 6e76ea720..e29aceb79 100644 --- a/artifacts/DataTokenTemplate.json +++ b/artifacts/DataTokenTemplate.json @@ -14355,7 +14355,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.925Z", + "updatedAt": "2020-09-16T10:31:01.104Z", "devdoc": { "details": "DataTokenTemplate is an ERC20 compliant token template Used by the factory contract as a bytecode reference to deploy new DataTokens.", "methods": { diff --git a/artifacts/Deployer.json b/artifacts/Deployer.json index bb1ec8d15..f47bbde84 100644 --- a/artifacts/Deployer.json +++ b/artifacts/Deployer.json @@ -783,7 +783,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.932Z", + "updatedAt": "2020-09-16T10:31:01.111Z", "devdoc": { "author": "Ocean Protocol Team", "details": "Contract Deployer This contract allowes factory contract to deploy new contract instances using the same library pattern in solidity. the logic it self is deployed only once, but executed in the context of the new storage contract (new contract instance)", diff --git a/artifacts/ERC20.json b/artifacts/ERC20.json index ce656e578..598df2d5d 100644 --- a/artifacts/ERC20.json +++ b/artifacts/ERC20.json @@ -11318,7 +11318,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.935Z", + "updatedAt": "2020-09-16T10:31:01.114Z", "devdoc": { "details": "Implementation of the {IERC20} interface. * This implementation is agnostic to the way tokens are created. This means that a supply mechanism has to be added in a derived contract using {_mint}. For a generic mechanism see {ERC20Mintable}. * TIP: For a detailed writeup see our guide https://forum.zeppelin.solutions/t/how-to-implement-erc20-supply-mechanisms/226[How to implement supply mechanisms]. * We have followed general OpenZeppelin guidelines: functions revert instead of returning `false` on failure. This behavior is nonetheless conventional and does not conflict with the expectations of ERC20 applications. * Additionally, an {Approval} event is emitted on calls to {transferFrom}. This allows applications to reconstruct the allowance for all accounts just by listening to said events. Other implementations of the EIP may not emit these events, as it isn't required by the specification. * Finally, the non-standard {decreaseAllowance} and {increaseAllowance} functions have been added to mitigate the well-known issues around setting allowances. See {IERC20-approve}.", "methods": { diff --git a/artifacts/ERC20Pausable.json b/artifacts/ERC20Pausable.json index e3ed58dbe..4ae099ad5 100644 --- a/artifacts/ERC20Pausable.json +++ b/artifacts/ERC20Pausable.json @@ -3236,7 +3236,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.930Z", + "updatedAt": "2020-09-16T10:31:01.109Z", "devdoc": { "details": "ERC20Pausable adds the ability to pause ERC20 compliant template used by the ERC20Template contract for pausing the contract.", "methods": { diff --git a/artifacts/FixedRateExchange.json b/artifacts/FixedRateExchange.json index f54f806a7..622da7ca4 100644 --- a/artifacts/FixedRateExchange.json +++ b/artifacts/FixedRateExchange.json @@ -17422,7 +17422,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.916Z", + "updatedAt": "2020-09-16T10:31:01.094Z", "devdoc": { "details": "FixedRateExchange is a fixed rate exchange Contract Marketplaces uses this contract to allow consumers exchanging datatokens with ocean token using a fixed exchange rate.", "methods": { diff --git a/artifacts/IERC20.json b/artifacts/IERC20.json index 228206d57..d0ea5d20d 100644 --- a/artifacts/IERC20.json +++ b/artifacts/IERC20.json @@ -1854,7 +1854,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.938Z", + "updatedAt": "2020-09-16T10:31:01.117Z", "devdoc": { "details": "Interface of the ERC20 standard as defined in the EIP. Does not include the optional functions; to access them see {ERC20Detailed}.", "methods": { diff --git a/artifacts/IERC20Template.json b/artifacts/IERC20Template.json index 682821dc5..4b01f0088 100644 --- a/artifacts/IERC20Template.json +++ b/artifacts/IERC20Template.json @@ -2867,7 +2867,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.922Z", + "updatedAt": "2020-09-16T10:31:01.101Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Migrations.json b/artifacts/Migrations.json index 24347c8d7..fac3e65e9 100644 --- a/artifacts/Migrations.json +++ b/artifacts/Migrations.json @@ -885,7 +885,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.859Z", + "updatedAt": "2020-09-16T10:31:01.032Z", "devdoc": { "methods": {} }, diff --git a/artifacts/OPFCommunityFeeCollector.json b/artifacts/OPFCommunityFeeCollector.json index a0eb5d2df..cc51057c3 100644 --- a/artifacts/OPFCommunityFeeCollector.json +++ b/artifacts/OPFCommunityFeeCollector.json @@ -3296,7 +3296,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.914Z", + "updatedAt": "2020-09-16T10:31:01.092Z", "devdoc": { "details": "Ocean Protocol Foundation Community Fee Collector contract allows consumers to pay very small fee as part of the exchange of data tokens with ocean token in order to support the community of ocean protocol and provide a sustainble development.", "methods": { diff --git a/artifacts/Ownable.json b/artifacts/Ownable.json index 0a8ff2703..f3fb699ba 100644 --- a/artifacts/Ownable.json +++ b/artifacts/Ownable.json @@ -3059,7 +3059,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.934Z", + "updatedAt": "2020-09-16T10:31:01.113Z", "devdoc": { "details": "Contract module which provides a basic access control mechanism, where there is an account (an owner) that can be granted exclusive access to specific functions. * This module is used through inheritance. It will make available the modifier `onlyOwner`, which can be applied to your functions to restrict their use to the owner.", "methods": { diff --git a/artifacts/SafeMath.json b/artifacts/SafeMath.json index fccf54e40..1f6294472 100644 --- a/artifacts/SafeMath.json +++ b/artifacts/SafeMath.json @@ -4882,7 +4882,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T10:18:23.933Z", + "updatedAt": "2020-09-16T10:31:01.112Z", "devdoc": { "details": "Wrappers over Solidity's arithmetic operations with added overflow checks. * Arithmetic operations in Solidity wrap on overflow. This can easily result in bugs, because programmers usually assume that an overflow raises an error, which is the standard behavior in high level programming languages. `SafeMath` restores this intuition by reverting the transaction when an operation overflows. * Using this library instead of the unchecked operations eliminates an entire class of bugs, so it's recommended to use it always.", "methods": {} diff --git a/artifacts/address.json b/artifacts/address.json new file mode 100644 index 000000000..2c8c94668 --- /dev/null +++ b/artifacts/address.json @@ -0,0 +1 @@ +{"ganache":{"DTFactory":"0x4ee3f7C631cB4e0E644A898fBFC93072fF80Cef1","BFactory":"0x6F4A0859D1a65f787b960a2674071D187FF44346","FixedRateExchange":"0x02C078D61a8cB690B341dE93e188D31736A7ca21","DDO":"0x7801176Cb73430EE92C14Be67D99eB0c7324aCC1"}} \ No newline at end of file diff --git a/package.json b/package.json index 004abf9c4..38a786dc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "0.4.1", + "version": "0.4.2", "description": "Ocean Protocol L1 - DataTokens", "bugs": { "url": "https://github.com/oceanprotocol/contracts/issues" diff --git a/setup.cfg b/setup.cfg index f67e2a1e6..4d06f372d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.1 +current_version = 0.4.2 commit = True tag = True diff --git a/setup.py b/setup.py index 0f19637a1..d07fa7a99 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.4.1', + version='0.4.2', zip_safe=False, ) \ No newline at end of file