From c749fe7f82588ee55cd0b407a9f8cb5d47561c4b Mon Sep 17 00:00:00 2001
From: Curtis Faith <curtis.m.faith@gmail.com>
Date: Thu, 7 Dec 2017 17:39:39 -0500
Subject: [PATCH] Remove dao folder moved to singnet/core repo

---
 dao/.dockerignore                             |   4 -
 dao/.gitignore                                |   9 -
 dao/.soliumignore                             |   1 -
 dao/.soliumrc.json                            |   9 -
 dao/Dockerfile                                |  12 --
 dao/README.md                                 | 153 --------------
 dao/contracts/Migrations.sol                  |  25 ---
 dao/contracts/agent/Agent.sol                 |  28 ---
 dao/contracts/agent/AgentFactory.sol          |  10 -
 dao/contracts/agent/AgentInterface.sol        |  12 --
 dao/contracts/foundation/AgiCrowdsale.sol     | 192 ------------------
 dao/contracts/market/Escrow.sol               |  27 ---
 dao/contracts/market/MarketJob.sol            | 103 ----------
 dao/contracts/market/MarketJobFactory.sol     |  31 ---
 dao/contracts/market/MarketJobInterface.sol   |  17 --
 dao/contracts/registries/AgentRegistry.sol    |  42 ----
 .../registries/AgentRegistryInterface.sol     |  16 --
 dao/contracts/tokens/SingularityNetToken.sol  |  60 ------
 dao/dao.sh                                    |  29 ---
 dao/docs/SNContractsDesignSpecs.md            |  58 ------
 dao/docs/SN_ContractsFlow.png                 | Bin 21901 -> 0 bytes
 dao/js/agent.js                               |  26 ---
 dao/js/index.html                             |  33 ---
 dao/js/index.js                               | 114 -----------
 dao/js/market.js                              |  70 -------
 dao/js/package.json                           |  15 --
 dao/js/registry.js                            |  33 ---
 dao/migrations/1_initial_migration.js         |   1 -
 dao/migrations/2_deploy_contracts.js          |  37 ----
 dao/migrations/3_deploy_crowdsale_contract.js |  50 -----
 dao/package.json                              |  25 ---
 dao/py/main.py                                | 103 ----------
 dao/py/personal.py                            |  24 ---
 dao/test.sh                                   |  26 ---
 dao/test/TestAgent.js                         |  48 -----
 dao/test/TestAgentFactory.js                  |  25 ---
 dao/test/TestAgentRegistry.js                 |  50 -----
 dao/test/TestAgiCrowdsale.js                  | 157 --------------
 dao/test/TestMarketJob.js                     | 185 -----------------
 dao/test/TestMarketJobFactory.js              |  38 ----
 dao/test/TestSingularityNetToken.js           | 102 ----------
 dao/test/helpers/AgiCrowdsaleMock.sol         |  27 ---
 dao/test/helpers/SingularityNetTokenMock.sol  |  11 -
 dao/test/helpers/assertFail.js                |   9 -
 dao/test/helpers/increaseTime.js              |  53 -----
 dao/test/helpers/latestTime.js                |  12 --
 dao/truffle.js                                |  20 --
 47 files changed, 2132 deletions(-)
 delete mode 100644 dao/.dockerignore
 delete mode 100644 dao/.gitignore
 delete mode 100644 dao/.soliumignore
 delete mode 100644 dao/.soliumrc.json
 delete mode 100644 dao/Dockerfile
 delete mode 100644 dao/README.md
 delete mode 100644 dao/contracts/Migrations.sol
 delete mode 100644 dao/contracts/agent/Agent.sol
 delete mode 100644 dao/contracts/agent/AgentFactory.sol
 delete mode 100644 dao/contracts/agent/AgentInterface.sol
 delete mode 100644 dao/contracts/foundation/AgiCrowdsale.sol
 delete mode 100644 dao/contracts/market/Escrow.sol
 delete mode 100644 dao/contracts/market/MarketJob.sol
 delete mode 100644 dao/contracts/market/MarketJobFactory.sol
 delete mode 100644 dao/contracts/market/MarketJobInterface.sol
 delete mode 100644 dao/contracts/registries/AgentRegistry.sol
 delete mode 100644 dao/contracts/registries/AgentRegistryInterface.sol
 delete mode 100644 dao/contracts/tokens/SingularityNetToken.sol
 delete mode 100755 dao/dao.sh
 delete mode 100644 dao/docs/SNContractsDesignSpecs.md
 delete mode 100644 dao/docs/SN_ContractsFlow.png
 delete mode 100644 dao/js/agent.js
 delete mode 100644 dao/js/index.html
 delete mode 100644 dao/js/index.js
 delete mode 100644 dao/js/market.js
 delete mode 100644 dao/js/package.json
 delete mode 100644 dao/js/registry.js
 delete mode 100644 dao/migrations/1_initial_migration.js
 delete mode 100644 dao/migrations/2_deploy_contracts.js
 delete mode 100644 dao/migrations/3_deploy_crowdsale_contract.js
 delete mode 100644 dao/package.json
 delete mode 100755 dao/py/main.py
 delete mode 100644 dao/py/personal.py
 delete mode 100644 dao/test.sh
 delete mode 100644 dao/test/TestAgent.js
 delete mode 100644 dao/test/TestAgentFactory.js
 delete mode 100644 dao/test/TestAgentRegistry.js
 delete mode 100644 dao/test/TestAgiCrowdsale.js
 delete mode 100644 dao/test/TestMarketJob.js
 delete mode 100644 dao/test/TestMarketJobFactory.js
 delete mode 100644 dao/test/TestSingularityNetToken.js
 delete mode 100644 dao/test/helpers/AgiCrowdsaleMock.sol
 delete mode 100644 dao/test/helpers/SingularityNetTokenMock.sol
 delete mode 100644 dao/test/helpers/assertFail.js
 delete mode 100644 dao/test/helpers/increaseTime.js
 delete mode 100644 dao/test/helpers/latestTime.js
 delete mode 100644 dao/truffle.js

