Merge branch 'release/0.3.0'

MARKETProtocol · Sep 7, 2018 · e79ad1b · e79ad1b
2 parents 5c7570b + a5803d7
commit e79ad1b
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 94 deletions.
diff --git a/build/contracts/MarketCollateralPoolFactory.json b/build/contracts/MarketCollateralPoolFactory.json
@@ -1984,12 +1984,12 @@
     "4": {
       "events": {},
       "links": {
-        "MathLib": "0x10420151fa1d0676ca274d6e53435ec261190ff0"
+        "MathLib": "0x254962dd15db2c9b57e612f1aaefb2ae5e33f107"
       },
-      "address": "0x06dcc8dacc3e3d49cf680acb2600c6fb128acce3",
-      "transactionHash": "0x50a139656b6500551aacbac54e1b07259c92b56b1b17c7e0ba3213b20ca9a94b"
+      "address": "0x2b451dc7695d7c0800e14fdc3192e0ee7d2a7327",
+      "transactionHash": "0x708a1c89111188dc87a47e90a8a470d630b9cd0d7cdfa469d9b4260fa7142204"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.647Z"
+  "updatedAt": "2018-09-07T18:28:49.239Z"
 }
diff --git a/build/contracts/MarketContractFactoryOraclize.json b/build/contracts/MarketContractFactoryOraclize.json
@@ -2957,49 +2957,14 @@
   },
   "networks": {
     "4": {
-      "events": {
-        "0x38ee3ff13b5d3453452a79e0799d83b2c8207bf126b2798fa512343680f643ee": {
-          "anonymous": false,
-          "inputs": [
-            {
-              "indexed": true,
-              "name": "creator",
-              "type": "address"
-            },
-            {
-              "indexed": true,
-              "name": "contractAddress",
-              "type": "address"
-            }
-          ],
-          "name": "MarketContractCreated",
-          "type": "event"
-        },
-        "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
-          "anonymous": false,
-          "inputs": [
-            {
-              "indexed": true,
-              "name": "previousOwner",
-              "type": "address"
-            },
-            {
-              "indexed": true,
-              "name": "newOwner",
-              "type": "address"
-            }
-          ],
-          "name": "OwnershipTransferred",
-          "type": "event"
-        }
-      },
+      "events": {},
       "links": {
-        "OrderLib": "0xf40577d3be99effc6634b44ee465e9efed7a6733"
+        "OrderLib": "0x5cfce3c76fa3528b87f27149c341b2add6904ea7"
       },
-      "address": "0x95f59498ceb2b4c9aa14cc470dddef4adafbe4c9",
-      "transactionHash": "0x0c780912cc25bebcb24c2ee51243ec131e5024b0798787cddf139f4de5898e86"
+      "address": "0xa9fd47ac90c86dc770219d040aa4311dda78a807",
+      "transactionHash": "0x32332dd11413cab050cd3b7e8a3d060f0090ab8ec31a9d8e3321397eb94331ef"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.644Z"
+  "updatedAt": "2018-09-07T18:28:49.236Z"
 }
diff --git a/build/contracts/MarketContractOraclize.json b/build/contracts/MarketContractOraclize.json
@@ -5732,7 +5732,14 @@
     "name": "solc",
     "version": "0.4.24+commit.e67f0147.Emscripten.clang"
   },
-  "networks": {},
+  "networks": {
+    "4": {
+      "events": {},
+      "links": {
+        "OrderLib": "0x5374c9b5d0d60e7f58063e02e6fd905ff94c4fb6"
+      }
+    }
+  },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.643Z"
+  "updatedAt": "2018-09-07T18:28:49.232Z"
 }
diff --git a/build/contracts/MarketContractRegistry.json b/build/contracts/MarketContractRegistry.json
@@ -5209,10 +5209,10 @@
         }
       },
       "links": {},
-      "address": "0xab0ca9a6899d60577f81e4b3464e8661d2cfd5db",
-      "transactionHash": "0x8e5ca21b23f9eed97f41df4773288df09fd6e66b2e457eb0dd236e65b996ed0d"
+      "address": "0xb721da9d20b1889bfb1d806aa6af21b8da7c7216",
+      "transactionHash": "0x9905164e6402f6c08d3426bb672dfe20abe4415becffefd86c08c043539b4a46"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.648Z"
+  "updatedAt": "2018-09-07T18:28:49.249Z"
 }
diff --git a/build/contracts/MarketToken.json b/build/contracts/MarketToken.json
@@ -7259,10 +7259,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x585bd4faff1420de5aa842a553068805efc4af47",
-      "transactionHash": "0xade09363df147223e04a9ab107d0427244766df0bbd22c716dfeaf33608d0bbe"
+      "address": "0xd7a45a708ada3a4fe55f64b74f9504f5ea88e3b6",
+      "transactionHash": "0x4eef93e88899938a6314ba8dd5f635408c9860f6360f0872bc8d3d24e373ba9d"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.649Z"
+  "updatedAt": "2018-09-07T18:28:49.244Z"
 }
