From ff2cb2ab2e692d0f78379dc1862219f89e29095c Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Wed, 16 Sep 2020 12:19:13 +0200 Subject: [PATCH] prepare for a new release --- 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 - docs/contracts/templates/DataTokenTemplate.md | 10 +++++----- 23 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 artifacts/address.json diff --git a/artifacts/BConst.json b/artifacts/BConst.json index cd363e423..667acfb62 100644 --- a/artifacts/BConst.json +++ b/artifacts/BConst.json @@ -2837,7 +2837,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.748Z", + "updatedAt": "2020-09-16T10:18:23.860Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BFactory.json b/artifacts/BFactory.json index bb752a38d..c35ea575a 100644 --- a/artifacts/BFactory.json +++ b/artifacts/BFactory.json @@ -3311,7 +3311,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.755Z", + "updatedAt": "2020-09-16T10:18:23.863Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BMath.json b/artifacts/BMath.json index 3f8b949de..226fa9962 100644 --- a/artifacts/BMath.json +++ b/artifacts/BMath.json @@ -16482,7 +16482,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.763Z", + "updatedAt": "2020-09-16T10:18:23.865Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BNum.json b/artifacts/BNum.json index 26f50cd92..89de339d1 100644 --- a/artifacts/BNum.json +++ b/artifacts/BNum.json @@ -13037,7 +13037,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.774Z", + "updatedAt": "2020-09-16T10:18:23.871Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BPool.json b/artifacts/BPool.json index d9dc8c059..6bcf05c31 100644 --- a/artifacts/BPool.json +++ b/artifacts/BPool.json @@ -66499,7 +66499,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.788Z", + "updatedAt": "2020-09-16T10:18:23.876Z", "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 038fd8777..198969773 100644 --- a/artifacts/BToken.json +++ b/artifacts/BToken.json @@ -14000,7 +14000,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.834Z", + "updatedAt": "2020-09-16T10:18:23.901Z", "devdoc": { "methods": {} }, diff --git a/artifacts/BTokenBase.json b/artifacts/BTokenBase.json index 93dca877e..d3addb919 100644 --- a/artifacts/BTokenBase.json +++ b/artifacts/BTokenBase.json @@ -13783,7 +13783,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.845Z", + "updatedAt": "2020-09-16T10:18:23.909Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Context.json b/artifacts/Context.json index 4003978be..0dc23fea7 100644 --- a/artifacts/Context.json +++ b/artifacts/Context.json @@ -585,7 +585,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.870Z", + "updatedAt": "2020-09-16T10:18:23.932Z", "devdoc": { "methods": {} }, diff --git a/artifacts/DDO.json b/artifacts/DDO.json index 1169d6cb8..5c29d97fd 100644 --- a/artifacts/DDO.json +++ b/artifacts/DDO.json @@ -4271,7 +4271,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.861Z", + "updatedAt": "2020-09-16T10:18:23.923Z", "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 d71875f04..89b663189 100644 --- a/artifacts/DTFactory.json +++ b/artifacts/DTFactory.json @@ -4665,7 +4665,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.731Z", + "updatedAt": "2020-09-16T10:18:23.857Z", "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 2ac2b3512..6e76ea720 100644 --- a/artifacts/DataTokenTemplate.json +++ b/artifacts/DataTokenTemplate.json @@ -14355,7 +14355,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.863Z", + "updatedAt": "2020-09-16T10:18:23.925Z", "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 75d0955c3..bb1ec8d15 100644 --- a/artifacts/Deployer.json +++ b/artifacts/Deployer.json @@ -783,7 +783,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.870Z", + "updatedAt": "2020-09-16T10:18:23.932Z", "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 58e02d543..ce656e578 100644 --- a/artifacts/ERC20.json +++ b/artifacts/ERC20.json @@ -11318,7 +11318,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.873Z", + "updatedAt": "2020-09-16T10:18:23.935Z", "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 add458e89..e3ed58dbe 100644 --- a/artifacts/ERC20Pausable.json +++ b/artifacts/ERC20Pausable.json @@ -3236,7 +3236,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.868Z", + "updatedAt": "2020-09-16T10:18:23.930Z", "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 ebfcd429c..f54f806a7 100644 --- a/artifacts/FixedRateExchange.json +++ b/artifacts/FixedRateExchange.json @@ -17422,7 +17422,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.852Z", + "updatedAt": "2020-09-16T10:18:23.916Z", "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 c43de9e93..228206d57 100644 --- a/artifacts/IERC20.json +++ b/artifacts/IERC20.json @@ -1854,7 +1854,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.876Z", + "updatedAt": "2020-09-16T10:18:23.938Z", "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 c3a887d57..682821dc5 100644 --- a/artifacts/IERC20Template.json +++ b/artifacts/IERC20Template.json @@ -2867,7 +2867,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.860Z", + "updatedAt": "2020-09-16T10:18:23.922Z", "devdoc": { "methods": {} }, diff --git a/artifacts/Migrations.json b/artifacts/Migrations.json index 95693beb1..24347c8d7 100644 --- a/artifacts/Migrations.json +++ b/artifacts/Migrations.json @@ -885,7 +885,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.742Z", + "updatedAt": "2020-09-16T10:18:23.859Z", "devdoc": { "methods": {} }, diff --git a/artifacts/OPFCommunityFeeCollector.json b/artifacts/OPFCommunityFeeCollector.json index 955e3df1b..a0eb5d2df 100644 --- a/artifacts/OPFCommunityFeeCollector.json +++ b/artifacts/OPFCommunityFeeCollector.json @@ -3296,7 +3296,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.850Z", + "updatedAt": "2020-09-16T10:18:23.914Z", "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 166344e48..0a8ff2703 100644 --- a/artifacts/Ownable.json +++ b/artifacts/Ownable.json @@ -3059,7 +3059,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.872Z", + "updatedAt": "2020-09-16T10:18:23.934Z", "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 ee52ed956..fccf54e40 100644 --- a/artifacts/SafeMath.json +++ b/artifacts/SafeMath.json @@ -4882,7 +4882,7 @@ }, "networks": {}, "schemaVersion": "3.2.0", - "updatedAt": "2020-09-16T09:22:58.871Z", + "updatedAt": "2020-09-16T10:18:23.933Z", "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 deleted file mode 100644 index 640e19480..000000000 --- a/artifacts/address.json +++ /dev/null @@ -1 +0,0 @@ -{"ganache":{"DTFactory":"0x260fb0b8815265cb5B920F41FFFc4a120B0c7ABe","BFactory":"0x9418E940fe1b8D9e893fa2Ee0530eC2caec6afC5","FixedRateExchange":"0x8BDA5b677CD6928Eb9FbB81340a55c500D0C5CC5","DDO":"0xA38E97f34D7F449A6fe6F193bEB3fAfb2122A68B"}} \ No newline at end of file diff --git a/docs/contracts/templates/DataTokenTemplate.md b/docs/contracts/templates/DataTokenTemplate.md index b4808956a..ee407cd0d 100644 --- a/docs/contracts/templates/DataTokenTemplate.md +++ b/docs/contracts/templates/DataTokenTemplate.md @@ -19,7 +19,7 @@ deploy new DataTokens. -### `constructor(string name, string symbol, address minter, uint256 cap, string blob, address feeCollector)` (public) +### `constructor(string name, string symbol, address minterAddress, uint256 cap, string blob, address feeCollector)` (public) @@ -27,7 +27,7 @@ constructor Called prior contract deployment -### `initialize(string name, string symbol, address minter, uint256 cap, string blob, address feeCollector) → bool` (external) +### `initialize(string name, string symbol, address minterAddress, uint256 cap, string blob, address feeCollector) → bool` (external) @@ -45,7 +45,7 @@ Only the minter address can call it. msg.value should be higher than zero and gt or eq minting fee -### `startOrder(address receiver, uint256 amount, bytes32 did, uint256 serviceId, address feeCollector, uint256 feePercentage)` (external) +### `startOrder(uint256 amount, bytes32 did, uint256 serviceId, address mrktFeeCollector)` (external) @@ -80,7 +80,7 @@ It unpauses the contract. Only called if the contract is paused. Only minter can call it. -### `setMinter(address minter)` (external) +### `setMinter(address minterAddress)` (external) @@ -173,7 +173,7 @@ the total fee (including the community fee) needed for order. -### `OrderStarted(uint256 amount, bytes32 did, uint256 serviceId, address receiver, uint256 startedAt, address feeCollector, uint256 marketFee)` +### `OrderStarted(uint256 amount, bytes32 did, uint256 serviceId, uint256 startedAt, address mrktFeeCollector, uint256 marketFee)`