Escrow contract with Kovan AGI deposit/withdraw

Author: tiero

contracts/market/Escrow.sol

@@ -0,0 +1,68 @@
+pragma solidity ^0.4.18;
+
+import "./Job.sol";
+import "zeppelin-solidity/contracts/token/ERC20.sol";
+
+contract Escrow is Job {
+    /**
+     * @dev Kovan AGI token.
+     * https://kovan.etherscan.io/token/0x3b226ff6aad7851d3263e53cb7688d13a07f6e81#readContract
+     */  
+    ERC20 public constant AGI = ERC20(0x3b226ff6aad7851d3263e53cb7688d13a07f6e81);
+    
+    /**
+     * @dev Vault mapping
+     */
+    mapping(address => mapping(address => uint256)) public vault;
+    
+    /**
+     * @dev Deposited event
+     */
+    event Deposited(address payer, uint256 amount);
+
+     /**
+      * @dev Deposited event
+      */
+    event Withdrew(address payee, uint256 amount);
+
+        /**
+      * @dev Escrow constructor.
+      * @param _payer An agent who pays the job.
+      * @param _payee An agent to whom the job is paid.
+      * @param _cost Cost in AGI
+      * @param _reward reward for validator
+      */
+    function Escrow(
+        address _payer, 
+        address _payee, 
+        bytes32 _descriptor, 
+        uint256 _cost, 
+        uint256 _reward ) public
+    {
+        payer = _payer;
+        payee = _payee;
+        descriptor = _descriptor;
+        cost = _cost;
+        reward = _reward;
+
+        provider = payee;
+        start = now;
+
+        Started(payer, payee, descriptor, address(this));
+    }
+
+
+    function deposit(uint256 amount) public {
+        require(AGI.transferFrom(msg.sender, this, amount));
+
+        Deposited(msg.sender,amount);
+    }
+
+    function withdraw() public {
+        require(msg.sender == payee);
+        require(status == 1);
+        uint256 balance = AGI.balanceOf(this);
+        require(AGI.transfer(msg.sender, balance));
+        Withdrew(msg.sender, balance);
+    }
+}

contracts/market/Job.sol

@@ -6,12 +6,10 @@ import "./JobValidator.sol";
  */
 contract Job is JobValidator {
 
-     /**
-    * @dev Kovan AGI token.
-    * https://kovan.etherscan.io/token/0x3b226ff6aad7851d3263e53cb7688d13a07f6e81#readContract
-    * ERC20Basic public constant AGI = ERC20Basic(0x3b226ff6aad7851d3263e53cb7688d13a07f6e81);
-    */  
-
+    /**
+     * @dev Who can set the result
+     */
+     address provider;
     /**
      * @dev Cost in AGI for the exection of the job
      * (10**8 cogs === 1 AGI)
@@ -23,31 +21,12 @@ contract Job is JobValidator {
      */
     event Started(address indexed payer, address indexed payee, bytes32 descriptor, address job);
 
-     /**
-      * @dev Job constructor.
-      * @param _payer An agent who pays the job.
-      * @param _payee An agent to whom the job is paid.
-      * @param _cost Cost in AGI
-      */
-    function Job(address _payer, address _payee, bytes32 _descriptor, uint256 _cost, uint256 _reward) public {
-
-        payer = _payer;
-        payee = _payee;
-        descriptor = _descriptor;
-        cost = _cost;
-        reward = _reward;
-
-        start = now;
-
-        Started(payer, payee, descriptor, address(this));
-    }
-
     /**
      * @dev Set result of this Job
      * @param _result Result data hash
      */
     function setResult(bytes32 _result) public returns (bool) {
-        require(msg.sender == payee);
+        require(msg.sender == provider);
         require(descriptor.length > 0);
 
         end = now;
@@ -60,6 +39,16 @@ contract Job is JobValidator {
         return true;
     }
 
+    /**
+     * @dev The payee can change the provider address
+     * @param _provider New provider
+     */
+     function setProvider(address _provider) public returns(bool) {
+         require(msg.sender == payee);
+         provider = _provider;
+         return true;
+     }
+
 
 
 }

test/TestJob.js

@@ -1,12 +1,11 @@
-const Job = artifacts.require('market/Job.sol')
+const Escrow = artifacts.require('market/Escrow.sol')
 
 
-contract('Job', function ([payee, payer]) {
+contract('Escrow', function ([payee, payer]) {
 
   beforeEach(async () => {
     const jobDescriptor = "0x0"
-    this.job = await Job.new(payer, payee, jobDescriptor, 800, 0)
-    console.log(this.job)
+    this.job = await Escrow.new(payer, payee, jobDescriptor, 800, 0)
   })
 
 
@@ -20,7 +19,7 @@ contract('Job', function ([payee, payer]) {
 
     const found2 = result.logs.find(e => e.event === 'Completed')
     assert.strictEqual(found2.event, 'Completed', 'Completed event not fired')
-    
+
   })