Merge branch 'release/0.0.2'

MARKETProtocol · Jul 27, 2018 · 5c7570b · 5c7570b
2 parents 352ffe8 + cc33c4e
commit 5c7570b
Show file tree

Hide file tree

Showing 14 changed files with 5,578 additions and 5,539 deletions.
diff --git a/README.md b/README.md
@@ -14,5 +14,7 @@ Join our [Discord Community](https://marketprotocol.io/discord) to interact with
 ### Rinkeby Token Faucets
 | Token  | Address |
 | ------ | -----   |
-| Fake USD | 0xee78ae82ab0bbbae6d99b36a999e7b6de2e8664b |
-| Fake Wrapped Eth | 0x2021c394e8fce5e56c166601a0428e4611147802 |
+| Fake USD | 0x8a58443F8FE877912B68dB454a1f583983FD8dBa |
+| Fake Wrapped Eth | 0x6371D022560B18Dc4A86702D6DE41B5a3c934DA0 |
+
+
diff --git a/build/contracts/InitialAllocationCollateralToken.json b/build/contracts/InitialAllocationCollateralToken.json
diff --git a/build/contracts/MarketCollateralPoolFactory.json b/build/contracts/MarketCollateralPoolFactory.json
diff --git a/build/contracts/MarketContractFactoryOraclize.json b/build/contracts/MarketContractFactoryOraclize.json
diff --git a/build/contracts/MarketContractOraclize.json b/build/contracts/MarketContractOraclize.json
diff --git a/build/contracts/MarketContractRegistry.json b/build/contracts/MarketContractRegistry.json
diff --git a/build/contracts/MarketToken.json b/build/contracts/MarketToken.json
diff --git a/build/contracts/MathLib.json b/build/contracts/MathLib.json
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
@@ -1378,10 +1378,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x854cb3af852cfda1b6725762a396e42de220d5b5",
-      "transactionHash": "0xb46caa3d729ec7f30be42e39d1f38aee3309897ae071c898395a47c44058392e"
+      "address": "0xcd392092ad3e5d1592822455168c98a6d34b307c",
+      "transactionHash": "0x54e91b11d25d331c3220ccf4785339d9294bd7c2f12616266fedeaaed02781f2"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-12T16:03:47.561Z"
+  "updatedAt": "2018-07-27T19:00:06.731Z"
 }
diff --git a/build/contracts/OraclizeQueryTest.json b/build/contracts/OraclizeQueryTest.json
diff --git a/build/contracts/OrderLib.json b/build/contracts/OrderLib.json
diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -90,7 +90,7 @@ module.exports = function(deployer, network) {
                   MarketToken.address,
                   collateralPoolFactory.address,
                   {
-                    gas: web3.eth.getBlock('latest').gasLimit
+                    gas: 7000000
                   }
                 )
                 .then(function(factory) {
@@ -117,7 +117,7 @@ module.exports = function(deployer, network) {
                               .contractAddress;
                           return collateralPoolFactory.deployMarketCollateralPool(
                               marketContractDeployedAddress,
-                              { gas: 1800000 }
+                              { gas: 1900000 }
                             );
                         });
                     });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@marketprotocol/abis",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "MARKET Protocol truffle artifacts and ABIs",
   "main": "truffle-config.js",
   "scripts": {
@@ -26,6 +26,6 @@
   },
   "homepage": "https://marketprotocol.io",
   "devDependencies": {
-    "@marketprotocol/marketprotocol": "^1.2.0"
+    "@marketprotocol/marketprotocol": "^1.3.0"
   }
 }