diff --git a/dao/.dockerignore b/dao/.dockerignore
deleted file mode 100644
index 7e96cc8..0000000
--- a/dao/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build
-node_modules/
-package-lock.json
-
diff --git a/dao/.gitignore b/dao/.gitignore
deleted file mode 100644
index 77f0382..0000000
--- a/dao/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-build
-node_modules/
-MetaCoin/
-package-lock.json
-yarn-error.log
-/.DS_Store
-npm-debug.log
-addresses.json
-/.vscode
diff --git a/dao/.soliumignore b/dao/.soliumignore
deleted file mode 100644
index b512c09..0000000
--- a/dao/.soliumignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
\ No newline at end of file
diff --git a/dao/.soliumrc.json b/dao/.soliumrc.json
deleted file mode 100644
index d3fe054..0000000
--- a/dao/.soliumrc.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "solium:all",
-  "rules": {
-    "indentation": ["error", 4],
-    "quotes": ["error", "double"],
-    "arg-overflow": "off",
-    "blank-lines": "off"
-  }
-}
\ No newline at end of file
diff --git a/dao/Dockerfile b/dao/Dockerfile
deleted file mode 100644
index 3e3f8fd..0000000
--- a/dao/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node:8
-
-WORKDIR /dao
-
-COPY package.json .
-
-RUN \
-    npm install -g truffle && \
-    npm install
-
-COPY . .
-
diff --git a/dao/README.md b/dao/README.md
deleted file mode 100644
index e826e25..0000000
--- a/dao/README.md
+++ /dev/null
@@ -1,153 +0,0 @@
-# SingularityNetwork
-Includes contracts, migrations, tests, user interface and webpack build pipeline.
-
-## Design Specifications
-
-[Smart Contracts Design ](./docs/SNContractsDesignSpecs.md)
-
-
-## Requirements
-
-* [Node.js](https://github.com/nodejs/node) (7.6 +)
-* [Npm](https://www.npmjs.com/package/npm)
-
-## Install
-
-### Truffle
-```bash
-npm i -g truffle
-```
-
-### Ethereum  
-You can choose between Parity or local testrpc
-
-### ganache (formerly testrpc)
-```bash
-npm install -g ganache-cli
-```
-
-### Parity
-  **Parity requires Rust version 1.19.0 to build**
-  - Linux:
-    ```bash
-    $ curl https://sh.rustup.rs -sSf | sh
-    ```
-
-    Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
-  - OSX:
-    ```bash
-    $ curl https://sh.rustup.rs -sSf | sh
-    ```
-
-  ##### Download and build Parity
-
-  ```bash
-  # download Parity code
-  $ git clone https://github.com/paritytech/parity
-  $ cd parity
-
-  # build in release mode
-  $ cargo build --release
-  ```
-
-  This will produce an executable in the `./target/release` subdirectory.
-  Note: if cargo fails to parse manifest try:
-
-  ```bash
-  $ ~/.cargo/bin/cargo build --release
-  ```
-
-  #### Start Parity
-  To start Parity manually, just run
-  ```bash
-  $ ./target/release/parity
-  ```
-  and Parity will begin syncing the Ethereum blockchain.
-
-  ##### Hint
-  Add parity to your command list:
-  ```bash
-    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
-
-Python
-----------
-
-Install web3
-
-`pip install web3`
-
-Using Web3
-
-To use the web3 library you will need to instantiate an instance of the
-``Web3`` object.
-
-
-    >>> from web3 import Web3, HTTPProvider, IPCProvider
-
-    # Note that you should create only one RPCProvider per
-    # process, as it recycles underlying TCP/IP network connections between
-    # your process and Ethereum node
-    >>> web3 = Web3(HTTPProvider('http://localhost:8545'))
-
-    # or for an IPC based connection
-    >>> web3 = Web3(IPCProvider())
-    >>> web3.eth.blockNumber
-    4000000
-
-
-This ``web3`` instance will now allow you to interact with the Ethereum
-blockchain.
-
-
-Javascript 
-----------
-
-`npm i -s web3`
-
-Create in /app folder an index.js file
-
-Use the `web3` object directly from global namespace:
-
-```js
-console.log(web3); // {eth: .., shh: ...} // it's here!
-```
-
-Set a provider (HttpProvider)
-
-```js
-if (typeof web3 !== 'undefined') {
-  web3 = new Web3(web3.currentProvider);
-} else {
-  // set the provider you want from Web3.providers
-  web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
-}
-```
-
-Set a provider (HttpProvider using [HTTP Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication))
-
-```js
-web3.setProvider(new web3.providers.HttpProvider('http://host.url', 0, BasicAuthUsername, BasicAuthPassword));
-```
-
-There you go, now you can use it:
-
-```js
-var coinbase = web3.eth.coinbase;
-var balance = web3.eth.getBalance(coinbase);
-```
-
-You can find more examples in [`example`](https://github.com/ethereum/web3.js/tree/master/example) directory.
-
diff --git a/dao/contracts/Migrations.sol b/dao/contracts/Migrations.sol
deleted file mode 100644
index d8c0d07..0000000
--- a/dao/contracts/Migrations.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma solidity ^0.4.18;
-
-
-contract Migrations {
-    address public owner;
-    uint public last_completed_migration;
-
-    modifier restricted() {
-        if (msg.sender == owner) 
-            _;
-    }
-
-    function Migrations() {
-        owner = msg.sender;
-    }
-
-    function setCompleted(uint completed) restricted {
-        last_completed_migration = completed;
-    }
-
-    function upgrade(address newAddress) restricted {
-        Migrations upgraded = Migrations(newAddress);
-        upgraded.setCompleted(last_completed_migration);
-    }
-}
diff --git a/dao/contracts/agent/Agent.sol b/dao/contracts/agent/Agent.sol
deleted file mode 100644
index baca086..0000000
--- a/dao/contracts/agent/Agent.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "./AgentInterface.sol";
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
-
-contract Agent is AgentInterface, Ownable {
-
-    bytes[] public packets;
-    MarketJobInterface public job;
-
-    function sendPacket(address target, bytes packet) external onlyOwner {
-        Agent(target).appendPacket(packet);
-    }
-
-    // @todo only people who can
-    function appendPacket(bytes packet) external {
-        packets.push(packet);
-    }
-
-    function getPacket(uint id) external constant returns (bytes) {
-        return packets[id];
-    }
-
-    function setJob(MarketJob _job) external returns (address) {
-        job = _job;
-    }
-
-}
diff --git a/dao/contracts/agent/AgentFactory.sol b/dao/contracts/agent/AgentFactory.sol
deleted file mode 100644
index 77fe1e4..0000000
--- a/dao/contracts/agent/AgentFactory.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "./Agent.sol";
-
-contract AgentFactory {
-
-    function create() public returns (Agent) {
-        return new Agent();
-    }
-}
diff --git a/dao/contracts/agent/AgentInterface.sol b/dao/contracts/agent/AgentInterface.sol
deleted file mode 100644
index 39fdf01..0000000
--- a/dao/contracts/agent/AgentInterface.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../market/MarketJob.sol";
-
-contract AgentInterface {
-
-    function sendPacket(address target, bytes packet) external;
-    function appendPacket(bytes packet) external;
-    function getPacket(uint id) external constant returns (bytes);
-    function setJob(MarketJob _job) external returns (address);
-    
-}
diff --git a/dao/contracts/foundation/AgiCrowdsale.sol b/dao/contracts/foundation/AgiCrowdsale.sol
deleted file mode 100644
index 2030890..0000000
--- a/dao/contracts/foundation/AgiCrowdsale.sol
+++ /dev/null
@@ -1,192 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../tokens/SingularityNetToken.sol";
-import "zeppelin-solidity/contracts/math/SafeMath.sol";
-import "zeppelin-solidity/contracts/ReentrancyGuard.sol";
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
-import "zeppelin-solidity/contracts/crowdsale/RefundVault.sol";
-
-/**
- * @title AgiCrowdsale
- * @dev AgiCrowdsale is a base contract for managing a token crowdsale.
- * Crowdsales have a start and end timestamps, where investors can make
- * token purchases and the crowdsale will assign them tokens based
- * on a token per ETH rate. Funds collected are forwarded to a wallet
- * as they arrive.
- */
-contract AgiCrowdsale is Ownable, ReentrancyGuard {
-    using SafeMath for uint256;
-
-    uint256 public cap;
-    uint256 public goal;
-    uint256 public rate;
-    uint256 public constant WEI_TO_COGS =  10**uint256(10);
-
-    address public wallet;
-    RefundVault public vault;
-    SingularityNetToken public token;
-
-    uint256 public startTime;
-    uint256 public endTime;
-
-    bool public isFinalized = false;
-    uint256 public weiRaised;
-
-    mapping(address => bool) public whitelist;
-    
-    event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
-    event TokenRelease(address indexed beneficiary, uint256 amount);
-    event TokenRefund(address indexed refundee, uint256 amount);
-
-    event Finalized();
-
-    function AgiCrowdsale(
-        address _token, 
-        address _wallet,
-        uint256 _startTime,
-        uint256 _endTime,
-        uint256 _rate,
-        uint256 _cap,
-        uint256 _goal
-    ) {
-        require(_startTime >= getBlockTimestamp());
-        require(_endTime >= _startTime);
-        require(_rate > 0);
-        require(_goal > 0);
-        require(_cap > 0);
-        require(_wallet != 0x0);
-
-        vault = new RefundVault(_wallet);
-        token = SingularityNetToken(_token);
-        wallet = _wallet;
-        startTime = _startTime;
-        endTime = _endTime;
-        rate = _rate;
-        goal = _goal;
-        cap = _cap;
-    }
-
-    // fallback function can be used to buy tokens
-    function () payable {
-        buyTokens(msg.sender);
-    }
-
-    //low level function to buy tokens
-    function buyTokens(address beneficiary) internal {
-        require(beneficiary != 0x0);
-        require(whitelist[beneficiary]);
-        require(validPurchase());
-
-        //derive amount in wei to buy 
-        uint256 weiAmount = msg.value;
-        //check if there is enough funds 
-        uint256 remainingToFund = cap.sub(weiRaised);
-        if (weiAmount > remainingToFund) {
-            weiAmount = remainingToFund;
-        }
-        uint256 weiToReturn = msg.value.sub(weiAmount);
-        //derive how many tokens
-        uint256 tokens = getTokens(weiAmount);
-        //update the state of weiRaised
-        weiRaised = weiRaised.add(weiAmount);
-
-       //Forward funs to the vault 
-        forwardFunds();
-        //refund if the contribution exceed the cap
-        if (weiToReturn > 0) {
-            beneficiary.transfer(weiToReturn);
-            TokenRefund(beneficiary, weiToReturn);
-        }
-
-        
-        //Trigger the event of TokenPurchase
-        TokenPurchase(
-            msg.sender,
-            beneficiary,
-            weiAmount,
-            tokens
-        );
-        token.transferTokens(beneficiary,tokens);
-        
-    }
-
-    function getTokens(uint256 amount) internal constant returns (uint256) {
-        return amount.mul(rate).div(WEI_TO_COGS);
-    }
-
-    // contributors can claim refund if the goal is not reached
-    function claimRefund() nonReentrant external {
-        require(isFinalized);
-        require(!goalReached());
-        vault.refund(msg.sender);
-    }
-
-    //in case of endTime before the reach of the cap, the owner can claim the unsold tokens
-    function claimUnsold() onlyOwner {
-        require(endTime <= getBlockTimestamp());
-        uint256 unsold = token.balanceOf(this);
-
-        if (unsold > 0) {
-            require(token.transferTokens(msg.sender, unsold));
-        }
-    }
-
-    // add to whitelist array of addresses
-    function updateWhitelist(address[] addresses, bool status) public onlyOwner {
-        for (uint256 i = 0; i < addresses.length; i++) {
-            address contributorAddress = addresses[i];
-            whitelist[contributorAddress] = status;
-        }
-    }
-
-    function finalize() onlyOwner {
-        require(!isFinalized);
-        require(hasEnded());
-
-        if (goalReached()) {
-            //Close the vault
-            vault.close();
-            //Unpause the token 
-            token.unpause();
-        } else {
-            //else enable refunds
-            vault.enableRefunds();
-        }
-        //update the sate of isFinalized
-        isFinalized = true;
-        //trigger and emit the event of finalization
-        Finalized();
-    } 
-
-    // send ether to the fund collection wallet, the vault in this case
-    function forwardFunds() internal {
-        vault.deposit.value(msg.value)(msg.sender);
-    }
-
-    // @return true if crowdsale event has ended or cap reached
-    function hasEnded() public constant returns (bool) {
-        bool capReached = weiRaised >= cap;
-        bool passedEndTime = getBlockTimestamp() > endTime;
-        return passedEndTime || capReached;
-    }
-
-    function goalReached() public constant returns (bool) {
-        return weiRaised >= goal;
-    }
-
-    function isWhitelisted(address contributor) public constant returns (bool) {
-        return whitelist[contributor];
-    }
-
-    // @return true if the transaction can buy tokens
-    function validPurchase() internal constant returns (bool) {
-        bool withinPeriod = getBlockTimestamp() >= startTime && getBlockTimestamp() <= endTime;
-        bool nonZeroPurchase = msg.value != 0;
-        bool withinCap = weiRaised.add(msg.value) <= cap;
-        return withinPeriod && withinCap && nonZeroPurchase;
-    }
-
-    function getBlockTimestamp() internal constant returns (uint256) {
-        return block.timestamp;
-    }
-}
\ No newline at end of file
diff --git a/dao/contracts/market/Escrow.sol b/dao/contracts/market/Escrow.sol
deleted file mode 100644
index 308de65..0000000
--- a/dao/contracts/market/Escrow.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity ^0.4.11;
-
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
-
-contract Escrow is Ownable {
-
-
-    address public beneficiary;
-
-    event Deposited(address indexed from, uint amount);
-
-    function Escrow(address _beneficiary) {
-        beneficiary = _beneficiary;
-    }
-
-    function () payable {
-        if (msg.value <= 0) {
-            return;
-        }
-
-        Deposited(msg.sender, msg.value);
-    }
-
-    function releaseFunds() onlyOwner {
-        beneficiary.transfer(this.balance);
-    }
-}
diff --git a/dao/contracts/market/MarketJob.sol b/dao/contracts/market/MarketJob.sol
deleted file mode 100644
index 8945ea6..0000000
--- a/dao/contracts/market/MarketJob.sol
+++ /dev/null
@@ -1,103 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "zeppelin-solidity/contracts/math/SafeMath.sol";
-import "../tokens/SingularityNetToken.sol";
-import "./MarketJobInterface.sol";
-
-
-contract MarketJob is MarketJobInterface {
-    using SafeMath for uint256;
-
-    SingularityNetToken public token;
-    address public masterAgent;
-    bytes public jobDescriptor;
-    bool public jobCompleted;
-    bool public jobAccepted;
-    bytes public jobResult;
-    address public payer;
-
-    event Deposited(address payer, uint256 amount);
-    event Withdrew(address payee, uint256 amount);
-    event JobCompleted();
-    event JobAccepted();
-
-
-    struct Job {
-        uint256 amount;
-        uint256 idService;
-    }
-
-    mapping (address => Job) public amounts;
-
-    modifier jobDone {
-        require(jobCompleted == true);
-        _;
-    }
-
-    modifier jobApproved {
-        require(jobAccepted == true);
-        _;
-    }
-
-    modifier jobPending {
-        require(jobCompleted == false);
-        _;
-    }
-
-    modifier onlyPayer {
-        require(msg.sender == payer);
-        _;
-    }
-
-    modifier onlyMasterAgent {
-        require(msg.sender == masterAgent);
-        _;
-    }
-
-    function MarketJob(
-        address[] _agents,
-        uint256[] _amounts,
-        uint256[] _services,
-        address _token,
-        address _payer,
-        bytes _jobDescriptor
-    ) {
-        require(_agents.length == _amounts.length);
-        require(_amounts.length == _services.length);
-        masterAgent = msg.sender;
-        payer = _payer;
-        jobDescriptor = _jobDescriptor;
-        jobCompleted = false;
-        token = SingularityNetToken(_token);
-
-        for (uint256 i = 0; i < _amounts.length; i++) {
-            amounts[_agents[i]] = Job(_amounts[i],_services[i]);
-        }
-    }
-
-    function deposit(uint256 amount) onlyPayer jobPending public {
-        require(token.transferFrom(msg.sender, address(this), amount));
-        Deposited(msg.sender,amount);
-    }
-
-    function setJobCompleted(bytes _jobResult) onlyMasterAgent jobPending public {
-        jobCompleted = true;
-        jobResult = _jobResult;
-        JobCompleted();
-    }
-
-    function setJobAccepted() onlyPayer jobDone public {
-        jobAccepted = true;
-        JobAccepted();
-    }
-
-    function withdraw() jobDone jobApproved public {
-        address agent = msg.sender;
-        uint256 amount = amounts[agent].amount;
-        require(amount > 0);
-
-        amounts[agent].amount = 0;
-        require(token.transfer(agent,amount));
-        Withdrew(agent,amount);
-    }
-}
diff --git a/dao/contracts/market/MarketJobFactory.sol b/dao/contracts/market/MarketJobFactory.sol
deleted file mode 100644
index 43f9ee0..0000000
--- a/dao/contracts/market/MarketJobFactory.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "./MarketJob.sol";
-
-contract MarketJobFactory {
-
-    event Created(address creator, address contractAddress);
-
-    function create(
-        address[] agents, 
-        uint256[] amounts, 
-        uint256[] services, 
-        address token, 
-        address payer, 
-        bytes firstPacket ) public returns (MarketJob) 
-    {
-        MarketJob marketJob = new MarketJob(
-            agents, 
-            amounts, 
-            services, 
-            token, 
-            payer, 
-            firstPacket
-        );
-
-        Created(msg.sender, marketJob);
-
-        return marketJob;
-    }
-
-}
diff --git a/dao/contracts/market/MarketJobInterface.sol b/dao/contracts/market/MarketJobInterface.sol
deleted file mode 100644
index 5a0dd05..0000000
--- a/dao/contracts/market/MarketJobInterface.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma solidity ^0.4.18;
-
-
-contract MarketJobInterface {
-
-    event Deposited(address payer, uint256 amount);
-    event Withdrew(address payee, uint256 amount);
-    event JobCompleted();
-    event JobAccepted();
-
-
-    function withdraw() public;
-    function setJobCompleted(bytes lastPacket) public;
-    function setJobAccepted() public;
-    function deposit(uint256 amount) public;
-
-}
diff --git a/dao/contracts/registries/AgentRegistry.sol b/dao/contracts/registries/AgentRegistry.sol
deleted file mode 100644
index 8af7650..0000000
--- a/dao/contracts/registries/AgentRegistry.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "./AgentRegistryInterface.sol";
-
-
-contract AgentRegistry is AgentRegistryInterface {
-
-    struct Service {
-        uint unit;
-        uint pricePerUnit;
-    }
-
-    address[] public agents;
-
-    mapping (uint => Service[]) services;
-
-    mapping (uint => uint[]) agentsForService;
-
-    function getAgentsWithService(uint service) external constant returns (uint[]) {
-        return agentsForService[service];
-    }
-
-    function getAgent(uint id) external constant returns (address) {
-        return agents[id];
-    }
-
-    function addAgent(
-        uint service, 
-        uint unit, 
-        uint price, 
-        address agent ) external 
-    {
-        services[service].push(Service(unit, price));
-        
-        uint id = agents.length;
-
-        agents.push(agent);
-        agentsForService[service].push(id);
-
-        AgentAdded(id, agent);
-    }
-}
diff --git a/dao/contracts/registries/AgentRegistryInterface.sol b/dao/contracts/registries/AgentRegistryInterface.sol
deleted file mode 100644
index 6947ad4..0000000
--- a/dao/contracts/registries/AgentRegistryInterface.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma solidity ^0.4.18;
-
-
-contract AgentRegistryInterface {
-
-    event AgentAdded(uint id, address agent);
-
-    function getAgentsWithService(uint service) external constant returns (uint[]);
-    function getAgent(uint id) external constant returns (address);
-    function addAgent(
-        uint service, 
-        uint unit, 
-        uint price, 
-        address agent) external;
-
-}
diff --git a/dao/contracts/tokens/SingularityNetToken.sol b/dao/contracts/tokens/SingularityNetToken.sol
deleted file mode 100644
index 30dc916..0000000
--- a/dao/contracts/tokens/SingularityNetToken.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "zeppelin-solidity/contracts/token/PausableToken.sol";
-import "zeppelin-solidity/contracts/token/BurnableToken.sol";
-
-
-/**
- * @title SingularityNET Token
- * @dev ERC20 SingularityNET Token (AGI)
- *
- * AGI Tokens are divisible by 1e8 (100,000,000) base
- * referred to as 'cogs'.
- *
- * AGI are displayed using 8 decimal places of precision.
- *
- * 1 AGI is equivalent to:
- *   100 000 000 == 1 * 10**8 == 1e8 == One Hundred Million cogs
- *
- * 1 Billion AGI (total supply) is equivalent to:
- *   100000000000000000 == 1 000 000 000 * 10**8 == 1e17 == One Hundred Quadrillion cogs
- *
- *
- */
-contract SingularityNetToken is PausableToken, BurnableToken {
-
-    string public constant NAME = "SingularityNET Token";
-    string public constant SYMBOL = "AGI";
-    uint8 public constant DECIMALS = 8;
-    uint256 public constant INITIAL_SUPPLY = 1000000000 * 10**uint256(DECIMALS);
-
-    uint256 public constant PRIVATE_SUPPLY =  200000000 * 10**uint256(DECIMALS);
-    uint256 public constant ADVISORS_SUPPLY = 100000000 * 10**uint256(DECIMALS); 
-    uint256 public constant PUBLIC_SUPPLY  =  700000000 * 10**uint256(DECIMALS);
-    
-    /**
-    * @dev SingularityNetToken Constructor
-    */
-
-    function SingularityNetToken() {
-        totalSupply = INITIAL_SUPPLY;   
-        balances[msg.sender] = INITIAL_SUPPLY;
-    }
-
-    function setOwnership(address _owner) onlyOwner {
-        pause();
-        balances[owner] = INITIAL_SUPPLY.sub(PUBLIC_SUPPLY);
-        owner = _owner;
-        balances[owner] = PUBLIC_SUPPLY;
-    } 
-
-    function transferTokens(address beneficiary, uint256 amount) onlyOwner returns (bool) {
-        require(amount > 0);
-
-        balances[owner] = balances[owner].sub(amount);
-        balances[beneficiary] = balances[beneficiary].add(amount);
-        Transfer(owner, beneficiary, amount);
-
-        return true;
-    }
-}
diff --git a/dao/dao.sh b/dao/dao.sh
deleted file mode 100755
index 6b09d50..0000000
--- a/dao/dao.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env sh
-
-set -o errexit
-set -o verbose
-set -o xtrace
-set -o nounset
-
-
-case "$1" in
-
-noop)
-    ;;
-
-bash)
-    /bin/bash
-    ;;
-
-run)
-    cd /dao
-    truffle compile
-    truffle migrate --reset
-    truffle test
-    ;;
-
-*) echo 'No operation specified'
-    exit 0;
-    ;;
-
-esac
diff --git a/dao/docs/SNContractsDesignSpecs.md b/dao/docs/SNContractsDesignSpecs.md
deleted file mode 100644
index a04308f..0000000
--- a/dao/docs/SNContractsDesignSpecs.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# SingularityNET
-Smart contract design
-
-### Contracts
-
-* AGI Token
-* RoboToken (also T-Coin or Spikes)
-* MarketJob
-* Agent
-* AgentFactory
-* AgentRegistry
-
-
-### Actors
-* Customer
-* Job
-* Agent(s) (multiple services for each)
-* Token
-
-
-![Flow](./SN_ContractsFlow.png)
-
-### Customer Flow
-1) Customer request a job  
-2) An off-chain estimation happens on the customer's request
-3) Finds service providers trought AgentRegistry
-4) Contact an Agent and append a Job (he becomes the agent master)
-5) The master agent create a MarketJob contract with payer and payee
-6) Once th job is done the tokens are swapped from customer's account to agent master 
-
-
-### Agent Flow
-1) Start Agent  
-2) Register the service(s) into the Registry    
-4) a new event  triggered new Packet Appended based on the Registry mapping  
-5) The Agent(s) complete the job and signals marketJob
-6) The tokens are automaticcaly swapped 
-7) Create a pull mecahnism for sub-agent to withdrawal funds from master agent  
-
-
-
-
-### Agent (pseudo)API 
-
-To make your app work on Ethereum, you can use the web3 object provided by the web3 (python library). Under the hood it communicates to a local node through RPC calls. web3 works with any Ethereum node, which exposes an RPC layer.
-
-### Methods
-
-* joinNetwork() : address
-* advertiseService(uint id, address) : void
-* findServiceProviders(uint service) : uint[]
-* getAgentbyId(uint id) : address
-
-### Events 
-
-[web3.py Events doc](https://web3py.readthedocs.io/en/latest/contracts.html#events)
-* AgentAdded(uint id, address agent)
-* Deposited(address from, uint value)
\ No newline at end of file
diff --git a/dao/docs/SN_ContractsFlow.png b/dao/docs/SN_ContractsFlow.png
deleted file mode 100644
index c9b8f56b7eae0743e43f7231941c3b3e224337f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21901
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
SS<*b>(JwX!2VVC-kn<N^DR$)m

diff --git a/dao/js/agent.js b/dao/js/agent.js
deleted file mode 100644
index 3e76dfb..0000000
--- a/dao/js/agent.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Import libraries we need.
-const Web3 = require('web3')
-const contract = require('truffle-contract')
-// Import our contract artifacts and turn them into usable abstractions.
-const Agent = require('../build/contracts/AgentFactory.json')
-const agent = contract(Agent)
-
-const account = "0x627306090abab3a6e1400e9345bc60c78a8bef57"
-
-function create() {
-  agent.setProvider(new Web3.providers.HttpProvider("http://localhost:9545"))
-
-  agent.deployed().then(function (instance) {
-    return instance.create({
-      from: account,
-      gas: 180000
-    })
-  }).then((tx) => {
-    console.log(tx)
-  }).then(console.log)
-    .catch(function (e) {
-      console.log(e)
-    })
-}
-
-create()
\ No newline at end of file
diff --git a/dao/js/index.html b/dao/js/index.html
deleted file mode 100644
index b0c678c..0000000
--- a/dao/js/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype>
-<html>
-
-<head>
-  <script type="text/javascript" src="./node_modules/web3/dist/web3.js"></script>
-
-  <script type="text/javascript">
-
-    if (typeof web3 !== 'undefined') {
-      web3 = new Web3(web3.currentProvider);
-    } else {
-      // set the provider you want from Web3.providers
-      web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:9545"));
-    }
-    
-
-  </script>
-</head>
-
-<body>
-  <h1>contract</h1>
-  <div id="code"></div>
-  <div id="status"></div>
-  <div id='create'>
-    <button type="button" onClick="createExampleContract();">Get address of Factory</button>
-  </div>
-  <div id='call' style='visibility: hidden;'>
-    <button type="button" onClick="callExampleContract();">Create a new MarketJob</button>    
-  </div>
-  <div id="result"></div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/dao/js/index.js b/dao/js/index.js
deleted file mode 100644
index 4976255..0000000
--- a/dao/js/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-
-//web3js
-const Web3 = require('web3')
-const web3 = new Web3(Web3.givenProvider)
-const OWNER = web3.eth.accounts[0]
- console.log(OWNER)
-//const OWNER = '0xb9d2bdfe453640730919fbd8acc5083e991177ff'
-//contracts ABI 
-const agentFactory = require('../build/contracts/AgentFactory.json')
-const agentRegistry = require('../build/contracts/AgentRegistry.json')
-const agent = require('../build/contracts/Agent.json')
-const escrow = require('../build/contracts/Escrow.json')
-//constants 
-const AGENT_FACTORY_ADDRESS = '0xd364ede69b6c1469fb19c145b3ad6f753f7f793a'
-const AGENT_REGISTRY_CONTRACT = '0x7988941a7d6037ef89b031af8606b88a1aa09e91'
-const AGENT_ADDRESS = '0x2bb2fdf0eb609046bbba217bca0765759a95600d'
-const ESCROW_ADDRESS = '0x278c4b8a81eebc94f2b2ebcac2ae33d4b889f5eb'
-//Using deployed contrat 
-const agentFactoryContract = new web3.eth.Contract(agentFactory.abi,AGENT_FACTORY_ADDRESS)
-const agentContract = new web3.eth.Contract(agent.abi,AGENT_ADDRESS)
-const escrowContarct = new web3.eth.Contract(escrow.abi,ESCROW_ADDRESS)
-const agentRegistryContract = new web3.eth.Contract(agentRegistry.abi, AGENT_REGISTRY_CONTRACT)
-//payload dev 
-const GAS = 1500000, GAS_PRICE = 30000000000000,
-      PAYLOAD = { from:OWNER, gas: GAS, gasPrice: GAS_PRICE}
-
-//Creates a new agent on the blockchain
-async function joinNetwork() {
-  return await new Promise((resolve,reject) =>{
-    agentFactoryContract.methods.create().send({from:OWNER})
-      .then((result) => {
-        resolve(result)
-      })
-  }) 
-}
-
-//appendPacket
-async function appendPacket(packet) {
-  return await new Promise((resolve,reject) => {
-    agentContract.methods.appendPacket(packet).send(PAYLOAD)
-      .then(result => {
-        resolve(result)
-      })
-      .catch( reason => {
-        reject(reason)
-      })
-  })
-}
-
-//getPacket
-async function getPacket(position) {
-  return await new Promise((resolve,reject) => {
-    agentContract.methods.getPacket(position).call({from:OWNER})
-      .then(result => {
-        resolve(result)
-      })
-      .catch( reason => {
-        reject(reason)
-      })
-  })
-}
-
-//registers an agent's service offerings on the blockchain
-async function advertiseService(service,agent) {
-  return await new Promise((resolve,reject) => {
-    agentRegistryContract.methods.addAgent(service,agent).send(PAYLOAD)
-      .then(event => {
-        resolve(event)
-      })
-  })
-}
-
-async function findServiceProviders(service) {
-  return await new Promise((resolve,reject) => {
-    agentRegistryContract.methods.getAgentsWithService(service).call(PAYLOAD)
-      .then(agents => {
-        resolve(agents)
-      })
-      .catch(reason => {
-        reject(reason)
-      })
-  })
-}
-
-async function getAgentById(id) {
-  return await new Promise((resolve,reject) => {
-    agentRegistryContract.methods.getAgent(id).call(PAYLOAD)
-      .then(resolve)
-      .catch(reject)
-  })
-}
-
-async function main() {
-  const wordSenseDisambiguation = 0, textSummarization = 1
-  
-  const address = await joinNetwork()
-  const address2 = await joinNetwork()
-  console.log(address,address2)
-  //console.log(address)
-  //await advertiseService(textSummarization,address)
-  
-  //await appendPacket("0x0")
-  //const r = await getPacket(0)
-
-  //const providers = await findServiceProviders(textSummarization)
-  //let target 
-  //if (providers.length>0) target = await getAgentById(parseInt(providers[0]))
-  //console.log(providers,target)
-
- 
-}
-
-
-//main()
diff --git a/dao/js/market.js b/dao/js/market.js
deleted file mode 100644
index 8bee6a5..0000000
--- a/dao/js/market.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Import libraries we need.
-const Web3 = require('web3')
-const contract = require('truffle-contract')
-// Import our contract artifacts and turn them into usable abstractions.
-const MarketJob = require('../build/contracts/MarketJob.json')
-const marketJob = contract(MarketJob)
-
-
-const account = "0x951BE8FAE44CD16a1152DA1CcC8c414f7aEC7bd6",
-  PAYER = process.env.PAYER || account,
-  AGENTS = process.env.AGENTS || [account],
-  AMOUNTS = process.env.AMOUNTS || [new marketJob.web3.BigNumber(300)],
-  SERVICES = process.env.SERVICES || [new marketJob.web3.BigNumber(101)],
-  JOB_DESCRIPTOR = process.env.JOB_DESC || "0x0"
-
-async function create() {
-  marketJob.setProvider(new Web3.providers.HttpProvider("http://localhost:8545"))
-
-  let tx 
-  try {
-    tx = await marketJob.new(
-      AGENTS, // agents
-      AMOUNTS, //amounts
-      SERVICES, // services id
-      "0xbf625fd0ae8c827d9a9ecba19fe959723ce052ec", //token address
-      PAYER, // payer address
-      JOB_DESCRIPTOR, // first bytes packet
-      {
-        from: account,
-        gas: 1500000
-      }
-    )
-    const payer = await tx.payer.call()
-    console.log('New MarketJob started ')
-    console.log('tx hash :' + tx.transactionHash)
-    console.log('\n')
-
-    console.log('=====================')
-    console.log('PAYER   :' + payer)
-    console.log('AGENT   :' + account)
-    console.log('Amount,serviceId  : ' + await tx.amounts.call(account))
-    console.log('\n')
-
-    console.log('=====================')
-    console.log('Job Descriptor')
-    console.log(await tx.jobDescriptor.call())
-
-  } catch (reason) {
-    console.error(reason)
-  }
-
-  return tx
-}
-
-const allowAndDeposit = async (contract) => {
-  
-
-  //APPROVE 
-  //await token.approve(escrow, amount, { from: acont })
-  //const allowance = await token.allowance.call(account, escrow)
- 
-}
-
-
-const main = async () => {
-  const escrow = await create()
-  await allowAndDeposit(escrow)
-}   
-
-main()
diff --git a/dao/js/package.json b/dao/js/package.json
deleted file mode 100644
index 7271555..0000000
--- a/dao/js/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "truffle-contract": "^3.0.1",
-    "web3": "^0.2.8"
-  }
-}
diff --git a/dao/js/registry.js b/dao/js/registry.js
deleted file mode 100644
index 55d04f7..0000000
--- a/dao/js/registry.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Import libraries we need.
-const Web3 = require('web3')
-const contract = require('truffle-contract')
-// Import our contract artifacts and turn them into usable abstractions.
-const Agent = require('../build/contracts/AgentRegistry.json')
-const agent = contract(Agent)
-
-const account = "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-  SERVICE = process.env.SERVICE || 0,
-  UNIT = process.env.UNIT || 0,
-  PRICE = process.env.PRICE || 100,
-  AGENT = process.env.AGENT || account
-
-function create() {
-  agent.setProvider(new Web3.providers.HttpProvider("http://localhost:9545"))
-
-  agent.deployed().then(function (instance) {
-    return instance.addAgent(
-      SERVICE,
-      UNIT,
-      PRICE,
-      AGENT,
-      { from: account, gas: 180000 }
-    )
-  }).then((tx) => {
-    console.log(tx)
-  }).then(console.log)
-    .catch(function (e) {
-      console.log(e)
-    })
-}
-
-create()
\ No newline at end of file
diff --git a/dao/migrations/1_initial_migration.js b/dao/migrations/1_initial_migration.js
deleted file mode 100644
index ed3ed7b..0000000
--- a/dao/migrations/1_initial_migration.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = function(deployer) { };
diff --git a/dao/migrations/2_deploy_contracts.js b/dao/migrations/2_deploy_contracts.js
deleted file mode 100644
index 89b6917..0000000
--- a/dao/migrations/2_deploy_contracts.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const fs = require('fs')
-
-const Escrow = artifacts.require('Escrow.sol')
-const Agent = artifacts.require('agent/Agent.sol')
-const MarketJob = artifacts.require('market/MarketJob.sol')
-const MarketJobFactory = artifacts.require('market/MarketJobFactory.sol')
-const AgentFactory = artifacts.require('agent/AgentFactory.sol')
-const AgentRegistry = artifacts.require('registries/AgentRegistry.sol')
-const SingularityNetToken = artifacts.require('tokens/SingularityNetToken.sol')
-
-module.exports = function(deployer, network, accounts) {
-  deployer.deploy([
-    Agent,
-    Escrow,
-    MarketJob,
-    AgentFactory,
-    AgentRegistry,
-    MarketJobFactory,
-    SingularityNetToken
-  ]).then(() => {
-    const fileName = "addresses.json"
-    const content = {
-      Agent: Agent.address,
-      Escrow: Escrow.address,
-      MarketJob: MarketJob.address,
-      AgentFactory: AgentFactory.address,
-      AgentRegistry: AgentRegistry.address,
-      MarketJobFactory: MarketJobFactory.address,
-      SingularityNetToken: SingularityNetToken.address
-    }
-
-    fs.writeFile(fileName, JSON.stringify(content), 'utf-8', (err) => {
-      if (err) { throw err }
-      console.log("Contracts addresses saved in ./" + fileName)
-    })
-  })
-};
diff --git a/dao/migrations/3_deploy_crowdsale_contract.js b/dao/migrations/3_deploy_crowdsale_contract.js
deleted file mode 100644
index 8deea37..0000000
--- a/dao/migrations/3_deploy_crowdsale_contract.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const fs = require('fs')
-const AgiCrowdsale = artifacts.require("foundation/AgiCrowdsale.sol")
-const SingularityNetToken = artifacts.require("token/SingularityNetToken.sol")
-
-function latestTime() {
-  return web3.eth.getBlock('latest').timestamp;
-}
-
-const duration = {
-  seconds: function (val) { return val },
-  minutes: function (val) { return val * this.seconds(60) },
-  hours: function (val) { return val * this.minutes(60) },
-  days: function (val) { return val * this.hours(24) },
-  weeks: function (val) { return val * this.days(7) },
-  years: function (val) { return val * this.days(365) }
-}
-
-module.exports = function(deployer, network, accounts) {
-  const startTime = latestTime() + duration.minutes(5);
-  const endTime = startTime + duration.days(20);
-  const rate = new web3.BigNumber(1000);
-  const wallet = web3.eth.accounts[0];
-  const goal = new web3.BigNumber(3000 * Math.pow(10, 18));
-  const cap = new web3.BigNumber(15000 * Math.pow(10, 18));
-
-  deployer.deploy(
-    AgiCrowdsale,
-    SingularityNetToken.address,
-    wallet,
-    startTime,
-    endTime,
-    rate,
-    cap,
-    goal
-  ).then(() => {
-    const fileName = "addresses.json"
-
-    fs.readFile(fileName, (err, data) => {
-      if (!err) {
-        let content = JSON.parse(data.toString())
-        content["AgiCrowdsale"] = AgiCrowdsale.address
-
-        fs.writeFile(fileName, JSON.stringify(content), 'utf-8', (err) => {
-          if (err) { throw err }
-          console.log("Added AgiCrowdsale to " + fileName)
-        })
-      }
-    })
-  })
-};
diff --git a/dao/package.json b/dao/package.json
deleted file mode 100644
index 0a323ca..0000000
--- a/dao/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "singnet-contracts",
-  "version": "1.0.0",
-  "description": "Includes contracts, migrations, tests",
-  "directories": {
-    "doc": "docs",
-    "test": "test"
-  },
-  "scripts": {
-    "test": "truffle test"
-  },
-  "author": "tiero",
-  "license": "MIT",
-  "dependencies": {
-    "ganache-cli": "^6.0.3",
-    "truffle-hdwallet-provider": "0.0.3",
-    "zeppelin-solidity": "^1.4.0",
-    "solium": "1.0.9",
-    "scrypt": "6.0.1"
-  },
-  "repository": {
-  "type": "git",
-  "url": "git://github.com/singnet/singnet/repository.git"
-  }
-}
diff --git a/dao/py/main.py b/dao/py/main.py
deleted file mode 100755
index 5f3d072..0000000
--- a/dao/py/main.py
+++ /dev/null
@@ -1,103 +0,0 @@
-import json
-from web3 import Web3, HTTPProvider, IPCProvider
-
-web3 = Web3(HTTPProvider('http://localhost:8545'))
-
-def getAddressByName(addresses,name):
-  for key, value in addresses.items():
-    if key==name:
-      return value
-
-def parseAbi(data):
-  for key, value in data.items():
-    if key=='abi':
-      return value
-#payloads
-payload = {'from': web3.eth.coinbase, 'gas': 1500000, 'gasPrice':30000000000000}
-
-#ABI(s)
-agentRegistryAbi = parseAbi(json.loads(open('../build/contracts/AgentRegistry.json','r').read()))
-agentFactoryAbi = parseAbi(json.loads(open('../build/contracts/AgentFactory.json','r').read()))
-marketJobAbi = parseAbi(json.loads(open('../build/contracts/MarketJob.json','r').read()))
-agentAbi = parseAbi(json.loads(open('../build/contracts/Agent.json','r').read()))
-crowdsaleAbi = parseAbi(json.loads(open('../build/contracts/AgiCrowdsale.json','r').read()))
-#addresses
-agentRegistryAddress = getAddressByName(json.loads(open('../addresses.json','r').read()),'AgentRegistry')
-agentFactoryAddress = getAddressByName(json.loads(open('../addresses.json','r').read()),'AgentFactory')
-marketJobAddress = getAddressByName(json.loads(open('../addresses.json','r').read()),'MarketJob')
-agentAddress = getAddressByName(json.loads(open('../addresses.json','r').read()),'Agent')
-crowdsaleAddress = getAddressByName(json.loads(open('../addresses.json','r').read()),'AgiCrowdsale')
-
-#Contracts
-agentRegistryContract = web3.eth.contract(abi = agentRegistryAbi, address=agentRegistryAddress)
-agentFactoryContract = web3.eth.contract(abi = agentFactoryAbi, address=agentFactoryAddress)
-marketJobContract = web3.eth.contract(abi = marketJobAbi, address=marketJobAddress, bytecode="0x6060604052604051610760380380610760833981016040528080518201919060200180518201919060200180519190602001805182019190602001805190910190505b60005b60008054600160a060020a03191633600160a060020a03161790555b845186511461006f57600080fd5b60018054600160a060020a031916600160a060020a038616179055600282805161009d92916020019061011f565b5060038380516100b192916020019061011f565b50600090505b8451811015610113578481815181106100cc57fe5b90602001906020020151600560008884815181106100e657fe5b90602001906020020151600160a060020a031681526020810191909152604001600020555b6001016100b7565b5b5050505050506101bf565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061016057805160ff191683800117855561018d565b8280016001018555821561018d579182015b8281111561018d578251825591602001919060010190610172565b5b5061019a92915061019e565b5090565b6101bc91905b8082111561019a57600081556001016101a4565b5090565b90565b610592806101ce6000396000f300606060405236156100a15763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663123119cd81146100a65780632f54bf6e146100d55780633ccfd60b1461010857806355a3b2c11461011d578063626568dc1461014e5780638da5cb5b146101d9578063a552386b14610208578063b2a7a8371461022f578063e33b39cf146102ba578063f2fde38b146102cf575b600080fd5b34156100b157600080fd5b6100b96102f0565b604051600160a060020a03909116815260200160405180910390f35b34156100e057600080fd5b6100f4600160a060020a03600435166102ff565b604051901515815260200160405180910390f35b341561011357600080fd5b61011b610316565b005b341561012857600080fd5b61013c600160a060020a036004351661039e565b60405190815260200160405180910390f35b341561015957600080fd5b6101616103b0565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561019e5780820151818401525b602001610185565b50505050905090810190601f1680156101cb5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101e457600080fd5b6100b961044e565b604051600160a060020a03909116815260200160405180910390f35b341561021357600080fd5b6100f461045d565b604051901515815260200160405180910390f35b341561023a57600080fd5b610161610466565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561019e5780820151818401525b602001610185565b50505050905090810190601f1680156101cb5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156102c557600080fd5b61011b610504565b005b34156102da57600080fd5b61011b600160a060020a0360043516610525565b005b600154600160a060020a031681565b600054600160a060020a038281169116145b919050565b60045460009060ff16151560011461032d57600080fd5b600160a060020a0333166000908152600560205260408120541161035057600080fd5b50600160a060020a033316600081815260056020526040808220805492905590919082156108fc0290839051600060405180830381858888f19350505050151561039957600080fd5b5b5b50565b60056020526000908152604090205481565b60038054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156104465780601f1061041b57610100808354040283529160200191610446565b820191906000526020600020905b81548152906001019060200180831161042957829003601f168201915b505050505081565b600054600160a060020a031681565b60045460ff1681565b60028054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156104465780601f1061041b57610100808354040283529160200191610446565b820191906000526020600020905b81548152906001019060200180831161042957829003601f168201915b505050505081565b60045460ff161561051457600080fd5b6004805460ff191660011790555b5b565b61052e336102ff565b151561053957600080fd5b6000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b505600a165627a7a723058204b360ed4e2a55422759240b12589fce4b67afa92f3d4db7484283b50c211d5210029")
-agentContract = web3.eth.contract(abi = agentAbi, address=agentAddress)
-crowdsaleContract = web3.eth.contract(abi = crowdsaleAbi, address=crowdsaleAddress, args)
-
-
-def joinNetwork():
-  return agentFactoryContract.transact(payload).create()
-
-def advertiseService(service,agent):
-  return agentRegistryContract.transact(payload).addAgent(service,agent)
-
-def findServiceProviders(service):
-  return agentRegistryContract.call(payload).getAgentsWithService(service)
-
-def getAgentsById(id):
-  return agentRegistryContract.call(payload).getAgent(id)
-
-def createMarketJob(agents,amounts,payer,firstService,lastService):
-  return marketJobContract.deploy(transaction={'from': web3.eth.accounts[8],'value': web3.toWei(1, 'ether')},args=(agents,amounts,payer,firstService,lastService))
-
-def setJobCompleted():
-  return marketJobContract.call(payload).setJobCompleted()
-
-def payAgent(agentAccounts):
-  return marketJobContract.call({'from': agentAccounts[0]}).withdraw()
-
-
-# assign an integer for each service
-# wordSenseDisambiguation = 0,
-# textSummarization = 1
-
-
-
-# # Here I'm joining the network and putting in myself the address on the blockchain
-# myself1 = joinNetwork()
-# print("myself_1          {0}".format(myself1))
-# myself2 = joinNetwork()
-# print("myself_2           {0}".format(myself2))
-
-# #TODO: add event watch AgentAdded
-# #Add an agent (address) and its service (id, unit, pricePerUnit) to the registry
-# advertiseService(0, 0, 20, web3.eth.accounts[1])
-
-# #Create a new market with two agents
-# agentAccounts = [web3.eth.accounts[4],web3.eth.accounts[5]]
-# rewardsForServices = [web3.toWei(0.5, 'ether'),web3.toWei(0.5, 'ether')]
-# payer = web3.eth.accounts[2]
-
-# marketJob = createMarketJob(agentAccounts,rewardsForServices,payer,"0","1")
-# print("market_job          {0}".format(marketJob))
-# #Complete all jobs
-# setJobCompleted()
-# #Let agent be payed for his service(s)
-# payAgent(agentAccounts)
-
-#Here I'm inserting a new agent for a determined service
-'''print("\n\nadvertize service\n")
-print(advertiseService(0,myself))
-print(advertiseService(0,test_agent))
-print(advertiseService(72182,test_agent))
-
-## Here I'm printing
-print("\n\nfind service providers for 0\n")
-print(getAgentsById(findServiceProviders(0)[0]))
-print(getAgentsById(findServiceProviders(0)[1]))
-print("\n\nfind service providers for 72182\n")
-print(findServiceProviders(72182)[0])
-test_provider_address = findServiceProviders(72182)[0]
-test_provider = getAgentsById(test_provider_address)'''
-
diff --git a/dao/py/personal.py b/dao/py/personal.py
deleted file mode 100644
index 3709ecd..0000000
--- a/dao/py/personal.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import json
-from web3 import Web3, HTTPProvider, IPCProvider
-
-web3 = Web3(HTTPProvider('http://localhost:8545'))
-
-#password for encrypting account
-psw = '1234'
-# seconds
-duration = 5 
-
-
-print("list of accounts           {0}".format(web3.personal.listAccounts))
-
-newAccount = web3.personal.newAccount(psw)
-print("Account created        {0}".format(newAccount))
-print("Unlocked:        {0}".format(web3.personal.unlockAccount(newAccount, psw)))
-
-# Unlocking with a duration
-print("Unlocked with a duration:        {0}".format(web3.personal.unlockAccount(newAccount, psw, duration)))
-
-
-
-
-
diff --git a/dao/test.sh b/dao/test.sh
deleted file mode 100644
index 6860d28..0000000
--- a/dao/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 "$@"
-node_modules/.bin/truffle test "$@"
-cd py && python main.py
diff --git a/dao/test/TestAgent.js b/dao/test/TestAgent.js
deleted file mode 100644
index 42b6ad2..0000000
--- a/dao/test/TestAgent.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const Agent = artifacts.require('agent/Agent.sol')
-
-
-contract('Agent', function () {
-
-  let agent
-
-  beforeEach(async () => {
-    agent = await Agent.new()
-  })
-
-  it('verifies that somehow can append bytes of data to the agent', async () => {
-
-    let result = await agent.appendPacket("0x0")
-    assert.isNotNull(result)
-
-  })
-
-  it('verifies that somehow can get bytes of data from the agent', async () => {
-
-    let result = await agent.appendPacket("0x0")
-    let packet = await agent.getPacket(0)
-    console.log(packet)
-    assert.isNotNull(packet)
-
-  })
-
-  it('verifies that somehow can send bytes of data to an agent', async () => {
-
-    const agent2 = await Agent.new()
-
-    await agent.appendPacket("0x0101")
-
-    let packet = await agent.getPacket(0)
-
-    await agent2.sendPacket(agent2.address, packet)
-
-    let packet2 = await agent2.getPacket(0)
-
-    console.log(packet2)
-
-    assert.isNotNull(packet2)
-
-  })
-
-
-
-})
diff --git a/dao/test/TestAgentFactory.js b/dao/test/TestAgentFactory.js
deleted file mode 100644
index 7ab1e2c..0000000
--- a/dao/test/TestAgentFactory.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const Agent = artifacts.require('agent/Agentfactory.sol')
-
-
-contract('AgentFactory', function () {
-
-  let agentFactory
-
-  beforeEach(async () => {
-    agentFactory = await Agent.new()
-  })
-
-  it('verifies that someone can create a new agent', async () => {
-
-    let result = await agentFactory.create()
-    assert.isNotNull(result)
-
-  })
-
-  it('verifies that somehow can create multiple agents', async () => {
-    let result = await agentFactory.create()
-    let result2 = await agentFactory.create()
-    assert.notEqual(result, result2, 'Errors, no multiple agents created')
-  })
-
-})
\ No newline at end of file
diff --git a/dao/test/TestAgentRegistry.js b/dao/test/TestAgentRegistry.js
deleted file mode 100644
index 36da9a7..0000000
--- a/dao/test/TestAgentRegistry.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const AgentRegistry = artifacts.require('registries/AgentRegistry.sol');
-
-
-contract('AgentRegistry', function (accounts) {
-
-  let registry
-
-  beforeEach(async () => {
-    registry = await AgentRegistry.new()
-  })
-
-  it('verifies that agent can be added to registry', async () => {
-
-    let result = await registry.addAgent(
-      0,
-      1,
-      20,
-      accounts[2]
-    )
-
-    assert.equal(result.logs[0].event, 'AgentAdded', 'Agent was not added')
-  })
-
-  it('returns agent data at 0 position', async () => {
-
-    await registry.addAgent(
-      0,
-      1,
-      20,
-      accounts[2]
-    )
-
-    let result = await registry.getAgent.call(0)
-    assert.isNotNull(result)
-  })
-
-  it('returns agents with service 0', async () => {
-
-    await registry.addAgent(
-      0,
-      1,
-      20,
-      accounts[2]
-    )
-
-    let result = await registry.getAgentsWithService.call(0)
-    assert.isNotNull(result)
-  })
-
-})
\ No newline at end of file
diff --git a/dao/test/TestAgiCrowdsale.js b/dao/test/TestAgiCrowdsale.js
deleted file mode 100644
index 8c48738..0000000
--- a/dao/test/TestAgiCrowdsale.js
+++ /dev/null
@@ -1,157 +0,0 @@
-const Crowdsale = artifacts.require('./helpers/AgiCrowdsaleMock.sol')
-const AGIToken = artifacts.require('SingularityNetToken.sol')
-
-const { latestTime, duration } = require('./helpers/latestTime')
-const { increaseTimeTo } = require('./helpers/increaseTime')
-
-
-contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, wallet]) => {
-  let agiCrowdsale
-  let token
-
-
-  beforeEach(async () => {
-    token = await AGIToken.new()
-    const startTime = latestTime() + duration.seconds(1)
-    const endTime = startTime + duration.weeks(1)
-    const rate = new web3.BigNumber(1000)
-    const goal = new web3.BigNumber(3000 * Math.pow(10, 18))
-    const cap = new web3.BigNumber(15000 * Math.pow(10, 18))
-    agiCrowdsale = await Crowdsale.new(token.address, wallet, startTime, endTime, rate, cap, goal)
-    await agiCrowdsale.setBlockTimestamp(startTime + duration.days(2))
-  })
-
-  describe('initialization', () => {
-
-    it('should not be finalized', async () => {
-      const isFinalized = await agiCrowdsale.isFinalized()
-
-      assert.isFalse(isFinalized, "isFinalized should be false")
-    })
-
-    it('goal should be 3000 ETH', async () => {
-      const goal = await agiCrowdsale.goal()
-      assert.equal(goal.toString(10), '3000000000000000000000', "goal is incorrect")
-    })
-
-    it('cap should be 15000 ETH', async () => {
-      const cap = await agiCrowdsale.cap()
-      assert.equal(cap.toString(10), '15000000000000000000000', "cap is incorrect")
-    })
-
-    it('should set the agiCrowdsale as a new owner of AGI token', async () => {
-      await token.setOwnership(agiCrowdsale.address)
-      const owner = await token.owner.call()
-      assert.equal(owner, agiCrowdsale.address, 'Crowdsale is not the owner of the token')
-    })
-
-  })
-
-  describe('whitelist', async () => {
-
-    it('should add two contributors into the whitelist', async () => {
-      await agiCrowdsale.updateWhitelist([firstContributor, secondContributor], true)
-      assert.isTrue(await agiCrowdsale.isWhitelisted(firstContributor))
-      assert.isTrue(await agiCrowdsale.isWhitelisted(secondContributor))
-    })
-
-    it('should add and remove the same contributor in whitelist', async () => {
-      await agiCrowdsale.updateWhitelist([firstContributor], true)
-      assert.isTrue(await agiCrowdsale.isWhitelisted(firstContributor))
-
-      await agiCrowdsale.updateWhitelist([firstContributor], false)
-      assert.isFalse(await agiCrowdsale.isWhitelisted(firstContributor))
-    })
-  })
-
-  describe('sale', async () => {
-
-    it('should not accept purchase before start', async () => {
-      try {
-        await agiCrowdsale.sendTransaction({ value: new web3.BigNumber(web3.toWei(1, 'ether')), from: firstContributor })
-
-        assert.fail('should have thrown before')
-      } catch (error) {
-        assert.isAbove(error.message.search('invalid opcode'), -1, 'Invalid opcode error must be returned');
-      }
-    })
-
-    it('should accept payments during the sale and issue tokens', async () => {
-      await agiCrowdsale.updateWhitelist([firstContributor], true)
-
-      await token.setOwnership(agiCrowdsale.address)
-
-      const rate = new web3.BigNumber(1000)
-      const weiToCogs = new web3.BigNumber(Math.pow(10, -10))
-      const startTime = latestTime() + duration.seconds(1)
-
-      const investmentAmount = new web3.BigNumber(web3.toWei(0.5, 'ether'))
-      const expectedCotributorAmount = rate.mul(investmentAmount).mul(weiToCogs)
-
-      await increaseTimeTo(startTime)
-
-      const value = new web3.BigNumber(web3.toWei(0.5, 'ether'))
-
-      await agiCrowdsale.sendTransaction({ value, from: firstContributor })
-
-      const initialSupply = await token.INITIAL_SUPPLY.call()
-      const contributorAmount = await token.balanceOf(firstContributor)
-
-      assert.equal(contributorAmount.toString(), expectedCotributorAmount.toString())
-      assert.equal((initialSupply - contributorAmount).toString(), (initialSupply - expectedCotributorAmount).toString())
-
-      try {
-        await token.transfer(secondContributor, 100)
-        assert.fail('should have thrown before')
-      } catch (error) {
-        assert.isAbove(error.message.search('invalid opcode'), -1, 'Invalid opcode error must be returned');
-      }
-
-
-      const isFinalized = await agiCrowdsale.isFinalized()
-
-      assert.isFalse(isFinalized, "isFinalized should be true")
-    })
-
-    it('should refund payers if the goal is not reached', async () => {
-      await agiCrowdsale.updateWhitelist([firstContributor], true)
-      await token.setOwnership(agiCrowdsale.address)
-
-      const value = new web3.BigNumber(web3.toWei(1, 'ether'))
-
-      await agiCrowdsale.sendTransaction({ value, from: firstContributor })
-      await agiCrowdsale.setBlockTimestamp(latestTime() + duration.weeks(2))
-      await agiCrowdsale.finalize()
-
-      const before = web3.fromWei(web3.eth.getBalance(firstContributor), 'ether')
-
-      await agiCrowdsale.claimRefund({ from: firstContributor })
-
-      const after = web3.fromWei(web3.eth.getBalance(firstContributor), 'ether')
-
-      assert.equal(Math.round(after - before), web3.fromWei(value, 'ether').toString())
-    })
-
-    it('should enable the owner to claim all unsold tokens', async () => {
-      await token.setOwnership(agiCrowdsale.address)
-
-      await agiCrowdsale.setBlockTimestamp(latestTime() + duration.weeks(2))
-      await agiCrowdsale.finalize()
-
-      const initialSupply = await token.balanceOf(agiCrowdsale.address)
-      const before = await token.balanceOf(miner)
-
-      await agiCrowdsale.claimUnsold()
-
-      const endSupply = await token.balanceOf(agiCrowdsale.address)
-      const after = await token.balanceOf(miner)
-
-      assert.equal(after.toString(), parseInt(initialSupply.toString()) + parseInt(before.toString()))
-      assert.equal(endSupply.toString(), 0)
-    })
-
-  })
-
-})
-
-
diff --git a/dao/test/TestMarketJob.js b/dao/test/TestMarketJob.js
deleted file mode 100644
index 705b6fa..0000000
--- a/dao/test/TestMarketJob.js
+++ /dev/null
@@ -1,185 +0,0 @@
-const Market = artifacts.require('market/MarketJob.sol')
-const AGIToken = artifacts.require('tokens/SingularityNetTokenMock.sol')
-
-contract('Market Job', function ([payer, firstAgent, secondAgent, thirdAgent]) {
-
-  const amounts = [new web3.BigNumber(300), new web3.BigNumber(300), new web3.BigNumber(400)]
-
-
-  it('DEPOSIT # only the payer can deposit AGI token', async () => {
-    const token = await AGIToken.new(payer, 1000)
-    const marketJob = await Market.new(
-      [firstAgent, secondAgent, thirdAgent], // agents
-      amounts, //amounts
-      [101, 102, 103], // services id
-      token.address, //token address
-      payer, // payer address
-      "0x0", // first bytes packet
-      {
-        from: firstAgent
-      }
-
-    )
-    const escrow = marketJob.address
-    // console.log(await token.balanceOf(payer))
-    const amount = new web3.BigNumber(1000)
-    const watch = token.Approval()
-    //APPROVE
-    await token.approve(escrow, amount, { from: payer })
-    const allowance = await token.allowance.call(payer, escrow)
-
-
-    assert.equal(watch.get()[0].args.owner, payer)
-    assert.equal(watch.get()[0].args.spender, escrow)
-
-    //DEPOSIT
-    const result = await marketJob.deposit(amount, { from: payer })
-
-    assert.strictEqual(
-      (await token.balanceOf.call(escrow)).toNumber(),
-      amount.toNumber()
-    );
-
-    assert.equal(result.logs[0].event, 'Deposited', 'Amount was not deposited')
-  })
-
-  it('COMPLETION # only the the master agent can set the job as completed', async () => {
-    const hash = '0x01'
-    const token = await AGIToken.new(payer, 1000)
-    const marketJob = await Market.new(
-      [firstAgent, secondAgent, thirdAgent], // agents
-      amounts, //amounts
-      [101, 102, 103], // services id
-      token.address, //token address
-      payer, // payer address
-      "0x0", // first bytes packet
-      {
-        from: firstAgent
-      }
-    )
-    const escrow = marketJob.address
-    const amount = new web3.BigNumber(1000)
-    await token.approve(escrow, amount, { from: payer })
-    await marketJob.deposit(amount, { from: payer })
-    // balance after deposit === 0
-    assert.equal((await token.balanceOf(escrow)).toNumber(), amount, 'Contract Not full empty')
-
-    const result = await marketJob.setJobCompleted(hash, { from: firstAgent })
-    const jobResult = await marketJob.jobResult.call()
-
-    assert.equal(jobResult, hash, 'Inserted jobResult is different than actual inserted')
-    assert.equal(result.logs[0].event, 'JobCompleted', 'Job was not completed')
-  })
-
-  it('APPROVAL # only the the payer can set the job as approved ', async () => {
-
-    const hash = '0x01'
-
-    const token = await AGIToken.new(payer, 1000)
-    const marketJob = await Market.new(
-      [firstAgent, secondAgent, thirdAgent], // agents
-      amounts, //amounts
-      [101, 102, 103], // services id
-      token.address, //token address
-      payer, // payer address
-      "0x0", // first bytes packet
-      {
-        from: firstAgent
-      }
-    )
-    const escrow = marketJob.address
-    const amount = new web3.BigNumber(1000)
-    await token.approve(escrow, amount, { from: payer })
-    await marketJob.deposit(amount, { from: payer })
-    // balance after deposit === 0
-    assert.equal((await token.balanceOf(escrow)).toNumber(), amount, 'Contract Not full empty')
-
-    await marketJob.setJobCompleted(hash, { from: firstAgent })
-    const result = await marketJob.setJobAccepted()
-    const jobAccepted = await marketJob.jobAccepted.call()
-
-    assert.equal(jobAccepted, true, 'the job state is euqal to approved')
-    assert.equal(result.logs[0].event, 'JobAccepted', 'Job was not approved')
-  })
-
-  it('WITHDRAW # only allowed agents can request a withdrawal', async () => {
-
-    const hash = '0x01'
-
-    const token = await AGIToken.new(payer, new web3.BigNumber(1000))
-    const marketJob = await Market.new(
-      [firstAgent, secondAgent, thirdAgent], // agents
-      amounts, //amounts
-      [101, 102, 103], // services id
-      token.address, //token address
-      payer, // payer address
-      "0x0", // first bytes packet
-      {
-        from: firstAgent
-      }
-    )
-    const escrow = marketJob.address
-
-    const amount = new web3.BigNumber(1000)
-
-    await token.approve(escrow, amount, { from: payer })
-    await marketJob.deposit(amount, { from: payer })
-    // balance after deposit === 0
-    assert.equal((await token.balanceOf(escrow)).toNumber(), amount, 'Contract Not full empty')
-    await marketJob.setJobCompleted(hash, { from: firstAgent })
-    await marketJob.setJobAccepted({ from: payer })
-
-
-    /**
-     * third agent 
-    */
-    const resultThird = await marketJob.withdraw({ from: thirdAgent })
-
-    assert.strictEqual(
-      (await token.balanceOf.call(thirdAgent)).toNumber(),
-      amounts[2].toNumber()
-    );
-
-    assert.equal(resultThird.logs[0].event, 'Withdrew', 'Withdrawal in favor of ' + thirdAgent + ' was not approved')
-
-    /**
-     * second agent 
-    */
-    const resultSecond = await marketJob.withdraw({ from: secondAgent })
-
-    assert.strictEqual(
-      (await token.balanceOf.call(secondAgent)).toNumber(),
-      amounts[1].toNumber()
-    );
-
-    assert.equal(resultSecond.logs[0].event, 'Withdrew', 'Withdrawal in favor of ' + secondAgent + ' was not approved')
-
-    /**
-     * first agent 
-    */
-
-    const resultFirst = await marketJob.withdraw({ from: firstAgent })
-
-    assert.strictEqual(
-      (await token.balanceOf.call(firstAgent)).toNumber(),
-      amounts[1].toNumber()
-    );
-
-    assert.equal(resultFirst.logs[0].event, 'Withdrew', 'Withdrawal in favor of ' + firstAgent + ' was not approved')
-
-    //Final balance === 0
-
-    assert.equal((await token.balanceOf(escrow)).toNumber(), 0, 'Contract Not full empty')
-
-    try {
-      const tryMore = await marketJob.withdraw({ from: firstAgent })
-      assert.fail('should have thrown before')
-    } catch (error) {
-      assert.isAbove(error.message.search('invalid opcode'), -1, 'Invalid opcode error must be returned');
-    }
-
-
-
-  })
-
-})
\ No newline at end of file
diff --git a/dao/test/TestMarketJobFactory.js b/dao/test/TestMarketJobFactory.js
deleted file mode 100644
index 6dd1950..0000000
--- a/dao/test/TestMarketJobFactory.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const Factory = artifacts.require('market/MarketJobFactory.sol')
-const MarketJob = artifacts.require('market/MarketJob.sol')
-const AGIToken = artifacts.require('tokens/SingularityNetTokenMock.sol')
-
-contract('Market Job Factory', function ([agent, payer]) {
-  
-
-  beforeEach(async () => {
-    
-  })
-  // master agent: accounts[0]
-  it('verifies that an agent can create a market job', async () => {
-    const token = await AGIToken.new(agent, 100)
-    const factory = await Factory.new()
-    const tx = await factory.create(
-      [agent], // agents
-      [100], // amounts
-      [12300], //id service
-      token.address, // token address
-      payer, // payer address
-      "0x0", // first packet )
-      {
-        from: agent
-      }
-    )
-
-    assert.isNotNull(tx)
-    
-    const marketJob = await MarketJob.new(tx)
-    assert.isNotNull(marketJob.address)
-
-    const result = await marketJob.setJobCompleted("0x0", { from: agent })
-
-    assert.equal(result.logs[0].event, 'JobCompleted', 'Job was not completed')    
-  })
-
-
-})
\ No newline at end of file
diff --git a/dao/test/TestSingularityNetToken.js b/dao/test/TestSingularityNetToken.js
deleted file mode 100644
index 32c4150..0000000
--- a/dao/test/TestSingularityNetToken.js
+++ /dev/null
@@ -1,102 +0,0 @@
-const SingularityNetToken = artifacts.require('./helpers/SingularityNetTokenMock.sol')
-const Crowdsale = artifacts.require('./helpers/AgiCrowdsaleMock.sol')
-
-
-const { latestTime, duration } = require('./helpers/latestTime')
-
-contract('SingularityNetToken', (accounts) => {
-
-  let token
-
-
-  beforeEach(async () => {
-    token = await SingularityNetToken.new(accounts[0], 100)
-  })
-
-  it('should have the name Singularity Network Token', async () => {
-    const name = await token.NAME.call()
-    assert.equal(name, 'SingularityNET Token', "Singularity Network Token wasn't the name")
-  })
-
-  it('should have the symbol AGI', async () => {
-    const symbol = await token.SYMBOL.call()
-    assert.equal(symbol, 'AGI', "AGI wasn't the symbol")
-  })
-
-  it('should have decimals set to 8', async () => {
-    const decimals = await token.DECIMALS.call()
-    assert.equal(decimals, 8, "8 wasn't the value of decimals")
-  })
-
-  it('should have INITIAL_SUPPLY set to 1e17 cogs', async () => {
-    const supply = await token.INITIAL_SUPPLY.call()
-    assert.equal(supply, 1e17, "1e17 wasn't the value of INITIAL_SUPPLY units")
-  })
-
-  it('should set totalSupply to 1e17 cogs', async () => {
-    const supply = await token.totalSupply.call()
-    assert.equal(supply, 1e17, "1e17 wasn't the value of totalSupply units")
-  })
-
-  it('should be able to transfer if transfers are unpaused', async function () {
-    // await token.unpause()
-
-    await token.transfer(accounts[1], 100)
-
-    const balance0 = await token.balanceOf(accounts[0])
-    assert.equal(balance0.toNumber(), 0)
-
-    const balance1 = await token.balanceOf(accounts[1])
-    assert.equal(balance1.toNumber(), 100)
-  })
-
-  it('should be able to transfer after transfers are paused and unpaused', async function () {
-    await token.pause()
-    await token.unpause()
-
-    await token.transfer(accounts[1], 100)
-
-    const balance1 = await token.balanceOf(accounts[1])
-    assert.equal(balance1.toNumber(), 100)
-  })
-
-  it('should throw an error trying to transfer while transactions are paused', async function () {
-    await token.pause()
-    try {
-      await token.transfer(accounts[1], 100)
-      assert.fail('should have thrown before')
-    } catch (error) {
-      assert.isAbove(error.message.search('invalid opcode'), -1, 'Invalid opcode error must be returned');
-    }
-  })
-
-  it('should throw an error trying to transfer from another account while transactions are paused', async function () {
-    await token.pause()
-    try {
-      await token.transferFrom(accounts[0], accounts[1], 100)
-      assert.fail('should have thrown before')
-    } catch (error) {
-      assert.isAbove(error.message.search('invalid opcode'), -1, 'Invalid opcode error must be returned');
-    }
-  })
-
-  it('should set the agiCrowdsale as the new owner', async function () {
-    const startTime = latestTime() + duration.seconds(1)
-    const endTime = startTime + duration.weeks(1)
-    const rate = new web3.BigNumber(1000)
-    const goal = new web3.BigNumber(3000 * Math.pow(10, 18))
-    const cap = new web3.BigNumber(15000 * Math.pow(10, 18))
-    agiCrowdsale = await Crowdsale.new(token.address, accounts[2], startTime, endTime, rate, cap, goal)
-    await agiCrowdsale.setBlockTimestamp(startTime + duration.days(1))
-    await token.setOwnership(agiCrowdsale.address)
-    const owner = await token.owner.call()
-    assert.equal(owner, agiCrowdsale.address, 'Crowdsale is not the owner of the token')
-  })
-
-  it('should transfer tokens to someone if owner', async function () {
-    await token.transferTokens(accounts[2], 50)
-    const balance2 = await token.balanceOf(accounts[2])
-    assert.equal(balance2.toNumber(), 50)
-  })
-
-})
\ No newline at end of file
diff --git a/dao/test/helpers/AgiCrowdsaleMock.sol b/dao/test/helpers/AgiCrowdsaleMock.sol
deleted file mode 100644
index ca5f5e1..0000000
--- a/dao/test/helpers/AgiCrowdsaleMock.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../../contracts/foundation/AgiCrowdsale.sol";
-
-contract AgiCrowdsaleMock is AgiCrowdsale {
-    uint256 public timeStamp = now;
-    function setBlockTimestamp(uint256 _timeStamp) public onlyOwner {
-        timeStamp = _timeStamp;
-    }
-
-    function getBlockTimestamp() internal constant returns (uint256) {
-        return timeStamp;
-    }
-  
-    function AgiCrowdsaleMock(
-        address _token, 
-        address _wallet, 
-        uint256 _startTime, 
-        uint256 _endTime, 
-        uint256 _rate, 
-        uint256 _cap, 
-        uint256 _goal) 
-        AgiCrowdsale(_token, _wallet, _startTime, _endTime, _rate, _cap, _goal)
-    {
-    }
-
-}
\ No newline at end of file
diff --git a/dao/test/helpers/SingularityNetTokenMock.sol b/dao/test/helpers/SingularityNetTokenMock.sol
deleted file mode 100644
index 5ab329d..0000000
--- a/dao/test/helpers/SingularityNetTokenMock.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../../contracts/tokens/SingularityNetToken.sol";
-
-contract SingularityNetTokenMock is SingularityNetToken {
-
-    function SingularityNetTokenMock( address owner, uint256 supply) {  
-        balances[owner] = supply;
-    }
-
-}
\ No newline at end of file
diff --git a/dao/test/helpers/assertFail.js b/dao/test/helpers/assertFail.js
deleted file mode 100644
index d274110..0000000
--- a/dao/test/helpers/assertFail.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = async function assertFail(callback, message) {
-  let web3ErrorThrown = false
-  try {
-    await callback()
-  } catch (error) {
-    if (error.message.search('invalid opcode')) web3ErrorThrown = true
-  }
-  assert.ok(web3ErrorThrown, message || 'Transaction should fail')
-}
diff --git a/dao/test/helpers/increaseTime.js b/dao/test/helpers/increaseTime.js
deleted file mode 100644
index a32a051..0000000
--- a/dao/test/helpers/increaseTime.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const time = require('./latestTime')
-
-// Increases testrpc time by the passed duration in seconds
-const increaseTime = (duration) => {
-  const id = Date.now()
-
-  return new Promise((resolve, reject) => {
-    web3.currentProvider.sendAsync({
-      jsonrpc: '2.0',
-      method: 'evm_increaseTime',
-      params: [duration],
-      id: id,
-    }, err1 => {
-      if (err1) return reject(err1)
-
-      web3.currentProvider.sendAsync({
-        jsonrpc: '2.0',
-        method: 'evm_mine',
-        id: id+1,
-      }, (err2, res) => {
-        return err2 ? reject(err2) : resolve(res)
-      })
-    })
-  })
-}
-
-/**
- * Beware that due to the need of calling two separate testrpc methods and rpc calls overhead
- * it's hard to increase time precisely to a target point so design your test to tolerate
- * small fluctuations from time to time.
- *
- * @param target time in seconds
- */
-const increaseTimeTo = (target) => {
-  let now = time.latestTime()
-  if (target < now) throw Error(`Cannot increase current time(${now}) to a moment in the past(${target})`);
-  let diff = target - now
-  return increaseTime(diff)
-}
-
-const duration = {
-  seconds: function(val) { return val},
-  minutes: function(val) { return val * this.seconds(60) },
-  hours:   function(val) { return val * this.minutes(60) },
-  days:    function(val) { return val * this.hours(24) },
-  weeks:   function(val) { return val * this.days(7) },
-  years:   function(val) { return val * this.days(365)}
-};
-
-
-module.exports = {
-  increaseTimeTo
-}
\ No newline at end of file
diff --git a/dao/test/helpers/latestTime.js b/dao/test/helpers/latestTime.js
deleted file mode 100644
index 5c18cef..0000000
--- a/dao/test/helpers/latestTime.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.latestTime = function () {
-  return global.web3.eth.getBlock('latest').timestamp;
-}
-
-exports.duration = {
-  seconds: function (val) { return val },
-  minutes: function (val) { return val * this.seconds(60) },
-  hours: function (val) { return val * this.minutes(60) },
-  days: function (val) { return val * this.hours(24) },
-  weeks: function (val) { return val * this.days(7) },
-  years: function (val) { return val * this.days(365) }
-};
\ No newline at end of file
diff --git a/dao/truffle.js b/dao/truffle.js
deleted file mode 100644
index cf7960f..0000000
--- a/dao/truffle.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const HDWalletProvider = require("truffle-hdwallet-provider")
-const mnemonic = "word word word" //MNEMONIC
-const host = "http://localhost:8545"//NODE
-
-module.exports = {
-  networks: {
-    development: {
-      host: "testrpc",
-      port: 8545,
-      network_id: "*" // Match any network id
-    },
-    kovan: {
-      provider: () => {
-        return new HDWalletProvider(mnemonic, host)
-      },
-      gas: 4700000,
-      network_id: "*" // Match any network id
-    }
-  },
-}