Merge pull request #43 from iExecBlockchainComputing/v1.0.14

release of v1.0.14
iExecBlockchainComputing · Jun 18, 2018 · 2ad1ce7 · 2ad1ce7
2 parents cc0fe20 + 39f71f8
commit 2ad1ce7
Show file tree

Hide file tree

Showing 38 changed files with 10,701 additions and 2,044 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 **/__pycache__
 node_modules
 makefile
+build
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -10,6 +10,16 @@ Features:
 Bugfixes:
 
 
+### v1.0.14 (not released)
+
+Features:
+ * [#42](https://github.com/iExecBlockchainComputing/PoCo/issues/42) ajust timeout categories
+ * [#40](https://github.com/iExecBlockchainComputing/PoCo/issues/40)  Removing the build/ folder from git and create a specific one for contracts addresses deployed
+
+ Bugfixes:
+ * [#41](https://github.com/iExecBlockchainComputing/PoCo/issues/41) : truffle compile doesn't work
+
+
 ### [v1.0.13](https://github.com/iExecBlockchainComputing/PoCo/releases/tag/v1.0.13)
 
 Features:

diff --git a/README.md b/README.md
@@ -492,7 +492,7 @@ or
 
 
 ```
-coverage : 20/05/2018
+coverage : 11/06/2018
 
 184 passing (10m)
 1 pending

diff --git a/audits/ChainSecurity_iExec-V2.pdf b/audits/ChainSecurity_iExec-V2.pdf
diff --git a/config/categories.json b/config/categories.json
@@ -4,35 +4,35 @@
       "description": {
         "io": "10mo"
       },
-      "workClockTimeRef": 30
+      "workClockTimeRef": 300
     },
     {
       "name": "2",
       "description": {
         "io": "100mo"
       },
-      "workClockTimeRef": 120
+      "workClockTimeRef": 900
     },
     {
       "name": "3",
       "description": {
         "io": "250mo"
       },
-      "workClockTimeRef": 900
+      "workClockTimeRef": 1800
     },
     {
       "name": "4",
       "description": {
         "io": "500mo"
       },
-      "workClockTimeRef": 1800
+      "workClockTimeRef": 3600
     },
     {
       "name": "5",
       "description": {
         "io": "1go"
       },
-      "workClockTimeRef": 3600
+      "workClockTimeRef": 7200
     }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -492,7 +492,7 @@ or @@
     ```
-    coverage : 20/05/2018
+    coverage : 11/06/2018
 passing (10m)
 pending
@@ Expand Down @@