diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b18219f5e..8243773f1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.1 +current_version = 0.5.2 [bumpversion:file:setup.cfg] diff --git a/CHANGELOG.md b/CHANGELOG.md index aa976e25b..ac7edc8c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ 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.2](https://github.com/oceanprotocol/ocean-contracts/compare/v0.5.1...v0.5.2) + +> 1 October 2020 + +- Fix/Release-Process [`#230`](https://github.com/oceanprotocol/ocean-contracts/pull/230) +- Use block.timestamp for orders logs [`#231`](https://github.com/oceanprotocol/ocean-contracts/pull/231) +- Fix/Minor-deployment-update [`#229`](https://github.com/oceanprotocol/ocean-contracts/pull/229) +- Release/v0.5.1 [`#228`](https://github.com/oceanprotocol/ocean-contracts/pull/228) +- prepare for a new release [`afa81fb`](https://github.com/oceanprotocol/ocean-contracts/commit/afa81fb86378633af714c6720ff764bf92f7c01b) +- update addresses [`cf9bf31`](https://github.com/oceanprotocol/ocean-contracts/commit/cf9bf312394188a615e7691034e0116b603238a0) +- Update DataTokenTemplate.sol [`038a558`](https://github.com/oceanprotocol/ocean-contracts/commit/038a55863ad193cace5a8781f68fbfab80208f28) + #### [v0.5.1](https://github.com/oceanprotocol/ocean-contracts/compare/v0.5.0...v0.5.1) > 1 October 2020 diff --git a/artifacts/BConst.json b/artifacts/BConst.json index 985e7ec38..fa380b373 100644 --- a/artifacts/BConst.json +++ b/artifacts/BConst.json @@ -2837,7 +2837,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.044Z", + "updatedAt": "2020-10-01T15:56:38.602Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BFactory.json b/artifacts/BFactory.json index 99e1de4e4..e4464f556 100644 --- a/artifacts/BFactory.json +++ b/artifacts/BFactory.json @@ -3024,7 +3024,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.051Z", + "updatedAt": "2020-10-01T15:56:38.603Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BMath.json b/artifacts/BMath.json index 55db40859..f4545909b 100644 --- a/artifacts/BMath.json +++ b/artifacts/BMath.json @@ -16482,7 +16482,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.058Z", + "updatedAt": "2020-10-01T15:56:38.605Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BNum.json b/artifacts/BNum.json index 610f0d670..a85b3a96d 100644 --- a/artifacts/BNum.json +++ b/artifacts/BNum.json @@ -13037,7 +13037,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.076Z", + "updatedAt": "2020-10-01T15:56:38.612Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BPool.json b/artifacts/BPool.json index 0271c612a..4c5abb32d 100644 --- a/artifacts/BPool.json +++ b/artifacts/BPool.json @@ -66915,7 +66915,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.088Z", + "updatedAt": "2020-10-01T15:56:38.616Z", "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 18cad9580..39c6c6459 100644 --- a/artifacts/BToken.json +++ b/artifacts/BToken.json @@ -14000,7 +14000,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.152Z", + "updatedAt": "2020-10-01T15:56:38.643Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BTokenBase.json b/artifacts/BTokenBase.json index 41cb686d8..553334e02 100644 --- a/artifacts/BTokenBase.json +++ b/artifacts/BTokenBase.json @@ -13783,7 +13783,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.161Z", + "updatedAt": "2020-10-01T15:56:38.648Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Context.json b/artifacts/Context.json index ff000b581..c95c71b8e 100644 --- a/artifacts/Context.json +++ b/artifacts/Context.json @@ -585,7 +585,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.192Z", + "updatedAt": "2020-10-01T15:56:38.669Z", "devdoc": { "methods": {} }, diff --git a/artifacts/DTFactory.json b/artifacts/DTFactory.json index f2b01c7f7..72c56e79f 100644 --- a/artifacts/DTFactory.json +++ b/artifacts/DTFactory.json @@ -4538,7 +4538,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.031Z", + "updatedAt": "2020-10-01T15:56:38.600Z", "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 bbd415ee0..6cff116f4 100644 --- a/artifacts/DataTokenTemplate.json +++ b/artifacts/DataTokenTemplate.json @@ -14305,7 +14305,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.184Z", + "updatedAt": "2020-10-01T15:56:38.663Z", "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 b3b14f466..8ad8cb13b 100644 --- a/artifacts/Deployer.json +++ b/artifacts/Deployer.json @@ -781,7 +781,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.192Z", + "updatedAt": "2020-10-01T15:56:38.669Z", "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 71a5f446a..50736a902 100644 --- a/artifacts/ERC20.json +++ b/artifacts/ERC20.json @@ -11318,7 +11318,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.195Z", + "updatedAt": "2020-10-01T15:56:38.672Z", "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/FixedRateExchange.json b/artifacts/FixedRateExchange.json index d9c8c43ee..433b7232a 100644 --- a/artifacts/FixedRateExchange.json +++ b/artifacts/FixedRateExchange.json @@ -16232,7 +16232,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.172Z", + "updatedAt": "2020-10-01T15:56:38.655Z", "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 86ab25221..6c87edb26 100644 --- a/artifacts/IERC20.json +++ b/artifacts/IERC20.json @@ -1854,7 +1854,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.198Z", + "updatedAt": "2020-10-01T15:56:38.676Z", "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 fbdf21a6c..b8f9d4430 100644 --- a/artifacts/IERC20Template.json +++ b/artifacts/IERC20Template.json @@ -2806,7 +2806,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.181Z", + "updatedAt": "2020-10-01T15:56:38.661Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Metadata.json b/artifacts/Metadata.json index 32cfcd22e..6885497dd 100644 --- a/artifacts/Metadata.json +++ b/artifacts/Metadata.json @@ -2389,7 +2389,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.182Z", + "updatedAt": "2020-10-01T15:56:38.662Z", "devdoc": { "details": "Metadata 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/Migrations.json b/artifacts/Migrations.json index 5191db17f..fc63541df 100644 --- a/artifacts/Migrations.json +++ b/artifacts/Migrations.json @@ -885,7 +885,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.036Z", + "updatedAt": "2020-10-01T15:56:38.602Z", "devdoc": { "methods": {} }, diff --git a/artifacts/OPFCommunityFeeCollector.json b/artifacts/OPFCommunityFeeCollector.json index 27c51e54d..1be91d9d6 100644 --- a/artifacts/OPFCommunityFeeCollector.json +++ b/artifacts/OPFCommunityFeeCollector.json @@ -3296,7 +3296,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.169Z", + "updatedAt": "2020-10-01T15:56:38.653Z", "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 2a0441ae1..d78f1762f 100644 --- a/artifacts/Ownable.json +++ b/artifacts/Ownable.json @@ -3059,7 +3059,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.194Z", + "updatedAt": "2020-10-01T15:56:38.671Z", "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 2934a517c..8ae2da061 100644 --- a/artifacts/SafeMath.json +++ b/artifacts/SafeMath.json @@ -4882,7 +4882,7 @@ }, "networks": {}, "schemaVersion": "3.2.4", - "updatedAt": "2020-10-01T15:18:05.193Z", + "updatedAt": "2020-10-01T15:56:38.670Z", "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..f37475a2e --- /dev/null +++ b/artifacts/address.json @@ -0,0 +1 @@ +{"ganache":{"DTFactory":"0x25A232Fa6eBbd9E1F833ADF036c4472565298A8E","BFactory":"0xCE79A7F7666a359dc679c21FD1514108c1300624","FixedRateExchange":"0xB675f4d7D1Bf01D63CA58CA9D616c797178946f0","Metadata":"0x4B38ab101c106C057Aa0335553830D313f6c8AA8"}} \ No newline at end of file diff --git a/docs/deployments/rinkeby.md b/docs/deployments/rinkeby.md index 167e1fc60..79f05c602 100644 --- a/docs/deployments/rinkeby.md +++ b/docs/deployments/rinkeby.md @@ -1,6 +1,43 @@ # Deployments ## Rinkeby +### V0.5.2 + +The contracts addresses for the latest deployment: + +Find [here](https://github.com/oceanprotocol/atlantic/blob/master/logs/Rinkeby-datatokens-deployment-01102020.txt) more deployment details + +```bash + Deploying 'OPFCommunityFeeCollector' + ----------------------------- + > contract address: 0xF1c56b31900F5FcFEb7D365f0fd244f89595b153 + + Deploying 'DataTokenTemplate' + ----------------------------- + > contract address: 0xBEDa0b963E57D8C05FbBf97BA7D6109675ab8705 + + Deploying 'DTFactory' + --------------------- + > contract address: 0x25A232Fa6eBbd9E1F833ADF036c4472565298A8E + + Deploying 'BPool' + ----------------- + > contract address: 0x1E62868F7Cc388ceD6457203E46F3094227B8EA8 + + Deploying 'BFactory' + -------------------- + > contract address: 0xCE79A7F7666a359dc679c21FD1514108c1300624 + + Deploying 'FixedRateExchange' + -------------------- + > contract address: 0xB675f4d7D1Bf01D63CA58CA9D616c797178946f0 + + Deploying 'Metadata' + -------------------- + > contract address: 0x4B38ab101c106C057Aa0335553830D313f6c8AA8 + +``` + ### V0.5.1 The contracts addresses for the latest deployment: diff --git a/package-lock.json b/package-lock.json index 48f14858d..fff04cacd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "0.5.1", + "version": "0.5.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b25e513b4..5bff7785d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "0.5.1", + "version": "0.5.2", "description": "Ocean Protocol L1 - DataTokens", "bugs": { "url": "https://github.com/oceanprotocol/contracts/issues" diff --git a/setup.cfg b/setup.cfg index eab57dd60..1786e7620 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.1 +current_version = 0.5.2 commit = True tag = True diff --git a/setup.py b/setup.py index 3d6ae7d5e..9357795dc 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.1', + version='0.5.2', zip_safe=False, ) \ No newline at end of file