diff --git a/build/contracts/MathLib.json b/build/contracts/MathLib.json
@@ -9585,10 +9585,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x10420151fa1d0676ca274d6e53435ec261190ff0",
-      "transactionHash": "0x58f2074de4df2a4b74081d60a18e2b310f51456f8107312ba20833fab309371a"
+      "address": "0x254962dd15db2c9b57e612f1aaefb2ae5e33f107",
+      "transactionHash": "0x77067e49a26c459b80b1cfddd051086a7d398241366aade59ff282a6027df69c"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.632Z"
+  "updatedAt": "2018-09-07T18:28:49.217Z"
 }
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
@@ -1378,10 +1378,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0xcd392092ad3e5d1592822455168c98a6d34b307c",
-      "transactionHash": "0x54e91b11d25d331c3220ccf4785339d9294bd7c2f12616266fedeaaed02781f2"
+      "address": "0x5b04afb217cd8b49d63c93c5718ec0ba949f36b1",
+      "transactionHash": "0x016a5a953642e86f3410f905ea3a09880b1dd8afcbc94710d00e03f48e175a59"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.731Z"
+  "updatedAt": "2018-09-07T18:28:49.241Z"
 }
diff --git a/build/contracts/OraclizeQueryTest.json b/build/contracts/OraclizeQueryTest.json
@@ -4232,10 +4232,10 @@
         }
       },
       "links": {},
-      "address": "0x18de1cf34877de1c2cc5d544f26ef0dbe1e59eb9",
-      "transactionHash": "0x08a7b1e9da5981ebe266bcc9d62536ce1803151491697c95415ea3e8a706d8f1"
+      "address": "0xfb4272316da77b63d8c70d8635849473fe24c011",
+      "transactionHash": "0xe5dc97aed47f22c06a9bcee6f3510642e521875430f2c43ffdb407ca618649bd"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.639Z"
+  "updatedAt": "2018-09-07T18:28:49.222Z"
 }
diff --git a/build/contracts/OrderLib.json b/build/contracts/OrderLib.json
@@ -7258,10 +7258,10 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0xf40577d3be99effc6634b44ee465e9efed7a6733",
-      "transactionHash": "0x5ace19ff9820c063a26ac6b82987c655143a31d6b4d3de6c64305508f90e6a68"
+      "address": "0x5cfce3c76fa3528b87f27149c341b2add6904ea7",
+      "transactionHash": "0x3ed17e9dba624cfb6603d9038c08f45eb58bdad8650ee41975e5a0271c57d20f"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-07-27T19:00:06.636Z"
+  "updatedAt": "2018-09-07T18:28:49.227Z"
 }
diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -7,9 +7,6 @@ const OrderLib = artifacts.require(
 const QueryTest = artifacts.require(
   '@marketprotocol/marketprotocol/OraclizeQueryTest.sol'
 );
-const InitialAllocationCollateralToken = artifacts.require(
-  '@marketprotocol/marketprotocol/InitialAllocationCollateralToken.sol'
-);
 const MarketContractOraclize = artifacts.require(
   '@marketprotocol/marketprotocol/MarketContractOraclize.sol'
 );
@@ -66,8 +63,6 @@ module.exports = function(deployer, network) {
         )
         .then(function() {
           // deploy collateral token and a fake wrapped ETH
-          deployer.deploy(InitialAllocationCollateralToken, 'Stable USD', 'USD', 1e9, 18);
-          deployer.deploy(InitialAllocationCollateralToken, 'Fake Wrapped ETH', 'FWETH', 1e9, 18);
 
           const daysToExpiration = 28;
           const expirationDate = new Date();
@@ -97,30 +92,6 @@ module.exports = function(deployer, network) {
                   // white list the factory
                   return marketContractRegistry
                     .addFactoryAddress(factory.address)
-                    .then(function() {
-                      // deploy a single contract for testing purposes.
-                      const gasLimit = 4000000; // gas limit for contract deployment
-                      let quickExpirationTimeStamp =
-                        Math.floor(Date.now() / 1000) + 60 * 60; // expires in an hour
-                      return factory
-                        .deployMarketContractOraclize(
-                          'ETHUSD_' + new Date().toISOString().substring(0, 10),
-                          InitialAllocationCollateralToken.address,
-                          [50000, 150000, 2, 1e18, quickExpirationTimeStamp],
-                          'URL',
-                          'json(https://api.kraken.com/0/public/Ticker?pair=ETHUSD).result.XETHZUSD.c.0',
-                          { gas: gasLimit}
-                        )
-                        .then(function(marketContractDeployResults) {
-                          const marketContractDeployedAddress =
-                            marketContractDeployResults.logs[0].args
-                              .contractAddress;
-                          return collateralPoolFactory.deployMarketCollateralPool(
-                              marketContractDeployedAddress,
-                              { gas: 1900000 }
-                            );
-                        });
-                    });
                 });
             });
           });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@marketprotocol/abis",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "MARKET Protocol truffle artifacts and ABIs",
   "main": "truffle-config.js",
   "scripts": {