Merge branch 'release/1.6.0'

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 
 job_common: &job_common
   docker:
-    - image: circleci/node:8.12-stretch
+    - image: circleci/node:10.12-stretch
   working_directory: ~/argent-contracts
 step_save_cache: &step_save_cache
   save_cache:
@@ -27,26 +27,30 @@ jobs:
       - <<: *step_restore_cache
       - <<: *step_setup_global_packages
       - run:
-          name: "Lint contracts"
+          name: "Lint Solidity contracts"
           command: npm run lint:contracts
       - run:
           name: "Compiling external library contracts"
           command: npm run compile:lib
       - run:
           name: "Compiling contracts"
           command: npm run compile
+      - 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
       - <<: *step_save_cache
-      # Save test results to artifacts
-      - store_test_results:
-          path: test-results.xml
+      # Save coverage artifacts
       - store_artifacts:
-          path: test-results.xml
+          path: coverage
 
 workflows:
   version: 2

.eslintignore

@@ -0,0 +1,6 @@
+#/node_modules/* ignored by default
+
+build/*
+contracts/*
+coverage/*
+lib/*

.eslintrc

@@ -0,0 +1,25 @@
+{
+  "extends": "airbnb-base",
+  "env": {
+    "commonjs": true,
+    "node": true,
+    "mocha": true
+  },
+  "globals": {
+    "web3": true,
+    "assert": true,
+    "contract": true
+  },
+  "rules": {
+    "max-len": [2, { "code": 150, "ignoreComments": true }],
+    "quotes": [2, "double", "avoid-escape"],
+    "no-console": "off",
+    "no-underscore-dangle": "off",
+    "no-await-in-loop": "off",
+    "no-restricted-syntax": "off",
+    "guard-for-in": "off"
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018
+  }
+}

.gitignore

@@ -2,6 +2,7 @@ node_modules
 build
 tmp
 bin
+.outputParameter
 
 ## Core latex/pdflatex auxiliary files:
 *.aux
@@ -22,15 +23,19 @@ bin
 .DS_Store
 .node-xmlhttprequest-sync-*
 .vscode
+.outputParameter
 
 .env
-*.sh
 utils/config/*.json
 !utils/config/ganache.json
+!utils/config/kovan.json
+!utils/config/kovan-fork.json
 
 ## Etherlime
 **/.etherlime-store
 flat
-
-
-
+.coverage_artifacts
+.coverage_contracts
+.coverage_tests
+coverage
+coverage.json

.nvmrc

@@ -1 +1 @@
-8.12.0
+10.12.0

.prettierignore

@@ -0,0 +1,2 @@
+*.sol
+*.js

.soliumignore

@@ -2,47 +2,5 @@ node_modules
 migrations
 openzeppelin-solidity
 lib
-contracts/test/CryptoKitties.sol
-contracts/test/KyberNetworkTest.sol
-contracts/test/TestContract.sol
-contracts/test/TestERC20.sol
-contracts/test/TestERC721.sol
-contracts/test/argent/legacy/LegacyBaseWallet.sol
-contracts/test/argent/legacy/TokenTransfer.sol
-contracts/test/argent/utils/ERC20Approver.sol
-contracts/test/argent/utils/NewTestModule.sol
-contracts/test/argent/utils/NonCompliantGuardian.sol
-contracts/test/argent/utils/OldTestModule.sol
-contracts/test/argent/utils/TestDapp.sol
-contracts/test/argent/utils/TestModule.sol
-contracts/test/argent/utils/TestOnlyOwnerModule.sol
-contracts/test/compound/CErc20.sol
-contracts/test/compound/CEther.sol
-contracts/test/compound/CToken.sol
-contracts/test/compound/CarefulMath.sol
-contracts/test/compound/Comptroller.sol
-contracts/test/compound/ComptrollerInterface.sol
-contracts/test/compound/ComptrollerStorage.sol
-contracts/test/compound/EIP20Interface.sol
-contracts/test/compound/EIP20NonStandardInterface.sol
-contracts/test/compound/ErrorReporter.sol
-contracts/test/compound/Exponential.sol
-contracts/test/compound/InterestRateModel.sol
-contracts/test/compound/Maximillion.sol
-contracts/test/compound/PriceOracle.sol
-contracts/test/compound/PriceOracleProxy.sol
-contracts/test/compound/ReentrancyGuard.sol
-contracts/test/compound/SimplePriceOracle.sol
-contracts/test/compound/Unitroller.sol
-contracts/test/compound/WhitePaperInterestRateModel.sol
-contracts/test/maker/DS/DSAuth.sol
-contracts/test/maker/DS/DSMath.sol
-contracts/test/maker/DS/DSNote.sol
-contracts/test/maker/DS/DSStop.sol
-contracts/test/maker/DS/DSThing.sol
-contracts/test/maker/DS/DSToken.sol
-contracts/test/maker/DS/DSValue.sol
-contracts/test/maker/MockScdMcdMigration.sol
-contracts/test/maker/SaiTub.sol
-contracts/test/maker/SaiVox.sol
-contracts/test/maker/WETH9.sol
+contracts/test
+contracts/legacy/LegacyBaseWallet.sol

README.md

@@ -6,6 +6,11 @@ See full specifications [here](specifications/specifications.pdf)
 
 ## Install
 
+Ensure the correct node version is installed:
+```
+nvm install `cat .nvmrc`
+```
+
 Install requirements with npm:
 ```
 npm install

contracts/defi/utils/CompoundRegistry.sol → contracts/infrastructure/CompoundRegistry.sol

@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../base/Owned.sol";
+import "../base/Owned.sol";
 
 /**
  * @title CompoundRegistry