Merge branch 'development' into v2-prototype

2018-05-15 15:52:49 -04:00
parent 9744b1906a 6aed4fb1ae
commit 9e0471bfbb
418 changed files with 26379 additions and 9061 deletions
--- a/packages/migrations/compiler.json
+++ b/packages/migrations/compiler.json
@@ -0,0 +1,28 @@
+{
+    "artifactsDir": "artifacts/1.0.0",
+    "contractsDir": "../contracts/src/contracts",
+    "contracts": [
+        "Exchange_v1",
+        "DummyERC20Token",
+        "ZRXToken",
+        "WETH9",
+        "TokenTransferProxy_v1",
+        "MultiSigWallet",
+        "MultiSigWalletWithTimeLock",
+        "MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress",
+        "TokenRegistry"
+    ],
+    "compilerSettings": {
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    }
+}