Merge branch 'Katalyst' into fix_audit2_comments_ChainSec

Author: ilanDoron

.solhint.json

@@ -1,12 +1,35 @@
 {
-  "extends": "solhint:default",
+  "extends": "solhint:recommended",
+  "plugins": [],
   "rules": {
-    "quotes": ["error", "double"],
+    "avoid-call-value": "error",
+    "avoid-low-level-calls": "off",
+    "avoid-sha3": "error",
     "avoid-suicide": "error",
-    "avoid-sha3": "warn",
-    "avoid-tx-origin": "warn",
-    "const-name-snakecase": "off",
-    "func-order": "warn",
-    "not-rely-on-block-hash": "warn"
+    "avoid-throw": "error",
+    "avoid-tx-origin": "off",
+    "check-send-result": "error",
+    "compiler-version": ["error", "0.6.6"],
+    "const-name-snakecase": "error",
+    "func-name-mixedcase": "error",
+    "func-order": "error",
+    "imports-on-top": "error",
+    "mark-callable-contracts": "error",
+    "max-line-length": ["error", 99],
+    "max-states-count": ["error", 20],
+    "multiple-sends": "error",
+    "no-complex-fallback": "error",
+    "no-empty-blocks": "off",
+    "no-inline-assembly": "error",
+    "no-unused-vars": "error",
+    "not-rely-on-block-hash": "error",
+    "not-rely-on-time": "off",
+    "payable-fallback": "error",
+    "quotes": ["error","double"],
+    "reentrancy": "error",
+    "state-visibility": "error",
+    "use-forbidden-name": "error",
+    "var-name-mixedcase": "error",
+    "visibility-modifier-order": "error"
   }
 }

.solhintignore

@@ -1,4 +1,7 @@
-# zeppelin contracts
-contracts/sol6/utils/zeppelin
-contracts/sol5/bridges
-
+contracts/sol4
+contracts/sol5
+contracts/sol6/Dao
+contracts/sol6/mock
+contracts/sol6/utils
+contracts/sol6/wrappers
+contracts/sol6/*.sol

.travis.yml

@@ -22,7 +22,7 @@ install:
   - npm ci
 
 before_script:
-  - npx solhint contracts/sol6/**/*.sol
+  - npx solhint "contracts/sol6/**/*.sol"
 
 script:
   - ./cmp.sh