Merge branch 'develop' into master

Author: olivdb

.circleci/config.yml

@@ -28,12 +28,6 @@ step_setup_global_packages: &step_setup_global_packages
     name: "Set up global packages"
     command: |
       npm install
-step_pull_solc_docker: &step_pull_solc_docker
-  run:
-    name: "Pull solc docker images"
-    command: |
-      docker pull ethereum/solc:0.5.4
-      docker pull ethereum/solc:0.6.12
 step_setup_slither: &step_setup_slither
   run:
     name: "Setup slither analyser https://github.com/crytic/slither"
@@ -46,16 +40,13 @@ step_setup_solc_select: &step_setup_solc_select
     command: |
       sudo pip3 install solc-select
       solc-select install 0.5.4
-      solc-select install 0.6.12
+      solc-select install 0.8.3
 jobs:
   unit-test:
     <<: *job_common
     steps:
       - checkout
       - <<: *step_restore_cache
-      - setup_remote_docker:
-          version: 19.03.13
-      - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
       - run:
           name: "Lint JavaScript"
@@ -66,9 +57,6 @@ jobs:
       - 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
@@ -85,11 +73,14 @@ jobs:
       - run:
           name: "Running unit tests"
           command: npm run ganache >/dev/null 2>&1 & npm run test
-      # Save coverage artifacts
+      # Save test artifacts
       - store_artifacts:
           path: gas-usage-report.log
           destination: reports/gas-usage-report.log
       - run: npx codechecks
+      - run:
+          name: "Running integration tests"
+          command: npm run mainnet-fork >/dev/null 2>&1 & npm run test:integration
       - run:
           name: "Running coverage"
           command: |
@@ -106,28 +97,20 @@ jobs:
     steps:
       - checkout
       - <<: *step_restore_cache
-      - setup_remote_docker:
-          version: 19.03.13
-      - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
       - <<: *step_setup_slither
       - <<: *step_setup_solc_select
-      - run:
-          name: "Check TokenPriceRegistry tokens for ERC20 compliance"
-          command:  |
-            export PATH=/home/circleci/.solc-select:$PATH
-            npm run validate:erc20
       - run:
           name: "Run slither on infrastructure contracts based on solc 0.5"
           command:  |
             export PATH=/home/circleci/.solc-select:$PATH
             npm run security:slither:infrastructure_0.5
           when: always
       - run:
-          name: "Run slither on infrastructure contracts based on solc 0.6"
+          name: "Run slither on infrastructure contracts based on solc 0.8"
           command:  |
             export PATH=/home/circleci/.solc-select:$PATH
-            npm run security:slither:infrastructure_0.6
+            npm run security:slither:infrastructure
           when: always
       - run:
           name: "Run slither on wallet modules contracts"

.eslintignore

@@ -5,4 +5,5 @@ contracts/*
 contracts-test/*
 coverage/*
 lib/*
-scripts/coverage.js
+scripts/coverage.js
+tmp

.gitignore

@@ -1,6 +1,5 @@
 node_modules
 build
-build-legacy
 tmp
 bin
 .outputParameter
@@ -30,8 +29,6 @@ flat
 .env
 utils/config/*.json
 !utils/config/development.json
-!utils/config/kovan.json
-!utils/config/kovan-fork.json
 ganache-accounts.json
 
 ## solidity-coverage

.solcover.js

@@ -1,9 +1,11 @@
 module.exports = {
   client: require('ganache-cli'),
+  measureStatementCoverage: false,
+  measureFunctionCoverage: false,
   skipFiles: [
     "../contracts-test",
-    "../contracts-legacy",
-    "../lib"
+    "../lib_0.5",
+    "../lib_0.7"
   ],
   providerOptions: {
     port: 8555,

.solhint.json

@@ -9,6 +9,6 @@
       "max-line-length": ["error", 150],
       "func-param-name-mixedcase": "error",
       "modifier-name-mixedcase": "error",
-      "reason-string": ["warn", { "maxLength":32 }]
+      "reason-string": ["error", { "maxLength":32 }]
     }
 }

README.md

@@ -1,6 +1,6 @@
 # Argent Wallet Smart Contracts
 
-The Argent wallet is an Ethereum Smart Contract based mobile wallet. The wallet's user keeps an Ethereum account (Externally Owned Account) secretly on his mobile device. This account is set as the owner of the Smart Contract. User's funds (ETH and ERC20 tokens) are stored on the Smart Contract. With that model, logic can be added to the wallet to improve both the user experience and the wallet security. For instance, the wallet is guarded, recoverable, lockable, protected by a daily limit and upgradable.
+The Argent wallet is an Ethereum Smart Contract based mobile wallet. The wallet's user keeps an Ethereum account (Externally Owned Account) secretly on his mobile device. This account is set as the owner of the Smart Contract. User's funds (ETH and ERC20 tokens) are stored on the Smart Contract. With that model, logic can be added to the wallet to improve both the user experience and the wallet security. For instance, the wallet is guarded, recoverable, lockable, and upgradable.
 
 See full specifications [here](specifications/specifications.pdf)