Skip to content

Commit a450798

Browse files
elenadimitrovaelenadimitrova
committed
Merge branch 'release/1.6.0'
2 parents ecec7b9 + ae1dea9 commit a450798

File tree

186 files changed

+24176
-31946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+24176
-31946
lines changed

‎.circleci/config.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22

33
job_common: &job_common
44
docker:
5-
- image: circleci/node:8.12-stretch
5+
- image: circleci/node:10.12-stretch
66
working_directory: ~/argent-contracts
77
step_save_cache: &step_save_cache
88
save_cache:
@@ -27,26 +27,30 @@ jobs:
2727
- <<: *step_restore_cache
2828
- <<: *step_setup_global_packages
2929
- run:
30-
name: "Lint contracts"
30+
name: "Lint Solidity contracts"
3131
command: npm run lint:contracts
3232
- run:
3333
name: "Compiling external library contracts"
3434
command: npm run compile:lib
3535
- run:
3636
name: "Compiling contracts"
3737
command: npm run compile
38+
- run:
39+
name: "Lint JavaScript"
40+
command: npm run lint:js
3841
- run:
3942
name: "Running unit tests"
4043
command: npm run ganache >/dev/null 2>&1 & npm run test
4144
- run:
4245
name: "Testing deployment scripts"
4346
command: npm run ganache >/dev/null 2>&1 & npm run test:deployment
47+
- run:
48+
name: "Running coverage"
49+
command: npm run test:coverage
4450
- <<: *step_save_cache
45-
# Save test results to artifacts
46-
- store_test_results:
47-
path: test-results.xml
51+
# Save coverage artifacts
4852
- store_artifacts:
49-
path: test-results.xml
53+
path: coverage
5054

5155
workflows:
5256
version: 2

‎.eslintignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#/node_modules/* ignored by default
2+
3+
build/*
4+
contracts/*
5+
coverage/*
6+
lib/*

‎.eslintrc

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"extends": "airbnb-base",
3+
"env": {
4+
"commonjs": true,
5+
"node": true,
6+
"mocha": true
7+
},
8+
"globals": {
9+
"web3": true,
10+
"assert": true,
11+
"contract": true
12+
},
13+
"rules": {
14+
"max-len": [2, { "code": 150, "ignoreComments": true }],
15+
"quotes": [2, "double", "avoid-escape"],
16+
"no-console": "off",
17+
"no-underscore-dangle": "off",
18+
"no-await-in-loop": "off",
19+
"no-restricted-syntax": "off",
20+
"guard-for-in": "off"
21+
},
22+
"parserOptions": {
23+
"ecmaVersion": 2018
24+
}
25+
}

‎.gitignore

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ node_modules
22
build
33
tmp
44
bin
5+
.outputParameter
56

67
## Core latex/pdflatex auxiliary files:
78
*.aux
@@ -22,15 +23,19 @@ bin
2223
.DS_Store
2324
.node-xmlhttprequest-sync-*
2425
.vscode
26+
.outputParameter
2527

2628
.env
27-
*.sh
2829
utils/config/*.json
2930
!utils/config/ganache.json
31+
!utils/config/kovan.json
32+
!utils/config/kovan-fork.json
3033

3134
## Etherlime
3235
**/.etherlime-store
3336
flat
34-
35-
36-
37+
.coverage_artifacts
38+
.coverage_contracts
39+
.coverage_tests
40+
coverage
41+
coverage.json

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.12.0
1+
10.12.0

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.sol
2+
*.js

‎.soliumignore

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,5 @@ node_modules
22
migrations
33
openzeppelin-solidity
44
lib
5-
contracts/test/CryptoKitties.sol
6-
contracts/test/KyberNetworkTest.sol
7-
contracts/test/TestContract.sol
8-
contracts/test/TestERC20.sol
9-
contracts/test/TestERC721.sol
10-
contracts/test/argent/legacy/LegacyBaseWallet.sol
11-
contracts/test/argent/legacy/TokenTransfer.sol
12-
contracts/test/argent/utils/ERC20Approver.sol
13-
contracts/test/argent/utils/NewTestModule.sol
14-
contracts/test/argent/utils/NonCompliantGuardian.sol
15-
contracts/test/argent/utils/OldTestModule.sol
16-
contracts/test/argent/utils/TestDapp.sol
17-
contracts/test/argent/utils/TestModule.sol
18-
contracts/test/argent/utils/TestOnlyOwnerModule.sol
19-
contracts/test/compound/CErc20.sol
20-
contracts/test/compound/CEther.sol
21-
contracts/test/compound/CToken.sol
22-
contracts/test/compound/CarefulMath.sol
23-
contracts/test/compound/Comptroller.sol
24-
contracts/test/compound/ComptrollerInterface.sol
25-
contracts/test/compound/ComptrollerStorage.sol
26-
contracts/test/compound/EIP20Interface.sol
27-
contracts/test/compound/EIP20NonStandardInterface.sol
28-
contracts/test/compound/ErrorReporter.sol
29-
contracts/test/compound/Exponential.sol
30-
contracts/test/compound/InterestRateModel.sol
31-
contracts/test/compound/Maximillion.sol
32-
contracts/test/compound/PriceOracle.sol
33-
contracts/test/compound/PriceOracleProxy.sol
34-
contracts/test/compound/ReentrancyGuard.sol
35-
contracts/test/compound/SimplePriceOracle.sol
36-
contracts/test/compound/Unitroller.sol
37-
contracts/test/compound/WhitePaperInterestRateModel.sol
38-
contracts/test/maker/DS/DSAuth.sol
39-
contracts/test/maker/DS/DSMath.sol
40-
contracts/test/maker/DS/DSNote.sol
41-
contracts/test/maker/DS/DSStop.sol
42-
contracts/test/maker/DS/DSThing.sol
43-
contracts/test/maker/DS/DSToken.sol
44-
contracts/test/maker/DS/DSValue.sol
45-
contracts/test/maker/MockScdMcdMigration.sol
46-
contracts/test/maker/SaiTub.sol
47-
contracts/test/maker/SaiVox.sol
48-
contracts/test/maker/WETH9.sol
5+
contracts/test
6+
contracts/legacy/LegacyBaseWallet.sol

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ See full specifications [here](specifications/specifications.pdf)
66

77
## Install
88

9+
Ensure the correct node version is installed:
10+
```
11+
nvm install `cat .nvmrc`
12+
```
13+
914
Install requirements with npm:
1015
```
1116
npm install

‎contracts/dapp/DappRegistry.sol

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎contracts/defi/Leverage.sol

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)