Skip to content

Commit

Permalink
Merge pull request #203 from aragon/dev
Browse files Browse the repository at this point in the history
Release aragonOS 3.0
  • Loading branch information
izqui committed Jan 25, 2018
2 parents a633ff8 + 7bf4011 commit f2e8b1a
Show file tree
Hide file tree
Showing 200 changed files with 12,467 additions and 18,367 deletions.
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .gitattribute
@@ -0,0 +1 @@
*.sol linguist-language=Solidity
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -9,3 +9,5 @@ coverageEnv/
coverage.json
scTopics
functions.csv
artifacts/
allFiredEvents
11 changes: 9 additions & 2 deletions .solcover.js
@@ -1,5 +1,12 @@
// NOTE: Upgrading to solidity-coverage 0.4.x breaks our tests

const libFiles = require('glob').sync('contracts/lib/**/*.sol').map(n => n.replace('contracts/', ''))
const interfaces = ['common/IForwarder.sol', 'kernel/IKernel.sol', 'evmscript/IEVMScriptExecutor.sol', 'apps/IAppProxy.sol', 'acl/IACL.sol']

module.exports = {
norpc: true,
compileCommand: '../node_modules/.bin/truffle compile',
testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
skipFiles: ['network/AragonResolver.sol', 'misc/Migrations.sol'],
}
skipFiles: interfaces.concat(libFiles),
copyNodeModules: true,
}
3 changes: 2 additions & 1 deletion .soliumignore
@@ -1 +1,2 @@
node_modules
node_modules
contracts/lib
42 changes: 23 additions & 19 deletions .soliumrc.json
@@ -1,21 +1,25 @@
{
"custom-rules-filename": null,
"rules": {
"imports-on-top": true,
"variable-declarations": true,
"array-declarations": true,
"operator-whitespace": true,
"lbrace": true,
"mixedcase": false,
"camelcase": true,
"uppercase": true,
"no-with": true,
"no-empty-blocks": true,
"no-unused-vars": true,
"double-quotes": true,
"indentation": true,
"whitespace": true,
"deprecated-suicide": true,
"pragma-on-top": true
}
"extends": "solium:all",
"plugins": ["security"],
"rules": {
"security/no-low-level-calls": "off",
"security/no-inline-assembly": "off",
"function-order": "off",
"imports-on-top": 1,
"variable-declarations": 1,
"array-declarations": 1,
"operator-whitespace": 1,
"lbrace": 1,
"mixedcase": 0,
"camelcase": 1,
"uppercase": 1,
"no-empty-blocks": 1,
"no-unused-vars": 1,
"quotes": 1,
"indentation": 1,
"arg-overflow": ["error", 8],
"whitespace": 1,
"deprecated-suicide": 1,
"pragma-on-top": 1
}
}
26 changes: 16 additions & 10 deletions .travis.yml
@@ -1,10 +1,16 @@
language: python
sudo: required
python:
- "3.4"
services:
- docker
script:
- docker-compose run core test
after_script:
- docker-compose run core coveralls
language: node_js
cache:
directories:
- node_modules
notifications:
email: false
node_js:
- '8'
env:
- TASK=lint
- TASK=coverage
before_script:
- npm prune
script: "npm run $TASK"
after_success:
- cat coverage/lcov.info | ./node_modules/.bin/coveralls
18 changes: 0 additions & 18 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Jorge Izquierdo (Aragon Foundation) Copyright (C) 2017
Aragon Institution MTÜ Copyright (C) 2017
Jordi Baylina (Giveth) Copyright (C) 2017

GNU GENERAL PUBLIC LICENSE
Expand Down
1 change: 0 additions & 1 deletion contracts/.gitignore
@@ -1 +0,0 @@
zeppelin/

0 comments on commit f2e8b1a

Please sign in to comment.