Merge pull request #1 from singnet/enhancements/vesting-factory

Enhancements/vesting factory

Author: tiero

.gitignore

@@ -1,7 +1,7 @@
 build
 node_modules
 yarn-error.log
-/.DS_Store
+.DS_Store
 npm-debug.log
 addresses.json
 package-lock.json

Dockerfile

@@ -1,7 +1,3 @@
-FROM node:6
+FROM node:8
 
-WORKDIR /code
-
-ADD . /code
-
-RUN npm install -g truffle
+RUN npm install

README.md

@@ -13,18 +13,14 @@ Includes contracts, migrations, tests, user interface and webpack build pipeline
 
 ## Install
 
-### Truffle
+### Dependencies
 ```bash
-npm i -g truffle
+npm install
 ```
 
-### Ethereum  
-You can choose between Parity or local testrpc
+### Test 
+
 
-### testRPC
-```bash
-npm install -g ethereumjs-testrpc
-```
 
 ### Parity
   **Parity requires Rust version 1.19.0 to build**
@@ -70,14 +66,6 @@ npm install -g ethereumjs-testrpc
     cp /target/release/parity /usr/local/bin 
   ```
 
-
-## Build 
-1.  First `cd dao && npm i`
-2.  `truffle compile` and run on separated tab `parity` or `testrpc`
-3.  `truffle migrate` to deploy the contracts onto your network of choice (default "development").
-5. `truffle test`
-
-
 ## Usage
 
 You can choose of using web3 with Python and Javascript

contracts/.DS_Store

@@ -0,0 +1,20 @@
+pragma solidity ^0.4.18;
+
+import "./TokenVesting.sol";
+import "zeppelin-solidity/contracts/math/SafeMath.sol";
+import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+
+contract TokenVestingFactory is Ownable {
+
+    event Created(TokenVesting vesting);
+
+    function create(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable) onlyOwner public returns (TokenVesting) {
+
+        TokenVesting vesting = new TokenVesting(_beneficiary, _start, _cliff, _duration, _revocable);
+
+        Created(vesting);
+
+        return vesting;
+    }
+
+}

contracts/tokens/TokenVestingFactory.sol

@@ -1,23 +1,26 @@
 const fs = require('fs')
 
-const MarketJobFactory = artifacts.require('market/MarketJobFactory.sol')
 const AgentFactory = artifacts.require('agent/AgentFactory.sol')
 const AgentRegistry = artifacts.require('registries/AgentRegistry.sol')
+const MarketJobFactory = artifacts.require('market/MarketJobFactory.sol')
 const SingularityNetToken = artifacts.require('tokens/SingularityNetToken.sol')
+const TokenVestingFactory = artifacts.require('tokens/TokenVestingFactory.sol')
 
 module.exports = function(deployer, network, accounts) {
   deployer.deploy([
     AgentFactory,
     AgentRegistry,
     MarketJobFactory,
-    SingularityNetToken
+    SingularityNetToken,
+    TokenVestingFactory
   ]).then(() => {
     const fileName = "addresses.json"
     const content = {
       AgentFactory: AgentFactory.address,
       AgentRegistry: AgentRegistry.address,
       MarketJobFactory: MarketJobFactory.address,
-      SingularityNetToken: SingularityNetToken.address
+      SingularityNetToken: SingularityNetToken.address,
+      TokenVestingFactory: TokenVestingFactory.address
     }
 
     fs.writeFile(fileName, JSON.stringify(content), 'utf-8', (err) => {

migrations/.DS_Store

@@ -12,7 +12,7 @@
   "author": "tiero",
   "license": "MIT",
   "dependencies": {
-    "ethereumjs-testrpc": "^4.1.3",
+    "truffle": "^4.0.1",
     "truffle-hdwallet-provider": "0.0.3",
     "zeppelin-solidity": "^1.4.0"
   },

migrations/2_deploy_contracts.js

@@ -1,26 +1,4 @@
 #!/usr/bin/env bash
 
-trap cleanup EXIT
-
-cleanup() {
-  if [ -n "$testrpc_pid" ] && ps -p $testrpc_pid > /dev/null; then
-    kill -9 $testrpc_pid
-  fi
-}
-
-testrpc_running() {
-  nc -z localhost 8545
-}
-
-if testrpc_running; then
-  echo "Using existing testrpc"
-else
-  echo "testrpc is running "
-  node_modules/.bin/testrpc > /dev/null &
-  testrpc_pid=$!
-fi
-
-node_modules/.bin/truffle compile --all "$@"
-node_modules/.bin/truffle migrate --reset "$@"
+npm i
 node_modules/.bin/truffle test "$@"
-cd py && python main.py