From 568707116287be83b59063a0f711e90ef1e29db8 Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Thu, 15 Mar 2018 11:30:02 +0530
Subject: [PATCH 1/4] [BA-794] Feature: Bundle app

---
 ui/contracts/MasterContract.sol | 11 +++++++++++
 ui/initfile.json                |  7 +++++++
 ui/package.json                 |  8 +++++---
 ui/public/index.html            |  1 +
 ui/scripts/create-metadata.js   | 22 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 ui/contracts/MasterContract.sol
 create mode 100644 ui/initfile.json
 create mode 100644 ui/scripts/create-metadata.js

diff --git a/ui/contracts/MasterContract.sol b/ui/contracts/MasterContract.sol
new file mode 100644
index 0000000..c3326cf
--- /dev/null
+++ b/ui/contracts/MasterContract.sol
@@ -0,0 +1,11 @@
+contract MasterContract {
+  uint public storedData;
+
+  function MasterContract() {
+    storedData = 2;
+  }
+
+  function setToFour(){
+    storedData = 4;
+  }
+}
diff --git a/ui/initfile.json b/ui/initfile.json
new file mode 100644
index 0000000..0d3ee81
--- /dev/null
+++ b/ui/initfile.json
@@ -0,0 +1,7 @@
+{
+    "masterContract": {
+      "contractName": "MasterContract",
+        "contractFilename": "contracts/MasterContract.sol",
+        "args": {}
+    }
+}
\ No newline at end of file
diff --git a/ui/package.json b/ui/package.json
index f2517ca..a6e81ad 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,5 +1,6 @@
 {
   "name": "ui",
+  "author": "BlockApps Inc",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -22,7 +23,8 @@
   "devDependencies": {
     "node-sass": "^4.5.2",
     "npm-run-all": "^4.0.2",
-    "react-scripts": "0.9.5"
+    "react-scripts": "0.9.5",
+    "read-package-json": "^2.0.13"
   },
   "scripts": {
     "build-css": "node-sass src/ -o src/",
@@ -32,8 +34,8 @@
     "start:back": "npm-run-all -p watch-css start-js > stdout.text 2> stderr.txt &",
     "start-js-windows": "react-scripts start",
     "start-windows": "npm-run-all -p watch-css start-js-windows",
-    "build": "npm run build-css && react-scripts build",
+    "build": "npm run build-css && react-scripts build && cp initfile.json ./build && node scripts/create-metadata.js && cp -a contracts ./build && cd build && zip -r app.zip *",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
-}
\ No newline at end of file
+}
diff --git a/ui/public/index.html b/ui/public/index.html
index 6cdc656..4280d28 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -6,6 +6,7 @@
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <script src="addresses.js"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tag above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/ui/scripts/create-metadata.js b/ui/scripts/create-metadata.js
new file mode 100644
index 0000000..ff0f547
--- /dev/null
+++ b/ui/scripts/create-metadata.js
@@ -0,0 +1,22 @@
+const readJson = require('read-package-json');
+const fs = require('fs');
+
+readJson('package.json', (err, data) => {
+  if (err) {
+    console.log('Could not read package.json', err);
+    return;
+  }
+
+  const metadata = {
+    name: data.name,
+    description: data.description,
+    maintainer: data.author.name,
+    version: data.version,
+  };
+
+  fs.writeFile('build/metadata.json',JSON.stringify(metadata,null,2), 'utf8', (err) => {
+    if(err) {
+      console.log('Failed to write metadata.json', err);
+    }
+  });
+});

From b62f675bf2b68178ecdd5db86a6f5f6a4c908022 Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Tue, 20 Mar 2018 19:45:29 +0530
Subject: [PATCH 2/4] [BA-794] Replace browserHistory with hashHistory

---
 ui/package.json                                               | 1 +
 ui/src/components/App/components/UserBadge/user-badge.saga.js | 4 ++--
 ui/src/components/EnsureAuthenticated/index.js                | 4 ++--
 ui/src/index.js                                               | 4 ++--
 ui/src/scenes/Login/login.saga.js                             | 4 ++--
 ui/src/scenes/Projects/components/BidModal/bidModal.saga.js   | 4 ++--
 .../Bids/components/BidTable/sagas/acceptBid.saga.js          | 4 ++--
 ui/src/scenes/Projects/components/Project/index.js            | 4 ++--
 .../Projects/components/Project/sagas/project-event.saga.js   | 4 ++--
 .../components/ProjectCreate/sagas/project-create.saga.js     | 4 ++--
 ui/src/scenes/Projects/components/ProjectList/index.js        | 4 ++--
 ui/src/scenes/Projects/index.js                               | 4 ++--
 12 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index a6e81ad..db8425d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -3,6 +3,7 @@
   "author": "BlockApps Inc",
   "version": "0.1.0",
   "private": true,
