Merge branch 'release/0.1.0'

build/contracts/Migrations.json

@@ -1378,10 +1378,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x1e1485f7327183fccfc3138afd965c23c78f9050",
-      "transactionHash": "0xd3f5fa596159a60bbc043c7a3e02c22bfbd28067def6c92818585e9e905e099d"
+      "address": "0x70c7d18816575bb0a85d53dffec3f30749e0b65f",
+      "transactionHash": "0xa99f956eba07dbe95ec6661f56c18d52f43dff399ec71bad43f4b57190117360"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-10-05T14:03:26.626Z"
+  "updatedAt": "2018-10-16T03:15:00.647Z"
 }

migrations/2_deploy_contracts.js

@@ -4,92 +4,82 @@ const MathLib = artifacts.require(
 const OrderLib = artifacts.require(
   '@marketprotocol/marketprotocol/OrderLib.sol'
 );
-const QueryTest = artifacts.require(
-  '@marketprotocol/marketprotocol/OraclizeQueryTest.sol'
-);
 const MarketContractOraclize = artifacts.require(
   '@marketprotocol/marketprotocol/MarketContractOraclize.sol'
 );
 const MarketContractFactory = artifacts.require(
   '@marketprotocol/marketprotocol/MarketContractFactoryOraclize.sol'
 );
-const MarketCollateralPoolFactory = artifacts.require(
-  '@marketprotocol/marketprotocol/MarketCollateralPoolFactory.sol'
+const MarketCollateralPool = artifacts.require(
+  '@marketprotocol/marketprotocol/MarketCollateralPool.sol'
 );
 const MarketContractRegistry = artifacts.require(
   '@marketprotocol/marketprotocol/MarketContractRegistry.sol'
 );
 const MarketToken = artifacts.require(
   '@marketprotocol/marketprotocol/MarketToken.sol'
 );
+const MarketTradingHub = artifacts.require(
+  '@marketprotocol/marketprotocol/MarketTradingHub.sol'
+);
 
-module.exports = function(deployer, network) {
+module.exports = function (deployer, network) {
   if (network !== 'live') {
-    deployer.deploy(MathLib);
-    deployer.deploy(OrderLib);
-    deployer.deploy(MarketContractRegistry).then(function() {
-
-      deployer.link(
-        MathLib,
-        QueryTest,
-        MarketContractOraclize,
-        MarketContractFactory
-      );
+    return deployer.deploy([MathLib, OrderLib, MarketContractRegistry]).then(function () {
 
       deployer.link(
         MathLib,
-        MarketCollateralPoolFactory
+        [
+          MarketContractOraclize,
+          MarketCollateralPool,
+          MarketContractFactory
+        ]
       );
 
-      deployer.link(OrderLib, MarketContractFactory, MarketContractOraclize);
-      // deploy our quest test contract
-      deployer.deploy(QueryTest).then(function(queryTestInstance) {
-        // by forcing the first query when we deploy we can make sure all the prices are accurate since
-        // the first query is free with oraclize.
-        return queryTestInstance.testOracleQuery(
-          'URL',
-          'json(https://api.kraken.com/0/public/Ticker?pair=BCHUSD).result.BCHUSD.c.0',
-        );
-      });
+      deployer.link(OrderLib, [MarketContractFactory, MarketContractOraclize, MarketTradingHub]);
 
-      // deploy MKT token
-      const marketTokenToLockForTrading = 0; // for testing purposes, require no lock
-      const marketTokenAmountForContractCreation = 0; //for testing purposes require no balance
-      return deployer
-        .deploy(
-          MarketToken,
-          marketTokenToLockForTrading,
-          marketTokenAmountForContractCreation
-        )
-        .then(function() {
-          // deploy and set up main factory to create MARKET Protocol smart contracts.
-          return MarketContractRegistry.deployed().then(function(
-            marketContractRegistry
-          ) {
+      // deploy the global collateral pool
+      return deployer.deploy(MarketCollateralPool).then(function (marketCollateralPool) {
 
+        // deploy MKT token
+        const marketTokenToLockForTrading = 0; // for testing purposes, require no lock
+        const marketTokenAmountForContractCreation = 0; //for testing purposes require no balance
+        return deployer
+          .deploy(
+            MarketToken,
+            marketTokenToLockForTrading,
+            marketTokenAmountForContractCreation
+          )
+          .then(function () {
+            // deploy our trading hub!
             return deployer.deploy(
-              MarketCollateralPoolFactory,
-              marketContractRegistry.address
-            ).then(function(collateralPoolFactory)
-            {
-              return deployer
-                .deploy(
-                  MarketContractFactory,
-                  marketContractRegistry.address,
-                  MarketToken.address,
-                  collateralPoolFactory.address,
-                  {
-                    gas: 7000000
-                  }
-                )
-                .then(function(factory) {
-                  // white list the factory
-                  return marketContractRegistry
-                    .addFactoryAddress(factory.address)
+              MarketTradingHub,
+              MarketToken.address,
+              MarketCollateralPool.address
+            ).then(function (marketTradingHub) {
+              return marketCollateralPool.setMarketTradingHubAddress(
+                marketTradingHub.address
+              ).then(function () {
+                // deploy and set up main factory to create MARKET Protocol smart contracts.
+                return MarketContractRegistry.deployed().then(function (
+                  marketContractRegistry
+                ) {
+                  return deployer.deploy(
+                    MarketContractFactory,
+                    marketContractRegistry.address,
+                    MarketToken.address,
+                    {
+                      gas: 7000000
+                    }
+                  ).then(function (factory) {
+                      // white list the factory
+                      return marketContractRegistry.addFactoryAddress(factory.address)
+                  });
                 });
+              });
             });
           });
-        });
+      });
     });
   }
 };