Merge pull request #307 from gnosis/development

Sync master<>development

Author: rmeissner

.env.sample

@@ -1,2 +1,6 @@
 MNEMONIC=""
-INFURA_TOKEN=""
+# Used for infura based network
+INFURA_KEY=""
+# Used for custom network
+NODE_URL=""
+ETHERSCAN_API_KEY=""

.github/workflows/ci.yml

@@ -0,0 +1,81 @@
+name: safe-contracts
+on: [push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 15
+      - uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - run: yarn --frozen-lockfile
+      - run: yarn build
+      - run: yarn coverage
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 15
+      - uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - run: yarn --frozen-lockfile
+      - run: yarn lint:sol
+  tests-other:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        contract-name: ["GnosisSafeL2"]
+    env:
+      SAFE_CONTRACT_UNDER_TEST: ${{ matrix.contract-name }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 15
+      - uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - run: yarn --frozen-lockfile
+      - run: yarn build
+      - run: yarn coverage
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+  benchmarks:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        solidity: ["0.7.6", "0.8.2"]
+        include:
+        - solidity: "0.8.2"
+          settings: '{"viaIR":true,"optimizer":{"enabled":true,"runs":10000}}'
+    env:
+      SOLIDITY_VERSION: ${{ matrix.solidity }}
+      SOLIDITY_SETTINGS: ${{ matrix.settings }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 15
+      - uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - run: (yarn --frozen-lockfile && yarn build && yarn hardhat codesize --contractname GnosisSafe && yarn benchmark) || echo "Benchmark failed"

.gitignore

@@ -3,7 +3,12 @@ node_modules/
 .DS_Store
 .zos.session
 .openzeppelin/.session
+deployments/
 env/
+dist/
 .env
 bin/
-solc
+solc
+coverage/
+coverage.json
+yarn-error.log

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,21 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+# Redirect output to stderr.
+exec 1>&2
+ 
+# prevent it.only or describe.only commited
+if [ "$allowonlytests" != "true" ] &&
+    test $(git diff --cached | grep -E "\b(it|describe).only\("  | wc -l) != 0
+then
+    cat <<\EOF
+Error: Attempt to add it.only or describe.only - which may disable all other tests
+ 
+If you know what you are doing you can disable this check using:
+ 
+    git config hooks.allowonlytests true
+EOF
+    exit 1
+fi
+ 
+exit 0

.nvmrc

@@ -0,0 +1 @@
+v15.6.0

.prettierrc

@@ -0,0 +1,15 @@
+{
+    "overrides": [
+      {
+        "files": "*.sol",
+        "options": {
+          "printWidth": 140,
+          "tabWidth": 4,
+          "useTabs": false,
+          "singleQuote": false,
+          "bracketSpacing": false,
+          "explicitTypes": "always"
+        }
+      }
+    ]
+  }

.solcover.js

@@ -0,0 +1,12 @@
+module.exports = {
+    skipFiles: [
+        'test/Token.sol',
+        'test/ERC20Token.sol',
+        'test/TestHandler.sol',
+        'test/ERC1155Token.sol',
+    ],
+    mocha: {
+        grep: "@skip-on-coverage", // Find everything with this tag
+        invert: true               // Run the grep's inverse set.
+    }
+};

.solhint.json

@@ -0,0 +1,20 @@
+{
+    "extends": "solhint:recommended",
+    "plugins": [
+        "prettier"
+    ],
+    "rules": {
+        "compiler-version": "off",
+        "func-visibility": [
+            "warn",
+            {
+                "ignoreConstructors": true
+            }
+        ],
+        "prettier/prettier": "error",
+        "not-rely-on-time": "off",
+        "reason-string": "off",
+        "no-empty-blocks": "off",
+        "avoid-low-level-calls": "off"
+    }
+}