Merge branch 'develop' release 2.1

Author: elenadimitrova

.circleci/config.yml

@@ -2,7 +2,11 @@ version: 2
 
 job_common: &job_common
   docker:
-    - image: circleci/node:10.12-stretch
+    - image: circleci/node:10.21-stretch
+  working_directory: ~/argent-contracts
+job_python: &job_python
+  docker:
+    - image: circleci/python:3.8.0b1-stretch-node
   working_directory: ~/argent-contracts
 step_save_cache: &step_save_cache
   save_cache:
@@ -18,7 +22,14 @@ step_setup_global_packages: &step_setup_global_packages
     name: "Set up global packages"
     command: |
       npm install
-
+step_setup_slither: &step_setup_slither
+  run:
+    name: "Setup slither analyser https://github.com/crytic/slither"
+    command: |
+      wget https://github.com/ethereum/solidity/releases/download/v0.5.4/solc-static-linux
+      chmod +x solc-static-linux
+      sudo mv solc-static-linux /usr/local/bin/solc
+      sudo pip3 install slither-analyzer
 jobs:
   unit-test:
     <<: *job_common
@@ -29,31 +40,59 @@ jobs:
       - run:
           name: "Lint Solidity contracts"
           command: npm run lint:contracts
+      - run:
+          name: "Testing deployment scripts and benchmark gas costs"
+          command: npm run ganache >/dev/null 2>&1 & npm run test:deployment && npm run test:benchmark
       - run:
           name: "Compiling external library contracts"
           command: npm run compile:lib
+      - run:
+          name: "Compiling legacy contracts"
+          command: npm run compile:legacy
       - run:
           name: "Compiling contracts"
           command: npm run compile
+      - run:
+          name: "Compiling test contracts"
+          command: npm run compile:test
       - run:
           name: "Lint JavaScript"
           command: npm run lint:js
       - run:
           name: "Running unit tests"
           command: npm run ganache >/dev/null 2>&1 & npm run test
-      - run:
-          name: "Testing deployment scripts"
-          command: npm run ganache >/dev/null 2>&1 & npm run test:deployment
       - run:
           name: "Running coverage"
-          command: npm run test:coverage
+          command: |
+            npm run compile
+            npm run compile:test
+            npm run test:coverage
       - <<: *step_save_cache
       # Save coverage artifacts
       - store_artifacts:
           path: coverage
-
+  security-test:
+    <<: *job_python
+    steps:
+      - checkout
+      - <<: *step_restore_cache
+      - <<: *step_setup_global_packages
+      - <<: *step_setup_slither
+      - run:
+          name: "Run slither"
+          command: npm run security:slither
 workflows:
   version: 2
   commit:
     jobs:
       - unit-test
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 1 * * *" # 1am UTC
+          filters:
+            branches:
+              only:
+                - develop
+    jobs:
+      - security-test

.eslintignore

@@ -2,5 +2,6 @@
 
 build/*
 contracts/*
+contracts-test/*
 coverage/*
 lib/*

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 build
+build-legacy
 tmp
 bin
 .outputParameter

.nvmrc

@@ -1 +1 @@
-10.12.0
+10.21.0

.solhint.json

@@ -0,0 +1,14 @@
+{
+  "extends": "solhint:recommended",
+  "plugins": [],
+    "rules": {
+      "compiler-version": ["off"],
+      "no-inline-assembly": ["error"],
+      "not-rely-on-time": ["off"],
+      "avoid-low-level-calls": ["off"],
+      "max-line-length": ["error", 150],
+      "func-param-name-mixedcase": "error",
+      "modifier-name-mixedcase": "error",
+      "reason-string": ["warn", { "maxLength":32 }]
+    }
+}

.solhintignore

@@ -0,0 +1,5 @@
+node_modules
+lib
+contracts-test
+contracts-legacy
+contracts/infrastructure_0.5

.soliumignore

@@ -27,6 +27,11 @@ Compile the contracts:
 npm run compile
 ```
 
+Compile the test contracts:
+```
+npm run compile:test
+```
+
 ## Test
 
 Launch ganache:
@@ -39,6 +44,12 @@ Run the tests:
 npm run test
 ```
 
+To run coverage testing:
+```
+npm run test:coverage
+```
+You need to not have `ganache` running with this as it uses own instance. 
+
 ## License
 
 Released under [GPL-3.0](LICENSE)