aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/.solhint.json23
-rw-r--r--packages/contracts/package.json2
2 files changed, 14 insertions, 11 deletions
diff --git a/packages/contracts/.solhint.json b/packages/contracts/.solhint.json
index 7e3b4dca2..594fce677 100644
--- a/packages/contracts/.solhint.json
+++ b/packages/contracts/.solhint.json
@@ -1,17 +1,20 @@
{
"extends": "default",
"rules": {
- "bracket-align": "warn",
- "code-complexity": "warn",
- "const-name-snakecase": "warn",
- "expression-indent": "warn",
- "function-max-lines": "warn",
- "statement-indent": "warn",
- "indent": ["warn", 4],
+ "avoid-low-level-calls": false,
+ "avoid-tx-origin": "warn",
+ "bracket-align": false,
+ "code-complexity": "false",
+ "const-name-snakecase": "error",
+ "expression-indent": "error",
+ "function-max-lines": false,
+ "func-order": "error",
+ "indent": ["error", 4],
+ "max-line-length": ["warn", 160],
+ "no-inline-assembly": false,
"quotes": ["error", "double"],
- "max-line-length": ["warn", 120],
- "separate-by-one-line-in-contract": "warn",
+ "separate-by-one-line-in-contract": "error",
"space-after-comma": "error",
- "func-order": "warn"
+ "statement-indent": "error"
}
}
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index a8bbdbe16..5c23d210e 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -30,7 +30,7 @@
"profiler:report:html": "istanbul report html && open coverage/index.html",
"coverage:report:lcov": "istanbul report lcov",
"test:circleci": "yarn test",
- "lint-contracts": "solhint src/2.0.0/**/*.sol"
+ "lint-contracts": "solhint src/2.0.0/**/**/**/**/*.sol"
},
"config": {
"abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TestValidator|TestWallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"