+  "homepage": ".",
   "dependencies": {
     "mixpanel-browser": "^2.11.1",
     "react": "15.5.4",
diff --git a/ui/src/components/App/components/UserBadge/user-badge.saga.js b/ui/src/components/App/components/UserBadge/user-badge.saga.js
index 02313e5..da7cf80 100644
--- a/ui/src/components/App/components/UserBadge/user-badge.saga.js
+++ b/ui/src/components/App/components/UserBadge/user-badge.saga.js
@@ -4,7 +4,7 @@ import {
   userBalanceSuccess,
   userBalanceFailure
 } from './user-badge.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL, API_MOCK } from '../../../../environment';
 import { handleApiError } from '../../../../lib/apiErrorHandler';
 
@@ -47,7 +47,7 @@ function* submitGetBalance(action) {
   {
     yield put(userBalanceFailure(err));
   }
-  browserHistory.push('/projects');
+  hashHistory.push('/projects');
 }
 
 export default function* watchBalanceSubmit() {
diff --git a/ui/src/components/EnsureAuthenticated/index.js b/ui/src/components/EnsureAuthenticated/index.js
index 18168bd..572a088 100644
--- a/ui/src/components/EnsureAuthenticated/index.js
+++ b/ui/src/components/EnsureAuthenticated/index.js
@@ -1,11 +1,11 @@
 import { Component } from 'react';
 import { connect } from 'react-redux';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 
 class EnsureAuthenticated extends Component {
   componentDidMount() {
     if(!this.props.authenticated) {
-      browserHistory.replace('/login');
+      hashHistory.replace('/login');
     }
   }
 
diff --git a/ui/src/index.js b/ui/src/index.js
index 142d5a3..f0b66dc 100644
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, browserHistory } from 'react-router';
+import { Router, hashHistory } from 'react-router';
 import routes from './routes';
 import { Provider } from 'react-redux';
 import { syncHistoryWithStore } from 'react-router-redux';
@@ -9,7 +9,7 @@ import './index.css';
 import { IntlProvider } from 'react-intl'
 
 const store = configureStore();
-const history = syncHistoryWithStore(browserHistory, store);
+const history = syncHistoryWithStore(hashHistory, store);
 
 ReactDOM.render(
   <Provider store={store}>
diff --git a/ui/src/scenes/Login/login.saga.js b/ui/src/scenes/Login/login.saga.js
index d087187..41f7d3e 100644
--- a/ui/src/scenes/Login/login.saga.js
+++ b/ui/src/scenes/Login/login.saga.js
@@ -4,7 +4,7 @@ import {
   userLoginSuccess,
   userLoginFailure
 } from './login.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL, API_MOCK } from '../../environment';
 import { handleApiError } from '../../lib/apiErrorHandler';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
@@ -59,7 +59,7 @@ function* submitLogin(action) {
     yield put(userLoginFailure(err));
     yield put(hideLoading());
   }
-  browserHistory.push('/projects');
+  hashHistory.push('/projects');
 }
 
 export default function* watchLoginSubmit() {
diff --git a/ui/src/scenes/Projects/components/BidModal/bidModal.saga.js b/ui/src/scenes/Projects/components/BidModal/bidModal.saga.js
index 656a3ed..c281329 100644
--- a/ui/src/scenes/Projects/components/BidModal/bidModal.saga.js
+++ b/ui/src/scenes/Projects/components/BidModal/bidModal.saga.js
@@ -4,7 +4,7 @@ import {
   bidSuccess,
   bidFailure
 } from './bidModal.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL, API_MOCK } from '../../../../environment';
 import { handleApiError } from '../../../../lib/apiErrorHandler';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
@@ -54,7 +54,7 @@ function* submitBid(action){
     yield put(hideLoading());
     yield put(bidSuccess());
     yield put(setUserMessage('Bid Success'));
-    browserHistory.goBack();
+    hashHistory.goBack();
   }
   catch(err) {
     yield put(hideLoading());
diff --git a/ui/src/scenes/Projects/components/Project/components/Bids/components/BidTable/sagas/acceptBid.saga.js b/ui/src/scenes/Projects/components/Project/components/Bids/components/BidTable/sagas/acceptBid.saga.js
index 98dfbeb..bbf0907 100644
--- a/ui/src/scenes/Projects/components/Project/components/Bids/components/BidTable/sagas/acceptBid.saga.js
+++ b/ui/src/scenes/Projects/components/Project/components/Bids/components/BidTable/sagas/acceptBid.saga.js
@@ -6,7 +6,7 @@ import {
   acceptBidSuccess,
   acceptBidFailure
 } from '../actions/acceptBid.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL, API_MOCK } from '../../../../../../../../../environment';
 import { handleApiError } from '../../../../../../../../../lib/apiErrorHandler';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
@@ -49,7 +49,7 @@ function* acceptBid(action){
     yield put(acceptBidSuccess());
     yield put(userBalanceSubmit(action.username));
     yield put(setUserMessage('Bid Accepted'));
-    browserHistory.goBack(); // todo: update current project data on the page instead?
+    hashHistory.goBack(); // todo: update current project data on the page instead?
   }
   catch(err) {
     yield put(acceptBidFailure(err));
diff --git a/ui/src/scenes/Projects/components/Project/index.js b/ui/src/scenes/Projects/components/Project/index.js
index 30e6c1a..9cfabbb 100644
--- a/ui/src/scenes/Projects/components/Project/index.js
+++ b/ui/src/scenes/Projects/components/Project/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import Button from 'react-md/lib/Buttons/Button';
 import Chip from 'react-md/lib/Chips';
 import Toolbar from 'react-md/lib/Toolbars';
@@ -118,7 +118,7 @@ class Project extends Component {
           onClick={(e) => {
             e.stopPropagation();
             mixpanel.track('home_click');
-            browserHistory.push('/projects');
+            hashHistory.push('/projects');
           }
           }>
           home
diff --git a/ui/src/scenes/Projects/components/Project/sagas/project-event.saga.js b/ui/src/scenes/Projects/components/Project/sagas/project-event.saga.js
index 2e5a71b..57d2781 100644
--- a/ui/src/scenes/Projects/components/Project/sagas/project-event.saga.js
+++ b/ui/src/scenes/Projects/components/Project/sagas/project-event.saga.js
@@ -6,7 +6,7 @@ import {
   projectEventSuccess,
   projectEventFailure
 } from '../actions/project-event.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL, API_MOCK } from '../../../../../environment';
 import { handleApiError } from '../../../../../lib/apiErrorHandler';
 import { PROJECT_EVENTS } from '../../../../../constants';
@@ -52,7 +52,7 @@ function* projectEvent(action){
     yield put(userBalanceSubmit(action.username));
     yield put(hideLoading());
     yield put(setUserMessage('Item ' + PROJECT_EVENTS[action.projectEvent]));
-    browserHistory.goBack(); // todo: update current project data on the page instead?
+    hashHistory.goBack(); // todo: update current project data on the page instead?
   }
   catch(err) {
     yield put(projectEventFailure(err));
diff --git a/ui/src/scenes/Projects/components/ProjectCreate/sagas/project-create.saga.js b/ui/src/scenes/Projects/components/ProjectCreate/sagas/project-create.saga.js
index 7b10c00..0d4b8f8 100644
--- a/ui/src/scenes/Projects/components/ProjectCreate/sagas/project-create.saga.js
+++ b/ui/src/scenes/Projects/components/ProjectCreate/sagas/project-create.saga.js
@@ -4,7 +4,7 @@ import {
   projectCreateSuccess,
   projectCreateFailure
 } from '../actions/project-create.actions';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { API_URL } from '../../../../../environment';
 import { handleApiError } from '../../../../../lib/apiErrorHandler';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
@@ -38,7 +38,7 @@ function* submitProjectCreate(action) {
     if(response.data.project) {
       yield put(projectCreateSuccess(response.data.project));
       yield put(setUserMessage('Contract Created Successfully'));
-      browserHistory.push('/projects');
+      hashHistory.push('/projects');
       yield put(setUserMessage('Contract Created Successfully'));
     }
   }
diff --git a/ui/src/scenes/Projects/components/ProjectList/index.js b/ui/src/scenes/Projects/components/ProjectList/index.js
index 20ca579..1d1c6d6 100644
--- a/ui/src/scenes/Projects/components/ProjectList/index.js
+++ b/ui/src/scenes/Projects/components/ProjectList/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { FormattedNumber, FormattedDate } from 'react-intl';
 
 import Card from 'react-md/lib/Cards/Card';
@@ -25,7 +25,7 @@ class ProjectList extends Component {
   handleProjectClick = function (e, projectName) {
     e.stopPropagation();
     mixpanel.track('project_click');
-    browserHistory.push(`/projects/${encodeURI(projectName)}`);
+    hashHistory.push(`/projects/${encodeURI(projectName)}`);
   };
 
   render() {
diff --git a/ui/src/scenes/Projects/index.js b/ui/src/scenes/Projects/index.js
index 1c64e69..bc79110 100644
--- a/ui/src/scenes/Projects/index.js
+++ b/ui/src/scenes/Projects/index.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { browserHistory } from 'react-router';
+import { hashHistory } from 'react-router';
 import { connect } from 'react-redux';
 import Button from 'react-md/lib/Buttons/Button';
 import Toolbar from 'react-md/lib/Toolbars';
@@ -12,7 +12,7 @@ class Projects extends Component {
   handleNewProjectClick = function(e) {
     e.stopPropagation();
     mixpanel.track('create_project_modal_click');
-    browserHistory.push(`/projects/create`);
+    hashHistory.push(`/projects/create`);
   };
 
   // TODO: move to common place

From 75252c4c4506cf57d085072f556c298636cdd698 Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Mon, 26 Mar 2018 14:51:55 +0530
Subject: [PATCH 3/4] [BA-794] Initialized all contracts

---
 ui/contracts/AdminInterface.sol |  19 +++++
 ui/contracts/Bid.sol            |  55 +++++++++++++
 ui/contracts/BidState.sol       |   9 +++
 ui/contracts/ErrorCodes.sol     |  12 +++
 ui/contracts/MasterContract.sol |  11 ---
 ui/contracts/Project.sol        |  84 +++++++++++++++++++
 ui/contracts/ProjectEvent.sol   |   9 +++
 ui/contracts/ProjectManager.sol | 139 ++++++++++++++++++++++++++++++++
 ui/contracts/ProjectState.sol   |  10 +++
 ui/contracts/User.sol           |  28 +++++++
 ui/contracts/UserManager.sol    |  54 +++++++++++++
 ui/contracts/UserRole.sol       |   9 +++
 ui/contracts/Util.sol           |  14 ++++
 ui/contracts/Version.sol        |   3 +
 ui/initfile.json                |  85 ++++++++++++++++++-
 15 files changed, 527 insertions(+), 14 deletions(-)
 create mode 100644 ui/contracts/AdminInterface.sol
 create mode 100644 ui/contracts/Bid.sol
 create mode 100644 ui/contracts/BidState.sol
 create mode 100644 ui/contracts/ErrorCodes.sol
 delete mode 100644 ui/contracts/MasterContract.sol
 create mode 100644 ui/contracts/Project.sol
 create mode 100644 ui/contracts/ProjectEvent.sol
 create mode 100644 ui/contracts/ProjectManager.sol
 create mode 100644 ui/contracts/ProjectState.sol
 create mode 100644 ui/contracts/User.sol
 create mode 100644 ui/contracts/UserManager.sol
 create mode 100644 ui/contracts/UserRole.sol
 create mode 100644 ui/contracts/Util.sol
 create mode 100644 ui/contracts/Version.sol

diff --git a/ui/contracts/AdminInterface.sol b/ui/contracts/AdminInterface.sol
new file mode 100644
index 0000000..a63ef73
--- /dev/null
+++ b/ui/contracts/AdminInterface.sol
@@ -0,0 +1,19 @@
+import "./UserManager.sol";
+import "./ProjectManager.sol";
+
+/**
+  * Interface to global contracts
+*/
+contract AdminInterface {
+  // NOTE: variable name must match contract name
+  UserManager public userManager;
+  ProjectManager public projectManager;
+
+  /**
+    * Constructor. Initialize global contracts and pointers
+  */
+  function AdminInterface() {
+    userManager = new UserManager();
+    projectManager = new ProjectManager();
+  }
+}
diff --git a/ui/contracts/Bid.sol b/ui/contracts/Bid.sol
new file mode 100644
index 0000000..d767c53
--- /dev/null
+++ b/ui/contracts/Bid.sol
@@ -0,0 +1,55 @@
+import "./ErrorCodes.sol";
+import "./BidState.sol";
+
+/**
+ * Bid data contract
+ */
+contract Bid is ErrorCodes, BidState {
+  // NOTE: members must be public to be indexed for search
+  uint public id;
+  string public name;
+  string public supplier;
+  uint public amount;
+  BidState public state;
+
+  function Bid(uint _id, string _name, string _supplier, uint _amount) {
+    id = _id;
+    name = _name;
+    supplier = _supplier;
+    amount = _amount;
+    state = BidState.OPEN;
+  }
+
+  function getState() returns (BidState) {
+    return state;
+  }
+
+  function setState(BidState _state) {
+    state = _state;
+  }
+
+  function setBidState(BidState newState) payable returns (ErrorCodes) {
+    if (state == BidState.OPEN  &&  newState == BidState.ACCEPTED) {
+      setState(newState);
+      return ErrorCodes.SUCCESS;
+    }
+    if (state == BidState.OPEN  &&  newState == BidState.REJECTED) {
+      setState(newState);
+      return ErrorCodes.SUCCESS;
+    }
+    return ErrorCodes.ERROR;
+  }
+
+  function settle(address supplierAddress) returns (ErrorCodes) {
+    // confirm balance, to return error
+    if (this.balance < amount) {
+      return ErrorCodes.INSUFFICIENT_BALANCE;
+    }
+    uint fee = 10000000 wei; // supplier absorbs the fee
+    uint amountWei = amount * 1 ether;
+
+    // transfer will throw
+    supplierAddress.send(amountWei-fee);
+    return ErrorCodes.SUCCESS;
+  }
+}
diff --git a/ui/contracts/BidState.sol b/ui/contracts/BidState.sol
new file mode 100644
index 0000000..34943e0
--- /dev/null
+++ b/ui/contracts/BidState.sol
@@ -0,0 +1,9 @@
+contract BidState {
+
+    enum BidState {
+        NULL,
+        OPEN,
+        ACCEPTED,
+        REJECTED
+    }
+}
diff --git a/ui/contracts/ErrorCodes.sol b/ui/contracts/ErrorCodes.sol
new file mode 100644
index 0000000..a25a585
--- /dev/null
+++ b/ui/contracts/ErrorCodes.sol
@@ -0,0 +1,12 @@
+contract ErrorCodes {
+
+    enum ErrorCodes {
+        NULL,
+        SUCCESS,
+        ERROR,
+        NOT_FOUND,
+        EXISTS,
+        RECURSIVE,
+        INSUFFICIENT_BALANCE
+    }
+}
diff --git a/ui/contracts/MasterContract.sol b/ui/contracts/MasterContract.sol
deleted file mode 100644
index c3326cf..0000000
--- a/ui/contracts/MasterContract.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract MasterContract {
-  uint public storedData;
-
-  function MasterContract() {
-    storedData = 2;
-  }
-
-  function setToFour(){
-    storedData = 4;
-  }
-}
diff --git a/ui/contracts/Project.sol b/ui/contracts/Project.sol
new file mode 100644
index 0000000..a431740
--- /dev/null
+++ b/ui/contracts/Project.sol
@@ -0,0 +1,84 @@
+import "./ErrorCodes.sol";
+import "./ProjectState.sol";
+
+/*
+
+{
+    created: '2017-05-09T16:47:49.016Z',
+    buyer: 'buyer1',
+    name: 'T-Shirts with logo',
+    description: 'The T-Shirts with our company\'s logo on the chest, Qty: 50',
+    priceDesired: 800.10,
+    desiredDeliveryDate: '2017-05-20T16:47:49.016Z',
+    addressStreet: '109 S 5th street',
+    addresscity: 'Brooklyn',
+    addressstate: 'New York',
+    addresszip: '11249',
+    spec: 'Lorem ipsum dolor sit amet, eam molestie singulis referrentur',
+    state: 'OPEN',
+    deliveredDate: null // filled when the 'RECEIVED' button clicked
+  }
+*/
+
+/**
+ * Project data contract
+ */
+contract Project is ErrorCodes, ProjectState {
+  // NOTE: members must be public to be indexed for search
+  string public name;
+  string public buyer;
+  string public description;
+  string public spec;
+  uint public price; // in cents
+
+  uint public created; // date
+  uint public targetDelivery; // date
+  uint public delivered; // date
+
+  string public addressStreet;
+  string public addressCity;
+  string public addressState;
+  string public addressZip;
+
+  ProjectState public state;
+
+  function Project(
+    string _name,
+    string _buyer,
+    string _description,
+    string _spec,
+    uint _price,
+    uint _created,
+    uint _targetDelivery
+  ) {
+    name = _name;
+    buyer = _buyer;
+    description = _description;
+    spec = _spec;
+    price = _price;
+    created = _created;
+    targetDelivery = _targetDelivery;
+
+    state = ProjectState.OPEN;
+  }
+
+  function setShippingAddress(
+    string _addressStreet,
+    string _addressCity,
+    string _addressState,
+    string _addressZip
+  ) {
+    addressStreet = _addressStreet;
+    addressCity = _addressCity;
+    addressState = _addressState;
+    addressZip = _addressZip;
+  }
+
+  function getState() returns (ProjectState) {
+    return state;
+  }
+
+  function setState(ProjectState _state) {
+    state = _state;
+  }
+}
diff --git a/ui/contracts/ProjectEvent.sol b/ui/contracts/ProjectEvent.sol
new file mode 100644
index 0000000..9e27614
--- /dev/null
+++ b/ui/contracts/ProjectEvent.sol
@@ -0,0 +1,9 @@
+contract ProjectEvent {
+
+    enum ProjectEvent {
+        NULL,
+        ACCEPT,
+        DELIVER,
+        RECEIVE
+    }
+}
diff --git a/ui/contracts/ProjectManager.sol b/ui/contracts/ProjectManager.sol
new file mode 100644
index 0000000..a83fa0c
--- /dev/null
+++ b/ui/contracts/ProjectManager.sol
@@ -0,0 +1,139 @@
+import "./Project.sol";
+import "./ProjectState.sol";
+import "./ProjectEvent.sol";
+import "./bid/contracts/Bid.sol";
+import "./bid/contracts/BidState.sol";
+import "./common/ErrorCodes.sol";
+import "./common/Util.sol";
+
+/**
+* Interface for Project data contracts
+*/
+contract ProjectManager is ErrorCodes, Util, ProjectState, ProjectEvent, BidState {
+
+  Project[] projects;
+  uint bidId; // unique identifier for bids
+
+  /*
+    note on mapping to array index:
+    a non existing mapping will return 0, so 0 should not be a valid value in a map,
+    otherwise exists() will not work
+  */
+  mapping (bytes32 => uint) nameToIndexMap;
+
+  /**
+  * Constructor
+  */
+  function ProjectManager() {
+    projects.length = 1; // see above note
+    bidId = block.number;
+  }
+
+  function exists(string name) returns (bool) {
+    return nameToIndexMap[b32(name)] != 0;
+  }
+
+  function getProject(string name) returns (address) {
+    uint index = nameToIndexMap[b32(name)];
+    return projects[index];
+  }
+
+  /*
+  string addressStreet,
+  string addressCity,
+  string addressState,
+  string addressZip
+  */
+  //      addressStreet,
+  //      addressCity,
+  //      addressState,
+  //      addressZip
+
+  function createProject(
+    string name,
+    string buyer,
+    string description,
+    string spec,
+    uint price,
+    uint created,
+    uint targetDelivery
+  ) returns (ErrorCodes) {
+    // name must be < 32 bytes
+    if (bytes(name).length > 32) return ErrorCodes.ERROR;
+    // fail if username exists
+    if (exists(name)) return ErrorCodes.EXISTS;
+    // add project
+    uint index = projects.length;
+    nameToIndexMap[b32(name)] = index;
+    projects.push(new Project(
+      name,
+      buyer,
+      description,
+      spec,
+      price,
+      created,
+      targetDelivery
+    ));
+    return ErrorCodes.SUCCESS;
+  }
+
+  function createBid(string name, string supplier, uint amount) returns (ErrorCodes, uint) {
+    // fail if project name not found
+    if (!exists(name)) return (ErrorCodes.NOT_FOUND, 0);
+    // create bid
+    bidId++; // increment the unique id
+    Bid bid = new Bid(bidId, name, supplier, amount);
+    return (ErrorCodes.SUCCESS, bidId);
+  }
+
+  function settleProject(string name, address supplierAddress, address bidAddress) returns (ErrorCodes) {
+    // validity
+    if (!exists(name)) return (ErrorCodes.NOT_FOUND);
+    // set project state
+    address projectAddress = getProject(name);
+    var (errorCode, state) = handleEvent(projectAddress, ProjectEvent.RECEIVE);
+    if (errorCode != ErrorCodes.SUCCESS) return errorCode;
+    // settle
+    Bid bid = Bid(bidAddress);
+    return bid.settle(supplierAddress);
+  }
+
+  /**
+   * handleEvent - transition project to a new state based on incoming event
+   */
+  function handleEvent(address projectAddress, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
+    Project project = Project(projectAddress);
+    ProjectState state = project.getState();
+    // check transition
+    var (errorCode, newState) = fsm(state, projectEvent);
+    // event is not valid in current state
+    if (errorCode != ErrorCodes.SUCCESS) {
+      return (errorCode, state);
+    }
+    // use the new state
+    project.setState(newState);
+    return (ErrorCodes.SUCCESS, newState);
+  }
+
+  function fsm(ProjectState state, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
+    // NULL
+    if (state == ProjectState.NULL)
+      return (ErrorCodes.ERROR, state);
+    // OPEN
+    if (state == ProjectState.OPEN) {
+      if (projectEvent == ProjectEvent.ACCEPT)
+        return (ErrorCodes.SUCCESS, ProjectState.PRODUCTION);
+    }
+    // PRODUCTION
+    if (state == ProjectState.PRODUCTION) {
+      if (projectEvent == ProjectEvent.DELIVER)
+        return (ErrorCodes.SUCCESS, ProjectState.INTRANSIT);
+    }
+    // INTRANSIT
+    if (state == ProjectState.INTRANSIT) {
+      if (projectEvent == ProjectEvent.RECEIVE)
+        return (ErrorCodes.SUCCESS, ProjectState.RECEIVED);
+    }
+    return (ErrorCodes.ERROR, state);
+  }
+}
diff --git a/ui/contracts/ProjectState.sol b/ui/contracts/ProjectState.sol
new file mode 100644
index 0000000..e4fa8c6
--- /dev/null
+++ b/ui/contracts/ProjectState.sol
@@ -0,0 +1,10 @@
+contract ProjectState {
+
+    enum ProjectState {
+        NULL,
+        OPEN,
+        PRODUCTION,
+        INTRANSIT,
+        RECEIVED
+    }
+}
diff --git a/ui/contracts/User.sol b/ui/contracts/User.sol
new file mode 100644
index 0000000..0688789
--- /dev/null
+++ b/ui/contracts/User.sol
@@ -0,0 +1,28 @@
+import "./common/ErrorCodes.sol";
+import "./common/Version.sol";
+import "./UserRole.sol";
+
+/**
+ * User data contract
+ */
+contract User is ErrorCodes, Version, UserRole {
+  // NOTE: members must be public to be indexed for search
+  address public account = 0x1234;
+  string public username;
+  bytes32 public pwHash;
+  uint public id;
+  UserRole public role;
+
+  function User(address _account, string _username, bytes32 _pwHash, uint _id, UserRole _role) {
+    account = _account;
+    username = _username;
+    pwHash = _pwHash;
+    id = _id;
+    role = _role;
+    version = 1;
+  }
+
+  function authenticate(bytes32 _pwHash) returns (bool) {
+    return pwHash == _pwHash;
+  }
+}
diff --git a/ui/contracts/UserManager.sol b/ui/contracts/UserManager.sol
new file mode 100644
index 0000000..6c42165
--- /dev/null
+++ b/ui/contracts/UserManager.sol
@@ -0,0 +1,54 @@
+import "./User.sol";
+import "./UserRole.sol";
+import "./common/ErrorCodes.sol";
+import "./common/Util.sol";
+
+/**
+* Interface for User data contracts
+*/
+contract UserManager is ErrorCodes, Util, UserRole {
+  User[] users;
+  /*
+    note on mapping to array index:
+    a non existing mapping will return 0, so 0 should not be a valid value in a map,
+    otherwise exists() will not work
+  */
+  mapping (bytes32 => uint) usernameToIdMap;
+
+  /**
+  * Constructor
+  */
+  function UserManager() {
+    users.length = 1; // see above note
+  }
+
+  function exists(string username) returns (bool) {
+    return usernameToIdMap[b32(username)] != 0;
+  }
+
+  function getUser(string username) returns (address) {
+    uint userId = usernameToIdMap[b32(username)];
+    return users[userId];
+  }
+
+  function createUser(address account, string username, bytes32 pwHash, UserRole role) returns (ErrorCodes) {
+    // name must be < 32 bytes
+    if (bytes(username).length > 32) return ErrorCodes.ERROR;
+    // fail if username exists
+    if (exists(username)) return ErrorCodes.EXISTS;
+    // add user
+    uint userId = users.length;
+    usernameToIdMap[b32(username)] = userId;
+    users.push(new User(account, username, pwHash, userId, role));
+    return ErrorCodes.SUCCESS;
+  }
+
+  function login(string username, bytes32 pwHash) returns (bool) {
+    // fail if username doesnt exists
+    if (!exists(username)) return false;
+    // get the user
+    address a = getUser(username);
+    User user = User(a);
+    return user.authenticate(pwHash);
+  }
+}
diff --git a/ui/contracts/UserRole.sol b/ui/contracts/UserRole.sol
new file mode 100644
index 0000000..47687f5
--- /dev/null
+++ b/ui/contracts/UserRole.sol
@@ -0,0 +1,9 @@
+contract UserRole {
+
+    enum UserRole {
+        NULL,
+        ADMIN,
+        BUYER,
+        SUPPLIER
+    }
+}
diff --git a/ui/contracts/Util.sol b/ui/contracts/Util.sol
new file mode 100644
index 0000000..56bf66f
--- /dev/null
+++ b/ui/contracts/Util.sol
@@ -0,0 +1,14 @@
+/**
+ * Util contract
+ */
+contract Util {
+  function stringToBytes32(string memory source) returns (bytes32 result) {
+      assembly {
+          result := mload(add(source, 32))
+      }
+  }
+
+  function b32(string memory source) returns (bytes32) {
+    return stringToBytes32(source);
+  }
+}
diff --git a/ui/contracts/Version.sol b/ui/contracts/Version.sol
new file mode 100644
index 0000000..61c74bc
--- /dev/null
+++ b/ui/contracts/Version.sol
@@ -0,0 +1,3 @@
+contract Version {
+  uint version;
+}
diff --git a/ui/initfile.json b/ui/initfile.json
index 0d3ee81..cfc0eb0 100644
--- a/ui/initfile.json
+++ b/ui/initfile.json
@@ -1,7 +1,86 @@
 {
-    "masterContract": {
-      "contractName": "MasterContract",
-        "contractFilename": "contracts/MasterContract.sol",
+    "adminInterface": {
+      "contractName": "AdminInterface",
+        "contractFilename": "contracts/AdminInterface.sol",
+        "args": {}
+    },
+    "bid": {
+      "contractName": "Bid",
+        "contractFilename": "contracts/Bid.sol",
+        "args": {
+          "_id": "1000000000",
+          "_name": "ABC",
+          "_supplier": "XYZ",
+          "_amount": "1000"
+        }
+    },
+    "bidState": {
+      "contractName": "BidState",
+        "contractFilename": "contracts/BidState.sol",
+        "args": {}
+    },
+    "errorCodes": {
+      "contractName": "ErrorCodes",
+        "contractFilename": "contracts/ErrorCodes.sol",
+        "args": {}
+    },
+    "project": {
+      "contractName": "Project",
+        "contractFilename": "contracts/Project.sol",
+        "args": {
+          "_name": "ABC",
+          "_buyer": "XYZ",
+          "_description": "DEFG",
+          "_spec": "HIJ",
+          "_price": "1000",
+          "_created": "1281930090",
+          "_targetDelivery": "1681930090"
+        }
+    },
+    "projectEvent": {
+      "contractName": "ProjectEvent",
+        "contractFilename": "contracts/ProjectEvent.sol",
+        "args": {}
+    },
+    "projectManager": {
+      "contractName": "ProjectManager",
+        "contractFilename": "contracts/ProjectManager.sol",
+        "args": {}
+    },
+    "projectState": {
+      "contractName": "ProjectState",
+        "contractFilename": "contracts/ProjectState.sol",
+        "args": {}
+    },
+    "user": {
+      "contractName": "User",
+        "contractFilename": "contracts/User.sol",
+        "args": {
+          "_account": "78fcb4b5c16e83d63866f0b82544cdf475710075",
+          "_username": "ABC",
+          "_pwHash": "qiyh4XPJGsOZ2MEAyLkfWqeQ",
+          "_id": "1000000000",
+          "_role": "ADMIN"
+        }
+    },
+    "userManager": {
+      "contractName": "UserManager",
+        "contractFilename": "contracts/UserManager.sol",
+        "args": {}
+    },
+    "userRole": {
+      "contractName": "UserRole",
+        "contractFilename": "contracts/UserRole.sol",
+        "args": {}
+    },
+    "util": {
+      "contractName": "Util",
+        "contractFilename": "contracts/Util.sol",
+        "args": {}
+    },
+    "version": {
+      "contractName": "Version",
+        "contractFilename": "contracts/Version.sol",
         "args": {}
     }
 }
\ No newline at end of file

From 3b6a0c8480f682ad8e89118fc37a8a45f6fe914d Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Wed, 28 Mar 2018 16:10:16 +0530
Subject: [PATCH 4/4] [BA-794] Added: All contracts in one file

---
 ui/contracts/AdminInterface.sol |  19 --
 ui/contracts/Bid.sol            |  55 ----
 ui/contracts/BidState.sol       |   9 -
 ui/contracts/BlockApps.sol      | 432 ++++++++++++++++++++++++++++++++
 ui/contracts/ErrorCodes.sol     |  12 -
 ui/contracts/Project.sol        |  84 -------
 ui/contracts/ProjectEvent.sol   |   9 -
 ui/contracts/ProjectManager.sol | 139 ----------
 ui/contracts/ProjectState.sol   |  10 -
 ui/contracts/User.sol           |  28 ---
 ui/contracts/UserManager.sol    |  54 ----
 ui/contracts/UserRole.sol       |   9 -
 ui/contracts/Util.sol           |  14 --
 ui/contracts/Version.sol        |   3 -
 ui/initfile.json                |  96 +++----
 15 files changed, 480 insertions(+), 493 deletions(-)
 delete mode 100644 ui/contracts/AdminInterface.sol
 delete mode 100644 ui/contracts/Bid.sol
 delete mode 100644 ui/contracts/BidState.sol
 create mode 100644 ui/contracts/BlockApps.sol
 delete mode 100644 ui/contracts/ErrorCodes.sol
 delete mode 100644 ui/contracts/Project.sol
 delete mode 100644 ui/contracts/ProjectEvent.sol
 delete mode 100644 ui/contracts/ProjectManager.sol
 delete mode 100644 ui/contracts/ProjectState.sol
 delete mode 100644 ui/contracts/User.sol
 delete mode 100644 ui/contracts/UserManager.sol
 delete mode 100644 ui/contracts/UserRole.sol
 delete mode 100644 ui/contracts/Util.sol
 delete mode 100644 ui/contracts/Version.sol

diff --git a/ui/contracts/AdminInterface.sol b/ui/contracts/AdminInterface.sol
deleted file mode 100644
index a63ef73..0000000
--- a/ui/contracts/AdminInterface.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-import "./UserManager.sol";
-import "./ProjectManager.sol";
-
-/**
-  * Interface to global contracts
-*/
-contract AdminInterface {
-  // NOTE: variable name must match contract name
-  UserManager public userManager;
-  ProjectManager public projectManager;
-
-  /**
-    * Constructor. Initialize global contracts and pointers
-  */
-  function AdminInterface() {
-    userManager = new UserManager();
-    projectManager = new ProjectManager();
-  }
-}
diff --git a/ui/contracts/Bid.sol b/ui/contracts/Bid.sol
deleted file mode 100644
index d767c53..0000000
--- a/ui/contracts/Bid.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-import "./ErrorCodes.sol";
-import "./BidState.sol";
-
-/**
- * Bid data contract
- */
-contract Bid is ErrorCodes, BidState {
-  // NOTE: members must be public to be indexed for search
-  uint public id;
-  string public name;
-  string public supplier;
-  uint public amount;
-  BidState public state;
-
-  function Bid(uint _id, string _name, string _supplier, uint _amount) {
-    id = _id;
-    name = _name;
-    supplier = _supplier;
-    amount = _amount;
-    state = BidState.OPEN;
-  }
-
-  function getState() returns (BidState) {
-    return state;
-  }
-
-  function setState(BidState _state) {
-    state = _state;
-  }
-
-  function setBidState(BidState newState) payable returns (ErrorCodes) {
-    if (state == BidState.OPEN  &&  newState == BidState.ACCEPTED) {
-      setState(newState);
-      return ErrorCodes.SUCCESS;
-    }
-    if (state == BidState.OPEN  &&  newState == BidState.REJECTED) {
-      setState(newState);
-      return ErrorCodes.SUCCESS;
-    }
-    return ErrorCodes.ERROR;
-  }
-
-  function settle(address supplierAddress) returns (ErrorCodes) {
-    // confirm balance, to return error
-    if (this.balance < amount) {
-      return ErrorCodes.INSUFFICIENT_BALANCE;
-    }
-    uint fee = 10000000 wei; // supplier absorbs the fee
-    uint amountWei = amount * 1 ether;
-
-    // transfer will throw
-    supplierAddress.send(amountWei-fee);
-    return ErrorCodes.SUCCESS;
-  }
-}
diff --git a/ui/contracts/BidState.sol b/ui/contracts/BidState.sol
deleted file mode 100644
index 34943e0..0000000
--- a/ui/contracts/BidState.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract BidState {
-
-    enum BidState {
-        NULL,
-        OPEN,
-        ACCEPTED,
-        REJECTED
-    }
-}
diff --git a/ui/contracts/BlockApps.sol b/ui/contracts/BlockApps.sol
new file mode 100644
index 0000000..47f95c1
--- /dev/null
+++ b/ui/contracts/BlockApps.sol
@@ -0,0 +1,432 @@
+contract ErrorCodes {
+
+    enum ErrorCodes {
+        NULL,
+        SUCCESS,
+        ERROR,
+        NOT_FOUND,
+        EXISTS,
+        RECURSIVE,
+        INSUFFICIENT_BALANCE
+    }
+}
+
+contract Version {
+  uint version;
+}
+
+contract UserRole {
+
+    enum UserRole {
+        NULL,
+        ADMIN,
+        BUYER,
+        SUPPLIER
+    }
+}
+
+/**
+ * User data contract
+ */
+contract User is ErrorCodes, Version, UserRole {
+  // NOTE: members must be public to be indexed for search
+  address public account = 0x1234;
+  string public username;
+  bytes32 public pwHash;
+  uint public id;
+  UserRole public role;
+
+  function User(address _account, string _username, bytes32 _pwHash, uint _id, UserRole _role) {
+    account = _account;
+    username = _username;
+    pwHash = _pwHash;
+    id = _id;
+    role = _role;
+    version = 1;
+  }
+
+  function authenticate(bytes32 _pwHash) returns (bool) {
+    return pwHash == _pwHash;
+  }
+}
+
+/**
+ * Util contract
+ */
+contract Util {
+  function stringToBytes32(string memory source) returns (bytes32 result) {
+      assembly {
+          result := mload(add(source, 32))
+      }
+  }
+
+  function b32(string memory source) returns (bytes32) {
+    return stringToBytes32(source);
+  }
+}
+
+/**
+* Interface for User data contracts
+*/
+contract UserManager is ErrorCodes, Util, UserRole {
+  User[] users;
+  /*
+    note on mapping to array index:
+    a non existing mapping will return 0, so 0 should not be a valid value in a map,
+    otherwise exists() will not work
+  */
+  mapping (bytes32 => uint) usernameToIdMap;
+
+  /**
+  * Constructor
+  */
+  function UserManager() {
+    users.length = 1; // see above note
+  }
+
+  function exists(string username) returns (bool) {
+    return usernameToIdMap[b32(username)] != 0;
+  }
+
+  function getUser(string username) returns (address) {
+    uint userId = usernameToIdMap[b32(username)];
+    return users[userId];
+  }
+
+  function createUser(address account, string username, bytes32 pwHash, UserRole role) returns (ErrorCodes) {
+    // name must be < 32 bytes
+    if (bytes(username).length > 32) return ErrorCodes.ERROR;
+    // fail if username exists
+    if (exists(username)) return ErrorCodes.EXISTS;
+    // add user
+    uint userId = users.length;
+    usernameToIdMap[b32(username)] = userId;
+    users.push(new User(account, username, pwHash, userId, role));
+    return ErrorCodes.SUCCESS;
+  }
+
+  function login(string username, bytes32 pwHash) returns (bool) {
+    // fail if username doesnt exists
+    if (!exists(username)) return false;
+    // get the user
+    address a = getUser(username);
+    User user = User(a);
+    return user.authenticate(pwHash);
+  }
+}
+
+contract ProjectState {
+
+    enum ProjectState {
+        NULL,
+        OPEN,
+        PRODUCTION,
+        INTRANSIT,
+        RECEIVED
+    }
+}
+
+/*
+
+{
+    created: '2017-05-09T16:47:49.016Z',
+    buyer: 'buyer1',
+    name: 'T-Shirts with logo',
+    description: 'The T-Shirts with our company\'s logo on the chest, Qty: 50',
+    priceDesired: 800.10,
+    desiredDeliveryDate: '2017-05-20T16:47:49.016Z',
+    addressStreet: '109 S 5th street',
+    addresscity: 'Brooklyn',
+    addressstate: 'New York',
+    addresszip: '11249',
+    spec: 'Lorem ipsum dolor sit amet, eam molestie singulis referrentur',
+    state: 'OPEN',
+    deliveredDate: null // filled when the 'RECEIVED' button clicked
+  }
+*/
+
+/**
+ * Project data contract
+ */
+contract Project is ErrorCodes, ProjectState {
+  // NOTE: members must be public to be indexed for search
+  string public name;
+  string public buyer;
+  string public description;
+  string public spec;
+  uint public price; // in cents
+
+  uint public created; // date
+  uint public targetDelivery; // date
+  uint public delivered; // date
+
+  string public addressStreet;
+  string public addressCity;
+  string public addressState;
+  string public addressZip;
+
+  ProjectState public state;
+
+  function Project(
+    string _name,
+    string _buyer,
+    string _description,
+    string _spec,
+    uint _price,
+    uint _created,
+    uint _targetDelivery
+  ) {
+    name = _name;
+    buyer = _buyer;
+    description = _description;
+    spec = _spec;
+    price = _price;
+    created = _created;
+    targetDelivery = _targetDelivery;
+
+    state = ProjectState.OPEN;
+  }
+
+  function setShippingAddress(
+    string _addressStreet,
+    string _addressCity,
+    string _addressState,
+    string _addressZip
+  ) {
+    addressStreet = _addressStreet;
+    addressCity = _addressCity;
+    addressState = _addressState;
+    addressZip = _addressZip;
+  }
+
+  function getState() returns (ProjectState) {
+    return state;
+  }
+
+  function setState(ProjectState _state) {
+    state = _state;
+  }
+}
+
+contract ProjectEvent {
+
+    enum ProjectEvent {
+        NULL,
+        ACCEPT,
+        DELIVER,
+        RECEIVE
+    }
+}
+
+contract BidState {
+
+    enum BidState {
+        NULL,
+        OPEN,
+        ACCEPTED,
+        REJECTED
+    }
+}
+
+/**
+ * Bid data contract
+ */
+contract Bid is ErrorCodes, BidState {
+  // NOTE: members must be public to be indexed for search
+  uint public id;
+  string public name;
+  string public supplier;
+  uint public amount;
+  BidState public state;
+
+  function Bid(uint _id, string _name, string _supplier, uint _amount) {
+    id = _id;
+    name = _name;
+    supplier = _supplier;
+    amount = _amount;
+    state = BidState.OPEN;
+  }
+
+  function getState() returns (BidState) {
+    return state;
+  }
+
+  function setState(BidState _state) {
+    state = _state;
+  }
+
+  function setBidState(BidState newState) payable returns (ErrorCodes) {
+    if (state == BidState.OPEN  &&  newState == BidState.ACCEPTED) {
+      setState(newState);
+      return ErrorCodes.SUCCESS;
+    }
+    if (state == BidState.OPEN  &&  newState == BidState.REJECTED) {
+      setState(newState);
+      return ErrorCodes.SUCCESS;
+    }
+    return ErrorCodes.ERROR;
+  }
+
+  function settle(address supplierAddress) returns (ErrorCodes) {
+    // confirm balance, to return error
+    if (this.balance < amount) {
+      return ErrorCodes.INSUFFICIENT_BALANCE;
+    }
+    uint fee = 10000000 wei; // supplier absorbs the fee
+    uint amountWei = amount * 1 ether;
+
+    // transfer will throw
+    supplierAddress.send(amountWei-fee);
+    return ErrorCodes.SUCCESS;
+  }
+}
+
+/**
+* Interface for Project data contracts
+*/
+contract ProjectManager is ErrorCodes, Util, ProjectState, ProjectEvent, BidState {
+
+  Project[] projects;
+  uint bidId; // unique identifier for bids
+
+  /*
+    note on mapping to array index:
+    a non existing mapping will return 0, so 0 should not be a valid value in a map,
+    otherwise exists() will not work
+  */
+  mapping (bytes32 => uint) nameToIndexMap;
+
+  /**
+  * Constructor
+  */
+  function ProjectManager() {
+    projects.length = 1; // see above note
+    bidId = block.number;
+  }
+
+  function exists(string name) returns (bool) {
+    return nameToIndexMap[b32(name)] != 0;
+  }
+
+  function getProject(string name) returns (address) {
+    uint index = nameToIndexMap[b32(name)];
+    return projects[index];
+  }
+
+  /*
+  string addressStreet,
+  string addressCity,
+  string addressState,
+  string addressZip
+  */
+  //      addressStreet,
+  //      addressCity,
+  //      addressState,
+  //      addressZip
+
+  function createProject(
+    string name,
+    string buyer,
+    string description,
+    string spec,
+    uint price,
+    uint created,
+    uint targetDelivery
+  ) returns (ErrorCodes) {
+    // name must be < 32 bytes
+    if (bytes(name).length > 32) return ErrorCodes.ERROR;
+    // fail if username exists
+    if (exists(name)) return ErrorCodes.EXISTS;
+    // add project
+    uint index = projects.length;
+    nameToIndexMap[b32(name)] = index;
+    projects.push(new Project(
+      name,
+      buyer,
+      description,
+      spec,
+      price,
+      created,
+      targetDelivery
+    ));
+    return ErrorCodes.SUCCESS;
+  }
+
+  function createBid(string name, string supplier, uint amount) returns (ErrorCodes, uint) {
+    // fail if project name not found
+    if (!exists(name)) return (ErrorCodes.NOT_FOUND, 0);
+    // create bid
+    bidId++; // increment the unique id
+    Bid bid = new Bid(bidId, name, supplier, amount);
+    return (ErrorCodes.SUCCESS, bidId);
+  }
+
+  function settleProject(string name, address supplierAddress, address bidAddress) returns (ErrorCodes) {
+    // validity
+    if (!exists(name)) return (ErrorCodes.NOT_FOUND);
+    // set project state
+    address projectAddress = getProject(name);
+    var (errorCode, state) = handleEvent(projectAddress, ProjectEvent.RECEIVE);
+    if (errorCode != ErrorCodes.SUCCESS) return errorCode;
+    // settle
+    Bid bid = Bid(bidAddress);
+    return bid.settle(supplierAddress);
+  }
+
+  /**
+   * handleEvent - transition project to a new state based on incoming event
+   */
+  function handleEvent(address projectAddress, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
+    Project project = Project(projectAddress);
+    ProjectState state = project.getState();
+    // check transition
+    var (errorCode, newState) = fsm(state, projectEvent);
+    // event is not valid in current state
+    if (errorCode != ErrorCodes.SUCCESS) {
+      return (errorCode, state);
+    }
+    // use the new state
+    project.setState(newState);
+    return (ErrorCodes.SUCCESS, newState);
+  }
+
+  function fsm(ProjectState state, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
+    // NULL
+    if (state == ProjectState.NULL)
+      return (ErrorCodes.ERROR, state);
+    // OPEN
+    if (state == ProjectState.OPEN) {
+      if (projectEvent == ProjectEvent.ACCEPT)
+        return (ErrorCodes.SUCCESS, ProjectState.PRODUCTION);
+    }
+    // PRODUCTION
+    if (state == ProjectState.PRODUCTION) {
+      if (projectEvent == ProjectEvent.DELIVER)
+        return (ErrorCodes.SUCCESS, ProjectState.INTRANSIT);
+    }
+    // INTRANSIT
+    if (state == ProjectState.INTRANSIT) {
+      if (projectEvent == ProjectEvent.RECEIVE)
+        return (ErrorCodes.SUCCESS, ProjectState.RECEIVED);
+    }
+    return (ErrorCodes.ERROR, state);
+  }
+}
+
+
+/**
+  * Interface to global contracts
+*/
+contract AdminInterface {
+  // NOTE: variable name must match contract name
+  UserManager public userManager;
+  ProjectManager public projectManager;
+
+  /**
+    * Constructor. Initialize global contracts and pointers
+  */
+  function AdminInterface() {
+    userManager = new UserManager();
+    projectManager = new ProjectManager();
+  }
+}
diff --git a/ui/contracts/ErrorCodes.sol b/ui/contracts/ErrorCodes.sol
deleted file mode 100644
index a25a585..0000000
--- a/ui/contracts/ErrorCodes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract ErrorCodes {
-
-    enum ErrorCodes {
-        NULL,
-        SUCCESS,
-        ERROR,
-        NOT_FOUND,
-        EXISTS,
-        RECURSIVE,
-        INSUFFICIENT_BALANCE
-    }
-}
diff --git a/ui/contracts/Project.sol b/ui/contracts/Project.sol
deleted file mode 100644
index a431740..0000000
--- a/ui/contracts/Project.sol
+++ /dev/null
@@ -1,84 +0,0 @@
-import "./ErrorCodes.sol";
-import "./ProjectState.sol";
-
-/*
-
-{
-    created: '2017-05-09T16:47:49.016Z',
-    buyer: 'buyer1',
-    name: 'T-Shirts with logo',
-    description: 'The T-Shirts with our company\'s logo on the chest, Qty: 50',
-    priceDesired: 800.10,
-    desiredDeliveryDate: '2017-05-20T16:47:49.016Z',
-    addressStreet: '109 S 5th street',
-    addresscity: 'Brooklyn',
-    addressstate: 'New York',
-    addresszip: '11249',
-    spec: 'Lorem ipsum dolor sit amet, eam molestie singulis referrentur',
-    state: 'OPEN',
-    deliveredDate: null // filled when the 'RECEIVED' button clicked
-  }
-*/
-
-/**
- * Project data contract
- */
-contract Project is ErrorCodes, ProjectState {
-  // NOTE: members must be public to be indexed for search
-  string public name;
-  string public buyer;
-  string public description;
-  string public spec;
-  uint public price; // in cents
-
-  uint public created; // date
-  uint public targetDelivery; // date
-  uint public delivered; // date
-
-  string public addressStreet;
-  string public addressCity;
-  string public addressState;
-  string public addressZip;
-
-  ProjectState public state;
-
-  function Project(
-    string _name,
-    string _buyer,
-    string _description,
-    string _spec,
-    uint _price,
-    uint _created,
-    uint _targetDelivery
-  ) {
-    name = _name;
-    buyer = _buyer;
-    description = _description;
-    spec = _spec;
-    price = _price;
-    created = _created;
-    targetDelivery = _targetDelivery;
-
-    state = ProjectState.OPEN;
-  }
-
-  function setShippingAddress(
-    string _addressStreet,
-    string _addressCity,
-    string _addressState,
-    string _addressZip
-  ) {
-    addressStreet = _addressStreet;
-    addressCity = _addressCity;
-    addressState = _addressState;
-    addressZip = _addressZip;
-  }
-
-  function getState() returns (ProjectState) {
-    return state;
-  }
-
-  function setState(ProjectState _state) {
-    state = _state;
-  }
-}
diff --git a/ui/contracts/ProjectEvent.sol b/ui/contracts/ProjectEvent.sol
deleted file mode 100644
index 9e27614..0000000
--- a/ui/contracts/ProjectEvent.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ProjectEvent {
-
-    enum ProjectEvent {
-        NULL,
-        ACCEPT,
-        DELIVER,
-        RECEIVE
-    }
-}
diff --git a/ui/contracts/ProjectManager.sol b/ui/contracts/ProjectManager.sol
deleted file mode 100644
index a83fa0c..0000000
--- a/ui/contracts/ProjectManager.sol
+++ /dev/null
@@ -1,139 +0,0 @@
-import "./Project.sol";
-import "./ProjectState.sol";
-import "./ProjectEvent.sol";
-import "./bid/contracts/Bid.sol";
-import "./bid/contracts/BidState.sol";
-import "./common/ErrorCodes.sol";
-import "./common/Util.sol";
-
-/**
-* Interface for Project data contracts
-*/
-contract ProjectManager is ErrorCodes, Util, ProjectState, ProjectEvent, BidState {
-
-  Project[] projects;
-  uint bidId; // unique identifier for bids
-
-  /*
-    note on mapping to array index:
-    a non existing mapping will return 0, so 0 should not be a valid value in a map,
-    otherwise exists() will not work
-  */
-  mapping (bytes32 => uint) nameToIndexMap;
-
-  /**
-  * Constructor
-  */
-  function ProjectManager() {
-    projects.length = 1; // see above note
-    bidId = block.number;
-  }
-
-  function exists(string name) returns (bool) {
-    return nameToIndexMap[b32(name)] != 0;
-  }
-
-  function getProject(string name) returns (address) {
-    uint index = nameToIndexMap[b32(name)];
-    return projects[index];
-  }
-
-  /*
-  string addressStreet,
-  string addressCity,
-  string addressState,
-  string addressZip
-  */
-  //      addressStreet,
-  //      addressCity,
-  //      addressState,
-  //      addressZip
-
-  function createProject(
-    string name,
-    string buyer,
-    string description,
-    string spec,
-    uint price,
-    uint created,
-    uint targetDelivery
-  ) returns (ErrorCodes) {
-    // name must be < 32 bytes
-    if (bytes(name).length > 32) return ErrorCodes.ERROR;
-    // fail if username exists
-    if (exists(name)) return ErrorCodes.EXISTS;
-    // add project
-    uint index = projects.length;
-    nameToIndexMap[b32(name)] = index;
-    projects.push(new Project(
-      name,
-      buyer,
-      description,
-      spec,
-      price,
-      created,
-      targetDelivery
-    ));
-    return ErrorCodes.SUCCESS;
-  }
-
-  function createBid(string name, string supplier, uint amount) returns (ErrorCodes, uint) {
-    // fail if project name not found
-    if (!exists(name)) return (ErrorCodes.NOT_FOUND, 0);
-    // create bid
-    bidId++; // increment the unique id
-    Bid bid = new Bid(bidId, name, supplier, amount);
-    return (ErrorCodes.SUCCESS, bidId);
-  }
-
-  function settleProject(string name, address supplierAddress, address bidAddress) returns (ErrorCodes) {
-    // validity
-    if (!exists(name)) return (ErrorCodes.NOT_FOUND);
-    // set project state
-    address projectAddress = getProject(name);
-    var (errorCode, state) = handleEvent(projectAddress, ProjectEvent.RECEIVE);
-    if (errorCode != ErrorCodes.SUCCESS) return errorCode;
-    // settle
-    Bid bid = Bid(bidAddress);
-    return bid.settle(supplierAddress);
-  }
-
-  /**
-   * handleEvent - transition project to a new state based on incoming event
-   */
-  function handleEvent(address projectAddress, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
-    Project project = Project(projectAddress);
-    ProjectState state = project.getState();
-    // check transition
-    var (errorCode, newState) = fsm(state, projectEvent);
-    // event is not valid in current state
-    if (errorCode != ErrorCodes.SUCCESS) {
-      return (errorCode, state);
-    }
-    // use the new state
-    project.setState(newState);
-    return (ErrorCodes.SUCCESS, newState);
-  }
-
-  function fsm(ProjectState state, ProjectEvent projectEvent) returns (ErrorCodes, ProjectState) {
-    // NULL
-    if (state == ProjectState.NULL)
-      return (ErrorCodes.ERROR, state);
-    // OPEN
-    if (state == ProjectState.OPEN) {
-      if (projectEvent == ProjectEvent.ACCEPT)
-        return (ErrorCodes.SUCCESS, ProjectState.PRODUCTION);
-    }
-    // PRODUCTION
-    if (state == ProjectState.PRODUCTION) {
-      if (projectEvent == ProjectEvent.DELIVER)
-        return (ErrorCodes.SUCCESS, ProjectState.INTRANSIT);
-    }
-    // INTRANSIT
-    if (state == ProjectState.INTRANSIT) {
-      if (projectEvent == ProjectEvent.RECEIVE)
-        return (ErrorCodes.SUCCESS, ProjectState.RECEIVED);
-    }
-    return (ErrorCodes.ERROR, state);
-  }
-}
diff --git a/ui/contracts/ProjectState.sol b/ui/contracts/ProjectState.sol
deleted file mode 100644
index e4fa8c6..0000000
--- a/ui/contracts/ProjectState.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract ProjectState {
-
-    enum ProjectState {
-        NULL,
-        OPEN,
-        PRODUCTION,
-        INTRANSIT,
-        RECEIVED
-    }
-}
diff --git a/ui/contracts/User.sol b/ui/contracts/User.sol
deleted file mode 100644
index 0688789..0000000
--- a/ui/contracts/User.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-import "./common/ErrorCodes.sol";
-import "./common/Version.sol";
-import "./UserRole.sol";
-
-/**
- * User data contract
- */
-contract User is ErrorCodes, Version, UserRole {
-  // NOTE: members must be public to be indexed for search
-  address public account = 0x1234;
-  string public username;
-  bytes32 public pwHash;
-  uint public id;
-  UserRole public role;
-
-  function User(address _account, string _username, bytes32 _pwHash, uint _id, UserRole _role) {
-    account = _account;
-    username = _username;
-    pwHash = _pwHash;
-    id = _id;
-    role = _role;
-    version = 1;
-  }
-
-  function authenticate(bytes32 _pwHash) returns (bool) {
-    return pwHash == _pwHash;
-  }
-}
diff --git a/ui/contracts/UserManager.sol b/ui/contracts/UserManager.sol
deleted file mode 100644
index 6c42165..0000000
--- a/ui/contracts/UserManager.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-import "./User.sol";
-import "./UserRole.sol";
-import "./common/ErrorCodes.sol";
-import "./common/Util.sol";
-
-/**
-* Interface for User data contracts
-*/
-contract UserManager is ErrorCodes, Util, UserRole {
-  User[] users;
-  /*
-    note on mapping to array index:
-    a non existing mapping will return 0, so 0 should not be a valid value in a map,
-    otherwise exists() will not work
-  */
-  mapping (bytes32 => uint) usernameToIdMap;
-
-  /**
-  * Constructor
-  */
-  function UserManager() {
-    users.length = 1; // see above note
-  }
-
-  function exists(string username) returns (bool) {
-    return usernameToIdMap[b32(username)] != 0;
-  }
-
-  function getUser(string username) returns (address) {
-    uint userId = usernameToIdMap[b32(username)];
-    return users[userId];
-  }
-
-  function createUser(address account, string username, bytes32 pwHash, UserRole role) returns (ErrorCodes) {
-    // name must be < 32 bytes
-    if (bytes(username).length > 32) return ErrorCodes.ERROR;
-    // fail if username exists
-    if (exists(username)) return ErrorCodes.EXISTS;
-    // add user
-    uint userId = users.length;
-    usernameToIdMap[b32(username)] = userId;
-    users.push(new User(account, username, pwHash, userId, role));
-    return ErrorCodes.SUCCESS;
-  }
-
-  function login(string username, bytes32 pwHash) returns (bool) {
-    // fail if username doesnt exists
-    if (!exists(username)) return false;
-    // get the user
-    address a = getUser(username);
-    User user = User(a);
-    return user.authenticate(pwHash);
-  }
-}
diff --git a/ui/contracts/UserRole.sol b/ui/contracts/UserRole.sol
deleted file mode 100644
index 47687f5..0000000
--- a/ui/contracts/UserRole.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract UserRole {
-
-    enum UserRole {
-        NULL,
-        ADMIN,
-        BUYER,
-        SUPPLIER
-    }
-}
diff --git a/ui/contracts/Util.sol b/ui/contracts/Util.sol
deleted file mode 100644
index 56bf66f..0000000
--- a/ui/contracts/Util.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Util contract
- */
-contract Util {
-  function stringToBytes32(string memory source) returns (bytes32 result) {
-      assembly {
-          result := mload(add(source, 32))
-      }
-  }
-
-  function b32(string memory source) returns (bytes32) {
-    return stringToBytes32(source);
-  }
-}
diff --git a/ui/contracts/Version.sol b/ui/contracts/Version.sol
deleted file mode 100644
index 61c74bc..0000000
--- a/ui/contracts/Version.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract Version {
-  uint version;
-}
diff --git a/ui/initfile.json b/ui/initfile.json
index cfc0eb0..4edf23c 100644
--- a/ui/initfile.json
+++ b/ui/initfile.json
@@ -1,32 +1,48 @@
 {
-    "adminInterface": {
-      "contractName": "AdminInterface",
-        "contractFilename": "contracts/AdminInterface.sol",
+    "errorCodes": {
+      "contractName": "ErrorCodes",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
-    "bid": {
-      "contractName": "Bid",
-        "contractFilename": "contracts/Bid.sol",
+    "version": {
+      "contractName": "Version",
+        "contractFilename": "contracts/BlockApps.sol",
+        "args": {}
+    },
+    "userRole": {
+      "contractName": "UserRole",
+        "contractFilename": "contracts/BlockApps.sol",
+        "args": {}
+    },
+    "user": {
+      "contractName": "User",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {
+          "_account": "78fcb4b5c16e83d63866f0b82544cdf475710075",
+          "_username": "ABC",
+          "_pwHash": "qiyh4XPJGsOZ2MEAyLkfWqeQ",
           "_id": "1000000000",
-          "_name": "ABC",
-          "_supplier": "XYZ",
-          "_amount": "1000"
+          "_role": "ADMIN"
         }
     },
-    "bidState": {
-      "contractName": "BidState",
-        "contractFilename": "contracts/BidState.sol",
+    "util": {
+      "contractName": "Util",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
-    "errorCodes": {
-      "contractName": "ErrorCodes",
-        "contractFilename": "contracts/ErrorCodes.sol",
+    "userManager": {
+      "contractName": "UserManager",
+        "contractFilename": "contracts/BlockApps.sol",
+        "args": {}
+    },
+    "projectState": {
+      "contractName": "ProjectState",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
     "project": {
       "contractName": "Project",
-        "contractFilename": "contracts/Project.sol",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {
           "_name": "ABC",
           "_buyer": "XYZ",
@@ -39,48 +55,32 @@
     },
     "projectEvent": {
       "contractName": "ProjectEvent",
-        "contractFilename": "contracts/ProjectEvent.sol",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
-    "projectManager": {
-      "contractName": "ProjectManager",
-        "contractFilename": "contracts/ProjectManager.sol",
-        "args": {}
-    },
-    "projectState": {
-      "contractName": "ProjectState",
-        "contractFilename": "contracts/ProjectState.sol",
+    "bidState": {
+      "contractName": "BidState",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
-    "user": {
-      "contractName": "User",
-        "contractFilename": "contracts/User.sol",
+    "bid": {
+      "contractName": "Bid",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {
-          "_account": "78fcb4b5c16e83d63866f0b82544cdf475710075",
-          "_username": "ABC",
-          "_pwHash": "qiyh4XPJGsOZ2MEAyLkfWqeQ",
           "_id": "1000000000",
-          "_role": "ADMIN"
+          "_name": "ABC",
+          "_supplier": "XYZ",
+          "_amount": "1000"
         }
     },
-    "userManager": {
-      "contractName": "UserManager",
-        "contractFilename": "contracts/UserManager.sol",
-        "args": {}
-    },
-    "userRole": {
-      "contractName": "UserRole",
-        "contractFilename": "contracts/UserRole.sol",
-        "args": {}
-    },
-    "util": {
-      "contractName": "Util",
-        "contractFilename": "contracts/Util.sol",
+    "projectManager": {
+      "contractName": "ProjectManager",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     },
-    "version": {
-      "contractName": "Version",
-        "contractFilename": "contracts/Version.sol",
+    "adminInterface": {
+      "contractName": "AdminInterface",
+        "contractFilename": "contracts/BlockApps.sol",
         "args": {}
     }
 }
\ No newline at end of file