Merge development

2019-01-28 17:26:13 +01:00
parent 0c12128f64 25e42c0ad4
commit 141ac0ca0b
280 changed files with 1876 additions and 1411 deletions
--- a/contracts/asset-proxy/compiler.json
+++ b/contracts/asset-proxy/compiler.json
@@ -0,0 +1,31 @@
+{
+    "artifactsDir": "./generated-artifacts",
+    "contractsDir": "./contracts",
+    "useDockerisedSolc": true,
+    "compilerSettings": {
+        "optimizer": {
+            "enabled": true,
+            "runs": 1000000
+        },
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    },
+    "contracts": [
+        "IAssetData",
+        "IAssetProxy",
+        "IAuthorizable",
+        "ERC20Proxy",
+        "ERC721Proxy",
+        "MixinAuthorizable",
+        "MultiAssetProxy"
+    ]
+}