Added a simpler implementation of a payer/payee escrow

Author: tiero

contracts/market/Job.sol

@@ -0,0 +1,39 @@
+pragma solidity ^0.4.18;
+
+contract Job {
+    uint256 public status = 0;
+    bytes32 public jobDescriptor;
+    bytes32 public jobResult;
+
+    uint256 public start;
+    uint256 public end;
+
+    address public payer;
+    address public payee;
+
+    event JobStarted(address indexed payer, address indexed payee, bytes32 jobDescriptor, address jobAddress);
+    event JobCompleted(bytes32 jobResult, address jobAddress);
+
+    function setJobStarted(address _payer, address _payee, bytes32 _jobDescriptor) public {
+        require(status < 1);
+        payer = _payer;
+        payee = _payee;
+        jobDescriptor = _jobDescriptor;
+        status = 1;
+        start = now;
+
+        JobStarted(payer, payee, jobDescriptor, address(this));
+    }
+
+    function setJobCompleted(bytes32 _jobResult) public {
+        require(msg.sender == payee);
+        require(status < 2);        
+        status = 2;
+        jobResult = _jobResult;
+        end = now;
+
+        JobCompleted(jobResult, address(this));
+
+    }
+
+}

contracts/market/Market.sol

@@ -0,0 +1,25 @@
+/* pragma solidity ^0.4.18;
+
+
+contract Market {
+
+  address public owner;
+  mapping (address => uint256) public jobs;
+
+  function Market() public {
+    owner = msg.sender;
+  }
+
+  function ask() public {
+
+  }
+
+  function sell() public {
+
+  }
+
+  function stake() pure {
+
+  }
+
+} */

migrations/2_deploy_contracts.js

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

migrations/3_deploy_crowdsale_contract.js

@@ -16,6 +16,7 @@ const duration = {
 }
 
 module.exports = function(deployer, network, accounts) {
+  if (network!=='live') return;
   const startTime = latestTime() + duration.minutes(5)
   const endTime = startTime + duration.days(20)
   const rate = new web3.BigNumber(1000)

migrations/4_deploy_tokenvesting_contract.js

@@ -3,13 +3,14 @@ const SingularityNetToken = artifacts.require("token/SingularityNetToken.sol")
 
 
 module.exports = function (deployer, network, accounts) {
-    const beneficiary = accounts[0]
-    
-      const start = 1450656000
-      const cliff = 31536000 // ~1 yr
-      const duration = 126144000 // ~4yrs
-    
-      const amount = 5000 * 1e18
-    
-      deployer.deploy(TokenVesting,beneficiary,start,cliff,duration,true)
+  if (network !== 'live') return;
+  const beneficiary = accounts[0]
+
+  const start = 1450656000
+  const cliff = 31536000 // ~1 yr
+  const duration = 126144000 // ~4yrs
+
+  const amount = 5000 * 1e18
+
+  deployer.deploy(TokenVesting, beneficiary, start, cliff, duration, true)
 };

package.json

@@ -7,18 +7,20 @@
     "test": "test"
   },
   "scripts": {
+    "compile": "node_modules/.bin/truffle compile",
+    "deploy": "node_modules/.bin/truffle migrate",
     "test": "node_modules/.bin/truffle test"
   },
   "author": "tiero",
   "license": "MIT",
   "dependencies": {
     "truffle": "4.0.1",
-    "truffle-hdwallet-provider": "0.0.3",
     "zeppelin-solidity": "1.4.0"
   },
   "devDependencies": {
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
-    "chai-bignumber": "^2.0.2"
+    "chai-bignumber": "^2.0.2",
+    "truffle-hdwallet-provider": "^0.0.3"
   }
 }

test/TestJob.js

@@ -0,0 +1,30 @@
+const Job = artifacts.require('market/Job.sol')
+
+
+contract('Job', function ([payer, payee]) {
+
+  beforeEach(async () => {
+    this.job = await Job.new()
+  })
+  
+  it('JOB STARTED', async () => {
+    const jobDescriptor = "0x0"
+
+    const { logs } = await this.job.setJobStarted(payer, payee, jobDescriptor)
+    const found = logs.find(e => e.event === 'JobStarted')
+    assert.strictEqual(found.event, 'JobStarted', 'Job not started')
+  })
+
+  it('JOB COMPLETED', async () => {
+    const jobDescriptor = "0x0"
+    const jobResult = "0x0102"
+
+    await this.job.setJobStarted(payer, payee, jobDescriptor)
+    //Complete jobs
+    const { logs } = await this.job.setJobCompleted(jobResult, {from:payee})
+    const found = logs.find(e => e.event === 'JobCompleted')
+    assert.strictEqual(found.event, 'JobCompleted', 'Job not completed')
+  })
+
+
+})